Added modular X dependencies (bug #121011, Moshe Kaminsky).

Package-Manager: portage-2.1_pre4-r1

3 files changed, 30 insertions, 6 deletions

diff --git a/media-video/mpeg-tools/ChangeLog b/media-video/mpeg-tools/ChangeLog
index b1655658257e..0f1407861c71 100644
--- a/media-video/mpeg-tools/ChangeLog
+++ b/media-video/mpeg-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mpeg-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.14 2006/01/21 07:14:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/ChangeLog,v 1.15 2006/02/11 16:12:55 joshuabaergen Exp $
+
+  11 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  mpeg-tools-1.5b-r2.ebuild:
+  Added modular X dependencies (bug #121011, Moshe Kaminsky).
 
   21 Jan 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -files/1.5b/mpeg-tools-1.5b-fix-exit-call.patch, -files/1.5b/libpnmrw.c,
diff --git a/media-video/mpeg-tools/Manifest b/media-video/mpeg-tools/Manifest
index d9c05e5ddae7..62cd5482690b 100644
--- a/media-video/mpeg-tools/Manifest
+++ b/media-video/mpeg-tools/Manifest
@@ -1,10 +1,30 @@
-MD5 d2a839b57bc8e3516b8eacdfa49974fb ChangeLog 2462
+MD5 3427c0683c5525305de120417bf025ec ChangeLog 2615
+RMD160 b8ea53218a55aca08dfe8600ad621a8d42021cc3 ChangeLog 2615
+SHA256 175acb76f5b1e7ba1a908948faa835f213e6a9f7c7aa9fe344a699930b6051b5 ChangeLog 2615
 MD5 bf748902484902bcc7eb4e616a8d04dd files/digest-mpeg-tools-1.5b-r2 73
+RMD160 82eeef5105b93081d2dc2dbd938fc2cbab1f69a7 files/digest-mpeg-tools-1.5b-r2 73
+SHA256 803c0820faa4dce8805f80a206ce6f069109950a458de97adb7ec484a6a6533b files/digest-mpeg-tools-1.5b-r2 73
 MD5 411d4b0fde7b753d3ff9008eb9eaefcc files/mpeg-tools-1.5b-64bit_fixes.patch 6986
+RMD160 7bfb2fdaf89846043d95074a5226c77f0f9ef98b files/mpeg-tools-1.5b-64bit_fixes.patch 6986
+SHA256 76e8add6d8241898abf20c27ff93655df05ee90866632a0eb852ff6665078d4e files/mpeg-tools-1.5b-64bit_fixes.patch 6986
 MD5 44b911d91abb56f60d64cc8b07074b11 files/mpeg-tools-1.5b-build.patch 1414
+RMD160 987151e4c0c30097c7bc993552dd7459686fba5b files/mpeg-tools-1.5b-build.patch 1414
+SHA256 0cbcc0e0de74f02b069059588334ba0766bf74769fdd63d37c1702d2e47eb1e5 files/mpeg-tools-1.5b-build.patch 1414
 MD5 0971aef5099bdb3d5c9a962c308a1d43 files/mpeg-tools-1.5b-system-jpeg.patch 893
+RMD160 e32d6e6f0d355085f1781eef5b0569940fbd274e files/mpeg-tools-1.5b-system-jpeg.patch 893
+SHA256 f0e9f99bf42c12b91cebb0e17c1a8567629d522b269e11c2adc6fffaed43afa8 files/mpeg-tools-1.5b-system-jpeg.patch 893
 MD5 20a27f243e783c15b17079c112876d10 files/mpeg-tools-1.5b-tempfile-convert.patch 4097
+RMD160 3e37f83093c2d09051b4fc131cc0b8b91e7351cf files/mpeg-tools-1.5b-tempfile-convert.patch 4097
+SHA256 a8f67272493e7bd6536e020b75bcf2174a7ae1f453dc0bd3b09f134ed3f1a649 files/mpeg-tools-1.5b-tempfile-convert.patch 4097
 MD5 ac3d41c507a2fc1b1cfcf8ca91e1e983 files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538
+RMD160 3bc3e29da8cdd4d05de50cf073c6b6ea0e7417c6 files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538
+SHA256 2325ccdc43bce07d38522250c488f21db8010c7e5f27b244b107d05882e4a17b files/mpeg-tools-1.5b-tempfile-mpeg-encode.patch 2538
 MD5 f7cc407da44caa2318d26dab75f3459a files/mpeg-tools-1.5b-tempfile-tests.patch 5256
+RMD160 e292bfec28bb13bf35ec40e4f86702ff086dbc72 files/mpeg-tools-1.5b-tempfile-tests.patch 5256
+SHA256 ba156158d92dc6f3803b40ad3b0e8e248b0e74c5b59415a91f55c1e775a6e5a4 files/mpeg-tools-1.5b-tempfile-tests.patch 5256
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 fe2b153c4f7fa1e923db108b7ca18c85 mpeg-tools-1.5b-r2.ebuild 1644
+RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
+SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata.xml 225
+MD5 76a59a3ed5cbeceb62d532fedccb4c71 mpeg-tools-1.5b-r2.ebuild 1674
+RMD160 34ebf7633b871beb407b540bc5d9788a754ef4a3 mpeg-tools-1.5b-r2.ebuild 1674
+SHA256 73ded43d3421f2aa13092998fe3f9c98b16928c454c4db7dca1502befe0e575a mpeg-tools-1.5b-r2.ebuild 1674
diff --git a/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild b/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild
index 3f66f6672496..cf6634a3496d 100644
--- a/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild
+++ b/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild,v 1.4 2005/10/26 03:51:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-tools/mpeg-tools-1.5b-r2.ebuild,v 1.5 2006/02/11 16:12:55 joshuabaergen Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="virtual/x11
+DEPEND="|| ( x11-libs/libX11 virtual/x11 )
 	media-libs/jpeg"
 
 S=${WORKDIR}/${MY_PN}