diff options
author | Travis Tilley <lv@gentoo.org> | 2004-07-26 04:04:52 +0000 |
---|---|---|
committer | Travis Tilley <lv@gentoo.org> | 2004-07-26 04:04:52 +0000 |
commit | 35232addbb923a47b3e762502881b2a65353d103 (patch) | |
tree | 603584b5ab20bfacebbc106ee2464504e7ed7a4b /media-video/mpeg4ip | |
parent | Fixed Manifest. (diff) | |
download | historical-35232addbb923a47b3e762502881b2a65353d103.tar.gz historical-35232addbb923a47b3e762502881b2a65353d103.tar.bz2 historical-35232addbb923a47b3e762502881b2a65353d103.zip |
removed invalid blocker that prevents faad2 from being installed when mpeg4ip is also installed
Diffstat (limited to 'media-video/mpeg4ip')
-rw-r--r-- | media-video/mpeg4ip/ChangeLog | 6 | ||||
-rw-r--r-- | media-video/mpeg4ip/Manifest | 6 | ||||
-rw-r--r-- | media-video/mpeg4ip/mpeg4ip-1.1.ebuild | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog index df8ae70e8247..32cc7823a173 100644 --- a/media-video/mpeg4ip/ChangeLog +++ b/media-video/mpeg4ip/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mpeg4ip # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.12 2004/06/30 01:05:49 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.13 2004/07/26 04:04:52 lv Exp $ + + 26 Jul 2004; Travis Tilley <lv@gentoo.org> mpeg4ip-1.1.ebuild: + removed invalid blocker that prevents faad2 from being installed when mpeg4ip + is also installed 29 Jun 2004; <tester@gentoo.org> mpeg4ip-1.0.ebuild, mpeg4ip-1.1.ebuild: Removed superfluous S= and marked 1.1 stable on x86 diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest index a02fbe6b4396..fcbbe5521257 100644 --- a/media-video/mpeg4ip/Manifest +++ b/media-video/mpeg4ip/Manifest @@ -1,6 +1,6 @@ MD5 d3901fe672ba3d47273a123d16228c72 mpeg4ip-1.0.ebuild 2205 -MD5 e2768ce9c5264b0862ac0419074f1d69 ChangeLog 2268 +MD5 2773c4cf5f3bce4ccc59940dacc01247 ChangeLog 2430 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255 -MD5 48f6eff64766e9a42cd9115516e795c3 mpeg4ip-1.1.ebuild 1521 -MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64 +MD5 2c2aa2b52a6956cc97cf77c7befcac58 mpeg4ip-1.1.ebuild 1498 MD5 a00452dc115e6e8ddb761e17ccfb0a5a files/digest-mpeg4ip-1.0 64 +MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64 diff --git a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild index 2accd3ee7dc5..5bc6673735e9 100644 --- a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild +++ b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.6 2004/06/30 01:05:49 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.7 2004/07/26 04:04:52 lv Exp $ DESCRIPTION="MPEG 4 implementation library" @@ -27,8 +27,7 @@ RDEPEND="sys-devel/libtool nas? ( media-libs/nas virtual/x11 ) alsa? ( media-libs/alsa-lib ) arts? ( kde-base/arts ) - esd? ( media-sound/esound ) - !media-libs/faad2" + esd? ( media-sound/esound )" DEPENDS="${RDEPEND} x86? ( mmx? ( >=dev-lang/nasm-0.98.19 ) )" |