diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-06-26 17:18:16 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-06-26 17:18:16 +0000 |
| commit | fae2a291707d169a1876d1b304f8aa8b447dae92 (patch) | |
| tree | a726843f2e813acb1ab6a75471fca6fed361c587 /media-libs/xvid | |
| parent | update emul-linux blocker, bug #473838 (diff) | |
| download | gentoo-2-fae2a291707d169a1876d1b304f8aa8b447dae92.tar.gz gentoo-2-fae2a291707d169a1876d1b304f8aa8b447dae92.tar.bz2 gentoo-2-fae2a291707d169a1876d1b304f8aa8b447dae92.zip | |
update emul-linux blocker, bug #473838
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-libs/xvid')
| -rw-r--r-- | media-libs/xvid/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/xvid/xvid-1.3.2-r1.ebuild | 4 |
2 files changed, 6 insertions, 3 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/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 |