7 files changed, 160 insertions, 1 deletions
diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index edee85375e3a..190e9c27e6b5 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,23 @@
 # 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.19 2006/04/27 23:06:37 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.20 2006/05/03 14:05:49 seemant Exp $
+
+*libdc1394-2.0.0_pre6-r2 (03 May 2006)
+*libdc1394-1.2.1 (03 May 2006)
+*libdc1394-1.0.0-r1 (03 May 2006)
+
+  03 May 2006; Seemant Kulleen <seemant@gentoo.org>
+  +libdc1394-1.0.0-r1.ebuild, +libdc1394-1.2.1.ebuild,
+  +libdc1394-2.0.0_pre6-r2.ebuild:
+  Now that pre6 has changed API and install locations of its headers and
+  library names, we can safely SLOT version 1 and version 2 separately for
+  simultaneous install. Note that pre5 and earlier in the 2.0.0 branch will
+  NOT be put back into the tree at all, because they clash with version 1.
+  Also, pre6 is supposed to be closer to the final 2.0.0 release in terms of
+  API etc, so I am more confident with this change than I was earlier.
+  Additionally, added the fix for CLK_TCK and glibc-2.4, that really I should
+  have done months ago. My apologies for that. Bugs #117201 and #124995 are
+  now closed with this.
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org>
   files/digest-libdc1394-2.0.0_pre4, Manifest:
diff --git a/media-libs/libdc1394/files/digest-libdc1394-1.0.0-r1 b/media-libs/libdc1394/files/digest-libdc1394-1.0.0-r1
new file mode 100644
index 000000000000..006a7b376908
--- /dev/null
+++ b/media-libs/libdc1394/files/digest-libdc1394-1.0.0-r1
@@ -0,0 +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/files/digest-libdc1394-1.2.1 b/media-libs/libdc1394/files/digest-libdc1394-1.2.1
new file mode 100644
index 000000000000..1e9fa61ed8e9
--- /dev/null
+++ b/media-libs/libdc1394/files/digest-libdc1394-1.2.1
@@ -0,0 +1,3 @@
+MD5 b3d90d2dd8e5e902cac8a32d28123b93 libdc1394-1.2.1.tar.gz 389075
+RMD160 d44b07f218772a8fdd9d409b1e2dcf5152aa5f9f libdc1394-1.2.1.tar.gz 389075
+SHA256 5019d040ee4a803db5a4e9ce2857487f69d41d3bdec027f1eeef320e80fa227f libdc1394-1.2.1.tar.gz 389075
diff --git a/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre6-r2 b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre6-r2
new file mode 100644
index 000000000000..772a9b57c883
--- /dev/null
+++ b/media-libs/libdc1394/files/digest-libdc1394-2.0.0_pre6-r2
@@ -0,0 +1,3 @@
+MD5 a2bafbc41fd46e0c0fb1fa14fcece9d6 libdc1394-2.0.0-pre6.tar.gz 412057
+RMD160 86417b142aca35ee799278ba57b0335313dbbf48 libdc1394-2.0.0-pre6.tar.gz 412057
+SHA256 4721407b2365f9ce697cfe5f0267a6fc4774206d1b34945dff63f5bb4dd91117 libdc1394-2.0.0-pre6.tar.gz 412057
diff --git a/media-libs/libdc1394/libdc1394-1.0.0-r1.ebuild b/media-libs/libdc1394/libdc1394-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..6bc95f961c84
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-1.0.0-r1.ebuild
@@ -0,0 +1,42 @@
+# 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-r1.ebuild,v 1.1 2006/05/03 14:05:49 seemant Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="libdc1394 is a library that is intended to provide a high level programming interface for application developers who wish to control IEEE 1394 based cameras that conform to the 1394-based Digital Camera Specification (found at http://www.1394ta.org/)"
+HOMEPAGE="http://sourceforge.net/projects/libdc1394/"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="X"
+
+RDEPEND=">=sys-libs/libraw1394-0.9.0
+		X? ( || ( ( x11-libs/libSM x11-libs/libXv )
+				  virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	!=sys-libs/libdc1394-1.0.0
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	if ! use X; then
+		epatch ${FILESDIR}/nox11.patch
+	fi
+}
+
+src_compile() {
+	if has_version '>=sys-libs/glibc-2.4' ; then
+		append-flags "-DCLK_TCK=CLOCKS_PER_SEC"
+	fi
+
+	econf || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	dodoc NEWS README AUTHORS
+}
diff --git a/media-libs/libdc1394/libdc1394-1.2.1.ebuild b/media-libs/libdc1394/libdc1394-1.2.1.ebuild
new file mode 100644
index 000000000000..27f09245cc3b
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-1.2.1.ebuild
@@ -0,0 +1,42 @@
+# 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.2.1.ebuild,v 1.1 2006/05/03 14:05:49 seemant Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="libdc1394 is a library that is intended to provide a high level programming interface for application developers who wish to control IEEE 1394 based cameras that conform to the 1394-based Digital Camera Specification (found at http://www.1394ta.org/)"
+HOMEPAGE="http://sourceforge.net/projects/libdc1394/"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="X"
+
+RDEPEND=">=sys-libs/libraw1394-0.9.0
+		X? ( || ( ( x11-libs/libSM x11-libs/libXv )
+				  virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	!=sys-libs/libdc1394-1.0.0
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	if ! use X; then
+		epatch ${FILESDIR}/nox11.patch
+	fi
+}
+
+src_compile() {
+	if has_version '>=sys-libs/glibc-2.4' ; then
+		append-flags "-DCLK_TCK=CLOCKS_PER_SEC"
+	fi
+
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc NEWS README AUTHORS
+}
diff --git a/media-libs/libdc1394/libdc1394-2.0.0_pre6-r2.ebuild b/media-libs/libdc1394/libdc1394-2.0.0_pre6-r2.ebuild
new file mode 100644
index 000000000000..0c674a4e5de0
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-2.0.0_pre6-r2.ebuild
@@ -0,0 +1,49 @@
+# 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_pre6-r2.ebuild,v 1.1 2006/05/03 14:05:49 seemant Exp $
+
+inherit eutils
+
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="library for controling IEEE 1394 conforming based cameras"
+HOMEPAGE="http://sourceforge.net/projects/libdc1394/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X"
+
+RDEPEND=">=sys-libs/libraw1394-1.2.0
+		X? ( || ( ( x11-libs/libSM x11-libs/libXv )
+				  virtual/x11 ) )"
+DEPEND="!=sys-libs/libdc1394-2.0.0*
+	${RDEPEND}
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix a bug where iso_channel property is not kept up-to-date
+	epatch ${FILESDIR}/${P}-grab_partial_image.diff
+	epatch ${FILESDIR}/${P}-vendor_avt.diff
+	epatch ${FILESDIR}/${P}-extra-failure-removal.diff
+}
+
+src_compile() {
+	if has_version '>=sys-libs/glibc-2.4' ; then
+		append-flags "-DCLK_TCK=CLOCKS_PER_SEC"
+	fi
+	econf \
+		--program-suffix=2 \
+		$(use_with X x) || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc NEWS README AUTHORS ChangeLog
+}