gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 20:56:41 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 20:56:41 +0100
commit: d87262dd706fec50cd150aab3e93883b6337466d (patch)
tree: 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-cdr
parent: 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff)
289 files changed, 760 insertions, 6363 deletions
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 99064ed7f2c3..5f4e3b0d6e68 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/b5i2iso-0.2-r1 b/app-cdr/b5i2iso-0.2-r1
new file mode 100644
index 000000000000..dfe68af8448b
--- /dev/null
+++ b/app-cdr/b5i2iso-0.2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Convert CD images from b5i (BlindWrite) to iso
+EAPI=6
+HOMEPAGE=https://web.archive.org/web/20100116120705/b5i2iso.berlios.de
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/b5i2iso.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b2804221fd50de1eb57797d9c6542099
diff --git a/app-cdr/b5i2iso/Manifest b/app-cdr/b5i2iso/Manifest
deleted file mode 100644
index b19c599d69c1..000000000000
--- a/app-cdr/b5i2iso/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX b5i2iso-0.2-segfault.patch 388 BLAKE2B 151e6f41afe5e241be181de2b0ce50a2ee0bff64ab1b04ff99501b2844705a1295cbfea28b85446d2aa899eb6e3a58b9f40e992c336965f8b07749e1698af53c SHA512 133fb1c4da9391e1465f0c820fea2038859c351dbf9b9a8de293294c66857a68f0f544bbca9b8a927a615cc3488a691db6a0bb532bea98362904876634966a5f
-DIST b5i2iso.tar.bz2 7503 BLAKE2B a1ac74596213845c49dd007390445640ebe6226ae6273f4e05d567c58badb2ca2698c06951be7348c63c89920dd8034e376343d387665ae08ee13747efcf903b SHA512 2ec6ce30225370898aee9876937b70ee38ed68b6515bef13eb010f1ef1970894995461d5dc5f44ac24d2e7e682774e4fc3c6d2bdde8f744129a3f6103b50f9e4
-EBUILD b5i2iso-0.2-r1.ebuild 581 BLAKE2B 88f162876dd3af073cd3af7c3a188cf998c3fd3ebac2e36880bd6379d9a6270ceea581d23c9f7bd30e9b83ed4fa62969a8ff408811becb12f0261684750e4496 SHA512 33048970e02ab8bd1d39a6a77be648e7e7e6bf20633b7ea10e5e274ab356dabac1b375a26442f699ca0324957b2dea62df7f013676e1f1470d6b9a12c4c5ca2a
-MISC metadata.xml 168 BLAKE2B 3e5971a4f8eec29fb98ca9e9e3e93e1ffb3ceecbc911e171844dee81b53f757ee37173d79fdeba5ceded1ae70f84cd00da36912efed91d3bbdfd09e339886166 SHA512 a0f46e63b4efc395be44cfec9bafd3f0067a239be0ac79de35b85c6ad14f6bb7dae7c4e82ce8d18fb4c089026426d6554ecbe2c54d4b0f8bdcd77cfee6467ec4
diff --git a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild b/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
deleted file mode 100644
index f45009e3c802..000000000000
--- a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit toolchain-funcs
-
-DESCRIPTION="Convert CD images from b5i (BlindWrite) to iso"
-HOMEPAGE="https://web.archive.org/web/20100116120705/b5i2iso.berlios.de"
-SRC_URI="mirror://gentoo/${PN}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-PATCHES=( "${FILESDIR}/${P}-segfault.patch" )
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/${PN}.c -o ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch b/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch
deleted file mode 100644
index 6fda80e79605..000000000000
--- a/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- b5i2iso/src/b5i2iso.c
-+++ b5i2iso/src/b5i2iso.c
-@@ -1,3 +1,4 @@
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -45,6 +46,10 @@
-    }
- 
- fsource = fopen(argv[1],"rb");
-+if (fsource == NULL) {
-+  printf("can't open %s: %s\n", argv[1], strerror(errno));
-+  exit(EXIT_FAILURE);
-+}
- fdest = fopen(destfilename,"wb");
- 
- fseek(fsource, 2352, SEEK_CUR);
-\ No newline at end of file
diff --git a/app-cdr/b5i2iso/metadata.xml b/app-cdr/b5i2iso/metadata.xml
deleted file mode 100644
index 11f5a93ba0e7..000000000000
--- a/app-cdr/b5i2iso/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/bashburn-3.1.0 b/app-cdr/bashburn-3.1.0
new file mode 100644
index 000000000000..ea939d2d3202
--- /dev/null
+++ b/app-cdr/bashburn-3.1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-shells/bash
+DESCRIPTION=A shell script for burning optical media
+EAPI=4
+HOMEPAGE=http://bashburn.dose.se/
+KEYWORDS=amd64 ppc ~ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=app-shells/bash app-cdr/cdrdao app-cdr/dvd+rw-tools media-libs/flac || ( dev-libs/libcdio-paranoia media-sound/cdparanoia ) media-sound/lame || ( media-sound/mpg123 media-sound/mpg321 ) media-sound/normalize media-sound/vorbis-tools virtual/cdrtools virtual/eject
+SLOT=0
+SRC_URI=http://bashburn.dose.se/index.php?s=file_download&id=25 -> BashBurn-3.1.0.tar.gz
+_md5_=66fa9e9e14c6e1309f4e21bd57a9023d
diff --git a/app-cdr/bashburn/Manifest b/app-cdr/bashburn/Manifest
deleted file mode 100644
index 91e85f80a36f..000000000000
--- a/app-cdr/bashburn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST BashBurn-3.1.0.tar.gz 91295 BLAKE2B 98b813a78029becdd2b2167e9c0d318bb2d8aed6ed5d697047ba81cc4fb87795439c8f4182b53e5db0286a03028b489d0b6e73d5d4032d47eaaf2ea0b88894e9 SHA512 9bded7a67b762be89993a6a7564d6a32f4cac209f9d16a4a861a5a36db92eda6436c2b80b89d57c051bbdafb0549999e54ce6e26477f664481cf60092eef90e5
-EBUILD bashburn-3.1.0.ebuild 1173 BLAKE2B bdf08957f242f1c3a62c6d4ebb399c734eac5199fba164d00d52717a7606d86435375ecc48e8146c30a790dc47c351c7113d87336617ff6abc331e27e1919955 SHA512 5d5bfe920aad12000eea2946c54d1487b1182c65b1fd1e9966750bb60bc108068fceec74578e01a57c1004e098703b4652acf9ab6c1786382aad34fafe5a3183
-MISC metadata.xml 570 BLAKE2B 29e9f0d65fb879b7abee7605a0627de25f37952bf81072fee9e9d4bf2772b82321d4f4750e812983bea4f77d718b908584af76582fbfd4574447e1ce7ead0b2e SHA512 4a4f80ae83dd1cdf986675bfe70800be286e9041933602739a44756d88a12ad129acea090d36d37460eacef32e375efcaa21d074f0e53b30529ee0987fa2d1e4
diff --git a/app-cdr/bashburn/bashburn-3.1.0.ebuild b/app-cdr/bashburn/bashburn-3.1.0.ebuild
deleted file mode 100644
index ad701420c84e..000000000000
--- a/app-cdr/bashburn/bashburn-3.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_P=BashBurn-${PV}
-
-DESCRIPTION="A shell script for burning optical media"
-HOMEPAGE="http://bashburn.dose.se/"
-SRC_URI="http://bashburn.dose.se/index.php?s=file_download&id=25 -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-DEPEND="app-shells/bash"
-RDEPEND="${DEPEND}
-	app-cdr/cdrdao
-	app-cdr/dvd+rw-tools
-	media-libs/flac
-	|| ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
-	media-sound/lame
-	|| ( media-sound/mpg123 media-sound/mpg321 )
-	media-sound/normalize
-	media-sound/vorbis-tools
-	virtual/cdrtools
-	virtual/eject"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Fix for "warning: jobserver unavailable: using -j1."
-	sed -i -e 's:make -C:$(MAKE) -C:' Makefile || die
-}
-
-src_install() {
-	./Install.sh --prefix="${D}"/usr || die
-
-	# Remove /var/tmp/portage from installed script
-	sed -i \
-		-e "/BBROOTDIR=/s:'.*':'/usr/lib/Bashburn/lib':" \
-		"${ED}"/usr/lib/Bashburn/lib/BashBurn.sh || die
-
-	rm -rf "${ED}"/usr/lib/Bashburn/lib/docs
-	dodoc docs/{ChangeLog,CREDITS,FAQ,HOWTO,README,TODO,TRANSLATION_RULE}
-}
diff --git a/app-cdr/bashburn/metadata.xml b/app-cdr/bashburn/metadata.xml
deleted file mode 100644
index e161172ddfdb..000000000000
--- a/app-cdr/bashburn/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		A shell script for burning optical media. Supports data and audio burning,
-		with broad format support including WAV, MP3, Vorbis, and FLAC.
-	</longdescription>
-	<upstream>
-		<maintainer status="inactive">
-			<email>anders.linden@gmail.com</email>
-			<name>Anders Lindén</name>
-		</maintainer>
-		<doc lang="en">http://bashburn.dose.se/index.php?s=docs</doc>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/bchunk-1.2.0-r4 b/app-cdr/bchunk-1.2.0-r4
new file mode 100644
index 000000000000..498acd10e71d
--- /dev/null
+++ b/app-cdr/bchunk-1.2.0-r4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Convert CD images from bin/cue to iso+wav/cdr
+EAPI=6
+HOMEPAGE=http://he.fi/bchunk/
+KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=http://he.fi/bchunk/bchunk-1.2.0.tar.gz
+_md5_=83d23679530fbb74f2f96ae3f4c74d46
diff --git a/app-cdr/bchunk/Manifest b/app-cdr/bchunk/Manifest
deleted file mode 100644
index 7f2c16e31b7c..000000000000
--- a/app-cdr/bchunk/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
-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
deleted file mode 100644
index 846db0b7f490..000000000000
--- a/app-cdr/bchunk/bchunk-1.2.0-r4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Convert CD images from bin/cue to iso+wav/cdr"
-HOMEPAGE="http://he.fi/bchunk/"
-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"
-
-DOCS=( "${P}.lsm" "${PN}.spec" README ChangeLog )
-PATCHES=( "${FILESDIR}/CVE-2017-15953.patch" "${FILESDIR}/CVE-2017-15955.patch" )
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/app-cdr/bchunk/files/CVE-2017-15953.patch b/app-cdr/bchunk/files/CVE-2017-15953.patch
deleted file mode 100644
index f78bb7178af2..000000000000
--- a/app-cdr/bchunk/files/CVE-2017-15953.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/bchunk.c	2017-10-30 18:03:58.658741629 +0000
-+++ b/bchunk.c	2017-10-30 19:40:25.558131619 +0000
-@@ -18,6 +18,7 @@
-   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   */
-
-+#define _GNU_SOURCE
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -271,11 +272,10 @@
- 	int16_t i;
- 	float fl;
- 	
--	if (!(fname = malloc(strlen(bname) + 8))) {
--		fprintf(stderr, "main(): malloc() failed, out of memory\n");
-+	if (asprintf(&fname, "%s%2.2d.%s", bname, track->num, track->extension) == -1) {
-+		fprintf(stderr, "writetrack(): asprintf() failed, out of memory\n");
- 		exit(4);
- 	}
--	sprintf(fname, "%s%2.2d.%s", bname, track->num, track->extension);
- 	
- 	printf("%2d: %s ", track->num, fname);
- 	
-
diff --git a/app-cdr/bchunk/files/CVE-2017-15955.patch b/app-cdr/bchunk/files/CVE-2017-15955.patch
deleted file mode 100644
index 85797fe020af..000000000000
--- a/app-cdr/bchunk/files/CVE-2017-15955.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/bchunk.c	2017-10-30 18:03:58.658741629 +0000
-+++ b/bchunk.c	2017-10-30 19:17:36.732855884 +0000
-@@ -426,11 +426,11 @@
- 			printf("\nTrack ");
- 			if (!(p = strchr(p, ' '))) {
- 				fprintf(stderr, "... ouch, no space after TRACK.\n");
--				continue;
-+				exit(3);
- 			}
- 			p++;
- 			if (!(t = strchr(p, ' '))) {
- 				fprintf(stderr, "... ouch, no space after track number.\n");
--				continue;
-+				exit(3);
- 			}
- 			*t = '\0';
-
-@@ -460,12 +460,12 @@
- 		} else if ((p = strstr(s, "INDEX"))) {
- 			if (!(p = strchr(p, ' '))) {
- 				printf("... ouch, no space after INDEX.\n");
--				continue;
-+				exit(3);
- 			}
- 			p++;
- 			if (!(t = strchr(p, ' '))) {
- 				printf("... ouch, no space after index number.\n");
--				continue;
-+				exit(3);
- 			}
- 			*t = '\0';
- 			t++;
-\ No newline at end of file
diff --git a/app-cdr/bchunk/metadata.xml b/app-cdr/bchunk/metadata.xml
deleted file mode 100644
index 9807a3e2fa77..000000000000
--- a/app-cdr/bchunk/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!--maintainer-needed-->
-<longdescription>binchunker converts a CD image in a ".bin / .cue" format
-(sometimes ".raw / .cue") to a set of .iso and .cdr tracks.</longdescription>
-</pkgmetadata>
diff --git a/app-cdr/bin2iso-19b-r2 b/app-cdr/bin2iso-19b-r2
new file mode 100644
index 000000000000..6b266f6f80fe
--- /dev/null
+++ b/app-cdr/bin2iso-19b-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=converts RAW format (.bin/.cue) files to ISO/WAV format
+EAPI=6
+HOMEPAGE=http://users.andara.com/~doiron/bin2iso/
+KEYWORDS=alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=public-domain
+SLOT=0
+SRC_URI=mirror://gentoo/bin2iso-19b.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=2835708260f64bd999e021e4b31e8ab8
diff --git a/app-cdr/bin2iso/Manifest b/app-cdr/bin2iso/Manifest
deleted file mode 100644
index 524262e88f90..000000000000
--- a/app-cdr/bin2iso/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX bin2iso-19b-sanity-checks.patch 903 BLAKE2B cdd4efb8e631114aa593dbbec3d4f6f0cc88b8c2dee30d138212269d86b55eaaef70d520c91a13bcb408b507a5020c51f1170d4cc5a237a412b3a113ad1e534e SHA512 cbeaf8e620bc54e531293cee179b94c63cb6e8925ac579d65d0f700013235d9da683af8f367f1687828d23c3aa6f6bd20196e2d4201593048ae0152baf7e26a3
-DIST bin2iso-19b.tar.bz2 9805 BLAKE2B 0800f00d4c67481e1fa4c681450ac4f7c5110aadb1f06e70219ac980590af6e37407c75c9e41d3189726922157af843d951461f19915e66da3a30eb2645d7379 SHA512 1f2dbde824ee32eb3be878bf1b96167d753a3f40eb0baf59f3c72907dcc6ce4c999c04d008efde5269dec306b6eab3dd2b15a18a81388c105545abd04e1769c5
-EBUILD bin2iso-19b-r2.ebuild 655 BLAKE2B 9a8eb4c7cba476324bfe564988d43c869277285d98f5f8c826b61d1aa7183cc443a5acec2bc13d2d2de807c2875368e82b71f454019fcacc8805bfedcdcc1063 SHA512 8f6c51bd162836ec0e7ddc482ef4908ccab8ce4887adf03284ea1c004dc5228c11db0d7c02153ef7aeaf96a38c8fad1a3ab388f2c83966ef2a0fad9a86f4d963
-MISC metadata.xml 294 BLAKE2B 0b315a1e4e53307837d80443e3fffa228f54ffcfc5dfbb1acc8d7a011f4c75b5e49bc638376724f21b242d4cff8030edb0c0c5f9131aad3d7b2b25e76c9fc5ba SHA512 b6fdc3ce5da8e1fdf502c3542820e10a75d054661376f8c75498e5b77f3f2f7ae1f939798661ec4235239ea261a4c9aaa1aa2a03beb6a496bc373ce794e766f5
diff --git a/app-cdr/bin2iso/bin2iso-19b-r2.ebuild b/app-cdr/bin2iso/bin2iso-19b-r2.ebuild
deleted file mode 100644
index 7d565d3a1013..000000000000
--- a/app-cdr/bin2iso/bin2iso-19b-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="converts RAW format (.bin/.cue) files to ISO/WAV format"
-HOMEPAGE="http://users.andara.com/~doiron/bin2iso/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}"/${P}-sanity-checks.patch )
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} bin2iso19b_linux.c -o ${PN} || die "compile failed"
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc readme.txt
-}
diff --git a/app-cdr/bin2iso/files/bin2iso-19b-sanity-checks.patch b/app-cdr/bin2iso/files/bin2iso-19b-sanity-checks.patch
deleted file mode 100644
index 43e3f4aae3b4..000000000000
--- a/app-cdr/bin2iso/files/bin2iso-19b-sanity-checks.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Add more checks to prevent segfaults in ill-formatted files
-
-http://bugs.gentoo.org/show_bug.cgi?id=90540
-
---- a/bin2iso19b_linux.c
-+++ b/bin2iso19b_linux.c
-@@ -237,6 +237,10 @@
-    // Get the 'mode'
-    if (strncmp(&Line[2], "TRACK ", 6)==0) 
-    {
-+      if (Line[8] < '0' || Line[8] > '9' || Line[9] < '0' || Line[9] > '9') {
-+        printf("Error: Track # is not a 2 digit number\n");
-+        exit(1);
-+      }
-       strncpy(track->num, &Line[8], 2); track->num[2] = '\0';
- 
-       track->mode = UNKNOWN;
-@@ -246,7 +250,11 @@
-       if(strncmp(&Line[11], "MODE2/2352", 10)==0) track->mode = MODE2_2352;
-       if(strncmp(&Line[11], "MODE2/2336", 10)==0) track->mode = MODE2_2336;
-    }
--   else return(1);
-+   else
-+   {
-+      printf("Error: 2nd line does not begin with '  TRACK '\n");
-+      exit(1);
-+   }
-    
-    // Set the name
-    strcpy(track->name, sBinFilename);
diff --git a/app-cdr/bin2iso/metadata.xml b/app-cdr/bin2iso/metadata.xml
deleted file mode 100644
index 4803f9252554..000000000000
--- a/app-cdr/bin2iso/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-Converts RAW format (.bin) files to ISO/WAV format and recovers .cue 
-files from .bin ones
-</longdescription>
-</pkgmetadata>
diff --git a/app-cdr/brasero-3.12.2-r1 b/app-cdr/brasero-3.12.2-r1
new file mode 100644
index 000000000000..c5b7f5fc3ec5
--- /dev/null
+++ b/app-cdr/brasero-3.12.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-1:0= ) >=dev-util/intltool-0.50 dev-util/itstool >=dev-util/gtk-doc-am-1.12 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.3 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=CD/DVD burning application for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Brasero
+IUSE=+css +introspection +libburn mp3 nautilus packagekit playlist test tracker
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+ CC-BY-SA-3.0
+PDEPEND=gnome-base/gvfs
+RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3:3[introspection?] media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1:= media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-1.30:= ) libburn? ( >=dev-libs/libburn-0.4:= >=dev-libs/libisofs-0.6.4:= ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) tracker? ( >=app-misc/tracker-1:0= ) media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-meta:1.0[mp3?] x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/dvd+rw-tools virtual/cdrtools ) packagekit? ( app-admin/packagekit-base )
+SLOT=0/3.1
+SRC_URI=mirror://gnome/sources/brasero/3.12/brasero-3.12.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac72dc2cbe2270ecf0b6753950ca862c
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
deleted file mode 100644
index a4cad08c5d58..000000000000
--- a/app-cdr/brasero/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST brasero-3.12.2.tar.xz 3742120 BLAKE2B 42cc60d3f4e26e948321c34f2514172aeac5a1b2624e6b23f27cc9725efd5cf0844a54175161b4c94601bbd5c4a6f18ccdd62353e862eddaab17e0d164f4694c SHA512 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f
-EBUILD brasero-3.12.2-r1.ebuild 1941 BLAKE2B b1f42dfcba6bf95f087e33547098d17fd41a7f6b32fa52832fe31f977fe8eb299fd7f039eb8eefc33799ebba1f591a106f5016f930d5d2ac28e36537f900e514 SHA512 7cc760921823d55eeb3701709d599f5ac0f1231bef71872b151c1c5b6b75f0188d191d6d76f3643bcb5b146b238c5fb8f3e971c59e12cd4597275bf47bd0bca6
-MISC metadata.xml 767 BLAKE2B 731778f406b9adbdf563315ce4e978a567f7c762b2a1659df6ead92cb610fdaf9dffb220ea54988bed0970b9b3cf0330afb390c802627930bbb450e11f8d7db6 SHA512 d5eff95f93edce1d592b2d8b383e04d0f96c92374d8077709d4e8404060e9eefcba9dc16f741651ebb5323f7692b07462ded60c7e6f638be3334fa04740da381
diff --git a/app-cdr/brasero/brasero-3.12.2-r1.ebuild b/app-cdr/brasero/brasero-3.12.2-r1.ebuild
deleted file mode 100644
index 76fc53b6fbc7..000000000000
--- a/app-cdr/brasero/brasero-3.12.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="CD/DVD burning application for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
-IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.29.14:2
-	>=x11-libs/gtk+-3:3[introspection?]
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/libnotify-0.6.1:=
-
-	media-libs/libcanberra[gtk3]
-	x11-libs/libICE
-	x11-libs/libSM
-
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-	libburn? (
-		>=dev-libs/libburn-0.4:=
-		>=dev-libs/libisofs-0.6.4:= )
-	nautilus? ( >=gnome-base/nautilus-2.91.90 )
-	playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
-	tracker? ( >=app-misc/tracker-1:0= )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-plugins/gst-plugins-meta:1.0[mp3?]
-	x11-themes/hicolor-icon-theme
-	css? ( media-libs/libdvdcss:1.2 )
-	!libburn? (
-		app-cdr/cdrdao
-		app-cdr/dvd+rw-tools
-		virtual/cdrtools )
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	>=dev-util/gtk-doc-am-1.12
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.3 )
-"
-# eautoreconf deps
-#	app-text/yelp-tools
-#	gnome-base/gnome-common
-
-PDEPEND="gnome-base/gvfs"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-caches \
-		$(use_enable !libburn cdrtools) \
-		$(use_enable !libburn cdrkit) \
-		$(use_enable !libburn cdrdao) \
-		$(use_enable !libburn growisofs) \
-		$(use_enable introspection) \
-		$(use_enable libburn libburnia) \
-		$(use_enable nautilus) \
-		$(use_enable playlist) \
-		$(use_enable tracker search)
-}
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
deleted file mode 100644
index af93b7c17c26..000000000000
--- a/app-cdr/brasero/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="packagekit">Enable support for the distro-neutral package
-			manager GUI <pkg>app-admin/packagekit</pkg></flag>
-		<flag name="nautilus">Build the <pkg>gnome-base/nautilus</pkg>
-			extension</flag>
-		<flag name="libburn">Enable <pkg>dev-libs/libburn</pkg> backend</flag>
-		<flag name="playlist">Enable support for playlists through
-			<pkg>dev-libs/totem-pl-parser</pkg></flag>
-		<flag name="tracker">Enable audio playlist search using the
-			<pkg>app-misc/tracker</pkg> indexer</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-cdr/burn-cd-1.8.0-r1 b/app-cdr/burn-cd-1.8.0-r1
new file mode 100644
index 000000000000..07621b8651ea
--- /dev/null
+++ b/app-cdr/burn-cd-1.8.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=Smart console frontend for virtual/cdrtools and dvd+rw-tools
+EAPI=5
+HOMEPAGE=http://burn-cd.sourceforge.net
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/cdrtools app-cdr/dvd+rw-tools
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/burn-cd/burn-cd-1.8.0.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=df67b8740a4ebfa50a60affdfc896087
diff --git a/app-cdr/burn-cd-1.8.1 b/app-cdr/burn-cd-1.8.1
new file mode 100644
index 000000000000..129106365d70
--- /dev/null
+++ b/app-cdr/burn-cd-1.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Smart console frontend for the cdrkit/cdrtools & dvd+rw-tools
+EAPI=6
+HOMEPAGE=https://github.com/aglyzov/burn-cd/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/cdrtools app-cdr/dvd+rw-tools
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/aglyzov/burn-cd/archive/1.8.1.tar.gz -> burn-cd-1.8.1.tar.gz
+_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=3b7a24800cb2ea2273732bc8c4bccdeb
diff --git a/app-cdr/burn-cd/Manifest b/app-cdr/burn-cd/Manifest
deleted file mode 100644
index ec2d80287b45..000000000000
--- a/app-cdr/burn-cd/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST burn-cd-1.8.0.gz 14977 BLAKE2B 3cc72d908f86affd8c6fef1144ece00ea00ef4cf63858c5a3a01ff83640bd9b513feddf590c774538de6621611bfc842077ef60f28bde6db906aefd0eaa46ccb SHA512 d052d6bd909af3f3c96cee727e222e179d913aa42c2d2afe8104c57b5263b06f318d6ec870ad2862779d757c4d522b7d82892eb0725255261a28243c919b82cf
-DIST burn-cd-1.8.1.tar.gz 153586 BLAKE2B 7762bfe7bb497752c0f78ddc2dba2a00423db2e3ef3dcd02ecb36a60eb6a4ecab69d04bc85971531443b8820cb8320e22349817540d95c694b9861261e6e821f SHA512 2da40c703351e97d164eeef7c5662cad66292b71a97f47ae4ddcbcf11a09fb298c6c9e8160da53b0908434e64048c2397beaa988b1cbc1513660f73d8f2fe1fe
-EBUILD burn-cd-1.8.0-r1.ebuild 581 BLAKE2B eb577476b615782cd97e9ac12cb412d0e38c6469c28d0b2b1b31ab487422716d6160a340afe9faa900adaa64a0629631650b9d2754f58a2d09829d76d3ddaa2d SHA512 316c9c623639f89c7a0cf59ef9bd31acd48f0d2c1bb63356e44137a4271263088031854b6b7bd735a74087da6c952c6641365688d3a8dfa8b53cc6c9e5068d90
-EBUILD burn-cd-1.8.1.ebuild 625 BLAKE2B 9c94dd42b9cc8e076665a6309a4fa297b7b37b588607185bd55bb6d9afea3998a8b83f2ef420802af9c1db4abfafeb715bec69398005c9439dab0331d093cbba SHA512 ea01a64d3859c2a707ea6c84e580a73ac09bbbb924c41ecea644facb289fe56a2e244013de05853b894d38b1ffbbff0aff2eca35f99e49dd3b0e71269c4067ab
-MISC metadata.xml 591 BLAKE2B 9b54a0ade9fd72fbee30ea4250fb72588580d5515efcba62862b1096b3fe98cbdbb3eec58ac245b92e798b12b22e265d9ffea34fb35562f6bdd576e2a902b654 SHA512 faa26f95c90f49757434682dbe3a309123a67e3bb95b11408a99849dd7935ed0037d5c6de022ede67fa2056cde3ead181c3d6797864f6842a4bb8c980b631eae
diff --git a/app-cdr/burn-cd/burn-cd-1.8.0-r1.ebuild b/app-cdr/burn-cd/burn-cd-1.8.0-r1.ebuild
deleted file mode 100644
index 2a72ea5bedb0..000000000000
--- a/app-cdr/burn-cd/burn-cd-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Smart console frontend for virtual/cdrtools and dvd+rw-tools"
-HOMEPAGE="http://burn-cd.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	virtual/cdrtools
-	app-cdr/dvd+rw-tools"
-DEPEND=""
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}
-
-src_install() {
-	python_fix_shebang ${P}
-	newbin ${P} ${PN}
-}
diff --git a/app-cdr/burn-cd/burn-cd-1.8.1.ebuild b/app-cdr/burn-cd/burn-cd-1.8.1.ebuild
deleted file mode 100644
index 9ae863226c5c..000000000000
--- a/app-cdr/burn-cd/burn-cd-1.8.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-r1
-
-DESCRIPTION="Smart console frontend for the cdrkit/cdrtools & dvd+rw-tools"
-HOMEPAGE="https://github.com/aglyzov/burn-cd/"
-SRC_URI="https://github.com/aglyzov/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	virtual/cdrtools
-	app-cdr/dvd+rw-tools"
-
-src_install() {
-	newbin ${P} ${PN}
-	insinto /etc
-	newins dotburn-cd.conf burn-cd.conf
-}
diff --git a/app-cdr/burn-cd/metadata.xml b/app-cdr/burn-cd/metadata.xml
deleted file mode 100644
index d1c04c8d0488..000000000000
--- a/app-cdr/burn-cd/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>canutethegreat@gmail.com</email>
-		<name>Ronald Farrer</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
-	<upstream>
-		<remote-id type="github">aglyzov/burn-cd</remote-id>
-		<remote-id type="sourceforge">burn-cd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/burncdda-1.8.3 b/app-cdr/burncdda-1.8.3
new file mode 100644
index 000000000000..4aebe1f636b2
--- /dev/null
+++ b/app-cdr/burncdda-1.8.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Console app for copying burning audio cds
+EAPI=6
+HOMEPAGE=http://burncdda.sourceforge.net/
+IUSE=flac mp3 vorbis
+KEYWORDS=amd64 ppc ~sparc x86
+LICENSE=GPL-2
+RDEPEND=app-cdr/cdrdao dev-util/dialog media-sound/normalize media-sound/sox virtual/cdrtools flac? ( media-libs/flac ) mp3? ( media-sound/mpg123 media-sound/mp3_check ) vorbis? ( media-sound/vorbis-tools )
+SLOT=0
+SRC_URI=mirror://sourceforge/burncdda/burncdda-1.8.3.tar.gz
+_md5_=adaf55034dc0352c06983bdc1a076b59
diff --git a/app-cdr/burncdda/Manifest b/app-cdr/burncdda/Manifest
deleted file mode 100644
index 98abe94e0f5e..000000000000
--- a/app-cdr/burncdda/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST burncdda-1.8.3.tar.gz 23710 BLAKE2B 60e70eaa31d2c2eee2a3e3a874f28dde1fc1c4d221b9eb14119666f505f94275c78f4aa87b823ee7c926bb657492a0cbc9830635d2a3d781b9853ec8866c5caa SHA512 b0ddf9457ca9a1b8ad07b43aba4b5c6532ef09aae85b363802084bcf7bbb4d4bfadf980af98862dfbdd72e257d287f1e517323ebec7432be3514880e393e9f1d
-EBUILD burncdda-1.8.3.ebuild 713 BLAKE2B e420f819d332959355b55b3723c49bcab504c88fa923ef378fb8bca1f0d0642c31af6868d21fb04214e7965504175fca919d0dd7a36221c5163362075ea48074 SHA512 8f62740382d174173d5f31e048e3831a287d65a0025ccdbb4d4b546d84cf6872a2a4bde2f2322febe1349b8b669c01f8f9ed7ee54401b236f48132031b548a70
-MISC metadata.xml 527 BLAKE2B 9051fc1e5e9905f5e86eb2b8cc3cbfaeb1caa5e25ac730a45f63c99c7acdec20e49f004d3248efb7bbee886758b9ec350ffffc6c979c172cdb6898eebbb27da0 SHA512 7b37753fad3ed11f3afa59b31d51ae2a90336ebb16f22b20a8c1cbed06c4f430126708eb5ff63724204b6cb10489c966cae3d3cb6703b2d440c52c98ce987352
diff --git a/app-cdr/burncdda/burncdda-1.8.3.ebuild b/app-cdr/burncdda/burncdda-1.8.3.ebuild
deleted file mode 100644
index 0d02e2c31549..000000000000
--- a/app-cdr/burncdda/burncdda-1.8.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Console app for copying burning audio cds"
-HOMEPAGE="http://burncdda.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="flac mp3 vorbis"
-
-RDEPEND="
-	app-cdr/cdrdao
-	dev-util/dialog
-	media-sound/normalize
-	media-sound/sox
-	virtual/cdrtools
-	flac? ( media-libs/flac )
-	mp3? (
-		media-sound/mpg123
-		media-sound/mp3_check
-	)
-	vorbis? ( media-sound/vorbis-tools )
-"
-
-src_install() {
-	dobin ${PN}
-
-	insinto /usr/share/${PN}
-	doins *.func
-
-	insinto /etc
-	doins ${PN}.conf
-
-	dodoc ChangeLog
-	doman burncdda.1
-}
diff --git a/app-cdr/burncdda/metadata.xml b/app-cdr/burncdda/metadata.xml
deleted file mode 100644
index a6a5608a3f0e..000000000000
--- a/app-cdr/burncdda/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-	burnCDDA is a console frontend to cdrdao, cdrecord, mpg123, oggdec, mppdec,
-	flac, normalize, and mp3_check. It can be used to create audio CDs from an
-	M3U playlist (the playlist format of XMMS and amaroK). It supports MP3, OGG
-	Vorbis, Musepack, FLAC, and WAV files, and it might be the easiest way to
-	copy an audio CD.
-</longdescription>
-</pkgmetadata>
diff --git a/app-cdr/ccd2iso-0.3 b/app-cdr/ccd2iso-0.3
new file mode 100644
index 000000000000..cc52392d6ca6
--- /dev/null
+++ b/app-cdr/ccd2iso-0.3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Convert CD images from ccd (CloneCD) to iso
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/ccd2iso/
+KEYWORDS=amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://sourceforge/ccd2iso/ccd2iso-0.3.tar.gz
+_md5_=8fa0a89252d551217abdea957a41b263
diff --git a/app-cdr/ccd2iso/Manifest b/app-cdr/ccd2iso/Manifest
deleted file mode 100644
index 559ab7130e16..000000000000
--- a/app-cdr/ccd2iso/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ccd2iso-0.3-headers.patch 240 BLAKE2B 536e0114f0485ae4e79f8801f737c380cafdc37c6d2dc1f272415385324839cfddd56af7f07085bfb181ae1a1e05531ecc6869b6f66b35dd89c8c9d50a1ead1e SHA512 e0d334fb378d5ad0dc25653ab810d3c55a0f8c19a03b4b2180352a20e2b9e405209b37448f57a72fd7c2628601e6f5528118db3fe9e431d580c7d9443bb440a3
-DIST ccd2iso-0.3.tar.gz 158221 BLAKE2B 5cb83f62f6b98e725c5c30e58e9082fd6eff612169d3b8fe0d244bd567f7319879c99792400f788b736874f5ae026ed53154b8e5599f82fbfea879e634f8f155 SHA512 40e0e5bd792c851dd0549a08a3a0d7226cc05893316dc9575d4c9131dce758d992081355de569e3e66dca310545bf3a17c1cd6431ab97e790fdbe5b19c09adc1
-EBUILD ccd2iso-0.3.ebuild 552 BLAKE2B acfd988539d01d0a97a2871a61a421cf8f732e051bd287d3413cf886b872aab5678620a6b6a9ba389c4d4828bcae80b5fe9560a256f0633d44320032f4da5c7b SHA512 933868f8f4c257195b488eb774d9d2d805345538da81bf1e65bb230eb3a8f577f2d68a58fbcc78bf24df0da9c0a85b2edbbc1108dc04ccabadf85c0e1cb1ee40
-MISC metadata.xml 241 BLAKE2B f90be0c12adaf844accdc218553814e3e325c943055dcfb4f4b6041909ff8fb99a1f7bdd8f948f721f7face33363d917874a0d8f82355d1271fe3b2ff6c0b94b SHA512 2a6542d23b7ab38216d47177060122b4850c76f519984c2f65f9db8d06bc19b0261db695002209efedf047cc693b59bd3387ad5e88c214f6a34ed73339e4615f
diff --git a/app-cdr/ccd2iso/ccd2iso-0.3.ebuild b/app-cdr/ccd2iso/ccd2iso-0.3.ebuild
deleted file mode 100644
index 5de8728f6ab2..000000000000
--- a/app-cdr/ccd2iso/ccd2iso-0.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Convert CD images from ccd (CloneCD) to iso"
-HOMEPAGE="https://sourceforge.net/projects/ccd2iso/"
-SRC_URI="mirror://sourceforge/ccd2iso/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-PATCHES=( "${FILESDIR}/${P}-headers.patch" )
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/app-cdr/ccd2iso/files/ccd2iso-0.3-headers.patch b/app-cdr/ccd2iso/files/ccd2iso-0.3-headers.patch
deleted file mode 100644
index de193eaf438c..000000000000
--- a/app-cdr/ccd2iso/files/ccd2iso-0.3-headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ccd2iso-0.3/src/ccd2iso.c	2007-04-01 03:00:14.000000000 -0400
-+++ ccd2iso-0.3/src/ccd2iso.c	2007-04-01 03:00:57.000000000 -0400
-@@ -27,6 +27,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "clonecd.h"
- 
diff --git a/app-cdr/ccd2iso/metadata.xml b/app-cdr/ccd2iso/metadata.xml
deleted file mode 100644
index 4847a8764d48..000000000000
--- a/app-cdr/ccd2iso/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!--maintainer-needed-->
-<upstream>
-    <remote-id type="sourceforge">ccd2iso</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/app-cdr/cdck-0.7.0-r2 b/app-cdr/cdck-0.7.0-r2
new file mode 100644
index 000000000000..2467a7199208
--- /dev/null
+++ b/app-cdr/cdck-0.7.0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Measure the read time per sector on CD or DVD to check the quality
+EAPI=6
+HOMEPAGE=http://swaj.net/unix/index.html#cdck
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://swaj.net/unix/cdck/cdck-0.7.0.tar.gz
+_md5_=03f911e0f842cc160c020621de27cd78
diff --git a/app-cdr/cdck/Manifest b/app-cdr/cdck/Manifest
deleted file mode 100644
index 274baa551a74..000000000000
--- a/app-cdr/cdck/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cdck-0.7.0.tar.gz 240285 BLAKE2B 78b0d4949dd39b12ba6813586d956c3f11cd4119b196edbbfcd09487b360ebc3968c7f9f946945e3fbf1e2c4a8c033ed672ff7d84c876a10d73dfd3c1058aaa7 SHA512 aa53a2270fdf4f7d9b61bfe5b4a876ea63baad18b7cc7c920049b446f5518aee3c8389a9c5990bd96ce7e641222d39a70da86e2c6235bb68f054c576ddbc3730
-EBUILD cdck-0.7.0-r2.ebuild 573 BLAKE2B 16c9cf91a369505f03ccc3ee05106897b2721542e61809ff6cced4eab172ff3fa205b5fef49d289b71b4448a2f3407743da4a24319f4f4c9ec9def5934fe5590 SHA512 b67407f2d071995d5c0fd60afbf1623c19e3c7c2ee83ad485925d49ed6046a03ddbc53b6e864a20fcf7056e18ed05a9c43ed03fc0f25d12678dabfc39babcbe7
-MISC metadata.xml 687 BLAKE2B 1ff9c77433be3eb136ee02a64665737b032a399a406bd7b4d0d989259419b38ecd822214ede469a014f88dcbe1a4861affaa431763f21bdefd329dec9eddc71f SHA512 4288b3a7dd3b397f350445f6f83a51908d5bff8f29c2ed7ce15dabe3dbc601e7b11162ed97bd4f499ef6fb4f0b9e4c9e989cc98a6aad7c230e2eb2726fc6497d
diff --git a/app-cdr/cdck/cdck-0.7.0-r2.ebuild b/app-cdr/cdck/cdck-0.7.0-r2.ebuild
deleted file mode 100644
index ef491d866157..000000000000
--- a/app-cdr/cdck/cdck-0.7.0-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Measure the read time per sector on CD or DVD to check the quality"
-HOMEPAGE="http://swaj.net/unix/index.html#cdck"
-SRC_URI="http://swaj.net/unix/cdck/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	default
-
-	sed -e '1d' -i man/cdck_man.in || die "sed failed"
-}
-
-src_configure() {
-	econf --disable-dependency-tracking \
-		--disable-shared
-}
-
-src_install() {
-	default
-
-	dobin src/cdck
-	doman man/cdck.1
-}
diff --git a/app-cdr/cdck/metadata.xml b/app-cdr/cdck/metadata.xml
deleted file mode 100644
index e09e5268ee34..000000000000
--- a/app-cdr/cdck/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-    Actually cdck is a simple program to verify CD/DVD quality. The known
-    fact is that even if all files on the disc are readable, some sectors
-    having bad timing can easily turn into unreadable ones in the future.
-
-    To get an idea about disc cdck reads it sector by sector, keeping all
-    reading timings and then tells you its verdict. Optionally it can write
-    timing table into text file usable by gnuplot(1) program, so you can draw
-    some graphs out of it.
-  </longdescription>
-</pkgmetadata>
diff --git a/app-cdr/cdcover-0.7.4-r1 b/app-cdr/cdcover-0.7.4-r1
new file mode 100644
index 000000000000..aef306b8e7d5
--- /dev/null
+++ b/app-cdr/cdcover-0.7.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup
+DESCRIPTION=cdcover allows the creation of inlay-sheets for jewel cd-cases
+EAPI=5
+HOMEPAGE=http://cdcover.sourceforge.net
+IUSE=cddb python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] cddb? ( dev-python/cddb-py[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) media-sound/cd-discid
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/cdcover/cdcover-0.7.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e0d96105c6cde94edefec67ff66f12d1
diff --git a/app-cdr/cdcover/Manifest b/app-cdr/cdcover/Manifest
deleted file mode 100644
index 2a0995bdcb96..000000000000
--- a/app-cdr/cdcover/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cdcover-0.7.4-Makefile.patch 480 BLAKE2B 42eda735fd5a49565dc30625ff4f25154e8060ef81996352dbc83975b3a5fb003e523162ccdb51baff0566249767a5f1754dffb97733fda89192df9a84bb8036 SHA512 eac8ee9fdd649c2f42a20ce8a695c0849d82a8cbfefb85646503d76f2d3f64f7cb17d63fc5924f0a83644d6b9aefa4e5d9d7c3d2c7e69e5572bb5d17ba05ebc3
-DIST cdcover-0.7.4.tar.gz 908267 BLAKE2B dc048bf756e8e9a55f477462a81975ace669c2ecd8d062b5880dce60b286f98d5a5b573704ef4323093e92d3802dc9087114b333462bd5d0979720b207b7d7fd SHA512 5da176559595608ac6565d23a390364b0fff332084206e819f91d22baee86a752677424fdf90e6a6ecf85fa30eab00edc89fb419f3ae82e0fcce0e714dbb1985
-EBUILD cdcover-0.7.4-r1.ebuild 945 BLAKE2B afbf39c56265eb3320c20735c08ddb1dffb6c07da119688fe3da77bf2b3c4bc69548325d3b4bb21d7fe6dccba438ca01c64b8eb3fcb76268dc7c761556a60a5e SHA512 29cc350d80fef09165fcecff962030529f3ec84ae82f0fe106f22c1fc303f7a17fcc5f2fb6c6520bd398369fda0703a339f142fa85a6ca974d39005a1d9d2fde
-MISC metadata.xml 244 BLAKE2B 469a05b81bd052f22d5c6cc5aa3683afb144abcb85b7794f077bdb3ef1073dc8295f1a48893f4faa97e51d4763dad89aa7240858b317ff8fe8341f85a059c56d SHA512 a04597cdb8b76cb0476450e0ccab923b3e84d9bc6eed456ab0a80a535a45063318f5d38a3cf943ae3ab0f4d1e803f0eb80e12439ab06068cd771768b1a7e338f
diff --git a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild b/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
deleted file mode 100644
index c96bc8227041..000000000000
--- a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE=tk
-
-inherit eutils python-single-r1
-
-DESCRIPTION="cdcover allows the creation of inlay-sheets for jewel cd-cases"
-HOMEPAGE="http://cdcover.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cddb"
-
-RDEPEND="${PYTHON_DEPS}
-	cddb? ( dev-python/cddb-py[${PYTHON_USEDEP}] )
-	media-sound/cd-discid"
-DEPEND=""
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	sed -i -e 's:ggv:gv:' dotcdcover.{example,m4} || die
-}
-
-src_compile() {
-	emake prefix="${D}"/usr target=/usr || die
-}
-
-src_install() {
-	emake prefix="${D}"/usr docdir="${D}"/usr/share/doc/${PF} install || die
-
-	python_fix_shebang "${D}"
-
-	make_desktop_entry ${PN} ${PN}
-
-	dodoc doc/cdcover.pdf
-}
diff --git a/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch b/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch
deleted file mode 100644
index c1026bf23503..000000000000
--- a/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -9,8 +9,8 @@
- IMAGES=./share/images
- TEMPLATES=./share/templates
- 
--DOCFILES=BUGS COPYING INSTALL README VERSION
--IMAGEFILES=autonum.gif cddb.gif exit.gif gv.gif logo.gif nocddb.gif ps.gif
-+DOCFILES=README VERSION
-+IMAGEFILES=application-exit.gif cddb.gif document-print-preview.gif document-save.gif logo.gif nocddb.gif renumber.gif
- TEMPLATEFILES=CD-Classic.pst CD-Modern.pst CD-Tracktime.pst CD-TwoColumns.pst DVD-Classic.pst
- 
- INSTALL=install -D
diff --git a/app-cdr/cdcover/metadata.xml b/app-cdr/cdcover/metadata.xml
deleted file mode 100644
index 88453e2e2dde..000000000000
--- a/app-cdr/cdcover/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">cdcover</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/cddetect-2.1 b/app-cdr/cddetect-2.1
new file mode 100644
index 000000000000..3d1ecbb77e46
--- /dev/null
+++ b/app-cdr/cddetect-2.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A tool for detecting the type of a CD/DVD without mounting it
+EAPI=4
+HOMEPAGE=http://www.bellut.net/projects.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.bellut.net/files/cddetect-2.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a3093ba470a5ff6689452febb24f2f33
diff --git a/app-cdr/cddetect/Manifest b/app-cdr/cddetect/Manifest
deleted file mode 100644
index 14ea25c51f68..000000000000
--- a/app-cdr/cddetect/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cddetect-2.1.tar.gz 11779 BLAKE2B 2e71d923a37d8c1248e4fd0f33349bbec767ef39c31153de3615a5b19f071812e1064b49df5de8d380d2ef7d63adc3dc059bbf37bc9caa3421f70e42fee7f40b SHA512 1a67a17f1d26db8361fd72201afa108571fe8639d34e0bea6fd47a26ea6dfa9ff535c56fd14739d9ee551efdcf74c261e6e4b208e769d066926ee96c400ed54c
-EBUILD cddetect-2.1.ebuild 561 BLAKE2B 9b464650ef4edf613180d807647e340980178d6b1015ad9db40d58a38ced3983c14270ae7041d48cf2db45aa0655657fc0e523d1c1c8f6955d098e1e877e3305 SHA512 98d96929cbf4397d7ed61213feea1cf0e5cdfbcddb51c108879dd588daae48a5a453d9d66fb005dcb3548bde68554297fa37b3b89bd89c9bce52ac34323ceb1d
-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
deleted file mode 100644
index 5de6bf19692a..000000000000
--- a/app-cdr/cddetect/cddetect-2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="A 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
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="-Wall ${CFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-cdr/cddetect/metadata.xml b/app-cdr/cddetect/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-cdr/cddetect/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/cdemu-3.1.0 b/app-cdr/cdemu-3.1.0
new file mode 100644
index 000000000000..d04ae9d0f2c2
--- /dev/null
+++ b/app-cdr/cdemu-3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 ) dev-util/desktop-file-utils >=dev-util/intltool-0.21 >=sys-devel/gettext-0.18 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Command-line tool for controlling cdemu-daemon
+EAPI=6
+HOMEPAGE=http://cdemu.org
+IUSE=+cdemu-daemon python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 ~hppa x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://sourceforge/cdemu/cdemu-client-3.1.0.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e558c26ad9b14ef75a503ecda08c39b1
diff --git a/app-cdr/cdemu-3.2.0 b/app-cdr/cdemu-3.2.0
new file mode 100644
index 000000000000..33d5e7240d8e
--- /dev/null
+++ b/app-cdr/cdemu-3.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-util/desktop-file-utils >=dev-util/intltool-0.21 >=sys-devel/gettext-0.18 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Command-line tool for controlling cdemu-daemon
+EAPI=6
+HOMEPAGE=http://cdemu.org
+IUSE=+cdemu-daemon python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://sourceforge/cdemu/cdemu-client-3.2.0.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=510a90f34d551cad1ea0b548783f9af7
diff --git a/app-cdr/cdemu-daemon-3.1.0 b/app-cdr/cdemu-daemon-3.1.0
new file mode 100644
index 000000000000..e00160b299a0
--- /dev/null
+++ b/app-cdr/cdemu-daemon-3.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libmirage-3.1.0:= >=media-libs/libao-0.8.0:= sys-apps/dbus >=sys-fs/vhba-20130607 dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Daemon of the CDEmu optical media image mounting suite
+EAPI=6
+HOMEPAGE=http://cdemu.org
+KEYWORDS=amd64 ~hppa x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libmirage-3.1.0:= >=media-libs/libao-0.8.0:= sys-apps/dbus >=sys-fs/vhba-20130607
+SLOT=0/7
+SRC_URI=mirror://sourceforge/cdemu/cdemu-daemon-3.1.0.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=24fed8bf8b9bdb9cb3a12fddcc396b04
diff --git a/app-cdr/cdemu-daemon-3.2.1 b/app-cdr/cdemu-daemon-3.2.1
new file mode 100644
index 000000000000..757d11f61b92
--- /dev/null
+++ b/app-cdr/cdemu-daemon-3.2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libmirage-3.2.0:= >=media-libs/libao-0.8.0:= dev-util/intltool sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Daemon of the CDEmu optical media image mounting suite
+EAPI=6
+HOMEPAGE=http://cdemu.org
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/libmirage-3.2.0:= >=media-libs/libao-0.8.0:= sys-apps/dbus >=sys-fs/vhba-20130607
+SLOT=0/7
+SRC_URI=mirror://sourceforge/cdemu/cdemu-daemon-3.2.1.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9baca103171e8e20348cc169705a33ca
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
deleted file mode 100644
index 39ab7e16b4ae..000000000000
--- a/app-cdr/cdemu-daemon/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cdemu-daemon-3.1.0.tar.bz2 79943 BLAKE2B 23407c3a14b426fa9f53c2d62564e34a8f878598c24cdd9419c811786d858135a0af3a1cde8b7afc4178f7772336ed533077c089c976e98de30c932deca1c426 SHA512 f0f3de31b2bf6a97852bb1bc45d301e6cbf401ca7499f42e99811ca62431e86b344c83ddb4420571f2038e43432711e04817b9ed3859893eec7d36fbad8dfdb5
-DIST cdemu-daemon-3.2.1.tar.bz2 82426 BLAKE2B 282b1a62ca3a770e709ff31ee7b72ed9f5e102c5f318a765a99421c93881e9ecacfdc5867af494e69dddda40603c8eb6cc8904a7c82fec004a6d5644a28a9f87 SHA512 399dbb818de8a550bd31784a5a7f0adb9d2e35d922ba71f341df81d20fd7e5ebaba5f31db1554caca17919325773f9ec6bb3d5ae99afa5d6eaf5b22142e010ee
-EBUILD cdemu-daemon-3.1.0.ebuild 1110 BLAKE2B 001cea1a051505de440cf792f5c561617312d8b946675623d47a204bc7e4b94ad4fa5e4ed8e2bdcb8d47483a0f33d8c2ffdbb935ffe3f401e90358f45de8d97e SHA512 ee7fdd166e61e9a9e6339629d46ed9c6aa91984e0e2b357958aa40d79c3401cde0d9fdf24942708074a7389b66205b6b38ad156674581cd68f16e89284093d14
-EBUILD cdemu-daemon-3.2.1.ebuild 1151 BLAKE2B 7fcb6614be31951e77ce310a9b7709163c0ac33c858dfd2eea28dd0fbf9cc2597e65bedefa23ff4e50a8489f2b238e290bb691df69b85c049feb23c5f3e1b988 SHA512 4ce6f56fee85b7ff547080064c04da44345f6dda25fffefd1afa720e48d864596f489f53630fbeca10383366b93367610de66ec8e47eabe7bd63a6b3c1c3eca0
-MISC metadata.xml 455 BLAKE2B 23500677c263c1b8fc4839698bd6f1c08e9821fe4472a0b1725ad4777cfff385531ab6ec966f32a2335571c315b6f886f973451076745aa9fe4297c3cc436a30 SHA512 51c8d87f3c49c81798e4d2e038f911a2e05bfde742f229939f759c6768c6459cf4aa6829981791c57ef766fd447923194d7c14d4ad16951ae505d3b5a73c3479
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.1.0.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.1.0.ebuild
deleted file mode 100644
index e7bdef53c7de..000000000000
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 ~hppa x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	>=dev-libs/libmirage-${PV}:=
-	>=media-libs/libao-0.8.0:=
-	sys-apps/dbus
-	>=sys-fs/vhba-20130607"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-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.1.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.1.ebuild
deleted file mode 100644
index d3509f5f2628..000000000000
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ~hppa ~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/metadata.xml b/app-cdr/cdemu-daemon/metadata.xml
deleted file mode 100644
index 3c7b1adb6301..000000000000
--- a/app-cdr/cdemu-daemon/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>tetromino@gentoo.org</email>
-    <name>Alexandre Rostovtsev</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">cdemu</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
deleted file mode 100644
index 6cb436078fb3..000000000000
--- a/app-cdr/cdemu/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cdemu-3.0.0-bash-completion-dir.patch 361 BLAKE2B 10202ce49885d8f8a824589a80f050b228e0bdf73ccc823131f36954b525471a3d10cedd791be56aa462e15526daf6ca3f363871930da9f6e94c10060371b7e5 SHA512 55c2fe9abddf87740126e60d6933431cb433b9420f4e94bb24bb9f80bae170632c5e9f7be4b552efcc748aa0eb97b6d65997cbe5f30f6399c4becb2971d92895
-DIST cdemu-client-3.1.0.tar.bz2 43066 BLAKE2B 97413d06b0466e81dce212c9f621fed2a7b83517c8ef3c70ccf182b48093b9c5f805ee40c81bf23bb88089da758876e80f57094c2ec761d42480a401d3b95114 SHA512 62c0650cfd18c1e8edca8c53a343460bf12aae35909251fce24098f16b48a3b30d083d436f494bf23145c06252f943f75413f024c6744696f5ad75cac0a15509
-DIST cdemu-client-3.2.0.tar.bz2 43588 BLAKE2B 0f75bed1ce2a715bb7acf227ebd3da8b80cf6418e28b0d352f294121c1f67acb8c6bab5f5dc5c768150ad46830b823d66f1940887c66225d20b41827c1377d31 SHA512 778f2ecac828ba278d0ded875c7bab2415f1c1acb62f4030eaf161376869939c48bc16a6d660326d9aacd2af745ef9dc9158f922a72aa8ccbd47f05ce41b8cd7
-EBUILD cdemu-3.1.0.ebuild 1148 BLAKE2B bf3b0903ce07572ea60b1f13dbd5e790cbf36d961f5ed0935ac37109beb4f45a0c0b2dc08032e242bd2d4408e3edfa708e3a85c3978bc81eb41fa38dfdb8e2dd SHA512 91cf3c8c2fc460e0de63dd7d9344142153fdf17f74cf70aee220769a6095a460efcace854ef7f5f5d6ff917011d80755ef55c69b99a9c4351bc24435fac97598
-EBUILD cdemu-3.2.0.ebuild 1092 BLAKE2B 84599fcd6f57f0d2ebafc9d852017ed91396aa1350ea891b431caa85a22ea88f47eabd1e6e9096ae9be1f86b4478f93bcfcfc271b12fea8930e7b33ca896a85f SHA512 e6c259f3ee222b91e08d0b56ab15e31f386d0f102cbd7a284bf4e4beff17ecbd37cea743a87aa59287ec1f4fbd2e6ec5670b97338e4347c2a33490d8a1d8a4a6
-MISC metadata.xml 652 BLAKE2B 6750f0d7abcdba746aa4c2e75c3afc47dd9bebbaa3491cdc3cfccf0e629b944266b467779875ff84f4ba08624b5056c0b2f774020535eb93e85cddb9b228a7d9 SHA512 3c37419e3191ab278fdbb03b26ffafb36c6c00edc93566524a08253cb2deddd3ac61184e6bf0e66a0d18aa30b890c13f2c0946d396ee3835131a722e8bb76f93
diff --git a/app-cdr/cdemu/cdemu-3.1.0.ebuild b/app-cdr/cdemu/cdemu-3.1.0.ebuild
deleted file mode 100644
index aa0b79fa1f1c..000000000000
--- a/app-cdr/cdemu/cdemu-3.1.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-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 ~hppa 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="${RDEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	>=sys-devel/gettext-0.18"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.0-bash-completion-dir.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	python_fix_shebang src/cdemu
-}
-
-src_configure() {
-	local DOCS=( AUTHORS README )
-	local mycmakeargs=(
-		-DPOST_INSTALL_HOOKS=OFF
-		-DGENTOO_BASHCOMPDIR="$(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.0.ebuild b/app-cdr/cdemu/cdemu-3.2.0.ebuild
deleted file mode 100644
index d0d8bc99f220..000000000000
--- a/app-cdr/cdemu/cdemu-3.2.0.ebuild
+++ /dev/null
@@ -1,53 +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} )
-
-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 ~hppa ~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/files/cdemu-3.0.0-bash-completion-dir.patch b/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
deleted file mode 100644
index 270ce7bb2ba8..000000000000
--- a/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt
-index 99b595e..e4f9b6e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,7 +39,8 @@ install (
- 
- install (
-     FILES data/cdemu-bash-completion.sh
--    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
-+    DESTINATION ${GENTOO_BASHCOMPDIR}
-+    RENAME cdemu
- )
- 
- install (
diff --git a/app-cdr/cdemu/metadata.xml b/app-cdr/cdemu/metadata.xml
deleted file mode 100644
index 268d427433cc..000000000000
--- a/app-cdr/cdemu/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>tetromino@gentoo.org</email>
-    <name>Alexandre Rostovtsev</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <use>
-    <flag name="cdemu-daemon">Pull <pkg>app-cdr/cdemu-daemon</pkg> dependency, useful in chroot environment (bug #315491). Do not disable until you know what you are doing.</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">cdemu</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-cdr/cdlabelgen-4.3.0 b/app-cdr/cdlabelgen-4.3.0
new file mode 100644
index 000000000000..abe169a0b0c0
--- /dev/null
+++ b/app-cdr/cdlabelgen-4.3.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=CD cover, tray card and envelope generator
+EAPI=6
+HOMEPAGE=https://www.aczoom.com/tools/cdinsert
+KEYWORDS=amd64 ppc ~sparc x86
+LICENSE=aczoom
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=https://www.aczoom.com/pub/tools/cdlabelgen-4.3.0.tgz
+_md5_=7a57d27a863e1d10959c381eb71b3fe3
diff --git a/app-cdr/cdlabelgen/Manifest b/app-cdr/cdlabelgen/Manifest
deleted file mode 100644
index 2e0094a0b252..000000000000
--- a/app-cdr/cdlabelgen/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 4.0.0-create-MAN_DIR.diff 695 BLAKE2B f292796ab872b6a1c9440f60551ea3eebc56cd37752415d59bff1346cb33f21fb0a0907c5e1e59d0ab57b85c41b12576d7dee6415305c155b2da9b9b6b507ff6 SHA512 21e4414fd2bd9c619e9c78371ae6300e4a9ba9f81ac4bb2c4afbbc4fe2ca783409fd6e18e2164e1b1017fd452d06f3ddf14a6823477e4811dd749eb2681b386f
-DIST cdlabelgen-4.3.0.tgz 209771 BLAKE2B 7d8be25da83a7e4235c9aa9188855ed0f2600eab79e19a9cb1287b30609ad40d6b28a14329fd6281e6aee049ea7d402ecc61d116c00e3c4b02da05cdb4a28fab SHA512 e9528dc1cfead1f3a90b2109346ac1e5305875e2a10dc3196a1caa94fb6e30daeff4bdac5eb43cb6710fdf36fc98349fdeaa225eaa6db3825bf9fd33cc9ab8cf
-EBUILD cdlabelgen-4.3.0.ebuild 629 BLAKE2B d092f64eede7c49347d420d37dc5f27dee2563640defc5be89fd6833367cc83a3998871ebf66469118ba6c8c23b8b418af5cd137cc52e924d5c68a94c9ec47fe SHA512 a562efc1ae82a08e34902683848610bd2d124d161c7fa7a78b9c313001f211ba24d19da81e6f1b11a5e8d3ed11131fbbd5316dba0a86b039e820a8d7b12e2b30
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/cdlabelgen/cdlabelgen-4.3.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-4.3.0.ebuild
deleted file mode 100644
index e72ab4ecc2c7..000000000000
--- a/app-cdr/cdlabelgen/cdlabelgen-4.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="CD cover, tray card and envelope generator"
-HOMEPAGE="https://www.aczoom.com/tools/cdinsert"
-SRC_URI="https://www.aczoom.com/pub/tools/${P}.tgz"
-LICENSE="aczoom"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-DEPEND=""
-
-PATCHES=( "${FILESDIR}"/4.0.0-create-MAN_DIR.diff )
-DOCS=( ChangeLog README INSTALL.WEB )
-
-src_install() {
-	emake BASE_DIR="${D}"/usr install
-	einstalldocs
-	insinto "/usr/share/${PN}"
-	doins *.html
-	exeinto "/usr/share/${PN}"
-	doexe cdinsert{,-ps}.pl
-}
diff --git a/app-cdr/cdlabelgen/files/4.0.0-create-MAN_DIR.diff b/app-cdr/cdlabelgen/files/4.0.0-create-MAN_DIR.diff
deleted file mode 100644
index 54191b2dddd3..000000000000
--- a/app-cdr/cdlabelgen/files/4.0.0-create-MAN_DIR.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur cdlabelgen-4.0.0.orig/Makefile cdlabelgen-4.0.0/Makefile
---- cdlabelgen-4.0.0.orig/Makefile	2007-12-16 16:17:22.000000000 +0100
-+++ cdlabelgen-4.0.0/Makefile	2007-12-16 16:18:10.000000000 +0100
-@@ -45,13 +45,13 @@
- 	@echo ""
- 	$(INSTALL_DIR) $(BIN_DIR)
- 	$(INSTALL) cdlabelgen $(BIN_DIR)
-+	$(INSTALL_DIR) $(MAN_DIR)/man1
- 	$(INSTALL_FILE) cdlabelgen.1 $(MAN_DIR)/man1
- 	$(INSTALL_DIR) $(LIB_DIR)
- 	set -e; \
- 	for file in $(POSTSCRIPT); do \
- 		$(INSTALL_FILE) postscript/$$file $(LIB_DIR)/; \
- 	done
--	@echo "** Done. Check $(BIN_DIR)/cdlabelgen and fix @where_is_the_template - if needed!"
- 
- cdlabelgen-$(VERSION).spec: spec.template
- 	sed -e "s/TAG_VERSION/$(VERSION)/" < $? > $@
diff --git a/app-cdr/cdlabelgen/metadata.xml b/app-cdr/cdlabelgen/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-cdr/cdlabelgen/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/cdrdao-1.2.3-r4 b/app-cdr/cdrdao-1.2.3-r4
new file mode 100644
index 000000000000..f0d80db249b6
--- /dev/null
+++ b/app-cdr/cdrdao-1.2.3-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=virtual/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Burn CDs in disk-at-once mode -- with optional GUI frontend
+EAPI=6
+HOMEPAGE=http://cdrdao.sourceforge.net/
+IUSE=encode mad vorbis
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=virtual/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) !app-cdr/cue2toc !dev-util/pccts
+SLOT=0
+SRC_URI=mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7b8169cfc67516da43670ca3e6b0582a
diff --git a/app-cdr/cdrdao-1.2.4 b/app-cdr/cdrdao-1.2.4
new file mode 100644
index 000000000000..4224e64d6c95
--- /dev/null
+++ b/app-cdr/cdrdao-1.2.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=virtual/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Burn CDs in disk-at-once mode -- with optional GUI frontend
+EAPI=6
+HOMEPAGE=http://cdrdao.sourceforge.net/
+IUSE=encode mad vorbis
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=virtual/cdrtools encode? ( >=media-sound/lame-3.99 ) mad? ( media-libs/libmad media-libs/libao ) vorbis? ( media-libs/libvorbis media-libs/libao ) !app-cdr/cue2toc !dev-util/pccts
+SLOT=0
+SRC_URI=mirror://sourceforge/cdrdao/cdrdao-1.2.4.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=438086f29ed18820d2011072dd6299d1
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
deleted file mode 100644
index 392b9bd7266a..000000000000
--- a/app-cdr/cdrdao/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX cdrdao-1.2.3-ax_pthread.patch 16862 BLAKE2B 657da0dd5107302c97b2eb2096e61326d4aacfab3c7adf881ae40fde1b6bf0ede3860105f117b2d0b29966aeed3e7002ad8ed12edcc5ae01b663eddd7b7ab5f3 SHA512 ae881b74fbf8ae80ad1f5742bc57034f8edf99bd8972b69202d026a8df5b6645710f7b96fef85469c34a72ee4d0fda3d48abe3dce9585de65a2ba66992195f00
-AUX cdrdao-1.2.3-glibc212.patch 260 BLAKE2B 6f84d32fc4b3e2254c61453f6e0a77c99b6fb5de7622ab1ce444348f9ae9fccde3450023421ef54a55e248b8280b1177373b632abb543908c6d728d2ee66b03b SHA512 3954d77f301beb1063292000f7f0bc07b1f1f8908bbc7dc31717e3ad0afbe51e398157edff943c8679155000e6f494e396527b02419191036bdfcd549f94d04d
-AUX cdrdao-1.2.3-lame-3.100.patch 737 BLAKE2B 63765fe4b6a689705bc9eaf08ce823e3b8e0f004d1d5141c65d133e743c58b52bfcd599e950d6114450f12230b3c932a76ae903a54c2d1a77ffe803654af52a8 SHA512 bf6aa3cba34317c87a008c2c6b698be51a7e544a28bb6f7d5d42719a71e78e08903a89e7544ffd54b8d7d9d01d1f996e6d599263f0f10a4f043e33b1b45e8913
-AUX cdrdao-1.2.3-unsigned-char.patch 1119 BLAKE2B e5e52f03541d77740dd4a61f6b275e2f6edf0045c1671539745d42b60c11fda623e3b983801efa6979bdea1fdefad23293d2156ebbce37d7fdf39d20eb7f98f1 SHA512 77227662a86f17a10841e4b3085d9c40067f7a1c46694e188371018e200ec8bd94ae2fdd86143bba9cc345211abfdaf197e4aa2dd8cb1b1749b954ef70055cf2
-AUX cdrdao-1.2.3-wformat-security.patch 6279 BLAKE2B dabab6d2575e24b5bfcf690daa634cfbd795d18930e03fc9acfcf630408fcb6e60af077053a577507725365a23083c273f43f5efea65f8c58189279085a2e472 SHA512 aff829cf227658ac1a11975c818385999ee91582f239bd70ad440021cd08554cf80c29470683f55ca9d50aef05e33b326e853ba022ecfa9e7eae84fb4c51acd3
-AUX cdrdao-1.2.4-ax_pthread.patch 16846 BLAKE2B a76c7c68c53a57731e652325d98f9f2ce434c9c9385e8583fb948fe2e1c120ad564a95bc247993493afbef1163206c30fc8a141d72ee723b3bcabb20a5f9f36a SHA512 83789963569dbaa599294bd79447e3351309675817eef683e2f90974d68fda00c705eca43c015128d6c6e9ec98f14bf7f205f8e3ab46f33c1bf0afaf0f055694
-AUX cdrdao-1.2.4-wformat-security.patch 4864 BLAKE2B fa300eefe5d714de0245a9e745d13f051dcbc14590efb33a367dd113474984618e62e347fc3cdc26a057169ff95bdde25b36d9b7bcb25aa9cdd5fd9b07a42ec1 SHA512 a40fd8c91fa207ad52f3cde9318fc4422f14aeea15bab4d2cd1e04d3f09a2fc2b666397cdbddc89245c97a6a98ac155c0ecf71c1e2993a366a21016bd337a33e
-DIST cdrdao-1.2.3.tar.bz2 1428695 BLAKE2B d5d8e9f2f17b4e4a385e226233d219afdf48fa98bade0dad57292ba45fc4f25c3bb146289884c9ad35224c26a826b305c6f8a1e43c22fe7f1cbd812f1a69790a SHA512 36b14180acf476de062f5f31e2b9dece39e3cc7a84552e80a6714931fa35d6090ec90ddfcdbd2651d690be8ce3fc78d483aa13856c3c311bcc2f571f0040adf6
-DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
-EBUILD cdrdao-1.2.3-r4.ebuild 1363 BLAKE2B 39976860881ab6c78968cbc03705cc52d693a25f82ca444567d7904ac6c517bc0e68c73279caf7b76cec3c663095435ec3907dbb842c61fb5e87c79fbbac96d8 SHA512 61bf45c88cb48a58375cee24fa82df7d45d2e4f3ca1d9712d087e625b8aee20c014a4954be6e47a2dd1a8d7466e72a7b1b47f39cab5e8821f0beb0ebc5b2786c
-EBUILD cdrdao-1.2.4.ebuild 1300 BLAKE2B 1dcec4244516cf139cf47d703d9050f4f18dee304a07b603161ad439f044e3f3915eaed6df8ebfb789dbfba43752b1df471074b49002125c530f502d5caca49d SHA512 a7a8a64be2514108efa4dfb31d9c332b8fcf12dc9c90794a2d01d431ee398872297d98d02e5ec13bf67574a01b8782dd7bc4eff6e95ea9566dc3dd03b2136fe7
-MISC metadata.xml 395 BLAKE2B 271ac8836e1bc4bd8b8405ab9fdfdaaa4046b47bb44b07bdb78d063853a82433117d69d4dd46e89b4f42008b55f10e69d8262340bd29fe396061add32ed9959a SHA512 66d6f12a07e09dd91c828d34941963b1a498e1be14f0cadcb145b47471e148559280fb237a68c1d99ba3c2360e0603a231f124b950b3debde76fe476a5491351
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild
deleted file mode 100644
index cc00a1346b4d..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-HOMEPAGE="http://cdrdao.sourceforge.net/"
-if [[ ${PV/*_rc*} ]]
-then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-else
-	SRC_URI="http://www.poolshark.org/src/${P/_}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="encode mad vorbis"
-
-COMMON_DEPEND="
-	virtual/cdrtools
-	encode? ( >=media-sound/lame-3.99 )
-	mad? (
-		media-libs/libmad
-		media-libs/libao
-	)
-	vorbis? (
-		media-libs/libvorbis
-		media-libs/libao
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!app-cdr/cue2toc
-	!dev-util/pccts"
-
-PATCHES=(
-	"${FILESDIR}/${P}-glibc212.patch"
-	"${FILESDIR}/${P}-unsigned-char.patch"
-	"${FILESDIR}/${P}-ax_pthread.patch"
-	"${FILESDIR}/${P}-wformat-security.patch"
-	"${FILESDIR}/${P}-lame-3.100.patch"
-)
-
-S="${WORKDIR}/${P/_}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Fix building with latest libsigc++
-	append-cxxflags -std=c++11
-	find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + || die
-
-	econf \
-		--without-xdao \
-		$(use_with vorbis ogg-support) \
-		$(use_with mad mp3-support) \
-		$(use_with encode lame)
-}
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
deleted file mode 100644
index f856d437c8c5..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-HOMEPAGE="http://cdrdao.sourceforge.net/"
-if [[ ${PV/*_rc*} ]]
-then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-else
-	SRC_URI="http://www.poolshark.org/src/${P/_}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="encode mad vorbis"
-
-COMMON_DEPEND="
-	virtual/cdrtools
-	encode? ( >=media-sound/lame-3.99 )
-	mad? (
-		media-libs/libmad
-		media-libs/libao
-	)
-	vorbis? (
-		media-libs/libvorbis
-		media-libs/libao
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!app-cdr/cue2toc
-	!dev-util/pccts"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ax_pthread.patch"
-	"${FILESDIR}/${P}-wformat-security.patch"
-)
-
-S="${WORKDIR}/${P/_}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Fix building with latest libsigc++
-	append-cxxflags -std=c++11
-	find -name '*.h' -exec sed -i '/sigc++\/object.h/d' {} + || die
-
-	local myeconfargs=(
-		--without-gcdmaster
-		$(use_with vorbis ogg-support)
-		$(use_with mad mp3-support)
-		$(use_with encode lame)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch
deleted file mode 100644
index c20a73dd64a6..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-ax_pthread.patch
+++ /dev/null
@@ -1,418 +0,0 @@
-Use AX_PTHREAD for finding proper pthread flags. Forcibly add these flags
-to CFLAGS, CXXFLAGS and LIBS.
-Also use AM_PROG_AR to detect proper ar
-See also: https://bugs.gentoo.org/show_bug.cgi?id=548004
-
---- cdrdao-1.2.3/configure.ac
-+++ cdrdao-1.2.3/configure.ac
-@@ -2,6 +2,7 @@
- AC_REVISION($Revision: 1.25 $)dnl
- 
- AC_INIT(cdrdao, 1.2.3)
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AC_CONFIG_SRCDIR(dao/main.cc)
- AM_INIT_AUTOMAKE
-@@ -32,7 +33,7 @@
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_RANLIB
--AC_CHECK_PROG(AR,ar,ar)
-+AM_PROG_AR
- AC_PROG_MAKE_SET
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
- 
-@@ -113,7 +114,10 @@
- fi
- 
- if test "$use_pthreads" = yes; then
--  AC_CHECK_FUNC(pthread_create,have_pthread_std=yes,have_pthread_std=no)
-+  AX_PTHREAD([have_pthread_std=yes],[have_pthread_std=no])
-+  LIBS="$PTHREAD_LIBS $PTHREAD_CFLAGS $LIBS"
-+  CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+  CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
- 
-   if test "$have_pthread_std" = yes; then
-     AC_DEFINE(USE_POSIX_THREADS,1,"")
---- cdrdao-1.2.3/m4/ax_pthread.m4
-+++ cdrdao-1.2.3/m4/ax_pthread.m4
-@@ -0,0 +1,332 @@
-+# ===========================================================================
-+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+#   This macro figures out how to build C programs using POSIX threads. It
-+#   sets the PTHREAD_LIBS output variable to the threads library and linker
-+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-+#   flags that are needed. (The user can also force certain compiler
-+#   flags/libs to be tested by setting these environment variables.)
-+#
-+#   Also sets PTHREAD_CC to any special C compiler that is needed for
-+#   multi-threaded programs (defaults to the value of CC otherwise). (This
-+#   is necessary on AIX to use the special cc_r compiler alias.)
-+#
-+#   NOTE: You are assumed to not only compile your program with these flags,
-+#   but also link it with them as well. e.g. you should link with
-+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-+#
-+#   If you are only building threads programs, you may wish to use these
-+#   variables in your default LIBS, CFLAGS, and CC:
-+#
-+#     LIBS="$PTHREAD_LIBS $LIBS"
-+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+#     CC="$PTHREAD_CC"
-+#
-+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-+#
-+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-+#   PTHREAD_CFLAGS.
-+#
-+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-+#   is not found. If ACTION-IF-FOUND is not specified, the default action
-+#   will define HAVE_PTHREAD.
-+#
-+#   Please let the authors know if this macro fails on any platform, or if
-+#   you have any other suggestions or comments. This macro was based on work
-+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-+#   grateful for the helpful feedback of numerous users.
-+#
-+#   Updated for Autoconf 2.68 by Daniel Richard G.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-+#
-+#   This program is free software: you can redistribute it and/or modify it
-+#   under the terms of the GNU General Public License as published by the
-+#   Free Software Foundation, either version 3 of the License, or (at your
-+#   option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful, but
-+#   WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+#   Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program. If not, see <http://www.gnu.org/licenses/>.
-+#
-+#   As a special exception, the respective Autoconf Macro's copyright owner
-+#   gives unlimited permission to copy, distribute and modify the configure
-+#   scripts that are the output of Autoconf when processing the Macro. You
-+#   need not follow the terms of the GNU General Public License when using
-+#   or distributing such scripts, even though portions of the text of the
-+#   Macro appear in them. The GNU General Public License (GPL) does govern
-+#   all other use of the material that constitutes the Autoconf Macro.
-+#
-+#   This special exception to the GPL applies to versions of the Autoconf
-+#   Macro released by the Autoconf Archive. When you make and distribute a
-+#   modified version of the Autoconf Macro, you may extend this special
-+#   exception to the GPL to apply to your modified version as well.
-+
-+#serial 21
-+
-+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-+AC_DEFUN([AX_PTHREAD], [
-+AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_LANG_PUSH([C])
-+ax_pthread_ok=no
-+
-+# We used to check for pthread.h first, but this fails if pthread.h
-+# requires special compiler flags (e.g. on True64 or Sequent).
-+# It gets checked for in the link test anyway.
-+
-+# First of all, check if the user has set any of the PTHREAD_LIBS,
-+# etcetera environment variables, and if threads linking works using
-+# them:
-+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        save_LIBS="$LIBS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-+        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
-+        AC_MSG_RESULT([$ax_pthread_ok])
-+        if test x"$ax_pthread_ok" = xno; then
-+                PTHREAD_LIBS=""
-+                PTHREAD_CFLAGS=""
-+        fi
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+fi
-+
-+# We must check for the threads library under a number of different
-+# names; the ordering is very important because some systems
-+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-+# libraries is broken (non-POSIX).
-+
-+# Create a list of thread flags to try.  Items starting with a "-" are
-+# C compiler flags, and other items are library names, except for "none"
-+# which indicates that we try without any flags at all, and "pthread-config"
-+# which is a program returning the flags for the Pth emulation library.
-+
-+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-+
-+# The ordering *is* (sometimes) important.  Some notes on the
-+# individual items follow:
-+
-+# pthreads: AIX (must check this before -lpthread)
-+# none: in case threads are in libc; should be tried before -Kthread and
-+#       other compiler flags to prevent continual compiler warnings
-+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-+# -pthreads: Solaris/gcc
-+# -mthreads: Mingw32/gcc, Lynx/gcc
-+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-+#      doesn't hurt to check since this sometimes defines pthreads too;
-+#      also defines -D_REENTRANT)
-+#      ... -mt is also the pthreads flag for HP/aCC
-+# pthread: Linux, etcetera
-+# --thread-safe: KAI C++
-+# pthread-config: use pthread-config program (for GNU Pth library)
-+
-+case ${host_os} in
-+        solaris*)
-+
-+        # On Solaris (at least, for some versions), libc contains stubbed
-+        # (non-functional) versions of the pthreads routines, so link-based
-+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-+        # a function called by this macro, so we could check for that, but
-+        # who knows whether they'll stub that too in a future libc.)  So,
-+        # we'll just look for -pthreads and -lpthread first:
-+
-+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
-+        ;;
-+
-+        darwin*)
-+        ax_pthread_flags="-pthread $ax_pthread_flags"
-+        ;;
-+esac
-+
-+# Clang doesn't consider unrecognized options an error unless we specify
-+# -Werror. We throw in some extra Clang-specific options to ensure that
-+# this doesn't happen for GCC, which also accepts -Werror.
-+
-+AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
-+save_CFLAGS="$CFLAGS"
-+ax_pthread_extra_flags="-Werror"
-+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
-+                  [AC_MSG_RESULT([yes])],
-+                  [ax_pthread_extra_flags=
-+                   AC_MSG_RESULT([no])])
-+CFLAGS="$save_CFLAGS"
-+
-+if test x"$ax_pthread_ok" = xno; then
-+for flag in $ax_pthread_flags; do
-+
-+        case $flag in
-+                none)
-+                AC_MSG_CHECKING([whether pthreads work without any flags])
-+                ;;
-+
-+                -*)
-+                AC_MSG_CHECKING([whether pthreads work with $flag])
-+                PTHREAD_CFLAGS="$flag"
-+                ;;
-+
-+                pthread-config)
-+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-+                if test x"$ax_pthread_config" = xno; then continue; fi
-+                PTHREAD_CFLAGS="`pthread-config --cflags`"
-+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-+                ;;
-+
-+                *)
-+                AC_MSG_CHECKING([for the pthreads library -l$flag])
-+                PTHREAD_LIBS="-l$flag"
-+                ;;
-+        esac
-+
-+        save_LIBS="$LIBS"
-+        save_CFLAGS="$CFLAGS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
-+
-+        # Check for various functions.  We must include pthread.h,
-+        # since some functions may be macros.  (On the Sequent, we
-+        # need a special flag -Kthread to make this header compile.)
-+        # We check for pthread_join because it is in -lpthread on IRIX
-+        # while pthread_create is in libc.  We check for pthread_attr_init
-+        # due to DEC craziness with -lpthreads.  We check for
-+        # pthread_cleanup_push because it is one of the few pthread
-+        # functions on Solaris that doesn't have a non-functional libc stub.
-+        # We try pthread_create on general principles.
-+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-+                        static void routine(void *a) { a = 0; }
-+                        static void *start_routine(void *a) { return a; }],
-+                       [pthread_t th; pthread_attr_t attr;
-+                        pthread_create(&th, 0, start_routine, 0);
-+                        pthread_join(th, 0);
-+                        pthread_attr_init(&attr);
-+                        pthread_cleanup_push(routine, 0);
-+                        pthread_cleanup_pop(0) /* ; */])],
-+                [ax_pthread_ok=yes],
-+                [])
-+
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+
-+        AC_MSG_RESULT([$ax_pthread_ok])
-+        if test "x$ax_pthread_ok" = xyes; then
-+                break;
-+        fi
-+
-+        PTHREAD_LIBS=""
-+        PTHREAD_CFLAGS=""
-+done
-+fi
-+
-+# Various other checks:
-+if test "x$ax_pthread_ok" = xyes; then
-+        save_LIBS="$LIBS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+
-+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-+        AC_MSG_CHECKING([for joinable pthread attribute])
-+        attr_name=unknown
-+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-+                           [int attr = $attr; return attr /* ; */])],
-+                [attr_name=$attr; break],
-+                [])
-+        done
-+        AC_MSG_RESULT([$attr_name])
-+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-+            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
-+                               [Define to necessary symbol if this constant
-+                                uses a non-standard name on your system.])
-+        fi
-+
-+        AC_MSG_CHECKING([if more special flags are required for pthreads])
-+        flag=no
-+        case ${host_os} in
-+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
-+            osf* | hpux*) flag="-D_REENTRANT";;
-+            solaris*)
-+            if test "$GCC" = "yes"; then
-+                flag="-D_REENTRANT"
-+            else
-+                # TODO: What about Clang on Solaris?
-+                flag="-mt -D_REENTRANT"
-+            fi
-+            ;;
-+        esac
-+        AC_MSG_RESULT([$flag])
-+        if test "x$flag" != xno; then
-+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-+        fi
-+
-+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-+            [ax_cv_PTHREAD_PRIO_INHERIT], [
-+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-+                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
-+                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-+                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
-+            ])
-+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
-+            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
-+
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+
-+        # More AIX lossage: compile with *_r variant
-+        if test "x$GCC" != xyes; then
-+            case $host_os in
-+                aix*)
-+                AS_CASE(["x/$CC"],
-+                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-+                  [#handle absolute path differently from PATH based program lookup
-+                   AS_CASE(["x$CC"],
-+                     [x/*],
-+                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-+                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-+                ;;
-+            esac
-+        fi
-+fi
-+
-+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-+
-+AC_SUBST([PTHREAD_LIBS])
-+AC_SUBST([PTHREAD_CFLAGS])
-+AC_SUBST([PTHREAD_CC])
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x"$ax_pthread_ok" = xyes; then
-+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-+        :
-+else
-+        ax_pthread_ok=no
-+        $2
-+fi
-+AC_LANG_POP
-+])dnl AX_PTHREAD
---- cdrdao-1.2.3/m4/gconf-2.m4
-+++ cdrdao-1.2.3/m4/gconf-2.m4
-@@ -0,0 +1,44 @@
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-+dnl  (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl  you should install foo.schemas files
-+dnl
-+
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+  else
-+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+  fi
-+
-+  AC_ARG_WITH([gconf-source],
-+	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+			     [Config database for installing schema files.]),
-+	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-+
-+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+
-+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+  fi
-+
-+  AC_ARG_WITH([gconf-schema-file-dir],
-+	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+			     [Directory for installing schema files.]),
-+	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+
-+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+
-+  AC_ARG_ENABLE(schemas-install,
-+  	AC_HELP_STRING([--disable-schemas-install],
-+		       [Disable the schemas installation]),
-+     [case ${enableval} in
-+       yes|no) ;;
-+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-+      esac])
-+  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-+])
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch
deleted file mode 100644
index c37fd5d0c37d..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-glibc212.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/332237
-
---- cdrdao-1.2.3/dao/ScsiIf-linux.cc
-+++ cdrdao-1.2.3/dao/ScsiIf-linux.cc
-@@ -30,6 +30,7 @@
- #include <asm/param.h>
- #include <scsi/scsi.h>
- #include <scsi/sg.h>
-+#include <sys/stat.h>
- 
- #include "ScsiIf.h"
- #include "sg_err.h"
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch
deleted file mode 100644
index c712de2394c7..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-lame-3.100.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/utils/toc2mp3.cc
-+++ b/utils/toc2mp3.cc
-@@ -143,8 +143,8 @@
- 
-   message(0, "LAME encoder version: %s", get_lame_version());
-   message(0, "Supported bit rates: ");
--  for (int i = 0; i < 16 && bitrate_table[1][i] >= 0; i++) {
--    message(0, "%d ", bitrate_table[1][i]);
-+  for (int i = 0; i < 16 && lame_get_bitrate(1, i) >= 0; i++) {
-+    message(0, "%d ", lame_get_bitrate(1, i));
-   }
-   message(0, "");
- }
-@@ -238,8 +238,8 @@
-   lame_global_flags *lf;
-   int bitrateOk = 0;
- 
--  for (int i = 0; bitrate_table[1][i] >= 0 && !bitrateOk; i++) {
--    if (bitrate == bitrate_table[1][i])
-+  for (int i = 0; lame_get_bitrate(1, i) >= 0 && !bitrateOk; i++) {
-+    if (bitrate == lame_get_bitrate(1, i))
-       bitrateOk = 1;
-   }
- 
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-unsigned-char.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-unsigned-char.patch
deleted file mode 100644
index 18c60830ba30..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-unsigned-char.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/69344
-https://sourceforge.net/p/cdrdao/patches/26/
-
-patch by qbt937@gmail.com
-
---- a/dao/CdrDriver.cc
-+++ b/dao/CdrDriver.cc
-@@ -495,7 +495,7 @@
-   0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0
- };
- 
--char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 };
-+unsigned char CdrDriver::REMOTE_MSG_SYNC_[4] = { 0xff, 0x00, 0xff, 0x00 };
- 
- 
- /* Maps a string to the corresponding driver option value 
---- a/dao/CdrDriver.h
-+++ b/dao/CdrDriver.h
-@@ -440,7 +440,7 @@
-   bool fullBurn_;
- 
-   static unsigned char syncPattern[12];
--  static char REMOTE_MSG_SYNC_[4];
-+  unsigned static char REMOTE_MSG_SYNC_[4];
- 
-   static int speed2Mult(int);
-   static int mult2Speed(int);
---- a/xdao/CdDevice.cc
-+++ b/xdao/CdDevice.cc
-@@ -255,10 +255,10 @@
- 
- bool CdDevice::updateProgress(Glib::IOCondition cond, int fd)
- {
--  static char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 };
-+  unsigned static char msgSync[4] = { 0xff, 0x00, 0xff, 0x00 };
-   fd_set fds;
-   int state = 0;
--  char buf[10];
-+  unsigned char buf[10];
-   struct timeval timeout = { 0, 0 };
- 
-   if (process_ == NULL)
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-wformat-security.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-wformat-security.patch
deleted file mode 100644
index c5cfad840c15..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.3-wformat-security.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-Fix -Werror=format-security errors
-Also fix incorrect printf() format specifiers
-https://bugs.gentoo.org/show_bug.cgi?id=520988
-
-* gen.c: In function 'genHdr':
-* gen.c:3869:17: error: format not a string literal and no format arguments [-Werror=format-security]
-
---- cdrdao-1.2.3/pccts/antlr/bits.c
-+++ cdrdao-1.2.3/pccts/antlr/bits.c
-@@ -574,13 +574,13 @@
- 	else
- 		fprintf(DefFile, "extern SetWordType zzerr%d[];\n", esetnum);
- 	if ( name!=NULL ) {
--		fprintf(ErrFile, "SetWordType %s%s[%d] = {",
-+		fprintf(ErrFile, "SetWordType %s%s[%lu] = {",
- 				name,
-                 suffix,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
- 	}
- 	else {
--		fprintf(ErrFile, "SetWordType zzerr%d[%d] = {",
-+		fprintf(ErrFile, "SetWordType zzerr%d[%lu] = {",
- 				esetnum,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
- 	}
-@@ -642,20 +642,20 @@
- 	esetnum++;
- 
- 	if ( name!=NULL ) {
--		fprintf(Parser_h, "\tstatic SetWordType %s%s[%d];\n", name, suffix,
-+		fprintf(Parser_h, "\tstatic SetWordType %s%s[%lu];\n", name, suffix,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
--		fprintf(Parser_c, "SetWordType %s::%s%s[%d] = {",
-+		fprintf(Parser_c, "SetWordType %s::%s%s[%lu] = {",
- 				CurrentClassName,
- 				name,
- 				suffix,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
- 	}
- 	else {
--		fprintf(Parser_c, "SetWordType %s::err%d[%d] = {",
-+		fprintf(Parser_c, "SetWordType %s::err%d[%lu] = {",
- 				CurrentClassName,
- 				esetnum,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
--		fprintf(Parser_h, "\tstatic SetWordType err%d[%d];\n", esetnum,
-+		fprintf(Parser_h, "\tstatic SetWordType err%d[%lu];\n", esetnum,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
- 	}
- 
-@@ -788,7 +788,7 @@
- 
- 	/* Build constructors */
- 	fprintf(Parser_c, "\n%s::", CurrentClassName);
--	fprintf(Parser_c,	"%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%d)\n",
-+	fprintf(Parser_c,	"%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%lu)\n",
- 						CurrentClassName,
- 						(BaseClassName == NULL ? "ANTLRParser" : BaseClassName),
- 						OutputLL_k,
-@@ -913,7 +913,7 @@
- #ifdef DUM
- 	if ( LexGen ) fprintf(ErrFile, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
- #endif
--	fprintf(ErrFile, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
-+	fprintf(ErrFile, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
- 	if ( DemandLookahead ) fprintf(ErrFile, "#define DEMAND_LOOK\n");
- 	fprintf(ErrFile, "#include \"antlr.h\"\n");
- 	if ( GenAST ) fprintf(ErrFile, "#include \"ast.h\"\n");
---- cdrdao-1.2.3/pccts/antlr/fset2.c
-+++ cdrdao-1.2.3/pccts/antlr/fset2.c
-@@ -2210,7 +2210,7 @@
-       if (p->ntype != nToken) continue;
-       tn=(TokNode *)p;
-       if (depth != 0) fprintf(stdout," ");
--      fprintf(stdout,TerminalString(tn->token));
-+      fprintf(stdout,"%s",TerminalString(tn->token));
-       depth++;
-       if (! MR_AmbAidMultiple) {
-         if (set_nil(tn->tset)) {
---- cdrdao-1.2.3/pccts/antlr/gen.c
-+++ cdrdao-1.2.3/pccts/antlr/gen.c
-@@ -159,7 +159,7 @@
- #define gen6(s,a,b,c,d,e,f)	{tab(); fprintf(output, s,a,b,c,d,e,f);}
- #define gen7(s,a,b,c,d,e,f,g)	{tab(); fprintf(output, s,a,b,c,d,e,f,g);}
- 
--#define _gen(s)			{fprintf(output, s);}
-+#define _gen(s)			{fprintf(output, "%s", s);}
- #define _gen1(s,a)		{fprintf(output, s,a);}
- #define _gen2(s,a,b)	{fprintf(output, s,a,b);}
- #define _gen3(s,a,b,c)	{fprintf(output, s,a,b,c);}
-@@ -3911,7 +3911,7 @@
- 	}
- #endif
- 	/* ###WARNING: This will have to change when SetWordSize changes */
--	if ( !GenCC ) _gen1("#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
-+	if ( !GenCC ) _gen1("#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
-     if (TraceGen) {
-       _gen("#ifndef zzTRACE_RULES\n");  /* MR20 */
-       _gen("#define zzTRACE_RULES\n");  /* MR20 */
-@@ -4125,7 +4125,7 @@
- 	if ( LexGen ) fprintf(f, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
- #endif
- 	/* ###WARNING: This will have to change when SetWordSize changes */
--	fprintf(f, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
-+	fprintf(f, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
-     if (TraceGen) {
-       fprintf(f,"#ifndef zzTRACE_RULES\n");  /* MR20 */
-       fprintf(f,"#define zzTRACE_RULES\n");  /* MR20 */
---- cdrdao-1.2.3/pccts/antlr/lex.c
-+++ cdrdao-1.2.3/pccts/antlr/lex.c
-@@ -706,7 +706,7 @@
- /* MR26 */			if (! (isalpha(*t) || isdigit(*t) || *t == '_' || *t == '$')) break;
- /* MR26 */		}
- /* MR26 */	}
--/* MR26 */	fprintf(output,strBetween(pSymbol, t, pSeparator));
-+/* MR26 */	fprintf(output,"%s",strBetween(pSymbol, t, pSeparator));
- 
-     *q = p;
-     return (*pSeparator  == 0);
-@@ -771,7 +771,7 @@
- 				  &pValue,
- 				  &pSeparator,
- 				  &nest);
--	fprintf(f,strBetween(pDataType, pSymbol, pSeparator));
-+	fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator));
- }
- 
- /* check to see if string e is a word in string s */
-@@ -852,9 +852,9 @@
- 					  &pSeparator,
- 					  &nest);
- 		fprintf(f,"\t");
--		fprintf(f,strBetween(pDataType, pSymbol, pSeparator));
-+		fprintf(f,"%s",strBetween(pDataType, pSymbol, pSeparator));
- 		fprintf(f," ");
--		fprintf(f,strBetween(pSymbol, pEqualSign, pSeparator));
-+		fprintf(f,"%s",strBetween(pSymbol, pEqualSign, pSeparator));
- 		fprintf(f,";\n");
-     }
- 	fprintf(f,"};\n");
---- cdrdao-1.2.3/pccts/antlr/set.c
-+++ cdrdao-1.2.3/pccts/antlr/set.c
-@@ -263,7 +263,7 @@
- 	static set a;
- 
- 	if ( b == nil ) return( empty );
--	set_new(a, b);
-+	set_new(a, (long unsigned int) b);
- 	a.setword[DIVWORD(b)] = bitmask[MODWORD(b)];
- 
- 	return(a);
---- cdrdao-1.2.3/pccts/dlg/set.c
-+++ cdrdao-1.2.3/pccts/dlg/set.c
-@@ -263,7 +263,7 @@
- 	static set a;
- 
- 	if ( b == nil ) return( empty );
--	set_new(a, b);
-+	set_new(a, (long unsigned int) b);
- 	a.setword[DIVWORD(b)] = bitmask[MODWORD(b)];
- 
- 	return(a);
---- cdrdao-1.2.3/pccts/h/set.h
-+++ cdrdao-1.2.3/pccts/h/set.h
-@@ -55,7 +55,7 @@
- /* make arg1 a set big enough to hold max elem # of arg2 */
- #define set_new(a,_max) \
- if (((a).setword=(unsigned *)calloc(NumWords(_max),BytesPerWord))==NULL) \
--        fprintf(stderr, "set_new: Cannot allocate set with max of %d\n", _max); \
-+        fprintf(stderr, "set_new: Cannot allocate set with max of %lu\n", _max); \
-         (a).n = NumWords(_max);
- 
- #define set_free(a)									\
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch b/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch
deleted file mode 100644
index fe052db02af7..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.4-ax_pthread.patch
+++ /dev/null
@@ -1,418 +0,0 @@
-Use AX_PTHREAD for finding proper pthread flags. Forcibly add these flags
-to CFLAGS, CXXFLAGS and LIBS.
-Also use AM_PROG_AR to detect proper ar
-See also: https://bugs.gentoo.org/548004
-
---- cdrdao-1.2.4/configure.ac
-+++ cdrdao-1.2.4/configure.ac
-@@ -2,6 +2,7 @@
- AC_REVISION($Revision: 1.26 $)dnl
- 
- AC_INIT(cdrdao, 1.2.4)
-+AC_CONFIG_MACRO_DIR([m4])
- 
- AC_CONFIG_SRCDIR(dao/main.cc)
- AM_INIT_AUTOMAKE
-@@ -32,7 +33,7 @@
- AC_PROG_CPP
- AC_PROG_INSTALL
- AC_PROG_RANLIB
--AC_CHECK_PROG(AR,ar,ar)
-+AM_PROG_AR
- AC_PROG_MAKE_SET
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
- 
-@@ -113,7 +114,10 @@
- fi
- 
- if test "$use_pthreads" = yes; then
--  AC_CHECK_FUNC(pthread_create,have_pthread_std=yes,have_pthread_std=no)
-+  AX_PTHREAD([have_pthread_std=yes],[have_pthread_std=no])
-+  LIBS="$PTHREAD_LIBS $PTHREAD_CFLAGS $LIBS"
-+  CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+  CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
- 
-   if test "$have_pthread_std" = yes; then
-     AC_DEFINE(USE_POSIX_THREADS,1,"")
---- cdrdao-1.2.4/m4/ax_pthread.m4
-+++ cdrdao-1.2.4/m4/ax_pthread.m4
-@@ -0,0 +1,332 @@
-+# ===========================================================================
-+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-+#
-+# DESCRIPTION
-+#
-+#   This macro figures out how to build C programs using POSIX threads. It
-+#   sets the PTHREAD_LIBS output variable to the threads library and linker
-+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-+#   flags that are needed. (The user can also force certain compiler
-+#   flags/libs to be tested by setting these environment variables.)
-+#
-+#   Also sets PTHREAD_CC to any special C compiler that is needed for
-+#   multi-threaded programs (defaults to the value of CC otherwise). (This
-+#   is necessary on AIX to use the special cc_r compiler alias.)
-+#
-+#   NOTE: You are assumed to not only compile your program with these flags,
-+#   but also link it with them as well. e.g. you should link with
-+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-+#
-+#   If you are only building threads programs, you may wish to use these
-+#   variables in your default LIBS, CFLAGS, and CC:
-+#
-+#     LIBS="$PTHREAD_LIBS $LIBS"
-+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+#     CC="$PTHREAD_CC"
-+#
-+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
-+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-+#
-+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-+#   PTHREAD_CFLAGS.
-+#
-+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-+#   is not found. If ACTION-IF-FOUND is not specified, the default action
-+#   will define HAVE_PTHREAD.
-+#
-+#   Please let the authors know if this macro fails on any platform, or if
-+#   you have any other suggestions or comments. This macro was based on work
-+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-+#   grateful for the helpful feedback of numerous users.
-+#
-+#   Updated for Autoconf 2.68 by Daniel Richard G.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-+#
-+#   This program is free software: you can redistribute it and/or modify it
-+#   under the terms of the GNU General Public License as published by the
-+#   Free Software Foundation, either version 3 of the License, or (at your
-+#   option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful, but
-+#   WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+#   Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program. If not, see <http://www.gnu.org/licenses/>.
-+#
-+#   As a special exception, the respective Autoconf Macro's copyright owner
-+#   gives unlimited permission to copy, distribute and modify the configure
-+#   scripts that are the output of Autoconf when processing the Macro. You
-+#   need not follow the terms of the GNU General Public License when using
-+#   or distributing such scripts, even though portions of the text of the
-+#   Macro appear in them. The GNU General Public License (GPL) does govern
-+#   all other use of the material that constitutes the Autoconf Macro.
-+#
-+#   This special exception to the GPL applies to versions of the Autoconf
-+#   Macro released by the Autoconf Archive. When you make and distribute a
-+#   modified version of the Autoconf Macro, you may extend this special
-+#   exception to the GPL to apply to your modified version as well.
-+
-+#serial 21
-+
-+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-+AC_DEFUN([AX_PTHREAD], [
-+AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_LANG_PUSH([C])
-+ax_pthread_ok=no
-+
-+# We used to check for pthread.h first, but this fails if pthread.h
-+# requires special compiler flags (e.g. on True64 or Sequent).
-+# It gets checked for in the link test anyway.
-+
-+# First of all, check if the user has set any of the PTHREAD_LIBS,
-+# etcetera environment variables, and if threads linking works using
-+# them:
-+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        save_LIBS="$LIBS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
-+        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
-+        AC_MSG_RESULT([$ax_pthread_ok])
-+        if test x"$ax_pthread_ok" = xno; then
-+                PTHREAD_LIBS=""
-+                PTHREAD_CFLAGS=""
-+        fi
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+fi
-+
-+# We must check for the threads library under a number of different
-+# names; the ordering is very important because some systems
-+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-+# libraries is broken (non-POSIX).
-+
-+# Create a list of thread flags to try.  Items starting with a "-" are
-+# C compiler flags, and other items are library names, except for "none"
-+# which indicates that we try without any flags at all, and "pthread-config"
-+# which is a program returning the flags for the Pth emulation library.
-+
-+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-+
-+# The ordering *is* (sometimes) important.  Some notes on the
-+# individual items follow:
-+
-+# pthreads: AIX (must check this before -lpthread)
-+# none: in case threads are in libc; should be tried before -Kthread and
-+#       other compiler flags to prevent continual compiler warnings
-+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-+# -pthreads: Solaris/gcc
-+# -mthreads: Mingw32/gcc, Lynx/gcc
-+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-+#      doesn't hurt to check since this sometimes defines pthreads too;
-+#      also defines -D_REENTRANT)
-+#      ... -mt is also the pthreads flag for HP/aCC
-+# pthread: Linux, etcetera
-+# --thread-safe: KAI C++
-+# pthread-config: use pthread-config program (for GNU Pth library)
-+
-+case ${host_os} in
-+        solaris*)
-+
-+        # On Solaris (at least, for some versions), libc contains stubbed
-+        # (non-functional) versions of the pthreads routines, so link-based
-+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-+        # a function called by this macro, so we could check for that, but
-+        # who knows whether they'll stub that too in a future libc.)  So,
-+        # we'll just look for -pthreads and -lpthread first:
-+
-+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
-+        ;;
-+
-+        darwin*)
-+        ax_pthread_flags="-pthread $ax_pthread_flags"
-+        ;;
-+esac
-+
-+# Clang doesn't consider unrecognized options an error unless we specify
-+# -Werror. We throw in some extra Clang-specific options to ensure that
-+# this doesn't happen for GCC, which also accepts -Werror.
-+
-+AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
-+save_CFLAGS="$CFLAGS"
-+ax_pthread_extra_flags="-Werror"
-+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
-+                  [AC_MSG_RESULT([yes])],
-+                  [ax_pthread_extra_flags=
-+                   AC_MSG_RESULT([no])])
-+CFLAGS="$save_CFLAGS"
-+
-+if test x"$ax_pthread_ok" = xno; then
-+for flag in $ax_pthread_flags; do
-+
-+        case $flag in
-+                none)
-+                AC_MSG_CHECKING([whether pthreads work without any flags])
-+                ;;
-+
-+                -*)
-+                AC_MSG_CHECKING([whether pthreads work with $flag])
-+                PTHREAD_CFLAGS="$flag"
-+                ;;
-+
-+                pthread-config)
-+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-+                if test x"$ax_pthread_config" = xno; then continue; fi
-+                PTHREAD_CFLAGS="`pthread-config --cflags`"
-+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-+                ;;
-+
-+                *)
-+                AC_MSG_CHECKING([for the pthreads library -l$flag])
-+                PTHREAD_LIBS="-l$flag"
-+                ;;
-+        esac
-+
-+        save_LIBS="$LIBS"
-+        save_CFLAGS="$CFLAGS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
-+
-+        # Check for various functions.  We must include pthread.h,
-+        # since some functions may be macros.  (On the Sequent, we
-+        # need a special flag -Kthread to make this header compile.)
-+        # We check for pthread_join because it is in -lpthread on IRIX
-+        # while pthread_create is in libc.  We check for pthread_attr_init
-+        # due to DEC craziness with -lpthreads.  We check for
-+        # pthread_cleanup_push because it is one of the few pthread
-+        # functions on Solaris that doesn't have a non-functional libc stub.
-+        # We try pthread_create on general principles.
-+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-+                        static void routine(void *a) { a = 0; }
-+                        static void *start_routine(void *a) { return a; }],
-+                       [pthread_t th; pthread_attr_t attr;
-+                        pthread_create(&th, 0, start_routine, 0);
-+                        pthread_join(th, 0);
-+                        pthread_attr_init(&attr);
-+                        pthread_cleanup_push(routine, 0);
-+                        pthread_cleanup_pop(0) /* ; */])],
-+                [ax_pthread_ok=yes],
-+                [])
-+
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+
-+        AC_MSG_RESULT([$ax_pthread_ok])
-+        if test "x$ax_pthread_ok" = xyes; then
-+                break;
-+        fi
-+
-+        PTHREAD_LIBS=""
-+        PTHREAD_CFLAGS=""
-+done
-+fi
-+
-+# Various other checks:
-+if test "x$ax_pthread_ok" = xyes; then
-+        save_LIBS="$LIBS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+
-+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-+        AC_MSG_CHECKING([for joinable pthread attribute])
-+        attr_name=unknown
-+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-+                           [int attr = $attr; return attr /* ; */])],
-+                [attr_name=$attr; break],
-+                [])
-+        done
-+        AC_MSG_RESULT([$attr_name])
-+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-+            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
-+                               [Define to necessary symbol if this constant
-+                                uses a non-standard name on your system.])
-+        fi
-+
-+        AC_MSG_CHECKING([if more special flags are required for pthreads])
-+        flag=no
-+        case ${host_os} in
-+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
-+            osf* | hpux*) flag="-D_REENTRANT";;
-+            solaris*)
-+            if test "$GCC" = "yes"; then
-+                flag="-D_REENTRANT"
-+            else
-+                # TODO: What about Clang on Solaris?
-+                flag="-mt -D_REENTRANT"
-+            fi
-+            ;;
-+        esac
-+        AC_MSG_RESULT([$flag])
-+        if test "x$flag" != xno; then
-+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-+        fi
-+
-+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-+            [ax_cv_PTHREAD_PRIO_INHERIT], [
-+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-+                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
-+                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-+                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
-+            ])
-+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
-+            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
-+
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+
-+        # More AIX lossage: compile with *_r variant
-+        if test "x$GCC" != xyes; then
-+            case $host_os in
-+                aix*)
-+                AS_CASE(["x/$CC"],
-+                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-+                  [#handle absolute path differently from PATH based program lookup
-+                   AS_CASE(["x$CC"],
-+                     [x/*],
-+                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-+                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-+                ;;
-+            esac
-+        fi
-+fi
-+
-+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-+
-+AC_SUBST([PTHREAD_LIBS])
-+AC_SUBST([PTHREAD_CFLAGS])
-+AC_SUBST([PTHREAD_CC])
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x"$ax_pthread_ok" = xyes; then
-+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-+        :
-+else
-+        ax_pthread_ok=no
-+        $2
-+fi
-+AC_LANG_POP
-+])dnl AX_PTHREAD
---- cdrdao-1.2.4/m4/gconf-2.m4
-+++ cdrdao-1.2.4/m4/gconf-2.m4
-@@ -0,0 +1,44 @@
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-+dnl  (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl  you should install foo.schemas files
-+dnl
-+
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+  else
-+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+  fi
-+
-+  AC_ARG_WITH([gconf-source],
-+	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+			     [Config database for installing schema files.]),
-+	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-+
-+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+
-+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+  fi
-+
-+  AC_ARG_WITH([gconf-schema-file-dir],
-+	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+			     [Directory for installing schema files.]),
-+	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+
-+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+
-+  AC_ARG_ENABLE(schemas-install,
-+  	AC_HELP_STRING([--disable-schemas-install],
-+		       [Disable the schemas installation]),
-+     [case ${enableval} in
-+       yes|no) ;;
-+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-+      esac])
-+  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-+])
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.4-wformat-security.patch b/app-cdr/cdrdao/files/cdrdao-1.2.4-wformat-security.patch
deleted file mode 100644
index 92ebbdc37460..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.4-wformat-security.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Fix -Werror=format-security errors
-Also fix incorrect printf() format specifiers
-https://bugs.gentoo.org/show_bug.cgi?id=520988
-
-* gen.c: In function 'genHdr':
-* gen.c:3869:17: error: format not a string literal and no format arguments [-Werror=format-security]
-
---- cdrdao-1.2.4/pccts/antlr/bits.c
-+++ cdrdao-1.2.4/pccts/antlr/bits.c
-@@ -574,13 +574,13 @@
- 	else
- 		fprintf(DefFile, "extern SetWordType zzerr%d[];\n", esetnum);
- 	if ( name!=NULL ) {
--		fprintf(ErrFile, "SetWordType %s%s[%d] = {",
-+		fprintf(ErrFile, "SetWordType %s%s[%lu] = {",
- 				name,
-                 suffix,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
- 	}
- 	else {
--		fprintf(ErrFile, "SetWordType zzerr%d[%d] = {",
-+		fprintf(ErrFile, "SetWordType zzerr%d[%lu] = {",
- 				esetnum,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
- 	}
-@@ -642,20 +642,20 @@
- 	esetnum++;
- 
- 	if ( name!=NULL ) {
--		fprintf(Parser_h, "\tstatic SetWordType %s%s[%d];\n", name, suffix,
-+		fprintf(Parser_h, "\tstatic SetWordType %s%s[%lu];\n", name, suffix,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
--		fprintf(Parser_c, "SetWordType %s::%s%s[%d] = {",
-+		fprintf(Parser_c, "SetWordType %s::%s%s[%lu] = {",
- 				CurrentClassName,
- 				name,
- 				suffix,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
- 	}
- 	else {
--		fprintf(Parser_c, "SetWordType %s::err%d[%d] = {",
-+		fprintf(Parser_c, "SetWordType %s::err%d[%lu] = {",
- 				CurrentClassName,
- 				esetnum,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
--		fprintf(Parser_h, "\tstatic SetWordType err%d[%d];\n", esetnum,
-+		fprintf(Parser_h, "\tstatic SetWordType err%d[%lu];\n", esetnum,
- 				NumWords(TokenNum-1)*sizeof(unsigned));
- 	}
- 
-@@ -788,7 +788,7 @@
- 
- 	/* Build constructors */
- 	fprintf(Parser_c, "\n%s::", CurrentClassName);
--	fprintf(Parser_c,	"%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%d)\n",
-+	fprintf(Parser_c,	"%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%lu)\n",
- 						CurrentClassName,
- 						(BaseClassName == NULL ? "ANTLRParser" : BaseClassName),
- 						OutputLL_k,
-@@ -913,7 +913,7 @@
- #ifdef DUM
- 	if ( LexGen ) fprintf(ErrFile, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
- #endif
--	fprintf(ErrFile, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
-+	fprintf(ErrFile, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
- 	if ( DemandLookahead ) fprintf(ErrFile, "#define DEMAND_LOOK\n");
- 	fprintf(ErrFile, "#include \"antlr.h\"\n");
- 	if ( GenAST ) fprintf(ErrFile, "#include \"ast.h\"\n");
---- cdrdao-1.2.4/pccts/antlr/gen.c
-+++ cdrdao-1.2.4/pccts/antlr/gen.c
-@@ -159,7 +159,7 @@
- #define gen6(s,a,b,c,d,e,f)	{tab(); fprintf(output, s,a,b,c,d,e,f);}
- #define gen7(s,a,b,c,d,e,f,g)	{tab(); fprintf(output, s,a,b,c,d,e,f,g);}
- 
--#define _gen(s)			{fprintf(output, s);}
-+#define _gen(s)			{fprintf(output, "%s", s);}
- #define _gen1(s,a)		{fprintf(output, s,a);}
- #define _gen2(s,a,b)	{fprintf(output, s,a,b);}
- #define _gen3(s,a,b,c)	{fprintf(output, s,a,b,c);}
-@@ -3911,7 +3911,7 @@
- 	}
- #endif
- 	/* ###WARNING: This will have to change when SetWordSize changes */
--	if ( !GenCC ) _gen1("#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
-+	if ( !GenCC ) _gen1("#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
-     if (TraceGen) {
-       _gen("#ifndef zzTRACE_RULES\n");  /* MR20 */
-       _gen("#define zzTRACE_RULES\n");  /* MR20 */
-@@ -4125,7 +4125,7 @@
- 	if ( LexGen ) fprintf(f, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
- #endif
- 	/* ###WARNING: This will have to change when SetWordSize changes */
--	fprintf(f, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));
-+	fprintf(f, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
-     if (TraceGen) {
-       fprintf(f,"#ifndef zzTRACE_RULES\n");  /* MR20 */
-       fprintf(f,"#define zzTRACE_RULES\n");  /* MR20 */
---- cdrdao-1.2.4/pccts/antlr/set.c
-+++ cdrdao-1.2.4/pccts/antlr/set.c
-@@ -263,7 +263,7 @@
- 	static set a;
- 
- 	if ( b == nil ) return( empty );
--	set_new(a, b);
-+	set_new(a, (long unsigned int) b);
- 	a.setword[DIVWORD(b)] = bitmask[MODWORD(b)];
- 
- 	return(a);
---- cdrdao-1.2.4/pccts/dlg/set.c
-+++ cdrdao-1.2.4/pccts/dlg/set.c
-@@ -263,7 +263,7 @@
- 	static set a;
- 
- 	if ( b == nil ) return( empty );
--	set_new(a, b);
-+	set_new(a, (long unsigned int) b);
- 	a.setword[DIVWORD(b)] = bitmask[MODWORD(b)];
- 
- 	return(a);
---- cdrdao-1.2.4/pccts/h/set.h
-+++ cdrdao-1.2.4/pccts/h/set.h
-@@ -55,7 +55,7 @@
- /* make arg1 a set big enough to hold max elem # of arg2 */
- #define set_new(a,_max) \
- if (((a).setword=(unsigned *)calloc(NumWords(_max),BytesPerWord))==NULL) \
--        fprintf(stderr, "set_new: Cannot allocate set with max of %d\n", _max); \
-+        fprintf(stderr, "set_new: Cannot allocate set with max of %lu\n", _max); \
-         (a).n = NumWords(_max);
- 
- #define set_free(a)									\
diff --git a/app-cdr/cdrdao/metadata.xml b/app-cdr/cdrdao/metadata.xml
deleted file mode 100644
index 266fe7cc02d8..000000000000
--- a/app-cdr/cdrdao/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-	CD command line recording, ripping and copying tool.	Especially ISOs- and
-	bin/cue-files are handled very well.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">cdrdao</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/cdrtools-3.02_alpha07-r1 b/app-cdr/cdrtools-3.02_alpha07-r1
new file mode 100644
index 000000000000..fa5ddccee302
--- /dev/null
+++ b/app-cdr/cdrtools-3.02_alpha07-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit x11-misc/makedepend nls? ( >=sys-devel/gettext-0.18.1.1 ) filecaps? ( sys-libs/libcap ) sys-devel/gnuconfig
+DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/cdrtools/
+IUSE=acl caps nls unicode +filecaps
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
+RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
+SLOT=0
+SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a07.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=484a48c8b199e8b24054a4f06b6d18f1
diff --git a/app-cdr/cdrtools-3.02_alpha09 b/app-cdr/cdrtools-3.02_alpha09
new file mode 100644
index 000000000000..0af6da0a1ce6
--- /dev/null
+++ b/app-cdr/cdrtools-3.02_alpha09
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit x11-misc/makedepend nls? ( >=sys-devel/gettext-0.18.1.1 ) filecaps? ( sys-libs/libcap ) sys-devel/gnuconfig
+DESCRIPTION=A set of tools for CD/DVD reading and recording, including cdrecord
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/cdrtools/
+IUSE=acl caps nls unicode +filecaps
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1 CDDL-Schily
+RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) !app-cdr/cdrkit
+SLOT=0
+SRC_URI=mirror://sourceforge/cdrtools/alpha/cdrtools-3.02a09.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e91f6fce55798eedfea72238d2e56090
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
deleted file mode 100644
index 7da703440015..000000000000
--- a/app-cdr/cdrtools/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f89787fded558e88edecde89237ea5097b6a6cc0233b5950f0df460490af415255a56130d27b7198b3c1fee279e288835f9 SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077
-DIST cdrtools-3.02a07.tar.bz2 2127058 BLAKE2B 5307a012a0d4a593d7e0fc879e2ac0dab8ddcca573772194b3a5bbb3be74fc8109d9af720dd12369b4ef5c51ddc70ebad9e8c5a672d6dee62e7462dc67407ab4 SHA512 7f9835dd32ccca119d2ab77de1cdbd8cfbacc8e9923ca42175a15a5b1f45a8aa238fa3b0917ff67697b54905edc78a142f7106af9127854f944adead4a0d826d
-DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha07-r1.ebuild 8266 BLAKE2B 0ca2f4a823bd5f74f3fc0dd991a75b74c28e22d8fa6f2ad543bcfeac2ac2a9175b1bb821f79d6c9a9b315d50eea44e4ee3521f8e3badbcfce52cb7a525e4048c SHA512 b53f2141f7a7f83445b09a745425fcce2c5225ea0870b525b7698dbc3f9958eb07913913e23a1273b400e867c5a0e12416236840a1ef01e27dc53b2b5adde7a2
-EBUILD cdrtools-3.02_alpha09.ebuild 8267 BLAKE2B 6ebdcc3398107889061db42997d019461f22fd213bc3160757a243d36b6cc456915383442c8f2d3db251faad20677fe8d5d444ab1ee6f5cf8f5aa8ee3432eb25 SHA512 54c1bd95af2e3e843aa8d73faa332fc16ce1eb3be9e544dbf7882a46a0af70b8a9012569eab3ca9ce06c37c3bc74f1a28ec56596bc349dbe8f95b5e2ca8c7ba8
-MISC metadata.xml 533 BLAKE2B 13eeaf0e3fd17234f44138fc6b6fe1b0ef5e369b823a1adb9063743702b9afe86f1d939bb451df1cc6337c2e3790e38b1f890e68c46eeed9210ccc6d96e0944e SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha07-r1.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha07-r1.ebuild
deleted file mode 100644
index 720f7505f5d7..000000000000
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha07-r1.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
-SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl caps nls unicode"
-
-RDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	nls? ( virtual/libintl )
-	!app-cdr/cdrkit"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	nls? ( >=sys-devel/gettext-0.18.1.1 )"
-
-S=${WORKDIR}/${P/_alpha[0-9][0-9]}
-
-FILECAPS=(
-	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
-	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
-	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
-)
-
-cdrtools_os() {
-	local os="linux"
-	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
-	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
-	echo "${os}"
-}
-
-src_prepare() {
-	default
-
-	gnuconfig_update
-
-	# This fixes a clash with clone() on uclibc.  Upstream isn't
-	# 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
-
-	# Remove profiled make files.
-	find -name '*_p.mk' -delete || die "delete *_p.mk"
-
-	# Adjusting hardcoded paths.
-	sed -i -e "s|opt/schily|usr|" \
-		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
-		|| die "sed opt/schily"
-
-	sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
-		|| die "sed doc"
-
-	# Respect libdir.
-	sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
-		|| die "sed multilib"
-
-	# Do not install static libraries.
-	sed -i -e "s|include\t\t.*rules.lib||" \
-		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
-		|| die "sed rules"
-
-	# Enable verbose build.
-	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
-		RULES/*.rul RULES/rules.prg RULES/rules.inc \
-		|| die "sed verbose rules"
-
-	# Respect CC/CXX variables.
-	cd "${S}"/RULES || die
-	local tcCC=$(tc-getCC)
-	local tcCXX=$(tc-getCXX)
-	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
-		rules1.top || die "sed rules1.top"
-	sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
-		-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
-		-e "/COPTOPT=/s|-O||" \
-		-e 's|$(GCCOPTOPT)||' \
-		cc-gcc.rul || die "sed cc-gcc.rul"
-	sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
-		rules.cnf || die "sed rules.cnf"
-
-	# Schily make setup.
-	cd "${S}"/DEFAULTS || die
-	local os=$(cdrtools_os)
-
-	sed -i \
-		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
-		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
-		-e "s|^\(LDPATH=\).*|\1|" \
-		-e "s|^\(RUNPATH=\).*|\1|" \
-		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
-		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
-		-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
-		-e '/^DEFUMASK/s,002,022,g' \
-		Defaults.${os} || die "sed Schily make setup"
-	# re DEFUMASK above:
-	# bug 486680: grsec TPE will block the exec if the directory is
-	# group-writable. This is painful with cdrtools, because it makes a bunch of
-	# group-writable directories during build. Change the umask on their
-	# creation to prevent this.
-}
-
-ac_cv_sizeof() {
-	cat <<-EOF >"${T}"/test.c
-	#include <inttypes.h>
-	#include <stddef.h>
-	#include <stdint.h>
-	#include <sys/types.h>
-	int main () {
-		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
-		test_array [0] = 0;
-		return test_array [0];
-	}
-	EOF
-
-	local i=1
-	while [[ ${i} -lt 20 ]] ; do
-		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
-			echo ${i}
-			return 0
-		fi
-		: $(( i += 1 ))
-	done
-	return 1
-}
-
-src_configure() {
-	use acl || export ac_cv_header_sys_acl_h="no"
-	use caps || export ac_cv_lib_cap_cap_get_proc="no"
-	export ac_cv_header_pulse_pulseaudio_h="no"
-
-	# skip obsolete configure script
-	if tc-is-cross-compiler ; then
-		# Cache known values for targets. #486680
-
-		tc-export CC
-		local var val t types=(
-			char "short int" int "long int" "long long"
-			"unsigned char" "unsigned short int" "unsigned int"
-			"unsigned long int" "unsigned long long"
-			float double "long double" size_t ssize_t ptrdiff_t
-			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
-			"char *" "unsigned char *"
-		)
-		for t in "${types[@]}" ; do
-			var="ac_cv_sizeof_${t// /_}"
-			var=${var//[*]/p}
-			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
-			export "${var}=${val}"
-			einfo "Computing sizeof(${t}) as ${val}"
-		done
-		# We don't have these types.
-		export ac_cv_sizeof___int64=0
-		export ac_cv_sizeof_unsigned___int64=0
-		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
-
-		export ac_cv_type_prototypes="yes"
-		export ac_cv_func_mlock{,all}="yes"
-		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
-		export ac_cv_func_dtoa_r="no"
-		export ac_cv_func_sys_siglist{,_def}="no"
-		export ac_cv_func_printf_{j,ll}="yes"
-		export ac_cv_realloc_null="yes"
-		export ac_cv_no_user_malloc="no"
-		export ac_cv_var_timezone="yes"
-		export ac_cv_var___progname{,_full}="yes"
-		export ac_cv_fnmatch_igncase="yes"
-		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
-		export ac_cv_file__usr_src_linux_include="no"
-
-		case $(cdrtools_os) in
-		linux)
-			export ac_cv_func_bsd_{g,s}etpgrp="no"
-			export ac_cv_hard_symlinks="yes"
-			export ac_cv_link_nofollow="yes"
-			export ac_cv_access_e_ok="no"
-
-			export ac_cv_dev_minor_noncontig="yes"
-			case ${ac_cv_sizeof_long_int} in
-			4) export ac_cv_dev_minor_bits="32";;
-			8) export ac_cv_dev_minor_bits="44";;
-			esac
-
-			cat <<-EOF >"${T}"/test.c
-			struct {
-				char start[6];
-				unsigned char x1:4;
-				unsigned char x2:4;
-				char end[5];
-			} a = {
-				.start = {'S', 't', 'A', 'r', 'T', '_'},
-				.x1 = 5,
-				.x2 = 4,
-				.end = {'_', 'e', 'N', 'd', 'X'},
-			};
-			EOF
-			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
-			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="no"
-			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="yes"
-			fi
-			;;
-		esac
-	fi
-}
-
-src_compile() {
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
-		fi
-	fi
-
-	# If not built with -j1, "sometimes" cdda2wav will not be built.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
-}
-
-src_install() {
-	# If not built with -j1, "sometimes" manpages are not installed.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
-
-	# These symlinks are for compat with cdrkit.
-	dosym schily /usr/include/scsilib
-	dosym ../scg /usr/include/schily/scg
-
-	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
-
-	cd "${S}"/cdda2wav || die
-	docinto cdda2wav
-	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
-
-	cd "${S}"/mkisofs || die
-	docinto mkisofs
-	dodoc ChangeLog* TODO
-
-	# Remove man pages related to the build system
-	rm -rvf "${ED}"/usr/share/man/man5 || die
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		einfo
-		einfo "Darwin/OS X use the following device names:"
-		einfo
-		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
-		einfo
-		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
-		einfo
-	fi
-}
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
deleted file mode 100644
index b8be28aa15fa..000000000000
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
-SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl caps nls unicode"
-
-RDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	nls? ( virtual/libintl )
-	!app-cdr/cdrkit"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	nls? ( >=sys-devel/gettext-0.18.1.1 )"
-
-S=${WORKDIR}/${P/_alpha[0-9][0-9]}
-
-FILECAPS=(
-	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
-	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
-	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
-)
-
-cdrtools_os() {
-	local os="linux"
-	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
-	[[ ${CHOST} == *-freebsd* ]] && os="freebsd"
-	echo "${os}"
-}
-
-src_prepare() {
-	default
-
-	gnuconfig_update
-
-	# This fixes a clash with clone() on uclibc.  Upstream isn't
-	# 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
-
-	# Remove profiled make files.
-	find -name '*_p.mk' -delete || die "delete *_p.mk"
-
-	# Adjusting hardcoded paths.
-	sed -i -e "s|opt/schily|usr|" \
-		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
-		|| die "sed opt/schily"
-
-	sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
-		|| die "sed doc"
-
-	# Respect libdir.
-	sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
-		|| die "sed multilib"
-
-	# Do not install static libraries.
-	sed -i -e "s|include\t\t.*rules.lib||" \
-		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
-		|| die "sed rules"
-
-	# Enable verbose build.
-	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
-		RULES/*.rul RULES/rules.prg RULES/rules.inc \
-		|| die "sed verbose rules"
-
-	# Respect CC/CXX variables.
-	cd "${S}"/RULES || die
-	local tcCC=$(tc-getCC)
-	local tcCXX=$(tc-getCXX)
-	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
-		rules1.top || die "sed rules1.top"
-	sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
-		-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
-		-e "/COPTOPT=/s|-O||" \
-		-e 's|$(GCCOPTOPT)||' \
-		cc-gcc.rul || die "sed cc-gcc.rul"
-	sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
-		rules.cnf || die "sed rules.cnf"
-
-	# Schily make setup.
-	cd "${S}"/DEFAULTS || die
-	local os=$(cdrtools_os)
-
-	sed -i \
-		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
-		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
-		-e "s|^\(LDPATH=\).*|\1|" \
-		-e "s|^\(RUNPATH=\).*|\1|" \
-		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
-		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
-		-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
-		-e '/^DEFUMASK/s,002,022,g' \
-		Defaults.${os} || die "sed Schily make setup"
-	# re DEFUMASK above:
-	# bug 486680: grsec TPE will block the exec if the directory is
-	# group-writable. This is painful with cdrtools, because it makes a bunch of
-	# group-writable directories during build. Change the umask on their
-	# creation to prevent this.
-}
-
-ac_cv_sizeof() {
-	cat <<-EOF >"${T}"/test.c
-	#include <inttypes.h>
-	#include <stddef.h>
-	#include <stdint.h>
-	#include <sys/types.h>
-	int main () {
-		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
-		test_array [0] = 0;
-		return test_array [0];
-	}
-	EOF
-
-	local i=1
-	while [[ ${i} -lt 20 ]] ; do
-		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
-			echo ${i}
-			return 0
-		fi
-		: $(( i += 1 ))
-	done
-	return 1
-}
-
-src_configure() {
-	use acl || export ac_cv_header_sys_acl_h="no"
-	use caps || export ac_cv_lib_cap_cap_get_proc="no"
-	export ac_cv_header_pulse_pulseaudio_h="no"
-
-	# skip obsolete configure script
-	if tc-is-cross-compiler ; then
-		# Cache known values for targets. #486680
-
-		tc-export CC
-		local var val t types=(
-			char "short int" int "long int" "long long"
-			"unsigned char" "unsigned short int" "unsigned int"
-			"unsigned long int" "unsigned long long"
-			float double "long double" size_t ssize_t ptrdiff_t
-			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
-			"char *" "unsigned char *"
-		)
-		for t in "${types[@]}" ; do
-			var="ac_cv_sizeof_${t// /_}"
-			var=${var//[*]/p}
-			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
-			export "${var}=${val}"
-			einfo "Computing sizeof(${t}) as ${val}"
-		done
-		# We don't have these types.
-		export ac_cv_sizeof___int64=0
-		export ac_cv_sizeof_unsigned___int64=0
-		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
-
-		export ac_cv_type_prototypes="yes"
-		export ac_cv_func_mlock{,all}="yes"
-		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
-		export ac_cv_func_dtoa_r="no"
-		export ac_cv_func_sys_siglist{,_def}="no"
-		export ac_cv_func_printf_{j,ll}="yes"
-		export ac_cv_realloc_null="yes"
-		export ac_cv_no_user_malloc="no"
-		export ac_cv_var_timezone="yes"
-		export ac_cv_var___progname{,_full}="yes"
-		export ac_cv_fnmatch_igncase="yes"
-		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
-		export ac_cv_file__usr_src_linux_include="no"
-
-		case $(cdrtools_os) in
-		linux)
-			export ac_cv_func_bsd_{g,s}etpgrp="no"
-			export ac_cv_hard_symlinks="yes"
-			export ac_cv_link_nofollow="yes"
-			export ac_cv_access_e_ok="no"
-
-			export ac_cv_dev_minor_noncontig="yes"
-			case ${ac_cv_sizeof_long_int} in
-			4) export ac_cv_dev_minor_bits="32";;
-			8) export ac_cv_dev_minor_bits="44";;
-			esac
-
-			cat <<-EOF >"${T}"/test.c
-			struct {
-				char start[6];
-				unsigned char x1:4;
-				unsigned char x2:4;
-				char end[5];
-			} a = {
-				.start = {'S', 't', 'A', 'r', 'T', '_'},
-				.x1 = 5,
-				.x2 = 4,
-				.end = {'_', 'e', 'N', 'd', 'X'},
-			};
-			EOF
-			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
-			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="no"
-			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="yes"
-			fi
-			;;
-		esac
-	fi
-}
-
-src_compile() {
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
-		fi
-	fi
-
-	# If not built with -j1, "sometimes" cdda2wav will not be built.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
-}
-
-src_install() {
-	# If not built with -j1, "sometimes" manpages are not installed.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
-
-	# These symlinks are for compat with cdrkit.
-	dosym schily /usr/include/scsilib
-	dosym ../scg /usr/include/schily/scg
-
-	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
-
-	cd "${S}"/cdda2wav || die
-	docinto cdda2wav
-	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
-
-	cd "${S}"/mkisofs || die
-	docinto mkisofs
-	dodoc ChangeLog* TODO
-
-	# Remove man pages related to the build system
-	rm -rvf "${ED}"/usr/share/man/man5 || die
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		einfo
-		einfo "Darwin/OS X use the following device names:"
-		einfo
-		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
-		einfo
-		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
-		einfo
-	fi
-}
diff --git a/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch b/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch
deleted file mode 100644
index 9ffd28a5ba5c..000000000000
--- a/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur cdrtools-3.02.orig/readcd/readcd.c cdrtools-3.02/readcd/readcd.c
---- cdrtools-3.02.orig/readcd/readcd.c	2016-01-24 11:15:19.000000000 -0500
-+++ cdrtools-3.02/readcd/readcd.c	2016-04-09 12:29:54.727635502 -0400
-@@ -257,7 +257,7 @@
- BOOL	pifscan;
- BOOL	plot;
- BOOL	fulltoc;
--BOOL	clone;
-+BOOL	clonetoc;
- BOOL	edc_corr;
- BOOL	noerror;
- BOOL	nocorr;
-@@ -294,7 +294,7 @@
- 	error(_("\t-plot		Print data suitable for gnuplot\n"));
- #ifdef	CLONE_WRITE
- 	error(_("\t-fulltoc	Retrieve the full TOC\n"));
--	error(_("\t-clone		Retrieve the full TOC and all data\n"));
-+	error(_("\t-clonetoc		Retrieve the full TOC and all data\n"));
- 	error(_("\t-edc-corr	Try to do user level Reed Solomon repair (experimental)\n"));
- #endif
- 	error(_("\ttimeout=#	set the default SCSI command timeout to #.\n"));
-@@ -320,7 +320,7 @@
- }
- 
- /* CSTYLED */
--char	opts[]   = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clone,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
-+char	opts[]   = "debug#,d+,kdebug#,kd#,timeout#,quiet,q,verbose+,v+,Verbose+,V+,x+,xd#,silent,s,help,h,version,scanbus,dev*,scgopts*,sectors*,w,c2scan,cxscan,pi8scan,pifscan,plot,fulltoc,clonetoc,edc-corr,noerror,nocorr,notrunc,retries#,factor,f*,speed#,ts&,overhead,meshpoints#";
- 
- EXPORT int
- main(ac, av)
-@@ -397,7 +397,7 @@
- 			&scanbus, &dev, &scgopts, &sectors, &do_write,
- 			&c2scan, &cxscan, &pi8scan, &pifscan,
- 			&plot,
--			&fulltoc, &clone,
-+			&fulltoc, &clonetoc,
- 			&edc_corr,
- 			&noerror, &nocorr,
- 			&notrunc, &retries, &do_factor, &filename,
-@@ -679,7 +679,7 @@
- 
- 	if (filename || sectors || c2scan || cxscan || pi8scan || pifscan ||
- 	    meshpoints || fulltoc ||
--	    clone || edc_corr) {
-+	    clonetoc || edc_corr) {
- 		dorw(scgp, filename, sectors);
- 	} else {
- 		doit(scgp);
-@@ -894,9 +894,9 @@
- 		if (params.name == NULL)
- 			params.name = "/dev/null";
- 		read_ftoc(scgp, &params, FALSE);
--	} else if (clone || edc_corr) {
-+	} else if (clonetoc || edc_corr) {
- 		if (!is_mmc(scgp, NULL, NULL))
--			comerrno(EX_BAD, _("Unsupported device for clone mode.\n"));
-+			comerrno(EX_BAD, _("Unsupported device for clonetoc mode.\n"));
- 		if (!edc_corr)
- 			noerror = TRUE;
- 		if (retries == MAX_RETRY)
-@@ -904,7 +904,7 @@
- 		if (params.name == NULL)
- 			params.name = "/dev/null";
- 
--		if (clone)
-+		if (clonetoc)
- 		if (read_ftoc(scgp, &params, TRUE) < 0)
- 			comerrno(EX_BAD, _("Read fulltoc problems.\n"));
- 		readcd_disk(scgp, &params);
diff --git a/app-cdr/cdrtools/metadata.xml b/app-cdr/cdrtools/metadata.xml
deleted file mode 100644
index f049ae2e6331..000000000000
--- a/app-cdr/cdrtools/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>billie@gentoo.org</email>
-		<name>Daniel Pielmeier</name>
-	</maintainer>
-	<upstream>
-		<maintainer>
-			<email>joerg.schilling@fokus.fraunhofer.de</email>
-			<name>Jörg Schilling</name>
-		</maintainer>
-		<remote-id type="sourceforge">cdrtools</remote-id>
-	</upstream>
-	<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
-</pkgmetadata>
diff --git a/app-cdr/cdw-0.8.0 b/app-cdr/cdw-0.8.0
new file mode 100644
index 000000000000..189a2eeab93a
--- /dev/null
+++ b/app-cdr/cdw-0.8.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode]
+DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
+EAPI=5
+HOMEPAGE=http://cdw.sourceforge.net
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode]
+SLOT=0
+SRC_URI=mirror://sourceforge/cdw/cdw-0.8.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f43779f5383eac66deb1f622253a5809
diff --git a/app-cdr/cdw-9999 b/app-cdr/cdw-9999
new file mode 100644
index 000000000000..b0a7b90ec982
--- /dev/null
+++ b/app-cdr/cdw-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/cvs
+DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
+EAPI=5
+HOMEPAGE=http://cdw.sourceforge.net
+LICENSE=GPL-2
+RDEPEND=virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode]
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	cvs	c57fc648b829862b38ad2a8b8c1c02e8	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=41e29f44b1041daae7b93efff36ae6e3
diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
deleted file mode 100644
index b6ace0ecc2c3..000000000000
--- a/app-cdr/cdw/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX cdw-0.8.0-uclibc.patch 740 BLAKE2B d546a26870f9beba9b9c7471d94d5e3a5c9e23e88064356f06890683615e73651b3acf90b835b5fe2a3fa24c88cc24b28a471083a035d6b11e53ef76f067355d SHA512 1b2a1101037d7999f361b686685509745d71e953ce45dcd33cb52d73510ee684faaea1b6715627a2944068ebacf5130b9a881bbc73061714c4d1643233042c93
-DIST cdw-0.8.0.tar.gz 849851 BLAKE2B 395a8cf527c676da6056dd5b887625c2d6a7ac214651351e6412e846cb435c179785c406a9e4306a72c9a7982eb8e1a0600719ca481307a8efdee5da6e626089 SHA512 67fd9e397800187baafff425fd77ae9ba679a7b396736004f305accea3c3c9ca215d70dac0410fd8ef9ed016f7ce11c3859c84bfa04e3234cee84201605175d0
-EBUILD cdw-0.8.0.ebuild 638 BLAKE2B 84e0b4074f75b011d6e688229d9456d93254c2311fcb1c8f55654fe30e9ecdfcf5b8a1b22188b66e570dcd86e6fa03dd54ea8369700309aa874ffdc1be8be791 SHA512 eafd53379d69dd7f4755ebe950cd63100dd9dabe65983dbd82b332742868a4e764f16e93bd287293d3751a5703b24edd86f5d7f2f0cb78be948ebd9854324b82
-EBUILD cdw-9999.ebuild 728 BLAKE2B 27aec6e24d07a7709b3e243c30239708eab935b96d901a181006f08f929d5e5510f6ae6ed4dde4476d35e6fec825498934382c6cdab8c8f0faf8242316dad19c SHA512 201717df85037d106db0670b4ff528147851ed8e2502665484577f188b1164f7cfc99fd66c1e85d4f365a7b0bf63f98bc6a7e52b6988d741a596bbaee30f7599
-MISC metadata.xml 240 BLAKE2B 0afeda9a0f5f12f46f814e39da9b888116a752948c98603475a0745af8489c5c88b9ace8956a58c4d6699d382a05e683f2798867068e0c58a28c31ed8898d494 SHA512 ff094d0df1386eff97f6a48bd936826782717d38a8f51d4c1d06a066ce95b4ebe275ae23c7229d5bb7467c03a38fa85e23c04a7b65cbb89d8f3ef56a64dd1664
diff --git a/app-cdr/cdw/cdw-0.8.0.ebuild b/app-cdr/cdw/cdw-0.8.0.ebuild
deleted file mode 100644
index 2bcc1069a8b0..000000000000
--- a/app-cdr/cdw/cdw-0.8.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-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"
-IUSE=""
-
-DEPEND="virtual/cdrtools
-	app-cdr/dvd+rw-tools
-	dev-libs/libburn
-	dev-libs/libcdio[-minimal]
-	sys-libs/ncurses[unicode]"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-uclibc.patch
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
-		default
-}
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
deleted file mode 100644
index 68ab7c086d59..000000000000
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw"
-ECVS_MODULE="cdw"
-ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
-
-inherit autotools eutils cvs
-
-MY_P=${PN}_${PV}
-DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
-HOMEPAGE="http://cdw.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="virtual/cdrtools
-	app-cdr/dvd+rw-tools
-	dev-libs/libburn
-	dev-libs/libcdio[-minimal]
-	sys-libs/ncurses[unicode]"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
-		default
-}
diff --git a/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch b/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch
deleted file mode 100644
index eedf7e13642b..000000000000
--- a/app-cdr/cdw/files/cdw-0.8.0-uclibc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- cdw-0.8.0/src/main.c
-+++ cdw-0.8.0-uclibc/src/main.c
-@@ -44,7 +44,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __UCLIBC__
- #include <mcheck.h>
-+#endif
- #include <signal.h> /* sig_atomic_t */
- 
- #include <dirent.h> /* PATH_MAX */
---- cdw-0.8.0/src/tasks/cdw_create_image.c
-+++ cdw-0.8.0-uclibc/src/tasks/cdw_create_image.c
-@@ -21,6 +21,7 @@
- 
- #include <inttypes.h>
- #include <stdlib.h>
-+#include <unistd.h>
- 
- #include "cdw_file_manager.h"
- #include "gettext.h"
---- cdw-0.8.0/src/utilities/cdw_utils.c
-+++ cdw-0.8.0-uclibc/src/utilities/cdw_utils.c
-@@ -28,6 +28,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <unistd.h>
- 
- #include "cdw_logging.h"
- #include "gettext.h"
diff --git a/app-cdr/cdw/metadata.xml b/app-cdr/cdw/metadata.xml
deleted file mode 100644
index c2f92db9934e..000000000000
--- a/app-cdr/cdw/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">cdw</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/cue2toc-0.4 b/app-cdr/cue2toc-0.4
new file mode 100644
index 000000000000..28facdd8a59b
--- /dev/null
+++ b/app-cdr/cue2toc-0.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=!app-cdr/cdrdao
+DESCRIPTION=Convert CUE files to cdrdao's TOC format
+EAPI=6
+HOMEPAGE=http://cue2toc.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://sourceforge/cue2toc/cue2toc-0.4.tar.gz
+_md5_=820f6f23b37c6f89add8b2d4797ad633
diff --git a/app-cdr/cue2toc/Manifest b/app-cdr/cue2toc/Manifest
deleted file mode 100644
index 12d4549cbdd5..000000000000
--- a/app-cdr/cue2toc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cue2toc-0.4.tar.gz 76689 BLAKE2B f5171457f0061ca1062501b54dc360b8b76a3fb402a0041fa0db4541eb41ebc04e332fafa918fac7d7ace9e50348d867ecb9e41ee09c8b3d5e621fa64a72de2e SHA512 37fd4680890a38681331d4fb83a37daa9ddc39e45b2822930328796f1f57ac39635c609b27340b1ab06dd5b73720e77d96b601d1ee994c5ce836077a368cd95d
-EBUILD cue2toc-0.4.ebuild 405 BLAKE2B 29f03818e8f33818f88a72cbc031ce3900c557bcd8aea4dd333b09b76f54ee4250c8745402382a3bfff859d01754af3a54ff7a63717631425a55f25e11f3c075 SHA512 409b926c4c5184c8f2800d562647fabb5e2d19d6eb457781f9227a762b4882d85d3f11158d4cb6cf83f579595901e584aa694d6cdd47533cbba4c5a3cf607f77
-MISC metadata.xml 724 BLAKE2B a402466ee09177145cf5854ef3a48fb0edbe2a99f09b8c31a5400f66475d5d0350c93e4a55c5220a1cd3af5efba8dbbb5d5cec8a13a46ca9a8c6ec087c17c420 SHA512 2759d0408975e9fe04b825956c9957826cc290f36ff277779dea87250618f0774eeaddaaad73e96ef8068fd130b94e2b52bb6b3a45dcb17edd116cd4fcef966a
diff --git a/app-cdr/cue2toc/cue2toc-0.4.ebuild b/app-cdr/cue2toc/cue2toc-0.4.ebuild
deleted file mode 100644
index f93c0b309e98..000000000000
--- a/app-cdr/cue2toc/cue2toc-0.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Convert CUE files to cdrdao's TOC format"
-HOMEPAGE="http://cue2toc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cue2toc/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="!app-cdr/cdrdao"
diff --git a/app-cdr/cue2toc/metadata.xml b/app-cdr/cue2toc/metadata.xml
deleted file mode 100644
index ac480ee50abf..000000000000
--- a/app-cdr/cue2toc/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		cue2toc is a free program for UNIX systems to convert CUE files to cdrdao's
-		TOC format. Features include: support for complete set of CUE commands (e.g.
-		catalog number, data and audio tracks, ISRC codes, CD-Text, Pre-/Postgaps
-		(with zero data or data from file), subindexes etc.), automatic determination
-		of session type and conversion of data files by user configurable commands
-		based on file name extension matching.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">cue2toc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/cuecue-0.2.2-r2 b/app-cdr/cuecue-0.2.2-r2
new file mode 100644
index 000000000000..0009d419cc4a
--- /dev/null
+++ b/app-cdr/cuecue-0.2.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=flac? ( media-libs/flac ) mp3? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis media-libs/libogg )
+DESCRIPTION=Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=flac mp3 +vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+REQUIRED_USE=|| ( flac mp3 vorbis )
+SLOT=0
+SRC_URI=mirror://gentoo/cuecue-0.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3d3c125c2f6ce4499c48b4756b488aa0
diff --git a/app-cdr/cuecue/Manifest b/app-cdr/cuecue/Manifest
deleted file mode 100644
index 4d90953846c9..000000000000
--- a/app-cdr/cuecue/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cuecue-0.2.2-flac113.diff 3528 BLAKE2B ea1daa82d58df58fbfc4ee9b95980f93c1a06090da5765c4f8e2fb09feea9af1b626a51ef06edac24ec1eaf0ebfc93b0d2419ad0240125e41870d894b2a57b90 SHA512 af0bcc1ca7208b9713763b823792becb8785d442cc8f51240c470096b3d90eb21bc36230ec422b42401fa0cfa335aedb578507174083de1b2ffdb01d5f5e3fb6
-AUX cuecue-0.2.2-namespace.patch 200 BLAKE2B 20a1471d2c7bb4ce08335bda46f1cf8c1e7656aebd9364e26b9847e21edf87f2cdbc20eac3b8cf2921c4e427053535865efec1e622af17723443c597f7c91a3d SHA512 8b0ee39e60e913347f7aac6517e3a150e829099cf5ada6e76e3e4fd2673692c83061b8903676902a1cf6d7f3101ef6cf0a10858f36c44995a207b30ca39d826c
-AUX cuecue-0.2.2-unused.patch 448 BLAKE2B 6ee232d07362cd285e6a7712473f7e99f6d487f08b13f8dc1f7b2e8f145f91aa39c34f3f15399057abf7eabd4fda00495fd546ec7df9503b1295a945cd23bc0a SHA512 d3cf53c0aa25cc8d3a88852564d9bc6eb6a6fd51eff4fc8348a0601ffb268d4d2078fbca6d719b3783587eec97f78fcccd76431e68307b655bcdfe09be6d17b2
-DIST cuecue-0.2.2.tar.gz 97927 BLAKE2B f3577ca59fc277ecd1c6bf68a5ccfa127ae92a00c52a4da00f2be90b87df0522407b7cca616dd44d5d9af44790ca6db146224decfd632d26893d14db9fba3c28 SHA512 586ff819910532f19bf5c0b9ca61b3efe89a4699b05dba2ca6f4a9b78a1716264238e874405486f6b006cf84ed19a1cc96af510f815af9cdb0b76be3e1011595
-EBUILD cuecue-0.2.2-r2.ebuild 1007 BLAKE2B af2f6f7d5fbf3488eb684112510d414db7125b785c06665dfd7a8fde2ec319c90dc3607d6bcbf9c88a1f677cc3e4cb6e1ba7854db189c57e2ceb4b7c9c2318f2 SHA512 97e4a50751e12c7ff3ce776be466684b4ea6d16ab5c97a2985ff27f09c2f38ade1b44d82dd8f3352bcd552cc1f3d9b86c821aeba3c6a0248d1bc3448992b37bf
-MISC metadata.xml 379 BLAKE2B 10642874a33da77fd2f8c3aa6ddd983ec157e50eb79aa4d4bec9ad9c538b36f54cd36b4ea98b7295fa8e486bd46d14a40ed161c56be87dc3eac1bd687f9e0c58 SHA512 b66aca65ce1c6beecb9c4c3cb65153dcb32aa70de53ecccf9171e2a0163af4f213d5fe753949a3bfb49a476a82856f977972bbe535034533544066b672a79b6c
diff --git a/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild
deleted file mode 100644
index a8418f36b021..000000000000
--- a/app-cdr/cuecue/cuecue-0.2.2-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Enable one use flag by default, bug 254745"
-IUSE="flac mp3 +vorbis"
-REQUIRED_USE="|| ( flac mp3 vorbis )"
-
-DEPEND="
-	flac? ( media-libs/flac )
-	mp3? ( media-libs/libmad )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-flac113.diff # bug 157706
-	"${FILESDIR}"/${P}-namespace.patch
-	"${FILESDIR}"/${P}-unused.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable flac) \
-		$(use_enable mp3) \
-		$(use_enable vorbis ogg) \
-		--disable-libFLACtest \
-		--disable-oggtest \
-		--disable-vorbistest
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	default
-
-	insinto /usr/include
-	doins src/libcuecue/cuecue.h
-}
diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff b/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
deleted file mode 100644
index ddf10dcd11bb..000000000000
--- a/app-cdr/cuecue/files/cuecue-0.2.2-flac113.diff
+++ /dev/null
@@ -1,129 +0,0 @@
---- a/src/libcuecue/flac.c
-+++ b/src/libcuecue/flac.c
-@@ -27,6 +27,12 @@
- #include "cuecue.h"
- #include "cuecue_internal.h"
- 
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- typedef struct Internal
- {
- 	FILE *dst;
-@@ -38,7 +44,11 @@
- } Internal;
- 
- 
-+#ifdef LEGACY_FLAC
- void error(const FLAC__FileDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#else
-+void error(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+#endif
- {
- 	Internal *internal = client_data;
- 	switch (status) {
-@@ -52,11 +62,21 @@
- 			strcpy(cuecue_error,"CRC Mismatch: FLAC file corrupted");
- 			internal->error=1;
- 			break;
-+#ifndef LEGACY_FLAC
-+		case FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM:
-+			strcpy(cuecue_error,"Unparseable stream");
-+			internal->error=1;
-+			break;
-+#endif
- 	}
- }
- 
- 
-+#ifdef LEGACY_FLAC
- void metadata(const FLAC__FileDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#else
-+void metadata(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+#endif
- {
- 	if(metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
- 		/* get size of the file, for progress callback */
-@@ -66,7 +86,11 @@
- }
- 
- 
-+#ifdef LEGACY_FLAC
- FLAC__StreamDecoderWriteStatus write(const FLAC__FileDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#else
-+FLAC__StreamDecoderWriteStatus write(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+#endif
- {
- 	Internal *internal = client_data;
- 	unsigned int samples = frame->header.blocksize;
-@@ -126,7 +150,11 @@
- {
- 	FILE *dst;
- 	Internal internal;
-+#ifdef LEGACY_FLAC
- 	FLAC__FileDecoder *decoder;
-+#else
-+	FLAC__StreamDecoder *decoder;
-+#endif
- 
- 	dst = fopen(file_destination, "wb");
- 
-@@ -141,7 +169,11 @@
- 	internal.error=0;
- 	internal.dst=dst;
- 
-+#ifdef LEGACY_FLAC
- 	decoder = FLAC__file_decoder_new();
-+#else
-+	decoder = FLAC__stream_decoder_new();
-+#endif
- 
- 	if (decoder==NULL) {
- 		snprintf(cuecue_error,CUECUE_ERROR_LENGTH,"Cannot create FLAC decoder! memory error ?");
-@@ -150,6 +182,7 @@
- 
- 	internal.buffer = malloc(BUFFER_SIZE);
- 
-+#ifdef LEGACY_FLAC
- 	FLAC__file_decoder_set_md5_checking(decoder, true);
- 	FLAC__file_decoder_set_filename(decoder, file_source);
- 
-@@ -162,8 +195,20 @@
- 		snprintf(cuecue_error,1024,"Cannot open '%s'",file_source);
- 		internal.error=1;
- 	}
-+#else
-+	FLAC__stream_decoder_set_md5_checking(decoder, true);
-+	if(FLAC__stream_decoder_init_file(decoder, file_source, write, metadata, error, &internal) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
-+		snprintf(cuecue_error,1024,"Cannot open '%s'",file_source);
-+		internal.error=1;
-+	}
-+#endif
- 
--	if(!FLAC__file_decoder_process_until_end_of_file(decoder)) {
-+#ifdef LEGACY_FLAC
-+	if(!FLAC__file_decoder_process_until_end_of_file(decoder))
-+#else
-+	if(!FLAC__stream_decoder_process_until_end_of_stream(decoder))
-+#endif
-+	{
- 		if (!internal.error) {
- 			/* early error, not even the time to decode metadata :) */
- 			snprintf(cuecue_error,CUECUE_ERROR_LENGTH,"Cannot open '%s'",file_source);
-@@ -171,8 +216,13 @@
- 		internal.error=1;
- 	}
- 
-+#ifdef LEGACY_FLAC
- 	FLAC__file_decoder_finish(decoder);
- 	FLAC__file_decoder_delete(decoder);
-+#else
-+	FLAC__stream_decoder_finish(decoder);
-+	FLAC__stream_decoder_delete(decoder);
-+#endif
- 
- 	fclose(dst);
- 	free(internal.buffer);
diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-namespace.patch b/app-cdr/cuecue/files/cuecue-0.2.2-namespace.patch
deleted file mode 100644
index 42ebf42d4061..000000000000
--- a/app-cdr/cuecue/files/cuecue-0.2.2-namespace.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/libcuecue/cuecue.c
-+++ b/src/libcuecue/cuecue.c
-@@ -24,7 +24,9 @@
- 
- 
- #define LINE_MAX 1024
-+#ifndef FILENAME_MAX
- #define FILENAME_MAX 1024
-+#endif
- 
- FUNC_DECODER decoders[]=
- {
diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-unused.patch b/app-cdr/cuecue/files/cuecue-0.2.2-unused.patch
deleted file mode 100644
index 86874a2698e9..000000000000
--- a/app-cdr/cuecue/files/cuecue-0.2.2-unused.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/libcuecue/cuecue.c
-+++ b/src/libcuecue/cuecue.c
-@@ -163,12 +163,8 @@
- 	char str[CUECUE_FILENAME_MAX];
- 	char *ext;
- 	int i;
--	int found=0;
--
--	ext = strrchr(filename,'.');
- 
- 	for(i=0; i<DECODER_MAX; i++) {
--		char *ext;
- 
- 		strcpy(str,filename);
- 		ext = strrchr(str,'.');
-@@ -176,7 +172,6 @@
- 			strcpy(ext,Extensions[i]);
- 			if (FileExists(str)) {
- 				strcpy(cuefile,str);
--				found=1;
- 				return 1;
- 			}
- 		}
diff --git a/app-cdr/cuecue/metadata.xml b/app-cdr/cuecue/metadata.xml
deleted file mode 100644
index 74eb34bd0058..000000000000
--- a/app-cdr/cuecue/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		cuecue is a command line program to convert .cue + [.ogg|.flac|.wav|.mp3] to
-		.cue + .bin, in order to make them easier to burn with standard burning software.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-cdr/cuegen-1.2.0 b/app-cdr/cuegen-1.2.0
new file mode 100644
index 000000000000..bfeaeab0f112
--- /dev/null
+++ b/app-cdr/cuegen-1.2.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=CUEgen is a FLAC-compatible cuesheet generator for Linux
+EAPI=6
+HOMEPAGE=http://www.cs.man.ac.uk/~slavinp/cuegen.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.cs.man.ac.uk/~slavinp/files/cuegen-1.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b1e0efebc291212efc63f86573a475ce
diff --git a/app-cdr/cuegen/Manifest b/app-cdr/cuegen/Manifest
deleted file mode 100644
index c0e0794d1dfc..000000000000
--- a/app-cdr/cuegen/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cuegen-1.2.0-fix-build-system.patch 260 BLAKE2B 9318ece2533fd138b6666562d564fd6d6fb7fd2891e99207b4f7c65e2e75a43950ce10756c8fc82f02d08ae6090568c13a8abce48a0e6e800d7d21ceb674f2fc SHA512 438b0a306e149e76d4e63bb6206f2296f2ebd6bcaa960ab4f8778188ec4ccb5a2497126d8d6b4076a779a92c2fa3f12b125d2b5ff59332b690250f5c03b5f4ee
-DIST cuegen-1.2.0.tar.gz 4411 BLAKE2B 1f728200823c1121fdb165ee6af1f41cf8ac79e867cc173869843775d36d13ae6798f080b3a7c05d3f36c9fa8e0634edd9f09af5281d19165bb1c24a1ed3e9e1 SHA512 b1da7686944299994b8a04e3253aabc9c6b262f5f2d6d343d0ddd9b06d2c4b1e30441cfc9be6032675148e8d3146709924a486ef004102e02b5f90af7127d58e
-EBUILD cuegen-1.2.0.ebuild 608 BLAKE2B 1afc8988e0a854a8599ec1269a1f05ef872d2e3ed11455a752ef40c169ab0eee3f0a14b1c9ba4a33ee7264f07c02b8d9eb9f5df799d693dac76e1e82c97dab65 SHA512 69eb807758b3d57a389ad32bc777b14c031abf4279c47b7ec831b391502e6def2348c26ef6750ffa741ce007547da3455411c4ee9ab86eaee8090e21a748a4b6
-MISC metadata.xml 398 BLAKE2B e342d865f5699fc24ea988a69f3130ef58c4ec335b6565a8c2c80e161782210f6c7bd219a267e788fce15da11792ae06124d6130a494eddf27c25352548f0940 SHA512 28a877de5633dce60c0053f56b647a7c3318bc2111fe82075ff43617016518b3f9997601b9ba1ce021dd2f94136fbe9fbb6c22127b8359f32f5910f8efe80b25
diff --git a/app-cdr/cuegen/cuegen-1.2.0.ebuild b/app-cdr/cuegen/cuegen-1.2.0.ebuild
deleted file mode 100644
index 2f72c4191258..000000000000
--- a/app-cdr/cuegen/cuegen-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="CUEgen is a FLAC-compatible cuesheet generator for Linux"
-HOMEPAGE="http://www.cs.man.ac.uk/~slavinp/cuegen.html"
-SRC_URI="http://www.cs.man.ac.uk/~slavinp/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.0-fix-build-system.patch )
-
-src_configure() {
-	append-cflags -W -Wall -Wstrict-prototypes -Wmissing-prototypes
-	tc-export CC
-}
-
-src_install() {
-	dobin cuegen
-	einstalldocs
-}
diff --git a/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch b/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch
deleted file mode 100644
index 614ec59f905d..000000000000
--- a/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,9 +1 @@
--TARGET := cuegen
--CC     := gcc
--CFLAGS := -O2 -pipe -fomit-frame-pointer
--WARN   := -W -Wall -Wstrict-prototypes -Wmissing-prototypes
--
- all:	cuegen
--
--cuegen:	cuegen.o
--	${CC} ${WARN} ${CFLAGS} cuegen.c -o cuegen
diff --git a/app-cdr/cuegen/metadata.xml b/app-cdr/cuegen/metadata.xml
deleted file mode 100644
index 8d355000b606..000000000000
--- a/app-cdr/cuegen/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		CUEgen is a FLAC-compatible cuesheet generator for Linux. The FLAC
-		format allows cuesheets to be embedded in .flac files by storing 
-		their data in the CUESHEET metadata block.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-cdr/cuetools-1.4.1 b/app-cdr/cuetools-1.4.1
new file mode 100644
index 000000000000..e4938502d52a
--- /dev/null
+++ b/app-cdr/cuetools-1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Utilities to manipulate and convert cue and toc files
+EAPI=5
+HOMEPAGE=https://github.com/svend/cuetools
+IUSE=flac mp3 vorbis
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=flac? ( media-libs/flac ) mp3? ( media-sound/mp3info ) vorbis? ( media-sound/vorbis-tools )
+SLOT=0
+SRC_URI=https://github.com/svend/cuetools/archive/1.4.1.tar.gz -> cuetools-1.4.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bffa6513f64df8eb8f594d4c1000d828
diff --git a/app-cdr/cuetools/Manifest b/app-cdr/cuetools/Manifest
deleted file mode 100644
index 4bf9afa500ab..000000000000
--- a/app-cdr/cuetools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cuetools-1.4.1.tar.gz 32720 BLAKE2B 108b78f079e0065d1003bf09ee0a14b0ccf615e73cb5749ca92c0ef9a6580b023011d3aed83cea49256bdc743d13c6da5e394de019a120e7f8dc592e086bac50 SHA512 dc81e6ec756f9d040dd913e8f340be136d68619caa24bdec21364f94b4fc0ffcbcf21325c7fd53c9230d6d70a2856b45a32c5ca7f41ec76fa47298bf226d959e
-EBUILD cuetools-1.4.1.ebuild 714 BLAKE2B 7cd330b1bc284fc98776ef15374cfeb7cae01436c1a7e4c14ad9bfca0712bd17de0ad5076286a0f60c08d625a323ee1fd5b17a28b594c6dd92f6478a8b0a7120 SHA512 3d4fb8ae5b49eb121c4357a736657ebd55769dc393fd2c58506d41c2eb456d6a6782e6509c931f6d64d3d562d09422f1b7b1eb015140c9ca17d5ec38cff2d3ae
-MISC metadata.xml 653 BLAKE2B 826bad3ba9b8cf6ef515fadddacb4d511591fee47614716d1577cdb0fd7fe72b1054186ba94368ba60590c9b118c86a461beda7e3803b8ba34fd6f6d75d7b47e SHA512 475e736ca7ced23d61d721308f0d409f23798dfaed53b4ea35a96307683b21883ddac8ed528a198163b280481fde0204bf875477a883bd7be5984eabbdb64e6f
diff --git a/app-cdr/cuetools/cuetools-1.4.1.ebuild b/app-cdr/cuetools/cuetools-1.4.1.ebuild
deleted file mode 100644
index 2f34d2525069..000000000000
--- a/app-cdr/cuetools/cuetools-1.4.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Utilities to manipulate and convert cue and toc files"
-HOMEPAGE="https://github.com/svend/cuetools"
-SRC_URI="https://github.com/svend/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="flac mp3 vorbis"
-
-RDEPEND="
-	flac? ( media-libs/flac )
-	mp3? ( media-sound/mp3info )
-	vorbis? ( media-sound/vorbis-tools )
-"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README.md TODO
-	docinto extras
-	dodoc extras/{cueconvert.cgi,*.txt}
-}
diff --git a/app-cdr/cuetools/metadata.xml b/app-cdr/cuetools/metadata.xml
deleted file mode 100644
index f5c10e8bce60..000000000000
--- a/app-cdr/cuetools/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		cuetools is a set of utilities for working with Cue Sheet (cue) and Table of Contents (toc) files.
-		It includes:
-		cueconvert convert between the cue and toc formats
-		cuebreakpoints print the breakpoints from a cue or toc file
-		cueprint print disc and track infomation for a cue or toc file
-	</longdescription>
-	<upstream>
-		<remote-id type="github">svend/cuetools</remote-id>
-		<bugs-to>https://github.com/svend/cuetools/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/daa2iso-0.1.7e b/app-cdr/daa2iso-0.1.7e
new file mode 100644
index 000000000000..0ce0f9f5cff4
--- /dev/null
+++ b/app-cdr/daa2iso-0.1.7e
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DEPEND=app-arch/unzip
+DESCRIPTION=Program for converting the DAA and GBI files to ISO
+EAPI=6
+HOMEPAGE=http://aluigi.org/mytoolz.htm
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://aluigi.org/mytoolz/daa2iso.zip -> daa2iso-0.1.7e.zip
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5bde800e410016a426a7a2be1c12b6ed
diff --git a/app-cdr/daa2iso/Manifest b/app-cdr/daa2iso/Manifest
deleted file mode 100644
index 0464acf6676a..000000000000
--- a/app-cdr/daa2iso/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX daa2iso-0.1.7e-buildsystem.patch 342 BLAKE2B 45c7b8c8820f85524b47763fdc5d0eab4c91b89927a68d6d5c1f951c255e3140d596c129ac0dd55efcca498d72c21011326fc2c0887cb5e25a9808d2433390c7 SHA512 44ef91a071fa7723699e185a2c63ca7bcf893df08a94ba0daa6c1803b993558c1d33898818cf73b709d635dc922e32a963491c23985a2f650ea78eaa8687ef75
-DIST daa2iso-0.1.7e.zip 49862 BLAKE2B 701e8e853589e5d0fa1b2b5f80fefde0e61b32dcd40b2b326423e457510b2464fa64f1797e56d46341c13cfd938191a470e04252fd9bf0f39b76a29048a8e378 SHA512 dce00d3bfa4f4e60fd1cfa3ea606bdc8b9fdfc9ce14192ec0204a6da749dc2fb3a0f1de600c19f251e165c7b1f6b66fc14edcd97a38cfa4e163746cc8db5b38c
-EBUILD daa2iso-0.1.7e.ebuild 568 BLAKE2B c957e130a7fa6a1dbb2bb4eba21e60a5145f7e4858716fba4c692eacdd96227d2e8ca1df7fd605d1e8aeb48bfb156b617c59a2ff1705d30b07b1fc492b732c28 SHA512 1688513072d3064df22f6d571931437dca043c17e9a1915a56317f9b74f54957889ddd898f45a9055b5154e3edd4e9e6503becf4e01e13a79c41c9103013b829
-MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117
diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild b/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild
deleted file mode 100644
index 1f49851b0089..000000000000
--- a/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program for converting the DAA and GBI files to ISO"
-HOMEPAGE="http://aluigi.org/mytoolz.htm"
-SRC_URI="http://aluigi.org/mytoolz/${PN}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}/src
-PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch )
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake PREFIX="${ED%/}"/usr install
-	einstalldocs
-}
diff --git a/app-cdr/daa2iso/files/daa2iso-0.1.7e-buildsystem.patch b/app-cdr/daa2iso/files/daa2iso-0.1.7e-buildsystem.patch
deleted file mode 100644
index 5163d8bfa5d4..000000000000
--- a/app-cdr/daa2iso/files/daa2iso-0.1.7e-buildsystem.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,13 +1,9 @@
- EXE		= daa2iso
--CFLAGS	+= -O2 -s
- PREFIX	= /usr/local
- BINDIR	= $(PREFIX)/bin
- SRC		= $(EXE).c
- 
--all:
--	$(CC) $(CFLAGS) -c LzmaDec.c
--	$(CC) $(CFLAGS) -c tinflate.c
--	$(CC) $(SRC) $(CFLAGS) -o $(EXE) LzmaDec.o tinflate.o
-+$(EXE): LzmaDec.o tinflate.o
- 
- install:
- 	install -m 755 -d $(BINDIR)
diff --git a/app-cdr/daa2iso/metadata.xml b/app-cdr/daa2iso/metadata.xml
deleted file mode 100644
index 2028cee3c389..000000000000
--- a/app-cdr/daa2iso/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-cdr/disc-cover-1.5.6-r1 b/app-cdr/disc-cover-1.5.6-r1
new file mode 100644
index 000000000000..16b573544bd5
--- /dev/null
+++ b/app-cdr/disc-cover-1.5.6-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/perl
+DESCRIPTION=Creates CD-Covers via LaTeX by fetching cd-info from freedb.org or local file
+EAPI=6
+HOMEPAGE=https://web.archive.org/web/20151104062521/http://www.vanhemert.co.uk/disc-cover.html
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/Audio-CD-disc-cover virtual/latex-base
+SLOT=0
+SRC_URI=http://www.vanhemert.co.uk/files/disc-cover-1.5.6.tar.gz
+_md5_=be4976153de4e8d9c3f4028ae212c751
diff --git a/app-cdr/disc-cover/Manifest b/app-cdr/disc-cover/Manifest
deleted file mode 100644
index bda927252406..000000000000
--- a/app-cdr/disc-cover/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST disc-cover-1.5.6.tar.gz 52749 BLAKE2B e816e77df2306f51aa55043c25adc62a21efe2cfeafa36c52dd3fa6e026d603297705ab99b4f5fcf9eab106fdc4bb940a5de2428553909f45bc99c3c927cd8b6 SHA512 ac00eeda8da63312afa16fdd4d12d160c651dc44aa44e769b92cad1dd9ddb10f123e8fc64e14853302455047ec86582fa9de423ccacd32912a078d2a21cb0d8c
-EBUILD disc-cover-1.5.6-r1.ebuild 723 BLAKE2B 618abdac5be327f1f4f537e3f95d29aac93b3068aeab44d126daa39cd607ea269b05c0298c31cadf83662dcd4f5c2ec48e857b95034885289086c1c67869bf23 SHA512 eef1769ab9d301ecdf526e79960c79520113a8a1e8ad762ae7c50a5409e1542a24099da3b4a1789987b96b974682306c321162924b30a0a8cfb954c8f307681e
-MISC metadata.xml 466 BLAKE2B 5cbd0e7afd6433468999891d782c1a7f2737ed05e385ac643a931039e2837b40edf014d3713d8925a851a93b150e829424fad9225357eda10fe21b78d2cd08f3 SHA512 c044f60cecf2c53192be2652fc8d2551708ebb42504dc156985ecea6fc4b0cc3330a5b7a5bab5384e18d266f948db07c2808174ed1bfce20d9eafacd3c5fcb88
diff --git a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild
deleted file mode 100644
index 6e832050733c..000000000000
--- a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Creates CD-Covers via LaTeX by fetching cd-info from freedb.org or local file"
-HOMEPAGE="https://web.archive.org/web/20151104062521/http://www.vanhemert.co.uk/disc-cover.html"
-SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-SLOT="0"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Audio-CD-disc-cover
-	virtual/latex-base
-"
-
-src_compile() {
-	pod2man disc-cover > disc-cover.1 || die
-}
-
-src_install() {
-	dobin disc-cover
-	dodoc AUTHORS CHANGELOG TODO
-	doman disc-cover.1
-	insinto /usr/share/${PN}/templates
-	doins templates/*
-}
diff --git a/app-cdr/disc-cover/metadata.xml b/app-cdr/disc-cover/metadata.xml
deleted file mode 100644
index 2eadb7c03808..000000000000
--- a/app-cdr/disc-cover/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-    This is the disc-cover CLI only. For the web application,
-    see www-apps/disc-cover. These two packages are tightly
-    bound by the fact that they come from the same source package.
-    That's why the web application ebuild is manually slotted to 0.
-  </longdescription>
-</pkgmetadata>
diff --git a/app-cdr/dumpet-2.1 b/app-cdr/dumpet-2.1
new file mode 100644
index 000000000000..94406708440b
--- /dev/null
+++ b/app-cdr/dumpet-2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare setup unpack
+DEPEND=dev-libs/libxml2 dev-libs/popt virtual/pkgconfig >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=A tool to dump and debug bootable CD-like images
+EAPI=6
+HOMEPAGE=https://fedora.pkgs.org/rawhide/fedora-x86_64/dumpet-2.1-15.fc27.x86_64.rpm.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 dev-libs/popt
+SLOT=0
+SRC_URI=http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/source/tree/Packages/d/dumpet-2.1-15.fc27.src.rpm
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=35f14e42439fa45a7aabd1e49c2ef756
diff --git a/app-cdr/dumpet/Manifest b/app-cdr/dumpet/Manifest
deleted file mode 100644
index 18f29fa3c7cf..000000000000
--- a/app-cdr/dumpet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dumpet-2.1-15.fc27.src.rpm 25268 BLAKE2B ae80875f08211a825bbc357e4051bf6fcd26d2726b9fc477b61593155080fb460ea3cb6b7c5af519a740436313fa588cfffda7afdba41179a620702693e82ff2 SHA512 bf4b7f2de48590f5ff71ec17a05e331def234a1e57e7e06254c00eb60e44ae8c712e33515e01c6f5fe0bcecbea6e596e4e452ad192823b81dfb7de781d0d4e55
-EBUILD dumpet-2.1.ebuild 709 BLAKE2B 6cb0812b34c3ee6176400444444441ec9b4160ce77ae401d112e3a0a3713750b28477b2f5fa529a8577667b7b016344e725822646b53a7cb45307beafd4e63e0 SHA512 2a8d8664fb613f5ceefeb5c1ac8b0d5f18970664219a22e7c8133209ae17fd19b78cb4087d5ad03c736ce8b413106cdf1916b152648928a9e08aa6f4ae4a0f98
-MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-cdr/dumpet/dumpet-2.1.ebuild b/app-cdr/dumpet/dumpet-2.1.ebuild
deleted file mode 100644
index 145917d4da49..000000000000
--- a/app-cdr/dumpet/dumpet-2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm
-
-DESCRIPTION="A tool to dump and debug bootable CD-like images"
-HOMEPAGE="https://fedora.pkgs.org/rawhide/fedora-x86_64/dumpet-2.1-15.fc27.x86_64.rpm.html"
-SRC_URI="http://dl.fedoraproject.org/pub/fedora/linux/releases/27/Everything/source/tree/Packages/d/dumpet-${PV}-15.fc27.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2
-	dev-libs/popt"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup(){
-	tc-export CC
-}
-
-src_prepare() {
-	use amd64 && eapply "${WORKDIR}"/0001-Manually-tell-it-we-ve-got-64-bit-files-because-32-b.patch
-	default
-}
diff --git a/app-cdr/dumpet/metadata.xml b/app-cdr/dumpet/metadata.xml
deleted file mode 100644
index 435234188908..000000000000
--- a/app-cdr/dumpet/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>bkohler@gentoo.org</email>
-	<name>Ben Kohler</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-cdr/dvd+rw-tools-7.1-r3 b/app-cdr/dvd+rw-tools-7.1-r3
new file mode 100644
index 000000000000..f99468ce07b0
--- /dev/null
+++ b/app-cdr/dvd+rw-tools-7.1-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=virtual/cdrtools sys-devel/m4
+DESCRIPTION=A set of tools for DVD+RW/-RW drives
+EAPI=6
+HOMEPAGE=http://fy.chalmers.se/~appro/linux/DVD+RW/
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=virtual/cdrtools
+SLOT=0
+SRC_URI=http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a9a18ba3c2b71dd64c9b50086f5ad81e
diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
deleted file mode 100644
index 4d7a5f8ca79e..000000000000
--- a/app-cdr/dvd+rw-tools/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX dvd+rw-tools-7.0-dvddl-r1.patch 472 BLAKE2B 4ee6c6b19a7ef77389b58496d4dbbaff84b8802ee2a074dea67d2fa20c2dec6ec54de51310e00bc31d06ad87b87f08fc5a42b966b8ef2d161437fb18911d8219 SHA512 d7ccd07e31ed844baea7492e4a717a1fa01598058d5af111e5b03f6b893fb850c34a2a7e873bf06492b69c3e41aef4d98371b828a3f094da46962cca589300dc
-AUX dvd+rw-tools-7.0-glibc2.6.90.patch 406 BLAKE2B 9cd5a2e77f97ad48eced20fb7b127fc989400c4c597889c9230c2845640a1f71e6b4fa98b5c361d8a8b60746a7318dcb242ac31aa7d0343440f1f1f1eefd1d09 SHA512 a6e0b3df85ec6c28ae13b1f3e67bd26a4c35588f37493e0cb65d0b3f382b05207e421ea1f3cd92432237c2b7479d71c44ed639155cea3b52ccae741c78c3c2a4
-AUX dvd+rw-tools-7.0-reload.patch 513 BLAKE2B 2b0fd7b2726f38b8cfeb24dcbe42c02cce97e4f1899c6b042925f9ca504f59c38d76cbe01c3f6eff8d0bdae9a55e59a0b609de568559b77c32bf122fc8d08d65 SHA512 0d3336841425e88174c43a01042fcf13c86fad4411c9df942b04f7432da6eabec361b89ddca622d62b2aa4b80e1ff6fed405819d24272cffc515de7047424e93
-AUX dvd+rw-tools-7.0-sysmacros.patch 351 BLAKE2B 968b41636a930b16993971aec2d443d079aafadd2c26448c942d0f8b6760528fd9c8a8a20d62a545b9b97de31f1eb3c6fb8cb43fe09ec6d6ae3d935859e5da79 SHA512 0055336cd2a05ccdbdb5fc4ae4f732c2f88eb446bb22a01d6b68bc6606bc5c566600fe6a444796a44aeebb60745399c293b323fc31efdfa7e36b785b8701e95f
-AUX dvd+rw-tools-7.0-wctomb-r1.patch 374 BLAKE2B 670740ca45a6d6bf9e054bedd8c105abb8545d4fcb9d7fe6ccf80f14fb4b51644a3514a0395dc6a1e2b7ebd0b7871fde4106f2f21444abd0d3e7c01dbc4197e9 SHA512 6f83b9681ccccdca3dbce0997ad6c6c6504915b96a520cf36e45b1987c1005a8673761e026d5d1a7d7501d6ff3cd6fd953929ad8c98d47c17f41029101b0d78e
-AUX dvd+rw-tools-7.0-wexit.patch 382 BLAKE2B d07a8e54fff49ef4dd6f36bd3beba94920bc7a7278f03787d2c6cfaade36d8d39f804885839de1bac7755e9a075143de75081d18fb0733cfa6661726a0958d5f SHA512 d98a66ea2e08b14683377c3aff491fb2ee6cd2742e42191c1f7d47fe3474c2ce5f940ba82bce46e557886adbb1fd94431531f7aa73a572a7d41ee227428576fd
-AUX dvd+rw-tools-7.1-bluray_pow_freespace.patch 512 BLAKE2B ca65ce1389dfb0be7b28882897c5711d8f98edd5f72be5f333703af9c42acfb655c711aa7edd7c0bc0bbe1a1af8f0e2e19eae1a3246deefa1a968ad69f3e7958 SHA512 61125ad2fcaa23172132499159cb66c44ba90513328f547c33776cd878d0afdb6927679396290450ab8cb3bbd5819528fd340b1b48bf6632b00d74e3b6357e72
-AUX dvd+rw-tools-7.1-bluray_srm+pow.patch 427 BLAKE2B 5caea4e6afd1af9b0afd33e9cf344e40a191fdfdbd0f7ac9af91b2d346fbfcdf73a2e957c1f5a3aca6bd133054d0a8a89553da2ff3e3e5661241390b0358fdd0 SHA512 d585302680f094eaecbc5ad7d4bfdaf91ad61d621c4c87965c2a9172ab8c2044ad929ff58470f2908949f90c6e227d43778a99e86880acc32c13d305d88505d6
-AUX dvd+rw-tools-7.1-lastshort.patch 593 BLAKE2B e24b41b6eb39961568133f91a110afc87b26597ead0b623deb22bff11a40638bd5faca1de75b8289484889d2d2768077fd637dfe57fdb8bc9f61c1ddd6bed91d SHA512 554b1eb09a00e6bba38acc6ab983f3e0e810b919eb2205f9ee6473d83edd0fdd524e29b844f4c5a55f8044bb72457b2896a24488d691773a00aa355dd1be9975
-AUX dvd+rw-tools-7.1-noevent.patch 783 BLAKE2B 78f27d65759b98607ac6e3eb29ce44c2d88029f7fdaffd3a6d305166b82a069c8a8621b2c680bfbb3a9a2e6585370bc6c1503b4107e903f69099565bfdc0de8d SHA512 0df88a56b3b776934fea0caca1ac247b5b5416fa4985601ac7996633a833b4d264b334d6bb9c5d7587227529ee36a7f2087fad9f6851b4cde8918204d8718b47
-DIST dvd+rw-tools-7.1.tar.gz 140846 BLAKE2B e456be6ee8d1863e78abc6d494a1ce08a49e3aec9b45533408c33ff4620dfc450b968280ce0453b0c0d966f3afca0d23e1ed7e3497caee8216561ad85599b138 SHA512 938f9ec5597158af275c7bf63002696ba362f6f22a219108c6a1df28792f0485046a7af5ce57e41695aaaa0d69543bd66cbbeb4415df5c0e0a902a3f1d278a31
-EBUILD dvd+rw-tools-7.1-r3.ebuild 1551 BLAKE2B 01baee5f5a0a3c364fd7bb5fb5ff7fa94305f0e10812e7a9950027af40e2c4cf26a2ca8d9546c6acb5c3af48813fcfda2525cd7f6c013540dcdfef73df6fbdd3 SHA512 bb3596b3d84647e94d2a70787a1867a443ac6cd884857ffd752661ec772981f0b4cd0a5643ea7179505ee231854eaee55a111286a55222c7db50175b0d737dfb
-MISC metadata.xml 293 BLAKE2B 52fa8d7ab0ea6ec8869040cbdfee249187f47ec2220813c866675c140ef3db973493e1469d7de9c6e9e2d02b3c3b72f08a0f0fe5923774a2b934cef35b7f07f3 SHA512 eb980abc7dc1cb53be1fe388de068272fc51aeae7d714738cd3a9f3b7b07b92f4f2e89e216e1067364d4496857b69545050e435a51a4ca1589e6c4a691bee16d
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
deleted file mode 100644
index 9263e0692c03..000000000000
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A set of tools for DVD+RW/-RW drives"
-HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
-SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="virtual/cdrtools"
-DEPEND="${RDEPEND}
-	sys-devel/m4"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0-sysmacros.patch
-	"${FILESDIR}"/${PN}-7.0-wctomb-r1.patch
-	"${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch
-	"${FILESDIR}"/${PN}-7.0-dvddl-r1.patch
-	"${FILESDIR}"/${PN}-7.0-wexit.patch
-	"${FILESDIR}"/${PN}-7.0-reload.patch
-	"${FILESDIR}"/${PN}-7.1-noevent.patch
-	"${FILESDIR}"/${PN}-7.1-lastshort.patch
-	"${FILESDIR}"/${PN}-7.1-bluray_srm+pow.patch
-	"${FILESDIR}"/${PN}-7.1-bluray_pow_freespace.patch
-)
-
-src_prepare() {
-	# Linux compiler flags only include -O2 and are incremental.
-	sed -i '/FLAGS/s:-O2::' Makefile.m4 || die "failed to sed out FLAGS"
-	default
-}
-
-src_compile() {
-	emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install
-	dodoc index.html
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog 'If you receive an error, "unable to anonymously mmap...'
-		elog 'Resource temporarily unavailable" when running growisofs,'
-		elog 'then you may need to run "ulimit -l unlimited".'
-	fi
-}
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl-r1.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl-r1.patch
deleted file mode 100644
index 8975b04d6f9c..000000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl-r1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/growisofs_mmc.cpp	2006-04-27 20:45:00.788446635 +0200
-+++ b/growisofs_mmc.cpp	2006-04-27 20:46:01.666824300 +0200
-@@ -1412,9 +1412,7 @@
-     blocks += 15, blocks &= ~15;
- 
-     if (blocks <= split)
--	fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
--			"    use single layer media for this recording\n"),
--	exit (FATAL_START(EMEDIUMTYPE));
-+	fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
- 
-     blocks /= 16;
-     blocks += 1;
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-glibc2.6.90.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-glibc2.6.90.patch
deleted file mode 100644
index 49742d3c4db0..000000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-glibc2.6.90.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 dvd+rw-tools-7.0/transport.hxx
---- dvd+rw-tools-7.0/transport.hxx.glibc2.6.90	2007-08-15 12:56:17.000000000 +0200
-+++ dvd+rw-tools-7.0/transport.hxx	2007-08-15 12:56:42.000000000 +0200
-@@ -11,6 +11,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-+#include <limits.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-reload.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-reload.patch
deleted file mode 100644
index 49352e549a2b..000000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-reload.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrup dvd+rw-tools-7.0/growisofs_mmc.cpp dvd+rw-tools-7.0_mod/growisofs_mmc.cpp
---- dvd+rw-tools-7.0/growisofs_mmc.cpp	2006-09-23 20:45:49.000000000 +0800
-+++ dvd+rw-tools-7.0_mod/growisofs_mmc.cpp	2007-11-19 18:20:46.000000000 +0800
-@@ -138,7 +138,7 @@ int media_reload (char *name=NULL,struct
- 		cmd[0] = 0x1B;		// START/STOP UNIT
- 		cmd[4] = 0x2;		// "Eject"
- 		cmd[5] = 0;
--		if (cmd.transport()) return 1;
-+		cmd.transport();
- 	    }
- #if defined(__sun) || defined(sun)
- 	    else if (volmgt_running())
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-sysmacros.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-sysmacros.patch
deleted file mode 100644
index b65c4c975183..000000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-sysmacros.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-include sysmacros.h explicitly for major()/minor()/etc...
-
---- a/growisofs.c
-+++ b/growisofs.c
-@@ -408,6 +408,7 @@
- # ifndef _GNU_SOURCE
- #  define _GNU_SOURCE
- # endif
-+# include <sys/sysmacros.h>
- #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || \
-       (defined(__APPLE__) && defined(__MACH__))
- # define off64_t	off_t
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb-r1.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb-r1.patch
deleted file mode 100644
index 9a9889756c86..000000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/transport.hxx	2008-03-25 21:24:47.000000000 -0400
-+++ b/transport.hxx	2008-03-25 21:25:36.000000000 -0400
-@@ -116,7 +116,7 @@
- extern "C" char *plusminus_locale()
- { static class __plusminus {
-     private:
--	char str[4];
-+	char str[MB_LEN_MAX];
-     public:
- 	__plusminus()	{   setlocale(LC_CTYPE,ENV_LOCALE);
- 			    int l = wctomb(str,(wchar_t)(unsigned char)'�');
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wexit.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wexit.patch
deleted file mode 100644
index e7910cbdd7b8..000000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wexit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dvd+rw-tools-7.0/dvd+rw-format.cpp.wexit	2007-06-21 12:42:30.000000000 +0200
-+++ dvd+rw-tools-7.0/dvd+rw-format.cpp	2007-06-21 12:44:13.000000000 +0200
-@@ -245,7 +245,7 @@ int main (int argc, char *argv[])
- 	alarm(1);
- 	while ((waitpid(pid,&i,0) != pid) && !WIFEXITED(i)) ;
- 	if (WEXITSTATUS(i) == 0) fprintf (stderr,"\n");
--	exit (0);
-+	exit (WEXITSTATUS(i));
-     }
- #endif
- 
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-bluray_pow_freespace.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-bluray_pow_freespace.patch
deleted file mode 100644
index 3b562822b1ef..000000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-bluray_pow_freespace.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up wrk/growisofs_mmc.cpp.wrk wrk/growisofs_mmc.cpp
---- wrk/growisofs_mmc.cpp.wrk	2014-11-14 13:22:49.579552118 +0100
-+++ wrk/growisofs_mmc.cpp	2014-11-14 13:35:36.779730963 +0100
-@@ -410,7 +410,9 @@ static unsigned int get_2k_capacity (Scs
- 	    }
- 
- 	    nwa = 0;
--	    if (buf[7]&1 && !bdr_plus_pow)	// NWA_V
-+	    //if (buf[7]&1 && !bdr_plus_pow)	// NWA_V
-+	    //!bdr_plus_pow patched out for Fedora
-+	    if (buf[7]&1)	// NWA_V
- 	    {	nwa  = buf[12]<<24;
- 		nwa |= buf[13]<<16;
- 		nwa |= buf[14]<<8;
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-bluray_srm+pow.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-bluray_srm+pow.patch
deleted file mode 100644
index 8fc1a6d30167..000000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-bluray_srm+pow.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up dvd+rw-tools-7.1/growisofs_mmc.cpp.wrk dvd+rw-tools-7.1/growisofs_mmc.cpp
---- dvd+rw-tools-7.1/growisofs_mmc.cpp.wrk	2013-06-24 14:18:38.898344970 +0200
-+++ dvd+rw-tools-7.1/growisofs_mmc.cpp	2013-06-24 14:20:00.428025541 +0200
-@@ -756,6 +756,8 @@ static void bd_r_format (Scsi_Command &c
- 
-     wait_for_unit (cmd);
- 
-+    bdr_plus_pow = 1;
-+
-     cmd[0] = 0x35;	// FLUSH CACHE
-     cmd[9] = 0;
-     cmd.transport();
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-lastshort.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-lastshort.patch
deleted file mode 100644
index da225d4ebf71..000000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-lastshort.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up dvd+rw-tools-7.1/growisofs_mmc.cpp.lastshort dvd+rw-tools-7.1/growisofs_mmc.cpp
---- dvd+rw-tools-7.1/growisofs_mmc.cpp.lastshort	2012-04-13 18:09:31.047641524 +0200
-+++ dvd+rw-tools-7.1/growisofs_mmc.cpp	2012-04-13 18:09:34.451763587 +0200
-@@ -540,7 +540,7 @@ ssize_t poor_mans_pwrite64 (int fd,const
- 	// own higher HZ value and disrespects the user-land one.
- 	// Sending them down as milliseconds is just safer...
- 	//
--	if (!(errcode=cmd.transport (WRITE,(void *)buff,size)))
-+	if (!(errcode=cmd.transport (WRITE,(void *)buff,nbl*2048)))
- 	    break;
- 
- 	//--- WRITE failed ---//
diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-noevent.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-noevent.patch
deleted file mode 100644
index 19c8c668869d..000000000000
--- a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-noevent.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up dvd+rw-tools-7.1/transport.hxx.debug dvd+rw-tools-7.1/transport.hxx
---- dvd+rw-tools-7.1/transport.hxx.debug	2012-03-07 10:55:07.167322839 +0100
-+++ dvd+rw-tools-7.1/transport.hxx	2012-03-07 15:44:34.384202747 +0100
-@@ -1795,9 +1795,12 @@ static int handle_events (Scsi_Command &
- 		break;
- 	    case 5: ret |= 1<<5; break;		// Multiple Initiators
- 	    case 6:				// Device Busy
--		if ((event[4]&0xF)==1 &&	// Timeout occured
--		    (event[5]&0x3)!=0)
--		{   poll(NULL,0,(descr&0xFFFF)*100+100);
-+		if ((event[4]&0xF)==1)		// Timeout occured
-+		{
-+		    if ((event[5]&0x3)==0)	// No Event
-+			return 0;		// Ready to accept any command
-+
-+		    poll(NULL,0,(descr&0xFFFF)*100+100);
- 		    cmd[0] = 0;		// TEST UNIT READY
- 		    cmd[5] = 0;
- 		    if ((err=cmd.transport()))
diff --git a/app-cdr/dvd+rw-tools/metadata.xml b/app-cdr/dvd+rw-tools/metadata.xml
deleted file mode 100644
index aaeb304f3f54..000000000000
--- a/app-cdr/dvd+rw-tools/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-dvdrtools is a fork of cdrtools, with the primary goal of supporting
-writable DVD drives.
-</longdescription>
-</pkgmetadata>
diff --git a/app-cdr/dvdisaster-0.72.4 b/app-cdr/dvdisaster-0.72.4
new file mode 100644
index 000000000000..0015a9e26036
--- /dev/null
+++ b/app-cdr/dvdisaster-0.72.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst
+DEPEND=app-arch/bzip2 >=dev-libs/glib-2.20 media-libs/libpng:0 sys-libs/zlib >=x11-libs/gtk+-2.14:2 virtual/os-headers virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Data-protection and recovery tool for DVDs
+EAPI=4
+HOMEPAGE=http://dvdisaster.sourceforge.net/
+IUSE=debug nls l10n_cs l10n_de l10n_it l10n_pt-BR l10n_ru l10n_sv
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 >=dev-libs/glib-2.20 media-libs/libpng:0 sys-libs/zlib >=x11-libs/gtk+-2.14:2
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dvdisaster/dvdisaster_0.72.4.orig.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c3f39730431eac3a44fb4b98dcdfd1f8
diff --git a/app-cdr/dvdisaster-0.79.5 b/app-cdr/dvdisaster-0.79.5
new file mode 100644
index 000000000000..17a304cbfc99
--- /dev/null
+++ b/app-cdr/dvdisaster-0.79.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst
+DEPEND=>=dev-libs/glib-2.32 nls? ( virtual/libintl ) >=x11-libs/gtk+-2.6:2 x11-libs/gdk-pixbuf nls? ( sys-devel/gettext ) virtual/os-headers virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Tool for creating error correction data (ecc) for optical media (DVD, CD, BD)
+EAPI=5
+HOMEPAGE=http://dvdisaster.net/
+IUSE=debug nls l10n_cs l10n_de l10n_it l10n_pt-BR l10n_ru l10n_sv
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.32 nls? ( virtual/libintl ) >=x11-libs/gtk+-2.6:2 x11-libs/gdk-pixbuf
+SLOT=0
+SRC_URI=http://dvdisaster.net/downloads/dvdisaster-0.79.5.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b5d3d496e6c326baa2289c11a1752636
diff --git a/app-cdr/dvdisaster/Manifest b/app-cdr/dvdisaster/Manifest
deleted file mode 100644
index dd2b7126877a..000000000000
--- a/app-cdr/dvdisaster/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST dvdisaster-0.79.5.tar.bz2 8224726 BLAKE2B 443816b550a627ce1998eae71c6524c17105c7253af1e1591eae06055d342afc4457b847c53bfb857793676fc50ca9c5c7f33dafaf541c92e84f149a2987d632 SHA512 8630d4389983307afc3faa5b4256f531ded370f84ec35d4a363853dc7d79e5e15ee0b81bf64f4b88f57fe6176537df8195f83acf23e770d991c700b7408dd1f5
-DIST dvdisaster_0.72.4.orig.tar.bz2 5097738 BLAKE2B 77027d8f5c329525c69acccb0a1c780edc2abaae577473442259bfc3650a78d1443a30793c3fd9bbefe4d542bd7f77edaaf35f11d5285832405cdfeb9e8c225c SHA512 aa0a9f3040d45b16a9117b2b6756d2423cf55db4a00e8314a164f6dc32863cd4e5a5b5ec009a56782aa2afe6031e3a32954014101abc67291428e9edea1b5272
-EBUILD dvdisaster-0.72.4.ebuild 1787 BLAKE2B ad76b0d46ec89a633409c0c058292f6fd3d0f314d193aeda5aa3b002746b36d2e2e5567af667d52acaf75f393e833bc457a59b069ca3244e18aef36bb4c9c23f SHA512 76413a25bf5acfb4258b7dcf554c743ff96810e1abaec34f0436e0d0ef739cca776d35e16228fc380d1cb54ca641d461365e24d71e40619ca88de1f535473fd4
-EBUILD dvdisaster-0.79.5.ebuild 1759 BLAKE2B a3d136f68cfb576873589059cf9ae15361a8139b11f032be731f7749c6ff8b26f7b426120ac8a3c0f6368fe0b2e7a4dbc6e22f09aca42fc66b08987882d538fd SHA512 b3169cdd55823103abe2958c4653a8c9b71d86b8708174eea0c3d2905c68bdc4241f1e13d4b996803b22fc5909167c680b3b6496725a2489b0c37930ae2a9809
-MISC metadata.xml 533 BLAKE2B 9db837ca6d8d637bd17eec18ae9f395d5217ca63455d90d1615bffe4a8cf858aa502b144ff9132853895d995db4776d2c9f2108ac3dcc0d6c451b0ad7d82e91f SHA512 d554061a440ce135ad7a799cc9717885f22d2da11bab7c7a755654e93aefa9404d80ed628d669473c411d3f6710eec6149ff2716075f02b99e4cc53f219a8716
diff --git a/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild b/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild
deleted file mode 100644
index cceecd25132a..000000000000
--- a/app-cdr/dvdisaster/dvdisaster-0.72.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils gnome2-utils toolchain-funcs
-
-DESCRIPTION="Data-protection and recovery tool for DVDs"
-HOMEPAGE="http://dvdisaster.sourceforge.net/"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug nls"
-
-dvdi_langs="cs de it pt-BR ru sv"
-for dvdi_lang in ${dvdi_langs}; do
-	IUSE+=" l10n_${dvdi_lang}"
-done
-unset dvdi_lang
-
-RDEPEND="app-arch/bzip2
-	>=dev-libs/glib-2.20
-	media-libs/libpng:0
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14:2"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig"
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc \
-		--docsubdir=${PF} \
-		--localedir=/usr/share/locale \
-		--buildroot="${D}" \
-		--with-nls=$(usex nls) \
-		--with-memdebug=$(usex debug) || die
-}
-
-src_compile() {
-	emake $(use nls && echo -j1) CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install
-	dobin tools/pngpack
-
-	newdoc tools/README README.pngpack
-	dodoc CHANGELOG CREDITS.en README* TODO *HOWTO
-
-	newicon contrib/${PN}48.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN} 'System;Utility'
-
-	local res
-	for res in 16 32 48 64; do
-		newicon -s ${res} contrib/${PN}${res}.png ${PN}.png
-	done
-
-	local dest="${ED}"/usr/share
-
-	local dvdi_lang
-	for dvdi_lang in ${dvdi_langs}; do
-		use l10n_${dvdi_lang} || rm -rf \
-			${dest}/doc/${PF}/${dvdi_lang/-/_} \
-			${dest}/doc/${PF}/CREDITS.${dvdi_lang/-/_} \
-			${dest}/man/${dvdi_lang/-/_}
-	done
-
-	rm -f "${ED}"/usr/bin/*-uninstall.sh
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
deleted file mode 100644
index dbc782d73d2a..000000000000
--- a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils toolchain-funcs
-
-DESCRIPTION="Tool for creating error correction data (ecc) for optical media (DVD, CD, BD)"
-HOMEPAGE="http://dvdisaster.net/"
-SRC_URI="http://dvdisaster.net/downloads/${PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug nls"
-
-dvdi_langs="cs de it pt-BR ru sv"
-for dvdi_lang in ${dvdi_langs}; do
-	IUSE+=" l10n_${dvdi_lang}"
-done
-unset dvdi_lang
-
-RDEPEND=">=dev-libs/glib-2.32
-	nls? ( virtual/libintl )
-	>=x11-libs/gtk+-2.6:2
-	x11-libs/gdk-pixbuf"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/os-headers
-	virtual/pkgconfig"
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc \
-		--docsubdir=${PF} \
-		--localedir=/usr/share/locale \
-		--buildroot="${D}" \
-		--with-nls=$(usex nls) \
-		--with-memdebug=$(usex debug) || die
-}
-
-src_compile() {
-	emake $(use nls && echo -j1) CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake install
-	dodoc CHANGELOG CREDITS.en README* TODO *HOWTO
-
-	newicon contrib/${PN}48.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN} 'System;Utility'
-
-	local res
-	for res in 16 32 48 64; do
-		newicon -s ${res} contrib/${PN}${res}.png ${PN}.png
-	done
-
-	local dest="${D}"usr/share
-
-	local dvdi_lang
-	for dvdi_lang in ${dvdi_langs}; do
-		use l10n_${dvdi_lang} || rm -rf \
-			${dest}/doc/${PF}/${dvdi_lang/-/_} \
-			${dest}/doc/${PF}/CREDITS.${dvdi_lang/-/_} \
-			${dest}/man/${dvdi_lang/-/_}
-	done
-
-	rm -f "${D}"usr/bin/*-uninstall.sh
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-cdr/dvdisaster/metadata.xml b/app-cdr/dvdisaster/metadata.xml
deleted file mode 100644
index bd177f600490..000000000000
--- a/app-cdr/dvdisaster/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@k8n.de</email>
-		<name>Daniel Kenzelmann</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
-	<use>
-		<flag name="debug">
-			Enable memory debugging.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">dvdisaster</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/dvdshrink-2.6.1_p10 b/app-cdr/dvdshrink-2.6.1_p10
new file mode 100644
index 000000000000..52839711d6e3
--- /dev/null
+++ b/app-cdr/dvdshrink-2.6.1_p10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Scriptable DVD copy software
+EAPI=6
+HOMEPAGE=http://dvdshrink.sourceforge.net
+IUSE=gtk
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-video/transcode-1.0.2-r2[dvd] >=media-video/mjpegtools-1.8.0-r1 >=media-video/subtitleripper-0.3.4-r1 >=media-video/dvdauthor-0.6.11 >=app-cdr/dvd+rw-tools-6.1 gtk? ( >=dev-perl/Gtk2-1.104 ) >=app-text/gocr-0.40 virtual/cdrtools
+SLOT=0
+SRC_URI=mirror://sourceforge/dvdshrink/dvdshrink-2.6.1-10mdk.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=2503233608104cefe437e36d1fdd2680
diff --git a/app-cdr/dvdshrink/Manifest b/app-cdr/dvdshrink/Manifest
deleted file mode 100644
index 9e0bf01a1b2c..000000000000
--- a/app-cdr/dvdshrink/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dvdshrink-2.6.1_p10-fix-paths.patch 793 BLAKE2B 7bca779d2e17ed4388dfdf8e6798bf11111a3a25c3bac722f0a5e428b703ccaaad0cd83f8e906d5ed17d123745d073f12d83c130f03fbf38d8a13f981b85cf5f SHA512 8302a9e62b57346a107857c3c3b7095c5838771919b16d4f248c03582100fbb9ab3d55aafbe8b3a911dc1fa89c746a438a9da60ca77af7419068c5bafb9816a3
-DIST dvdshrink-2.6.1-10mdk.tar.gz 1087571 BLAKE2B a45427483b5519ee7abbc787e7afea2f9edcb49f8f6a15843184e7c62e51f7ebb18ad1db35ea695004eda9763dfc9b2a5522b7b4c279a2b63a71b96d091ffe37 SHA512 6766f95bd2bb29ef0877d9b22bc45eb2c508ad2d1a7bb99f84b3f858987fc098a696f15f953efe006bf9556a73f6aa0e6247afcdf8e4c5dad826ddba97f02c06
-EBUILD dvdshrink-2.6.1_p10.ebuild 1057 BLAKE2B f01d636320244c7ee4bf287a376bb8afa4e1d436501fd8ff590e0412fe6ae6e8d8155f94246bcd2c81c9f407eefb90214db7cbc8bd7f62a48e1a85d2eb438f04 SHA512 9b093d7c68411904176f8884c1aeb579a0b56f7c3d8ee8b2c93c032c446ac51f0d175a80c816a53d451918969c939eb2cf7832cfa4edb8aaf846e62097c5c0e6
-MISC metadata.xml 427 BLAKE2B 0d25c5f4c9d81b6c2e3fefb76d87d1df9e975455fe0d55b241b43549cedde20ff538cff1472121c3a21f9e176a233b69890cd60e55e50018819467192aa4bb53 SHA512 c0a8f2ce1679df431c652810e91285db1f1602a281b432c0dfe5e013ff3d25c22ab23852991a0fdb9cbccbebc5d07d61cce10ffb235012cb0b0b064219d5391c
diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
deleted file mode 100644
index c7e5f5c4269e..000000000000
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-DESCRIPTION="Scriptable DVD copy software"
-HOMEPAGE="http://dvdshrink.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}mdk.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gtk"
-
-RDEPEND=">=media-video/transcode-1.0.2-r2[dvd]
-	>=media-video/mjpegtools-1.8.0-r1
-	>=media-video/subtitleripper-0.3.4-r1
-	>=media-video/dvdauthor-0.6.11
-	>=app-cdr/dvd+rw-tools-6.1
-	gtk? ( >=dev-perl/Gtk2-1.104 )
-	>=app-text/gocr-0.40
-	virtual/cdrtools"
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-PATCHES=( "${FILESDIR}"/${PN}-2.6.1_p10-fix-paths.patch )
-
-src_install() {
-	dobin usr/bin/{batchrip.sh,dvds{functions,hrink}}
-
-	use gtk && dobin usr/bin/xdvdshrink.pl
-
-	insinto /usr/share
-	doins -r usr/share/applications/dvdshrink
-
-	dodoc usr/share/doc/dvdshrink/{batchrip.txt,example.xml,README.txt}
-
-	doicon usr/share/icons/{batchrip.xpm,dvdshrink.xpm}
-	use gtk && make_desktop_entry xdvdshrink.pl xDVDShrink ${PN} AudioVideo
-}
diff --git a/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch b/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch
deleted file mode 100644
index 8acbb70073e0..000000000000
--- a/app-cdr/dvdshrink/files/dvdshrink-2.6.1_p10-fix-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/usr/bin/dvdsfunctions
-+++ b/usr/bin/dvdsfunctions
-@@ -1933,7 +1933,7 @@
-    if ! ((`ps -C xdvdshrink.pl > /dev/null 2>&1`)); then GUI=1; fi
-    SAVEISO=0            # Save an ISO along with the burn(s)
- 
--   APPDIR=/usr/share/applications/dvdshrink
-+   APPDIR=/usr/share/dvdshrink
- }
- 
- # Build a minimal but usable XML file for 'dvdauthor'
---- a/usr/bin/xdvdshrink.pl
-+++ b/usr/bin/xdvdshrink.pl
-@@ -22,7 +22,7 @@
- 
- my $login       =  getlogin || getpwuid($<); # Userid of current user
- my $homedir     = "/home/" . $login;         # Home dir of current user
--my $app_dir     = "/usr/share/applications/dvdshrink";
-+my $app_dir     = "/usr/share/dvdshrink";
- my $false       = 0;    # A 'false'
- my $true        = 1;    # A 'true'
- my $srunning    = 0;    # Is the bash script running
diff --git a/app-cdr/dvdshrink/metadata.xml b/app-cdr/dvdshrink/metadata.xml
deleted file mode 100644
index 51dfd57f535a..000000000000
--- a/app-cdr/dvdshrink/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-XDVDShrink is a project in BASH and Perl-Gtk2 that allows you to create fair-use
-archival copies of DVD content on single-layer writable DVDs.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">dvdshrink</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/extract-xiso-2.5 b/app-cdr/extract-xiso-2.5
new file mode 100644
index 000000000000..ecf3ed2251b9
--- /dev/null
+++ b/app-cdr/extract-xiso-2.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Tool for extracting and creating optimised Xbox ISO images
+EAPI=0
+HOMEPAGE=https://sourceforge.net/projects/extract-xiso
+KEYWORDS=amd64 ppc x86
+LICENSE=BSD-4
+SLOT=0
+SRC_URI=mirror://sourceforge/extract-xiso/extract-xiso_v2.5_src.tgz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=6c7aab78a9585bcbf398e49d0c2e3db2
diff --git a/app-cdr/extract-xiso-2.7.1 b/app-cdr/extract-xiso-2.7.1
new file mode 100644
index 000000000000..0877d267532e
--- /dev/null
+++ b/app-cdr/extract-xiso-2.7.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Tool for extracting and creating optimised Xbox ISO images
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/extract-xiso
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD-4
+SLOT=0
+SRC_URI=mirror://sourceforge/extract-xiso/extract-xiso-2.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c7c694708867bb2a51949cbabf656dff
diff --git a/app-cdr/extract-xiso/Manifest b/app-cdr/extract-xiso/Manifest
deleted file mode 100644
index 18320008d9fa..000000000000
--- a/app-cdr/extract-xiso/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX extract-xiso-2.7.1-headers.patch 437 BLAKE2B fbfcfe1d84c25bbb51fc60a20e1a374f75f6ca23c59bf24451312fd048c26fb77e176abbebce8a868f23625de1eac7cde531858f63faee94bbe55142e02de123 SHA512 4d6a46259d4c96a405d8e52347dfc9fad53bbfe5c2d4fabd74a81c6e698a4da9351c50bff6a6e810ffad4e8b927f0d687538c210eebf905ab454e2dd4146aa58
-DIST extract-xiso-2.7.1.tar.gz 207518 BLAKE2B bf99e2555e85344db318bdedf0e6dfb80b5f8cd079dc2083ba94e06c62032235d88296909a1aa887180ce94ce9d80a6b39aab25ed99b04741951aed79c2e8cdb SHA512 a7153d96fa7cfb01dfa385a0984d94dc0fa5ac14ce9f7e2d50287b7e1edbb6a4ba84b6b874aa2628b1a82f23b30687958e411699487896cc48787f48e0e012c6
-DIST extract-xiso_v2.5_src.tgz 207052 BLAKE2B 36363ac23bff01c28ddfee46990cae5e193841a294549b1b9f29c401f833e42e5f92e0157aa07d1cb2bfe272eb25a0f96e3e285b6a06abc3a7d06868258cf649 SHA512 ae73d5814167894f60530f9cb88485a9bcc39a60da87ed20b8b579f8e3f91542df102c2f9cb868ce61ff61c1a5add63d4bec66097f039c906353762358760dec
-EBUILD extract-xiso-2.5.ebuild 766 BLAKE2B 372750ef7d28f4ef2a5a8753e73e2c63b81bbde68105192a87103c9673741a79d2d6c86e9bc759d4fc4d9a0179a916648542bdd1f145d7e3973405d24d10f6ed SHA512 e7de249b74bd03c75deb690237d761de455186875a98bdb0b5bd98ef2a3db78b43bf4de1c56f42bd7be2a3b66837543c933cc64eedb7d8a8ed9bea68ca6984da
-EBUILD extract-xiso-2.7.1.ebuild 847 BLAKE2B 915254e5ebc48cebc29fcc69bcfe23ba680c7a4cf2de9080bb2639d2f28d22d77afcab55ef9362bed93aa1bce2a34f753c85e8fdd2632269b1bb1136bef4ccfb SHA512 edbc8000e5646d31ed1449e1a8b092fcf298302ab41aae26d9d021b12572f6671c802682c3da883b559e5b22657f1f0503ec401bd320cffc4ea937475667b0be
-MISC metadata.xml 350 BLAKE2B 59afc13240ce011a9b7d746219ef7718dfb00a442af68856661e5db1c2c37c53a988c71e43e15a403ff4817761ac7030f153d3c0cf0ad269b87be533d2863da2 SHA512 e91c8fdfdc4f353e817d510e79ce773dd332cb821cfbce9c893b9cb53cb0c75f3c915e7a4db6355db039adf5b311685b94f244549698778dc010a6d1cf0ffcb4
diff --git a/app-cdr/extract-xiso/extract-xiso-2.5.ebuild b/app-cdr/extract-xiso/extract-xiso-2.5.ebuild
deleted file mode 100644
index f90107358352..000000000000
--- a/app-cdr/extract-xiso/extract-xiso-2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-MY_PV=${PV/_beta/b}
-
-DESCRIPTION="Tool for extracting and creating optimised Xbox ISO images"
-HOMEPAGE="https://sourceforge.net/projects/extract-xiso"
-SRC_URI="mirror://sourceforge/extract-xiso/${PN}_v${MY_PV}_src.tgz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e 's:__LINUX__:__linux__:' \
-		*.[ch] */*.[ch] || die
-}
-
-doit() { echo "$@"; "$@"; }
-
-src_compile() {
-	doit $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
-		extract-xiso.c libftp-*/*.c -o extract-xiso || die
-}
-
-src_install() {
-	dobin extract-xiso || die
-	dodoc README.TXT
-}
diff --git a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild b/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
deleted file mode 100644
index d7d153a3aa9d..000000000000
--- a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs eutils
-
-MY_PV=${PV/_beta/b}
-
-DESCRIPTION="Tool for extracting and creating optimised Xbox ISO images"
-HOMEPAGE="https://sourceforge.net/projects/extract-xiso"
-SRC_URI="mirror://sourceforge/extract-xiso/${P}.tar.gz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.7.1-headers.patch
-	sed -i \
-		-e 's:__LINUX__:__linux__:' \
-		*.[ch] */*.[ch] || die
-}
-
-doit() { echo "$@"; "$@"; }
-
-src_compile() {
-	# Need _GNU_SOURCE here for asprintf prototype.
-	doit $(tc-getCC) ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} \
-		extract-xiso.c libftp-*/*.c -o extract-xiso || die
-}
-
-src_install() {
-	dobin extract-xiso
-	dodoc README.TXT
-}
diff --git a/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch b/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch
deleted file mode 100644
index 3de797050b43..000000000000
--- a/app-cdr/extract-xiso/files/extract-xiso-2.7.1-headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fix missing prototype warnings
-
---- a/libftp-5.0.1.modified.by.in/FtpLibrary.h
-+++ b/libftp-5.0.1.modified.by.in/FtpLibrary.h
-@@ -20,6 +20,7 @@
-     extern "C" {
- #endif
- 
-+#include <ctype.h>
- #include <errno.h>
- #include <stdio.h>
- #include <stdarg.h>
-@@ -33,6 +34,7 @@
- #include <sys/time.h>
- #include <sys/socket.h>
- #include <arpa/ftp.h>
-+#include <arpa/inet.h>
- #include <arpa/telnet.h>
- #include <netinet/in.h>
- #include <netdb.h>
diff --git a/app-cdr/extract-xiso/metadata.xml b/app-cdr/extract-xiso/metadata.xml
deleted file mode 100644
index 43c2a8e7fd57..000000000000
--- a/app-cdr/extract-xiso/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>Tool for extracting and creating optimised Xbox ISO images</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">extract-xiso</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-cdr/gaffitter-0.6.0-r1 b/app-cdr/gaffitter-0.6.0-r1
new file mode 100644
index 000000000000..4b34b379c0c0
--- /dev/null
+++ b/app-cdr/gaffitter-0.6.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Genetic Algorithm File Fitter
+EAPI=6
+HOMEPAGE=http://gaffitter.sourceforge.net/
+IUSE=scripts
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://sourceforge/gaffitter/gaffitter-0.6.0.tar.bz2 scripts? ( mirror://sourceforge/gaffitter/scripts/0.1.0/scripts-0.1.0.tar.bz2 )
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4491f39dcff410b6ed515a7af6998f95
diff --git a/app-cdr/gaffitter/Manifest b/app-cdr/gaffitter/Manifest
deleted file mode 100644
index df7ee06231c9..000000000000
--- a/app-cdr/gaffitter/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gaffitter-0.6.0-fix-build-system.patch 713 BLAKE2B f4faa44bd548d8a806a18e4a86a336c64f045e9bb82f1a4fbe657346e45865ab78e3c28b582a2a43e95a0561cbe2bafd626d1130d73044bcb114546b5eca466b SHA512 72724f2c638ad93d5a10991a1f0b674a2977b6b8a97956cfc08db456dad5775ca35e1fe49848a103ab0a335351a40ce792613263adcba2df7985f48b109ef3b2
-DIST gaffitter-0.6.0.tar.bz2 44433 BLAKE2B 8ae8fb68711168619e69b79c8544dcb926e984ed3e311062060c71f691588c581fb90744c3e984847bd3061e6ed18e6ae07896af8812d6896fb27291af9450e0 SHA512 f27313b0274d2b08e6e9cd7ce86d93c3a944d6d4e4ad103cba8137dd4074bcdfcbd470ef6decdd192e6e5086f27968e27e0b76ca738e9b538db14d83816010b6
-DIST scripts-0.1.0.tar.bz2 5859 BLAKE2B fa774440d9f5b1e8c3a1b4cfd2d65d1d943a904d196df2657ff12e079266b211476bd61b2514be9f629522106ef0b1ef2b21fbb8e0431bf4c6a04273fe3d8a83 SHA512 6730df258444fa4fb17a0d0438b8b1394f857638ce95aaa28dae5345d0bf7517a226a0483a6e8ab89a5012aef9b79586a0cd2b576f9a1ceafc6f29e45d797a20
-EBUILD gaffitter-0.6.0-r1.ebuild 882 BLAKE2B 251e65386c7ff36d5fe8fe3e100b7ea19f983a44a8f1ffbaeb7f4088e4538aff21124ae8d676b3b785071100ce0a0e9cbe9f88d2531512937d522f18064173b0 SHA512 7457798f7c242fd904e47391d76d44fc6de3c962574487fedb90a031029bde84785e6c9af8f8a60eac27bb586febc761c588783d659f08432a360c76b98d8bf9
-MISC metadata.xml 433 BLAKE2B 12c8e3692c80100cfa835c65e6609b2d104075fb687bc8b5a48f018570c70e476d102bedcbb713223d093b0843360488842ec3ed23ac4ed4054da704b90f51d3 SHA512 d1fcf8060649dbf5ee3fcfd24a4ac29167e0d4ae34529de8cfefb260a28ffbae476ce393a6a5c6cedf0283ce73f79acedbe5567a2cb9402017209a5048900a2e
diff --git a/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch b/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch
deleted file mode 100644
index df7d99b9c31e..000000000000
--- a/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -6,28 +6,14 @@
- 			  optimizers/BestFit.cc optimizers/Split.cc \
- 			  util/CmdLineParser.cc
- 
--INCLUDES = -I/usr/local/include -I.
--CXX = g++
--CXXFLAGS = -O3 -Wno-long-long $(INCLUDES)
--LIBPATH = 
--LIBS = 
--LDFLAGS = $(LIBPATH) $(LIBS)
--
- ###########################################################################
- 
- OBJS = $(CPPFILES:.cc=.o)
- 
--.SUFFIXES: .o .cc 
--
--.cc.o:
--	@echo $<:
--	$(CXX) $(CXXFLAGS) -c $*.cc -o $*.o
--
- default: gaffitter 
- 
- 
--gaffitter: $(OBJS) gaffitter.cc Params.h
--	$(CXX) $(CXXFLAGS) $@.cc $(OBJS) -o $@ $(LDFLAGS)
-+gaffitter: $(OBJS) Params.h
- ###########################################################################
- 
- objs: $(OBJS)	
diff --git a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild b/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
deleted file mode 100644
index f3f46c1d5e98..000000000000
--- a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-SV="0.1.0"
-SCRIPTS="scripts-${SV}"
-
-DESCRIPTION="Genetic Algorithm File Fitter"
-HOMEPAGE="http://gaffitter.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	scripts? ( mirror://sourceforge/${PN}/scripts/${SV}/${SCRIPTS}.tar.bz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="scripts"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.6.0-fix-build-system.patch )
-
-src_prepare() {
-	default
-
-	if use scripts; then
-		sed -i -re "s:--data((cd)|(dvd)):--data:" "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-k3b || die
-	fi
-}
-
-src_configure() {
-	tc-export CXX
-}
-
-src_install() {
-	dobin src/gaffitter
-	einstalldocs
-
-	if use scripts; then
-		dobin "${WORKDIR}"/${PN}/${SCRIPTS}/gaff-**
-		dobin "${WORKDIR}"/${PN}/${SCRIPTS}/nautilus/nautilus-*
-	fi
-}
diff --git a/app-cdr/gaffitter/metadata.xml b/app-cdr/gaffitter/metadata.xml
deleted file mode 100644
index 26dd4a0434da..000000000000
--- a/app-cdr/gaffitter/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<use>
-		<flag name="scripts">Install additional gaffitter scripts for external programs</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">gaffitter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/gcdemu-3.1.0 b/app-cdr/gcdemu-3.1.0
new file mode 100644
index 000000000000..672bd539e031
--- /dev/null
+++ b/app-cdr/gcdemu-3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-util/desktop-file-utils >=dev-util/intltool-0.21 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Gtk+ GUI for controlling cdemu-daemon
+EAPI=6
+HOMEPAGE=http://cdemu.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-cdr/cdemu-daemon:0/7 dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/librsvg:2 x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://sourceforge/cdemu/gcdemu-3.1.0.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e1bf730e710762dfb9af1e12deda116e
diff --git a/app-cdr/gcdemu-3.2.0 b/app-cdr/gcdemu-3.2.0
new file mode 100644
index 000000000000..4e9fc15e7448
--- /dev/null
+++ b/app-cdr/gcdemu-3.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-util/desktop-file-utils >=dev-util/intltool-0.21 sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Gtk+ GUI for controlling cdemu-daemon
+EAPI=6
+HOMEPAGE=http://cdemu.org/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-cdr/cdemu-daemon:0/7 dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/librsvg:2 x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://sourceforge/cdemu/gcdemu-3.2.0.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ec8b84412eef28264cfa6cce562d0567
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
deleted file mode 100644
index 52bf59a99aa9..000000000000
--- a/app-cdr/gcdemu/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gcdemu-3.1.0.tar.bz2 48036 BLAKE2B 4fc14f02a7d006556bab31b82b0cb017efec2b7e3f99854567ac0e5b8211c151583e91cf72e180341077a927430688401c4ecb6112bd6758e7288c7a06e2c4ec SHA512 e3e0369cc443bc47befa52989cc2bc5d62e4c9462bb8de1c3dd8563e1240ba7f59fc8cc54aed2e96bdb23a5f6e2fa11ca36073dfa066409f097a1dca619866fc
-DIST gcdemu-3.2.0.tar.bz2 52144 BLAKE2B f349e4482905b0ac59bce5d6af74000e05ff9b7257c7ec8755106ac8fe316d59d19de8b72705fd9cccfa888d170776667ee07fe90311a81e78f251fee85601ee SHA512 61a1775c874c9c3604ce88758039ef80b262463ae180e791eb545811fa2176e4bf07c4dbcd3be5f17d446fdef92317a0ff64ce8d27f26aeaeee9d8134b6a95ea
-EBUILD gcdemu-3.1.0.ebuild 1213 BLAKE2B 8889f4c6277a8c6b736f0eea76b036d7f9534ccca1c5064d60ad800b40a5653159b63a0feee4a8008d296d0052c0020f3df13974432aa83419cdead3d1d14011 SHA512 95f84316bf0a91f2ba54fd5ed53b75d2d967507d1c14c5fb3c1c1950c83660b0efc40874bd1a6c34a1324c0f1a34ea64decd0379965a0609279405fbd40a206e
-EBUILD gcdemu-3.2.0.ebuild 1129 BLAKE2B ddf5a2f6762b625d6a6d853665226f97273c025fb2319bb6cb2aa91fa1876471386ee67cffa011267c9a4565228ee910695a4e4914f06b58ccfc54a768c8486e SHA512 3d137fb50f9d7b09071a985e5f214c6e82027fd95f74507ff07dbdda3daaeee8861aea7e88f32e9aec29c95383b2299ab8adb60b46110e2752a587e04634f140
-MISC metadata.xml 455 BLAKE2B 23500677c263c1b8fc4839698bd6f1c08e9821fe4472a0b1725ad4777cfff385531ab6ec966f32a2335571c315b6f886f973451076745aa9fe4297c3cc436a30 SHA512 51c8d87f3c49c81798e4d2e038f911a2e05bfde742f229939f759c6768c6459cf4aa6829981791c57ef766fd447923194d7c14d4ad16951ae505d3b5a73c3479
diff --git a/app-cdr/gcdemu/gcdemu-3.1.0.ebuild b/app-cdr/gcdemu/gcdemu-3.1.0.ebuild
deleted file mode 100644
index ec901b26bc91..000000000000
--- a/app-cdr/gcdemu/gcdemu-3.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-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="${COMMON_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_ECLASS_GLIB_SCHEMAS=1 \
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	GNOME2_ECLASS_GLIB_SCHEMAS=1 \
-	gnome2_schemas_update
-}
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 02e502013f61..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} )
-
-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/metadata.xml b/app-cdr/gcdemu/metadata.xml
deleted file mode 100644
index 3c7b1adb6301..000000000000
--- a/app-cdr/gcdemu/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>tetromino@gentoo.org</email>
-    <name>Alexandre Rostovtsev</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">cdemu</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-cdr/graveman-0.3.12_p5-r2 b/app-cdr/graveman-0.3.12_p5-r2
new file mode 100644
index 000000000000..b40620d22f1e
--- /dev/null
+++ b/app-cdr/graveman-0.3.12_p5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-cdr/cdrdao >=dev-libs/glib-2.4:2 >=gnome-base/libglade-2.4:2.0 media-libs/libmng:= virtual/cdrtools x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 dvdr? ( app-cdr/dvd+rw-tools ) flac? ( media-libs/flac ) mp3? ( media-libs/libid3tag media-libs/libmad media-sound/sox ) nls? ( virtual/libintl ) vorbis? ( media-libs/libogg media-libs/libvorbis media-sound/sox ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2
+EAPI=6
+HOMEPAGE=http://graveman.tuxfamily.org/
+IUSE=debug dvdr flac mp3 nls vorbis
+KEYWORDS=amd64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=app-cdr/cdrdao >=dev-libs/glib-2.4:2 >=gnome-base/libglade-2.4:2.0 media-libs/libmng:= virtual/cdrtools x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.4:2 dvdr? ( app-cdr/dvd+rw-tools ) flac? ( media-libs/flac ) mp3? ( media-libs/libid3tag media-libs/libmad media-sound/sox ) nls? ( virtual/libintl ) vorbis? ( media-libs/libogg media-libs/libvorbis media-sound/sox )
+SLOT=0
+SRC_URI=http://graveman.tuxfamily.org/sources/graveman-0.3.12-5.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9602a60b7b915f50c093bbea031ae09a
diff --git a/app-cdr/graveman/Manifest b/app-cdr/graveman/Manifest
deleted file mode 100644
index 1625da4ae1be..000000000000
--- a/app-cdr/graveman/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX desktop-entry.patch 544 BLAKE2B 8d02275e4dcbc4819f252b4493da4808384b2f036e0e208411bd9d734cca1802cee3c141cb0f2f4939f3286e146be9c4bbe13b8e1bf652a156d54eab377e0aba SHA512 92c46a60de5676e0fbb4a22c0e382586b0ac165ad9346f6dd4363c9ec6b19225f80755605bdcf25fdbb834d0868c7040703847797f3b835bde0849be5a08204f
-AUX joliet-long.patch 796 BLAKE2B 308e8471cbbcd2767370c452417d64bad6839126f95a4ed68c005074fb7daef85dc28076615679c1ba507a3091115e4a07ae4e6596492addb4101cdc71f72123 SHA512 cc3280b8eb0f79c89e70cdee5852119d8c13165483222fc1c750b65bfbeb081de9153387f30113ef90e553f18a5ef9625f4bd5737bd6fba521e3846294d27ade
-AUX rename.patch 505 BLAKE2B a7794bdc1a45b34fee773fb0482054b80506d7865c98e7c88f5995c3c4ee377086470d8288640f7e9686e208ba43e49ca2631348d709fa48357ceb815ec5218e SHA512 5ae9769ddd1c26a34d155d38ec2dede550e63be6fa7cb7f8a3cdd7b289aadce370c3f015bac91d0379b20f9f5a2265daff6f69b22350df9486b515c956d7abf5
-AUX sox.patch 1396 BLAKE2B c6f193498e8086111a90aa0811e4d3396c743722a8c31ac8286d37d3bf98d17bb12bd505574af2fc10633a796cdc5bf07924ebd7a2bf63e2fc8cb470feaa8ccb SHA512 545e3439a81e131a704c53e0c5a016d32a99e5bbda788ef5f3a6b1819cac7f4d5b98688e3738f3e6f1440eaba3a69efc1b2718edd578c9e4499166e4d527bd2d
-DIST graveman-0.3.12-5.tar.gz 962523 BLAKE2B b7650c79ccd379ede48d9b1a9abbb1504e88e787feaf7897f50509d92ff51171e366e99bba4c9f9d153d92b4bbc5970b9775064e7f482fb0b1ccf12e5e50c4e0 SHA512 c09ec1b5273411e61ee568260eb921bb10aafa90ccd0f4074228741c1f0470650368f96e595763d77b46c87fa4a038a1d5a3a022f8019afd5f772754f9636ee4
-EBUILD graveman-0.3.12_p5-r2.ebuild 1674 BLAKE2B 9de76d9cc919a3859e57e0eefb3b8310b370729ee22b73219f69aa0ba6ffe6de88f8988f376a9730b787229e21347f64fee77d9ded6c28e56a354c9643702cbb SHA512 5907963ae33523bb1eb1460ef9438d5240ba19a9f79f89f6d2c7ccda05e3112badb9881f3354ed43244990773622e91fa9462b31c5133ba75c468adea9c8d7a6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/graveman/files/desktop-entry.patch b/app-cdr/graveman/files/desktop-entry.patch
deleted file mode 100644
index 4a683d2c84ec..000000000000
--- a/app-cdr/graveman/files/desktop-entry.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur graveman-0.3.12-5.orig/desktop/graveman.desktop.in graveman-0.3.12-5/desktop/graveman.desktop.in
---- graveman-0.3.12-5.orig/desktop/graveman.desktop.in	2005-05-24 00:07:08.000000000 +0300
-+++ graveman-0.3.12-5/desktop/graveman.desktop.in	2008-05-10 06:33:32.000000000 +0300
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Graveman
- Name[cs]=Graveman
- Name[de]=Graveman
-@@ -48,5 +47,5 @@
- Exec=graveman
- Terminal=false
- Type=Application
--Icon=graveman48.png
--Categories=Application;Utility;
-+Icon=graveman48
-+Categories=Utility;
diff --git a/app-cdr/graveman/files/joliet-long.patch b/app-cdr/graveman/files/joliet-long.patch
deleted file mode 100644
index 0b0f66656aa3..000000000000
--- a/app-cdr/graveman/files/joliet-long.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/mkisofs.c.old	2005-05-28 02:37:14.000000000 +0200
-+++ b/src/mkisofs.c	2005-07-11 02:10:44.000000000 +0200
-@@ -91,13 +91,13 @@
-       }
-     }
- 
--    Lextra = g_strdup_printf("%s %s -iso-level %s %s%s %s%s", Lrockridge == TRUE ? "-r" : "", Ljoliet ? "-J" : "", Lisolevel,
-+    Lextra = g_strdup_printf("%s %s -iso-level %s %s%s %s%s", Lrockridge == TRUE ? "-r" : "", Ljoliet ? "-J -joliet-long" : "", Lisolevel,
-         Lmediainfo ? "-C " : "", Lmediainfo ? Lmediainfo : "", Lmediainfo && Ldevchar ? "-M " : "",
-         Lmediainfo && Ldevchar ? Ldevchar : "");
-     g_free(Lmediainfo);
-     g_free(Lisolevel);
-   } else {  /* data dvd */
--    Lextra = g_strdup("-r -J");
-+    Lextra = g_strdup("-r -J -joliet-long");
-   }
- 
-   /* charsets a utiliser pour la creation de l'image iso */
diff --git a/app-cdr/graveman/files/rename.patch b/app-cdr/graveman/files/rename.patch
deleted file mode 100644
index 5970656a3c55..000000000000
--- a/app-cdr/graveman/files/rename.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/callbacks.c.old	2006-05-23 17:42:48.642913000 +0200
-+++ b/src/callbacks.c	2006-05-23 17:42:52.553201500 +0200
-@@ -268,7 +268,7 @@
- 
-   gtk_tree_model_get(Ltreemodel, &Liter, 2, &Lname, -1);
- 
--  Ltitle = g_strdup_printf(Ltitle, _("Enter the new name for %s"), Lname);
-+  Ltitle = g_strdup_printf(_("Enter the new name for %s"), Lname);
-  
-   Lboite = gtk_dialog_new_with_buttons(Ltitle, NULL, GTK_DIALOG_MODAL,
-         GTK_STOCK_OK,GTK_RESPONSE_OK, GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL, NULL);
diff --git a/app-cdr/graveman/files/sox.patch b/app-cdr/graveman/files/sox.patch
deleted file mode 100644
index 570bc8406177..000000000000
--- a/app-cdr/graveman/files/sox.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur /var/tmp/portage/graveman-0.3.12_p5/work/graveman-0.3.12-5/src/sox.c ./src/sox.c
---- a/src/sox.c	2005-05-28 02:37:14.000000000 +0200
-+++ b/src/sox.c	2007-01-27 18:22:11.000000000 +0100
-@@ -37,7 +37,7 @@
- gboolean check_sox()
- {
-   gchar *Lsox = conf_get_string("sox");
--  gchar *Lcommandline, *Lerr = NULL;
-+  gchar *Lcommandline, *Lerr = NULL, *Lstdout = NULL;
-   gboolean Lstatus;
-   gint Lexit = 0;
- 
-@@ -47,12 +47,22 @@
-   if (!Lsox || !*Lsox) return FALSE;
- 
-   Lcommandline = g_strdup_printf("%s -help", conf_get_string("sox"));
--  Lstatus = g_spawn_command_line_sync(Lcommandline, NULL, &Lerr, &Lexit, NULL);
-+  Lstatus = g_spawn_command_line_sync(Lcommandline, &Lstdout, &Lerr, &Lexit, NULL);
-   g_free(Lcommandline);
- 
--  GsupportMp3 = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_MP3))));
--  GsupportOgg = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_OGG))));
-+  /* sox 12.17 outputs -help to stderr */ 
-+  if (Lerr && strstr(Lerr, "12.17")) {
-+	GsupportMp3 = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_MP3))));
-+	GsupportOgg = (Lstatus == TRUE && Lerr && ((strstr(Lerr, SOX_OGG))));
-+  }
-+
-+  /* sox 12.18 outputs -help to stdout */
-+  else {
-+	GsupportMp3 = (Lstatus == TRUE && Lstdout && ((strstr(Lstdout, SOX_MP3))));
-+	GsupportOgg = (Lstatus == TRUE && Lstdout && ((strstr(Lstdout, SOX_OGG))));
-+  }
-   
-+  g_free(Lstdout);
-   g_free(Lerr);
- 
-   return Lstatus;
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
deleted file mode 100644
index f38d627c9490..000000000000
--- a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2"
-HOMEPAGE="http://graveman.tuxfamily.org/"
-SRC_URI="http://graveman.tuxfamily.org/sources/${PN}-${PV/_p/-}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="debug dvdr flac mp3 nls vorbis"
-
-RDEPEND="
-	app-cdr/cdrdao
-	>=dev-libs/glib-2.4:2
-	>=gnome-base/libglade-2.4:2.0
-	media-libs/libmng:=
-	virtual/cdrtools
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.4:2
-	dvdr? ( app-cdr/dvd+rw-tools )
-	flac? ( media-libs/flac )
-	mp3? ( 	media-libs/libid3tag
-		media-libs/libmad
-		media-sound/sox )
-	nls? ( virtual/libintl )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-		media-sound/sox )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${P/_p/-}"
-
-src_prepare() {
-	eapply \
-		"${FILESDIR}"/joliet-long.patch \
-		"${FILESDIR}"/rename.patch \
-		"${FILESDIR}"/desktop-entry.patch
-
-	if use mp3 || use vorbis; then
-		eapply "${FILESDIR}"/sox.patch
-	fi
-
-	# Fix tests
-	echo glade/dialog_media.glade >> po/POTFILES.in
-	echo glade/window_welcome.glade >> po/POTFILES.in
-	echo src/flac.c >> po/POTFILES.in
-
-	# Prevent m4_copy error when running aclocal
-	# m4_copy: won't overwrite defined macro: glib_DEFUN, bug #579918
-	rm m4/glib-gettext.m4 || die
-
-	eautoreconf # Needed for build only the needed translations
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable debug) \
-		$(use_enable flac) \
-		$(use_enable mp3) \
-		$(use_enable vorbis ogg)
-}
diff --git a/app-cdr/graveman/metadata.xml b/app-cdr/graveman/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-cdr/graveman/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/gtkcdlabel-1.15 b/app-cdr/gtkcdlabel-1.15
new file mode 100644
index 000000000000..d5342ef17d22
--- /dev/null
+++ b/app-cdr/gtkcdlabel-1.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-cdr/cdlabelgen-4 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=A GUI for cdlabelgen that generates CD labels
+EAPI=6
+HOMEPAGE=http://gtkcdlabel.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 ppc ~sparc x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-cdr/cdlabelgen-4 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/gtkcdlabel/gtkcdlabel-1.15.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=0b3da740415a57869d945e5cc1e09ce2
diff --git a/app-cdr/gtkcdlabel/Manifest b/app-cdr/gtkcdlabel/Manifest
deleted file mode 100644
index 21115d43f80b..000000000000
--- a/app-cdr/gtkcdlabel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gtkcdlabel-1.15.tar.bz2 36468 BLAKE2B afddc7029fa509f792757f2f57f07002854b0387c7c417cd3b45297757e7dc3c019d0a9a0207b5025ecd91c8c3713503f0e7f43b2eb7e2abe7054b32ae271352 SHA512 3edcaa0b15a592d684a20c34282437f5f51201cd6dde915a1a02ac1ed388a2046f8e2ce7aecf4afac3e4af01191d747c34e50d689eb945072bc20f4458bf7356
-EBUILD gtkcdlabel-1.15.ebuild 764 BLAKE2B 015ad3b2fe149530f8d6a8dc66b1ffaf0db1475e6d73bdbbb338b93ecbed415a40633f006ee494ad55b1181ade1b0680c1278f096703490fa6191cd7b0ddcbf4 SHA512 50e46dc69a84857d51a718e48bad83d74e0cbaa30440d56d060497aac73910054241b1e26bb10e5300bbec2d11d71524b52d8c2ef54bc61a419cd25405ddb0e0
-MISC metadata.xml 247 BLAKE2B d8d62acef0f0dc2775a84b74f6e185af3172c49a298011a8c9b54283b7fcb37a15edeeb4a411544d992883e7303d1a43a9cb553efbf5ed00c30ccfb9ee86bc25 SHA512 dc900409a542a32f73819f826b53be8e553d7890f136cfc4533c2931c605c45282bf87b89dbde2f7a630a5d8497ace4b8e1b1f8922ad45bc6eb68c347a1d92e5
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.15.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.15.ebuild
deleted file mode 100644
index f0e3b51cba89..000000000000
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.15.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A GUI for cdlabelgen that generates CD labels"
-HOMEPAGE="http://gtkcdlabel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	>=app-cdr/cdlabelgen-4
-	dev-python/pygtk[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	python_fix_shebang .
-}
-
-src_install() {
-	dobin "usr/bin/${PN}.py"
-	insinto /usr/share
-	doins -r usr/share/{applications,"${PN}",pixmaps}
-	dodoc usr/share/doc/"${PN}"/{AUTHORS,README}
-}
diff --git a/app-cdr/gtkcdlabel/metadata.xml b/app-cdr/gtkcdlabel/metadata.xml
deleted file mode 100644
index a38de18b27b2..000000000000
--- a/app-cdr/gtkcdlabel/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">gtkcdlabel</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/iat-0.1.7-r1 b/app-cdr/iat-0.1.7-r1
new file mode 100644
index 000000000000..04fdcf110578
--- /dev/null
+++ b/app-cdr/iat-0.1.7-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=BIN, MDF, PDI, CDI, NRG, and B5I converters
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=amd64 arm x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/iat-0.1.7.tar.bz2
+_md5_=a05f66532c4161793034bfa02d1d8cfd
diff --git a/app-cdr/iat/Manifest b/app-cdr/iat/Manifest
deleted file mode 100644
index aeaf82ec102f..000000000000
--- a/app-cdr/iat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iat-0.1.7.tar.bz2 103750 BLAKE2B 30aed495ea5a03478fa741ef0479d22bb12e579fddf7f9232b62430d7867f4a0029145e69909f39d3b63c0b8d7f11b473f00cacbf3e051050157177503034d0b SHA512 ecde86ae11a9d88f7fa05c3b803941f6e5fad6f3dd14dc094145aa809fe9a15f7b410dae7b81715147c92309b618b8b62975ee193b73f38250b4403a6dd55eb4
-EBUILD iat-0.1.7-r1.ebuild 401 BLAKE2B ffcc16ea4e34763832b57e28d7ce47a1d00dc33f1f46e61764d3a377ebaad67cbb5e4e95fcba9c3f13601d240279e9505357e89f639236a43c511ce318d84883 SHA512 03325afdf37c5e29166b8c6be9c2b7a6b3939ed4f8cc5adf6019a59592e77a45ef9b2074d5a2cd532176334edabdc2662abcee7b03f7e6c1074e0765f0cd2fdf
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/iat/iat-0.1.7-r1.ebuild b/app-cdr/iat/iat-0.1.7-r1.ebuild
deleted file mode 100644
index b55af314a5fa..000000000000
--- a/app-cdr/iat/iat-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="BIN, MDF, PDI, CDI, NRG, and B5I converters"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-src_configure() {
-	econf  \
-		--includedir="${EPREFIX}/usr/include/${PN}"
-}
diff --git a/app-cdr/iat/metadata.xml b/app-cdr/iat/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-cdr/iat/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/isoimagewriter-0.2 b/app-cdr/isoimagewriter-0.2
new file mode 100644
index 000000000000..9e3135c08387
--- /dev/null
+++ b/app-cdr/isoimagewriter-0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gpgme[cxx,qt5] virtual/libudev:= sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Write hybrid ISO files onto a USB disk
+EAPI=6
+HOMEPAGE=http://wiki.rosalab.com/en/index.php/Blog:ROSA_Planet/ROSA_Image_Writer
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 app-crypt/gpgme[cxx,qt5] virtual/libudev:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/unstable/isoimagewriter/0.2/isoimagewriter-0.2.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c5d00f83d2e0c7e7e80c4c6e9e8ea1b
diff --git a/app-cdr/isoimagewriter/Manifest b/app-cdr/isoimagewriter/Manifest
deleted file mode 100644
index f1d8010dee02..000000000000
--- a/app-cdr/isoimagewriter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST isoimagewriter-0.2.tar.xz 423900 BLAKE2B 36ce0b0bba3d955c4e10d003a3bded9ec55931b6496c5b1c91c83b6c8d3fa29e033a833d6c16a81f098a16f57cac0dae638719d389892d0336a28a6cdbd24151 SHA512 cec7d67e8255caaaccc14d07da3677a13b8081f599136516b0a31262e20eec884fa738dcc2d3aa1bfd49c00bb6c5bc6c3a62c767b13cdb06799cb53cf1e6ecc1
-EBUILD isoimagewriter-0.2.ebuild 606 BLAKE2B 1b30be3c52c9e6be1ae661097bf9ead09997f14b03e18e9fba3cd46a3e4fa516ffe756c84eeee8b5673e863ea5e019e5fd9a4553b63d803b8c12175ba794722d SHA512 87a60ad8795b9dcf6f1749fd77c0af0eee305bfad98420fdfecb3cf9b80cfe8251a2579f07a9aa12ee3abed34dce6c55e25b79b395c0a55421eb041131591e16
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-cdr/isoimagewriter/isoimagewriter-0.2.ebuild b/app-cdr/isoimagewriter/isoimagewriter-0.2.ebuild
deleted file mode 100644
index fdcf75951548..000000000000
--- a/app-cdr/isoimagewriter/isoimagewriter-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Write hybrid ISO files onto a USB disk"
-HOMEPAGE="http://wiki.rosalab.com/en/index.php/Blog:ROSA_Planet/ROSA_Image_Writer"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	app-crypt/gpgme[cxx,qt5]
-	virtual/libudev:=
-"
-RDEPEND="${DEPEND}"
diff --git a/app-cdr/isoimagewriter/metadata.xml b/app-cdr/isoimagewriter/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/app-cdr/isoimagewriter/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-cdr/isomaster-1.3.13 b/app-cdr/isomaster-1.3.13
new file mode 100644
index 000000000000..b7ea90878402
--- /dev/null
+++ b/app-cdr/isomaster-1.3.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=>=dev-libs/iniparser-3.0.0:0 x11-libs/gtk+:2 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.1 )
+DESCRIPTION=Graphical CD image editor for reading, modifying and writing ISO images
+EAPI=6
+HOMEPAGE=http://littlesvr.ca/isomaster
+IUSE=nls
+KEYWORDS=amd64 x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/iniparser-3.0.0:0 x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://littlesvr.ca/isomaster/releases/isomaster-1.3.13.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1b3fec1f9cdcb643d74d2423cdd7fd97
diff --git a/app-cdr/isomaster-1.3.14 b/app-cdr/isomaster-1.3.14
new file mode 100644
index 000000000000..136145b54253
--- /dev/null
+++ b/app-cdr/isomaster-1.3.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=>=dev-libs/iniparser-4.1:4 x11-libs/gtk+:2 virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.1 )
+DESCRIPTION=Graphical CD image editor for reading, modifying and writing ISO images
+EAPI=6
+HOMEPAGE=http://littlesvr.ca/isomaster
+IUSE=nls
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/iniparser-4.1:4 x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://littlesvr.ca/isomaster/releases/isomaster-1.3.14.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a7362618fa2fed12b9fe50d4da9bda6a
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
deleted file mode 100644
index b39b29c07f35..000000000000
--- a/app-cdr/isomaster/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX isomaster-1.3.9-iniparser-3.0.0.patch 780 BLAKE2B bd7f3cff83b01bb241e005ce200016dd7ee30ac8798a9c250924f20da55f1f774558b64d37bf0a4e30dc44f18ed06f585bda4e3c2c0edf31b203ce5554d7cc50 SHA512 0681ab5b4578f67b1eb9e8180fde951d4a34dbf40452ee29a6f09992afed6da5084791d86778296964cb39d59d2eaf51b97972e02582a5d6ff3698655bf09134
-DIST isomaster-1.3.13.tar.bz2 245085 BLAKE2B ae2333f5511aae8deed76e556cf6055f7ad257d613dcf5c85274946f31f0da879b5fb7953d065046371c6f20faa15663ecb3c5d976c4dff404140cd09d23207c SHA512 dbc6a77fabf8d454bbde25a7540e68820bf773bc991176e5684e87aeb6044ad1bbbcf1c4f537148c18ec8847572949a52d6578a14f68b8ad3f21d542685859ba
-DIST isomaster-1.3.14.tar.bz2 257674 BLAKE2B 7b7abeb586eb8c6964d7959222195c1999f81275dea305e7c4efec1fef6dd9d9d4969552e6a6a4a882a9fe227ea072c6639879896e50799db9e67732e1331ad4 SHA512 5454baa4ce4e09df8ec4331718df3e1d81c0647867a21cfc4c4b15d90e509371a636e8fada7e624c0cf6d1b03b564bf89a2a26e13b5ec1b4cca91407bbc518f5
-EBUILD isomaster-1.3.13.ebuild 1507 BLAKE2B 7376caeaac6a4cafafe18935bde267b56b09bbc30255598c0d66a1bb7f67b22bb5e23abfc94dac2d9a7db4947144e293c3046331093ac7ba786d9f2942a1774d SHA512 7504b26b144abf3c32e9fbceaa0768db744d4934df495c9c40dcea003c7f5edc3ff5abcde9c5f5c9fa1e857b72e9d3a251bade719859776168848f8ed3e1444b
-EBUILD isomaster-1.3.14.ebuild 1463 BLAKE2B 94b41867d4993b287787ec280f8c0547ec0aba5dc44a44a820fae1a96eb1e78dcb562412d3ec8d6ecdeaffe5e598990957e820598af15bdf0528bcc960f1467d SHA512 d4d890cb728f0a3169c3f404010b03b23981913756717d991278325e4aee788258e039b2bf4be1b8c5eed9cd59e63ad74c9b7348d22383cebf9eeea30091e927
-MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch b/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch
deleted file mode 100644
index 902028a660a2..000000000000
--- a/app-cdr/isomaster/files/isomaster-1.3.9-iniparser-3.0.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d2cea534819267e9e8b7348b7cf6fdbad72c7b11 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 21 Jan 2012 21:34:33 +0100
-Subject: [PATCH] Fix compilation against iniparser 3.0.0 (bug #399629)
-
----
- Makefile |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3f4b383..43187fc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -66,6 +66,7 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64
- 
- ifdef USE_SYSTEM_INIPARSER
- CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER)
-+CPPFLAGS += -Diniparser_setstr=iniparser_set  # Define went away with iniparser 3.0.0, Gentoo bug #399629
- endif
- 
- OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o editfile.o
--- 
-1.7.8.4
-
diff --git a/app-cdr/isomaster/isomaster-1.3.13.ebuild b/app-cdr/isomaster/isomaster-1.3.13.ebuild
deleted file mode 100644
index 5497413a82de..000000000000
--- a/app-cdr/isomaster/isomaster-1.3.13.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
-HOMEPAGE="http://littlesvr.ca/isomaster"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/iniparser-3.0.0:0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.9-iniparser-3.0.0.patch #399629
-)
-
-pkg_setup() {
-	myisoconf=(
-		DEFAULT_EDITOR=leafpad
-		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
-		USE_SYSTEM_INIPARSER=1
-		PREFIX=/usr
-		)
-
-	use nls || myisoconf+=( WITHOUT_NLS=1 )
-}
-
-src_prepare() {
-	default
-	rm -f configure || die #274361
-	rm -R iniparser-2.17 || die
-}
-
-src_compile() {
-	tc-export CC
-	emake "${myisoconf[@]}"
-}
-
-_apply_linguas() {
-	mv "${D}"/usr/share/locale{,_ALL} || die
-	dodir /usr/share/locale || die
-	for lingua in ${LINGUAS}; do
-		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
-		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
-	done
-	rm -R "${D}"/usr/share/locale_ALL || die
-}
-
-src_install() {
-	emake "${myisoconf[@]}" DESTDIR="${D}" install
-	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
-
-	use nls && _apply_linguas  # bug 402679, bug 512448
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-cdr/isomaster/isomaster-1.3.14.ebuild b/app-cdr/isomaster/isomaster-1.3.14.ebuild
deleted file mode 100644
index 8dd88dcd9ad1..000000000000
--- a/app-cdr/isomaster/isomaster-1.3.14.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
-HOMEPAGE="http://littlesvr.ca/isomaster"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/iniparser-4.1:4
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
-
-pkg_setup() {
-	myisoconf=(
-		DEFAULT_EDITOR=leafpad
-		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
-		USE_SYSTEM_INIPARSER=1
-		LIB_INIPARSER=iniparser4
-		PREFIX=/usr
-		)
-
-	use nls || myisoconf+=( WITHOUT_NLS=1 )
-}
-
-src_prepare() {
-	default
-	rm -f configure || die #274361
-	rm -R iniparser-4.1 || die
-}
-
-src_compile() {
-	tc-export CC
-	emake "${myisoconf[@]}"
-}
-
-_apply_linguas() {
-	mv "${D}"/usr/share/locale{,_ALL} || die
-	dodir /usr/share/locale || die
-	for lingua in ${LINGUAS}; do
-		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
-		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
-	done
-	rm -R "${D}"/usr/share/locale_ALL || die
-}
-
-src_install() {
-	emake "${myisoconf[@]}" DESTDIR="${D}" install
-	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
-
-	use nls && _apply_linguas  # bug 402679, bug 512448
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-cdr/isomaster/metadata.xml b/app-cdr/isomaster/metadata.xml
deleted file mode 100644
index 6d2298876faa..000000000000
--- a/app-cdr/isomaster/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sping@gentoo.org</email>
-		<name>Sebastian Pipping</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-cdr/kcdemu-0.7.2 b/app-cdr/kcdemu-0.7.2
new file mode 100644
index 000000000000..f2e64e492dac
--- /dev/null
+++ b/app-cdr/kcdemu-0.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Frontend to cdemu daemon based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.linux-apps.com/p/998461/
+IUSE=debug
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=app-cdr/cdemu-2.0.0[cdemu-daemon] !app-cdr/kcdemu:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=https://dl.opendesktop.org/api/files/download/id/1481242372/kde_cdemu-0.7.2.tar.bz2 -> kcdemu-0.7.2.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dbdbdd49b9d5072e2d3840475d87d785
diff --git a/app-cdr/kcdemu/Manifest b/app-cdr/kcdemu/Manifest
deleted file mode 100644
index 409a3b41ba90..000000000000
--- a/app-cdr/kcdemu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kcdemu-0.7.2.tar.bz2 16408 BLAKE2B 45737abd24b236205b476cfc87b9290d1cd3ef846fbe5ee9626e8256475a33af2d00a9856d4924feaf5f6fe7623a473b05e891acd672ba099bd01c5f5bdab762 SHA512 9ffe5a2d42622cb7e7e072b29eb9977464dfa2517f0d3d2af5580da0dae2fc7e56be8aebcb1dc94aecdc279a12baa3a27fa999293a25c3ebd0316c92848516fa
-EBUILD kcdemu-0.7.2.ebuild 838 BLAKE2B 4faba3137689643a24e3802bb8c0307137d8ec0a9d538414d5c30e5426d26cd2662b123817fae00c66fb1aa5e8b8443f573cb490264da982db7850877180abc2 SHA512 d73ea75e85412ade242769067aa9008351717c73d436ea942f17c2a29a5992d1f7a942f3c6d4eb33bab9ba45fea3498447ef021a0c30069e151d8d62efff0936
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-cdr/kcdemu/kcdemu-0.7.2.ebuild b/app-cdr/kcdemu/kcdemu-0.7.2.ebuild
deleted file mode 100644
index 09dea77fc930..000000000000
--- a/app-cdr/kcdemu/kcdemu-0.7.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="kde_cdemu"
-inherit kde5
-
-DESCRIPTION="Frontend to cdemu daemon based on KDE Frameworks"
-HOMEPAGE="https://www.linux-apps.com/p/998461/"
-SRC_URI="https://dl.opendesktop.org/api/files/download/id/1481242372/${MY_PN}-${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	>=app-cdr/cdemu-2.0.0[cdemu-daemon]
-	!app-cdr/kcdemu:4
-"
-
-S=${WORKDIR}/${MY_PN}
diff --git a/app-cdr/kcdemu/metadata.xml b/app-cdr/kcdemu/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/app-cdr/kcdemu/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-cdr/metadata.xml b/app-cdr/metadata.xml
deleted file mode 100644
index c7c7c3a8559e..000000000000
--- a/app-cdr/metadata.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The app-cdr category contains software for writing CDs and DVDs, and for
-		working with .iso files.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie app-cdr enthält Software für das Erstellen von CDs und DVDs, 
-		sowie für das Arbeiten mit ISO-Dateien.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría app-cdr contiene programas para escribir CDs y DVDs, y para
-		trabajar con archivos .iso.
-	</longdescription>
-	<longdescription lang="ja">
-		app-cdrカテゴリにはCDとDVDを書込んで、.isoファイルツールソフトウェアが
-		含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De app-cdr categorie bevat applicaties om CD's en DVD's te branden en om
-		.iso bestanden te bewerken.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm app-cdr chứa các phần mềm để ghi CD và DVD, làm
-		việc với các tập tin .iso.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria app-cdr contiene programmi per scrivere CD e DVD e lavorare con file .iso .
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria app-cdr contém software para gravar CDs e DVDs, e para
-		trabalhar com arquivos .iso.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria app-cdr zawiera programy służące do zapisywania danych na
-		płyty CD i DVD oraz służące do manipulowania plikami .iso.
-	</longdescription>
-</catmetadata>
-
diff --git a/app-cdr/mirage2iso-0.4.2 b/app-cdr/mirage2iso-0.4.2
new file mode 100644
index 000000000000..b4797ca537d2
--- /dev/null
+++ b/app-cdr/mirage2iso-0.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=>=dev-libs/libmirage-2.0.0:0= dev-libs/glib:2= pinentry? ( dev-libs/libassuan:0= ) app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=CD/DVD image converter using libmirage
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/mirage2iso/
+IUSE=pinentry test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/libmirage-2.0.0:0= dev-libs/glib:2= pinentry? ( dev-libs/libassuan:0= ) pinentry? ( app-crypt/pinentry )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mgorny/mirage2iso/releases/download/v0.4.2/mirage2iso-0.4.2.tar.xz test? ( https://github.com/mgorny/mirage2iso/releases/download/v0.4.2/mirage2iso-0.4.2-tests.tar.xz )
+_md5_=5f83075b619e3f97ce3616f14e9896ea
diff --git a/app-cdr/mirage2iso-9999 b/app-cdr/mirage2iso-9999
new file mode 100644
index 000000000000..cce35df2e700
--- /dev/null
+++ b/app-cdr/mirage2iso-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare unpack
+DEPEND=>=dev-libs/libmirage-2.0.0:0= dev-libs/glib:2= pinentry? ( dev-libs/libassuan:0= ) dev-libs/libassuan virtual/pkgconfig test? ( app-arch/xz-utils ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=CD/DVD image converter using libmirage
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/mirage2iso/
+IUSE=pinentry test
+LICENSE=BSD
+RDEPEND=>=dev-libs/libmirage-2.0.0:0= dev-libs/glib:2= pinentry? ( dev-libs/libassuan:0= ) pinentry? ( app-crypt/pinentry )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7bfb098ed27dfa0637e042008d0d70ea
diff --git a/app-cdr/mirage2iso/Manifest b/app-cdr/mirage2iso/Manifest
deleted file mode 100644
index 082d955ca927..000000000000
--- a/app-cdr/mirage2iso/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mirage2iso-0.4.2-tests.tar.xz 12362388 BLAKE2B 7ed280ead88e3f63efe7d545f428ebe901762455f641f24d12e5b01270d29a6a47ba0cfb895bb3e7967bee4de192b0bf42eaf0714b0120683df434d8f2e5f627 SHA512 94955524e8caecf7c9e27e016677e03265311bff6fe1e7f873f8bb009e27a2cad7748e451de382a76ec312d39aee1ef94edd81386009d120c2a3ba63494a366e
-DIST mirage2iso-0.4.2.tar.xz 93168 BLAKE2B 957734f8fe1a57b7472f20250ae0b7347d8fac8b8bf51ed1ecacbe3521b0fc23c846e9fd9988ab8484e081b015726ae8e183fc171577a57b72fb00181e593650 SHA512 ef2671bf6887696f09fbf12df5af06ee5a6d66a9b6dd95ac5c84b71a6dc3216a4c5013aee7b8fb8ffebc8cab1a707b66f10ddefc5e20a5abe3ad0edce960b817
-EBUILD mirage2iso-0.4.2.ebuild 800 BLAKE2B ab858df133b77a7640e44c5c97645e9893392f16eb76c2346eea2b48b40409db33b8a11185c7005981bf4df5be12d21349227b5a0dbb10d52ffb85bd996d8827 SHA512 0791fad85876ea76e24e4c580534864a4fe864e9df2ebd76b7e879bbc5c2c428493a1cdc57697c73c7c73892ac36d9377218d9a041d1498fd1197743c18fef4b
-EBUILD mirage2iso-9999.ebuild 791 BLAKE2B 7f67b03e7c44a6c092bc07dbb637c1aaef9286c13cfd6225deeb233a469e52aadce8384c41574dba97c3b9106facfa9372e3fe1e4314a72016a16266130afd0d SHA512 e22d09aa9dfe4101b88120a4b718add10da9c2298da204aac33b108102fa759b9fca58a2e3f201fa40f1690fd82616d4404342e8bde2081475b19c6a9a4736c2
-MISC metadata.xml 620 BLAKE2B 25e0626d39a3336342b597f75758e4e8d203c9b64a5f30da9b6ab0ac53ef29eaae61ca8b1419877e980ea3b4a9d037e4b5047468ca2293adabd58dba937ce6b1 SHA512 8ff607390bb7fe65725b123868e60d514550861a57d62c92ddeb282e3035ade4760ffc2d8298c35bab55f06016dddf7f95c013bbf5e6b9311574933cfd554e00
diff --git a/app-cdr/mirage2iso/metadata.xml b/app-cdr/mirage2iso/metadata.xml
deleted file mode 100644
index 80f0436e5426..000000000000
--- a/app-cdr/mirage2iso/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<use>
-		<flag name="pinentry">Support <pkg>app-crypt/pinentry</pkg> password
-			input backend.</flag>
-	</use>
-	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://github.com/mgorny/mirage2iso/issues/</bugs-to>
-		<remote-id type="github">mgorny/mirage2iso</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild
deleted file mode 100644
index c1efb10c0087..000000000000
--- a/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="CD/DVD image converter using libmirage"
-HOMEPAGE="https://github.com/mgorny/mirage2iso/"
-SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.xz
-	test? ( https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}-tests.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pinentry test"
-
-COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0=
-	dev-libs/glib:2=
-	pinentry? ( dev-libs/libassuan:0= )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	pinentry? ( app-crypt/pinentry )"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local myconf=(
-		$(use_with pinentry libassuan)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/app-cdr/mirage2iso/mirage2iso-9999.ebuild b/app-cdr/mirage2iso/mirage2iso-9999.ebuild
deleted file mode 100644
index 117ba275a26e..000000000000
--- a/app-cdr/mirage2iso/mirage2iso-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/mgorny/mirage2iso.git"
-inherit autotools git-r3
-
-DESCRIPTION="CD/DVD image converter using libmirage"
-HOMEPAGE="https://github.com/mgorny/mirage2iso/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="pinentry test"
-
-COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0=
-	dev-libs/glib:2=
-	pinentry? ( dev-libs/libassuan:0= )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libassuan
-	virtual/pkgconfig
-	test? ( app-arch/xz-utils )"
-RDEPEND="${COMMON_DEPEND}
-	pinentry? ( app-crypt/pinentry )"
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_with pinentry libassuan)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/app-cdr/mkcdtoc-1.0 b/app-cdr/mkcdtoc-1.0
new file mode 100644
index 000000000000..1a6b230110e3
--- /dev/null
+++ b/app-cdr/mkcdtoc-1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=>=dev-lang/perl-5.8.0
+DESCRIPTION=command-line utility to create toc-files for cdrdao
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/mkcdtoc/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.8.0
+SLOT=0
+SRC_URI=mirror://sourceforge/mkcdtoc/mkcdtoc-1.0.tar.bz2
+_md5_=6902c2ff05d9af850ace0d1d23fbab1d
diff --git a/app-cdr/mkcdtoc/Manifest b/app-cdr/mkcdtoc/Manifest
deleted file mode 100644
index 461979ad3ef3..000000000000
--- a/app-cdr/mkcdtoc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mkcdtoc-1.0.tar.bz2 18255 BLAKE2B 305a218343c09d77968c93a19ebfc95d4b1fc5fd85792323caca1d7d3254fbb731cf5ca510747d7d35a620269ed59e64d0b15abd7173390b6a17c4817155090d SHA512 1eb06913118f9c300f528ded9b733eb9842f5b781bad68493b2f938b2f2a876d3d9d19000d1e4a1f15974049464db09047ebab1570251241220315f80070d32f
-EBUILD mkcdtoc-1.0.ebuild 396 BLAKE2B b4af39555ca634ebc702770cc898e19eed32f136c3ab78dff2bcf068b11a25bf3079ee834dc1f0ade6aa83a76af573c1dcd35469181cd64acf3a3ff308c4c970 SHA512 dca57c11b19d7c9dd4783afd89607d41a95099b896336a91be11ef6c22d53ad2372d28b980918b03df01ebc6dbb96d0696db2db0b3bbf1cbe63cd615f6772603
-MISC metadata.xml 544 BLAKE2B 061e8b65e8d8b663ab92f9cd9551b8e90fa065253776041a8b7ea526c3a46b621b8a6d6a0020321dc046131fc368b9a9ebaa059e16889e2a5c1b7aa2785ce592 SHA512 ca257347d43ee33420003ec202aeca6fe2a04fb2bc3d1e68a9e07b3239525e4c04a9822223e03e87e4c0df288f83b1df5973f31b69f31c9761e30d10448de2c7
diff --git a/app-cdr/mkcdtoc/metadata.xml b/app-cdr/mkcdtoc/metadata.xml
deleted file mode 100644
index a9c94b2b4ae4..000000000000
--- a/app-cdr/mkcdtoc/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		mkcdtoc is a command-line utility to create toc-files for cdrdao. It
-		reads a list of audio files in simple text or M3U format. The program
-		can be extended via plugins. There is plugins to fill CD-TEXT blocks
-		and perform audio file conversion.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">mkcdtoc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild b/app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild
deleted file mode 100644
index c49089a56cab..000000000000
--- a/app-cdr/mkcdtoc/mkcdtoc-1.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="command-line utility to create toc-files for cdrdao"
-HOMEPAGE="https://sourceforge.net/projects/mkcdtoc/"
-SRC_URI="mirror://sourceforge/mkcdtoc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.8.0"
-RDEPEND="${DEPEND}"
diff --git a/app-cdr/mode2cdmaker-1.5.1 b/app-cdr/mode2cdmaker-1.5.1
new file mode 100644
index 000000000000..d6a491fb0be6
--- /dev/null
+++ b/app-cdr/mode2cdmaker-1.5.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Utility to create mode-2 CDs, for example XCDs
+EAPI=0
+HOMEPAGE=https://www.gentoo.org/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/mode2cdmaker-1.5.1-src.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cc7f71afb77d5ca77bf6dd4946da200e
diff --git a/app-cdr/mode2cdmaker/Manifest b/app-cdr/mode2cdmaker/Manifest
deleted file mode 100644
index 85c7da2fc709..000000000000
--- a/app-cdr/mode2cdmaker/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mode2cdmaker-1.5.1-gentoo.patch 1479 BLAKE2B 513be90ffca1422de78b069177e97d57e8bb239026f8c3576b54fe9861ee28cf22e24991773c2aa72971dee507157e19c8f7eeb89bacb1d4f656d984b6734ba8 SHA512 c88dbebb84183c8a47e185de0890bcccde5d5dd99a7942166d0d388a96c14269a38549906dfc0e982fd3fc31c47e75898f811c01b76de28c2625840e230c1f3c
-DIST mode2cdmaker-1.5.1-src.zip 57049 BLAKE2B f314dcd862732598a6c0035dc50fcbbebb14da3c8941d9d34ebc8c012add030040b9a8465c2b5bf526da792738119c570eb98ab840d9b376c7fd7f602f6c2388 SHA512 854aea23ae83521f689c5e4d91e6b3aba3e0977a987eb5a88fd340bb2b3f795ba76bf227a84727f3792b4f2453b4a4710d5e3782ccbfda79569506c23e77302f
-EBUILD mode2cdmaker-1.5.1.ebuild 627 BLAKE2B d2419493c98514431e648ba89b02541b36c47e331374c54e05f9d4ecc2ca5def4a91d73e0d784ed8581f08fcb015b8740d15d55af4574c485381ed0c46098d59 SHA512 e9342e30984dd016e6a68062c7cf44411a57df0124276a2eff3cf71dfa5838e468e1a7becee2eee2ae96f9d44e0d2416afd216b06bb7bc94755fccd2b681706f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/mode2cdmaker/files/mode2cdmaker-1.5.1-gentoo.patch b/app-cdr/mode2cdmaker/files/mode2cdmaker-1.5.1-gentoo.patch
deleted file mode 100644
index 502819c11df3..000000000000
--- a/app-cdr/mode2cdmaker/files/mode2cdmaker-1.5.1-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur mode2cdmaker-1.5.1.orig/Makefile.linux mode2cdmaker-1.5.1/Makefile.linux
---- mode2cdmaker-1.5.1.orig/Makefile.linux	2003-02-01 16:27:18.000000000 +0200
-+++ mode2cdmaker-1.5.1/Makefile.linux	2008-06-15 19:24:14.000000000 +0300
-@@ -4,8 +4,8 @@
- output=mode2cdmaker
- 
- all:
--	gcc -c $(srcs)
--	gcc -o $(output) $(objs)
-+	$(CC) ${CFLAGS} -DMAX_PATH=512 -c $(srcs)
-+	$(CC) ${LDFLAGS} -o $(output) $(objs)
- 
- clean:
- 	-rm -f $(objs) $(output)
-diff -ur mode2cdmaker-1.5.1.orig/mkvcdfs.c mode2cdmaker-1.5.1/mkvcdfs.c
---- mode2cdmaker-1.5.1.orig/mkvcdfs.c	2003-03-14 19:57:38.000000000 +0200
-+++ mode2cdmaker-1.5.1/mkvcdfs.c	2008-06-15 19:23:25.000000000 +0300
-@@ -120,6 +120,7 @@
- #endif
- #endif
- #include <stdio.h>
-+#include <stdlib.h>
- #include <fcntl.h>
- #include <string.h>
- #include <ctype.h>
-@@ -629,7 +630,7 @@
- 				next_command[1]=(char*)malloc(256);
- 				while (fgets(next_command[1],256,pf))
- 				{
--					next_command[1][lstrlen(next_command[1])-1]=0;
-+					next_command[1][strlen(next_command[1])-1]=0;
- 					parse_params(2,next_command,idepth+1);
- 				}
- 				fclose(pf);
-diff -ur mode2cdmaker-1.5.1.orig/vcdisofs.c mode2cdmaker-1.5.1/vcdisofs.c
---- mode2cdmaker-1.5.1.orig/vcdisofs.c	2003-02-02 00:02:44.000000000 +0200
-+++ mode2cdmaker-1.5.1/vcdisofs.c	2008-06-15 19:19:59.000000000 +0300
-@@ -80,6 +80,8 @@
- #include <windows.h>
- #endif
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include <time.h>
- #include "defaults.h"
- 
diff --git a/app-cdr/mode2cdmaker/metadata.xml b/app-cdr/mode2cdmaker/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-cdr/mode2cdmaker/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/mode2cdmaker/mode2cdmaker-1.5.1.ebuild b/app-cdr/mode2cdmaker/mode2cdmaker-1.5.1.ebuild
deleted file mode 100644
index d3f0bde8ee9c..000000000000
--- a/app-cdr/mode2cdmaker/mode2cdmaker-1.5.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility to create mode-2 CDs, for example XCDs"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake -f Makefile.linux || die
-}
-
-src_install() {
-	dobin mode2cdmaker || die
-	dodoc {bugs,compatibility,readme}.txt
-}
diff --git a/app-cdr/mp3burn-0.4.2 b/app-cdr/mp3burn-0.4.2
new file mode 100644
index 000000000000..21702adfea2e
--- /dev/null
+++ b/app-cdr/mp3burn-0.4.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/perl
+DESCRIPTION=Burn mp3s without filling up your disk with .wav files
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/mp3burn
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl media-sound/mpg123 media-libs/flac media-sound/vorbis-tools virtual/cdrtools dev-perl/MP3-Info dev-perl/Ogg-Vorbis-Header dev-perl/String-ShellQuote
+SLOT=0
+SRC_URI=mirror://sourceforge/mp3burn/mp3burn-0.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0e1f9c67cf4394ef53dab8f8c30f3482
diff --git a/app-cdr/mp3burn/Manifest b/app-cdr/mp3burn/Manifest
deleted file mode 100644
index b6f2c5f00149..000000000000
--- a/app-cdr/mp3burn/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mp3burn-0.4.2-build.patch 450 BLAKE2B 495a56ba698a6e160583cdcdfff895f09cb478c9a7d03142aef5e4a038488a5127f0d8ad5a01f2ce2b4b351f5309339251c39582f49471b3865b182184ffc7a9 SHA512 0b3d88fb3d716da0ba97e4a041f7df3204c67b3033374f592a37d4cc9414ee6fb95fe7ab50b9e47036ba353c2382fe18cea5d8bc2993cfb374c93a31858f38f2
-DIST mp3burn-0.4.2.tar.gz 17166 BLAKE2B 099954b2bd5ba6ff2dcbdade63b7bd2ffeaf4c269eee9c856149b8a899ed995e131516446b80c905850733e385bb4f6cb52ad2cb15fe4306dce417cadbb359ec SHA512 96234f7e7a528b0073e3cb8130d5f606741532954e54de56757b4b0945d24fa72860e62ae1d78a13463ed8dca22848d99d49791957ba3c92cb60591d0f54f261
-EBUILD mp3burn-0.4.2.ebuild 705 BLAKE2B 63105038984bc944b75d49b76ec82b66e6102fef55cd01266964d9980e277cc72072394e820e97e7b377e7a80b4db94ea7eceec3df738268e3e73605180bcc3b SHA512 5ebe8e11aa4b933137dc69d9f3473b6d41dc81d2ebb158262bd549d3617c037fd048774b6831766b8356b25e323016b1b18ad959ae901cfb36b1909f9d78e079
-MISC metadata.xml 244 BLAKE2B e3e13de16e966b5bf7cb78a5941c209f349ad3862e14028e8b48825b691269a8397f681ef076c017ef72c14d1adecc64f6a9582a20eaad8c002f5d254b4cdbd5 SHA512 5dadcff7ab9780843e5ff9b58fc515cfb20b2d19633112459a961e4fdceff3f6e17b3490ecb891d47d5f448500a826ff673b62709e91864e4f0d87c624d62445
diff --git a/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch b/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch
deleted file mode 100644
index 13cf94d42643..000000000000
--- a/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mp3burn	2013-08-18 23:13:34.843372424 +0000
-+++ mp3burn	2013-08-18 23:14:15.663182707 +0000
-@@ -412,6 +412,8 @@
- => F<mp3decoder>.  I<(Note:  Currently, the MP3 decoder must be
- able to accept mpg123-style command-line arguments.)>
- 
-+=back
-+
- =cut
- 
- $mp3decoder = $encoder if $encoder;		# -M overrides .mp3burnrc
-@@ -586,6 +588,8 @@
- 
- =head1 DIAGNOSTICS
- 
-+=over 4
-+
- =item Error in .mp3burnrc:
- 
- Perl(1) cannot parse the F<.mp3burnrc> file.
diff --git a/app-cdr/mp3burn/metadata.xml b/app-cdr/mp3burn/metadata.xml
deleted file mode 100644
index 0ba258d88130..000000000000
--- a/app-cdr/mp3burn/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">mp3burn</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
deleted file mode 100644
index c391931b7233..000000000000
--- a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Burn mp3s without filling up your disk with .wav files"
-HOMEPAGE="https://sourceforge.net/projects/mp3burn"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	media-sound/mpg123
-	media-libs/flac
-	media-sound/vorbis-tools
-	virtual/cdrtools
-	dev-perl/MP3-Info
-	dev-perl/Ogg-Vorbis-Header
-	dev-perl/String-ShellQuote
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	einstalldocs
-}
diff --git a/app-cdr/multicd-1.7.5-r1 b/app-cdr/multicd-1.7.5-r1
new file mode 100644
index 000000000000..fd65df28e0a6
--- /dev/null
+++ b/app-cdr/multicd-1.7.5-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Tool for making direct copies of your files to multiple cd's
+EAPI=6
+HOMEPAGE=http://danborn.net/multicd/
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.8.6 virtual/cdrtools
+SLOT=0
+SRC_URI=http://danborn.net/multicd/multicd-1.7.5.tar.gz
+_md5_=18c650fc3086fa7e78654081847528da
diff --git a/app-cdr/multicd/Manifest b/app-cdr/multicd/Manifest
deleted file mode 100644
index dd4bb0070bae..000000000000
--- a/app-cdr/multicd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST multicd-1.7.5.tar.gz 22437 BLAKE2B 7b355fb6a7a99322fa4c3502da7f3949ca372fdebff786ca239260129432596a8556c68d62184ec22ca1c4b1f31b1ab3940793f8656c88f6e1fadd75c96c18d0 SHA512 c17be38d36e0c81a5a230729bbf78c26bfc4e1288f959f6a176951b142772727b58e976e30d12beb05b835aa4126b5410f6f2f8a5aca4bbb89794d336c072b85
-EBUILD multicd-1.7.5-r1.ebuild 473 BLAKE2B d6079aebd43092ac316711947e140f55141a77729fae1234638bcf8b6da5e5baa61e213834b98f9931e11d217626178d134b194a519494dc8ff3a55aff1e6dd7 SHA512 ae46e61d90dff98ee5b3122dd64a88d6f7df04e04c7cb1f3ebfbdf3750c60fd0ad403d996bfbaeb10b3ae57309b712b09cbd706feabe05fb925939ea5048c407
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/multicd/metadata.xml b/app-cdr/multicd/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-cdr/multicd/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/multicd/multicd-1.7.5-r1.ebuild b/app-cdr/multicd/multicd-1.7.5-r1.ebuild
deleted file mode 100644
index a0811c55ef76..000000000000
--- a/app-cdr/multicd/multicd-1.7.5-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tool for making direct copies of your files to multiple cd's"
-HOMEPAGE="http://danborn.net/multicd/"
-SRC_URI="http://danborn.net/multicd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.6
-	virtual/cdrtools"
-
-src_install() {
-	dobin multicd
-	insinto /etc
-	newins sample_multicdrc multicdrc
-}
diff --git a/app-cdr/nero-4.0.0.0b-r2 b/app-cdr/nero-4.0.0.0b-r2
new file mode 100644
index 000000000000..b8a47d817513
--- /dev/null
+++ b/app-cdr/nero-4.0.0.0b-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst setup unpack
+DEPEND=>=sys-apps/sed-4 >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Nero Burning ROM for Linux
+EAPI=6
+HOMEPAGE=http://nerolinux.nero.com
+IUSE=doc kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=Nero-EULA-US
+RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXinerama x11-libs/pango[X]
+RESTRICT=strip mirror test fetch
+SLOT=0
+SRC_URI=x86? ( nerolinux-4.0.0.0b-x86.rpm ) amd64? ( nero/nerolinux-4.0.0.0b-x86_64.rpm )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d45be684e6640cc779b38f1e8c600e1e
diff --git a/app-cdr/nero/Manifest b/app-cdr/nero/Manifest
deleted file mode 100644
index 9518988cbbce..000000000000
--- a/app-cdr/nero/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX nero-4.0.0.0b-qa-desktop-files.patch 1072 BLAKE2B dbf4c8fdd85a6f08bacc7f78b318869b23ebf3c4b5728e7f35f22bc71f4bd2fd9ad2cf45256ae3c87da2302e367384794d20ddf287ddd1ce2c74444b2a18d2cb SHA512 4193e7fd12daac29e99928fd1e117fa5cb110a6ced2c2b294779d8b74b5c9c3bd1c971bd80e6a42d24e818d54cbcf44f827ef8ae22d54795e5e34e732e589afa
-DIST nerolinux-4.0.0.0b-x86.rpm 17391650 BLAKE2B 4d78b4fa09ba45709af0ff87dea28cf24e1d04f8dee2fab1432215ee0707e398f9564c05f5f6999da912ff1e163d08687c8db99498a0c90e469a524684543759 SHA512 2168f87d329054803b6ac33f671aeaee59f5b9e22fb07c23347ae519d63fc4547db9d6e535f58468f2fba4ac274399f934a34d828892ae93e75cf2c2b46d44c7
-DIST nerolinux-4.0.0.0b-x86_64.rpm 17559298 BLAKE2B 5e7cc99c4710bcafbc9b6eebfa7b5670534a4f6b4011d3ff756fc936375b7ef6a466c474f3065516a09455b8bf35b8f3db145aedca497293e2915a53ef2dbae5 SHA512 0e5d6c1c9f99b6c149a72f544c6ec7608e9ded4c0d31a7754785a0d16fb3ad77d9d82cc210617104ac6dc2470b3df778cdf132be86a0591813e7a867d3c75a51
-EBUILD nero-4.0.0.0b-r2.ebuild 2462 BLAKE2B 9d7138ce92315a9cd9e78f53eefee54f90a8a088e653c82d3975b01303adb37e3cbabce0a333215e72e3f46a8f0f3f604c33e4664796733c52341a7ca6995a41 SHA512 bdcfa17d8a53711e390dd43ecf61b968b5c3d62a854635829928dd360e032b614b7463151fb0f1c5e07722cdb77a700a4261d94cc37219da00276b7279ccd239
-MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch b/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch
deleted file mode 100644
index 2145678db0f6..000000000000
--- a/app-cdr/nero/files/nero-4.0.0.0b-qa-desktop-files.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix QA issues caused by outdated .desktop files:
-* QA Notice: This package installs one or more .desktop files that do not
-* pass validation.
-*
-*  /usr/share/applications/nerolinux.desktop: warning:
-*  key "Categories" in group "Desktop Entry" contains a deprecated value "Application"
-
---- a/usr/share/applications/nerolinux.desktop
-+++ b/usr/share/applications/nerolinux.desktop
-@@ -53,4 +53,4 @@
- Icon=nerolinux
- MimeType=application/x-cd-image;application/x-iso;application/x-cue;application/x-nero-disc-image;application/x-nero-linux-compilation
- Terminal=false
--Categories=Application;AudioVideo;DiscBurning;Recorder;
-+Categories=AudioVideo;DiscBurning;Recorder;
---- a/usr/share/applications/nerolinuxexpress.desktop
-+++ b/usr/share/applications/nerolinuxexpress.desktop
-@@ -53,4 +53,4 @@
- Icon=nerolinuxexpress
- MimeType=application/x-cd-image;application/x-iso;application/x-cue;application/x-nero-disc-image;application/x-nero-linux-compilation
- Terminal=false
--Categories=Application;AudioVideo;DiscBurning;Recorder;
-+Categories=AudioVideo;DiscBurning;Recorder;
diff --git a/app-cdr/nero/metadata.xml b/app-cdr/nero/metadata.xml
deleted file mode 100644
index 70f78a5392df..000000000000
--- a/app-cdr/nero/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>soap@gentoo.org</email>
-		<name>David Seifert</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-cdr/nero/nero-4.0.0.0b-r2.ebuild b/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
deleted file mode 100644
index bed8d5a44fb7..000000000000
--- a/app-cdr/nero/nero-4.0.0.0b-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils linux-info rpm xdg-utils
-
-DESCRIPTION="Nero Burning ROM for Linux"
-HOMEPAGE="http://nerolinux.nero.com"
-SRC_URI="
-	x86? ( ${PN}linux-${PV}-x86.rpm )
-	amd64? ( ${PN}/${PN}linux-${PV}-x86_64.rpm )"
-
-LICENSE="Nero-EULA-US"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RESTRICT="strip mirror test fetch"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXinerama
-	x11-libs/pango[X]"
-DEPEND=""
-
-S="${WORKDIR}"
-
-PATCHES=( "${FILESDIR}"/${P}-qa-desktop-files.patch )
-
-pkg_nofetch() {
-	local nero_arch
-	use amd64 && nero_arch=64
-	use x86 && ner_arch=32
-
-	einfo "Please visit https://www.nero.com/enu/downloads/previous-versions/download-linux4-update.php"
-	einfo " and use the 'RPM package ${nero_arch} bit' download then place ${A}"
-	einfo " into ${DISTDIR}"
-}
-
-pkg_setup() {
-	QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
-		opt/${PN}/$(get_libdir)/libNeroAPI.so"
-	QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
-	QA_PREBUILT="opt/${PN}/${PN}.*
-		opt/${PN}/${PN}
-		opt/${PN}/$(get_libdir)/.*so
-		opt/${PN}/$(get_libdir)/${PN}/*
-		opt/${PN}/$(get_libdir)/${PN}/plug-ins/*
-		usr/share/${PN}/helpers/splash/nerosplash"
-
-	CONFIG_CHECK="~CHR_DEV_SG"
-	linux-info_pkg_setup
-}
-
-src_install() {
-	insinto /etc
-	doins -r etc/nero
-
-	insinto /opt/nero
-	doins -r usr/$(get_libdir)
-	dosym /opt/nero/$(get_libdir)/nero /usr/$(get_libdir)/nero
-
-	exeinto /opt/nero
-	doexe usr/bin/nero*
-
-	insinto /usr/share
-	doins -r usr/share/nero usr/share/locale usr/share/icons
-
-	domenu usr/share/applications/*.desktop
-	doicon usr/share/pixmaps/nerolinux.xpm
-
-	doman usr/share/man/man1/*
-
-	use doc && local DOCS+=( usr/share/doc/nero/*.pdf )
-	einstalldocs
-
-	make_wrapper nero ./nero /opt/nero /opt/${PN}/$(get_libdir)
-	make_wrapper nerocmd ./nerocmd /opt/nero /opt/nero/$(get_libdir)
-	make_wrapper neroexpress ./neroexpress /opt/nero /opt/nero/$(get_libdir)
-
-	# This is a ugly hack to fix burning in x86_64
-	# http://club.cdfreaks.com/showthread.php?t=218041
-	if use amd64; then
-		cp usr/share/nero/Nero*.txt "${ED%/}"/opt/nero/$(get_libdir)/nero || die
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-
-	nero --perform-post-installation || die
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-cdr/nrg2iso-0.4-r2 b/app-cdr/nrg2iso-0.4-r2
new file mode 100644
index 000000000000..b0abd0b05099
--- /dev/null
+++ b/app-cdr/nrg2iso-0.4-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test
+DESCRIPTION=Convert CD images from nrg (Nero) to iso
+EAPI=6
+HOMEPAGE=http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html
+IUSE=test
+KEYWORDS=amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=http://gregory.kokanosky.free.fr/v4/linux/nrg2iso-0.4.tar.gz test? ( https://yegortimoshenko.s3.amazonaws.com/nrg2iso-test.iso https://yegortimoshenko.s3.amazonaws.com/nrg2iso-test.nrg )
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=3abc086476518675a49a6135008fa142
diff --git a/app-cdr/nrg2iso/Manifest b/app-cdr/nrg2iso/Manifest
deleted file mode 100644
index 9bffc0ad9125..000000000000
--- a/app-cdr/nrg2iso/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST nrg2iso-0.4.tar.gz 8553 BLAKE2B 2bd7907dc027c1bf602447c32f24f82d1627a90922aa32ebabecc15a3b3bb8d021f0dc3e13661351626a36365c76e325cded37046d7ac0f84ce6239c034a87e1 SHA512 fa9e081984345770fad713cdfc5711c8c9ace3981d1cc8130b4c2b83eca517c7765eaab758a34dd5e59846f24c6e3f76f3fc89e984305c4358859b0b28e1ec68
-DIST nrg2iso-test.iso 55452 BLAKE2B c4bd651bde0bc66b781332cc186828fbe3fbff2c77150f5ac5cea5f42824b0016fd8b007991d94801a64edc43ce84e050a2db654380e3a0497b33d3abb11cdf5 SHA512 905c0b30482a3b411e786a4cc225dab7513a33c32bfd312717f4666543323456d2b6b6ddbeee75ed194e04cf28d472c87ffbdbf783c63abd06fae7e433601fba
-DIST nrg2iso-test.nrg 362652 BLAKE2B c122ae3b0c310e5c823ccbf33906135aa74f1001b02dc31f7fc0fa77b87b5627d31ea8746a64f0e8a2450e0ec20dc25f5fd72e202113237a95bc219f321c79df SHA512 c29f7e7d3f692a03fdbc5d0c1a112ead73efb45b102302f7f1685f9f2ccfe1eed9b690a3c3f1c7d7d79da9197fdb40dd06ca7bab4187e5dfca81d47268b550b7
-EBUILD nrg2iso-0.4-r2.ebuild 965 BLAKE2B aa2f6ae8666fb3f816683fc803b3f7b534858f5290b612519c8a1f1a71e9f182181c35390634580ed67e2640eef73b2b148cce95bab662d0d373495273db009b SHA512 778e679f7d0d828dddf9f94cfb8b339d303ed1a7c6ccfea25f9d942b0674faef02b15b2c83a21677d24d1333effd7e428829ab7f3db5251e4e58fc7a1ea0f3e8
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/app-cdr/nrg2iso/metadata.xml b/app-cdr/nrg2iso/metadata.xml
deleted file mode 100644
index 58f638b2ac3e..000000000000
--- a/app-cdr/nrg2iso/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/nrg2iso/nrg2iso-0.4-r2.ebuild b/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
deleted file mode 100644
index 25312a18564b..000000000000
--- a/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Convert CD images from nrg (Nero) to iso"
-HOMEPAGE="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"
-SRC_URI="http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz
-	test? (
-		https://yegortimoshenko.s3.amazonaws.com/${PN}-test.iso
-		https://yegortimoshenko.s3.amazonaws.com/${PN}-test.nrg
-	)"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-DOCS=( CHANGELOG )
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -o ${PN}
-}
-
-src_test() {
-	einfo "checking that nrg -> iso matches the expected output"
-	"${S}/${PN}" "${DISTDIR}/${PN}-test.nrg" "${T}/${PN}-test.iso" || die "conversion failed"
-	diff "${DISTDIR}/${PN}-test.iso" "${T}/${PN}-test.iso" || die "unexpected iso"
-}
-
-src_install() {
-	dobin ${PN}
-	einstalldocs
-}
diff --git a/app-cdr/pburn-3.4.3 b/app-cdr/pburn-3.4.3
new file mode 100644
index 000000000000..7ac487ebe3b5
--- /dev/null
+++ b/app-cdr/pburn-3.4.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/pet2tgz
+DESCRIPTION=A burning tool with GTK+ frontend
+EAPI=4
+HOMEPAGE=http://murga-linux.com/puppy/viewtopic.php?t=23881
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-admin/killproc app-cdr/cddetect app-cdr/dvd+rw-tools sys-apps/hotplug2stdout virtual/cdrtools >=x11-misc/gtkdialog-0.8.0
+SLOT=0
+SRC_URI=mirror://gentoo/pburn-3.4.3.pet
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=97c316d584bec64f37283bea98cbb7f0
diff --git a/app-cdr/pburn/Manifest b/app-cdr/pburn/Manifest
deleted file mode 100644
index 0114ca77dc85..000000000000
--- a/app-cdr/pburn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pburn-3.4.3.pet 66536 BLAKE2B 9a3129f5a7d85adbbf376c92b40eaf4036a931987752da3a18a265474d60913df47d0a29e06574ee5018c552ebff85dcd149f4f13b9a69655c5a78169eb8ccce SHA512 8bd67dfb9b3c08510ff9b675ec69929a0719871e2c9924fb4defe41147e2c7096b305776cca7f07fe7a28ec65133106636ee5804ca43ca2b5f6e1fe487eed99c
-EBUILD pburn-3.4.3.ebuild 1114 BLAKE2B 9eff85207ba26301d1ca23f2e5ce3ce748e2d2a06eb6881be10783e071ae8cbfcf4fe2ff9e28f65b5db8d4558670c2df604daf8adb02a02de125def25c0a8bb5 SHA512 7bb35d89f8d0e78f4973338cfa9488ca229fc2d4c80a1dd78df8f23466c018793b5a244c2720d3af945389c35999969313d7f202f36be8d55825f70f370d4ea8
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/pburn/metadata.xml b/app-cdr/pburn/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-cdr/pburn/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/pburn/pburn-3.4.3.ebuild b/app-cdr/pburn/pburn-3.4.3.ebuild
deleted file mode 100644
index 4b38d8c05bdb..000000000000
--- a/app-cdr/pburn/pburn-3.4.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# wget --user puppy --password linux "http://www.meownplanet.net/zigbert/${P}.pet"
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="A burning tool with GTK+ frontend"
-HOMEPAGE="http://murga-linux.com/puppy/viewtopic.php?t=23881"
-SRC_URI="mirror://gentoo/${P}.pet"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-admin/killproc
-	app-cdr/cddetect
-	app-cdr/dvd+rw-tools
-	sys-apps/hotplug2stdout
-	virtual/cdrtools
-	>=x11-misc/gtkdialog-0.8.0"
-DEPEND="app-arch/pet2tgz"
-
-src_unpack() {
-	pet2tgz -i "${DISTDIR}"/${P}.pet -o "${WORKDIR}"/${P}.tar.gz
-	unpack ./${P}.tar.gz
-}
-
-src_prepare() {
-	cat <<-EOF > "${T}"/${PN}
-	#!/bin/bash
-	"/usr/share/${PN}/${PN}" "\$@"
-	EOF
-
-	sed -i -e 's:usleep:/sbin/&:' usr/local/pburn/box_splash || die
-}
-
-src_install() {
-	dobin "${T}"/${PN}
-
-	dodir /usr/share
-	cp -dpR usr/local/${PN} "${D}"/usr/share || die
-
-	make_desktop_entry \
-		${PN} \
-		"Pburn CD/DVD/Blu-ray writer" \
-		/usr/share/${PN}/${PN}20.png \
-		"AudioVideo;DiscBurning"
-
-	dohtml -r usr/share/doc/${PN}
-}
diff --git a/app-cdr/plextor-tool-0.5.0 b/app-cdr/plextor-tool-0.5.0
new file mode 100644
index 000000000000..43f0461e5cfa
--- /dev/null
+++ b/app-cdr/plextor-tool-0.5.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Tool to change the parameters of a Plextor CD-ROM drive
+EAPI=5
+HOMEPAGE=http://plextor-tool.sourceforge.net/
+IUSE=static
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/plextor-tool/plextor-tool-0.5.0.src.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d445be44729fea85becb55815a1753f2
diff --git a/app-cdr/plextor-tool/Manifest b/app-cdr/plextor-tool/Manifest
deleted file mode 100644
index 43e1c167a834..000000000000
--- a/app-cdr/plextor-tool/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX plextor-tool-0.5.0-build.patch 2102 BLAKE2B a87425f879e7ee6f7d84df05405b14d2d39ed877a9104c0103ce3e01101a7ca1e7472ffadaf86c5c4b0fb45fcab956ab225fff9654dfb0173abebf243eb9cd75 SHA512 2422e53823b986d230c8fddc2fba52a3cd9c95433e20aecf6a20224fdf9516cb840b270d11bc4e18f1aa2d33cfc22c6687736db230f04b23e5c788e9abfe2ce5
-DIST plextor-tool-0.5.0.src.tar.bz2 51594 BLAKE2B 2a613b6cf338d75d257e4f3ef839ae7131fdf454617be846ec43aa4cce970369defc7e5009697628cb7c76e91c3f718c6f316e69285ec96aacfaa56e79e5e597 SHA512 a613c081bf01f387cd3b6b03b1c81e12a654e1e706ff96ad8aae9afe5e001b91627f95995fae838a5b47c83dd1d07bfefcb0c26d9bb981f4f72bbb3e2eaa8d75
-EBUILD plextor-tool-0.5.0.ebuild 796 BLAKE2B 4eb8c39f6826774710aa182f129ee083c7fa138ecccd8797b0950f5e624029f03fecc973ffafe8b3b62fdd4012b34034abcbcebf68770ab7d9eb1982b586067d SHA512 82f522ce6bbdfa0c08e1f5ddedf2dcbce3753193eb1adb1826c199ce0fe19bf6a28aac37cefb70f885e6a21610ac7d5423bb72a0ed663c4eb02ef62d8146983f
-MISC metadata.xml 374 BLAKE2B b89cba0d997655147351e195448d3a5abd908e5e34de90e0f2593782e4bf278eb500a8593744b014f6c759224589c48a9bbd9c98cbcf7651fc55ab45ce804b51 SHA512 5e9d28dc6e6450ef21f358158bd78ee07e4c6cef37e787a170f1e79206075de563450d65ceaa572f1e126c9af1450367ed5f62f1421a6fcff18ae3c0233e8c57
diff --git a/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch b/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
deleted file mode 100644
index d2a181f14fed..000000000000
--- a/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -2,17 +2,17 @@
- #               Copyright (c) 1999-2002 Georg Huettenegger
- #
- 
--CC=gcc
--INCLUDES=-Icommon/
-+CC?=gcc
-+CPPFLAGS+=-Icommon/
- 
- # defines to be set for release
- 
--DEFINES=-DUSE_GNOME
--SCFLAGS=-Wall $(DEFINES) $(INCLUDES)
--CFLAGS=`gnome-config --cflags applets` $(SCFLAGS)
--LFLAGS=`gnome-config --libs applets`
-+CPPFLAGS += -DUSE_GNOME
-+CFLAGS += -Wall
-+CFLAGS +=
-+LFLAGS=$(LDFLAGS)
- # the following line worked on RedHat 7.0/1/2
--SLFLAGS=-L/usr/lib -L/usr/X11R6/lib -lpanel_applet -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
-+#SLFLAGS=-L/usr/lib -L/usr/X11R6/lib -lpanel_applet -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXi -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
- # the following line worked on RedHat 6.1
- #SLFLAGS=-L/usr/lib -L/usr/X11R6/lib -lpanel_applet -lgnorba -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -lm -ldb1 -lglib -ldl
- 
-@@ -53,18 +53,16 @@
- RM=rm
- STRIP=strip
- 
--all:	plextor-tool pt-static plextor-tool-applet pta-static plextor-tool.8.gz strip
-+all:	plextor-tool pt-static plextor-tool-applet pta-static plextor-tool.8
- 
--plextor-tool.8.gz:	../doc/plextor-tool.groff
-+plextor-tool.8:	../doc/plextor-tool.groff
- 	$(MANCC) $(MANCCFLAGS) ../doc/plextor-tool.groff > plextor-tool.8
--	$(RM) -f plextor-tool.8.gz
--	gzip plextor-tool.8
- 
- plextor-tool:	$(COBJS)
--	$(CC) -o $@ $(COBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- pt-static:	$(COBJS)
--	$(CC) -static -o $@ $(COBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -static -o $@ $^
- 
- ls_mode_pages:	$(LSMPOBJS)
- 	$(CC) -o $@ $(LSMPOBJS)
-@@ -110,10 +108,8 @@
- 
- .SUFFIXES: .o .cpp
- .cpp.o:
--	$(CXX) $(CXXFLAGS) -c -o $@ $<
- 
- .SUFFEXES: .o .c
- .c.o:
--	$(CC) -c $(CFLAGS) -o $@ $<
- 
- include .depend
diff --git a/app-cdr/plextor-tool/metadata.xml b/app-cdr/plextor-tool/metadata.xml
deleted file mode 100644
index b104c5f6fbc0..000000000000
--- a/app-cdr/plextor-tool/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>A console utility that can set certain parameters of Plextor/MMC cdrom and cd-rw drives.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">plextor-tool</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
deleted file mode 100644
index 39a125aaf854..000000000000
--- a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tool to change the parameters of a Plextor CD-ROM drive"
-HOMEPAGE="http://plextor-tool.sourceforge.net/"
-SRC_URI="mirror://sourceforge/plextor-tool/${P}.src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-S=${WORKDIR}/${PN}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	gunzip plextor-tool.8.gz || die
-}
-
-src_compile() {
-	local targets="plextor-tool"
-	use static && targets="${targets} pt-static"
-	echo ${targets} > my-make-targets
-	emake CC="$(tc-getCC)" ${targets}
-}
-
-src_install() {
-	local targets=$(<my-make-targets)
-	dodoc ../doc/{NEWS,README} TODO
-	dobin ${targets}
-	doman plextor-tool.8
-}
diff --git a/app-cdr/poweriso-1.3 b/app-cdr/poweriso-1.3
new file mode 100644
index 000000000000..e69f8ad3a57c
--- /dev/null
+++ b/app-cdr/poweriso-1.3
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Utility to extract, list and convert PowerISO DAA image files
+EAPI=0
+HOMEPAGE=http://www.poweriso.com
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=http://www.poweriso.com/poweriso-1.3.tar.gz
+_md5_=9620487f409e2d5120e53fec0d581f0a
diff --git a/app-cdr/poweriso/Manifest b/app-cdr/poweriso/Manifest
deleted file mode 100644
index 45934bbe7d06..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 432 BLAKE2B 825ac0acbcee521b62935c21ed4e99127d4cf1e299e1938e041f67c82041a6dd0e07ba57226317d573a5ecf51810d6ae4c4e8a89c5847107263339a9dd6e0170 SHA512 37164161c38098692689572665979723a464b8c0467e3f8699fa19b514bddddd6906c28b0459041af05bb2928aa8ffb0e7bfb517daf5562dde4d65c17a3d4153
-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 382ea0b18c01..000000000000
--- a/app-cdr/poweriso/poweriso-1.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-QA_PRESTRIPPED="opt/bin/poweriso"
-
-S=${WORKDIR}
-
-src_install() {
-	into /opt
-	dobin ${PN} || die
-}
diff --git a/app-cdr/sync2cd-1.3-r1 b/app-cdr/sync2cd-1.3-r1
new file mode 100644
index 000000000000..d3ecbbc854aa
--- /dev/null
+++ b/app-cdr/sync2cd-1.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=An incremental archiving tool to CD/DVD
+EAPI=5
+HOMEPAGE=http://www.calins.ch/software/sync2cd.html
+IUSE=cdr dvdr python_targets_python2_7
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=virtual/eject cdr? ( virtual/cdrtools ) dvdr? ( app-cdr/dvd+rw-tools ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://www.calins.ch/download/sync2cd/sync2cd-1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f83a321d1d1de9c6b6a900574d133c58
diff --git a/app-cdr/sync2cd/Manifest b/app-cdr/sync2cd/Manifest
deleted file mode 100644
index 92bcf3cd7dff..000000000000
--- a/app-cdr/sync2cd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sync2cd-1.3.tar.gz 39663 BLAKE2B 79f5051155252dc820a2632feba048e5323aca94dc9f14afba39a3c5d7bf606540bdf7b479bd2e4663c78a4c0fff6ed41f2865d7c1711b87cadbfed2fdc1b343 SHA512 a80c00e4a5e1eccf12750e7c6bae606fb1befeba1ad6510e887c931e3bdecef28864053a9a8933f55073204577e173b8109456051e47bce5f26d35be24052c4a
-EBUILD sync2cd-1.3-r1.ebuild 593 BLAKE2B 0e159e84a17e8448d07457525c80207c648f5391f07b6395124f420786b8628aeadae97b650a2a254201dd4138057fc0047a8483ba109548e608b887662b0570 SHA512 877b9fc5f7c3c075985bb32e06c2eea9e7bd4417f1147a4b895538212b25b85f9dd5a45166b74c3f29adba227f50ff3bc85482d6805b50a198b49e3ce093506d
-MISC metadata.xml 579 BLAKE2B 9339557a34401b5c1395a77cbafd6e8e500c3450a88bf694e90e2adb59badb384cd4544512fbd83070cc3ae18cb6522c2e08a8872f50e03dee4a4047f28577cf SHA512 8c04a85eb827adc76cc742c4ddb77bd0b547000a64657e5836ca612950d592c8c51138217af51405c345bb2af8cb6e1d5bb92ed825e7cfe785c3d0ee14daac09
diff --git a/app-cdr/sync2cd/metadata.xml b/app-cdr/sync2cd/metadata.xml
deleted file mode 100644
index c083f24ac45a..000000000000
--- a/app-cdr/sync2cd/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-sync2cd is an incremental archiving tool. It allows backing up complete filesystem hierarchies to multiple backup 
-media (e.g. CD-R). Files are archived incrementally, i.e. only new or changed files are stored during an archive 
-operation.
-
-All entity types are supported: directories, files, symlinks, named pipes, sockets, block and character devices.
-(copyied off ref url)
-</longdescription>
-</pkgmetadata>
diff --git a/app-cdr/sync2cd/sync2cd-1.3-r1.ebuild b/app-cdr/sync2cd/sync2cd-1.3-r1.ebuild
deleted file mode 100644
index 87620150944c..000000000000
--- a/app-cdr/sync2cd/sync2cd-1.3-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="An incremental archiving tool to CD/DVD"
-HOMEPAGE="http://www.calins.ch/software/sync2cd.html"
-SRC_URI="http://www.calins.ch/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="cdr dvdr"
-
-RDEPEND="virtual/eject
-	cdr? ( virtual/cdrtools )
-	dvdr? ( app-cdr/dvd+rw-tools )"
-DEPEND=""
-
-python_test() {
-	cd tests || die
-	"${PYTHON}" run.py || die "Unit tests failed for ${EPYTHON}"
-}
diff --git a/app-cdr/tkdvd-4.0.9-r1 b/app-cdr/tkdvd-4.0.9-r1
new file mode 100644
index 000000000000..94c4852d8d22
--- /dev/null
+++ b/app-cdr/tkdvd-4.0.9-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A Tcl/Tk GUI for writing DVDs and CDs
+EAPI=5
+HOMEPAGE=http://regis.damongeot.free.fr/tkdvd/
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=app-cdr/dvd+rw-tools dev-lang/tcl:0 dev-lang/tk:0 virtual/cdrtools
+SLOT=0
+SRC_URI=http://regis.damongeot.free.fr/tkdvd/dl/tkdvd-4.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e3967c8021df6cca126114255f154ffc
diff --git a/app-cdr/tkdvd/Manifest b/app-cdr/tkdvd/Manifest
deleted file mode 100644
index 7dba05d7a58b..000000000000
--- a/app-cdr/tkdvd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tkdvd-4.0.9.tar.gz 71046 BLAKE2B 0253f9c891f6ee617ef392279a126b23e031025df96fdd261a440277724d910714db721cf0d92e8f20c6ce4df5a5ae5c7fac1776a5fd42bf73cb5ff31dbef628 SHA512 948cbbf98338aaf92e4e74e81fbd996d7646f6737a7adfad16063bd8747994e33e034b277942536423d9c099f85dec6649c2be6f1a0e1efba8da7537ea426820
-EBUILD tkdvd-4.0.9-r1.ebuild 803 BLAKE2B 72214a8c5f5aecf08cf62a894963cf9dd787930844ab00414991871483e3dc76ca1705b5c1532089ad2745815a00e8acc8749f2266ef64859d7f14b292437451 SHA512 2b8546dd82fbcf558ef752c8f3cc4e4b366ed28f392f06fae9a00acc2c8e596e8ceac9ca89613933a037c0af2821597c0a28d93c0eae2ff50e259539966e8fdd
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/tkdvd/metadata.xml b/app-cdr/tkdvd/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-cdr/tkdvd/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/tkdvd/tkdvd-4.0.9-r1.ebuild b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
deleted file mode 100644
index 96e958e6843d..000000000000
--- a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A Tcl/Tk GUI for writing DVDs and CDs"
-HOMEPAGE="http://regis.damongeot.free.fr/tkdvd/"
-SRC_URI="http://regis.damongeot.free.fr/tkdvd/dl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
-	app-cdr/dvd+rw-tools
-	dev-lang/tcl:0
-	dev-lang/tk:0
-	virtual/cdrtools
-"
-
-S=${WORKDIR}/tkdvd
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/${PF}/src
-	doins src/*
-
-	insinto /usr/share/${PF}
-	doins TkDVD.sh
-
-	cat <<- EOF >"${T}"tkdvd
-	#!/bin/sh
-	cd /usr/share/${PF}
-	sh TkDVD.sh
-	EOF
-
-	dobin "${T}"tkdvd
-
-	DOCS=( ChangeLog FAQ README TODO doc/config_file )
-	HTML_DOCS=( doc/combobox.html )
-	einstalldocs
-
-	doicon icons/*.png
-}
diff --git a/app-cdr/uif2iso-0.1.7c-r1 b/app-cdr/uif2iso-0.1.7c-r1
new file mode 100644
index 000000000000..809d94f46f65
--- /dev/null
+++ b/app-cdr/uif2iso-0.1.7c-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install test
+DEPEND=sys-libs/zlib app-arch/unzip
+DESCRIPTION=Convert CD images from uif (MagicISO) to iso
+EAPI=6
+HOMEPAGE=http://aluigi.altervista.org/mytoolz.htm#uif2iso
+IUSE=test
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://gentoo/uif2iso-0.1.7c.zip test? ( https://yegortimoshenko.s3.amazonaws.com/uif2iso-test.iso https://yegortimoshenko.s3.amazonaws.com/uif2iso-test.uif )
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b0cf5e275bacabc3afbca4092681efa4
diff --git a/app-cdr/uif2iso/Manifest b/app-cdr/uif2iso/Manifest
deleted file mode 100644
index 718a1598acf1..000000000000
--- a/app-cdr/uif2iso/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST uif2iso-0.1.7c.zip 113727 BLAKE2B ae82e898cf27da8e3283af4c3d8dc2bea87fe29fbe998cf720f7876665c621495b1f68ab28af1250d7d041640404fc3d04c112eb7599476dfe4cb8118ab1dad9 SHA512 22e2e2d156cae7f2f72ba5959bf3b4282609397d148e6a98666382003ce568e185a90e6af8821829d302c1efea1ca2c6d155df0181c6a29294d70de8adc9591f
-DIST uif2iso-test.iso 55296 BLAKE2B b17ea40509445665c9103b38fcf26fd8b6e84917e9a0d31c7a53bbb201c310685649c06d055454dc2883e1d566d98912003d74ffbb68f6e6dca8dd47c1705a59 SHA512 775f8fc87a51709c6ef10ae2751cc8600c22d70af419afd680a1917338a699e6a3934597af26400f67ff68fdea5db32e416d73fda370ef71f0d19a5bbdcbedd6
-DIST uif2iso-test.uif 499 BLAKE2B 8e5098629c11572e839bc481ef44e7ff79c46926e049c3f5fb41b1868f63775f509740679835b289222299cfc9710ae8ff7f1739089a44f6fabd1d12720251fb SHA512 6863305d325ec6cf6c8693512d011ec4150bcf0be94f84495e4075cea74412b9fd8ede17f77ad9f7d4b3cf205c9406adbd5440697c7857ab094e4659d074efeb
-EBUILD uif2iso-0.1.7c-r1.ebuild 1079 BLAKE2B 850274931d547bfd444f53a24f3566073f4980ef021a1b8dd4acb4b78480b1ef83dfae9d416bf6ba8f2d6e8eba8f6c230a72c35b1b7ce8aac7a54bee0db69fbf SHA512 8ef1cbb864c6554e1dd7452ba50fea697ff55dd7c4c43a50940757f265036ae7ef9b2f2486c5ca9cb5cc82596107c7231b580153f54836a039f8af07b28a32d7
-MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/app-cdr/uif2iso/metadata.xml b/app-cdr/uif2iso/metadata.xml
deleted file mode 100644
index 58f638b2ac3e..000000000000
--- a/app-cdr/uif2iso/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/uif2iso/uif2iso-0.1.7c-r1.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild
deleted file mode 100644
index 42e0d67928b1..000000000000
--- a/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit toolchain-funcs
-
-DESCRIPTION="Convert CD images from uif (MagicISO) to iso"
-HOMEPAGE="http://aluigi.altervista.org/mytoolz.htm#uif2iso"
-SRC_URI="mirror://gentoo/${P}.zip
-	 test? ( https://yegortimoshenko.s3.amazonaws.com/${PN}-test.iso
-	       	 https://yegortimoshenko.s3.amazonaws.com/${PN}-test.uif )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" -C src -f - <<-'EOF'
-	      CPPFLAGS += -DMAGICISO_IS_SHIT
-	      LDLIBS = -lz
-	      uif2iso: $(patsubst %.c,%.o,$(wildcard *.c))
-	EOF
-}
-
-src_test() {
-	einfo "checking that uif -> iso matches the expected output"
-	src/${PN} "${DISTDIR}/${PN}-test.uif" "${T}/${PN}-test.iso" # always returns 1
-	diff "${DISTDIR}/${PN}-test.iso" "${T}/${PN}-test.iso" || die "unexpected iso"
-}
-
-src_install() {
-	dobin src/${PN}
-	dodoc ${PN}.txt README
-}
diff --git a/app-cdr/xbiso-0.6.1-r2 b/app-cdr/xbiso-0.6.1-r2
new file mode 100644
index 000000000000..ae4fd233b2ff
--- /dev/null
+++ b/app-cdr/xbiso-0.6.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=ftp? ( <net-libs/ftplib-4 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Xbox xdvdfs ISO extraction utility
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/xbiso/
+IUSE=ftp
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=ftp? ( <net-libs/ftplib-4 )
+SLOT=0
+SRC_URI=mirror://sourceforge/xbiso/xbiso-0.6.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=66f7969f9e4a7a4b8216b8d2df15f161
diff --git a/app-cdr/xbiso/Manifest b/app-cdr/xbiso/Manifest
deleted file mode 100644
index 19296007b210..000000000000
--- a/app-cdr/xbiso/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xbiso-0.6.1-libs.patch 831 BLAKE2B 3be6bfd500f834d455ed0a8f471276c139871bb6876247ae38ccc4344ccf71b1694df67ece512398128202b025976fe0b751ea934201983cb51b20786627e18a SHA512 abbbd8cbb8ff0a2e3c13a6cac2598b42cc213a087e19c46d0665d95a3b394a513009609118cb661bbc207bb6121e335f2d6e755f3fdcba0cf03864bcd048b51f
-DIST xbiso-0.6.1.tar.gz 49698 BLAKE2B ac1605df188b0ec84d0798a0c0220405ce5082160025dc7b21405f1a17f8e0439c6f8d5dbbe293db1645ac0ad195fb0791fe765ea9e1b8c199461f97a2525dce SHA512 351b558c591c3a6c633fb07e081d57cf7ac8b15272ae19878f7d33a796567177aa4eb2fad64d71e6fd86ac18e1c25d30b52013a83ce5d44854f37ec893282fcc
-EBUILD xbiso-0.6.1-r2.ebuild 874 BLAKE2B b3a16c9762bb44c42f4d010014d1d68146bbf9edab3d0016ac4773868daffd3cb64ad34cf49f7d6c27a658ea6d32ff3249711e0b7bdc52fa428f7ba3f78722de SHA512 e1248654a198074e9b7f0d1b9ecfee94623a5d788339b1daf6dc272d62c636adb89a57c40b4388a085629e0ed49cad937b4a62fc7c23523beaae0f021e561d64
-MISC metadata.xml 323 BLAKE2B 6a0770e71ff7ea1d4aec6a1c463ef0e61da6e67d233faabe667fb48d66178810bb5a8cb45089aa9c6e9be72a10e88befa475ce12c2c5c5874276011543a67952 SHA512 688b4299ad48494730835903feb951941c1da2a69705d49dd4c64c7d0b8d9f5e6576e162f735739787063db73ff2dff41d5444375181e8488cff21f31c3d89f6
diff --git a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
deleted file mode 100644
index 5b48ba674230..000000000000
--- a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.in.orig	2014-12-02 18:56:23.000000000 +0300
-+++ configure.in	2014-12-02 19:09:46.724190436 +0300
-@@ -6,13 +6,13 @@
- 
- dnl Checks for libraries.
- dnl Replace `main' with a function in -lftp:
--AC_CHECK_LIB(ftp, main,[LIBS="-DUSE_FTP -lftp"],AC_MSG_WARN([Warning libftp not found ftp features disabled]))
- AC_CHECK_LIB(m, ceil,[LIBS="$LIBS -lm"],AC_MSG_ERROR([Error mlib is required]))
--AC_ARG_ENABLE(ftp,
--[
-+AC_ARG_ENABLE([ftp],
-+    AS_HELP_STRING([--disable-ftp],[Disables all ftp features and libftp dependencies]))
- 
--  --disable-ftp			Disables all ftp features and libftp dependencies
--],[LIBS=""])
-+AS_IF([test "x$enable_ftp" != "xno"], [
-+    AC_SEARCH_LIBS([FtpInit],[ftp],[CPPFLAGS+="-DUSE_FTP"],AC_MSG_ERROR([libftp not found]))
-+])
- 
- dnl Checks for header files.
- AC_CONFIG_HEADERS([config.h:config.h.in])
diff --git a/app-cdr/xbiso/metadata.xml b/app-cdr/xbiso/metadata.xml
deleted file mode 100644
index 0141167ac48a..000000000000
--- a/app-cdr/xbiso/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>Tools for manipulating Xbox ISO images</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">xbiso</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
deleted file mode 100644
index 0bfb72aa0667..000000000000
--- a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Xbox xdvdfs ISO extraction utility"
-HOMEPAGE="https://sourceforge.net/projects/xbiso/"
-SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ftp"
-
-RDEPEND="ftp? ( <net-libs/ftplib-4 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
-	epatch "${FILESDIR}/${P}-libs.patch"
-	mv configure.in configure.ac || die #426262
-	eautoreconf
-}
-
-src_configure() {
-	# for this package, interix behaves the same as BSD
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
-
-	econf \
-		$(use_enable ftp)
-}
-
-src_install() {
-	dobin xbiso
-	dodoc CHANGELOG README
-}
diff --git a/app-cdr/xcdroast-0.98_alpha16-r3 b/app-cdr/xcdroast-0.98_alpha16-r3
new file mode 100644
index 000000000000..82c408b7ccd1
--- /dev/null
+++ b/app-cdr/xcdroast-0.98_alpha16-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/gtk+-2:2 app-cdr/cdrtools sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Lightweight cdrtools front-end for CD and DVD writing
+EAPI=6
+HOMEPAGE=http://www.xcdroast.org/
+IUSE=nls suid
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-2:2 app-cdr/cdrtools
+SLOT=0
+SRC_URI=mirror://sourceforge/xcdroast/xcdroast-0.98alpha16.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b63c54809b5aa7e6df5d1351f5ae1b74
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
deleted file mode 100644
index 06224f4a28e1..000000000000
--- a/app-cdr/xcdroast/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX cdda2wav_version.patch 1494 BLAKE2B f6772d32c3f9d28e727f0fb86d58e929631a55b0708de46722527387f8fc8dd8db1575fd4681a68fa1861c0d4a4ed42008930af972220fc9de561f973e14d406 SHA512 d792b4b348441f7f07c84e9bb6a533956f3a132b5b9a39cf65c76bc71f4308809f425aa1f447339530c19efb015e10990197248ff85c4a2d88b3a3bb12a2df51
-AUX disable_version_check.patch 296 BLAKE2B b8b59c238028906593d2aece2f1ce184c9850e3ce7e39b498c84f066b42008e829432d77986ba7bbaec6a5f9c80646042af70a051dd14bb6541b770ff822f0f8 SHA512 97cc36e91cb997b577700c97e29b89780095df043dc5739e51b67a9741991504b4a8f7bde9697c1bff478b39dfdf222b7dfcaf8684ab98861136fd7eb0b97bac
-AUX fix_cddb_hidden_tracks.patch 1256 BLAKE2B c944682453dc9e9a4675b8b6fb77cee6b4955d20e2669ea86520e8f0c49c1d2537afb73691dc64a0c11edee4da656840831c7826c0fe31bfc26d843e6ba491f9 SHA512 8aa10b3bbe65e1c56ef1b6fb47ff4de9af4e7cfe323fb1588d25a288818b569a8a6efff340b5f16c26f5f199379325f6779f4fd69465ddbe332c4c72068ad332
-AUX format-security.patch 316 BLAKE2B a0de5c35bbf0ff3642e835f7febfec67d6cc12ec7c789d05a345c8f34a18ea95bb3692273311d73dc5821973de204a55411741b15f9e8232f9cc0a0f581c8fb8 SHA512 8c9aca33910ae791f5a5e5d7ed99329df1925b28f38f7ee71287cd9ef40cda231b26fc207c68931b830f7ea67f131045a23b296d55e009935120a1fb48908da4
-AUX io_compile.patch 625 BLAKE2B e1737c621d4305fc67f871ae32301f440fab9cea25c93482fd63f4a98d1c96fb1b7a9215c3d559023d7ea8b67ab59b71e535ba45a87c5bd997ab9b8690bb404c SHA512 823b26a63729ae1f87a0ce156708cc49bdf5d699de73a42be97e21488f5ca5efb0ea6d6285aea49a5b00d3f6fc0d5f2017493aa6ebef4a70748806e6ad7cf2a0
-AUX io_progressbar_fix.patch 806 BLAKE2B bb9b5a68580ba937a3ca16f9b5e7bab9a9843a23fa6058cd61d7b984e4a41c165e8c9b9dbb024beff5094d6f9a94ee71e3d9da080de245b949c35d742b678265 SHA512 7ac76062e49c7480157b16ad11d45ca81e6394515ad897fe59be8a6af938ac7d11e4d1160b21447c83e6aaed0147d29b3260a001d52eac1e806608e3b027d579
-AUX suid-perms.patch 1362 BLAKE2B c0ddb6945070c021eddca470df8e6f82882e490f8433447d0628a91c14601f0aa5e89ed1b058fbf2917e95b18a77fb8e26693dba4eba0b9324bb3aab20572bc1 SHA512 ca96f168cff8fe4052de92ac58451d39532d959be428284da7dc6307f0cd36e661e760b8dd5f5902260cc3a953b51e894b4b87ca4f0340f98f079da5c97c4a7a
-DIST xcdroast-0.98alpha16.tar.gz 3563666 BLAKE2B 781f06e89265e9f30ea651d39219d7083a2cfc2833bc2ab0b57d9f67de77b2eb8aa6755148cd259e3c188a72f07026ecda91d0bbe09af4b55c696c75274739e0 SHA512 dec789955eb70a14f6bcb7c0895a6ca4b7c471cc5ee7ab12af1e671c8586c481c4a05e20eb42724d686d561a551809d9437dafadd3cd081079cefc28e0b94df7
-EBUILD xcdroast-0.98_alpha16-r3.ebuild 1542 BLAKE2B fea04f0f3137b9e0726796498857dbf11c615cecbb2c079befed4deac77dd36579beb592be55bae7e4e673fe8261819aa2addd3e313851e8b583e4cde09e111e SHA512 3ec73df2b8272826258ed8de2cfbec87f4f94b131b746386f13a8191be46f7a908e6e199e047e0667e0c482de065758622a4f5fbb208aadfb89c379b788fbb54
-MISC metadata.xml 409 BLAKE2B 97ef0f8bc2af279ff4a1e873e9a51c1e147d9c83cd6edee4cc7b0cfede91916f8e80eb15064a18819e963d35e6083aff595a1044a5b345e8a77673f74bd13aff SHA512 647dd37debb84ca815b0b8785739af072b02f37bf8007fbe53d6ebfac332fbc81c554821bba295ab10ef1b541510a21f2f19e59fe910e871a0596f83900f7ba9
diff --git a/app-cdr/xcdroast/files/cdda2wav_version.patch b/app-cdr/xcdroast/files/cdda2wav_version.patch
deleted file mode 100644
index cd001e0ee7bf..000000000000
--- a/app-cdr/xcdroast/files/cdda2wav_version.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -urNad xcdroast-0.98+0alpha16~/src/io.c xcdroast-0.98+0alpha16/src/io.c
---- xcdroast-0.98+0alpha16~/src/io.c	2008-08-21 15:11:40.000000000 +0200
-+++ xcdroast-0.98+0alpha16/src/io.c	2009-12-29 22:54:08.571188849 +0100
-@@ -10062,6 +10062,7 @@
- 
- gint check_version_cdda2wav(gchar *match, gchar *found) {
- gchar line[MAXLINE];
-+gchar vline[MAXLINE];
- gchar ver[MAXLINE];
- FILE *fpin;
- gchar *p;
-@@ -10076,32 +10077,38 @@
-         }
- 
- 	strcpy(line,"");
-+	strcpy(vline,"");
-         for (;;) {
-                 if (fgets(line,MAXLINE,fpin) == NULL) 
-                         break;
- 		dodebug(10,"got: %s",line);
-+
-+	        /* only get first line */
-+        	if (strcmp(vline,"") == 0) {
-+                	strncpy(vline, line, MAXLINE);
-+        	}
-         }
- 
-         if (pclose(fpin) == -1) {
-                 g_error("pclose error\n");
-         }
- 
--	if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) {
-+	if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) {
- 		/* failed to open - permission denied */
- 		return 2;
- 	}
- 
--	/* now line contains the version string of cdda2wav */
-+	/* now vline contains the version string of cdda2wav */
- 	/* try to extract the version number */
- 
--	p = strstr(line,"version");
-+	p = strstr(vline,"version");
- 	if (p != NULL) {
- 		p = strtok(p+8, " _");
- 		if (p != NULL) {
- 			strcpy(ver,p);
- 		}
- 	} else {
--		p = strstr(line,"cdda2wav");
-+		p = strstr(vline,"cdda2wav");
- 		if (p != NULL) {
- 			p = strtok(p+9, " ");
- 			if (p != NULL) {
diff --git a/app-cdr/xcdroast/files/disable_version_check.patch b/app-cdr/xcdroast/files/disable_version_check.patch
deleted file mode 100644
index e72c4d0ddb36..000000000000
--- a/app-cdr/xcdroast/files/disable_version_check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/init.c	2016-07-08 12:00:17.705356781 +0200
-+++ b/src/init.c	2016-07-08 12:02:35.914358133 +0200
-@@ -790,7 +790,7 @@
- 	debug = 0;
- 	oldfontcode = 0;
- 	*altdevscan = 1;
--	no_versioncheck = 0;
-+	no_versioncheck = 1;
- 	support_ontheflyaudio = 0;
- 	c_locale_is_utf8 = 0;
- 	ignoreProDVD = 0;
diff --git a/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch b/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch
deleted file mode 100644
index ca532f20d359..000000000000
--- a/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/src/io.c
-+++ b/src/io.c
-@@ -2665,6 +2665,8 @@
- 		g_error("Unexpected output in cdda2wav toc-output\n");
- 	}
- 	trackinfo[tocnr]->track_nr = atoi(p1);
-+	if (trackinfo[tocnr]->track_nr == 0)
-+		cdinfo.nr_tracks++;
- 	trackinfo[tocnr]->isosize = -1;
- 
- 	/* reststring into tmp2 - strip to remove leading spaces */
-@@ -8401,6 +8403,9 @@
- 		if (extract_quoted(tmp) != 0) 
- 			return;
- 
-+		if (matchnr == 0 && trackinfo[matchnr]->track_nr == 0)
-+			matchnr++;
-+
- 		if (mode == 0) {
- 			if (matchnr >= cdinfo.nr_tracks) {
- 				g_warning("invalid track count from cddb-server\n");
-@@ -8482,14 +8487,20 @@
- 
- 	/* build of command line */
- 	if (mode == 0 || mode == 2) {
-+		gint	ntr = cdinfo.nr_tracks;
-+
-+		if (ntr > 0 && trackinfo[0]->track_nr == 0)
-+			ntr--;
- 		g_snprintf(tmp,MAXLINE,"cddb query %s %d ",
--			cdinfo.cddb_discid, cdinfo.nr_tracks);
-+			cdinfo.cddb_discid, ntr);
- 		for (i = 0; i < cdinfo.nr_tracks; i++) {
-+			if (trackinfo[i]->track_nr == 0)
-+				continue;
- 			g_snprintf(tmp2,MAXLINE,"%d ",
- 				trackinfo[i]->start_sec + 150);
- 			strcat(tmp,tmp2);
- 		}
--		g_snprintf(tmp2,MAXLINE,"%d",cdinfo.total_size / 75);
-+		g_snprintf(tmp2,MAXLINE,"%d",(cdinfo.leadout + 150) / 75);
- 		strcat(tmp,tmp2);
- 	} else {
- 		/* get data from toc file */
-
diff --git a/app-cdr/xcdroast/files/format-security.patch b/app-cdr/xcdroast/files/format-security.patch
deleted file mode 100644
index 9d01cf4f7758..000000000000
--- a/app-cdr/xcdroast/files/format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xcdroast-0.98alpha16/src/setup.c.orig	2008-08-21 12:07:18.000000000 +0400
-+++ xcdroast-0.98alpha16/src/setup.c	2016-07-09 11:26:54.724084818 +0300
-@@ -4468,7 +4468,7 @@
- 		if (!textonly) {
- 			show_dialog(ICO_ERROR,tmp, T_OK, NULL, NULL, 0);
- 		} else {
--			g_warning(tmp);
-+			g_warning("%s",tmp);
- 		}
- 	}	
- }
diff --git a/app-cdr/xcdroast/files/io_compile.patch b/app-cdr/xcdroast/files/io_compile.patch
deleted file mode 100644
index 339523d42f75..000000000000
--- a/app-cdr/xcdroast/files/io_compile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/io.c.org	2009-02-24 09:38:27.000000000 +0100
-+++ b/src/io.c	2009-02-24 09:45:18.000000000 +0100
-@@ -1903,7 +1903,8 @@
- 	}
- 
- 	strcpy(str,"");
--	fgets(str,MAXLINE,fpin); 
-+	if (fgets(str,MAXLINE,fpin) == NULL)
-+                g_error("fgets error\n");
- 
-         if (pclose(fpin) == -1) {
-                 g_error("pclose error\n");
-@@ -4720,7 +4721,7 @@
- 	dolog(3, "Saving extended output to %s\n", fname);
- 
- 	/* write to file */
--	fd = open(fname,O_WRONLY | O_CREAT);
-+	fd = open(fname, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
- 	if (fd < 0) {
- 		g_warning("Can't open file %s for writing\n",fname);
- 		return 1;
diff --git a/app-cdr/xcdroast/files/io_progressbar_fix.patch b/app-cdr/xcdroast/files/io_progressbar_fix.patch
deleted file mode 100644
index 745af45d7e73..000000000000
--- a/app-cdr/xcdroast/files/io_progressbar_fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/src/io.c.last	So. Jan 24 19:18:45 2010
-+++ b/src/io.c	Fr. Jul 16 10:59:32 2010
-@@ -3202,6 +3202,8 @@
-			close(fd2[1]);
-		}
-
-+		g_setenv("LC_ALL", "C", TRUE);
-+
-		/* startup child */
-		if (execl("/bin/sh", "sh", "-c", cmd ,(void *)NULL) < 0) {
-			g_error("execl error\n");
-@@ -3402,6 +3404,8 @@
-			close(fd3[1]);
-		}
-
-+		g_setenv("LC_ALL", "C", TRUE);
-+
-		/* startup child */
-		if (execv(callpath,arglist) < 0) {
-			g_error("execv error\n");
-@@ -3506,6 +3510,8 @@
-			close(pipefd[1]); 
-		} 
-
-+		g_setenv("LC_ALL", "C", TRUE);
-+
-		/* startup first child */
-		if (execv(callpath,arglist) < 0) {
-			g_error("execv error\n");
-@@ -3568,6 +3574,8 @@
-			close(fd3[1]);
-		}
-
-+		g_setenv("LC_ALL", "C", TRUE);
-+
-		/* startup second child */
-		if (execv(callpath2,arglist2) < 0) {
-			g_error("execv error\n");
-
diff --git a/app-cdr/xcdroast/files/suid-perms.patch b/app-cdr/xcdroast/files/suid-perms.patch
deleted file mode 100644
index 1c804bc1775c..000000000000
--- a/app-cdr/xcdroast/files/suid-perms.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naurd xcdroast-0.98alpha16.orig/doc/README.nonroot xcdroast-0.98alpha16/doc/README.nonroot
---- xcdroast-0.98alpha16.orig/doc/README.nonroot	2003-10-27 23:37:40.000000000 +0300
-+++ xcdroast-0.98alpha16/doc/README.nonroot	2016-07-07 21:32:35.006587826 +0300
-@@ -72,7 +72,7 @@
- Please change now to the corresponding directory and enter:
- 
- 	chown root xcdrwrap
--	chmod 4755 xcdrwrap
-+	chmod 4711 xcdrwrap
- 
- 
- Usage of the non-root-mode
-diff -Naurd xcdroast-0.98alpha16.orig/src/init.c xcdroast-0.98alpha16/src/init.c
---- xcdroast-0.98alpha16.orig/src/init.c	2008-08-20 20:20:23.000000000 +0400
-+++ xcdroast-0.98alpha16/src/init.c	2016-07-07 21:32:35.006587826 +0300
-@@ -670,7 +670,7 @@
- 
- 	/* check file mode of wrapper */
- 	if (stat(tmp,&buf) == 0) {
--		if (buf.st_mode != 0104755) {
-+		if (buf.st_mode != 0104711) {
- 			dodebug(3,"Note: %s wrong modes set (0%o)\n", tmp, buf.st_mode);
- 			nofail = 0;
- 		}
-diff -Naurd xcdroast-0.98alpha16.orig/src/io.c xcdroast-0.98alpha16/src/io.c
---- xcdroast-0.98alpha16.orig/src/io.c	2008-08-21 17:11:40.000000000 +0400
-+++ xcdroast-0.98alpha16/src/io.c	2016-07-07 21:32:35.003587931 +0300
-@@ -10380,7 +10380,7 @@
- 	 strcat(ret,tmp);
- #endif
- 	 /* old nonroot mode - 2755 */
--	 g_snprintf(tmp,MAXLINE,"%s 4755 %s\n", cmd_chmod, bin);
-+	 g_snprintf(tmp,MAXLINE,"%s 4711 %s\n", cmd_chmod, bin);
- 	 strcat(ret,tmp);
- 
- 
diff --git a/app-cdr/xcdroast/metadata.xml b/app-cdr/xcdroast/metadata.xml
deleted file mode 100644
index fc37d15c7ade..000000000000
--- a/app-cdr/xcdroast/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-	<longdescription>Menu based front-end to mkisofs and cdrecord</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">xcdroast</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild
deleted file mode 100644
index 1f9180da2e72..000000000000
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="Lightweight cdrtools front-end for CD and DVD writing"
-HOMEPAGE="http://www.xcdroast.org/"
-SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="nls suid"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	app-cdr/cdrtools"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_/}
-
-PATCHES=(
-	"${FILESDIR}"/cdda2wav_version.patch
-	"${FILESDIR}"/fix_cddb_hidden_tracks.patch
-	"${FILESDIR}"/io_compile.patch
-	"${FILESDIR}"/io_progressbar_fix.patch
-	"${FILESDIR}"/suid-perms.patch
-	"${FILESDIR}"/disable_version_check.patch
-	"${FILESDIR}"/format-security.patch
-)
-
-src_prepare() {
-	default
-
-	# fix Norwegian locales
-	mv po/{no,nb}.po || die
-	mv po/{no,nb}.gmo || die
-	sed -i -e 's/no/nb/' po/LINGUAS || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable suid nonrootmode) \
-		--enable-gtk2 \
-		--disable-dependency-tracking \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc
-}
-
-src_compile() {
-	emake PREFIX=/usr
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-	dodoc -r AUTHORS ChangeLog README doc/*
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins xpms/xcdricon.xpm xcdroast.xpm
-
-	make_desktop_entry xcdroast "X-CD-Roast" xcdroast "AudioVideo;DiscBurning"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-cdr/xdvdfs-tools-2.1-r1 b/app-cdr/xdvdfs-tools-2.1-r1
new file mode 100644
index 000000000000..24b13c2ae5bd
--- /dev/null
+++ b/app-cdr/xdvdfs-tools-2.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=|| ( app-arch/unrar app-arch/rar )
+DESCRIPTION=Tools for manipulating Xbox ISO images
+EAPI=0
+HOMEPAGE=http://www.layouts.xbox-scene.com/
+KEYWORDS=~amd64 ~ppc x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.layouts.xbox-scene.com/main/files/XDVDFSToolsv2.1.rar
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6cabf4e89949e378464f903a73e16986
diff --git a/app-cdr/xdvdfs-tools/Manifest b/app-cdr/xdvdfs-tools/Manifest
deleted file mode 100644
index f3b4b6f4b1f2..000000000000
--- a/app-cdr/xdvdfs-tools/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xdvdfs-tools-2.1-fnamefix.patch 677 BLAKE2B bfed8e31e9a521d29b56c51ecf340d862e039d9e25aa97ecba360a61a37d02485669954f8b5c1af4618cc88284fafefc7875a6ecae2bb073be2a65c2ee88cc5c SHA512 c18cd21c071d5bec12ad33c2194dbc6ba358612959dd97a70439565f702cc9a138114aca933e9592dffddb20faa75a6ad1f00bfabc59a0b1da3ef0f4655f9bab
-DIST XDVDFSToolsv2.1.rar 211193 BLAKE2B 29190302427d57976e276a2fdffbcd472134148936b01a5e05d71377e5d646b8740f205b0b150d6a0631cdb0d1ca3bb84f36d1e70905c77d3a6e49ede7780af1 SHA512 c3158dc603ac363cadc2dcc99fd112ef66be6ae8fa4f89544cbf4c5a6490cace82cf1d16fa748ede4d206359e2e6752ffd6bfe074ad3c48f9a829e4938f1e99d
-EBUILD xdvdfs-tools-2.1-r1.ebuild 1158 BLAKE2B 2d1a8403a3564000b4d76c5e1bb26a678ccdbb81945fda2e214bac76ac7fca132aeb2eab935e7805aa7bcb702f39b9107f2cab10333942a9bb6deae180f44bd2 SHA512 f79c6e0eedaf3e5119406df82d24639e2bad0adc055d41a69c7507ebb81227fc2ce56fd149360cbaf43919aa5823a2b44e591f4a5cec65c06d3154a21767b25a
-MISC metadata.xml 244 BLAKE2B b954540d65ea8f530fc4f5257d44c4312da99da514b960e42efbee6ea96d7a7b20298f29dd38a94572f73110c02dfbc55174e5781817585c26552467179ec91e SHA512 399963932d63a0f60cf264aaccae581f82015e8cdcfd615860339589d32c21c465996bfd51c7bfd622bd5a874b59566f81b82d8ba98a3559f1d5435dd5f9c290
diff --git a/app-cdr/xdvdfs-tools/files/xdvdfs-tools-2.1-fnamefix.patch b/app-cdr/xdvdfs-tools/files/xdvdfs-tools-2.1-fnamefix.patch
deleted file mode 100644
index 4d06822eb06c..000000000000
--- a/app-cdr/xdvdfs-tools/files/xdvdfs-tools-2.1-fnamefix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- XDVDFS_Tools.orig/src/xdvdfs/xdvdfs.c	2003-08-15 23:26:58.000000000 +0000
-+++ XDVDFS_Tools/src/xdvdfs/xdvdfs.c	2005-05-21 12:13:55.655839216 +0000
-@@ -157,6 +157,14 @@
- 	memcpy(SearchRecord->Filename, Entry->Filename, Entry->FilenameLength);
- 	SearchRecord->Filename[Entry->FilenameLength] = 0;
- 
-+	if (strstr(SearchRecord->Filename,"..") || 
-+	    strchr(SearchRecord->Filename, '/') || 
-+	    strchr(SearchRecord->Filename, '\\'))
-+	  {
-+	    printf("Filename contains invalid characters\n");
-+	    exit(1);
-+	  }
-+
- 	// Copy file parameters in the search_rec
- 	SearchRecord->Attributes = Entry->FileAttributes;
- 	SearchRecord->FileSize = ENDIAN_SAFE32(Entry->FileSize);
diff --git a/app-cdr/xdvdfs-tools/metadata.xml b/app-cdr/xdvdfs-tools/metadata.xml
deleted file mode 100644
index 1e7d0f7b5623..000000000000
--- a/app-cdr/xdvdfs-tools/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>Tools for manipulating Xbox ISO images</longdescription>
-</pkgmetadata>
diff --git a/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild b/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild
deleted file mode 100644
index 7ad8b3e56926..000000000000
--- a/app-cdr/xdvdfs-tools/xdvdfs-tools-2.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tools for manipulating Xbox ISO images"
-HOMEPAGE="http://www.layouts.xbox-scene.com/"
-SRC_URI="http://www.layouts.xbox-scene.com/main/files/XDVDFSToolsv${PV}.rar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="|| ( app-arch/unrar app-arch/rar )"
-RDEPEND=""
-
-S=${WORKDIR}/XDVDFS_Tools/src
-
-src_unpack() {
-	unpack ${A}
-	mv "XDVDFS Tools" XDVDFS_Tools
-	sed -i \
-		-e '/^LDFLAGS = -s/d' \
-		-e '/^CCFLAGS =/s:=.*:= ${CFLAGS} ${CPPFLAGS}:g' \
-		-e "/^CC =/s:=.*:=$(tc-getCC):" \
-		"${S}"/makefile.prefab
-	epatch "${FILESDIR}"/${P}-fnamefix.patch
-	mkdir "${S}"/xdvdfs_extract/output "${S}"/xdvdfs_maker/output
-}
-
-src_compile() {
-	local d
-	for d in xdvdfs_{dumper,extract,maker} ; do
-		emake -C ${d} || die
-	done
-}
-
-src_install() {
-	dobin xdvdfs_dumper/output/xdvdfs_dumper || die "xdvdfs_dumper"
-	dobin xdvdfs_extract/output/xdvdfs_extract || die "xdvdfs_extract"
-	dobin xdvdfs_maker/output/xdvdfs_maker || die "xdvdfs_maker"
-	dohtml ../documentation/*.htm
-	dodoc ../Readme.txt
-}
diff --git a/app-cdr/xfburn-0.5.5 b/app-cdr/xfburn-0.5.5
new file mode 100644
index 000000000000..3e96b3509879
--- /dev/null
+++ b/app-cdr/xfburn-0.5.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure postinst postrm
+DEPEND=>=dev-libs/glib-2.32:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.10:= gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= ) udev? ( virtual/libgudev:= ) dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=GTK+ based CD and DVD burning application
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/applications/xfburn
+IUSE=gstreamer +udev
+KEYWORDS=amd64 arm ~ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:= >=dev-libs/libburn-0.4.2:= >=dev-libs/libisofs-0.6.2:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.6:= >=xfce-base/libxfce4ui-4.10:= gstreamer? ( media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= ) udev? ( virtual/libgudev:= )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfburn/0.5/xfburn-0.5.5.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=96964ad9ccf44eb7341892a8aca641dc
diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest
deleted file mode 100644
index b6f1ac08b3c8..000000000000
--- a/app-cdr/xfburn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xfburn-0.5.5.tar.bz2 819546 BLAKE2B 180f50e9dc8e9bb2372ac7335374b09eade93b6477e557b4282ee65705e55d1f391578343e3473061921cfe296e0da9dae0ddb8823fc5daadc673537331f3085 SHA512 37574aa7dcec65c26a8fd5019c3776196763fa1ebb0f531002f5bcb72a6eb0ec19ed994dd14726988766d890ef257c39c26e64ca3f5944386c03d9b54c26a90a
-EBUILD xfburn-0.5.5.ebuild 1040 BLAKE2B 7705381c01f11fa01a94cb724cb56047aaf641be296478df454b9ee7a479c9ed8033949009832c34650072b20336fe2c7cb8c883ecd6edb4ccb781b0ee8fbe9c SHA512 a1a164b27b32e2ce5bcff29d8507d14088ac7f3501493eb574fe805ba66b3663165d47583f460e4c3d5de5314ab5a8366156e8169edd10c2453bc2f636895832
-MISC metadata.xml 481 BLAKE2B 336b6da9e50fab974d5d320a93ffa10e24cb4621f13835e6a0fa86a95067b28e26fc3c9ca2e17eeecc69f0c842f98bdcebc273bc164cb26baa6b87f39f7c85ca SHA512 1ef204c9fe28b54edffac8132485e3bc326b0452a3014f7be50378be871621e62771f53810b441e4db18b657707e875b67fd2e1231609f62534adbfee2270fc4
diff --git a/app-cdr/xfburn/metadata.xml b/app-cdr/xfburn/metadata.xml
deleted file mode 100644
index 88aa9ba02394..000000000000
--- a/app-cdr/xfburn/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-  <upstream>
-    <maintainer>
-      <email>mario@xfce.org</email>
-      <name>Mario Đanić</name>
-    </maintainer>
-    <maintainer>
-      <email>bugs@da.mcbf.net</email>
-      <name>David Mohr</name>
-    </maintainer>
-  </upstream>
-</pkgmetadata>
diff --git a/app-cdr/xfburn/xfburn-0.5.5.ebuild b/app-cdr/xfburn/xfburn-0.5.5.ebuild
deleted file mode 100644
index 20f7a7e26cb8..000000000000
--- a/app-cdr/xfburn/xfburn-0.5.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="GTK+ based CD and DVD burning application"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfburn"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86"
-IUSE="gstreamer +udev"
-
-RDEPEND=">=dev-libs/glib-2.32:=
-	>=dev-libs/libburn-0.4.2:=
-	>=dev-libs/libisofs-0.6.2:=
-	>=x11-libs/gtk+-2.24:2=
-	>=xfce-base/exo-0.6:=
-	>=xfce-base/libxfce4ui-4.10:=
-	gstreamer? (
-		media-libs/gstreamer:1.0=
-		media-libs/gst-plugins-base:1.0= )
-	udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable udev gudev)
-		$(use_enable gstreamer)
-	)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 20:56:41 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 20:56:41 +0100
commit	d87262dd706fec50cd150aab3e93883b6337466d (patch)
tree	246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-cdr
parent	71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff)