Modular-X fixes.

(Portage version: 2.1_pre4)

4 files changed, 36 insertions, 18 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index b0fcbec12342..d235847e888c 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libdc1394
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.12 2005/10/19 18:38:02 seemant Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.13 2006/01/29 08:02:28 robbat2 Exp $
+
+  29 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
+  libdc1394-2.0.0_pre5.ebuild:
+  Modular-X fixes.
 
 *libdc1394-2.0.0_pre5 (19 Oct 2005)
 
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index 582337cfb080..9258e677fa02 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,20 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bbfbe9579924faeb5e2782864cfae4ac ChangeLog 3663
+RMD160 59caef27de93465773b6547c628176d2f46c197f ChangeLog 3663
+SHA256 cdfb4e108b06f975da7a41814e3b8d4e3a6e1bb77f881947db0056910e31c53d ChangeLog 3663
 MD5 4fc355449f1b06ba0387efc3c70d6249 files/digest-libdc1394-1.0.0 67
+RMD160 97eb13f4b092e64ffa090d0d294d048fa41f8417 files/digest-libdc1394-1.0.0 67
+SHA256 a8e88897c0c0ef42db83d100cc7162f801a680f72fba2c6ae663e8370f09072e files/digest-libdc1394-1.0.0 67
 MD5 d24f1e449aa173fce2d9f93ae627131d files/digest-libdc1394-2.0.0_pre4 155
-MD5 87e72b75097bb65b788b525a95bb2341 files/digest-libdc1394-2.0.0_pre5 72
+RMD160 80dfe71517faeebc6c669c617ec7459051ab5140 files/digest-libdc1394-2.0.0_pre4 155
+SHA256 c598e05c6890dbf15010731d7da40f7e24be26227305fd0ce7be63b8dcc53971 files/digest-libdc1394-2.0.0_pre4 155
+MD5 cd66fb3acf276ebb4ea4d625dc1b1548 files/digest-libdc1394-2.0.0_pre5 262
+RMD160 068a75726baef6f610461c0939596b2cba0a94c0 files/digest-libdc1394-2.0.0_pre5 262
+SHA256 c28f14a853cdaa2306f57e033df5e288a6dacab5e09d2208eb41cebab6320072 files/digest-libdc1394-2.0.0_pre5 262
 MD5 878ff31cebe2ccca989bb8e60ef5e0b6 files/nox11-2.patch 3221
+RMD160 dcca897e8f8417f6b063b52a7e2b9f8c5907790c files/nox11-2.patch 3221
+SHA256 a4b901e465cbd4aa900419b4364780dfa2ec736401dd3aec73a52ea5b1272d89 files/nox11-2.patch 3221
 MD5 5b920f2f9f6db3d25002af5bddf73e1b files/nox11.patch 2194
+RMD160 31b0f39359d51433ce130b8fc7e008260a854509 files/nox11.patch 2194
+SHA256 bfc53f3d505e76ad9bf149d90a3f48a2154fb179c38b200feaae520d1075c404 files/nox11.patch 2194
 MD5 b2b2f6953de74208b537cecd72a9a1e5 libdc1394-1.0.0.ebuild 941
+RMD160 ffe4fc69b1eb7fc01ebe14c2d65a4ad3bd0336c7 libdc1394-1.0.0.ebuild 941
+SHA256 7de235a1b6b0bfa8a923bd66cecaede7d0fad71673087c63a554dbedfe718cc8 libdc1394-1.0.0.ebuild 941
 MD5 fb2bb4bf3161139499760b7e2c98e2cc libdc1394-2.0.0_pre4.ebuild 1157
-MD5 9c91b5b010ee778a18e42bac424788d1 libdc1394-2.0.0_pre5.ebuild 835
+RMD160 435b9cce55f64e025fda98007e72c3822c0efd94 libdc1394-2.0.0_pre4.ebuild 1157
+SHA256 db4f5ced59e2391500866e0664f7d1a10e6e10c4119fdac7bacfd0602b8ee259 libdc1394-2.0.0_pre4.ebuild 1157
+MD5 70d44297d9243957643b50f5c1341cba libdc1394-2.0.0_pre5.ebuild 905
+RMD160 eaa229d179bab71afaab7627dc0de647d8530f11 libdc1394-2.0.0_pre5.ebuild 905
+SHA256 f4f0a0e589dc88b0e8c5f0651038decbf2cc3bd54043cf25bd661a30f78bd797 libdc1394-2.0.0_pre5.ebuild 905
 MD5 8c508b7fe8782ef51c759979f02e6110 metadata.xml 254
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD0B6i2+ySkm8kpY0RAsp6AKDFsNKlVSaQITd972ap0viVCfo5vQCgwOFN
-SOIUTWt7cx7lODC2eM8dRcw=
-=bLa5
------END PGP SIGNATURE-----
+RMD160 e443fb2011869d9fa797e4d71e336cac9b91a57c metadata.xml 254
+SHA256 10f669506638ebd14d588da05f936dd27b3ffcc7a69e6063cbd77f6439edea0c metadata.xml 254
diff --git a/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre5 b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre5
index d7ddce471378..57abc46a6194 100644
--- a/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre5
+++ b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre5
@@ -1 +1,3 @@
 MD5 078cbe32c77dbf7d3943d09e7516816d libdc1394-2.0.0-pre5.tar.gz 368917
+RMD160 1b692acbc1fe402c2d07b5e132c35e0a9ea3653a libdc1394-2.0.0-pre5.tar.gz 368917
+SHA256 02bb1ed4e299a1a7a32487e8c7285f0e91fafb2acb700905a96ca57b7751af0a libdc1394-2.0.0-pre5.tar.gz 368917
diff --git a/media-libs/libdc1394/libdc1394-2.0.0_pre5.ebuild b/media-libs/libdc1394/libdc1394-2.0.0_pre5.ebuild
index b88a5773a463..3ee57463a610 100644
--- a/media-libs/libdc1394/libdc1394-2.0.0_pre5.ebuild
+++ b/media-libs/libdc1394/libdc1394-2.0.0_pre5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_pre5.ebuild,v 1.2 2006/01/19 23:17:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.0.0_pre5.ebuild,v 1.3 2006/01/29 08:02:28 robbat2 Exp $
 
 inherit eutils
 
@@ -16,9 +16,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="X"
 
-DEPEND=">=sys-libs/libraw1394-0.9.0
-	sys-devel/libtool
-	X? ( virtual/x11 )"
+RDEPEND=">=sys-libs/libraw1394-0.9.0
+		X? ( || ( ( x11-libs/libSM x11-libs/libXv )
+				  virtual/x11 ) )"
+DEPEND="${RDEPEND}
+		sys-devel/libtool"
 
 src_unpack() {
 	unpack ${A}