[This is a placeholder. Please ignore.]

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

5 files changed, 10 insertions, 125 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/Manifest b/media-libs/libdc1394/Manifest
index 961f49ebe701..ba6ff1fc8404 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,22 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libdc1394-disable-raw-capture.patch 905 RMD160 20f28c99080975d0fa5f038e7dde7b8ae28e781b SHA1 ea6cd821fd2ac4ccfcf5d17ae11c533924556736 SHA256 78c1b341ec5b19aea90e42ff74594d72f166bc29f5fd33cef8f4816849534aed
 AUX libdc1394-usbinit.patch 1149 RMD160 fd363313e2fd5d8ac0fa6e2ae444b0a3fa0aacd6 SHA1 cd0f177cc632f9f690ee44cc99660fff5994f9c1 SHA256 bb14627071cceca9a3fb5174ac26fc4f4d4ef77049caa96aa68d5c82ee799a32
 AUX libdc1394-videodev.h.patch 1964 RMD160 884799d96512d17623210b20fe6049e29c53e858 SHA1 f92fc7112b8a030cbce3c78a9b205245e4452848 SHA256 bb20fa4b0ec243b5c45f6e011f328b13b4647133332968e03dec8847ea970338
-DIST libdc1394-1.2.2.tar.gz 394782 RMD160 8c316c41d9a68f9dbc5c4bf18d9892c698f524e3 SHA1 eb781c0a23e674c335fde7b2d3b79c8e6c84f200 SHA256 0b75bd397e50dc409b15eee612ec599624d256806842306ad3248584595c87ed
 DIST libdc1394-2.1.2.tar.gz 585911 RMD160 20b7470cfb1990a9c8b4798b0362e91038d054a4 SHA1 d9ad4834f23b555d04f255945117a4420ae40977 SHA256 70a9f97a091165051bce7a5a5f198e01760432bbd20aa352e31562a73b229229
 DIST libdc1394-2.1.3.tar.gz 596778 RMD160 298ad9c92187bea0f127f0a0f9960483d50201aa SHA1 cab77199f2e434ece3cf31c798d00d79326679b4 SHA256 6690e8f97abadd41aa6a5f6e0365e17287847bb267d251ea308641a6dd7aa0e9
-EBUILD libdc1394-1.2.2.ebuild 966 RMD160 c8b8298841aec5676071f86fdfe2b91218a3e532 SHA1 d5b142c6a894443f0934c69efe686f98f4fdf5b3 SHA256 ab4f9b5b09fa9e5e4532a1f38b38987545514c787f797c436e550b95c7fbee2b
 EBUILD libdc1394-2.1.2.ebuild 1048 RMD160 4162e95ba1012c0ce1bc383023e7cac5fc95768c SHA1 208916937cff0b981313b4ca981bebd1c4b804e1 SHA256 1736fd72b578da1b124cb25d27232412b6cc46478068280ae0042e8be9a581ab
 EBUILD libdc1394-2.1.3-r1.ebuild 1062 RMD160 cbc9689a4c29094c6f60c9fb7d2cba44c16704c3 SHA1 aea99866a34ac09c107101d96988e31732dcf010 SHA256 88c1a986d56653cba74bf6eae7cd6ce12ef87ec47faeff1ac2f7b6374e6e5d25
-EBUILD libdc1394-2.1.3.ebuild 996 RMD160 c2f106b2214b25967721c7305bb76f9653024f26 SHA1 86316594916857b74a0365d080b5eb2074c9d9e4 SHA256 6d1655b3889ce7ec097b6f92cd7b62542711646602532a19b929a5f685043ebe
-MISC ChangeLog 12654 RMD160 e2d06a0758f8315934d491bc93992baa2715d70c SHA1 063e6cfe9dfae1ddadcf0baeef4ed6ef687c84f5 SHA256 a8a5b0febb8c8c4f439dcb7a2720f02c0138cc6594c00218f8c61f439ab5ed4b
+MISC ChangeLog 12849 RMD160 c78a61eb96de3af1a53bdd5946d1c0a4454c1c9c SHA1 9547b60e767b7bbf2d579aa53187291d20c4584e SHA256 2fc234532a71bbe5363c74360216dbf486f3a66d2fd3975a83c9f438e774a868
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5vm94ACgkQXkR9YqOcLPGnNwEAhvxmowz9AcQj8Z5aW/dB8Rd+
-sOspextZvHm6FFSfEyQA/16Sz2iIuKWRe09L9ytj3TpeKB8jIfs7A1kAtLibtsfg
-=J2SP
+iF4EAREIAAYFAk5vn7oACgkQXkR9YqOcLPF1mwEAkFxCL4gUnaYrFmO9h70IwntX
+dkaK4LlBoGVkorbtbWsA/1PULXSH0sH6CvGdzTfXA0MLoyXbPZGFCL9E7Vpb+X1P
+=SPH2
 -----END PGP SIGNATURE-----
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/*
-}