commit: 083a1ab10de1a6a8c1f41404f3708b3abc708f41
parent: bac07d978245c4a3b21536be26fb67508e6742ee
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Tue, 27 Aug 2019 07:55:52 +0200
Merge branch 'master' into newpkg/bleramo
Diffstat:
16 files changed, 194 insertions(+), 10 deletions(-)
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
@@ -1 +1,2 @@
DIST glslang-7.11.3214.tar.gz 2841979 BLAKE2B 4c1f5542ddbb70c6321c1f6c5bb14f886bc148f89edfde8fac55a34a81a6f2a6eb4d7f21b3eb5fafc70f7078d7038dfa654826aca53e8b2dbf76bfcf208b84ab SHA512 5e7f8c063b30fc5edf65898b2371f4128aead05008865d065de9d3a94354de787035067ec908651c7e88bf294251d1410929d2b1c19e03d9b51476ea8a7eae96
+DIST glslang-7.12.3352.tar.gz 2965427 BLAKE2B b7baa00e695e6a117bb78f3bd4bd3308afbb8ce507955f7e58ac67c89b9630416327cd9c5b135cdd6af6378a620ee233ebea3203c188ac490906a27b14fd7678 SHA512 75e78f6a00d9be54d80817811f6e29977c186a85884b85765481625617bbd09d64cb3977897255887f752d336591147574619f3f0368f34d1245e720f7820559
diff --git a/dev-util/glslang/glslang-7.11.3214.ebuild b/dev-util/glslang/glslang-7.11.3214.ebuild
@@ -1,5 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
-# Copyright 2019 Haelwenn (lanodan) Monnier <contact@hacktivis.me>
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/dev-util/glslang/glslang-7.12.3352.ebuild b/dev-util/glslang/glslang-7.12.3352.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib cmake-utils
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
+SRC_URI="https://github.com/KhronosGroup/glslang/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+SLOT="0"
+DEPENDS="
+ >=dev-lang/python-3.0
+"
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
@@ -0,0 +1 @@
+DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual ebuild for ::gentoo compatibility"
+HOMEPAGE="https://www.gtk.org/gtk-doc/"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-util/gtk-doc"
+RESTRICT="test"
+S="${WORKDIR}"
+
+src_compile() {
+ :
+}
+
+src_install() {
+ :
+}
diff --git a/dev-util/gtk-doc-am/metadata.xml b/dev-util/gtk-doc-am/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>contact@hacktivis.me</email>
+ <name>Haelwenn (lanodan) Monnier</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
@@ -0,0 +1 @@
+DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
diff --git a/dev-util/gtk-doc/files/61gtk-doc-gentoo.el b/dev-util/gtk-doc/files/61gtk-doc-gentoo.el
@@ -0,0 +1,9 @@
+
+;;; gtk-doc site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'gtk-doc-insert "gtk-doc"
+ "Add a documentation header to the current function." t)
+(autoload 'gtk-doc-insert-section "gtk-doc"
+ "Add a section documentation header at the current position." t)
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.8-emacs-keybindings.patch b/dev-util/gtk-doc/files/gtk-doc-1.8-emacs-keybindings.patch
@@ -0,0 +1,17 @@
+--- gtk-doc-1.8-orig/tools/gtk-doc.el 2007-01-03 16:04:14.000000000 +0100
++++ gtk-doc-1.8/tools/gtk-doc.el 2007-07-29 21:56:45.000000000 +0200
+@@ -262,7 +262,7 @@
+
+ ;; set global binding for this key (follows the format for
+ ;; creating a changelog entry ...)
+-(global-set-key "\C-x4h" 'gtk-doc-insert)
++;;(global-set-key "\C-x4h" 'gtk-doc-insert)
+
+
+ ;; Define another function for inserting a section header.
+@@ -280,4 +280,4 @@
+ " */\n"))
+
+ ;; Set the key binding.
+-(global-set-key "\C-x4s" 'gtk-doc-insert-section)
++;;(global-set-key "\C-x4s" 'gtk-doc-insert-section)
diff --git a/dev-util/gtk-doc/gtk-doc-1.32.ebuild b/dev-util/gtk-doc/gtk-doc-1.32.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="GTK+ Documentation Generator"
+HOMEPAGE="https://www.gtk.org/gtk-doc/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+
+IUSE="debug doc emacs pdf test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/libxslt
+ dev-libs/libxml2
+ app-text/docbook-xsl-stylesheets
+ dev-python/pygments[${PYTHON_USEDEP}]
+ doc? ( app-text/yelp-tools )
+ emacs? ( virtual/emacs )
+ pdf? (
+ || (
+ app-text/dblatex
+ dev-java/fop
+ )
+ )
+ test? ( >=dev-libs/glib-2.38.0:2 )
+"
+DEPEND="${RDEPEND}
+ ~dev-util/gtk-doc-am-${PV}
+ dev-util/itstool
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs.
+ You may set your own key bindings for \"gtk-doc-insert\" and
+ \"gtk-doc-insert-section\" in your ~/.emacs file."
+ SITEFILE=61${PN}-gentoo.el
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Remove global Emacs keybindings, bug #184588
+ eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
+
+ # Apply upstream commit 1baf9a6, bug #646850
+ sed -e '1,/exit 1/s/exit 1/exit $1/' \
+ -i gtkdoc-mkpdf.in || die
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable debug)
+}
+
+src_compile() {
+ gnome2_src_compile
+ use emacs && elisp-compile tools/gtk-doc.el
+}
+
+src_install() {
+ gnome2_src_install
+
+ python_fix_shebang "${ED}"/usr/bin/
+
+ if use doc; then
+ docinto doc
+ dodoc doc/*
+ docinto examples
+ dodoc examples/*
+ fi
+
+ if use emacs; then
+ elisp-install ${PN} tools/gtk-doc.el*
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ readme.gentoo_create_doc
+ fi
+}
+
+src_test() {
+ emake -j1 check
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ if use emacs; then
+ elisp-site-regen
+ readme.gentoo_print_elog
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/gtk-doc/metadata.xml b/dev-util/gtk-doc/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>contact@hacktivis.me</email>
+ <name>Haelwenn (lanodan) Monnier</name>
+ </maintainer>
+ <longdescription lang="en">
+ GTK-Doc is used to document C code.
+ It is typically used to document the public API of libraries,
+ such as the GTK+ and GNOME libraries, but it can also be used
+ to document application code.
+ </longdescription>
+</pkgmetadata>
diff --git a/games-arcade/stepmania/metadata.xml b/games-arcade/stepmania/metadata.xml
@@ -8,6 +8,5 @@
<flag name="networking">Enable network-related functionality</flag>
<flag name="wav">Enable support for WAV audio files</flag>
<flag name="default-songs">Install the songs that are distributed with the game by default</flag>
- <flag name="system-ffmpeg">Do not use the bundled version of media-video/ffmpeg</flag>
</use>
</pkgmetadata>
diff --git a/media-fonts/forkawesome/metadata.xml b/media-fonts/forkawesome/metadata.xml
@@ -8,8 +8,4 @@
<upstream>
<remote-id type="github">ForkAwesome/Fork-Awesome</remote-id>
</upstream>
- <use>
- <flag name="otf">Install the OpenType version of the font</flag>
- <flag name="ttf">Install the TrueType version of the font</flag>
- </use>
</pkgmetadata>
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
@@ -20,8 +20,6 @@
local clock.
</longdescription>
<use>
- <flag name="libressl">Enable HTTPS TLS time constraint support using
- <pkg>dev-libs/libressl</pkg>
- </flag>
+ <flag name="libressl">Enable HTTPS TLS time constraint support using <pkg>dev-libs/libressl</pkg></flag>
</use>
</pkgmetadata>
diff --git a/profiles/base/packages b/profiles/base/packages
@@ -5,7 +5,6 @@ app-misc/pax-utils
app-misc/tmux
app-portage/cpuid2cpuflags
app-portage/gentoolkit
-app-portage/layman
app-shells/mksh
app-text/mandoc
app-text/sshpaste
diff --git a/x11-plugins/purple-discord/purple-discord-9999.ebuild b/x11-plugins/purple-discord/purple-discord-9999.ebuild
