Fix 1.0.0 for modular-x as well.

(Portage version: 2.1_pre4)

4 files changed, 22 insertions, 15 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index d235847e888c..a65823bc1073 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libdc1394
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.14 2006/01/29 08:10:21 robbat2 Exp $
+
+  29 Jan 2006; Robin H. Johnson <robbat2@gentoo.org> libdc1394-1.0.0.ebuild:
+  Fix 1.0.0 for modular-x as well.
 
   29 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
   libdc1394-2.0.0_pre5.ebuild:
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index fc6dacd6e6b3..e26acabf5361 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,9 +1,9 @@
-MD5 74caed29e32488247124f027a128226a ChangeLog 3767
-RMD160 e640036b6319f59be45c3b3cd1ab0c8f5c979cad ChangeLog 3767
-SHA256 dd8e94e7417936baad46ba4bec954831924cabf47a62fac982569765d07ac8e3 ChangeLog 3767
-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 17077e4c2111c8e9c147438af6b48690 ChangeLog 3880
+RMD160 a6c8b63b8e0e5fb42482e899b1aefde3df342a48 ChangeLog 3880
+SHA256 6e3e14e1ccb157d9c295bf90c7e1782b52794292e3da206473bb26ff06441038 ChangeLog 3880
+MD5 4dc3c8ed8159eaa65e146db1bafdd4e1 files/digest-libdc1394-1.0.0 247
+RMD160 c9d5003f5f9fd0e018a11670fbd43c07886e7bc5 files/digest-libdc1394-1.0.0 247
+SHA256 df91ff7ccd095fdde4f05b4dd04565966d8b9aa91d1e34cdad5f59368c97952e files/digest-libdc1394-1.0.0 247
 MD5 d24f1e449aa173fce2d9f93ae627131d files/digest-libdc1394-2.0.0_pre4 155
 RMD160 80dfe71517faeebc6c669c617ec7459051ab5140 files/digest-libdc1394-2.0.0_pre4 155
 SHA256 c598e05c6890dbf15010731d7da40f7e24be26227305fd0ce7be63b8dcc53971 files/digest-libdc1394-2.0.0_pre4 155
@@ -16,9 +16,9 @@ SHA256 a4b901e465cbd4aa900419b4364780dfa2ec736401dd3aec73a52ea5b1272d89 files/no
 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 72db7348155a2294e99d8b65d56b1bd4 libdc1394-1.0.0.ebuild 1011
+RMD160 f81ece0dbd82cc093fd338dcc5cdd1044b5b7d1c libdc1394-1.0.0.ebuild 1011
+SHA256 fa3889be734017c51bb8ab8bf247a554e9d8ef15f430f094444116b83fdf0e99 libdc1394-1.0.0.ebuild 1011
 MD5 fb2bb4bf3161139499760b7e2c98e2cc libdc1394-2.0.0_pre4.ebuild 1157
 RMD160 435b9cce55f64e025fda98007e72c3822c0efd94 libdc1394-2.0.0_pre4.ebuild 1157
 SHA256 db4f5ced59e2391500866e0664f7d1a10e6e10c4119fdac7bacfd0602b8ee259 libdc1394-2.0.0_pre4.ebuild 1157
diff --git a/media-libs/libdc1394/files/digest-libdc1394-1.0.0 b/media-libs/libdc1394/files/digest-libdc1394-1.0.0
index 3c66056a34df..006a7b376908 100644
--- a/media-libs/libdc1394/files/digest-libdc1394-1.0.0
+++ b/media-libs/libdc1394/files/digest-libdc1394-1.0.0
@@ -1 +1,3 @@
 MD5 e87fba1834e3e99ec3b96738080eb835 libdc1394-1.0.0.tar.gz 352386
+RMD160 aa5794e870e673af7bf74737e960fd0db3a7dca8 libdc1394-1.0.0.tar.gz 352386
+SHA256 2d125ab044c6441a4980735a429bcbaa1e2355e9421ad7c72331c83d83f7a159 libdc1394-1.0.0.tar.gz 352386
diff --git a/media-libs/libdc1394/libdc1394-1.0.0.ebuild b/media-libs/libdc1394/libdc1394-1.0.0.ebuild
index 5bc910b02de0..80b996225743 100644
--- a/media-libs/libdc1394/libdc1394-1.0.0.ebuild
+++ b/media-libs/libdc1394/libdc1394-1.0.0.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-libs/libdc1394/libdc1394-1.0.0.ebuild,v 1.5 2005/10/19 18:08:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.0.0.ebuild,v 1.6 2006/01/29 08:10:21 robbat2 Exp $
 
 inherit eutils
 
@@ -13,9 +13,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}; cd ${S}