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

Package-Manager: portage-2.1.2-r4

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index ae2a2ee386693edaa70346a52d6f79e20fdf0819..448c96ba9628a2fc35d1b0d8e08c70ae7cb5ee67 100644 (file)
--- 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/Manifest b/media-libs/xvid/Manifest
index ea094655aeeedeea3871cbcc27072bcd70f9f6a3..64d39ef0bbe1f08eff596bd0d7c135ae7470d69d 100644 (file)
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -27,6 +27,7 @@ RMD160 316da7461c58ddabec7d2907431fbb9675cea322 files/xvid-1.1.0_beta2-altivec.p
 SHA256 5644023118344e577e7af0188161899bf5e91de92f864666066dc79e007f991d files/xvid-1.1.0_beta2-altivec.patch 1070
 DIST xvid-1.1.0-noexec-stack.patch.bz2 3443 RMD160 3da4597854b67975e424614ac403397fa566f2d1 SHA1 41eba0bcda09741773dace31a4321005f6e35445 SHA256 d63027784787b418947d969513621711a94fba847d51e7b1b4ac7c50ba14511e
 DIST xvid-1.1.0-textrel-2.patch.bz2 24494 RMD160 5ba4a367fa6ece1de693100112fe2d328c0ae3bb SHA1 0f23b4e4333030ee5c370483a475b749aff7018a SHA256 32ea754d71ac82461cd3fdc9a0f5eacbf8e0d0b3441e9e602baa2cacb9861440
+DIST xvid-1.1.2-noexec-stack.patch.bz2 2426 RMD160 083da9ab8e4fdcd067cd2970eeb7ad634894219f SHA1 0f5e9e15e96c6c2a1a6d7bea67e8abd5b41442fa SHA256 6de38a05303e02a2524e3f0093a3e0b021bba93d0889c2b97a05a29ba21efffa
 DIST xvidcore-1.0.2.tar.bz2 541407 RMD160 373cd9da39ffe250e8a536a2f7e2f7724c0794c9 SHA1 843c6d9d20a6525331726d5357f5032fcd62b4de SHA256 0fe361f203ff37dfab556a82e1004237a7de513b5333fe3cacdf1cdcaaf57546
 DIST xvidcore-1.0.3.tar.bz2 541841 RMD160 96e4d46f617ebb802c2a6cacbf64502356a70741 SHA1 4b7de410e55c318cb68a829bb7e3619cbf40a1cf SHA256 dbe805e16caaf9e3a781619d03feb9b032603b21f626beda80f98383ac1dfd94
 DIST xvidcore-1.1.0.tar.bz2 612101 RMD160 582927437970cf81534b9ed4f02173201e10f47b SHA1 f3ffc21529ab7941e423df7365de22c391d2eaeb SHA256 bde8cdf8fd490e91b75f98128fd3718b2c570e7cc8f6b83e71896dbbca135e3c
@@ -47,22 +48,22 @@ EBUILD xvid-1.1.0-r2.ebuild 1745 RMD160 9814485b410000e18a8cc19accca7a46e853ce3c
 MD5 5971fb3e5ff171405df85e58c8ef9104 xvid-1.1.0-r2.ebuild 1745
 RMD160 9814485b410000e18a8cc19accca7a46e853ce3c xvid-1.1.0-r2.ebuild 1745
 SHA256 fdedeafe1254e04bb39a33f5f9dd53ce4e17330efe3cf229656366f4338edbc6 xvid-1.1.0-r2.ebuild 1745
-EBUILD xvid-1.1.0-r3.ebuild 1675 RMD160 939dc16aacab9a7dfb45e99671b162d60329ced6 SHA1 c83fa1b4991a393c1c773365caa255c503d05646 SHA256 1335b21b2cb957196b94bf4cc455f5d2a5106e811047e43befc5ecba4adda789
-MD5 6e29a05c742990bd97a908d95f046826 xvid-1.1.0-r3.ebuild 1675
-RMD160 939dc16aacab9a7dfb45e99671b162d60329ced6 xvid-1.1.0-r3.ebuild 1675
-SHA256 1335b21b2cb957196b94bf4cc455f5d2a5106e811047e43befc5ecba4adda789 xvid-1.1.0-r3.ebuild 1675
+EBUILD xvid-1.1.0-r3.ebuild 1674 RMD160 40b815866fa5f98e721e18c92bcfa1dcff6bcb1a SHA1 c9fb92cd143cd1d46078b35c1e6852a6efd1035c SHA256 c4e1887b87da320ee816ac0f7ef6b7c7e3c7e2164bceeaf663b6e4aa0e2cead8
+MD5 22bebe1e1d55067652b580eccec08441 xvid-1.1.0-r3.ebuild 1674
+RMD160 40b815866fa5f98e721e18c92bcfa1dcff6bcb1a xvid-1.1.0-r3.ebuild 1674
+SHA256 c4e1887b87da320ee816ac0f7ef6b7c7e3c7e2164bceeaf663b6e4aa0e2cead8 xvid-1.1.0-r3.ebuild 1674
 EBUILD xvid-1.1.0.ebuild 1601 RMD160 f356e6cb25c1efa9406840ceead8ac1fb395ec0f SHA1 f1d134f7749815d2664be87c235ea703890191b2 SHA256 0ca29d2b3e03b4b2f79c82030a1f532d1e94add8eedbaf15dd74c900c847b1e2
 MD5 01be81ecfee18e03edf81918793be35e xvid-1.1.0.ebuild 1601
 RMD160 f356e6cb25c1efa9406840ceead8ac1fb395ec0f xvid-1.1.0.ebuild 1601
 SHA256 0ca29d2b3e03b4b2f79c82030a1f532d1e94add8eedbaf15dd74c900c847b1e2 xvid-1.1.0.ebuild 1601
-EBUILD xvid-1.1.2.ebuild 1661 RMD160 10a7db17df326d22ae6a7757e3e5bdf5f14b4ef8 SHA1 389d70f133eb22e6fef5b4167c7cd8c3fb3c0699 SHA256 d02aa8c0cce1b20a08dee252c3ac55dff8588e14d0b07ee9b40d013ca311ac32
-MD5 3f6bf463a65eda3291c3a266dfffabc0 xvid-1.1.2.ebuild 1661
-RMD160 10a7db17df326d22ae6a7757e3e5bdf5f14b4ef8 xvid-1.1.2.ebuild 1661
-SHA256 d02aa8c0cce1b20a08dee252c3ac55dff8588e14d0b07ee9b40d013ca311ac32 xvid-1.1.2.ebuild 1661
-MISC ChangeLog 10258 RMD160 32a0cc4dd85842f3d3dfab8b4d16b2d638f23504 SHA1 0571eb2c56a2a466e54c7a95ca59bc3d94145c2b SHA256 de3cb2a0ab412d2f9a7488f93c8ce23db88ad1170e908d0b767837801059a8be
-MD5 44f76940d94a7da16df4c1f6d8515d82 ChangeLog 10258
-RMD160 32a0cc4dd85842f3d3dfab8b4d16b2d638f23504 ChangeLog 10258
-SHA256 de3cb2a0ab412d2f9a7488f93c8ce23db88ad1170e908d0b767837801059a8be ChangeLog 10258
+EBUILD xvid-1.1.2.ebuild 1662 RMD160 905340b7391dc64178ed1bc32468678fc28fd030 SHA1 6c72075ee170c38625f8891bf099002a86ec7abb SHA256 de0a7c3cfab84c5b7637f7ccea601480384fed6949b441c7cfe579c52b0a0c0f
+MD5 27eb3849085a388d50e855fa74072c4d xvid-1.1.2.ebuild 1662
+RMD160 905340b7391dc64178ed1bc32468678fc28fd030 xvid-1.1.2.ebuild 1662
+SHA256 de0a7c3cfab84c5b7637f7ccea601480384fed6949b441c7cfe579c52b0a0c0f xvid-1.1.2.ebuild 1662
+MISC ChangeLog 10422 RMD160 74dcd039a2f54b4089ead4de65fca7d4aea11467 SHA1 84a915415697bb6bb9e5ebab77e331d2c2d22c03 SHA256 c9cb53527d2b11cd8f547b8f479e7a7325fead4efdeadc10b0a1d893ecc9f799
+MD5 0b2998674d6094cc33cc8f21e14ef78f ChangeLog 10422
+RMD160 74dcd039a2f54b4089ead4de65fca7d4aea11467 ChangeLog 10422
+SHA256 c9cb53527d2b11cd8f547b8f479e7a7325fead4efdeadc10b0a1d893ecc9f799 ChangeLog 10422
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -82,16 +83,16 @@ SHA256 06d6cf1d481f2181faf3de3baae5cee1a73810288614cf54209404ae8287d021 files/di
 MD5 72d5ac6407edb7c072a50ad5fa8fe610 files/digest-xvid-1.1.0-r2 789
 RMD160 06f53882da57b698c9bcc2bc3550dbee170d58a0 files/digest-xvid-1.1.0-r2 789
 SHA256 06d6cf1d481f2181faf3de3baae5cee1a73810288614cf54209404ae8287d021 files/digest-xvid-1.1.0-r2 789
-MD5 1f38af1f2eb1d1974aef412e1b027d4b files/digest-xvid-1.1.0-r3 521
-RMD160 df64668c49d9194c5c53e624fbafa44e73fb825c files/digest-xvid-1.1.0-r3 521
-SHA256 f52b1defaca15b9c73c241248ff11af3629914ed9c5c2bf4d73ebc38d4f479ed files/digest-xvid-1.1.0-r3 521
-MD5 80d6d4b0dfc6c634af4688c19ba86e76 files/digest-xvid-1.1.2 521
-RMD160 2ff69b484a575d240e97a341b3df681599d8216d files/digest-xvid-1.1.2 521
-SHA256 e0c5da3829ad41eb162acc0411c59dc49cb955d45ab586fdb257e30a771b6ea9 files/digest-xvid-1.1.2 521
+MD5 ce8d426ff1502da1b8b531c458fa0b0f files/digest-xvid-1.1.0-r3 521
+RMD160 d7ce141e703dcc384c2937681c5c5429e5d2d84c files/digest-xvid-1.1.0-r3 521
+SHA256 8ec504a3d639a9a000280899ca4efba3e9426ba35a04a17a39408902e87f8c8b files/digest-xvid-1.1.0-r3 521
+MD5 26d1450c4e4a1c36542bdf5d5cdcc34d files/digest-xvid-1.1.2 521
+RMD160 fb56e445472a9e1cf183ed01453cdb8e5838ad61 files/digest-xvid-1.1.2 521
+SHA256 8a8687cb17d15ffe62ec2549d8ae08b23e08841e606c6abc4a05f99d831edfec files/digest-xvid-1.1.2 521
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFt9rBvFcC4BYPU0oRAsmIAKC68f3lVjORde78hbFk1BzX44AEiQCfQSOk
-EIPpbrllF4q6TsD1HTvet1M=
-=U5IV
+iD8DBQFFuzMc8bi6rjpTunYRAr2JAJ4sOsiL1SGHXIvL5fcpjvFibqZNowCfbWne
+xmJgMRWvxwI5EnVE87h1Kqg=
+=kcke
 -----END PGP SIGNATURE-----

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 31b550c2ac6edaf240ab9d2ce6f8119bc0756cfc..8dbdf25ff290aca4b57d8cbafa26fd587d4c42c4 100644 (file)
--- 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 a4085a66f2f833e41349da18ed31c55aca3997dd..7b965d1e5250478cce5ef740d33bbbe03c90e6a3 100644 (file)
--- 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 5355b1412e7fe49fde52e44836d627418aa51b0e..2d09a6fa0082b5caff5902fd49116dc0ec661ef7 100644 (file)
--- 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 73178b4a18938dc8199928e317d7244135bd697f..7f55ec162eac99a5c7944a05045fb0d82f09623b 100644 (file)
--- 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/*