gentoo resync : 24.02.2018

4 files changed, 59 insertions, 56 deletions

diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index 308288578566..fa908966f9e8 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,5 +1,5 @@
 AUX libdc1394-2.2.1-includes.patch 1024 BLAKE2B 9bd32fdd870be4607531318c18a48245507cf21c53d289a1dcb969d5e3578607f186ca04707e88d237e81231713722b11ecb93680c40e8ea04f2a6a0244c4ee9 SHA512 8fd615b01c1233c11815c9aaa1137c477e52c0482f860e0395c1e10a64694e4c8850d61ba42480a6a13a26cab6732a2dead95e9f4d2e2662aafae51482e69f70
-AUX libdc1394-2.2.1-pthread.patch 328 BLAKE2B f7f597d16bf2572d0bd925cee190d098fb9c24eb811e4bd321df28f609b6d8502cf193ee266e7b5fb65a3fc06d245e9098f6e64bc4a51ef19ffade25f89c57ca SHA512 058f712f14def6c451403c04e2eccb08db5ee2a9466e235dbc6343905eff1826a99e18dc764333567a05105f3fd46d825a53e509ee12753679666ce7157db72c
+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
@@ -14,5 +14,5 @@ EBUILD libdc1394-2.1.4.ebuild 886 BLAKE2B fe079835c214a573395bb07b9624e8dd704faf
 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.ebuild 1376 BLAKE2B ba77395c07da4f8eec5841dbd61ca8c3787dccf210eebc0c2b827c25bcff10ddc82f4af63edc77f82e4b5b5bd5d990aa370e69ac63142da5b456795809f47f00 SHA512 22dd28ea38096f1265fbbfb3ca15d74137170a227acf563207c85f7190714a0cd03e3bf14a2764e2ffa38c39725fee11b0a2c60a0051d87f5bbad5edf955c378
+EBUILD libdc1394-2.2.5-r1.ebuild 1388 BLAKE2B a8cc5706ee78f2c853a5ae52813d070b6d3ca0464e9ef0fd423664c758c3c7622ec43a7a4ec4162b6515783a34ea8dd57590e02c85fdf4b385fd93cc3f71b612 SHA512 e4a74a0852cca933499809e4697acbd51bbceecc7fdeee60349ffdc76f1ef5155918c4ee22899923f45893330cdac285e3bbfa766bd6dc819a903f95a6ef7f26
 MISC metadata.xml 310 BLAKE2B e433df9a1c48848c371f278ef408de74d5a78896a17a511cd1dd7cdf35e77a87070178f22ad55f70a200088f8f2186d970b1c5cea7eed8ca66b8bad58549667b SHA512 2fbb994fc42ad1c7e1da90b5525ddc1ee1b1abeefeed6496b3aea4df79d556e7032291c782c022ab855216ecdf1539e624f951766f19e33564fd80646bec25b1
diff --git a/media-libs/libdc1394/files/libdc1394-2.2.1-pthread.patch b/media-libs/libdc1394/files/libdc1394-2.2.1-pthread.patch
index 6ea7651e1463..535dc9040d8e 100644
--- a/media-libs/libdc1394/files/libdc1394-2.2.1-pthread.patch
+++ b/media-libs/libdc1394/files/libdc1394-2.2.1-pthread.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/514008
 
---- dc1394/usb/Makefile.am
-+++ dc1394/usb/Makefile.am
+--- a/dc1394/usb/Makefile.am
++++ b/dc1394/usb/Makefile.am
 @@ -8,7 +8,7 @@
  endif
  
diff --git a/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
new file mode 100644
index 000000000000..12da4be28a7e
--- /dev/null
+++ b/media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+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
+	https://dev.gentoo.org/~ssuominen/sdl.m4-20140620.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.1-pthread.patch )
+
+src_prepare() {
+	default
+	AT_M4DIR=${WORKDIR}/aclocal eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable doc doxygen-html)
+		$(use_enable static-libs static)
+		--disable-examples
+		--program-suffix=2
+		--without-x # only useful for (disabled) examples
+	)
+
+	multilib_is_native_abi || myeconfargs+=( --disable-doxygen-html )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && emake doc
+}
+
+multilib_src_install() {
+	multilib_is_native_abi && use doc && local HTML_DOCS=( doc/html/. )
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libdc1394/libdc1394-2.2.5.ebuild b/media-libs/libdc1394/libdc1394-2.2.5.ebuild
deleted file mode 100644
index 954f2ee21508..000000000000
--- a/media-libs/libdc1394/libdc1394-2.2.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib-minimal
-
-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
-	https://dev.gentoo.org/~ssuominen/sdl.m4-20140620.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static-libs X"
-
-RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.2.1-pthread.patch
-
-	AT_M4DIR=${WORKDIR}/aclocal eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf="$(use_enable doc doxygen-html)"
-	multilib_is_native_abi || myconf="--disable-doxygen-html --disable-examples"
-
-	# X is only useful for examples that are not installed.
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--program-suffix=2 \
-		--without-x \
-		${myconf}
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use doc && emake doc
-}
-
-multilib_src_install() {
-	default
-	multilib_is_native_abi && use doc && dohtml doc/html/*
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}