Fix for bug #437478.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64

4 files changed, 36 insertions, 25 deletions

diff --git a/media-sound/aacgain/ChangeLog b/media-sound/aacgain/ChangeLog
index 7b6a33ea8c9c..0dc78941c5f3 100644
--- a/media-sound/aacgain/ChangeLog
+++ b/media-sound/aacgain/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/aacgain
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aacgain/ChangeLog,v 1.10 2011/10/23 17:05:17 sbriesen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aacgain/ChangeLog,v 1.11 2013/02/19 06:04:55 zx2c4 Exp $
+
+  19 Feb 2013; Jason A. Donenfeld <zx2c4@gentoo.org>
+  +files/aacgain-1.9-patch-dotdot.patch, aacgain-1.9.ebuild:
+  Fix for bug #437478.
 
 *aacgain-1.9 (23 Oct 2011)
 
@@ -39,4 +43,3 @@
   19 Mar 2006; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml,
   +aacgain-1.5.ebuild:
   initial commit.
-
diff --git a/media-sound/aacgain/Manifest b/media-sound/aacgain/Manifest
index 50a7cb24d839..89caadc59f1f 100644
--- a/media-sound/aacgain/Manifest
+++ b/media-sound/aacgain/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX aacgain-1.8+glibc-2.10.patch 463 RMD160 d2b268f714c70ced7881591df78ecee413178d17 SHA1 af9fc26f8781cf977cf673e715607c9561353432 SHA256 3751fec46c0593e4cf7541996c7ef1ee536c67364b43299f0c99a88c3d90d93f
-DIST aacgain-1.8.tar.bz2 1188680 RMD160 8f97121f3797cde45f71839dbe14251b74365ccd SHA1 331039c4231e4d85ae878795ce3095dd96dcbfdb SHA256 2bb8e27aa8f8434a4861fdbc70adb9cb4b47e1dfe472910d62d6042cb80a2ee1
-DIST aacgain-1.9.tar.xz 52824 RMD160 d69b6fc8536853248c9f14781c1310a646a05f16 SHA1 405b8abd0c87f265cc2aeaa8ab8b0968c808b6b0 SHA256 42c97a956b69828e312345c09ee477ce411a40d25bdbb67b184c61afd3be3c91
-DIST faad2-2.7.tar.gz 1137407 RMD160 3f0ca461e2953014d5b17edccb3337767d478b8d SHA1 80eaaa5cc576c35dd28863767b795c50cbcc0511 SHA256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330
-DIST mp3gain-1_5_2-src.zip 129435 RMD160 60fcff364ab3a71a40f9ff89001afe02e2bdb5de SHA1 b4593dc0873728b8b6745c8dec0560f338368aab SHA256 dbadc7a41a8a3b87d3a21a1989701cfe72d2090c3ead02b0b396a19a8acf6fca
-DIST mp4v2-1.9.1.tar.bz2 432943 RMD160 66aed17925589b49ec3b1241bfcb45a8e3181c08 SHA1 c62d00e99b65efce16accd83c501fb8a57206aa8 SHA256 5c381caeab2326fc48cfda0fe202bdb8ba0ae624d9c97ad7680a2b07e2c2e3b4
-EBUILD aacgain-1.8.ebuild 1122 RMD160 5d33a95a94c8c39e3e2f6ff6987211f26aae630b SHA1 b53fae3cbb88324bef1bb8e89a11925e689e426e SHA256 3f4fae28ac527ed61aeea654259cecb5b1553ab07a90fd4d9920e94e9b96c16b
-EBUILD aacgain-1.9.ebuild 2068 RMD160 d3385a49332094f0f782bb2a0749299f287f8fe3 SHA1 cce56a6579cdebf53553e6d913f9f13413e14f5c SHA256 5a6817f0c560fb19df41de698cbbf174e350e7884a648b73d067a0271fc1da14
-MISC ChangeLog 1461 RMD160 446cdfbd09b40eba84ecef387d8cb5e47db0b5fb SHA1 5e6d90139e78b3e97b13ec53086d9ca4a05d2141 SHA256 7932ee60ed72f25fd3ecb828b6f14f36f9bc2c78b493547fa76277615a1638d1
-MISC metadata.xml 944 RMD160 b20146accde4653acbc799247ead1f562f8ffc04 SHA1 8bf4a960616d38d551025492d90ab7d8b0cd76d4 SHA256 32ad5294912a494c7ff863b3b29df5c557576f70224053982d18bdf4da42d0f1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk93TnUACgkQ/ejvha5XGaOpRwCgnVOZIKeNNQxYk0rlRVJ0Wh1s
-NUsAn3j8B5o6heOikjKU25DVC3IQqtGz
-=6xU2
------END PGP SIGNATURE-----
+AUX aacgain-1.8+glibc-2.10.patch 463 SHA256 3751fec46c0593e4cf7541996c7ef1ee536c67364b43299f0c99a88c3d90d93f SHA512 29670ef902a534f1121e596e1d2aa6a9085ed7a2abe76c909a67c69308c01271381ac27381b0ab85adc47a3ab1ec26bf8a500f1128c1525285543b2424bae604 WHIRLPOOL 7ed6dc1286fa11b1c588d70f45af59a710aa2b088be8da5e2a21476ccd35a073c0f129783dd3579e7fb821e1515815311cb651cfea90be887d47847a51732eaa
+AUX aacgain-1.9-patch-dotdot.patch 620 SHA256 e60b96f9aea9c9b042d23effe4b074c08412632f07b41085eb516a8a832d0751 SHA512 aaf0f22c584b0bf82f0982862ff72e9a8bd21c2057669bf6c374fa8f2272477c83cb7fdf77624482b46dc59932b4a161d36220c09d7ca7fa5a5a8a5f252e5537 WHIRLPOOL ffa63139fd5ea4d6f86a3258964da0df8efcd5814f34d15a67e6fc8a91b2bc82fc7c1993fea69386aa58960ca6a6524343aff54eb15e01f90daa1bb5249c8b50
+DIST aacgain-1.8.tar.bz2 1188680 SHA256 2bb8e27aa8f8434a4861fdbc70adb9cb4b47e1dfe472910d62d6042cb80a2ee1
+DIST aacgain-1.9.tar.xz 52824 SHA256 42c97a956b69828e312345c09ee477ce411a40d25bdbb67b184c61afd3be3c91 SHA512 937c1c66feb13dfa869b8868415168c06b20e552577328957230a09b11f5e44ac53643da8e6fe91e476b54fe24c265a589c4a25dbde400f2fd43eebc5916f523 WHIRLPOOL bb006c6476d9f0c73b4e545684d99c8b4f32d9c05125cd48a109d88e59f788055a455a1baa6956ef0dead314dcbbed27e78cecf3526c86d371ddfac5fe91d966
+DIST faad2-2.7.tar.gz 1137407 SHA256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161 WHIRLPOOL 6e30d466e47de0e06751718005573a632c5aa0cd209445c56c25d859f917265452676ce897ac5ad1cd308d411911aaf232bfc50904469f9434b2cc95b6ae928f
+DIST mp3gain-1_5_2-src.zip 129435 SHA256 dbadc7a41a8a3b87d3a21a1989701cfe72d2090c3ead02b0b396a19a8acf6fca SHA512 1a7ac51bf0108c1f6fbd610c513bf7fd2c64d340a2ba23dc9fa5c3b896b279474f31f2d60318f409576e39f7643dd585d3e159e2a4db4553f7c9cc3761b7f388 WHIRLPOOL 4a0584c52090100e9f9fe2c53ac6614965976f1ada9134212734966199a6c116ce2e304ed54ec240c489c293928daf664f109d003d29c5c79c1e3b4a6ee08403
+DIST mp4v2-1.9.1.tar.bz2 432943 SHA256 5c381caeab2326fc48cfda0fe202bdb8ba0ae624d9c97ad7680a2b07e2c2e3b4 SHA512 28b6f96c1d44a1601980113767c38f5b5b058e1a1fae25c18632163e948c18fc884af9d146bb68e771303ab3c5c8ef9437f4fffa7d770d29157f2d455ee4b1c8 WHIRLPOOL 7ba33598287002d4227bcc4bfc1e8fe71241b95ed7151704b78a250d0f5f7d5c77cabf0195502d368571f5668f775fdecc09700bea12859c827d0d29aa654f5e
+EBUILD aacgain-1.8.ebuild 1122 SHA256 3f4fae28ac527ed61aeea654259cecb5b1553ab07a90fd4d9920e94e9b96c16b SHA512 84d88d91d3c00e0b4a259e4356d786fd6ea586052da8c296ecdacd9c740ba32408f06a69e9be2eeb9072f3854771315103fd1fc950dc1289e3c2568c63ef667c WHIRLPOOL e7ef84dc6c91d9f6b0880fb765b6d1067b8369237b487212c33ab094d04aa9ce625c491da3b78efefb8920c30df79aeaeb80e7bea09b1eb9d7294a10c46b949a
+EBUILD aacgain-1.9.ebuild 2111 SHA256 11babb7dbb30bb489d0fa524b5538b45b873953bf6145ae54ce080623ceaa43e SHA512 309595ef37309f847e1b164c666dda499f0b41fc29f5a7ef30fac7cd8286f3a02d3c30582bf21028873547cd2128614a473309585f667cd08e07f32976f585ad WHIRLPOOL 076b91124c998995403b620d30260b402b9d527158eceaf027cb07645f14694373c7680df7ef05dec59b26f20a1b415567035474d9a54ce2fb956f5b4b0552e8
+MISC ChangeLog 1595 SHA256 837a11bbec035a15c9c03767ecca1a974d9e9fe9c194dbccab89423cd86aefbf SHA512 4a3ef418de08c19affa5d6c56965aca2b628bff4ef4d951492617554a88fd5db9fd734fc26fbcc57964dc5106123363b9e0137e9680f6f14f0445ae60045e224 WHIRLPOOL b8b35c4673ab001aea48b8223f3f86a3441e9a4cb593b15d2aaa59b882d2b05084ce0a8d948b6e8a15db077b52aa67f928d9666a8c57286689cd919ec503b910
+MISC metadata.xml 944 SHA256 32ad5294912a494c7ff863b3b29df5c557576f70224053982d18bdf4da42d0f1 SHA512 6bedbe871e73da3b2e2d5b13c4272c75bd5a062201fbc8f9d4f5a9a79635215ab3c12f4691306cd78330a6b84a59672fd6b3785be5ca7b3a03bc323e5ad11444 WHIRLPOOL da666de69aec344a836a612ef5864c8b538362728990c791a1b703df41d054a58dafef993184da04dc685743518e9863913ea23920fbc33eec42fdd236ac2d45
diff --git a/media-sound/aacgain/aacgain-1.9.ebuild b/media-sound/aacgain/aacgain-1.9.ebuild
index 6f181fc24c15..3f4938dc3063 100644
--- a/media-sound/aacgain/aacgain-1.9.ebuild
+++ b/media-sound/aacgain/aacgain-1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aacgain/aacgain-1.9.ebuild,v 1.1 2011/10/23 17:05:17 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aacgain/aacgain-1.9.ebuild,v 1.2 2013/02/19 06:04:55 zx2c4 Exp $
 
 EAPI=4
 
@@ -52,6 +52,7 @@ src_prepare() {
 		-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!"
diff --git a/media-sound/aacgain/files/aacgain-1.9-patch-dotdot.patch b/media-sound/aacgain/files/aacgain-1.9-patch-dotdot.patch
new file mode 100644
index 000000000000..5beda664d83e
--- /dev/null
+++ b/media-sound/aacgain/files/aacgain-1.9-patch-dotdot.patch
@@ -0,0 +1,16 @@
+diff -ru aacgain-1.9-orig/aacgain/linux/prepare.sh aacgain-1.9/aacgain/linux/prepare.sh
+--- aacgain-1.9-orig/aacgain/linux/prepare.sh	2013-02-19 07:00:54.313006065 +0100
++++ aacgain-1.9/aacgain/linux/prepare.sh	2013-02-19 07:01:42.849006331 +0100
+@@ -51,7 +51,11 @@
+ #remove obsolete config.h; a correct one will be created by automake's configure
+ rm -f ../../mp3gain/mpglibDBL/config.h
+ #correct header include paths
+-patch -p0 -N <mp3gain.patch
++sed -i 's:../../::' mp3gain.patch
++old="$(pwd)"
++cd ../..
++patch -p0 -N <"${old}/mp3gain.patch"
++cd "$old"
+ 
+ echo Creating the configure script
+ cp -p configure.ac ../..