gentoo resync : 28.04.2019

25 files changed, 82 insertions, 230 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 47188cccdd34..98821d4c02c3 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/bchunk/Manifest b/app-cdr/bchunk/Manifest
index 7f2c16e31b7c..16dcac40bfa0 100644
--- a/app-cdr/bchunk/Manifest
+++ b/app-cdr/bchunk/Manifest
@@ -1,5 +1,5 @@
 AUX CVE-2017-15953.patch 738 BLAKE2B a7d35373ff5fc7f105430c6480285fe567a2ecd4cf6979b0e950a0945e9cdbe78aeab9815b628af6e398d1a57ae94ebbd8ec829b01a43bc33baa434ef4863b41 SHA512 266dc695cbc53a58f99cef7bff8e399a018275dce05d50edb4465096c418fa4d77850c671b56a3656f942f0affd83110f341c91bb325d48b9d264b5370b99a51
 AUX CVE-2017-15955.patch 773 BLAKE2B ed4a57da8a73cdde213a5b6e7b454d067ac7b178d1919490657ca0a2ba095ca0b2ae05dfe929d4ee92fa6a2fc7861215cddb9f5d6727d460f6a44b18b9f38581 SHA512 060d6d637f5af2507d63edea4bdda30ae4d6fa5b8e96aaac6d9e41fe328d474bf6854fea101fd6de878ea3b5f2f3e2ccdd1b8e1182a55fe423f293b2024dc7f1
 DIST bchunk-1.2.0.tar.gz 15078 BLAKE2B 60d443380ffaa8dd1d025777c91c1374a931f16c8de2219a4ff453ee4d7c6eb235b2380ce1021911636d247a12640214dc40b29f9c9cf917ff4bc4594f189fc4 SHA512 0e1f9daa2dfeff58e2c65ac2767bff804811fa22f70a220747aa873cb01b77b4c6a809736483aa22fb3f2d2a88885469d10fb45af4626069e992a0763a5fcc2d
-EBUILD bchunk-1.2.0-r4.ebuild 584 BLAKE2B e6cadb8e14ffb69db005f27c76dfaa7eb77db351b5293d084d948b52304cbd6e6f54a67d31fa24f2fac30e04130ce78f19eab37a03c426f289b858478addb65b SHA512 1eaf7fdb44aec8579926280b8fd9b5eb4f3841cd2ec6c89d6ad097709029b8d0108abcbd79b64a517a48e93f4244f8a6ddd6bc35bc5b3f2fc289eeb846be772b
+EBUILD bchunk-1.2.0-r4.ebuild 588 BLAKE2B fca2b156f7ea8c2338f6a33c048b79cbbe557db4dab177274d4e9a77fa6209dbe76a0b46a4db64ef00416cbb6e1015d172be9b05c3c67ac39cbc3454642c717b SHA512 0f695d47accf745aaded70dc63e6d6717ced7248d95b5f281115e8f2c3fc88a5c8b55baad18bc625f0c6c109449efd8bb34a389aa6e67c0045c9a7186ed64c31
 MISC metadata.xml 316 BLAKE2B f234f603d9fcf3c50f48602826b361707317ec2dd0ca1438224e6ec753e92bd0c024d773343c6b6413a920698f4673b85cf6b6411a0c53dc02253b5e341da236 SHA512 1a2c6992e5957694c18634dd12d5a567d1bd74b063f91e7c524984722955a0a72ff22ff2ef17932eb2eafd84d4493dbe6a103df3fad70e4134fa33ddcc3463e9
diff --git a/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild b/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
index 846db0b7f490..109475dbc088 100644
--- a/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
+++ b/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 DOCS=( "${P}.lsm" "${PN}.spec" README ChangeLog )
 PATCHES=( "${FILESDIR}/CVE-2017-15953.patch" "${FILESDIR}/CVE-2017-15955.patch" )
diff --git a/app-cdr/cddetect/Manifest b/app-cdr/cddetect/Manifest
index 14ea25c51f68..4cc13cceb4dd 100644
--- a/app-cdr/cddetect/Manifest
+++ b/app-cdr/cddetect/Manifest
@@ -1,3 +1,4 @@
+AUX cddetect-2.1-fix-include.patch 269 BLAKE2B a9997f7f32417386378a585de4ebd1a051896c07de4c26f6949f1bd49b323c5c1ba69adf9e961d272af77ccc28743d4f0ca710f02eff41c0fedbaf47d0553fc2 SHA512 c45972e5191a44822ba5ca1d52e8d77d9de41a337febf5c6b1fa8e89aa182faa1c7314444e7041d645bd4836d8d800cc034703916a87cad806d962d226b7f40f
 DIST cddetect-2.1.tar.gz 11779 BLAKE2B 2e71d923a37d8c1248e4fd0f33349bbec767ef39c31153de3615a5b19f071812e1064b49df5de8d380d2ef7d63adc3dc059bbf37bc9caa3421f70e42fee7f40b SHA512 1a67a17f1d26db8361fd72201afa108571fe8639d34e0bea6fd47a26ea6dfa9ff535c56fd14739d9ee551efdcf74c261e6e4b208e769d066926ee96c400ed54c
-EBUILD cddetect-2.1.ebuild 561 BLAKE2B 9b464650ef4edf613180d807647e340980178d6b1015ad9db40d58a38ced3983c14270ae7041d48cf2db45aa0655657fc0e523d1c1c8f6955d098e1e877e3305 SHA512 98d96929cbf4397d7ed61213feea1cf0e5cdfbcddb51c108879dd588daae48a5a453d9d66fb005dcb3548bde68554297fa37b3b89bd89c9bce52ac34323ceb1d
+EBUILD cddetect-2.1.ebuild 532 BLAKE2B 38c315944c766241be104aaad1ac49dea41f8fb8844aaddf093bff04cdca9bad96a2ed3676a8042d07d66d3127348418b4780d39dd017d695e436b63323387c7 SHA512 4bf0b7395fbaf1a1ae6f1a0e93b577db9df82e234a2c10e8ea0501f407ba5c925f75ed51ae50d18a2a66a862a5e0dd376a802fa7a29144cfffaae4bcca0adba6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/cddetect/cddetect-2.1.ebuild b/app-cdr/cddetect/cddetect-2.1.ebuild
index 5de6bf19692a..ed051629ee1b 100644
--- a/app-cdr/cddetect/cddetect-2.1.ebuild
+++ b/app-cdr/cddetect/cddetect-2.1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="A tool for detecting the type of a CD/DVD without mounting it"
+DESCRIPTION="Tool for detecting the type of a CD/DVD without mounting it"
 HOMEPAGE="http://www.bellut.net/projects.html"
 SRC_URI="http://www.bellut.net/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 S=${WORKDIR}
 
-src_prepare() {
-	sed -i -e '1i#include <limits.h>' ${PN}.c || die #337628
-}
+PATCHES=( "${FILESDIR}"/"${P}"-fix-include.patch ) #337628
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="-Wall ${CFLAGS}"
diff --git a/app-cdr/cddetect/files/cddetect-2.1-fix-include.patch b/app-cdr/cddetect/files/cddetect-2.1-fix-include.patch
new file mode 100644
index 000000000000..77386abd1bc6
--- /dev/null
+++ b/app-cdr/cddetect/files/cddetect-2.1-fix-include.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/337628
+
+--- a/cddetect.c
++++ b/cddetect.c
+@@ -1,3 +1,4 @@
++#include <limits.h>
+ /* big parts taken from cdfs (C) 1999, 2000, 2001 by Michiel Ronsse
+  * relesed under the GPL v.2
+  * more parts taken from isoinfo/isodump (W) 1993 Eric Youngdale,
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 26ff484b19de..23058e65cc95 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST cdemu-daemon-3.2.1.tar.bz2 82426 BLAKE2B 282b1a62ca3a770e709ff31ee7b72ed9f5e102c5f318a765a99421c93881e9ecacfdc5867af494e69dddda40603c8eb6cc8904a7c82fec004a6d5644a28a9f87 SHA512 399dbb818de8a550bd31784a5a7f0adb9d2e35d922ba71f341df81d20fd7e5ebaba5f31db1554caca17919325773f9ec6bb3d5ae99afa5d6eaf5b22142e010ee
 DIST cdemu-daemon-3.2.2.tar.bz2 82366 BLAKE2B d21436a5dbf1c6d953aa7ceb58e5d4580931391ea407c45de8f7c7154c181aef76535833bf02999d77d3a9e0c624db1124a9d333d028e206844a1256b3c5dde0 SHA512 4010bad27d5f595d20e1666700d32c2fb3f943f2e50645317bcc8fbbbba58cd61b3f6d3276e91fff55f449e44291abc776a56ded7c4f0bb7901ac247da72d7fe
-EBUILD cdemu-daemon-3.2.1.ebuild 1140 BLAKE2B 3a9168913ac901d268b46137fe8f705866df375172dce36e67a8302d9191ec2c991804a264972260b0f2c59f66d15adffb4fab1cd0132211a34d2926b0d50b21 SHA512 747f5c96c441723873e147f6111d12dca95be0da67dc7658b7fe2a395e524f6af24369b4b932c3de328c46bd4b4a73f258c935e285ee8d9d47398cd68d911f3e
-EBUILD cdemu-daemon-3.2.2.ebuild 1142 BLAKE2B 07c239beaf56df21bf2f393dd46f84a153addc57960eace12844eebec433f24d3f31b256379927220c7aa99544c996b53f358a01cdac75551e6b6321c6b11171 SHA512 79d525f7a96deffb5169ee926e2b0947db816c4eeb3db0ed8c67eb0e67e0f7339fa6847507f3ff7c5c3204a1fad8676b398da72c256e760c5acfe8a9841bd78b
+EBUILD cdemu-daemon-3.2.2.ebuild 1140 BLAKE2B 37bf7e266dcbf187004b9e6184176791873d8a6ef29d11e2a0348d606affd72ae5fe8a0ced71e44c460ec218cdb41dd4073539000920fc290adfa7a7a10c2383 SHA512 2e05466f5bdec9615e5bc03343706b2abd1c310532364fb09454170aa2389f70bb490a1538e2097dadb73131907f2820e4b9ca8f774f12c1a94d1e922e322adf
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.1.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.1.ebuild
deleted file mode 100644
index 6db965c48f29..000000000000
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.32:2
-	>=dev-libs/libmirage-3.2.0:=
-	>=media-libs/libao-0.8.0:="
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/dbus
-	>=sys-fs/vhba-20130607"
-
-DOCS=( AUTHORS README )
-
-pkg_postinst() {
-	elog "You will need to load the vhba module to use cdemu devices:"
-	elog " # modprobe vhba"
-	elog "To automatically load the vhba module at boot time, edit your"
-	elog "/etc/conf.d/modules file."
-
-	if [[ -e "${ROOT}etc/conf.d/cdemud" ]]; then
-		elog
-		elog "${PN} no longer installs an init.d service; instead, it is"
-		elog "automatically activated when needed via dbus."
-		elog "You can therefore remove ${ROOT%/}/etc/conf.d/cdemud"
-	fi
-}
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.2.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.2.ebuild
index f4972c2ba6b5..d69d9e612cee 100644
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.2.ebuild
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-libs/glib-2.38:2
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index ab6d642bc130..3f39a6105551 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,5 +1,3 @@
-DIST cdemu-client-3.2.0.tar.bz2 43588 BLAKE2B 0f75bed1ce2a715bb7acf227ebd3da8b80cf6418e28b0d352f294121c1f67acb8c6bab5f5dc5c768150ad46830b823d66f1940887c66225d20b41827c1377d31 SHA512 778f2ecac828ba278d0ded875c7bab2415f1c1acb62f4030eaf161376869939c48bc16a6d660326d9aacd2af745ef9dc9158f922a72aa8ccbd47f05ce41b8cd7
 DIST cdemu-client-3.2.1.tar.bz2 43584 BLAKE2B d34c09203b7b4e70161d62aee48d531b083952174fd2357bf0fc7b69a0fd59200bedb9ca87fe2d2c18c953979c84e9db3fec4d5fb500375f0bcc155dcaf5cedb SHA512 913c26754d16c339d7ddb4e00cc7d5b754ad6cc7f1a156c9448b51ed09468cf9e8a2bc74ed123a621278d2ad281e447d33ee06c3416bc1d0d2e6c2becd539154
-EBUILD cdemu-3.2.0.ebuild 1083 BLAKE2B e1909cc305fc2b5e1ea3b17dc9db089c9495a537a677eb17a007b19cf993b1d34b9d633bbdf1bc4329532708f3c196bc31127a243498a15941ef0de2059ce13c SHA512 e1054fda4e2a1cd8edb3f2691c766a4aa90f775ae57e6aba26c95d7f6df9b320930b506baead99577bb7e6d5482912e4b5878a67fb45c859e3d28c09834e66b2
-EBUILD cdemu-3.2.1.ebuild 1085 BLAKE2B 147210cc448991427212d64fc9d4f130dc9595cb094d411f957dc9b767cedb71cfd1150385bf3679ed18c312e7c47d8e9d6bfa287e4c9174a4cb174cdb84a6a5 SHA512 194733be7dd97cfedc607111fac619588eece03bb61f1f400d992c8e640dab969949646bb469f1adf71f90d0b0e3023e5e7e482c40e1a56a669a5ce1de53f050
+EBUILD cdemu-3.2.1.ebuild 1081 BLAKE2B 33bb3596f62c2df6265e4313dd0fa84e52fb73d64cdcc938650c9a340b7b6c19505acaae17b4c61080bbdc578a834ac80b90f2027ee0462f345f66d1895f41bf SHA512 95642bbf73fd7a54dae54a4408275be33a55545b91af88db0e5e6890f03433d079309d0a4f28c32b44fa85332f354657391453fa57aedf623af8f6b77bbc4ea0
 MISC metadata.xml 529 BLAKE2B 88d72a301708901597eb11c475ae67d8477381c77d430b49042cb4a8658aa44b88273858f87cbbaa1fc16ae222b604fa9ff81f6f791d39c39d5c76b58b9d0d81 SHA512 27850929d16910038f7b406c0ec4c22648c91a6f8a8f9cd56c0a3ea8e4e772de9b77598514c5a621eb71386635a327829251a90128ba33073ac34485a3b60a92
diff --git a/app-cdr/cdemu/cdemu-3.2.0.ebuild b/app-cdr/cdemu/cdemu-3.2.0.ebuild
deleted file mode 100644
index 13ab76055be7..000000000000
--- a/app-cdr/cdemu/cdemu-3.2.0.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=( python3_{4,5,6,7} )
-
-inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Command-line tool for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+cdemu-daemon"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
-DEPEND="
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	python_fix_shebang src/cdemu
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPOST_INSTALL_HOOKS=OFF
-		-DCMAKE_INSTALL_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-cdr/cdemu/cdemu-3.2.1.ebuild b/app-cdr/cdemu/cdemu-3.2.1.ebuild
index 3da78b6b6bd8..2a76ff1648ec 100644
--- a/app-cdr/cdemu/cdemu-3.2.1.ebuild
+++ b/app-cdr/cdemu/cdemu-3.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+cdemu-daemon"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index c128fa1a4a95..44cc33a5168d 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,5 +1,5 @@
 AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f89787fded558e88edecde89237ea5097b6a6cc0233b5950f0df460490af415255a56130d27b7198b3c1fee279e288835f9 SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha09-r2.ebuild 8341 BLAKE2B 67c7a09496ff2ebed4a04660dd1c20bff2040922041ce1efbfe11fef764a38a8dc5df3411ac73262e6f986d3ff7da8c5fe97e9900a37bb81580d5541a9631556 SHA512 9e8a412a449a0537473e916d9ceb92ecac82044a164286468d9e120a0faab75ca14650ac357ab885c2d49d382d4a99b84a6cba34f3025118b6579135525f44ae
+EBUILD cdrtools-3.02_alpha09-r2.ebuild 8341 BLAKE2B 8e79f49060382bc560ec36e7921365c4f3691ef28d43132a0810d11af8833ab926938045f57e7ce665ff7aa410c76dc764f96eaec4f3482be84005b8d6497ade SHA512 617e083f76882f03ed486c123d622926a5a76da4b25774d2e8cc39ca26fde2c5adcf037494e113aa5016b8c2cbed70250e758cb30d129d68436adf8ff21251e4
 EBUILD cdrtools-3.02_alpha09.ebuild 8265 BLAKE2B 33dc93262e7030aa38808cf24cc48953f25c02104ee9f4277685ce2765b997c2eeb6bd0314bff3834131ecedb9c05b31c3cb9b4b04cc0e8d80f0126caa9a0b38 SHA512 1bcbbd468dff045dc536553223f7b478dc73aad258df3f5a52d9e391d858c8d7f1b29a46fa8148ea373b0190af7317f96045eb3953181effe29048516484c39c
 MISC metadata.xml 533 BLAKE2B 13eeaf0e3fd17234f44138fc6b6fe1b0ef5e369b823a1adb9063743702b9afe86f1d939bb451df1cc6337c2e3790e38b1f890e68c46eeed9210ccc6d96e0944e SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
index b7c396deae03..5bf70f56e71d 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,7 +55,7 @@ src_prepare() {
 	# going to include this so let's try to carry it forward.
 	# Contact me if it needs updating.  Bug #486782.
 	# Anthony G. Basile <blueness@gentoo.org>.
-	use elibc_uclibc && epatch "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
+	use elibc_uclibc && eapply "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
 
 	# Remove profiled make files.
 	find -name '*_p.mk' -delete || die "delete *_p.mk"
diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index c5a7ad4b6a11..0c0a26346d25 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -1,4 +1,5 @@
 DIST cdw-0.8.1.tar.gz 858791 BLAKE2B 971a5c69ef1452bb4fd02e74bb2a81492de5dc16c024d185c43bb19aa0e293b727e74f72ce73ef3aebcdb941500f95433dc6243f1171f68943b2dbe7bdc176f7 SHA512 08f6bac823f534987835f434190601d0a72df2246ff78bfe1af98fd30dda25edb8cf2e09161b3a0bc55e9efefbc453b409cc95fd3c117d447f07e49f79072e33
-EBUILD cdw-0.8.1.ebuild 682 BLAKE2B e9dfd42e2cdb74f15bcf7ff114cd5f02006c844f953081ce56d045bc6650a981ee8fb0d5482fcba394c1d74555283c678731f444dada18236fd8972f09820acc SHA512 b6668d1ecd765da6f10e2f8106a289e3ccdac3213ad9f824ce6a43bed528511f3cb6d821bb9a086411f51bd40f4530ac9231f0e5b799534ded5631fec1db66c7
-EBUILD cdw-9999.ebuild 839 BLAKE2B d08609e2dd4d4a34b388d9c62ff65d0e4244d60597e507b405b0354e2c9f54c0e7555cc5f84f50d54d02a051129d3342b3babad69f9f8133f4aacd9bf9b332fe SHA512 270c68410afffa822a0ab785b297b97da44f7cfebf2f17335029bd5cbf4463b5dc4c1f2bf5bca5cbb9b6e64dd3463c3c8538b81e48fffe68dcbd3037c82a3dcc
-MISC metadata.xml 240 BLAKE2B 0afeda9a0f5f12f46f814e39da9b888116a752948c98603475a0745af8489c5c88b9ace8956a58c4d6699d382a05e683f2798867068e0c58a28c31ed8898d494 SHA512 ff094d0df1386eff97f6a48bd936826782717d38a8f51d4c1d06a066ce95b4ebe275ae23c7229d5bb7467c03a38fa85e23c04a7b65cbb89d8f3ef56a64dd1664
+EBUILD cdw-0.8.1-r1.ebuild 665 BLAKE2B 8ec562f5e01700a9338989f9a25dabced25fc0a8c9450defde4e5ed133b51e222e993510675e00c8767880ead601e302a7d75e44b46d5a37699ece3feec0a4bb SHA512 3b51aed44a8bef5d1766bce8fa47dfbea67516a2e6c12dc4442c9208f6865ba332f5d2278a0a0160f3420b1f918bde725cbf2089a14ebfcee139d81bbd8d9486
+EBUILD cdw-0.8.1.ebuild 683 BLAKE2B 6be4e48db38ceb81cb4c819552def61d7f96a8b35faa01d02bce8fde9e3915e2fe39cb6010dfd114c24836db2b2b34beed798203d7541022d6acef57a8271208 SHA512 e2f975ae1e5cba6b086d52fa104aa67d0acab99cf6b4cbc04a36880b12cde300d788fb41a7e65e37e2594ad009211d1106c377ed1fb0890052c63c9ed874b0d5
+EBUILD cdw-9999.ebuild 791 BLAKE2B 5b380cbeed433459b15b244ed38a1c1a8b3f5bb9225125327f308a8337adc8f2d2df07e49774830baabf06311d30b4fe5231762ceb0fbd47ebf19666bce4d4da SHA512 c99bea0008b0920bc3bf23de6a35fb1e82509feb5cdb815c9b839628c7f699bd30599bb9daa382e00133173089b72f05a87e4d09190b3ef459b92302f8bab871
+MISC metadata.xml 446 BLAKE2B 6313db12893912ba680ec7c27d939ba2fa7c81b6cb2d7132052b5a0eaf674ce7f71703a8ea8324c61fcad6101b6bbb1e07f9a857bdc1646d96c27e6110b6b495 SHA512 304f1a9a99962e295db23822a327cc5d1b8f2f049bcbbbe562a516a5bf5171b5d93a9886353d02dedc32d1d1220f519bff13c35a7c00d1463a6af4906ad63161
diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..2e0b7596745d
--- /dev/null
+++ b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
+HOMEPAGE="http://cdw.sourceforge.net"
+SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	app-cdr/dvd+rw-tools
+	dev-libs/libburn
+	dev-libs/libcdio:=[-minimal]
+	sys-libs/ncurses:0=[unicode]
+	virtual/cdrtools
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
+
+src_configure() {
+	econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
diff --git a/app-cdr/cdw/cdw-0.8.1.ebuild b/app-cdr/cdw/cdw-0.8.1.ebuild
index 01faff8d2318..3b50e3848a7f 100644
--- a/app-cdr/cdw/cdw-0.8.1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
 HOMEPAGE="http://cdw.sourceforge.net"
 SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index e1a1792a140d..5013ebb9082d 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -1,32 +1,30 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw"
 ECVS_MODULE="cdw"
 ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
 
 inherit autotools cvs toolchain-funcs
 
-MY_P=${PN}_${PV}
 DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
 HOMEPAGE="http://cdw.sourceforge.net"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS=""
+DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
 
 RDEPEND="
-	virtual/cdrtools
 	app-cdr/dvd+rw-tools
 	dev-libs/libburn
-	dev-libs/libcdio[-minimal]
-	sys-libs/ncurses:*[unicode]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
+	dev-libs/libcdio:=[-minimal]
+	sys-libs/ncurses:0=[unicode]
+	virtual/cdrtools
 "
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 S=${WORKDIR}/${ECVS_MODULE}
 
 src_prepare() {
@@ -37,8 +35,3 @@ src_prepare() {
 src_configure() {
 	econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
 }
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
-		default
-}
diff --git a/app-cdr/cdw/metadata.xml b/app-cdr/cdw/metadata.xml
index c2f92db9934e..9325abc85670 100644
--- a/app-cdr/cdw/metadata.xml
+++ b/app-cdr/cdw/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>arthurzam+gentoo@gmail.com</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cdw</remote-id>
 	</upstream>
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index cda035aa44db..4c8502aed37b 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,5 +1,3 @@
-DIST gcdemu-3.2.0.tar.bz2 52144 BLAKE2B f349e4482905b0ac59bce5d6af74000e05ff9b7257c7ec8755106ac8fe316d59d19de8b72705fd9cccfa888d170776667ee07fe90311a81e78f251fee85601ee SHA512 61a1775c874c9c3604ce88758039ef80b262463ae180e791eb545811fa2176e4bf07c4dbcd3be5f17d446fdef92317a0ff64ce8d27f26aeaeee9d8134b6a95ea
 DIST gcdemu-3.2.1.tar.bz2 52231 BLAKE2B f6b0025f6c5e79fe7312bf15b467327152e561db33f6190847e4e702cb98ff8005b37fe997c721b5c76cd64d64bafef1c015a9151c0ee200c52efcb849c93dba SHA512 c2da75d985981ccd0b44f210745670501fecd0ae7c60bde783fc5f91ab4c629c6eab9e8b35df906b5669b6518d3bdf36c5814b513c0f3e2d703659d23df1c82e
-EBUILD gcdemu-3.2.0.ebuild 1129 BLAKE2B 4af93d2a9f88cce37cc032ece75a76b4a6462df0a2226fe5c67c5fddc84351374af74b0b00ee76624af339bb847c178b4e1317355142261722e16fbe90d34814 SHA512 8c5494ce53fd55b5fa97d339ed46840eb7d873fd71e14c255588d5fc038f0f4786cacd865151f8e425cfe48cf3208d6b5d479adb0cf283f22f0144178d5b2897
-EBUILD gcdemu-3.2.1.ebuild 1128 BLAKE2B 583df69f50bfe095f04e270a0d0b8f7c0702fcf3981a896976e5a021041ce3bb4e16c5476570bdc04888586ecba0372a2951e48477ff89c3e5dcd384b3a99f61 SHA512 d27c324213e50c7a07fc10de978ee89475d2bc19e3387814871df6d9e6b95975e880917d7c3f5d3303ada2a873464db3ce10f369e85698aa7db6b01d710f8193
+EBUILD gcdemu-3.2.1.ebuild 1124 BLAKE2B ca3230f358917866a2fb5708b459b33eeca45ea23a16d7c51c53b8b18a2ae3615f39a6a6f12d8fcc7a4be0a54155907dec68eddd5bb4b731c4fb5cb74eb54f37 SHA512 bbdd46cae47b5f06d428f0131403b2b2bb39e000f02035d298155d7c81bf178c5cafbbf612a4abd34b656b835ecd3bb68643e56efd507befc7734dccdc7ba380
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/gcdemu/gcdemu-3.2.0.ebuild b/app-cdr/gcdemu/gcdemu-3.2.0.ebuild
deleted file mode 100644
index 2600df099363..000000000000
--- a/app-cdr/gcdemu/gcdemu-3.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org/"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# librsvg for pixbuf-loader
-RDEPEND="${PYTHON_DEPS}
-	app-cdr/cdemu-daemon:0/7
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-DEPEND="
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang src/gcdemu
-}
-
-src_configure() {
-	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_schemas_update
-}
diff --git a/app-cdr/gcdemu/gcdemu-3.2.1.ebuild b/app-cdr/gcdemu/gcdemu-3.2.1.ebuild
index 8ab6ae82ae0c..07325dc46248 100644
--- a/app-cdr/gcdemu/gcdemu-3.2.1.ebuild
+++ b/app-cdr/gcdemu/gcdemu-3.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-cdr/poweriso/Manifest b/app-cdr/poweriso/Manifest
deleted file mode 100644
index 6ffc129df403..000000000000
--- a/app-cdr/poweriso/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST poweriso-1.3.tar.gz 288910 BLAKE2B 17404c5529c0e93f6f1470148ca8b09d1d76ea1ce8ec057efbbc1b95b428e8b46bb252cdb40e83e2358c45eb5f5232ac2c866e90428c4216ae8d36adc86964e7 SHA512 532e17c624bcb289214d8efd9e49bef04ef25d1d54d347dab108b44470e0cbfed6b2ff2357b4375a1edea02eebaecce7634d5f8cfe4c4b650aef0b5da0b5c7c7
-EBUILD poweriso-1.3.ebuild 461 BLAKE2B 689727e15bd0681f0e8aac42ff0ff41e2c4743ca110767e1f045839b4c553cc63460998de4b5d44e6f87a1bcd76001610684dc521ef3a09bfe09cf376b01c0bf SHA512 93a113a9e9e847886b58610f57d363c84b3ae60c24a47ea20144e9a6b6fb34a795746d86be523d7ebda7e80d6d167b429b02164b7d3f4f8c54474cea121410a0
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/poweriso/metadata.xml b/app-cdr/poweriso/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-cdr/poweriso/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-cdr/poweriso/poweriso-1.3.ebuild b/app-cdr/poweriso/poweriso-1.3.ebuild
deleted file mode 100644
index 3fd62f0282d9..000000000000
--- a/app-cdr/poweriso/poweriso-1.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Utility to extract, list and convert PowerISO DAA image files"
-HOMEPAGE="http://www.poweriso.com"
-SRC_URI="http://www.${PN}.com/${P}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-QA_PRESTRIPPED="opt/bin/poweriso"
-
-S=${WORKDIR}
-
-src_install() {
-	into /opt
-	dobin ${PN} || die
-}