gentoo resync : 29.05.2018

28 files changed, 83 insertions, 186 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 6890ecde97ca..fb3c3a7f8749 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/aseqview/Manifest b/media-sound/aseqview/Manifest
index 864df5b417e2..8bb3fd70c1eb 100644
--- a/media-sound/aseqview/Manifest
+++ b/media-sound/aseqview/Manifest
@@ -1,3 +1,3 @@
 DIST aseqview-0.2.8.tar.gz 120287 BLAKE2B 331d4e93ba635b59dc1c07fcf470b94a47ee3e03b348b57ae7d7bff2da461d70f092284a461691e76f24cb9d0745c721f283b8b5656192814960761495f94219 SHA512 853dc2b1c54152c39a29cbbf17698c4f397f479b5a57397c778b22ecab803be0a69dce3b4a10d50a3c1ace08256f05bbc481ed695ab81c89c40af2034a97c203
-EBUILD aseqview-0.2.8.ebuild 655 BLAKE2B f3f97391e4d473e6447319de8c4d2184c97fbe8252b3a3c67448a0b32fae1c659bf428bdc4958d4066596b3e495548370664a2a6b3c749cd78af6ebb7fb73c5b SHA512 133eabb3b5998ab669250341e5679fcf2c6863df9123ec58387d2a33cee6ddd66bf6e8851f4af2900b0596a17b10936df4deeeedb3bae060f9ee347c0a76cfba
+EBUILD aseqview-0.2.8.ebuild 545 BLAKE2B 30402264294de0c20996e7450e9631a12b1dd8fd5e947c3d7dd1e1a827048a3f7537524868b3de99cdcd02db36350cfbd378513fd13cfa82b94de4b9c09d985f SHA512 fbfd8aea35790dda240c9cb30bd26fa8a94e181c9fdc0ff1913a39a5d1ac9618c96ab3d77eecf83c6a410519c007a671fe072228987b37cfcd60df3a09aba058
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/aseqview/aseqview-0.2.8.ebuild b/media-sound/aseqview/aseqview-0.2.8.ebuild
index 0d5c975b9ec6..202bcc67d40d 100644
--- a/media-sound/aseqview/aseqview-0.2.8.ebuild
+++ b/media-sound/aseqview/aseqview-0.2.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="ALSA sequencer event viewer/filter"
-HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
-SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.alsa-project.org/~iwai/alsa.html"
+SRC_URI="https://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,8 +21,3 @@ DEPEND="${RDEPEND}
 src_configure() {
 	econf --disable-alsatest --disable-gtktest --enable-gtk2
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-sound/bladeenc/Manifest b/media-sound/bladeenc/Manifest
index b03c1547469c..f3400662d81b 100644
--- a/media-sound/bladeenc/Manifest
+++ b/media-sound/bladeenc/Manifest
@@ -1,4 +1,4 @@
 AUX bladeenc-0.94.2-secfix.diff 394 BLAKE2B 102fca9a640911331e2bdf99966f260a017cbf709eddb2cab9d8b6e5d8507d288d0fa051c522a80a5eef43c8536d93cb372c3bf833bacbe66d64462f2d2d1d6a SHA512 6f590d4f9bdc34f36cb9aef3fc1a590893dd4aa52f9caeaeee9375653f1a80658dc1c52ec6bd679ef5836335b05d6ec02a3987392d3220294a78a23adac09400
 DIST bladeenc-0.94.2-src-stable.tar.gz 142949 BLAKE2B 3a939aa0a10d37b5f67e43c9b91936c05b7f6bd78142d6d781153eb29d7565debbebeb32a535990291d29766aa8eafe7fd98608e866b1cc3df46164b7c9a5e16 SHA512 570202a201c3582483078248fae7330d978d69018e4367d51322f84f26875cf84250de6c46527d11624cd6f19d4a98e30421447358b15ce9f256cade28e604ef
-EBUILD bladeenc-0.94.2-r1.ebuild 504 BLAKE2B 5b91317f27b9d5a9c1c75eac4bc689f94998f2c345c2d3f4dfa1381e476d6c8b83499f75e9fb686ea0b829e59bad03f1e3157241af2637e70ba56b15ba39dae4 SHA512 88dc0edd54f2df014dd437d402dd759a02ab0c99fdc46f499716e65bd08543ef389a8553eddc4e767cbfb91eba1806c7c332edbdc7f0e7a50cff2d9d4806c851
+EBUILD bladeenc-0.94.2-r1.ebuild 358 BLAKE2B 77cd9d5f9b48fdc631a895479892bba88a35b2fcb40ec332ce8930c0aabe52f25eeb5d3e1ab6c38729d3555c06bc2e5715a3e67dbf9666c5b042f257e0562fb7 SHA512 c5e494a470bedd1eb40e70688f0060d7323fe013526d1e967a953d5efd89165fa32b24aec7c8b93b9190f4450040ef431f0a4855775be84e65b7411b7820e32e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild b/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
index 2f80c8918298..62d668d243ac 100644
--- a/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
+++ b/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="An mp3 encoder"
 SRC_URI="http://bladeenc.mp3.no/source/${P}-src-stable.tar.gz"
@@ -13,11 +12,4 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-secfix.diff
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
-}
+PATCHES=( "${FILESDIR}/${P}-secfix.diff" )
diff --git a/media-sound/cvoicecontrol/Manifest b/media-sound/cvoicecontrol/Manifest
index 15c7ef4899b7..0b0f5a552fcc 100644
--- a/media-sound/cvoicecontrol/Manifest
+++ b/media-sound/cvoicecontrol/Manifest
@@ -1,6 +1,6 @@
 AUX cvoicecontrol-0.9_alpha-gentoo-2.patch 1512 BLAKE2B e02182d5035b863bb194bfcb1cfd84d78b7e75c89fd973f22c1fd79281923a76237159c974eeba40799128fa45a81548c827e3d2ae32f50ea6153d7040f31d5b SHA512 dd116c7e30ad94680fa355a765e8a39e8bb85ffb59d886e2c7ed6e77e6fd5c440c4db2490d5505042c5b57d06df8a14951a06f38348ff390832b39bfa1f47f53
 AUX cvoicecontrol-0.9_alpha-gentoo.diff 442 BLAKE2B 6ff8c90887d262d3ee8c755ae695291d2c8c757758254c41f40bf8f07646d3810935f3c339b63525219c1358593e8e42b58a134917c83b4030ea80d5d8479e9e SHA512 6c32c51d621662be71dfc1801296e5766001ac645251f34e69de711f80ce8781bbacf329af51556c72fe70a6fbb823ea84cb55229a0ba667488d0c0ae79287a0
 DIST cvoicecontrol-0.9alpha.tar.bz2 78081 BLAKE2B 162557e9e85ee3e15142a1603a70a23d8e55f6180c006660c020c476aab45d37de3c66df8ebb1ac78ae7c5ddd79912a45dc4b29297899dfc8a0a4b5a67ede9f8 SHA512 c01d932edf563f7c50f5edf36ccc03401372915776489026fa69a12dc545f8698f542dcba054d0d1694a86ce78171bc9507feb47a924996cf3a22e865e0ed187
-EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 815 BLAKE2B 0ceba521b099bb6346bc45267c924527797038a7df4e6d12a0bbcfccffc0931f9a5ef0d20384a52239625183da1a855c3a97fc31141553834a2c3f7117e82300 SHA512 01d416b6198ba3adccb85fb5c5d4d815b973e0bd461a54aa2d195956ffd2c2c34b8de5ae9af20078f4308925a934b9a905133fdb5bbde32d4a387ac748babf5a
+EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 772 BLAKE2B 5c32881817c038fcf129940ad8cfb98a7b2c3d02498ab6ce16ccc5f4189430022ab36748eccf07b491084234d4da4fbf267f18154ceb9ae8cda143fb3d5feb7e SHA512 338f9824d94cabcfe49d344b6f583722ca78fa708b399f339fac1ae0b159d0552e3995c04806761e15fe9467950a55765ca9f242304d94bea2068eacb8d16a29
 EBUILD cvoicecontrol-0.9_alpha.ebuild 951 BLAKE2B 9b1d2ba07c664826373679ed678d0f23eb12478160d8bb0f51f4e4f4280460f067b03096879da4aaad376c233c75cdcd699f76093baf63543ada542dc50f8e96 SHA512 04d08e6961d1e2d9cd7ca55cf62a5452286574f5a49feee282a0475f19f3cdda2bd90acf34d60f13471f23cf42465dcf0209a00983aff2c54cd5aa9bab650695
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
index eb49302b044e..5aed99496537 100644
--- a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=7
 
 MY_P=${P/_/}
 
@@ -17,15 +16,16 @@ IUSE=""
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}/${P}-gentoo-2.patch" )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo-2.patch
-	sed -i -e "s/install-data-am: install-data-local/install-data-am:/" Makefile.in
+	default
+	sed -i -e "s/install-data-am: install-data-local/install-data-am:/" Makefile.in || die "sed failed"
 	# Handle documentation with dohtml instead.
-	sed -i -e "s:SUBDIRS = docs:#SUBDIRS = docs:" cvoicecontrol/Makefile.in
+	sed -i -e "s:SUBDIRS = docs:#SUBDIRS = docs:" cvoicecontrol/Makefile.in || die "sed #2 failed"
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog FAQ README
-	dohtml cvoicecontrol/docs/en/*.html
+	HTML_DOCS=( cvoicecontrol/docs/en/*.html )
+	default
 }
diff --git a/media-sound/dvda-author/Manifest b/media-sound/dvda-author/Manifest
index 4b4c01648b9a..3217baecce20 100644
--- a/media-sound/dvda-author/Manifest
+++ b/media-sound/dvda-author/Manifest
@@ -1,4 +1,3 @@
 DIST dvda-author-10.06-300.tar.gz 828028 BLAKE2B bb1000024a4879989980246443c2ac7a7f795140b7c6165422793829c927c16fa8603c3a44a2f08e6e677e21871bffca6a5c330878688bcffa1b0fa2862290f0 SHA512 619215e5e9ac4a3e55d2bef0222a931412946f129927f1042807ee25541d64609a5a9189c843fdc30d34bb0e41e0779d821d8c32a16cf89c6227d9925ea07024
 EBUILD dvda-author-10.06-r1.ebuild 1309 BLAKE2B 1086ab574cd1f546cd9ce5a22a28b9dafad8195a30bfebfc35aecd28d7a43a435338eba6ddadb23d779047b698f8338a717c10e7461a8509e0528e8726a79ac8 SHA512 cc67b275e3c5764b04ac68d2cdd27eb19f8f8e4791cbcdb0a2eaefc642c952686a7683332f430ddb3a5226b328366f4ee4c689ef92792695434f9fe9ff8588dd
-EBUILD dvda-author-10.06.ebuild 1018 BLAKE2B a9acae796a3c4455fff8716ac9685dfbaaf30dd24266b5a575fdfb7492a43d0b88e4a505bddda9feabba3ecd6ca0c8b0db935095451deee1fd7ac3fd49cae738 SHA512 53c7e799cfff95d1294a30fdd44de15a51c9dd9b43d89273bf4955a6c24540093b2b555f836d2d03a711d07a312dd0c82cde578fe28a83e9f3662cf1825166a4
 MISC metadata.xml 332 BLAKE2B 1501e697062fd49d3cdce60850f04ffbb77f94c547751b9f8f3075cd598cc0dfb291638d8f5f1c356911f78fa3a285eff8cd2acc326fe16cee821682f150bab2 SHA512 85c9b13baabe446a5c74613084fb53f83071219d872dccef40b946c2f36c4df4f0cbc1e964779fe9c989d8081c483d82c10ad454e5d225b00361a851b5e0400c
diff --git a/media-sound/dvda-author/dvda-author-10.06.ebuild b/media-sound/dvda-author/dvda-author-10.06.ebuild
deleted file mode 100644
index 34c331c5bd75..000000000000
--- a/media-sound/dvda-author/dvda-author-10.06.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="Author a DVD-Audio DVD"
-HOMEPAGE="http://dvd-audio.sourceforge.net"
-SRC_URI="mirror://sourceforge/dvd-audio/${P}-300.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=media-sound/sox-14.1[png]
-	>=media-libs/flac-1.2.1[ogg]"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2"
-
-src_prepare() {
-	# Fix parallel make
-	sed -i -e 's:^\(\tcd ${MAYBE_CDRTOOLS}\):@HAVE_CDRTOOLS_BUILD_TRUE@\1:' \
-		Makefile.in || die "sed failed"
-
-	# Don't pre-strip binaries
-	sed -i -e 's:$LIBS -s:$LIBS:' configure || die "sed failed"
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--with-config=/etc \
-		$(use_with debug debug full)
-}
-
-src_install() {
-	newbin src/dvda ${PN} || die "newbin failed"
-	insinto /etc
-	doins ${PN}.conf || die "doins failed"
-	dodoc AUTHORS BUGS ChangeLog EXAMPLES HOWTO.conf LIMITATIONS NEWS TODO \
-		|| die "dodoc failed"
-}
diff --git a/media-sound/id3/Manifest b/media-sound/id3/Manifest
index 2af5c4e78a08..c7dfa2177a50 100644
--- a/media-sound/id3/Manifest
+++ b/media-sound/id3/Manifest
@@ -1,3 +1,3 @@
-DIST id3_0.15.orig.tar.gz 12871 BLAKE2B 4d4b8edfbebdb79b0528817f183a76ef05f7e4f051f366bcc327e9481e39eca422cc221f4d272dea57d184089e696aeeab722839e1c2cbb6e3664656161fc0bc SHA512 b99f3608fc5494863ddf71b5d15505ea952453777090deb82ea469c1c8ed8cc794907d2fffcd4c5a0aaf6ede260103cd9e720e06244877934b22dfa88e1f2cd0
-EBUILD id3-0.15.ebuild 636 BLAKE2B d0a392335c96d60b3a6bc7c42ca0f18424adaca0edc11a82939a8a5bdf6f56f5f68daa8a48bff4aa8e84f3f19dc4e1631f547b9afe9fd3785e1518cf8b9e0855 SHA512 9061bb6bdf629d8bdb1587d8fd1d0a8d7e23ff6a1872de635eb4448f3cbf059645540c6102af710302d178efc37bdce545b7a72a2b57c8e9fcb28b0074e15c1d
+DIST id3-0.15.tar.gz 12871 BLAKE2B 4d4b8edfbebdb79b0528817f183a76ef05f7e4f051f366bcc327e9481e39eca422cc221f4d272dea57d184089e696aeeab722839e1c2cbb6e3664656161fc0bc SHA512 b99f3608fc5494863ddf71b5d15505ea952453777090deb82ea469c1c8ed8cc794907d2fffcd4c5a0aaf6ede260103cd9e720e06244877934b22dfa88e1f2cd0
+EBUILD id3-0.15-r1.ebuild 540 BLAKE2B 7f06c9a0afcd6da19b0104fe8d47e0bb2a22ef579ff9e7aecefe13d438899a15aca809bbb77512fec070bfd625865a2b89de3ecaf617912fdcd81ae72346d7be SHA512 2ea6bfea35395edc7863c2fcdba3ba6aeca6f2b7a9841f9169f51838594404874bb582a521355f72788211672251d23f285363820c9412d66e6d8ec861954bfe
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/id3/id3-0.15.ebuild b/media-sound/id3/id3-0.15-r1.ebuild
index 0b1a3400137c..c918d1331c9c 100644
--- a/media-sound/id3/id3-0.15.ebuild
+++ b/media-sound/id3/id3-0.15-r1.ebuild
@@ -1,31 +1,25 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 inherit toolchain-funcs
 
 DESCRIPTION="changes the id3 tag in an mp3 file"
 HOMEPAGE="http://lly.org/~rcw/abcde/page"
-SRC_URI="http://lly.org/~rcw/id3/${PN}_${PV}.orig.tar.gz"
+SRC_URI="http://lly.org/~rcw/id3/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:-s::" Makefile
+src_prepare() {
+	default
+	sed -i -e "s:-s::" Makefile || die "sed failed"
 }
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc README
+		LDFLAGS="${LDFLAGS}"
 }
diff --git a/media-sound/modplugtools/Manifest b/media-sound/modplugtools/Manifest
index 43baaaa4d6f6..51b077e7b225 100644
--- a/media-sound/modplugtools/Manifest
+++ b/media-sound/modplugtools/Manifest
@@ -1,5 +1,5 @@
 DIST modplugtools-0.5.1.tar.gz 337382 BLAKE2B aa04a7fbe0b4be1e8be2bf5ac1d9ca9641fbc99f16ce1e9cc8bf65bd89f42e6cba1e1ef5fed3323bd49c086d7a5ed199fcbfdc29ccfa0845244f6177a848139c SHA512 58e2bfda90630bc0a4762fdde4afc48865a921beea41419a0f57e7a2e4120579d4a1bf734b1c7925b27fa3fe83a665a35a3e4a22a30c0035854e9fe35f6fd759
 DIST modplugtools-0.5.3.tar.gz 342603 BLAKE2B f66d985769c3f8f311aff539bdf88c9c63a1e0e86e5a63e8d5b287140c113c6443fe48ef9bef8b7fc598b488cfb5a4618c42a432607e9aed58896d7cc23aed7a SHA512 82f3787dfd6188c722d2b2dac315ee40f46795704769575695d7d71cd504b88e0e2dc39bc2d9d803dd84473b86d09019be9aa6c5dc713c72bcfa6ca1c1340e9d
-EBUILD modplugtools-0.5.1.ebuild 580 BLAKE2B 763181a5ad034ff39934235d8b7d06bcac4f3368c81d74916cdc9bf7379c00477d304701657541cc71a83fd03770c48d303476f35e7222b5adf6faf8c887cc4d SHA512 5ec4dc4be11c585400a88a7accb22026d7d953fd2b2fb757ee33b33e014c430da93bb40da7e0eaaddda8da74c8adf706a57a3661bbe4aebc434201ef369a66e8
-EBUILD modplugtools-0.5.3.ebuild 582 BLAKE2B bc6886851ab1fda5d4e5e39179f8518de2bd8292ab36caddfa12afa89e3192736f22c6669fbd65483a2dc402a52662a4c9f61daf58e70e9bc0aed2d7cf8c8585 SHA512 1a414cd6f2b8f66b93a1c62ad712942f47bc381fa5f0c3b8c27b812f3dc2b6962b97ee01bd8ba06ebbca2fbfd059c649fe24dd38f1f092fc9ef04198ecc668c2
+EBUILD modplugtools-0.5.1.ebuild 482 BLAKE2B 96fd6fa5bc83e973bfacaa51024ec7b1f070a65059cf9c4c8cb817ddbff935106b64b3b97c84e717545d91a49feaeca60a05e945b205f0a70a3d0057ed94257b SHA512 06ca01846a7b4073324fcd069d3dd221290b31a38f74027c3a0c20f692fa2bf96bf06f35ac6ed1dc0840d4cacd7375e591e842d64759b6bb3ee943ac107cf52e
+EBUILD modplugtools-0.5.3.ebuild 484 BLAKE2B 197dfb4d55d8dba3d6ee11c9ca9837ca15823fe54083f4129e90f439973a0e866c345ee7499f4e34586dbf7dd80d0e8ded5e3e303aca9d9a849f0e11a4556f9b SHA512 e914abcce34adcf2c8aa417bd2493b6a9f889291fc0aa56e10eecf46f61308d4639b10785bb601d4a985d5f08b1fe17c14368a4519d292940ce3fe6233da54e3
 MISC metadata.xml 335 BLAKE2B 8d72f4d71a61dcb53528381c1661c06f4a4229dec58ba437e43478cc65b3f7d92133cfcc8cb49e5e411176da08ed3311aee58c0490882b90b8922a38f47c1546 SHA512 ff5cc9078858678f75ede9fed227b75f852d2caa6471dc1af1ea6827d30895bd59a7f4a7bb3414625d86af528fe2ca358debcc77887d34bfa51ddff618569d33
diff --git a/media-sound/modplugtools/modplugtools-0.5.1.ebuild b/media-sound/modplugtools/modplugtools-0.5.1.ebuild
index df70b05c35e3..83d5fb42dd38 100644
--- a/media-sound/modplugtools/modplugtools-0.5.1.ebuild
+++ b/media-sound/modplugtools/modplugtools-0.5.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="libmodplug based module players modplug123 and modplugplay"
 HOMEPAGE="http://modplug-xmms.sourceforge.net/"
@@ -17,8 +17,3 @@ RDEPEND=">=media-libs/libao-0.8.0
 	!media-sound/modplugplay"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/modplugtools/modplugtools-0.5.3.ebuild b/media-sound/modplugtools/modplugtools-0.5.3.ebuild
index ec6a84193ef0..fec8ff0e7fc2 100644
--- a/media-sound/modplugtools/modplugtools-0.5.3.ebuild
+++ b/media-sound/modplugtools/modplugtools-0.5.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
 
 DESCRIPTION="libmodplug based module players modplug123 and modplugplay"
 HOMEPAGE="http://modplug-xmms.sourceforge.net/"
@@ -17,8 +17,3 @@ RDEPEND=">=media-libs/libao-0.8.0
 	!media-sound/modplugplay"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/pwavecat/Manifest b/media-sound/pwavecat/Manifest
index d0da24258366..bd816f5c04a5 100644
--- a/media-sound/pwavecat/Manifest
+++ b/media-sound/pwavecat/Manifest
@@ -1,5 +1,5 @@
 AUX pwavecat-0.4.5-overflow.patch 1255 BLAKE2B fba5c647534041b1e22884422dcc09d540d706ca716fa0b640061b12839cbe910d17bd1099bfed78e4633cc415855778290fe10afe1fe3441969d7c6d6f5277b SHA512 560281481a1de5550f8a491d77aed483a297c5d192d71d75d0aca2274c7afb15fa7ebe01070a07961f05c15fc0adbff41548e9722d9a94b369120b8ffea225c5
 AUX pwavecat-0.4.5.diff 823 BLAKE2B c6cbd638495c8dc1bf011c26fb6ee2bf07cfb3ca77b1c29fed56585f1680c0514055f1f3b446f7b57a30682d874b729b20af1aa76e0db2d04cb9f2df5d5c0f17 SHA512 a92e9f242cb79af4392f099b2fc2014c97676e679e2646cfb5eeb5fca8173e953c031eeee8e72de08efe68750773fae77d8009ee12a43ed8be7eff6d57818336
 DIST pwavecat-0.4.5.tgz 13110 BLAKE2B 084286e2e056f73ed410f23ecea245466934f8475bd4143d216df312a51c62335155381ddfa1db2e9d5fcacd35dfd9fbb27d8b8cf0af5d4cdc110b64e03a57d5 SHA512 3faa03d08cc1cde47294837c0295eeabb8461327c9e13caa317b985fc12bdc8d00ec7207411aad1325a54c7cc63cca5f5638db5c988c7e6887f3a0d77b5ace55
-EBUILD pwavecat-0.4.5.ebuild 701 BLAKE2B 6bc931120a7996d17884a54168b90ba1621b290b0e4ee2aaf7d37555686a63c347777af7ae4954cdbe3e481ba511faa852a75cefde8c8ac457ef5f7e7b6af9b3 SHA512 7d922d5f46a87fbd08e54b04bec6598788815608ed3de81188f91db5cef39a926ec1d0d7accbfb0b22c55cc70b331f584905bcdd788835949fb0cd3462633355
+EBUILD pwavecat-0.4.5.ebuild 662 BLAKE2B 8ce3b8d33b0f374d271ad608700de71883263b6de3417449b7dfdac57b629ac1ca3661e81520126f6a843803c62abdf942d3c90a4eee54fc00bb55646222da09 SHA512 c33a9c55d151749b2c8a89460e1260d265c06f07622102142618be1b7ae65b86bb36625512e780eb367dc3d13add6fc710f8161fc65dde4cb9c320d952a8c84f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pwavecat/pwavecat-0.4.5.ebuild b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
index 4f9f719b74aa..91a5792d8a0c 100644
--- a/media-sound/pwavecat/pwavecat-0.4.5.ebuild
+++ b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit eutils toolchain-funcs flag-o-matic
-
-IUSE=""
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="concatenates any number of audio files to stdout"
 HOMEPAGE="http://panteltje.com/panteltje/dvd/"
@@ -14,11 +12,12 @@ SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}.diff" \
-		"${FILESDIR}"/${P}-overflow.patch
-}
+PATCHES=(
+	"${FILESDIR}/${P}.diff"
+	"${FILESDIR}/${P}-overflow.patch"
+)
 
 src_compile() {
 	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE	-D_LARGEFILE64_SOURCE
@@ -27,5 +26,5 @@ src_compile() {
 
 src_install() {
 	dobin pwavecat || die
-	dodoc CHANGES README
+	default
 }
diff --git a/media-sound/sidplay/Manifest b/media-sound/sidplay/Manifest
index e4554b76ab5e..5d729c8a3b9e 100644
--- a/media-sound/sidplay/Manifest
+++ b/media-sound/sidplay/Manifest
@@ -1,5 +1,5 @@
 AUX sidplay-2.0.9-gcc43.patch 1097 BLAKE2B 38c060522fad4f8e71a0a6eab3bb32d01292b60b9adfa7f7cf6f5cd9708b944d5597ab3ceb34dd9d38f1b07513772f8430035cb29ce8723bc3f87f6e858d21a8 SHA512 4e2c717389e9fa7aa7a459138a42f411342def25fa6f236f64e4c306419402d7d9ece7e9376ad492d7a3fa4db9fee3c9bbffd2d3d13669a0366da990fa8e38c6
 AUX sidplay-2.0.9-gcc44.patch 3726 BLAKE2B 6d775f8a1cfb2e33d1ed9a07f51100c6ceb4da52f25de15ed4be504058b43293916661a94ba768fc898a55898ea5268659cd0548f0e8cd15ee1cf4ea3b519463 SHA512 41f319b4e232d199478d586b8a397493e1cc6a8eaa6b4eb5bec272b520ff8ffa078ac72b3eddf4f2865614bfe1f8e28df5ad3f2699bc74684c476a24b7795f75
 DIST sidplay-2.0.9.tar.gz 362140 BLAKE2B 4b5b5d9aff566f8840c4a1f405f64f1d64b642d32d85eca355a4d97bcd03056456c9b49dedd6eca63d5174893206e90693a2555ff35835f6f037ba964bccaae2 SHA512 38d334b7e649d6043b48705edf3c4cd27d01283b95f42d1b46bb7cf266ca0d5f6fac4a7dfd398578a3278d293342e4d4d09cde8d443d60a8d50e4abbe127afe5
-EBUILD sidplay-2.0.9.ebuild 615 BLAKE2B 7b75ca09800d19fb3c767eaaddae64a431eac8315871e64b502241f98c1901f9588411a986e12e5b862c5f016a35c4fb34047619584e832a0bb56cac565d500a SHA512 2b194897a1245620f622bbabb8b6cce24bf6f56d5d21d42185b5446c3b8039e6e4fa961803948c9fce69a5459984f373c50e230ddfc8c8a1baf61797b9d8ee8b
+EBUILD sidplay-2.0.9.ebuild 474 BLAKE2B aa119bd74a9af90d3c7f0af88db174d70c13f57b0e09127b6f225e23aeec807c8d8dcfb2966d4cd58cca808f0c81155ce6ec96c2e84f2d9afb968c0019c5a9e5 SHA512 b2b76c35af776ea6890f2a853f8ae051b0d6829b70dcac5c4a59843884e6d67f108e588e9c1d7834754518bca9891fb7eb09da144565d980fbaea29819ae43eb
 MISC metadata.xml 331 BLAKE2B 41bbcd40272e97e1e0b10fd8e9471db6bfa393ac15eead124bd6e5885b1a35d746bd5be4ced94ed97d31ea130ed17aee55f81b6582e1895813661e3cf07e55b6 SHA512 83c0e6c0f4c7a85a10c96db7cb2eadffab0ef5e4614b0a091a4e14bb9a37b90d0d509bec47bf75d03853ab39a06ca12bcb5cd89f89e09901340a76c7b5c392e8
diff --git a/media-sound/sidplay/sidplay-2.0.9.ebuild b/media-sound/sidplay/sidplay-2.0.9.ebuild
index 4f38551f8ebd..e9a2c0d50f34 100644
--- a/media-sound/sidplay/sidplay-2.0.9.ebuild
+++ b/media-sound/sidplay/sidplay-2.0.9.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="C64 SID player"
 HOMEPAGE="http://sidplay2.sourceforge.net/"
@@ -17,12 +16,7 @@ RDEPEND=">=media-libs/libsidplay-2.1"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc TODO AUTHORS ChangeLog
-}
+PATCHES=(
+	"${FILESDIR}/${P}-gcc43.patch"
+	"${FILESDIR}/${P}-gcc44.patch"
+)
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
index c40a0a013df8..8683a3349afa 100644
--- a/media-sound/streamripper/Manifest
+++ b/media-sound/streamripper/Manifest
@@ -1,3 +1,3 @@
 DIST streamripper-1.64.6.tar.gz 900205 BLAKE2B b316565c786b2005802b24cb441d6ee73c2548a4ac7515633fd92faba143a4708bc49c9de7c3eb9985de14a43ac1f86935ac2c353e3d14a7cbf28e334fa21338 SHA512 8477086d0099f6de861f1c47112476c427073b6e8127bbaaa2dd3e7930fe9a5c6d9b2c68d4a317f1bc0b20c625e665d5c245189049d35468aa83cf51828d4428
-EBUILD streamripper-1.64.6.ebuild 826 BLAKE2B ef4b218fd005c655e3c214eca33d0746515a78dffb763d529f31d740ce5ef28d3447a672868180f53f92cd26802e188b344e91b3b3f54d6d52ffe80a9b3361e8 SHA512 381949a9a8879a8484448970b6aa2a66dda727f838ee5fde694f51fb4e1e5e8f291f96ac938c5b981d3f235e0041374adbf1d8180e0dd4a69f58da50c585c399
+EBUILD streamripper-1.64.6.ebuild 739 BLAKE2B d8dbb6425d24d83c46c0c9efba1fa906a71ae7726a639e78a93932b684b702e79126d7b21ff442c15e9246eaa54c37dad0e2ebaf7522d19ed5c2bfbf85edef51 SHA512 dbcd3a6d7d0075aec9177fbb286a7fa65f311e78658c310fb78ac2c125d2676fd2bf5b1c8e053d8b07046d296ba092d1c13738eab6efae0ed473f6f6464c8d95
 MISC metadata.xml 345 BLAKE2B caf6bf6724c60fd86ad8983db7d4a38472aae47ba7bcc0d50f2796d81ef2c1b38cda0a1cb048b7af88dcf82bbde900c289cc6c803dc121404a6f0c19cb97cfc1 SHA512 6830a4fe1eedf9577237eb166dd97594bfe9e19a5d95578992ba2f90de46ec62679dde5a60fb9abc5887e5e7374b0742676b63e25db0106ec4f84cdac85629f0
diff --git a/media-sound/streamripper/streamripper-1.64.6.ebuild b/media-sound/streamripper/streamripper-1.64.6.ebuild
index 15242a2342ad..13b9c6985a7f 100644
--- a/media-sound/streamripper/streamripper-1.64.6.ebuild
+++ b/media-sound/streamripper/streamripper-1.64.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="Extracts and records individual MP3 file tracks from shoutcast streams"
 HOMEPAGE="http://streamripper.sourceforge.net"
@@ -19,15 +19,11 @@ RDEPEND="media-libs/libmad
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+DOCS=( CHANGES parse_rules.txt README THANKS )
+
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		--without-included-libmad \
 		--without-included-argv \
 		$(use_with vorbis ogg)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc CHANGES parse_rules.txt README THANKS
-}
diff --git a/media-sound/substract_wave/Manifest b/media-sound/substract_wave/Manifest
index 81cdca33f21d..6bdff5462f92 100644
--- a/media-sound/substract_wave/Manifest
+++ b/media-sound/substract_wave/Manifest
@@ -1,5 +1,5 @@
 AUX substract_wave-0.3-Makefile.patch 1112 BLAKE2B 9a4e57525dd3fcfcd110cb645c6d2c2fc38aff77fff3456a65b5beb005ea7cf51fb53dd3618d426d9fe390e39f21615e49725d549dad3f8220b7033cd8a831fc SHA512 050562b55d1a45dbcba694df9f989be9ef7671b08c6bc9f9bf76f7650c5e3fecba0ddbcf9b77af07505e5504a2d0cba84a4fdc029d04ac83659930382ab8b429
 AUX substract_wave-0.3-overflow.patch 884 BLAKE2B 85fe358477be29831817d2785afe627421183e82a809b7bebd98157583a4871283e78b480cbc5ec99c65be2b9d671c911d16a8810098bcc8a82deebff3a901d0 SHA512 384054cdfc029885dd4d3f7ada6d9838736c5cd375a936bbb785233b124157028c2690f7036afa940f6ff536e14105eeb02ec6b1581db9c9cea64279d50586bc
 DIST substract_wave-0.3.tgz 14793 BLAKE2B 7e22fa8f46b1eb2de889034867a3c0c0d1594ae639abc970bafc6c27858ed2d78170c4f0de18368bf6fd5a83b878624e0e1c35e35831fcfb546996e5de92ed51 SHA512 f62c6c36e5cc69b4cc6afb28500b89284dc48e12b42643e9dca836dc48506a97444d6df032fb593329952d70e41e2a88963291bbb2c5a5d54db3a577ea7bb5fb
-EBUILD substract_wave-0.3-r1.ebuild 684 BLAKE2B 0e9a2075a47524ee08bc0c1efdb7fb6ad85f78a68ceaf192af5a8af67ba183d119e993c3016c0724f75cae4d9ae153545184d374aa929e667b6941f1e2ce3d78 SHA512 ecb0326a12754f2e7f4a5be71f38be264fe228162d5fd06499c186c4f0066df51593bdcdc2603e5271bca9ee44e228b595e91af009f99e6ff54b7df4aa09b116
+EBUILD substract_wave-0.3-r1.ebuild 558 BLAKE2B ce2ee684277f841c475ba6bf61b73b07e3fa87a0ecc6e7df5aa706279cec7ef17d64eb8a797c008c321a68d1dea5ccb037629d0abe06c4fe37285753e847e6f2 SHA512 660ccbfab26c3a4d6f7d1b4bd7778a9aad80131fb7e87e3724a2c26b580f5adb68125b8646a202f57ca40c7fad4c9553837f5a312afb7351d9efa7759f41d197
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/substract_wave/substract_wave-0.3-r1.ebuild b/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
index cd3e2c907b74..bef6d1ddfaa8 100644
--- a/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
+++ b/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="substracts 2 mono wave files from each other by a factor specified on the command line"
 HOMEPAGE="http://panteltje.com/panteltje/dvd/"
@@ -13,17 +13,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch \
-		"${FILESDIR}"/${P}-overflow.patch
-}
+PATCHES=(
+	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-overflow.patch"
+)
 
-src_compile() {
-	tc-export CC
-	emake || die "emake failed"
-}
+DOCS=( CHANGES mono-stereo.txt README )
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc CHANGES mono-stereo.txt README
+src_configure() {
+	tc-export CC
 }
diff --git a/media-sound/synaesthesia/Manifest b/media-sound/synaesthesia/Manifest
index f79a3c24e3e6..60cbdf3823b0 100644
--- a/media-sound/synaesthesia/Manifest
+++ b/media-sound/synaesthesia/Manifest
@@ -1,3 +1,3 @@
 DIST synaesthesia-2.4.tar.gz 259531 BLAKE2B 2ecf15a58793de77addb2dc2ab6d7640902c4a34838cff158d7bf9ce0ea5ee171cc205d2c8d9ee3a07d5434fd8e0e48f0cf1bf8c9d5b53de9cb9b70799cfc9c7 SHA512 e48f210f055486aa0a7c9a03f6aa7ff6a3292a2b598bfd8536dd592c3934b7672ed0b9b7dfc20427b5ea2b4cd1dcd6e104bf2c41f80ec38ab0b4b0a9497ff905
-EBUILD synaesthesia-2.4.ebuild 802 BLAKE2B 73d8da6940405aa6ed875555f4fa6b7dc4defaff8f8fd82538556c225a54dde1f28e62301fc4963aafccefef5569cbf6dd5b4c7f55815c2ff9bbfa62fde1d3f8 SHA512 dba5d9b72eb0aee4b314f01b34c3f8b667d0567768e25f430f784607f6f43fbf92416726b10301c1dc53b14eaa1dc1fa03a43b1e2f8a8f27ac6b61a0c7db8681
+EBUILD synaesthesia-2.4.ebuild 718 BLAKE2B d36669fcef5323373bd1d0f04c43f982c382aba69d6b5471cfc0c0e0124bd9708617c7a5248266ecc2dcbfbcf6b10b5c1b5ef404f36bb417b9efd40fddf12131 SHA512 e854d3d82dca84716746fe7bbff4ca49052966dce66333ebb51d894b43fff53d6c2ba3c1d09e4f4cb14d5b8db6c01c4fd50b045f2092522dfbcbf66646a15c12
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/synaesthesia/synaesthesia-2.4.ebuild b/media-sound/synaesthesia/synaesthesia-2.4.ebuild
index ade33b06d5b9..e431ff390070 100644
--- a/media-sound/synaesthesia/synaesthesia-2.4.ebuild
+++ b/media-sound/synaesthesia/synaesthesia-2.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="a nice graphical accompaniment to music"
 HOMEPAGE="http://www.logarithmic.net/pfh/synaesthesia"
@@ -20,12 +20,8 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
 src_prepare() {
+	default
 	sed -e '/CFLAGS=/s:-O4:${CFLAGS}:' \
 		-e '/CXXFLAGS=/s:-O4:${CXXFLAGS}:' -i configure || die "sed failed"
 	sed -e 's:void inline:inline void:' -i syna.h || die "sed failed"
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
diff --git a/media-sound/vbrfixc/Manifest b/media-sound/vbrfixc/Manifest
index b60f5cb47174..e00782f08097 100644
--- a/media-sound/vbrfixc/Manifest
+++ b/media-sound/vbrfixc/Manifest
@@ -1,4 +1,4 @@
 AUX vbrfixc-0.24-gcc43.patch 489 BLAKE2B b55b18d7fdd37c0400547abd5f837b2023936889fe7a1812a996919138e476141e7f579db8bc291a6433fc71bc812e80546afe5ff8a813ea7299d994cbcdf365 SHA512 c79a4cb19016a055d2bc460f312798ae2e4626b0151f0f026a1ba0697cc5d3079c79f4e7d131c893f810c5f27ce835625e4533e172b96f0e811aecc7f02dbd9f
 DIST vbrfixc-0.24.tar.gz 656877 BLAKE2B df6e7a31e19d78abcd05781e3d346318ff9b3a091f92cac747862c67baa5b54f6290df3e10e7aa366c7fd7756f4ea340f4cecbc8ad44d22cd6bd943d0fe04584 SHA512 afc6db7ba53999de9b601c0cf65583ae0d0c3ca5177ea0da04d53fdb41d3dd75492b75ec5d7ddf37ec9447888c2afde03d07fb5d090a495f8a51507a2aede745
-EBUILD vbrfixc-0.24.ebuild 648 BLAKE2B 0e6328d1a0687751734ab2445df5167206808525f9baa7ef661abe6738f2ce33803c68e76d6a9af6dac6e7ca06e9198742a7cf50ad45ddea76901fe0e785f8db SHA512 213c4c9f491f1ae2f8add4422b77a6c2642b22ee956f1f968c7c6e37c652b504e352246b287bae8a0d9b6a70c9db6bbb12e4268325e4f4c0798d5ffe301f446c
+EBUILD vbrfixc-0.24.ebuild 548 BLAKE2B 2eb13aff2c32ce583b915dfc12e7a9fe8adbc9d98409032deb37ab5c4449404dd6d41e3109d06f896f4274fcdd73e87baccac698ffea8b0e149b236a3c5deefb SHA512 75a08623a1aeff90ee4bc2548c4c54bab4633e9e426c7ca56177407307a5face3845353bfc497eb27d82091d94a8de810951c475c3cb4aef2be1efdf0dc7cec5
 MISC metadata.xml 438 BLAKE2B a5d6b70f6735ef3f1adaae0a60c827533a1b0553cf83859501662771cc8197de205e4ffdd1b700281eaf8acdd39e28a896138778c8119a4eeb28227e7e76be68 SHA512 8619707e6dfbfd175d328a2d0b68deb28b3b5ac4dbee2f36d5d5295c239176f6534931d7e57949e7aea27d8a1c187132faeb2c2eb04072e59e098ca1888ae77c
diff --git a/media-sound/vbrfixc/vbrfixc-0.24.ebuild b/media-sound/vbrfixc/vbrfixc-0.24.ebuild
index aee720fb1983..696cce119952 100644
--- a/media-sound/vbrfixc/vbrfixc-0.24.ebuild
+++ b/media-sound/vbrfixc/vbrfixc-0.24.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Vbrfix fixes MP3s and re-constructs VBR headers"
 HOMEPAGE="http://home.gna.org/vbrfix/"
@@ -13,16 +12,13 @@ SLOT="0"
 # bin endian ones need vbrfixc-0.24-bigendian.diff from gentoo-x86 cvs Attic
 KEYWORDS="amd64 x86"
 IUSE=""
+
 DEPEND=""
 RDEPEND=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-
-}
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README TODO
-	dohtml vbrfixc/docs/en/*.html
+	HTML_DOCS=( vbrfixc/docs/en/*.html )
+	default
 }
diff --git a/media-sound/xineadump/Manifest b/media-sound/xineadump/Manifest
index 702f482fcaa6..382d53262be9 100644
--- a/media-sound/xineadump/Manifest
+++ b/media-sound/xineadump/Manifest
@@ -1,5 +1,5 @@
 AUX xineadump-0.1-gcc-4.3.patch 625 BLAKE2B 5ec66e32b495c4e82617ee0003726378e99aac79cd7605f8d41e18c467fd61f66ac0a936b8032f5607e87d9c93beb0343d7876fe5496305f4393daff3a3f56b8 SHA512 8c1b8b6d1e356438dc201064d9b1355ceb3e83f26b32e7d659d68b06a538b2eeccd6549f9e58f9c60330e523f1fa07e706ba58b4c1807fc9ec499e4b57b6924b
 AUX xineadump-0.1-gcc-4.4.patch 436 BLAKE2B 4b887b02badc301c5049ba5a9bb06e03e7d83bcbaab08e413f68a2c42076dfed695dd3a459de29f7de24b13335b92ddb0b4c9250300112a14eaa0b14f6961ae6 SHA512 f37f5c68fe1bd7b3d60fdf769122eb8bf5187c736d9b330b143603cf82845b95f1cfcc8ba4f8f817f6b5fb647bed1e19f698362459272ac6e12f05ec217f69ac
 DIST xineadump-0.1.tar.bz2 233413 BLAKE2B 777aa2c044d38f12a552efd795181b48343fb3e19bc1fd5b485c445c8244270b87ec47c898b61d3ee0ea6c573897ec2195a93c33ecb4a9772153e61fe1b9f671 SHA512 879d147a451133e78835fb367a99f58ab9516746eec2a748fc11913db43f87f89af09649a7ae5e43362b44d97187a5ee58e41a6776894d8f2dfcd188c67c29e9
-EBUILD xineadump-0.1-r1.ebuild 642 BLAKE2B 36a93e26286bef6ffb8dc9342ed5ab1d276474c08c56e2fc5a0bfcbc357d7ff7fc39ca22520db11bf23961bbf335fa8ed6a1930bde94c70e42efd5b3bb09e0d4 SHA512 cee6c720df9747090c33dd677f99225d0f8d07bae4b32badbcaba9fc92edc049b4004e96c14fcf993513774bb84a38be3227e4bba4cbd0db91a87f192cd94808
+EBUILD xineadump-0.1-r1.ebuild 517 BLAKE2B d6fa470591afedde8c374949883a844687957f49d2d30eeb6554d1669f76dcd5bb3c30ba5f712c0782ce52dfa450aac19fdd85e83d3748f7a87fa1011f195edf SHA512 a218f0923d6ba867e869eb8006c3443b7630d2a354600cde255b0b98f6c2ead5d45050e56e7ccf9ec45c603a34641551c67a00fd87d41234f13b2fc84717d94c
 MISC metadata.xml 342 BLAKE2B c3d9ed9765931b19bf4d5594b473f25cbd5ec13865f221f185bb005eb0ead3af8e4d706109962e95cac5feb510bcb652474c986bc6f7e4961417fd8eca79e688 SHA512 58249d2892a19a51995fee018a69b66575e245eb719a6ba04ca4cc3e4e2f7f07e3866cc22ea89d9b4175ab066850e3b93d4f335e2a2dd28c7f9ff9d1c4880414
diff --git a/media-sound/xineadump/xineadump-0.1-r1.ebuild b/media-sound/xineadump/xineadump-0.1-r1.ebuild
index 44abf590ccd6..df5b84d849c1 100644
--- a/media-sound/xineadump/xineadump-0.1-r1.ebuild
+++ b/media-sound/xineadump/xineadump-0.1-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Utility for Xine decoding support in transKode"
 HOMEPAGE="https://sourceforge.net/projects/transkode"
@@ -19,12 +18,7 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc-4.3.patch \
-		"${FILESDIR}"/${P}-gcc-4.4.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS
-}
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-4.3.patch"
+	"${FILESDIR}/${P}-gcc-4.4.patch"
+)