Fixup exec patch to work with yasm and nasm #159498 by Shunichi Fuji.

(Portage version: 2.1.2-r4)

5 files changed, 23 insertions, 19 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index ae2a2ee38669..448c96ba9628 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xvid
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.80 2007/01/24 22:16:25 aballier Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.81 2007/01/27 11:09:30 vapier Exp $
+
+  27 Jan 2007; Mike Frysinger <vapier@gentoo.org> xvid-1.1.0-r3.ebuild,
+  xvid-1.1.2.ebuild:
+  Fixup exec patch to work with yasm and nasm #159498 by Shunichi Fuji.
 
 *xvid-1.1.2 (24 Jan 2007)
 
diff --git a/media-libs/xvid/files/digest-xvid-1.1.0-r3 b/media-libs/xvid/files/digest-xvid-1.1.0-r3
index 31b550c2ac6e..8dbdf25ff290 100644
--- a/media-libs/xvid/files/digest-xvid-1.1.0-r3
+++ b/media-libs/xvid/files/digest-xvid-1.1.0-r3
@@ -1,6 +1,6 @@
-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 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 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.2 b/media-libs/xvid/files/digest-xvid-1.1.2
index a4085a66f2f8..7b965d1e5250 100644
--- a/media-libs/xvid/files/digest-xvid-1.1.2
+++ b/media-libs/xvid/files/digest-xvid-1.1.2
@@ -1,6 +1,6 @@
-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 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 f748d835037fbe314a5fae8880c32f29 xvidcore-1.1.2.tar.bz2 626741
 RMD160 bc3dfbd176ece5f54bbd72f1e655eba4da9baeb4 xvidcore-1.1.2.tar.bz2 626741
 SHA256 def43b36cb0a5c1ad009237e9bb7d0ec0d5cc258c924c15b346c5627a53ed82d xvidcore-1.1.2.tar.bz2 626741
diff --git a/media-libs/xvid/xvid-1.1.0-r3.ebuild b/media-libs/xvid/xvid-1.1.0-r3.ebuild
index 5355b1412e7f..2d09a6fa0082 100644
--- a/media-libs/xvid/xvid-1.1.0-r3.ebuild
+++ b/media-libs/xvid/xvid-1.1.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.0-r3.ebuild,v 1.6 2006/12/03 19:51:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.0-r3.ebuild,v 1.7 2007/01/27 11:09:30 vapier Exp $
 
 WANT_AUTOMAKE="latest"
 inherit eutils fixheadtails autotools
@@ -9,7 +9,7 @@ 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.2-noexec-stack.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -27,7 +27,7 @@ src_unpack() {
 
 	cd "${WORKDIR}"/${MY_P}
 	epatch "${FILESDIR}/${PN}-1.1.0_beta2-altivec.patch"
-	epatch "${WORKDIR}/${PN}-1.1.0-noexec-stack.patch"
+	epatch "${WORKDIR}/${PN}-1.1.2-noexec-stack.patch"
 	epatch "${FILESDIR}/${P}-3dnow-2.patch"
 
 	cd ${S}
diff --git a/media-libs/xvid/xvid-1.1.2.ebuild b/media-libs/xvid/xvid-1.1.2.ebuild
index 73178b4a1893..7f55ec162eac 100644
--- a/media-libs/xvid/xvid-1.1.2.ebuild
+++ b/media-libs/xvid/xvid-1.1.2.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.2.ebuild,v 1.1 2007/01/24 22:16:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.2.ebuild,v 1.2 2007/01/27 11:09:30 vapier Exp $
 
 inherit eutils fixheadtails autotools
 
@@ -8,7 +8,7 @@ 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.2-noexec-stack.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -25,11 +25,11 @@ src_unpack() {
 	unpack ${A}
 
 	cd "${WORKDIR}"/${MY_P}
-	epatch "${FILESDIR}/${PN}-1.1.0_beta2-altivec.patch"
-	epatch "${WORKDIR}/${PN}-1.1.0-noexec-stack.patch"
-	epatch "${FILESDIR}/${PN}-1.1.0-3dnow-2.patch"
+	epatch "${FILESDIR}"/${PN}-1.1.0_beta2-altivec.patch
+	epatch "${WORKDIR}"/${PN}-1.1.2-noexec-stack.patch
+	epatch "${FILESDIR}"/${PN}-1.1.0-3dnow-2.patch
 
-	cd ${S}
+	cd "${S}"
 	eautoreconf
 }
 
@@ -39,7 +39,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 
 	cd "${S}"/../../
 	dodoc AUTHORS ChangeLog README TODO doc/*