gentoo resync : 02.03.2018

6 files changed, 2 insertions, 187 deletions

diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index fa908966f9e8..4f2f3ff65200 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,18 +1,12 @@
 AUX libdc1394-2.2.1-includes.patch 1024 BLAKE2B 9bd32fdd870be4607531318c18a48245507cf21c53d289a1dcb969d5e3578607f186ca04707e88d237e81231713722b11ecb93680c40e8ea04f2a6a0244c4ee9 SHA512 8fd615b01c1233c11815c9aaa1137c477e52c0482f860e0395c1e10a64694e4c8850d61ba42480a6a13a26cab6732a2dead95e9f4d2e2662aafae51482e69f70
 AUX libdc1394-2.2.1-pthread.patch 332 BLAKE2B e43035a9b9f9f7dc42806ee5fac9b1c7c7edcef700a82e845fe72e55f09de31904d61795afdbe50a8e8e1638ac2da0efaee5658a0301b183bfe06dea0a5f46f8 SHA512 ae0c6c4ad19da0b06ebae86e2602dcf80997ccea5cc45c18f71b5c55ac668310989d87e99075a1020cc58fe5d9f8bae71435aecae21e786b4c7436628fba808e
-AUX libdc1394-usbinit.patch 1149 BLAKE2B e4e0506464b7627f19b5696ac2507b16416d6b353dc14aea376148e83334a31cab74e129d8465c26007977aee073d6cc3d90641a3f890b5e1be61309d6c7df0d SHA512 8ca27c986decd27c8bb167f739cf00c30274987c8329078cf463ce207d36cc9eb3fd6d6f738764687ca1ead52a8d9e1a8b5dff8e8a1b5e45a940f0391caa72d0
-AUX libdc1394-videodev.h.patch 1964 BLAKE2B 2a8c1bdffcb29f63c8103ff5d94621955ee850917070194c6476a823463dbaa7d8604485a77eb5ea9647b3d510ef66e8c72b83fe8b8dbf883ca46cfab7cabb4d SHA512 1519871cdbb77b0b2f08f8daaaf7ac7548581d142a22d8142cf5cdd4a676ecdb8416a87ff60840ca62dcabce34cd93eb614a289a64ea24a057ce311004297391
-DIST libdc1394-2.1.3.tar.gz 596778 BLAKE2B d259a93b8b4316e934f13769e77a057cf485f847ab80809fdcceca1fd94689ae77f98bd2a882b1f9ee250cf459f53240995e31168b32fc9ab9cb6b67e823b834 SHA512 502e1c55dbcf755a12d2efa1d7d14f9b735d279b47df4782c5303e48cb57eacabb89be20a374e1303d8c9b3d57eadac86541b2aae859e939a84d8c25bd20290c
-DIST libdc1394-2.1.4.tar.gz 576406 BLAKE2B d71691759619fad0f9f73d5b161d0042ae7baceb1427da255347f4d919fa3e92538a7b607ddf764f6492490a0e8316d451bd857e4f85c7e989864e786e6b2721 SHA512 21f36988cc1b85ec058b8c17b5311ee7c0c61ff3bc69e9ade94c44b9e96ab02fa5f243bead0ed3f1e3f130663cc46843f83cd78d3a960bb8d06fffa3df4ac1e8
 DIST libdc1394-2.2.1.tar.gz 556544 BLAKE2B 5c443216c771cca76eec8c53c1163b35d7daa722e7ab962f4fcf64331aad33f95d620760a8730d0e3d4022459ddc8ef769ae8ed7948a7158156bb1bc89c0b9e8 SHA512 e79370d4ac50f60535ef8b6f6ae21d5ede965812c775853e98c5c38e9bfc87929ef6e0d3737a20a443cd60c0225af18944bcba6d2cfb2ba858ac868bfb53c446
 DIST libdc1394-2.2.3.tar.gz 606042 BLAKE2B 9b8e60ad7194421c085ae87d9d695fb7deb51de55bb232ec5ec12055894af8b535385cdc79af3c9e93219bc31429d3559afbb3126a2315d83cc71db24272776a SHA512 d60771fe196cfd5c1ede413c0159ed9f0a977183f4b414f8e26a7be0098c10599c8dd93f8175e7ad38dac1504295c7c9987633bc9cb7de561ad0b64da0c8ca28
 DIST libdc1394-2.2.4.tar.gz 609612 BLAKE2B b78fbc6ddb34a10fe5c82928e7537d68c86cfdefae67ca82fde53886572e852079d922a77a2e5e3cd0d6631238d1f814e48a3ecc8da9779e80ab1702843109f6 SHA512 adb461fc5562855c3d26279971e25f38f3356c21e6be3fe343390c322d78f2515cf071da00da0ff39aec0d08147851354a2a0dbf325ad2fc179659e6ef5ab6e9
 DIST libdc1394-2.2.5.tar.gz 611918 BLAKE2B 64a5e156bfcef1f7a0ab2ec9be6cab65cf47bdc79ec3387d183778287ea1f72234325f7df5b67745289d68aea0105f24d7c55a4f13e913a60d43e3d74fcd4979 SHA512 4a02560b7b2db7199b91c35786cb9d5af51398795fc1b7f0cb577d3563b27c0d03d407fa472d9756a2f87b658350a55d29c16fef401a74f835ba86e25214d13c
 DIST sdl.m4-20140620.tar.xz 2420 BLAKE2B 2057bd14817809fc4ce8188971e846d70deda495c25dc3e1e87499f61b67373870c4b3f171edd9e5cf20e29c5d4c1eb11858001c67658e06715be3550668a61d SHA512 d8844d0967809241b642e0b6aaf45f2a5e94567d239d338aee45aaeb0e38765bcae419660562b7064d91afec63cc6ade0878fc7d6f36c61c083d136098a9af55
-EBUILD libdc1394-2.1.3-r1.ebuild 1022 BLAKE2B ccf3ce9cab06cfd9ccaa80cecaddcb87a76a9f3a684c7e95a1b49c5eab277530f9f79dd01c1ccc39d84ace0658fc445e8a4a14fb829993480170b5def1a18b58 SHA512 1e30b8265f5bb67a53859d28006ef81224884d1b523ad29a123527186974c49316a420c2087da21ec5fc3db4867684f85c531af257345f804bf75fb6d2d451e0
-EBUILD libdc1394-2.1.4.ebuild 886 BLAKE2B fe079835c214a573395bb07b9624e8dd704faf2e2dca8e557900df6346274b7c709e1217b0398752c2700cc60d90a876d53304da32d6d5041ae9e2d02b51ad77 SHA512 168debbaf46438350337668edba2201530afa4e45f161d4fbf4fea1b38a7fec4b410909aca408db64f81fee72109847a2424e854b6e6a8cdbad6d00ff089d0a0
 EBUILD libdc1394-2.2.1.ebuild 1391 BLAKE2B 8ee0fcbd135891415cf61abeb5902d25182b92a7ee7325a3b8437db3e01f55a3ccd221b243abeb23ffcd792eec1c133dfaf8efe7ff7d26b55381c5c31eb6506b SHA512 a04d57c24bb668d11fe99aa79f6b322701ce908a80b7ea9eea11c7b170254cea2fbd7ae73dc405fe55d2b00c93e33d8f7f68de352b19e6c327e58d8ac96855ee
 EBUILD libdc1394-2.2.3.ebuild 1369 BLAKE2B 2a33c6efabae47445584a2561956745ef73dc136cf8b20e0b25e9148e5bbd92e26fee4d96be441a056a606addf14ed458e6c81443c4932874cdf9d67568a5c20 SHA512 c8b02dc5379fbfd667c8cf55729661af6b7f5aabdd2ccc4b53975f4d90a01f129b3a4696c63e948a5b2ca0d68448b323a2612a0a9e369a5df03233b605d149e4
 EBUILD libdc1394-2.2.4.ebuild 1369 BLAKE2B 2a33c6efabae47445584a2561956745ef73dc136cf8b20e0b25e9148e5bbd92e26fee4d96be441a056a606addf14ed458e6c81443c4932874cdf9d67568a5c20 SHA512 c8b02dc5379fbfd667c8cf55729661af6b7f5aabdd2ccc4b53975f4d90a01f129b3a4696c63e948a5b2ca0d68448b323a2612a0a9e369a5df03233b605d149e4
-EBUILD libdc1394-2.2.5-r1.ebuild 1388 BLAKE2B a8cc5706ee78f2c853a5ae52813d070b6d3ca0464e9ef0fd423664c758c3c7622ec43a7a4ec4162b6515783a34ea8dd57590e02c85fdf4b385fd93cc3f71b612 SHA512 e4a74a0852cca933499809e4697acbd51bbceecc7fdeee60349ffdc76f1ef5155918c4ee22899923f45893330cdac285e3bbfa766bd6dc819a903f95a6ef7f26
+EBUILD libdc1394-2.2.5-r1.ebuild 1387 BLAKE2B ab044659b000f86726fe6380056b022ed41569607f9e16a106f336c91869316c9c5fe57e57f1524c8432e25e4a49a24897804672ee810a17c44bc97cb688e09a SHA512 a7d9567a15ef7ac2f34060fddd751bac83602aa2e00bfdb05d38573ddca9bb70a5316088d8731e72a017ca3dfb6e7fb0bab3a93dc4820b5e4fb1e106edcdf65b
 MISC metadata.xml 310 BLAKE2B e433df9a1c48848c371f278ef408de74d5a78896a17a511cd1dd7cdf35e77a87070178f22ad55f70a200088f8f2186d970b1c5cea7eed8ca66b8bad58549667b SHA512 2fbb994fc42ad1c7e1da90b5525ddc1ee1b1abeefeed6496b3aea4df79d556e7032291c782c022ab855216ecdf1539e624f951766f19e33564fd80646bec25b1
diff --git a/media-libs/libdc1394/files/libdc1394-usbinit.patch b/media-libs/libdc1394/files/libdc1394-usbinit.patch
deleted file mode 100644
index e94d25355ad8..000000000000
--- a/media-libs/libdc1394/files/libdc1394-usbinit.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/libdc1394/dc1394/control.c b/libdc1394/dc1394/control.c
-index c62e0e2..f250f6a 100644
---- a/libdc1394/dc1394/control.c
-+++ b/libdc1394/dc1394/control.c
-@@ -1955,7 +1955,7 @@ dc1394_new (void)
-     windows_init (d);
- #endif
- #ifdef HAVE_LIBUSB
--    usb_init (d);
-+    dc1394_usb_init (d);
- #endif
- 
-     int i;
-diff --git a/libdc1394/dc1394/internal.h b/libdc1394/dc1394/internal.h
-index b4d295a..c59e5d3 100644
---- a/libdc1394/dc1394/internal.h
-+++ b/libdc1394/dc1394/internal.h
-@@ -74,7 +74,7 @@ void juju_init(dc1394_t *d);
- void linux_init(dc1394_t *d);
- void macosx_init(dc1394_t *d);
- void windows_init(dc1394_t *d);
--void usb_init(dc1394_t *d);
-+void dc1394_usb_init(dc1394_t *d);
- 
- void register_platform (dc1394_t * d, const platform_dispatch_t * dispatch,
-         const char * name);
-diff --git a/libdc1394/dc1394/usb/control.c b/libdc1394/dc1394/usb/control.c
-index 6509452..19a21a6 100644
---- a/libdc1394/dc1394/usb/control.c
-+++ b/libdc1394/dc1394/usb/control.c
-@@ -378,7 +378,7 @@ usb_dispatch = {
- };
- 
- void
--usb_init(dc1394_t * d)
-+dc1394_usb_init(dc1394_t * d)
- {
-     register_platform (d, &usb_dispatch, "usb");
- }
diff --git a/media-libs/libdc1394/files/libdc1394-videodev.h.patch b/media-libs/libdc1394/files/libdc1394-videodev.h.patch
deleted file mode 100644
index dba42c46f0bd..000000000000
--- a/media-libs/libdc1394/files/libdc1394-videodev.h.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001
-From: David Moore <david.moore@gmail.com>
-Date: Sun, 27 Mar 2011 22:48:15 -0700
-Subject: [PATCH 1/1] Conditionally compile dc1394_vloopback only when linux/videodev.h exists
-
----
- libdc1394/ChangeLog            |    3 +++
- libdc1394/configure.in         |    3 +++
- libdc1394/examples/Makefile.am |    2 ++
- 3 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/libdc1394/ChangeLog b/libdc1394/ChangeLog
-index e1355de..536ccae 100644
---- a/libdc1394/ChangeLog
-+++ b/libdc1394/ChangeLog
-@@ -1,3 +1,6 @@
-+2011-03-27  David Moore  <david.moore@gmail.com>
-+	* Conditionally compile dc1394_vloopback only when linux/video.h exists
-+
- 2011-01-02  David Moore  <david.moore@gmail.com>
- 	* dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN
- 	* Update NEWS, README, AUTHORS and version for release 2.1.3.
-diff --git a/libdc1394/configure.in b/libdc1394/configure.in
-index 69babab..bdddc9b 100644
---- a/libdc1394/configure.in
-+++ b/libdc1394/configure.in
-@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue)
- AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue)
- AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x")
- 
-+AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true])
-+AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue)
-+
- AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true])
- 
- AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue)
-diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am
-index fcebf18..035612e 100644
---- a/libdc1394/examples/Makefile.am
-+++ b/libdc1394/examples/Makefile.am
-@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \
- B = dc1394_reset_bus
- 
- if HAVE_LINUX
-+if HAVE_VIDEODEV
- B += dc1394_vloopback
-+endif
- if HAVE_XV
- A += dc1394_multiview
- endif
--- 
-1.7.0.1
-
diff --git a/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild b/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild
deleted file mode 100644
index fbe6ade1040c..000000000000
--- a/media-libs/libdc1394/libdc1394-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification"
-HOMEPAGE="https://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="doc static-libs X"
-
-RDEPEND=">=sys-libs/libraw1394-1.2.0
-	virtual/libusb:1
-	X? ( x11-libs/libSM x11-libs/libXv )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-videodev.h.patch \
-		"${FILESDIR}"/${PN}-usbinit.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--program-suffix=2 \
-		$(use_with X x) \
-		$(use_enable doc doxygen-html)
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-}
-
-src_install() {
-	default
-	use doc && dohtml doc/html/*
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/libdc1394/libdc1394-2.1.4.ebuild b/media-libs/libdc1394/libdc1394-2.1.4.ebuild
deleted file mode 100644
index 7331276d0eb3..000000000000
--- a/media-libs/libdc1394/libdc1394-2.1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification"
-HOMEPAGE="https://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="doc static-libs X"
-
-RDEPEND=">=sys-libs/libraw1394-1.2.0
-	virtual/libusb:1
-	X? ( x11-libs/libSM x11-libs/libXv )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--program-suffix=2 \
-		$(use_with X x) \
-		$(use_enable doc doxygen-html)
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-}
-
-src_install() {
-	default
-	use doc && dohtml doc/html/*
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
index 12da4be28a7e..e66eea98db4f 100644
--- a/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
+++ b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86"
 IUSE="doc static-libs"
 
 RDEPEND="