gentoo resync : 22.12.2021

3 files changed, 2 insertions, 54 deletions

diff --git a/media-libs/zvbi/Manifest b/media-libs/zvbi/Manifest
index f384025de9e5..026c3fc69887 100644
--- a/media-libs/zvbi/Manifest
+++ b/media-libs/zvbi/Manifest
@@ -1,5 +1,4 @@
 AUX tests-gcc7.patch 677 BLAKE2B 23258f8fd35fd650524b8b79a324206e73ae8921792898f3b57ad9f2412b79517e4bdd9925ebb997b5066dacdad3d9c480ac8cd54d65b7eba44219ecd2f91f9b SHA512 88e19bbb5e81f506dc031a2d8c2232396840784d3b22cdc67f8358792020c060432881c3a8ca126a96e779f83a12dd8209d7691c14cd2857a536dc0c84f3f074
 DIST zvbi-0.2.35.tar.bz2 1047761 BLAKE2B 5fa5fec7e39c9adc6590f3f6841a40ca723ffb6a017854f71f92f32232103672a6f48678b244a84f0cad742c378ffdb247fe33e5e3cdb1ee4d737e92f650a548 SHA512 3d73eb0a7d05fdf1e3f8a74cc9d4fcb2a0287285904d59230c832f42b91afb072e96bda7e396ef07f268348061a51242925746db124bbb713cf56bdfabdada5d
-EBUILD zvbi-0.2.35-r1.ebuild 1310 BLAKE2B 3a39874142819cbce255db14190f91ddb234311fa0659ba01c1a4f46cfb4f55aa77563a5a5a6cfd15a7bf070caae56d7a30fc8afbee9e60e507fb15e657900e7 SHA512 8e03bdd6ac6f30ff695e19d920ffa2c579f92409f9d0fdaf0be2eed98fb0662346221dc5df609c0392d5dde0183d697c6d6a49aedb4c0cde892dbdce139dcee3
-EBUILD zvbi-0.2.35-r2.ebuild 1402 BLAKE2B 3e004ba6900746b8285d54f92f1cf186c8d8f61f31ac92fb1b6dd41195c607c459f06f8b0b80a5321a241b149b1874d2412a5b021e5815d509370bac0484be8f SHA512 eebc6d0c851671d9e0001e2b62214a6ba22de93f05ff8854f301dd09ea12dfed1a558e626217d735788809936a4c70bfb9282103d28baf10a024fda98905ecb9
+EBUILD zvbi-0.2.35-r2.ebuild 1395 BLAKE2B 0e1edc8d78f80fec1854f38ef03471bcd3e81c72928a44b051c41e96a4fce31a8ff041eec8dec3c9380e3ad2a3addf8986316a656e3693e31d755fd253b89fca SHA512 5643e31ca1092ba69717dd0962334195a49ddae3b1e26c1c881caec05d87d074dfac6e135f708cd78a5cc0ac69eba55063c86ea72cd56bfc1a8574b388b2757e
 MISC metadata.xml 245 BLAKE2B 894dfe5af9a598364710f2e49e15797eba64682c9ffe57083fb91326da36dd10551183dcd64e23e0aa859d781f09f20620bebb409938c36470bfac7c8284d443 SHA512 fe1a9e2524495b2d585056a05c6ab1a2495b62df868d6973f7c7cbc4b626c36e5b11650d42cde35053784cade7b8353eccf8c7e55822a4abf3d07918d9f7b77d
diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
deleted file mode 100644
index 7fd82de6ab0e..000000000000
--- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch libtool multilib-minimal
-
-DESCRIPTION="VBI Decoding Library for Zapping"
-SRC_URI="mirror://sourceforge/zapping/${P}.tar.bz2"
-HOMEPAGE="http://zapping.sourceforge.net"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="doc dvb nls static-libs v4l X"
-
-RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
-	X? ( x11-libs/libXt )"
-
-src_prepare() {
-	epatch "${FILESDIR}/tests-gcc7.patch"
-	elibtoolize
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(use_enable v4l) \
-		$(use_enable dvb) \
-		$(use_enable nls) \
-		$(use_with X x) \
-		$(multilib_native_use_with doc doxygen)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	multilib_is_native_abi && use doc && dohtml -a png,gif,html,css doc/html/*
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/zvbi/zvbi-0.2.35-r2.ebuild b/media-libs/zvbi/zvbi-0.2.35-r2.ebuild
index 7e283497ec0b..f997d73c6a1e 100644
--- a/media-libs/zvbi/zvbi-0.2.35-r2.ebuild
+++ b/media-libs/zvbi/zvbi-0.2.35-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/zapping/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="doc dvb nls v4l X"
 
 RDEPEND=">=media-libs/libpng-1.5.18:0=[${MULTILIB_USEDEP}]