Add patch to fix textrel/non-PIC aware code, thanks to PaX Team and solar.

Package-Manager: portage-2.1_pre9-r4

4 files changed, 28 insertions, 18 deletions

diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog
index 87c0cf620032..1fb2141ffd07 100644
--- a/media-libs/libmpeg3/ChangeLog
+++ b/media-libs/libmpeg3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmpeg3
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.41 2006/04/24 23:58:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.42 2006/04/25 01:06:39 flameeyes Exp $
+
+  25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  libmpeg3-1.5.2-r3.ebuild:
+  Add patch to fix textrel/non-PIC aware code, thanks to PaX Team and solar.
 
   24 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/libmpeg3-1.5.2-gnustack.patch, libmpeg3-1.5.2-r3.ebuild:
diff --git a/media-libs/libmpeg3/Manifest b/media-libs/libmpeg3/Manifest
index 3121f9bbe183..f05eeaac4346 100644
--- a/media-libs/libmpeg3/Manifest
+++ b/media-libs/libmpeg3/Manifest
@@ -10,6 +10,7 @@ MD5 0aeab3ed1e4787b66ada984cdd7ea8ec files/libmpeg3-1.5.2-gnustack.patch 726
 RMD160 27aa188aef63042b4f47f54ab0a9427728cfc6fb files/libmpeg3-1.5.2-gnustack.patch 726
 SHA256 29658f031e529a2c287d0dae4140c18f619ea494011b005010dd2a715863003b files/libmpeg3-1.5.2-gnustack.patch 726
 DIST libmpeg3-1.5.2-src.tar.bz2 625682 RMD160 3198e42f529c5699dc7cf376d100831d0648f10f SHA256 dac7ed679476f6a011a603bba8e4eacf998650dc1ae74537f17326859c3aa7ba size 625682
+DIST libmpeg3-1.5.2-textrel-fix.patch.bz2 6386 RMD160 6547523cac00f1035505f40ce1eb720d5c6e04ac SHA256 b241e5bd5c05c90ec28ee6fdab33956ad51869ee506bf8b5e76f7f2f362b09dd size 6386
 DIST libmpeg3-patches-1.tar.bz2 4176 size 4176
 DIST libmpeg3-patches-3.tar.bz2 4251 RMD160 7fbb16804ce0c1cb6b6fc3a7467cc7efa4989988 SHA256 2b4b200337802a572c321e4a6744c4ea9a889acd3d1325337a80424aaede5186 size 4251
 EBUILD libmpeg3-1.5.2-r1.ebuild 2611 RMD160 d6c5f36ebb80eb0eb9ee3f2af8de253e39ca4dd0 SHA1 6d24e6b02f5ce665d7598b1e10be5ed18d9a1822 SHA256 05b5b516868400e1456349eec1e47567e4a6a0eaae192d4686a323c7e1edf05d size 2611
@@ -20,18 +21,18 @@ EBUILD libmpeg3-1.5.2-r2.ebuild 2610 RMD160 babb4aa25f3e5dac0ed8dcb7bc8404c9a1e0
 MD5 730caa4f16fc47c0c379a4b1e8c87baf libmpeg3-1.5.2-r2.ebuild 2610
 RMD160 babb4aa25f3e5dac0ed8dcb7bc8404c9a1e099c4 libmpeg3-1.5.2-r2.ebuild 2610
 SHA256 49f05d4fdebd8f30705714e04f67b2eadb8ea4fc0d5e7dbd015fd89effc458e0 libmpeg3-1.5.2-r2.ebuild 2610
-EBUILD libmpeg3-1.5.2-r3.ebuild 1981 RMD160 80f0fe1c067bc38955761537c6f22f3849c57f63 SHA1 dda15aba9e56745fcc31ddd3258571a11d00a4d9 SHA256 a0210b1d21252fe93c5dbbc5aeeabd63f3ca316a20523c48449608eaa05dd313 size 1981
-MD5 f3797d005a33c2ccdf0bf7e45e393bd3 libmpeg3-1.5.2-r3.ebuild 1981
-RMD160 80f0fe1c067bc38955761537c6f22f3849c57f63 libmpeg3-1.5.2-r3.ebuild 1981
-SHA256 a0210b1d21252fe93c5dbbc5aeeabd63f3ca316a20523c48449608eaa05dd313 libmpeg3-1.5.2-r3.ebuild 1981
+EBUILD libmpeg3-1.5.2-r3.ebuild 2061 RMD160 c1954aa70be3c8d712b363a8463b2d9ac4600652 SHA1 c0fd9d256206b2007900331ea8b1caa5473a47d3 SHA256 a6905668205f54ed21cf45908d05b520d95f103d1e331a631286b360e029c23d size 2061
+MD5 7036c31b9bfe7938deaca0866193e802 libmpeg3-1.5.2-r3.ebuild 2061
+RMD160 c1954aa70be3c8d712b363a8463b2d9ac4600652 libmpeg3-1.5.2-r3.ebuild 2061
+SHA256 a6905668205f54ed21cf45908d05b520d95f103d1e331a631286b360e029c23d libmpeg3-1.5.2-r3.ebuild 2061
 EBUILD libmpeg3-1.5.2.ebuild 2008 RMD160 c68202364954b2d073a6a61cdacae9b5d60827b1 SHA1 133c215fc9a547e17fc3296ade596a08548aacf4 SHA256 9a258c25505a73d5a924f972b8d0eecfacfb5132495ef072cc863b1131ba617d size 2008
 MD5 c6c6825ba565aae9d3a5d7399745e98f libmpeg3-1.5.2.ebuild 2008
 RMD160 c68202364954b2d073a6a61cdacae9b5d60827b1 libmpeg3-1.5.2.ebuild 2008
 SHA256 9a258c25505a73d5a924f972b8d0eecfacfb5132495ef072cc863b1131ba617d libmpeg3-1.5.2.ebuild 2008
-MISC ChangeLog 6956 RMD160 485922e09c271e3cb3620f8cf57141ef9490135b SHA1 5f87d24d0a41e193f561cf820d1e92fc16a9b3ab SHA256 f6ce01278bb35f907268673c97782d0b2620ca44e193ef15ff8f054485cae883 size 6956
-MD5 ea34505dd2b0563a7d555c440d0b30d0 ChangeLog 6956
-RMD160 485922e09c271e3cb3620f8cf57141ef9490135b ChangeLog 6956
-SHA256 f6ce01278bb35f907268673c97782d0b2620ca44e193ef15ff8f054485cae883 ChangeLog 6956
+MISC ChangeLog 7115 RMD160 800ce406f0c7c5fe451f50679bd0053c7fff089c SHA1 0c75a4d6208b2f38ce16b6f1a0957939071c1436 SHA256 60909dcab4a74cb9ed82b19da996aa6b0e30d2df997c8112dda86e059d4eb304 size 7115
+MD5 82a74102da2ecf0d2faffb59f3794302 ChangeLog 7115
+RMD160 800ce406f0c7c5fe451f50679bd0053c7fff089c ChangeLog 7115
+SHA256 60909dcab4a74cb9ed82b19da996aa6b0e30d2df997c8112dda86e059d4eb304 ChangeLog 7115
 MISC metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 SHA1 9ac37da489ebe6e58e32fe8e037b1ef2d99c6638 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 size 158
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
@@ -45,13 +46,13 @@ SHA256 ac332653ee33dd460becab2d68f01ce4e80c057a5246b07a50db8d0dd0311025 files/di
 MD5 652f940c23f681542d125f3b67d215f4 files/digest-libmpeg3-1.5.2-r2 512
 RMD160 573794a437d10297f713321e47cc622e51d551f0 files/digest-libmpeg3-1.5.2-r2 512
 SHA256 03fa862c63807b3b16bbc35844b17048cdadc729742d7dc9f3a0c6474f4c977c files/digest-libmpeg3-1.5.2-r2 512
-MD5 652f940c23f681542d125f3b67d215f4 files/digest-libmpeg3-1.5.2-r3 512
-RMD160 573794a437d10297f713321e47cc622e51d551f0 files/digest-libmpeg3-1.5.2-r3 512
-SHA256 03fa862c63807b3b16bbc35844b17048cdadc729742d7dc9f3a0c6474f4c977c files/digest-libmpeg3-1.5.2-r3 512
+MD5 0f096fadc78614069fc77718d8707b55 files/digest-libmpeg3-1.5.2-r3 795
+RMD160 416f71a53fc054577e37f7c3399ec315cd813712 files/digest-libmpeg3-1.5.2-r3 795
+SHA256 268817d6fddb4be51d6e5c8c4f414a76583228e864ea8f0326c62dc3c86aaff1 files/digest-libmpeg3-1.5.2-r3 795
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFETWYsAiZjviIA2XgRAhMKAJ9OBM+WLRr9muVmAvPV4hSSGfU72wCeKhrt
-BYuMCkhNNLJ7zyQ6lKL9S1M=
-=0jJD
+iD8DBQFETXYlAiZjviIA2XgRAvYrAJ44Z8B7RGSQGNEeoE4+UwD/H7YK9ACff661
+jzl3ds5BNnhhAayEs2av10g=
+=qjkX
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r3 b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r3
index 21d1de144fcb..db43c0aaf837 100644
--- a/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r3
+++ b/media-libs/libmpeg3/files/digest-libmpeg3-1.5.2-r3
@@ -1,6 +1,9 @@
 MD5 d2b12624e8e2eed1a03c4f837f33a90f libmpeg3-1.5.2-src.tar.bz2 625682
 RMD160 3198e42f529c5699dc7cf376d100831d0648f10f libmpeg3-1.5.2-src.tar.bz2 625682
 SHA256 dac7ed679476f6a011a603bba8e4eacf998650dc1ae74537f17326859c3aa7ba libmpeg3-1.5.2-src.tar.bz2 625682
+MD5 02bc99e817c7b0a6aabbbe5ee02cc4c9 libmpeg3-1.5.2-textrel-fix.patch.bz2 6386
+RMD160 6547523cac00f1035505f40ce1eb720d5c6e04ac libmpeg3-1.5.2-textrel-fix.patch.bz2 6386
+SHA256 b241e5bd5c05c90ec28ee6fdab33956ad51869ee506bf8b5e76f7f2f362b09dd libmpeg3-1.5.2-textrel-fix.patch.bz2 6386
 MD5 84f32e19c88437cbb043367cdc87d2c4 libmpeg3-patches-3.tar.bz2 4251
 RMD160 7fbb16804ce0c1cb6b6fc3a7467cc7efa4989988 libmpeg3-patches-3.tar.bz2 4251
 SHA256 2b4b200337802a572c321e4a6744c4ea9a889acd3d1325337a80424aaede5186 libmpeg3-patches-3.tar.bz2 4251
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild
index 10d6d3e83b3e..6bd21a099e5a 100644
--- a/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild,v 1.2 2006/04/24 23:58:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2-r3.ebuild,v 1.3 2006/04/25 01:06:39 flameeyes Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -8,7 +8,8 @@ PATCHLEVEL="3"
 DESCRIPTION="An mpeg library for linux"
 HOMEPAGE="http://heroinewarrior.com/libmpeg3.php3"
 SRC_URI="mirror://sourceforge/heroines/${P}-src.tar.bz2
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
+	mirror://gentoo/${P}-textrel-fix.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -38,8 +39,9 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-a52.patch"
 	epatch "${FILESDIR}/${P}-gnustack.patch"
+	epatch "${DISTDIR}/${P}-textrel-fix.patch.bz2"
 
-	if ! use mmx || has_pic ; then
+	if ! use mmx; then
 		sed -i -e 's:^NASM =.*:NASM =:' \
 			-e 's|^HAVE_NASM :=.*|HAVE_NASM=n|' \
 			-e 's|USE_MMX = 1|USE_MMX = 0|' \