Fix linking order (bug #393137).

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

diff --git a/media-sound/aacplusenc/ChangeLog b/media-sound/aacplusenc/ChangeLog
index 0c7908691d3f7d04a524d4a39fc6c3ab6cc2b7c5..10895e20b8d45061b1078a14ab1ae64f6783bcdd 100644 (file)
--- a/media-sound/aacplusenc/ChangeLog
+++ b/media-sound/aacplusenc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/aacplusenc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/ChangeLog,v 1.3 2011/06/27 06:50:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/ChangeLog,v 1.4 2011/12/04 22:53:46 radhermit Exp $
+
+  04 Dec 2011; Tim Harder <radhermit@gentoo.org> aacplusenc-0.17.5.ebuild,
+  +files/aacplusenc-0.17.5-libm.patch:
+  Fix linking order (bug #393137).
 
 *aacplusenc-0.17.5 (27 Jun 2011)
 

diff --git a/media-sound/aacplusenc/Manifest b/media-sound/aacplusenc/Manifest
index 648fdcb2d5d3a08386f0e229b1c7738c4a87cc24..185f568b87841ab8f03d781794c784462ca09cce 100644 (file)
--- a/media-sound/aacplusenc/Manifest
+++ b/media-sound/aacplusenc/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX aacplusenc-0.17.1-asneeded.patch 909 RMD160 cb2ac9c185cb25e7bd7ff2d92a38e8e3596fd57a SHA1 8e2d170315c8d3779d26045c6ffd0f5a67624716 SHA256 1e2adb61dc687d591475ba0358b02cf9a74442b581743db29466e7645d980397
 AUX aacplusenc-0.17.5-asneeded.patch 547 RMD160 e463dc2f0331c44d71466ebaab6af339093c83c1 SHA1 ace39f817e623fbf6499500dd3a08ae57d50181f SHA256 55d5d7d4d76763b5e87c1eeab3694ffdaa78df0dffe7ab050ca76ad38fae2d43
+AUX aacplusenc-0.17.5-libm.patch 468 RMD160 17316aa823f30d1989d58c7d69a45e6f711d80fc SHA1 f7ff28e3e60b5d69a65856d04e3e044be499bd26 SHA256 3e0cd0dcc4c007aa3ead32d4739c4537e354818361bdaa0b8198de20ae28835a
 DIST aacplusenc-0.17.1.tar.bz2 175606 RMD160 9c60013d5f6a24c1821575b69a85c8870c00a55f SHA1 47a88050adb254dd8d4fe7fc3e2585f939aa3869 SHA256 e9740f3e158ed247eb7ea8f3b2dcd3e523b05b9d138cf62232d70ec52f4ba8da
 DIST aacplusenc_0.17.5.tar.gz 547953 RMD160 c59efc3a3f8126b4650b304a043f176b80078d82 SHA1 1f862538c6f3ead4c5440d2649ecff4645c32a07 SHA256 318df58a86ac0647d6bfbcd8766fe301ad2ed08ffb4ef4e016e088f4dceb1669
 EBUILD aacplusenc-0.17.1.ebuild 1160 RMD160 d1c7c62ebc27744cb66a6bf8db3316a2b6ac15fb SHA1 96093e808be0c7d2a3546ed92f9b0db45415a9f8 SHA256 c70c5200636c08e6c44eede0e51173eab10a48c46c8989e35d0d5a0feee8b6a8
-EBUILD aacplusenc-0.17.5.ebuild 1171 RMD160 d9a451915b7b1571b3c2f4cedc95f156408a9fab SHA1 1a9866a1f9ca1aa79e7873d0beb605ef1ca15b61 SHA256 279d76a879bd2e45c3308c5df457988d81ec64d9f27221a632f0daa80924278a
-MISC ChangeLog 777 RMD160 180fe4222d701b2be6673b15d540b99a1e239202 SHA1 7081220d42e6755a208d33d7c1659c473ed43c30 SHA256 bd840e5647aa18a379d6d0da9748d39d1fc189ae382c88139563781cc9d2e4c2
+EBUILD aacplusenc-0.17.5.ebuild 1246 RMD160 57b58ce4cb1b99452f0e8b8af39d8a6bf4baf65a SHA1 8d73520276b912ba6a5b4961a32af44bcd446e42 SHA256 e7d6898a84fe673dc3904df8a124f4dc7331ce99e6f53d33e8ce1486566e0b56
+MISC ChangeLog 927 RMD160 ba6dc8e3cdc7a3875ca3f6b8025d68d5805def86 SHA1 abcaea38ca5ad5f5e275fcffa1c6e2bbfd77bec5 SHA256 84c566f749bd87ae5cb7d5bba0f457115f6f494959f9379ba9fd6e8095252801
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOCCg6AAoJEEqz6FtPBkyjaCcH/iu3Yp9s+X4+/Bx5+11ukmPW
-vwciY9OW0FiHsLXapTTcBVpPqPhbUNe9I/c1Jm/V8Zp+0BcwuugG1khA01JPPIn+
-1XTYr9ztQxVNCm7JCGA9yv8Rhc6ssQuPwpfLLN9TNArsoOURRiQO20pMJyoBt9er
-NCohIV1FdRTL03DoHoF9IMtXQ+yOTMUj/IwCpOrsnlRr+DbcF3R72iMFtMpq5Q+O
-inHxRiJMQT/7xr8iQnwkPvqP6YLJo/4VJYUchBX1C28YzCYnE4m463antpRggP7A
-jljFk5s9UlnlCRyGnmoGOFIqPk/5IwUT9d7tpTVpaebKllliPykVJIGAjZxw6VI=
-=xeJN
+iQEcBAEBCgAGBQJO2/oAAAoJEEqz6FtPBkyj90cH/iVJhOlmMRqAi+BbJs2KwS7O
+Px6i2blNIjmVg+mhPqczLfTthGDGjZKlSmowdVvfmnUeHNs11ElAbAoZ62dQUXBG
+N6wXFnAjK8/SRWjPQafXwOz+HgqGdtZ1Blu/e6502hpP09NP/6+gSNT9bil6mtNm
+nDrBlWtnR9/L7dek5K3chR6uA8pz/M80oHEfhmipwuPcD9NjTapucgEMaRABhymD
+h+UAdr23+7TG/1qO5quq3gTzWhoeHKpT2VtynQ0EWv0pJsb7V/BU/Px5+nV1zZFd
+hHc+pyBUbFcwkQ6fEmnvulxyc4XV+9cchQhmTcLbKJGvYIimLnn+g920rbVILfo=
+=0ODo
 -----END PGP SIGNATURE-----

diff --git a/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild b/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
index 76bbe2e8adaca06fb9070d02b2c38e612883de0d..ff4eb7b9f590b29eaae11722dcea26c92ef12837 100644 (file)
--- a/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
+++ b/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild,v 1.1 2011/06/27 06:50:29 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild,v 1.2 2011/12/04 22:53:46 radhermit Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -25,6 +25,10 @@ S=${WORKDIR}/${PN}
 
 src_prepare() {
        epatch "${FILESDIR}"/${P}-asneeded.patch
+
+       # Fix linking order (bug #393137)
+       epatch "${FILESDIR}"/${P}-libm.patch
+
        sed \
                -e 's:LDFLAGS:LIBRARIES:g' \
                -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \

diff --git a/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch b/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch
new file mode 100644 (file)
index 0000000..37a3f90
--- /dev/null
+++ b/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch
@@ -0,0 +1,13 @@
+--- aacplusenc/Makefile.orig
++++ aacplusenc/Makefile
+@@ -5,9 +5,8 @@
+ LIBS=libaacenc/libaacenc.a libbitbuf/libbitbuf.a libfr/libfr.a libsbrenc/libsbrenc.a libresamp/libresamp.a
+ TARGET=aacplusenc
+ 
+-LDFLAGS=-lm
+ LDFLAGS+=-L$(TOPDIR)/libaacenc -L$(TOPDIR)/libbitbuf -L$(TOPDIR)/libfr -L$(TOPDIR)/libsbrenc -L$(TOPDIR)/libresamp
+-LDFLAGS+=-laacenc -lbitbuf -lfr -lsbrenc -lresamp
++LDFLAGS+=-laacenc -lbitbuf -lfr -lsbrenc -lresamp -lm
+ 
+ ifdef FFTW3
+       LDFLAGS+=-lfftw3f