Added patch to fix textrels on x86 thanks to PaX Team. See bug #90287.

Package-Manager: portage-2.1_pre9-r4

5 files changed, 60 insertions, 31 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index d79b167c3561..7c48dea43711 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/xvid
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.59 2006/04/17 14:25:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.60 2006/04/25 01:29:45 flameeyes Exp $
+
+  25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> xvid-1.1.0-r1.ebuild:
+  Added patch to fix textrels on x86 thanks to PaX Team. See bug #90287.
 
 *xvid-1.1.0-r1 (17 Apr 2006)
 
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index e6eda49498a9..dc1348e00896 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,64 +1,83 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d55264c438dca4a63cbd325d4417ae1c ChangeLog 7764
-RMD160 ce1aa1fffc36f351300d6972f2c973a82117e6c5 ChangeLog 7764
-SHA256 ae9951dbe7d62296432a0a31b5558693f13992536bea141fbb5785de784a3862 ChangeLog 7764
+AUX 1.0.2-DESTDIR.patch 1450 RMD160 4812c2444247b8306d1ad0874ab45762ac898093 SHA1 71d1e00c431a8dd1840cfc067504a51beec6bdef SHA256 5aa2571d3e5053d15a9efa21a71ff8a851df6afb7dee73bb1075696346159e83 size 1450
 MD5 8c100445a64d960693db8424931ff0eb files/1.0.2-DESTDIR.patch 1450
 RMD160 4812c2444247b8306d1ad0874ab45762ac898093 files/1.0.2-DESTDIR.patch 1450
 SHA256 5aa2571d3e5053d15a9efa21a71ff8a851df6afb7dee73bb1075696346159e83 files/1.0.2-DESTDIR.patch 1450
-MD5 3ed49831081a6eb29ccda7ec2956c592 files/digest-xvid-1.0.2 67
-RMD160 02b7e85dadb9b930ef9355f446459e980ab1e77e files/digest-xvid-1.0.2 67
-SHA256 01e095f596d57fede70641b32ded31db0f3b2fc8e4234a7744b48c1621abbc04 files/digest-xvid-1.0.2 67
-MD5 a508fb244e68f01cbf06e590abbee04e files/digest-xvid-1.0.3 67
-RMD160 9ba90fbbb6b2b6514c9abdf3cfb4b59360d88b16 files/digest-xvid-1.0.3 67
-SHA256 820e2a89e22238c6082da7da6e5ef7853cfd1abf8b5a4501e9bed7db77fddf99 files/digest-xvid-1.0.3 67
-MD5 1f38af1f2eb1d1974aef412e1b027d4b files/digest-xvid-1.1.0 521
-RMD160 df64668c49d9194c5c53e624fbafa44e73fb825c files/digest-xvid-1.1.0 521
-SHA256 f52b1defaca15b9c73c241248ff11af3629914ed9c5c2bf4d73ebc38d4f479ed files/digest-xvid-1.1.0 521
-MD5 1f38af1f2eb1d1974aef412e1b027d4b files/digest-xvid-1.1.0-r1 521
-RMD160 df64668c49d9194c5c53e624fbafa44e73fb825c files/digest-xvid-1.1.0-r1 521
-SHA256 f52b1defaca15b9c73c241248ff11af3629914ed9c5c2bf4d73ebc38d4f479ed files/digest-xvid-1.1.0-r1 521
-MD5 efdb459d255b1c1d8c6784303c1cd575 files/digest-xvid-1.1.0_beta2-r1 149
-RMD160 d2768af5ea525844ab8c37ec348e976f2a769bc3 files/digest-xvid-1.1.0_beta2-r1 149
-SHA256 5bbf5b9caf1cc6ad827e6b9e008067eb0a9818097f2ec58c8d8fc6957b7869a8 files/digest-xvid-1.1.0_beta2-r1 149
+AUX xvid-1.0-ia64.patch 264 RMD160 1aecaf0076461d2dd64c562a930f2e6d65929655 SHA1 e820c6e6e2fdb3147fb65115eb43d4fb3913e422 SHA256 7cb82d6d71f9ccdb6b902313ca6922dd3dc9dca4ef18a3e481e8b361e36a8157 size 264
 MD5 666fc1f16bf35b48d500b495509b07b2 files/xvid-1.0-ia64.patch 264
 RMD160 1aecaf0076461d2dd64c562a930f2e6d65929655 files/xvid-1.0-ia64.patch 264
 SHA256 7cb82d6d71f9ccdb6b902313ca6922dd3dc9dca4ef18a3e481e8b361e36a8157 files/xvid-1.0-ia64.patch 264
+AUX xvid-1.0.1-64bit-clean.patch 1723 RMD160 511fbf80fdae52f8f6bfad66d68bd1dfdcc5aced SHA1 bb84d5ef608f8dae41317ab6a404402c2d815e7b SHA256 d1d46f1111e72f8a4c22f0ae58eb97678e526fb80ed91e9f4afa87b4473989c3 size 1723
 MD5 b2f1f286ed22acfa893dae382f47fee2 files/xvid-1.0.1-64bit-clean.patch 1723
 RMD160 511fbf80fdae52f8f6bfad66d68bd1dfdcc5aced files/xvid-1.0.1-64bit-clean.patch 1723
 SHA256 d1d46f1111e72f8a4c22f0ae58eb97678e526fb80ed91e9f4afa87b4473989c3 files/xvid-1.0.1-64bit-clean.patch 1723
+AUX xvid-1.1.0-3dnow.patch 417 RMD160 2fc9a193e28fbf41eb7a8a279a158a844021511e SHA1 507ec6b41a5b591208d0ce52272bcd93de3b8cd7 SHA256 552e7dd73c7ad41838e126ff102f63654ae371d6617df1fe984f84851d05bed7 size 417
 MD5 59dd07c645db4dd89c0d8a811317bb18 files/xvid-1.1.0-3dnow.patch 417
 RMD160 2fc9a193e28fbf41eb7a8a279a158a844021511e files/xvid-1.1.0-3dnow.patch 417
 SHA256 552e7dd73c7ad41838e126ff102f63654ae371d6617df1fe984f84851d05bed7 files/xvid-1.1.0-3dnow.patch 417
+AUX xvid-1.1.0_beta2-altivec.patch 1070 RMD160 316da7461c58ddabec7d2907431fbb9675cea322 SHA1 7ea51c2a5a06c8c8a183398fec4656f159335085 SHA256 5644023118344e577e7af0188161899bf5e91de92f864666066dc79e007f991d size 1070
 MD5 80a43f67032aa35894fcb976e575c252 files/xvid-1.1.0_beta2-altivec.patch 1070
 RMD160 316da7461c58ddabec7d2907431fbb9675cea322 files/xvid-1.1.0_beta2-altivec.patch 1070
 SHA256 5644023118344e577e7af0188161899bf5e91de92f864666066dc79e007f991d files/xvid-1.1.0_beta2-altivec.patch 1070
+AUX xvid-1.1.0_beta2-amd64-gcc4.patch 2135 RMD160 9955d64f7a90a753c9aff7bfb6fe9665c7f486e0 SHA1 787cfa0653203c705dd2ae8ae76b1919a23ec516 SHA256 e03e671cc793c15040f58d74fd9c34cb978eff5dcd54e89001d8478bf06d59a0 size 2135
 MD5 ecea104174b77d80f9bbf94f94a78aec files/xvid-1.1.0_beta2-amd64-gcc4.patch 2135
 RMD160 9955d64f7a90a753c9aff7bfb6fe9665c7f486e0 files/xvid-1.1.0_beta2-amd64-gcc4.patch 2135
 SHA256 e03e671cc793c15040f58d74fd9c34cb978eff5dcd54e89001d8478bf06d59a0 files/xvid-1.1.0_beta2-amd64-gcc4.patch 2135
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
-SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata.xml 225
+DIST xvid-1.1.0-noexec-stack.patch.bz2 3443 RMD160 3da4597854b67975e424614ac403397fa566f2d1 SHA256 d63027784787b418947d969513621711a94fba847d51e7b1b4ac7c50ba14511e size 3443
+DIST xvid-1.1.0-textrel.patch.bz2 24499 RMD160 461799d1e1b9c97afbf36a9c3278fb3eda8b907b SHA256 2c6d93494b64191e4eb0e414041be9edbf54b6137c4eacc4defbac18b50f916b size 24499
+DIST xvidcore-1.0.2.tar.bz2 541407 size 541407
+DIST xvidcore-1.0.3.tar.bz2 541841 size 541841
+DIST xvidcore-1.1.0-beta2.tar.bz2 594159 size 594159
+DIST xvidcore-1.1.0.tar.bz2 612101 RMD160 582927437970cf81534b9ed4f02173201e10f47b SHA256 bde8cdf8fd490e91b75f98128fd3718b2c570e7cc8f6b83e71896dbbca135e3c size 612101
+EBUILD xvid-1.0.2.ebuild 1212 RMD160 8187ba91b17eee9f376fc0f3dbf8c39f04aa5f61 SHA1 ccedbbecfc4c5fb4b438c5e46412e35d6646a40a SHA256 f8c1f0366c0afd9db2ea5eaf6f9fc2044f9e6ec4d2096ff31f4bb21278f7fb35 size 1212
 MD5 684af8a8c5e487d5e197b2b0f7793cec xvid-1.0.2.ebuild 1212
 RMD160 8187ba91b17eee9f376fc0f3dbf8c39f04aa5f61 xvid-1.0.2.ebuild 1212
 SHA256 f8c1f0366c0afd9db2ea5eaf6f9fc2044f9e6ec4d2096ff31f4bb21278f7fb35 xvid-1.0.2.ebuild 1212
+EBUILD xvid-1.0.3.ebuild 1163 RMD160 bc3cb9b08ec2f2dd24ed3c7f015a143b5aa46d46 SHA1 32868e9549726213f0e19754a51537a880e1a4c6 SHA256 2861085e0b50bb81092a5010404f2d46cc8a8dda93099d4f0a4f6c1d115e3170 size 1163
 MD5 9216d6d67f3a57fbe19895891d8e3c35 xvid-1.0.3.ebuild 1163
 RMD160 bc3cb9b08ec2f2dd24ed3c7f015a143b5aa46d46 xvid-1.0.3.ebuild 1163
 SHA256 2861085e0b50bb81092a5010404f2d46cc8a8dda93099d4f0a4f6c1d115e3170 xvid-1.0.3.ebuild 1163
-MD5 42490ab1fb6e265da08f4cbd481906f2 xvid-1.1.0-r1.ebuild 1646
-RMD160 393c22bb931ac87605638d463885e2239fe964b0 xvid-1.1.0-r1.ebuild 1646
-SHA256 b015737f66231a4704e27795eebb4f1c5de6d387923b5f521eb7688a211e5982 xvid-1.1.0-r1.ebuild 1646
+EBUILD xvid-1.1.0-r1.ebuild 1730 RMD160 a79bb5040e55d780441198813aa9200e0a7dcb40 SHA1 46a4c50651eb758412ba0a431c97517d0a4c1539 SHA256 46475cf921975f0e4165778c63776b145b44028e91f6b355c8c200402305b861 size 1730
+MD5 553fe59b05cd405a0ab9eac0e2fa1491 xvid-1.1.0-r1.ebuild 1730
+RMD160 a79bb5040e55d780441198813aa9200e0a7dcb40 xvid-1.1.0-r1.ebuild 1730
+SHA256 46475cf921975f0e4165778c63776b145b44028e91f6b355c8c200402305b861 xvid-1.1.0-r1.ebuild 1730
+EBUILD xvid-1.1.0.ebuild 1604 RMD160 beb6ac17281118443cf1f53681dc5f839019a1c4 SHA1 e04367cff4335f70319ede7dd2a6b347a2da3e68 SHA256 0c0b1d8819090cb2a57445034d616e2cbab6865498b7425cb1fdb357dcf40ba9 size 1604
 MD5 06c7c3230260a4e3334912d804d2bef5 xvid-1.1.0.ebuild 1604
 RMD160 beb6ac17281118443cf1f53681dc5f839019a1c4 xvid-1.1.0.ebuild 1604
 SHA256 0c0b1d8819090cb2a57445034d616e2cbab6865498b7425cb1fdb357dcf40ba9 xvid-1.1.0.ebuild 1604
+EBUILD xvid-1.1.0_beta2-r1.ebuild 1754 RMD160 3d2719a328d4e7d16f9fc0f45cc85788c581e1be SHA1 3fc46079a96abc6143c7f557445022b6c02f6faa SHA256 b45fbf45425c90e6adf79beef34fc921411306e7a1d9235b09836d2579f9d72e size 1754
 MD5 c1a7e7dcc3f66120502d2aa8f523f11a xvid-1.1.0_beta2-r1.ebuild 1754
 RMD160 3d2719a328d4e7d16f9fc0f45cc85788c581e1be xvid-1.1.0_beta2-r1.ebuild 1754
 SHA256 b45fbf45425c90e6adf79beef34fc921411306e7a1d9235b09836d2579f9d72e xvid-1.1.0_beta2-r1.ebuild 1754
+MISC ChangeLog 7913 RMD160 1219815459047f290a4e134d92ad1c705f79cd78 SHA1 df454d043646d365b4c22ca8d7dfa676e6cb35af SHA256 fe0529df7e89a663eb9826d4543e4f1e57398e4d4c7bac273ca39b884519c9f2 size 7913
+MD5 ade5404bf1457799e0981b923a8b40cc ChangeLog 7913
+RMD160 1219815459047f290a4e134d92ad1c705f79cd78 ChangeLog 7913
+SHA256 fe0529df7e89a663eb9826d4543e4f1e57398e4d4c7bac273ca39b884519c9f2 ChangeLog 7913
+MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 size 225
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
+SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata.xml 225
+MD5 3ed49831081a6eb29ccda7ec2956c592 files/digest-xvid-1.0.2 67
+RMD160 02b7e85dadb9b930ef9355f446459e980ab1e77e files/digest-xvid-1.0.2 67
+SHA256 01e095f596d57fede70641b32ded31db0f3b2fc8e4234a7744b48c1621abbc04 files/digest-xvid-1.0.2 67
+MD5 a508fb244e68f01cbf06e590abbee04e files/digest-xvid-1.0.3 67
+RMD160 9ba90fbbb6b2b6514c9abdf3cfb4b59360d88b16 files/digest-xvid-1.0.3 67
+SHA256 820e2a89e22238c6082da7da6e5ef7853cfd1abf8b5a4501e9bed7db77fddf99 files/digest-xvid-1.0.3 67
+MD5 1f38af1f2eb1d1974aef412e1b027d4b files/digest-xvid-1.1.0 521
+RMD160 df64668c49d9194c5c53e624fbafa44e73fb825c files/digest-xvid-1.1.0 521
+SHA256 f52b1defaca15b9c73c241248ff11af3629914ed9c5c2bf4d73ebc38d4f479ed files/digest-xvid-1.1.0 521
+MD5 06f18f01cd187985ef75643f538b81a2 files/digest-xvid-1.1.0-r1 783
+RMD160 18bedeccb5f6c93885e989bab7c1f831442b9149 files/digest-xvid-1.1.0-r1 783
+SHA256 9c5b7612c692fb55c042dccbec5b80dd8895c99f898d0c10d20b13a0b0851873 files/digest-xvid-1.1.0-r1 783
+MD5 95422d262a394414295a9f175b9daaf3 files/digest-xvid-1.1.0_beta2-r1 347
+RMD160 625f99366065d5f1967490efd12fb96451fe6d3a files/digest-xvid-1.1.0_beta2-r1 347
+SHA256 89c721b5f52648c0fbd732d37f3920801c583b3df1f57dc752b5cff849b1e72d files/digest-xvid-1.1.0_beta2-r1 347
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEQ6TKAiZjviIA2XgRAovbAJ9TZbv5c2oBOI2dai7xQ7+qCm0tPgCg6MzW
-oMWovX/IIMDrCzqJu8IU480=
-=kNQY
+iD8DBQFETXuQAiZjviIA2XgRAi8EAKCcFnjZ3iYWJbDzJbjs34b8ziUNiACePFZI
+N4KOiGsC7bCuMFFNK9+jOFs=
+=Au1w
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xvid/files/digest-xvid-1.1.0-r1 b/media-libs/xvid/files/digest-xvid-1.1.0-r1
index 31b550c2ac6e..6c5b3b9c6400 100644
--- a/media-libs/xvid/files/digest-xvid-1.1.0-r1
+++ b/media-libs/xvid/files/digest-xvid-1.1.0-r1
@@ -1,6 +1,9 @@
 MD5 891c95e3e4660da30db9badfbd724f6b xvid-1.1.0-noexec-stack.patch.bz2 3443
 RMD160 3da4597854b67975e424614ac403397fa566f2d1 xvid-1.1.0-noexec-stack.patch.bz2 3443
 SHA256 d63027784787b418947d969513621711a94fba847d51e7b1b4ac7c50ba14511e xvid-1.1.0-noexec-stack.patch.bz2 3443
+MD5 9612e37bf4afa9e74b068162b0a02a46 xvid-1.1.0-textrel.patch.bz2 24499
+RMD160 461799d1e1b9c97afbf36a9c3278fb3eda8b907b xvid-1.1.0-textrel.patch.bz2 24499
+SHA256 2c6d93494b64191e4eb0e414041be9edbf54b6137c4eacc4defbac18b50f916b xvid-1.1.0-textrel.patch.bz2 24499
 MD5 359eebc5fb496a2bf7b15010059e7897 xvidcore-1.1.0.tar.bz2 612101
 RMD160 582927437970cf81534b9ed4f02173201e10f47b xvidcore-1.1.0.tar.bz2 612101
 SHA256 bde8cdf8fd490e91b75f98128fd3718b2c570e7cc8f6b83e71896dbbca135e3c xvidcore-1.1.0.tar.bz2 612101
diff --git a/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1 b/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1
index 50ef637893b9..91dcab5c0b83 100644
--- a/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1
+++ b/media-libs/xvid/files/digest-xvid-1.1.0_beta2-r1
@@ -1,2 +1,4 @@
 MD5 891c95e3e4660da30db9badfbd724f6b xvid-1.1.0-noexec-stack.patch.bz2 3443
+RMD160 3da4597854b67975e424614ac403397fa566f2d1 xvid-1.1.0-noexec-stack.patch.bz2 3443
+SHA256 d63027784787b418947d969513621711a94fba847d51e7b1b4ac7c50ba14511e xvid-1.1.0-noexec-stack.patch.bz2 3443
 MD5 1556584438f5b9fcd4c5e4ca829da602 xvidcore-1.1.0-beta2.tar.bz2 594159
diff --git a/media-libs/xvid/xvid-1.1.0-r1.ebuild b/media-libs/xvid/xvid-1.1.0-r1.ebuild
index 01c696787efc..5c4e2f5381c9 100644
--- a/media-libs/xvid/xvid-1.1.0-r1.ebuild
+++ b/media-libs/xvid/xvid-1.1.0-r1.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/xvid/xvid-1.1.0-r1.ebuild,v 1.1 2006/04/17 14:25:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.0-r1.ebuild,v 1.2 2006/04/25 01:29:45 flameeyes Exp $
 
 inherit eutils fixheadtails autotools
 
@@ -8,7 +8,8 @@ MY_P=${PN}core-${PV/_beta/-beta}
 DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
 HOMEPAGE="http://www.xvid.org/"
 SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2
-	mirror://gentoo/${PN}-1.1.0-noexec-stack.patch.bz2"
+	mirror://gentoo/${PN}-1.1.0-noexec-stack.patch.bz2
+	mirror://gentoo/${P}-textrel.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -28,6 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.1.0_beta2-altivec.patch"
 	epatch "${WORKDIR}/${PN}-1.1.0-noexec-stack.patch"
 	epatch "${FILESDIR}/${P}-3dnow.patch"
+	epatch "${DISTDIR}/${P}-textrel.patch.bz2"
 
 	cd ${S}
 	eautoreconf