Fix PIC code for the decoder, thanks again to the PaX Team for the quick response, bug #202465

(Portage version: 2.1.4_rc10)

3 files changed, 14 insertions, 7 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 2d5f82ce4256..9db19c0ed490 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/xvid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.96 2007/12/02 17:39:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.97 2007/12/17 09:17:02 aballier Exp $
+
+*xvid-1.1.3-r2 (17 Dec 2007)
+
+  17 Dec 2007; Alexis Ballier <aballier@gentoo.org> -xvid-1.1.3-r1.ebuild,
+  +xvid-1.1.3-r2.ebuild:
+  Fix PIC code for the decoder, thanks again to the PaX Team for the quick
+  response, bug #202465
 
 *xvid-1.1.3-r1 (02 Dec 2007)
 
diff --git a/media-libs/xvid/files/digest-xvid-1.1.3-r1 b/media-libs/xvid/files/digest-xvid-1.1.3-r2
index ede909f05770..8e62662bda1c 100644
--- a/media-libs/xvid/files/digest-xvid-1.1.3-r1
+++ b/media-libs/xvid/files/digest-xvid-1.1.3-r2
@@ -1,9 +1,9 @@
 MD5 919ac7d4f8be05626e4d98abde100ab3 xvid-1.1.2-noexec-stack.patch.bz2 2426
 RMD160 083da9ab8e4fdcd067cd2970eeb7ad634894219f xvid-1.1.2-noexec-stack.patch.bz2 2426
 SHA256 6de38a05303e02a2524e3f0093a3e0b021bba93d0889c2b97a05a29ba21efffa xvid-1.1.2-noexec-stack.patch.bz2 2426
-MD5 03088a8568f91caf570149243b61d48c xvid-1.1.3-textrel.patch.bz2 24760
-RMD160 7a511ce369eade1de7e6d3d3a775cfa37e0e426a xvid-1.1.3-textrel.patch.bz2 24760
-SHA256 46419954aef27ec8a4ab8342eecb99b9816a9a6e233e1b5a8b0268523ec3a819 xvid-1.1.3-textrel.patch.bz2 24760
+MD5 d37ca823789c643329d338d2303b115f xvid-1.1.3-textrel-2.patch.bz2 24734
+RMD160 087e816f2bb1ab48a8f6e0652f1ad283ea49cf67 xvid-1.1.3-textrel-2.patch.bz2 24734
+SHA256 e80a115e8248e4b901d62d32a0f9e48df7a59f7d0c84ee54278661efc1f6f4fa xvid-1.1.3-textrel-2.patch.bz2 24734
 MD5 29c60d4d991ac18f687a8fd13cfe64b7 xvidcore-1.1.3.tar.bz2 625974
 RMD160 f890a2ef58be5362aa1d2894e748ef11a0c7bba8 xvidcore-1.1.3.tar.bz2 625974
 SHA256 f5d7f658840ef6fda5b2cd8b105d3738e1a3e735ee12ddc0136527f0185c14ed xvidcore-1.1.3.tar.bz2 625974
diff --git a/media-libs/xvid/xvid-1.1.3-r1.ebuild b/media-libs/xvid/xvid-1.1.3-r2.ebuild
index 6bd71a207be7..34ced5194981 100644
--- a/media-libs/xvid/xvid-1.1.3-r1.ebuild
+++ b/media-libs/xvid/xvid-1.1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.3-r1.ebuild,v 1.2 2007/12/03 07:19:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.3-r2.ebuild,v 1.1 2007/12/17 09:17:02 aballier Exp $
 
 inherit eutils fixheadtails autotools
 
@@ -10,7 +10,7 @@ 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.2-noexec-stack.patch.bz2
-	mirror://gentoo/${P}-textrel.patch.bz2"
+	mirror://gentoo/${P}-textrel-2.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -41,7 +41,7 @@ src_unpack() {
 	epatch "${WORKDIR}"/${PN}-1.1.2-noexec-stack.patch
 	epatch "${FILESDIR}"/${PN}-1.1.0-3dnow-2.patch
 	epatch "${FILESDIR}"/${P}-ia64-build.patch
-	epatch "${WORKDIR}/${P}-textrel.patch"
+	epatch "${WORKDIR}/${P}-textrel-2.patch"
 	cd "${S}"
 	eautoreconf
 }