From 3d647f92a15be38a44960db839117f0d4c769168 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 21 Feb 2007 03:44:39 +0000 Subject: [PATCH] Force just yasm for now #165682 ... it's better than nasm anyways. Package-Manager: portage-2.1.2-r10 --- media-libs/xvid/ChangeLog | 5 ++++- media-libs/xvid/Manifest | 26 ++++++++++++++++++-------- media-libs/xvid/xvid-1.1.2.ebuild | 10 +++++++--- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog index 1a9567c1ad63..1cac1002090b 100644 --- a/media-libs/xvid/ChangeLog +++ b/media-libs/xvid/ChangeLog @@ -1,6 +1,9 @@ # 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.83 2007/02/03 13:53:42 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.84 2007/02/21 03:44:39 vapier Exp $ + + 21 Feb 2007; Mike Frysinger xvid-1.1.2.ebuild: + Force just yasm for now #165682 ... it's better than nasm anyways. 03 Feb 2007; Simon Stelling xvid-1.1.2.ebuild: depend on yasm-0.5; bug 154369 diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest index 8559e526e179..1d506106d8d3 100644 --- a/media-libs/xvid/Manifest +++ b/media-libs/xvid/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 1.0.2-DESTDIR.patch 1450 RMD160 4812c2444247b8306d1ad0874ab45762ac898093 SHA1 71d1e00c431a8dd1840cfc067504a51beec6bdef SHA256 5aa2571d3e5053d15a9efa21a71ff8a851df6afb7dee73bb1075696346159e83 MD5 8c100445a64d960693db8424931ff0eb files/1.0.2-DESTDIR.patch 1450 RMD160 4812c2444247b8306d1ad0874ab45762ac898093 files/1.0.2-DESTDIR.patch 1450 @@ -53,14 +56,14 @@ EBUILD xvid-1.1.0.ebuild 1601 RMD160 f356e6cb25c1efa9406840ceead8ac1fb395ec0f SH 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 1669 RMD160 3bcd47d16ecdcc3158b5b33ed5807e41d64221cb SHA1 49bf04ccd45c4b71b7f4298e2ead4f012a2c83fb SHA256 167f724a7b8977c0cfc0ab514ae85726595e781a65c42c9dc229f62396977d0f -MD5 40281f430cf61c62752a55e37091c138 xvid-1.1.2.ebuild 1669 -RMD160 3bcd47d16ecdcc3158b5b33ed5807e41d64221cb xvid-1.1.2.ebuild 1669 -SHA256 167f724a7b8977c0cfc0ab514ae85726595e781a65c42c9dc229f62396977d0f xvid-1.1.2.ebuild 1669 -MISC ChangeLog 10625 RMD160 e60b4e80e94a9d67f7e4f56663e44a174557a252 SHA1 277ff103e7094a354f0ca51e128ab31a0e6e6f44 SHA256 07f07e94d0ddeaddbe0a2322df4529841da96ccd0dd02bb02142d7a1240d4d00 -MD5 7145558be2266a2d8a1862031f80de50 ChangeLog 10625 -RMD160 e60b4e80e94a9d67f7e4f56663e44a174557a252 ChangeLog 10625 -SHA256 07f07e94d0ddeaddbe0a2322df4529841da96ccd0dd02bb02142d7a1240d4d00 ChangeLog 10625 +EBUILD xvid-1.1.2.ebuild 1825 RMD160 59e25d9a7ff7f3215d2a93728124ab1f2fecad49 SHA1 93bffb3c2f049018cd43b251722606b5d3e26b84 SHA256 0f7da201eee4bfa007b4aa34d99d6797f0a9d39f8ef67a396681b210f9fd2941 +MD5 f572771d77b7af556ebf26eb2c88a761 xvid-1.1.2.ebuild 1825 +RMD160 59e25d9a7ff7f3215d2a93728124ab1f2fecad49 xvid-1.1.2.ebuild 1825 +SHA256 0f7da201eee4bfa007b4aa34d99d6797f0a9d39f8ef67a396681b210f9fd2941 xvid-1.1.2.ebuild 1825 +MISC ChangeLog 10765 RMD160 6a669745f03275859d0654341c038e2d232794fc SHA1 f3d6f1bbff8c659e38719ff47fbe1f2d2ddbb686 SHA256 3eec660fbd14298e5394b1daa4f623ad52225277bfe7362c4ad5de5bc3462467 +MD5 c4bff0ca13448154da59b8f1281c5d91 ChangeLog 10765 +RMD160 6a669745f03275859d0654341c038e2d232794fc ChangeLog 10765 +SHA256 3eec660fbd14298e5394b1daa4f623ad52225277bfe7362c4ad5de5bc3462467 ChangeLog 10765 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225 @@ -86,3 +89,10 @@ SHA256 8ec504a3d639a9a000280899ca4efba3e9426ba35a04a17a39408902e87f8c8b files/di 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.2 (GNU/Linux) + +iD8DBQFF28Bk8bi6rjpTunYRAhiNAKC2UuK1KBkjWRKk9zOUMiJruNkZBwCeLG2a +XCkwuAYOTgrV0kkxxE3wo7U= +=Dpau +-----END PGP SIGNATURE----- diff --git a/media-libs/xvid/xvid-1.1.2.ebuild b/media-libs/xvid/xvid-1.1.2.ebuild index 4276950d91de..33a70f4217b9 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.3 2007/02/03 13:53:42 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.1.2.ebuild,v 1.4 2007/02/21 03:44:39 vapier Exp $ inherit eutils fixheadtails autotools @@ -15,8 +15,12 @@ SLOT="1" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="doc altivec" -DEPEND="x86? ( >=dev-lang/nasm-0.98.36 ) - amd64? ( >=dev-lang/yasm-0.5.0 )" +# once yasm-0.6.0+ comes out, we can switch this to +# dev-lang/nasm >=dev-lang/yasm-0.6.0 +# and then drop the quotes from section in the noexec-stack.patch +NASM=">=dev-lang/yasm-0.5.0" +DEPEND="x86? ( ${NASM} ) + amd64? ( ${NASM} )" RDEPEND="" S=${WORKDIR}/${MY_P}/build/generic -- 2.26.2