gentoo resync : 10.02.2020

6 files changed, 9 insertions, 148 deletions

diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 27f162bede23..34ab2622a22e 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,9 +1,3 @@
-AUX gnofract4d-3.14-desktop.patch 479 BLAKE2B cfb56a81893b0bc1d9ea1fe119e75ab4324b5f8022deadc3380ae39407e8278ae4c6e425cfacd3072246b5df2083fc513d31f5c40c5505a44fd76ee9a65dde1c SHA512 1b90e6ce53e3b346af48a680d2486a5b69de49f2059f6a02c0f6d722a52ca70165e2935818ca57d58d149625528b923a897c85a34381595b9aae94f0476f90b5
-AUX gnofract4d-3.14-manual.patch 914 BLAKE2B 20be2e073ba3fb8fe06647b091e152a5d29119fe25c88fdd9dba3ad1dbbc0330b2fa15b84348e17601c39bc6c5c1cd9316f5f165889959fbe46731c79b469a66 SHA512 591858a7ba5e28e24cb170b5a6d24b98fd060ca79257542f9b3bcbe26d476ae2331ffa991c5d1726d352223198077e61339277b05e65ef0975944694f74a46ce
-DIST gnofract4d-3.14.1.tar.gz 4660808 BLAKE2B f5125be0414b847f506686734e9234c3d88732be6f7cd0feb9cbe759d6e0584f8ce143d64de17a5fcca9b28d75ae922e00993140f0ccb793d10faadb3221b990 SHA512 bcec1d12c589cdee2f0da5555a075db511debd21d4536db66793f6a28be35656258daffd8cbaaff4b5af041b18ca77c94d910ec4d0c7e14960412c580fd56725
-DIST gnofract4d-3.14.tar.gz 862499 BLAKE2B dcca058b6a625b4d2f0153f896ed029b27b8e6135a310942c4b58bf5a6396977f5ca065061918e99034b6303a5634c5288cac90c887a8dfa87286d24f9f1d04f SHA512 cf3614f60a43f7ab20208fb1a62d3823495c84060d177d2926bad20a475e661d7ec45a7bc14e826229656027fe7c0f68aac093b6b0dc7912e84d8d8ec8ff81e5
 DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
-EBUILD gnofract4d-3.14-r1.ebuild 838 BLAKE2B faf89e7b8110f981fc500a83b10985e71bd60320a3ae1ff4048d9ecef5866399369e13c35904df5d0474afceab7e29c16d69322aac55bf0a7b12500ca97fc6f5 SHA512 639bbddf911d9314e99142e4f55ab968b0898293d8ddeabd286010faa9304a35cb280f39790028360b78e64c8722581239913b37e15e196631a5011b9fb6950a
-EBUILD gnofract4d-3.14.1.ebuild 1142 BLAKE2B b6ff0697afc901a6e4ce549f2c5a6012a191ccec2b36c26e9ca428e753f422e9759a87b3dad612d715f2f4647eb46a63c2ebf6855c077765c8f4f88b7f00ef06 SHA512 63e621da4294d0b18023ff8f6df66d657ca1fff0af0156d226f19ceaa675f75640798b0c5dca34ce9da19769fe355dbe5268b6fc61bbde26236e7b651bfc9ad5
-EBUILD gnofract4d-4.0.1_p1.ebuild 1586 BLAKE2B 9e9767bf940353b7521dfbf8ad98641f0249a22130ee22b9a936093effdb2df4275bec4757609dd86b9bfcff640d9bbc1f34fee000dfa5cda60eb701fee1245f SHA512 fd919929386aae4b36ab9bc65321042b1c26338054b651c0cadf9ee96975308f2111db06123fa987fa0f87ea68f1d3ea62142a495e0e96c59ebb56b4b741f5e0
+EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1666 BLAKE2B ca6a2f20b4cd279798a3a6e3ca9471cc530b131edde088cd511a0ee4f5c0bece2e7e27e5813b91ff66e79856892aa8695a51a764248589ce5661b64b787d1e5c SHA512 eca186d36beba57e9a77e36f8d60224867217f5f3ee6993c16665750a435a32736a82fcbd22077b0d65947dbbc78b6105378cabee51b4d0e294094a269537a68
 MISC metadata.xml 403 BLAKE2B f0bfac9f73e6c64e4535ff9dd389bd65bd622ba3aa0b64d52ef1f3b96a5cf0fbc4913c311b3e227fd9ac91c18f3d78aa9ae085c7610b06e768a39f6f5993121e SHA512 ed69568f628be6a938f2f2cd9a7a2610b881f437ec57eb12baf803b00ddb5f62e7d562a1743eaff5a3fc8d083802cac05ed965aa0d473846e94aa526e66babb4
diff --git a/media-gfx/gnofract4d/files/gnofract4d-3.14-desktop.patch b/media-gfx/gnofract4d/files/gnofract4d-3.14-desktop.patch
deleted file mode 100644
index ca521962460f..000000000000
--- a/media-gfx/gnofract4d/files/gnofract4d-3.14-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/gnofract4d.desktop b/gnofract4d.desktop
-index 4bf055f..b8dfc47 100644
---- a/gnofract4d.desktop
-+++ b/gnofract4d.desktop
-@@ -1,13 +1,10 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=Gnofract 4D Fractal Generator
- Comment=Generate fractal images such as the Mandelbrot set
- Exec=gnofract4d %F
--Icon=gnofract4d-logo.png
-+Icon=gnofract4d-logo
- Terminal=false
- Type=Application
- Categories=GNOME;Graphics;Math;
- MimeType=text/x-gnofract4d-fractal-parameters
--
--
diff --git a/media-gfx/gnofract4d/files/gnofract4d-3.14-manual.patch b/media-gfx/gnofract4d/files/gnofract4d-3.14-manual.patch
deleted file mode 100644
index ce1918b33286..000000000000
--- a/media-gfx/gnofract4d/files/gnofract4d-3.14-manual.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/doc/gnofract4d-manual/C/gnofract4d-manual.xml b/doc/gnofract4d-manual/C/gnofract4d-manual.xml
-index 3cea223..0ce6e17 100644
---- a/doc/gnofract4d-manual/C/gnofract4d-manual.xml
-+++ b/doc/gnofract4d-manual/C/gnofract4d-manual.xml
-@@ -2,7 +2,6 @@
- <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- 
- <!ENTITY stdlib SYSTEM "stdlib.xml">
--<!ENTITY commands SYSTEM "commands.xml">
- <!ENTITY tutorial001 SYSTEM "tutorial001.xml">
- <!ENTITY tutorial002 SYSTEM "tutorial002.xml">
- <!ENTITY tutorial003 SYSTEM "tutorial003.xml">
-@@ -625,12 +624,6 @@ see weird effects unless you disable periodicity checking.
- </sect2>
- </sect1>
- 
--<sect1 id="cmdref">
--<title>Command Reference</title>
--<!-- pull in auto-generated list of keyboard and mouse commands -->
--&commands;
--</sect1>
--
- <sect1 id="maths">
- <title> About the maths</title>
- 
diff --git a/media-gfx/gnofract4d/gnofract4d-3.14-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-3.14-r1.ebuild
deleted file mode 100644
index 73a10f4e5557..000000000000
--- a/media-gfx/gnofract4d/gnofract4d-3.14-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
-HOMEPAGE="http://gnofract4d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	>=media-libs/libpng-1.4
-	virtual/jpeg
-	>=dev-python/pygtk-2[${PYTHON_USEDEP}]
-	>=gnome-base/gconf-2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	distutils-r1_src_install
-	rm -rf "${D}"/usr/share/doc/${PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild b/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild
deleted file mode 100644
index 45040d6819ae..000000000000
--- a/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-MY_PV=V_${PV//./_}
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
-HOMEPAGE="http://edyoung.github.io/gnofract4d/"
-SRC_URI="https://github.com/edyoung/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	>=dev-python/pygtk-2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/gnofract4d-3.14-desktop.patch
-	"${FILESDIR}"/gnofract4d-3.14-manual.patch
-)
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-python_compile_all() {
-	# Needs fixing to be able to generate commands.xml
-	"${EPYTHON}" createdocs.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	rm -rf "${ED%/}"/usr/share/doc/${PN} || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
index 397401cf09f1..1563bc834fda 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/edyoung/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+doc"
 REQUIRED_USE="test? ( doc )"
 
@@ -25,14 +25,18 @@ COMMON_DEPEND="
 	media-libs/libpng:0=
 	virtual/jpeg:0"
 RDEPEND="${COMMON_DEPEND}
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	x11-libs/gtk+:3[introspection]"
 BDEPEND="virtual/pkgconfig"
 DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-text/docbook-xsl-stylesheets
-		dev-python/pygobject[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		')
 		dev-libs/libxslt
 		x11-libs/gtk+:3[introspection]
 	)"