gentoo resync : 29.01.2021

4 files changed, 2 insertions, 111 deletions

diff --git a/media-libs/libquvi/Manifest b/media-libs/libquvi/Manifest
index d752d5cb0704..52f89907619d 100644
--- a/media-libs/libquvi/Manifest
+++ b/media-libs/libquvi/Manifest
@@ -1,7 +1,5 @@
 AUX libquvi-0.9.1-headers-reinstall.patch 457 BLAKE2B 67b0509e6e10cfa1f10067f6522d91cc76f84f160f109d088fca9d5209e171d16a7381fa9ed09dc1b0507756610222d38c797f00d043930306abeafc98b977e6 SHA512 6acce5b6c5b6907d138bd4a8257e966ec9e77aedbc463d28e94813615cb1f5a703d241214d378778886ea629b8702b6bf5d0808f125cb9ebe4da49d30b0c2b77
 AUX libquvi-0.9.4-autoconf-2.70.patch 359 BLAKE2B de87ca7222d1073da64337eed378a8d231da4ccd99cffa48dac377fac040b93df752977c7cbf9fc872c5547a599cdeeedb25832c9102c0df39b991f5b0669e58 SHA512 a6c1a853013ff7cc128d8ec1599e9847c4f5ec94bd9eab389c589696d0af8ab5704a9c2861186fa51d84a18dac67000af9c20c0fcedb1af1f0ba6fd64cbd1d00
 DIST libquvi-0.9.4.tar.xz 373172 BLAKE2B ab351a74d7cb3a19d3ddad615a476f139f76d1e8bfe4b6b049384bb6833f36cc5c0d1e87044f1d408241a90a898a55d7747eb5eb9daa009af512c281bc15cb94 SHA512 287015e370e7b7f98f0f4c3717f5b044c8fcfb8b823c7988cd248e56b5fbbfa1a1aa421fbdafb38d727b79495267ccd4dead71587052117db53f29236268b651
-EBUILD libquvi-0.9.4-r1.ebuild 1272 BLAKE2B f3d2d6088b4da79b5cd4a8957b0ea260368ade1f8984ffadbf6228c551c6021b661099dafc04e782abbae49df416293cc048dbca9eeb0dac28c78764dc789579 SHA512 3e2388d3a61e5f1fdeb83616e100acefdc89da45ba975b63d8818c3eec9c4c011440a61b97033f9819b334da7763a8bbd2cda90516d1f4404b4082a4a080890d
-EBUILD libquvi-0.9.4-r100.ebuild 1287 BLAKE2B 661e1cb938df16ecc9ede714b7b6c0f80040b7fdac6a1cd04834b5b40d397b23bab7fe2daceffcb774a72e35ca2737ff7941dbe773b23da76fa6c43b99f4dc2a SHA512 3d025522b33548ee63d647d3cfd48964c0ff734dac0ef1bf23b91493b16440536a855d13866bfce8e4c81a2d843f5c49f054a5fc9f3a12776b8974215026f925
-EBUILD libquvi-0.9.4-r2.ebuild 1196 BLAKE2B 2f85382337e83f5b47b9b346db7110b5bae74b37caf94a5a5ff8d9d5d442e7b586571f6ab421d0383b6daf41b725d62fce513ca2961ef3a6035a43050285051d SHA512 001db44e174c076311a08adce359eacfd50850712b1d5fbd19555f3658b72b9ae0330d039800e1ac02f8ab27679a516bbfbf9a512754b917e27693fe3d69c33e
+EBUILD libquvi-0.9.4-r100.ebuild 1282 BLAKE2B e71315f932cdad6736b7b803d29c0fff5191eb5d8da13afdc625386ce58e03301a8c24f68cfb02fedfea2e763a811e1815b287b817ddc68302aa527716f7324d SHA512 e99c3cd8e0a2613a234c061c7e1dbe39096e1eb5e7dd994a5409cf6ac3b463f83f553adc59e748c1558dbbdb426e0103a8f2cbabd83dafd738c445f89b1e7285
 MISC metadata.xml 333 BLAKE2B 0a7c7e68bfe6ae4ad274ea5b1a44f4537f170552e10377ab8bfeea2ff1d3d400b007d142287943a8f56f333ae66b7b95112113331ae4bcdaa16e813c5ee06467 SHA512 700993d15bce12df8bffb39e9e1f985c1a51c52c6d1f67e47d7764c6daa6e044082fdc00c2fafadda70a4d2f5439620de4919e6cd03285e293d1e172667a3cd9
diff --git a/media-libs/libquvi/libquvi-0.9.4-r1.ebuild b/media-libs/libquvi/libquvi-0.9.4-r1.ebuild
deleted file mode 100644
index bf3e51e5ae74..000000000000
--- a/media-libs/libquvi/libquvi-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils ltprune multilib-minimal
-
-DESCRIPTION="Library for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/8" # subslot = libquvi soname version
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="examples nls static-libs"
-
-RDEPEND="!<media-libs/quvi-0.4.0
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
-	>=media-libs/libquvi-scripts-0.9.20130903[${MULTILIB_USEDEP}]
-	>=net-libs/libproxy-0.4.11-r1[${MULTILIB_USEDEP}]
-	>=net-misc/curl-7.36.0[${MULTILIB_USEDEP}]
-	>=dev-lang/lua-5.1.5-r3:0=[deprecated,${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch )
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--with-manual
-	)
-	autotools-utils_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-
-	use examples && dodoc -r examples
-}
diff --git a/media-libs/libquvi/libquvi-0.9.4-r100.ebuild b/media-libs/libquvi/libquvi-0.9.4-r100.ebuild
index 1d357a005779..2a30743b87ff 100644
--- a/media-libs/libquvi/libquvi-0.9.4-r100.ebuild
+++ b/media-libs/libquvi/libquvi-0.9.4-r100.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0/8" # subslot = libquvi soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="examples nls static-libs"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/media-libs/libquvi/libquvi-0.9.4-r2.ebuild b/media-libs/libquvi/libquvi-0.9.4-r2.ebuild
deleted file mode 100644
index 75d9b7ba8237..000000000000
--- a/media-libs/libquvi/libquvi-0.9.4-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="Library for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/quvi/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/8" # subslot = libquvi soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples nls static-libs"
-
-RDEPEND="
-	>=dev-lang/lua-5.1.5-r3:0=[deprecated]
-	>=dev-libs/glib-2.34.3:2
-	>=dev-libs/libgcrypt-1.5.3:0=
-	>=media-libs/libquvi-scripts-0.9.20130903
-	!<media-libs/quvi-0.4.0
-	>=net-libs/libproxy-0.4.11-r1
-	>=net-misc/curl-7.36.0
-	nls? ( >=virtual/libintl-0-r1 )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.1-headers-reinstall.patch
-	"${FILESDIR}"/${PN}-0.9.4-autoconf-2.70.patch #749816
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		--with-manual
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	einstalldocs
-	use examples && dodoc -r examples
-
-	find "${ED}" -name '*.la' -delete || die
-}