gentoo resync : 15.12.2019

5 files changed, 21 insertions, 124 deletions

diff --git a/media-libs/quvi/Manifest b/media-libs/quvi/Manifest
index 91cb7302b4d9..b2a7c40e33e2 100644
--- a/media-libs/quvi/Manifest
+++ b/media-libs/quvi/Manifest
@@ -1,10 +1,4 @@
 AUX quvi-0.9.1-automagic.patch 1586 BLAKE2B 59ed8c56bdcf3eb2b96a485be50396b8ca6d6432a402929bf877e2c932e35276bf452f8f453d1a00a3d051fda075b49e0138ced9cf8dde5c63ee53d50ac0434a SHA512 cc13530109553c4ebe652faa74e29ce159ef807eb24000b472434e1d3307b677cfbc5db20851041ab6cc4d024db84cd2a1a6ee91f9787880588fc692aafecc52
-DIST quvi-0.2.19.tar.xz 363120 BLAKE2B c1ae1fbfabe6e1cc63bc7518fe1100cb1481b77aa8e3f07f6673a840b281c7224d14d759821bc87e5b78552d3274ba284f9202e7459799a9bbdef650ccc3f4ae SHA512 a013f3ffcbb8a970148e7a2a40c6994600c6430f10f604df57884205f25cb1dbb56608d5a48b4b8b1c280230cef4c35db89fbb7678834fefee524e9ee4146ffb
-DIST quvi-0.4.2.tar.xz 118756 BLAKE2B 4b00ef7ba8cc784177070c2146a42a827ec78ce08f3bdb7422ea18dc074d92410d0d6350acf03246648aea1c8e4253a20ba9fbd998e6023657474c60f79a01bc SHA512 a0cd26711123bd61e91534e510dd96fe290eb19eacaabe52c36b0064dee1ce410e80eddbe5995392e3769ae3c602b93b5132507a2d43d765e2b98e8488ea8f86
-DIST quvi-0.9.4.tar.xz 315768 BLAKE2B 307fb6f45567f1fd5ab15cc0b110eda06404c8a165d93063bdeeac33c39a7fce631e8b73934d6b14d1cdd5488e6101ea2688f7a1ec70044005d3e69bf482ae63 SHA512 fcec2a95de1a93734803177b515f0578a0722950d145ac8a37c48864281152005190bb9c9a76473b94df9b74ca80a58363435e196106b15093f484e6d4a1316d
 DIST quvi-0.9.5.tar.xz 316676 BLAKE2B f9d8aa9ffd1cc70b17c4ce77648bc46f178b5eb0faa238636bb702701d8a1f249fb3a56a0fa0f5840efcd53532609bdcc0010fd90163f4619746a196ab269267 SHA512 ef50160b7f2b6b8c9049eb995cb26da3100b10e7af8206d98d2e128cde300ceb05a24dded06d7d49c0e691fcc2de5a4c5c9e9f439d40ca52cd0a3a24330c6d79
-EBUILD quvi-0.2.19.ebuild 803 BLAKE2B f9a8b2aaab2a3bdc5d5e96bf8d3377311ce4a112d6674e5c1a803c316d0c5fd6ae2595950ff3a7eba55ba2229ed81099ba15c50d679ebb5a564cdccdec7f430e SHA512 befc7d4d598d418ba904a04735c7d8ee1af0ea89ee80ed714f9fb106f157bb3393cb3e5550e487674c3cdcd4545b05012119a8c7b6eb9acff2ea4e78760e1feb
-EBUILD quvi-0.4.2.ebuild 519 BLAKE2B cbc7978c65ad69480db2e3c7e9661825977ccc8f412b61323e1cd0ccb1fed840457d67c2e1ce94442b5663545ad982108ea62b0790ddd74a1b483e6ae509732b SHA512 155095ea23816d46945b2931111ee6d8ebcf4e615b9207a9e0eb6fa50b5bc31f401e8833b8443c340e7bffdca18789c6a465e7a0fa2232b6208bc0acee3c45e0
-EBUILD quvi-0.9.4.ebuild 862 BLAKE2B 408c9555ced18d363eb441bc74f6200d3ae46e352cdc7cc224ec241c69172ae66b897a2791734b5cbcb8a1001c27dd6c5922c65b6bcbff9f07b8a003ac2fdeef SHA512 f1edcc22e4b455468803bef27261d18d1f51739d2b0f7224090b83630aeb33042e539e078ffbe68543013d326169c9bc3a0d53c9ea0fe524eebdaabbacf8ad2c
-EBUILD quvi-0.9.5.ebuild 872 BLAKE2B 5c38283f277af0af760b0d0d68e2c0ed501e5575f3f0f04f0ea552b3a8fda5a58b49b68d4012fbb01022c61656acdbd8c48606e3e847518bef4f1f789a6b3a5e SHA512 76dfe4b1f86b8be4c1327df96f6e4204031547bff0308850b11802aaf5a6f34ddd3767ccf94eac97c0dd4bc4a9cdcbdf183f5529dd028923a0e8d6fee3fa40bd
+EBUILD quvi-0.9.5.ebuild 822 BLAKE2B ccb1f9ef1382a07b97c1bdba298ac3437417e2064dca1ada714ce9835be9a4a3eecd13a6fa1b141c848b32c755df7050c40a642b12352c0914680c217eeda598 SHA512 89de8474a819a8592f8a4fb3cf3fb79d9d15e0d7f6367ac4cafc7f2054eefe096b32bf108dcc836b27a648f7ee78c3db1a5388c91083be119e1553769fd5a900
 MISC metadata.xml 406 BLAKE2B de0ee5d493972dd342457e1e5ba80e373188ce6157b0d88b543164088964032c3e8ff65e4283afb192ed0cb3cb831faf24e56b88aa028c7a20eb4e4bbb3b28f5 SHA512 ce7e3fcd2383246bb40af7fe0b95dbb888d9ee10f1bae6d3edf7f612eb07baa8093777bedd271e3f7c629ddfb255fd407a658555ecb32bf5fe8dde02ebd6f1f4
diff --git a/media-libs/quvi/quvi-0.2.19.ebuild b/media-libs/quvi/quvi-0.2.19.ebuild
deleted file mode 100644
index e1ad2513f8c7..000000000000
--- a/media-libs/quvi/quvi-0.2.19.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 for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="examples test offensive static-libs"
-
-RDEPEND=">=net-misc/curl-7.18.0
-	dev-lang/lua[deprecated]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# tests fetch data from live websites, so it's rather normal that they
-# will fail
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_enable offensive nsfw) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.{c,h}
-	fi
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/quvi/quvi-0.4.2.ebuild b/media-libs/quvi/quvi-0.4.2.ebuild
deleted file mode 100644
index e25009604857..000000000000
--- a/media-libs/quvi/quvi-0.4.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A command line tool for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=net-misc/curl-7.18.2
-	>=media-libs/libquvi-0.4.0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--with-manual
-}
diff --git a/media-libs/quvi/quvi-0.9.4.ebuild b/media-libs/quvi/quvi-0.9.4.ebuild
deleted file mode 100644
index 37b11ccaf8fa..000000000000
--- a/media-libs/quvi/quvi-0.9.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="A command line tool for parsing video download links"
-HOMEPAGE="http://quvi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="json nls xml"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=net-misc/curl-7.21.0
-	>=media-libs/libquvi-0.9.2:=
-	json? ( >=dev-libs/json-glib-0.12 )
-	nls? ( virtual/libintl )
-	xml? ( >=dev-libs/libxml2-2.7.8:2 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.1-automagic.patch )
-
-src_configure() {
-	local myeconfargs=(
-		--with-manual
-		$(use_enable json)
-		$(use_enable xml)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-libs/quvi/quvi-0.9.5.ebuild b/media-libs/quvi/quvi-0.9.5.ebuild
index bed5ac447b8b..a5e505fb63dd 100644
--- a/media-libs/quvi/quvi-0.9.5.ebuild
+++ b/media-libs/quvi/quvi-0.9.5.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
+EAPI=7
 
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="A command line tool for parsing video download links"
 HOMEPAGE="http://quvi.sourceforge.net/"
@@ -12,27 +11,32 @@ SRC_URI="mirror://sourceforge/${PN}/${PV:0:3}/${P}.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="json nls xml"
 
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=net-misc/curl-7.21.0
-	>=media-libs/libquvi-0.9.2:=
-	json? ( >=dev-libs/json-glib-0.12 )
+RDEPEND="
+	dev-libs/glib:2
+	net-misc/curl:=
+	media-libs/libquvi:=
+	json? ( dev-libs/json-glib:= )
 	nls? ( virtual/libintl )
-	xml? ( >=dev-libs/libxml2-2.7.8:2 )"
-DEPEND="${RDEPEND}
+	xml? ( dev-libs/libxml2:2= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.9.1-automagic.patch )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
-	local myeconfargs=(
-		--with-manual
-		$(use_enable json)
+	econf \
+		--with-manual \
+		$(use_enable json) \
 		$(use_enable xml)
-	)
-	autotools-utils_src_configure
 }