Fix patch naming, thanks to Nick Hadaway in bug #131298.

Package-Manager: portage-2.1_pre9-r4

3 files changed, 17 insertions, 14 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index d1401de4f6e2..9ec118c56725 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.61 2006/04/25 18:02:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.62 2006/04/26 09:02:30 flameeyes Exp $
+
+  26 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> xvid-1.1.0-r1.ebuild:
+  Fix patch naming, thanks to Nick Hadaway in bug #131298.
 
   25 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> xvid-1.1.0-r1.ebuild:
   Update patch for xvid from PaX Team.
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 15d86036a1ec..eb9692daf0e5 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -39,10 +39,10 @@ EBUILD xvid-1.0.3.ebuild 1163 RMD160 bc3cb9b08ec2f2dd24ed3c7f015a143b5aa46d46 SH
 MD5 9216d6d67f3a57fbe19895891d8e3c35 xvid-1.0.3.ebuild 1163
 RMD160 bc3cb9b08ec2f2dd24ed3c7f015a143b5aa46d46 xvid-1.0.3.ebuild 1163
 SHA256 2861085e0b50bb81092a5010404f2d46cc8a8dda93099d4f0a4f6c1d115e3170 xvid-1.0.3.ebuild 1163
-EBUILD xvid-1.1.0-r1.ebuild 1732 RMD160 e10fa5987584cf2582eabb6d89418e4594632ad6 SHA1 624afcbd91a47b1e2127adc0032120f214f27ad6 SHA256 d59fa3259833840ebbd57ccc183c16c50cf814af454b1d366e9468d68591f416 size 1732
-MD5 f152c98544a7ed10c8e4d39efba8fd6b xvid-1.1.0-r1.ebuild 1732
-RMD160 e10fa5987584cf2582eabb6d89418e4594632ad6 xvid-1.1.0-r1.ebuild 1732
-SHA256 d59fa3259833840ebbd57ccc183c16c50cf814af454b1d366e9468d68591f416 xvid-1.1.0-r1.ebuild 1732
+EBUILD xvid-1.1.0-r1.ebuild 1734 RMD160 dfd207bac29c7a9d74a2a1ce1ad427c07211acb5 SHA1 2b8d453388d4121ad1637bed3608ca7fde10440b SHA256 c2ae84a7c02016f39b7f99bc092d1e0899e0b90b344dc1ccfe10f0e58853f6e6 size 1734
+MD5 31737e8caf47a08701f80caeefac1aca xvid-1.1.0-r1.ebuild 1734
+RMD160 dfd207bac29c7a9d74a2a1ce1ad427c07211acb5 xvid-1.1.0-r1.ebuild 1734
+SHA256 c2ae84a7c02016f39b7f99bc092d1e0899e0b90b344dc1ccfe10f0e58853f6e6 xvid-1.1.0-r1.ebuild 1734
 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
@@ -51,10 +51,10 @@ EBUILD xvid-1.1.0_beta2-r1.ebuild 1754 RMD160 3d2719a328d4e7d16f9fc0f45cc85788c5
 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 8028 RMD160 9c2dc750d87819f114e6c0a2436e75fc766f32c6 SHA1 2222176dc8e3a30b4707c662f809a4979ae07b65 SHA256 6fb51ac8f84fc94d35e436fe482a65d14f2e288d33755f7c42fc60bdfa966bcc size 8028
-MD5 ac4755c2dfa192d496deeb9970195c87 ChangeLog 8028
-RMD160 9c2dc750d87819f114e6c0a2436e75fc766f32c6 ChangeLog 8028
-SHA256 6fb51ac8f84fc94d35e436fe482a65d14f2e288d33755f7c42fc60bdfa966bcc ChangeLog 8028
+MISC ChangeLog 8163 RMD160 7fc797058ab555f2626ae75257cf709953b57708 SHA1 d81d385ee6dfc44b7b58004ae3e34a325661d9ca SHA256 67584b73cf39e0e8974aabab579c3918845ec407a2103320259bb4594ded8dfd size 8163
+MD5 3fd518b09c2df4bc3be1ec20a9d0be68 ChangeLog 8163
+RMD160 7fc797058ab555f2626ae75257cf709953b57708 ChangeLog 8163
+SHA256 67584b73cf39e0e8974aabab579c3918845ec407a2103320259bb4594ded8dfd ChangeLog 8163
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 size 225
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -77,7 +77,7 @@ SHA256 89c721b5f52648c0fbd732d37f3920801c583b3df1f57dc752b5cff849b1e72d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFETmRCAiZjviIA2XgRAlsWAKC4Kky93sdi9o3XWKHi27ZSwLt5owCeNC6X
-EZqx5j2lgPJMpJYOj6BZXXE=
-=aAHH
+iD8DBQFETzc1AiZjviIA2XgRAlbjAKCJwl3kge64fX8SVVBzFQ02O2dFPQCeI3Hm
+CGHPN1G+nLAonKyNwPRGFAw=
+=Y5ug
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xvid/xvid-1.1.0-r1.ebuild b/media-libs/xvid/xvid-1.1.0-r1.ebuild
index d23ff69bc56f..5f2c42157b7c 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.3 2006/04/25 18:02:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.0-r1.ebuild,v 1.4 2006/04/26 09:02:30 flameeyes Exp $
 
 inherit eutils fixheadtails autotools
 
@@ -29,7 +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"
+	epatch "${DISTDIR}/${P}-textrel-2.patch.bz2"
 
 	cd ${S}
 	eautoreconf