gentoo resync : 03.01.2018

4 files changed, 16 insertions, 104 deletions

diff --git a/media-sound/aacgain/Manifest b/media-sound/aacgain/Manifest
index 4595f341925f..98f6e758fa74 100644
--- a/media-sound/aacgain/Manifest
+++ b/media-sound/aacgain/Manifest
@@ -1,8 +1,8 @@
+AUX aacgain-1.9-derefptr.patch 589 BLAKE2B ea9de1b305955769e04d75f7cc0dcfded111700b04f3cffef66678c2a41e49bf05b5551a4f70786bdd0dadc45d759686e17863ea659d1a05dc832bcc7d8bd955 SHA512 41c3ba1c989194f2e714dbfdf7078fd17a1a54bc886485e6ac2eb10a22baa30d7f0c31c10f3c27fc7167e1fc2d490d8cccccca40a832be8a2ad69f62efdd536b
 AUX aacgain-1.9-patch-dotdot.patch 620 BLAKE2B 9ccd0cb4034e6c4ff4145afb48448ee97ba071a63b65e8edf5772f00f308a91a02f4594c2e58d79d738ff3b57239de8596c0f5190b3bf6552a9835aac6463f46 SHA512 aaf0f22c584b0bf82f0982862ff72e9a8bd21c2057669bf6c374fa8f2272477c83cb7fdf77624482b46dc59932b4a161d36220c09d7ca7fa5a5a8a5f252e5537
 DIST aacgain-1.9.tar.xz 52824 BLAKE2B ad3b3ffedf2a6831bb7a8563f6038fbfa140ba5e7eecbfd41e9e46ea814f222cb829ab6a6ae58ef658f293ba6e89989846f0fbef7cacccb328724801c18d8f13 SHA512 937c1c66feb13dfa869b8868415168c06b20e552577328957230a09b11f5e44ac53643da8e6fe91e476b54fe24c265a589c4a25dbde400f2fd43eebc5916f523
 DIST faad2-2.7.tar.gz 1137407 BLAKE2B 15f82689e671d8cc4ff21bf6f048aadb407abdaeff9ce59982e17b3b97e56c9e848664624e751fd8f4cc7876ab1a8e4c373e7b4a20d9970f5c085d8a0a9006e2 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161
 DIST mp3gain-1_5_2-src.zip 129435 BLAKE2B 39ad12a09e58375c23602939097622fda0cb6b7487e95947d5443fce55f4d2163c15df619f96b1839acf99bba9ed8ad1990bab287e1392c30813d185d823d734 SHA512 1a7ac51bf0108c1f6fbd610c513bf7fd2c64d340a2ba23dc9fa5c3b896b279474f31f2d60318f409576e39f7643dd585d3e159e2a4db4553f7c9cc3761b7f388
 DIST mp4v2-1.9.1.tar.bz2 432943 BLAKE2B 529ecc3ebd9192ab61febd0512704b5867abf29dc9755c5e61100522ebecc25189000886b152115c12fedbfbe5cc38bb36adb9281e6e60bbf43e86605432aae0 SHA512 28b6f96c1d44a1601980113767c38f5b5b058e1a1fae25c18632163e948c18fc884af9d146bb68e771303ab3c5c8ef9437f4fffa7d770d29157f2d455ee4b1c8
-EBUILD aacgain-1.9-r1.ebuild 2020 BLAKE2B 17cc51968e122c0da7ca9d4d6fc709a629aff57508c99d878d668c450c38da2355b4637348e918ba850796d181377bd64be41449228998d1141e79bf87ef6616 SHA512 e5ec85e4cbb9568acd6a1be7c88bc71516247932df4d80013f1ffcf90ab98ff9bdafbd0e884dea3a6b618ecabfe35ab8f2ed408352984feea190f1a5eb828167
-EBUILD aacgain-1.9.ebuild 1989 BLAKE2B 477f1c651579c416a669a2f158e32d51084454a17b84b6b87956a2546e439caf7a88f4251795850212be5c5c66b35c5ea8da8d8a81b1d0199512cc0d413ae47c SHA512 cb9ac85128c4ca21d3176bf775d8838e988dbcb0024414dab81abb088ca96ed02e042d403ec09ee9d3b8a91c36df8bf030ce5ee8835691ca243d163b72c069ca
+EBUILD aacgain-1.9-r2.ebuild 2053 BLAKE2B 84ea0919e778c3380adeaf3c0d38a5f62130baf6685663e9bd0c399d462ec16c149c1cfbd84fbda45397326e57f7e5478a27f2fa659930df3371153b905c0e57 SHA512 5dd161a204bea4059173ea8a4c7d6e24a3b15fc1c8c53e7b855908839942cb92a6b3785d3cb7df93dc8112a9ec5905d257d2782ff97a33d1cd0db891d64bc4e1
 MISC metadata.xml 922 BLAKE2B a67adcc8e24f365e45bff633091b4c9c7f2b89cff71fec001e1164907040efacb46bb9b9b0beac965513d7e03c8e19cbf1c1cb0a0aedcbe1d021445f4f3df7e9 SHA512 66e05b9c17bf6c66bdcd0c26dec1f15e04c21b7d815df058739d969b6067026b15249bdd3d5813847030b5038fc5b15097479d2aafa60fa2fdf5fc3c2a21ece7
diff --git a/media-sound/aacgain/aacgain-1.9-r1.ebuild b/media-sound/aacgain/aacgain-1.9-r2.ebuild
index d278711d59b5..a08a2bfff469 100644
--- a/media-sound/aacgain/aacgain-1.9-r1.ebuild
+++ b/media-sound/aacgain/aacgain-1.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=""
@@ -47,6 +47,7 @@ src_unpack() {
 PATCHES=(
 	${PN}/mp4v2.patch
 	"${FILESDIR}"/${P}-patch-dotdot.patch
+	"${FILESDIR}"/${P}-derefptr.patch
 )
 
 src_prepare() {
diff --git a/media-sound/aacgain/aacgain-1.9.ebuild b/media-sound/aacgain/aacgain-1.9.ebuild
deleted file mode 100644
index d48172721789..000000000000
--- a/media-sound/aacgain/aacgain-1.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-FAAD2_PV="2.7"
-MP4V2_PV="1.9.1"
-MP3GAIN_PV="1.5.2"
-
-DESCRIPTION="AACGain normalizes the volume of music files using the Replay Gain algorithm"
-HOMEPAGE="http://aacgain.altosdesign.com/"
-SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
-	https://mp4v2.googlecode.com/files/mp4v2-${MP4V2_PV}.tar.bz2
-	mirror://sourceforge/mp3gain/mp3gain-${MP3GAIN_PV//./_}-src.zip
-	mirror://sourceforge/faac/faad2-${FAAD2_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-DOCS="${PN}/README"
-
-src_unpack() {
-	mkdir -p "${S}"
-	for X in ${A}; do
-		case "${X}" in
-			mp3gain*)
-				mkdir -p "${S}/${X%%-*}"
-				cd "${S}/${X%%-*}"
-				unpack "${X}"
-				;;
-			*)
-				cd "${S}"
-				unpack "${X}"
-				[ -d "${X%%-*}" ] || mv -f "${X%%-*}"-* "${X%%-*}"
-				;;
-		esac
-	done
-}
-
-src_prepare() {
-	sed -i -e 's:iquote :I:' faad2/libfaad/Makefile.am
-	sed -i -e 's:../\(mp4v2/\):\1:g' ${PN}/mp4v2.patch
-	sed -i -e 's:\(libmp4v2\|libfaad/libfaad\)\.la:README:g' \
-		-e 's:^\(autoreconf\|pushd\|popd\):# \1:g' aacgain/linux/prepare.sh
-
-	epatch ${PN}/mp4v2.patch
-	epatch "${FILESDIR}"/${P}-patch-dotdot.patch
-
-	cd "${S}/${PN}/linux"
-	sh prepare.sh || die "prepare failed!"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/faad2"
-	eautoreconf
-
-	cd "${S}/mp4v2"
-	elibtoolize
-}
-
-src_configure() {
-	local myconf="--disable-dependency-tracking"
-	local myconf2="${myconf} --disable-shared --enable-static"
-
-	cd "${S}/faad2"
-	econf ${myconf2} --without-xmms --without-mpeg4ip
-
-	cd "${S}/mp4v2"
-	econf ${myconf2} --disable-gch
-
-	cd "${S}"
-	econf ${myconf}
-}
-
-src_compile() {
-	cd "${S}/faad2/libfaad"
-	emake
-
-	cd "${S}/mp4v2"
-	emake
-
-	cd "${S}"
-	emake
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "BACK UP YOUR MUSIC FILES BEFORE USING AACGAIN!"
-	ewarn "THIS IS EXPERIMENTAL SOFTWARE. THERE HAVE BEEN"
-	ewarn "BUGS IN PAST RELEASES THAT CORRUPTED MUSIC FILES."
-	ewarn
-}
diff --git a/media-sound/aacgain/files/aacgain-1.9-derefptr.patch b/media-sound/aacgain/files/aacgain-1.9-derefptr.patch
new file mode 100644
index 000000000000..6973f36bf1be
--- /dev/null
+++ b/media-sound/aacgain/files/aacgain-1.9-derefptr.patch
@@ -0,0 +1,11 @@
+--- aacgain-1.9/mp4v2/src/rtphint.cpp	2017-07-14 17:54:58.230117921 +0200
++++ aacgain-1.9/mp4v2/src/rtphint.cpp	2017-07-14 17:58:57.441883719 +0200
+@@ -345,7 +345,7 @@
+                 pSlash = strchr(pSlash, '/');
+                 if (pSlash != NULL) {
+                     pSlash++;
+-                    if (pSlash != '\0') {
++                    if (*pSlash != '\0') {
+                         length = strlen(pRtpMap) - (pSlash - pRtpMap);
+                         *ppEncodingParams = (char *)MP4Calloc(length + 1);
+                         strncpy(*ppEncodingParams, pSlash, length);