gentoo resync : 03.03.2021

3 files changed, 2 insertions, 32 deletions

diff --git a/media-libs/libiec61883/Manifest b/media-libs/libiec61883/Manifest
index 726ca4a902c2..ef0be47bbce9 100644
--- a/media-libs/libiec61883/Manifest
+++ b/media-libs/libiec61883/Manifest
@@ -1,5 +1,4 @@
 AUX libiec61883-1.2.0-examples.patch 1140 BLAKE2B ab448e0a4941fd87ac8d0cd2cb6f21e3fc784b956ff2d8a1b81cad50a91ac0e60469eb5341d7ff3d7bfb7093fe424a51b63246292b52a62dcd773370fd6a7445 SHA512 b022bd213e82ae0f6ac206512a6764784720ef4e5caf349e39e729ec2a7c6b84c70af9ef02753b76e431707fc36fe1cc076b87367ca3c89250bcc1a0660d4eb7
 DIST libiec61883-1.2.0.tar.xz 233640 BLAKE2B c1fdd4d6fbfd96eea9f1c22b20a1e71e4cafbe064091ef6211d097342f8751955f2d8a68cb3e5235d733f7ecd3725144abb329331bfa3497be1911bb8773d4a9 SHA512 817177081a229c6253340e5911369aab746bd657d5b3d6a1ef3cf639cceee667bdb677fb0536163468cc9e719c4e81c6beaf42c93e5a56eb52684964b6dd1e23
-EBUILD libiec61883-1.2.0-r1.ebuild 943 BLAKE2B 172fa1dc69fae176b893f8f489c756c5535000a572e7d2a580e1f3e65e326e05c43d9c9bd6cd3f0ac540605dca68ce4f341fe25a205d5fba72c087712555065a SHA512 8bde8dc265aa718ba5354bb9a5eaf7151298158bd052f946efe6a2ebc2171b314c911b238556616c04c54de61f8fa06e1895b564bcdaac720b5f13be5dd163ec
-EBUILD libiec61883-1.2.0-r2.ebuild 850 BLAKE2B f7e0c426ebbdd3288a8b0fd7269d469acb8189b71a260ddb8dc571e355114df39a6689ae5f98216680c648a14068158cfdb366e3bd682545b940708863c9c14b SHA512 54974d4b4771fd9eaaf0747ec94c0a740deff27f9197e82f4c69fd318841bca8fed9c3aaaa2a42a4a342e5d5658ba287ed32a5165c709fc674fd8f0a70a9de38
+EBUILD libiec61883-1.2.0-r2.ebuild 845 BLAKE2B c3883a20964d2fc7a5fde19526c14d8907f0d5818148cb57d2ed81f5bd44094b56539a413dae4d70b74364560745661d1597000c2860054d6e4e99bb096bb78f SHA512 4db797835327a3087c8326a7102f0ce2435763bf35d3934ab46d98d13ed3222b5c29a4c5193f115113c30ed2bb708716b497e77bb70b8f9d85308c7d314b9a4a
 MISC metadata.xml 531 BLAKE2B b3f4a2efce5fb0eb30e14c02ab34a58d4dd4e38b7b5a8b799816fa4ac50fec6e2656652629f351388519f6bf05275448f22fd10b4565884c12bdf054130639d1 SHA512 bbf4b45023f2a7f1ed7769fa4513cc13ec9697eeb677fde7ec882f5f787e00d0b291ef6be1c2d0ace4d35059782d85678c9ac38f8913ffd63f35a82ebfcab933
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
deleted file mode 100644
index e9b573d52ae9..000000000000
--- a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib eutils unpacker autotools
-
-DESCRIPTION="Library for capturing video (dv or mpeg2) over the IEEE 1394 bus"
-HOMEPAGE="http://dennedy.org/cgi-bin/gitweb.cgi?p=dennedy.org/libiec61883.git"
-SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="examples static-libs"
-
-RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	if use examples; then
-		sed -i -e "s:noinst_PROGRAMS.*:noinst_PROGRAMS = :g" \
-		-e "s:in_PROGRAMS.*:in_PROGRAMS = plugreport plugctl test-amdtp test-dv	test-mpeg2 test-plugs:g" \
-		examples/Makefile.am || die "noinst patching failed"
-		AUTOTOOLS_AUTORECONF="1"
-	fi
-	autotools-multilib_src_prepare
-}
diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
index 13dd6ab4543e..cd9a6c950a2c 100644
--- a/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
+++ b/media-libs/libiec61883/libiec61883-1.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"