[This is a placeholder. Please ignore.]

(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)

4 files changed, 6 insertions, 117 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index a17c90ea63ab..8d1ce932367b 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libdc1394
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.59 2011/09/13 18:06:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.60 2011/09/13 18:23:01 ssuominen Exp $
+
+  13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -files/libdc1394-disable-raw-capture.patch, -libdc1394-1.2.2.ebuild,
+  -libdc1394-2.1.3.ebuild:
+  [This is a placeholder. Please ignore.]
 
   13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
   libdc1394-2.1.3-r1.ebuild, metadata.xml:
diff --git a/media-libs/libdc1394/files/libdc1394-disable-raw-capture.patch b/media-libs/libdc1394/files/libdc1394-disable-raw-capture.patch
deleted file mode 100644
index 6e246e54bbdc..000000000000
--- a/media-libs/libdc1394/files/libdc1394-disable-raw-capture.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- /tmp/libdc1394-1.2.2/libdc1394/dc1394_capture.c	2007-08-03 08:47:33.000000000 +0200
-+++ libdc1394-1.2.2/libdc1394/dc1394_capture.c	2008-12-09 12:16:28.000000000 +0100
-@@ -27,6 +27,7 @@
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <errno.h>
-+#include <stdio.h>
- 
- #include "config.h"
- #include "dc1394_control.h"
-@@ -424,6 +425,12 @@
- dc1394_multi_capture(raw1394handle_t handle, dc1394_cameracapture *cams,
-                      int num) 
- {
-+    // this functionality is not supported anymore in libraw1394-2.0.0,
-+    // nor in recent linux kernels, and is superseded by the dma capture
-+    // functions below
-+    fprintf(stderr, "libdc1394: error, raw capture mode is not supported anymore");
-+    return DC1394_FAILURE;
-+#if 0
-     int i, j;
-     _dc1394_all_captured= num;
- 
-@@ -493,6 +500,7 @@
-     }
- 
-     return DC1394_SUCCESS;
-+#endif
- }
- 
- /**********************************
diff --git a/media-libs/libdc1394/libdc1394-1.2.2.ebuild b/media-libs/libdc1394/libdc1394-1.2.2.ebuild
deleted file mode 100644
index bbf2721d4fbc..000000000000
--- a/media-libs/libdc1394/libdc1394-1.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.2.2.ebuild,v 1.9 2011/03/21 14:23:54 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification"
-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=""
-
-RDEPEND="sys-libs/libraw1394
-	x11-libs/libSM
-	x11-libs/libXv"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	epatch "${FILESDIR}"/${PN}-disable-raw-capture.patch
-}
-
-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.1.3.ebuild b/media-libs/libdc1394/libdc1394-2.1.3.ebuild
deleted file mode 100644
index f6d7f5fdf394..000000000000
--- a/media-libs/libdc1394/libdc1394-2.1.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.1.3.ebuild,v 1.2 2011/06/07 23:21:16 tampakrap Exp $
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification"
-HOMEPAGE="http://sourceforge.net/projects/libdc1394/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X doc"
-
-RDEPEND="
-	>=sys-libs/libraw1394-1.2.0
-	X? ( x11-libs/libSM x11-libs/libXv )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-videodev.h.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--program-suffix=2 \
-		$(use_with X x) \
-		$(use_enable doc doxygen-html)
-}
-
-src_compile() {
-	default
-	if use doc ; then
-		emake doc
-	fi
-}
-
-src_install() {
-	default
-	use doc && dohtml doc/html/*
-}