gentoo resync : 18.08.2019

3 files changed, 3 insertions, 69 deletions

diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index 4814684c2935..7d49c28d3ec3 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,7 +1,5 @@
 AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
 AUX whipper-0.7.0-src-Makefile-respect-CFLAGS.patch 1755 BLAKE2B 5b750690e20230528830a468b34d0a481dbf08af36b1b687121a57518613fabb5b298145b8f2693b21653749b3ed1e185864c6348b0adfb33810c1723fe640d3 SHA512 ccda4c1e97a841d8afec9ed68ccf87371e0883afa7b179010973925185fa58e6a21f4b488dba1891a416c22a8e0ee911318117a059c20989d673c5e5e214c25a
-DIST whipper-0.7.0.tar.gz 160649 BLAKE2B 8e14b6dda00b3c8be7ba0fabb25d1cbca536edc785373986f857bafbc2e54d358f18b27140ffda74384c4e815e68ee466c8fc5e4e5d17aa80c8237fda389ba2b SHA512 b4bf4ca64521d8600288addecec6cbd8e43d1ff9a6b9a60872eff1bd5a2b6966af036d6467ba09273ac78aa01d8cac3be29a0e2c4e6600829b9988a74ef8cd88
 DIST whipper-0.7.3.tar.gz 168393 BLAKE2B b34151ede7c867dbbca34fcec3d8ef81cb50d66abc760fa54bec880f8f1186faf3e0f5298c2890501b9bd2f586b80d2cdc45a0755b6fe12fc1a2215e9ea9ecbb SHA512 ac96393471a6b4c40f5870f6e3183b65d43229314e2a1eacbf065c51ac61cbc772f2de3bde9f20ee1f7ffec427cd03c31f27df60eb6c621a699927646080c0ab
-EBUILD whipper-0.7.0-r1.ebuild 1524 BLAKE2B 636f64d95e641a89110436ee76fd62da430bcd720e99bad6d01a3c58384c4977912c9e90c2cbbc9333d46b62ddfac2b5e88dd4f294725498df79ef03c9048220 SHA512 9e427de20c9518adf1bbab1cb60ae3b06885dca221e628251871794631a1db0dd2a970e2dda761e49798c13534d5a70bc73580fb9d78774639746a9b944bad50
-EBUILD whipper-0.7.3.ebuild 1550 BLAKE2B 0f6253476e28c9a15ba33356639fa111c6d36a384e17247daf70d11aa0c487d0057f6c9c65f13304a173db413dadd284defef7d0244e0af44a30f445f46196ba SHA512 6e460f634a82c454851695eba770b667ff324488b50d258daeb92d4d0e30224161721239ef9c0736a28485251ed412ef67cfdbb4bbe0da6f25df352a0a707515
+EBUILD whipper-0.7.3-r1.ebuild 1500 BLAKE2B ef788965cfe9699e09141e83ec02c0b552d747f0132bc65686621df578e4292fa7735a18314de1d64202cd23d7c22a16ed134028afc388277547d284262768e0 SHA512 bbf1bd8d4be78491ddf5ef2ccdec781ff96d7af25d09e1df986f091124d3c7cd1e9ca9bf6d9278c1cf8ea9406dfe5c0c92ecf6f68c75b4658b884836f30659b6
 MISC metadata.xml 530 BLAKE2B 8cf5640fc05fc9b327e3b6d5d621987cdc74b816e372817fe9d63ac83c37e1669f6b07873eba61439b5d00d26975bc5dd850c649f80454f51f800cba8d7c340c SHA512 87970186262167b583d1a90dbe5016f11368d123f6ff81782c8bffa7217c8eda42440fca4c65ccfbbf75971acf292b1067838024c2bc536cd8b6116fc2cd4172
diff --git a/media-sound/whipper/whipper-0.7.0-r1.ebuild b/media-sound/whipper/whipper-0.7.0-r1.ebuild
deleted file mode 100644
index 2aace1ef8765..000000000000
--- a/media-sound/whipper/whipper-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python CD-DA ripper preferring accuracy over speed (forked from morituri)"
-HOMEPAGE="https://github.com/whipper-team/whipper"
-SRC_URI="https://github.com/whipper-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libsndfile
-	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	app-cdr/cdrdao
-	>=dev-libs/libcdio-paranoia-0.94_p2
-	dev-python/cddb-py[${PYTHON_USEDEP}]
-	dev-python/pycdio[${PYTHON_USEDEP}]
-	dev-python/pygobject:2=[${PYTHON_USEDEP}]
-	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/flac
-	media-libs/libsndfile
-	media-libs/mutagen[${PYTHON_USEDEP}]
-	media-sound/sox[flac]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cdparanoia-name-fix.patch"
-	"${FILESDIR}/${P}-src-Makefile-respect-CFLAGS.patch"
-)
-
-src_prepare() {
-	# accurip test totally depends on network access
-	rm "${PN}"/test/test_common_accurip.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake -C src CC="$(tc-getCC)"
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" -C src install
-}
diff --git a/media-sound/whipper/whipper-0.7.3.ebuild b/media-sound/whipper/whipper-0.7.3-r1.ebuild
index f7f2f40ca587..9491ea390da1 100644
--- a/media-sound/whipper/whipper-0.7.3.ebuild
+++ b/media-sound/whipper/whipper-0.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,10 +23,9 @@ DEPEND="
 "
 RDEPEND="
 	app-cdr/cdrdao
-	dev-libs/gobject-introspection[${PYTHON_USEDEP}]
 	>=dev-libs/libcdio-paranoia-0.94_p2
 	dev-python/pycdio[${PYTHON_USEDEP}]
-	dev-python/pygobject:2=[${PYTHON_USEDEP}]
+	dev-python/pygobject:3=[${PYTHON_USEDEP}]
 	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]