summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-06-26 17:18:30 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-06-26 17:18:30 +0000
commit3bb0ed448e567d6a5bd812658fde8fa1f2220371 (patch)
tree31e17a5a1ff76177c957a53bd3bcc71411856705 /media-libs/xvid
parentupdate emul-linux blocker, bug #473838 (diff)
downloadhistorical-3bb0ed448e567d6a5bd812658fde8fa1f2220371.tar.gz
historical-3bb0ed448e567d6a5bd812658fde8fa1f2220371.tar.bz2
historical-3bb0ed448e567d6a5bd812658fde8fa1f2220371.zip
update emul-linux blocker, bug #473838
Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-libs/xvid')
-rw-r--r--media-libs/xvid/ChangeLog5
-rw-r--r--media-libs/xvid/Manifest10
-rw-r--r--media-libs/xvid/xvid-1.3.2-r1.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 6cc2455bb8f6..fad8b906956d 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/xvid
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.136 2013/06/19 15:55:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.137 2013/06/26 17:18:16 aballier Exp $
+
+ 26 Jun 2013; Alexis Ballier <aballier@gentoo.org> xvid-1.3.2-r1.ebuild:
+ update emul-linux blocker, bug #473838
19 Jun 2013; Alexis Ballier <aballier@gentoo.org> -xvid-1.2.2-r2.ebuild,
-xvid-1.3.1.ebuild, -files/xvid-1.2.2-noexecstack.patch:
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index d8529ac9e33c..7bf2b3380f9a 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -2,14 +2,14 @@
Hash: SHA256
DIST xvidcore-1.3.2.tar.bz2 697038 SHA256 d6c11334e1e771f9e4722eff454762325fd0989f6a4217abca296d6770160bf4 SHA512 0b7725314abc1dbe1f0ba4700393c391b8f98589300051ad7ebc5bdef7e87b20f19dcc88c37afbc1dfa117b6c8c1d5051b8f8d263c419e6965c5bc5f0201dc97 WHIRLPOOL c9e3f1a99544fe5b2394afc9adee3764565572b7b7fb46e2c92500d13851a8225b3e8b8e0db280a37aba72ff978e11a8c9f80d3a65b27f682087b1308f506dfa
-EBUILD xvid-1.3.2-r1.ebuild 1863 SHA256 d02f259bc261a9e4527bcd689cbe6e7413a441bf86da6ee1bc10b596ccd3ecc7 SHA512 47283e3e42823bddeefa091f6663d92253ab7823dac3ccd66ba81306a1fd73cf6f3b55a24dc10435873e67bcf6e9506df85e4dfc695d055ccefb1835d3ee5088 WHIRLPOOL 596f8a6168838751e8d1c58de4108574ff781017746417b04ce0723519c77c6417cf8e2570d2db17a95e73ed9b18c0f52ae847f24b1369a4a36a822535ba8c19
+EBUILD xvid-1.3.2-r1.ebuild 1868 SHA256 44394a027cff01cceead4d6f5c81c3df763657f9950665a65b876ac95279e917 SHA512 5b4ab31eab380300866e304d673cb80638616e8c7f0217f28037d91357c907648375abaaf9c924556e134c1022fd8bd466959301df0d48d8321c428f9c5f1d56 WHIRLPOOL e0421e0c5d247bf0231d5a6b04cca38c41b56fc23ca66566dbff495ad2dfac45b7ce48ba1dee419491c6c41a0557cb17059c208435f69abcb6c4ce89deb384d2
EBUILD xvid-1.3.2.ebuild 1407 SHA256 94d8f7fe834e9c510a1d8caa5e7b906b459324f880e8ced4abf162a3fc9ec046 SHA512 701ceff32fa0a811fec700ff2034078d04e0fd5a55107e27759d64c3f506dc2a687d64e3ff2f1efd68934ca4c0486595dbd54b358b58b7e30e4a3c72cd2e0db9 WHIRLPOOL 7f2195e71311cfd61976589debd6e7efaa1e78baa2dbfc90f92c5f5244f14540585ee3ccad96dccde8f00981fd8a9b8ecf50ad3e9c75463a7301d6ba6a0e3221
-MISC ChangeLog 17503 SHA256 5df614bdd480599cf446bbc9ae83507569a3281e0dc1a7a209dc4eaed715b32c SHA512 72a943bee495e595d64a48456c7d50f832c2ca7be648aa82936ee5a1c09eb0ea1d40ccd0b8ab856d491c0bf6926ac0948c0b81aa585dd64d4f6f9c4356594cf2 WHIRLPOOL d39309d6b8e76d8bbd10195844409165a0a6c3cd6a02ed65e5f01a811e1b3d69ef36717982fbd011792c86b5b839e004936e3d18aedece633f19a9d1a5a19d9f
+MISC ChangeLog 17619 SHA256 fab35316b3455d5497d6f05e7d2f6fe9b5690730d0ae92cdf27f1df30ac71a5a SHA512 c8a8a543b4defde786623a1a94e7730300191a0188e7c5b1a60992495f89d7b824c9d13f74f785d63b1d87a598f229a2fb6a338c83499cc3d0fbf724c4f2ea8d WHIRLPOOL 59c56214b8bd2c2b301b0f4920c62d06f566cc8340b24bfc4ede0039d8ffdb2ca0a1aeea79ae211c89ffec70ad313e1d48785959158a217feddb4be1ec89951a
MISC metadata.xml 326 SHA256 44f920b8335d7708c3208af6281abb98d71274f3400ed3538ca469c3846705c9 SHA512 56eb9fa6a5cebf28725a3b0023545cc5c7d1967f63b94358d30f69e08c1837c9129e761108200579f209b9743695999b45ab9c0301e190eadd59bbb17346c42e WHIRLPOOL de611ff8bb19c90f6810575bc79b83cd0116ab70715e7445364236e6ad78f1665fd7a5e33b3a84500b9bd45f853f809dcc98586494f57d743f6bec559ed1ae70
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iEYEAREIAAYFAlHB1GMACgkQvFcC4BYPU0r+ogCePT9iGApCKwIPjuJmUenbAWl6
-lEEAnRofMf0d8JF7Y5ZaHg8kyBsd9a0l
-=X1E4
+iEYEAREIAAYFAlHLIloACgkQvFcC4BYPU0r08QCeKQOl3ag9Yi7WU/d5TfdBFoAi
+Y7cAn0uojQQVibn6Rbeu71XL15BvohRx
+=tTbU
-----END PGP SIGNATURE-----
diff --git a/media-libs/xvid/xvid-1.3.2-r1.ebuild b/media-libs/xvid/xvid-1.3.2-r1.ebuild
index 05eeb14c4721..f2fd7af039ca 100644
--- a/media-libs/xvid/xvid-1.3.2-r1.ebuild
+++ b/media-libs/xvid/xvid-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.3.2-r1.ebuild,v 1.1 2013/06/19 15:51:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.3.2-r1.ebuild,v 1.2 2013/06/26 17:18:16 aballier Exp $
EAPI=5
inherit flag-o-matic multilib multilib-minimal
@@ -23,7 +23,7 @@ YASM=">=dev-lang/yasm-1"
DEPEND="amd64? ( || ( ${YASM} ${NASM} ) )
x86? ( || ( ${YASM} ${NASM} ) )
x86-fbsd? ( || ( ${YASM} ${NASM} ) )"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224 )"
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
S=${WORKDIR}/${MY_PN}/build/generic