gentoo resync : 21.06.2020

2 files changed, 15 insertions, 25 deletions

diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index 99006954ba8c..cc534b505767 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -3,5 +3,5 @@ AUX libgpod-0.8.3-mono4.patch 334 BLAKE2B 06b76b3939c6b38e9b9bab8aa0d5b471a04032
 AUX libgpod-0.8.3-pkgconfig_overlinking.patch 640 BLAKE2B 74d924d61ce33c4fd0219e8dedb505bd66cd40e9912efb2dbbb5df31c2bea943ea4a4eb8b9e9baf2762966b02efae3f77c73293f8a4a581f6a43be4cc22eb727 SHA512 c8ebcc18ba7b44aef8fada3f9fea88fdaaf6bae12cf809b08f98e85ab6396ae032bfd7706809cd266be67c694749d4364a9cc591eb750478e095cbbcbe061419
 AUX libgpod-0.8.3-segfault.patch 1171 BLAKE2B ae8f00ad8708f23ef83c9f03f5e9a7157c2bdeaf0cfa2ed4542f8cc96295dad0200e968cb180883efa0e93fd180088be84fa0d2f1b40c642ada0caf37f7f3b9a SHA512 9b2f9a4f4e8f41e5d11cbc943cbba915147b81ec66859b62a5986b5d1c5c90526ce522e24499daf3378c201126ac6e5da8ef855a5f2353b933806c5b3aa6effb
 DIST libgpod-0.8.3.tar.bz2 801903 BLAKE2B e9bc54d23be7f54a17eea3f8a07d7bf6a28224d9c0b0f90fb9d44d97af6cf64c31096de5d9fa4b446e1a9463a6e8f3a59929d73bf52ad8d638732868c3c1b7d0 SHA512 e39f22054c2d2bdf5fc764aa1f692de17a1a06c7c7e9c60883d126b216dacca7840bf818e7e7e039218fe2a64c0920ba96d8cbbe310e11c1c4e68b82e7cbbd8e
-EBUILD libgpod-0.8.3-r2.ebuild 1974 BLAKE2B 54d81f74a3d970996e5ea5868c9790a6c6fc614e2dcab0a5d60a5aaa7b7cb8d9387575baf59bb4685ca3683271b548bea9ddffa428bdc9cb3ef5a617b09cc75d SHA512 70b858bd917667770950475a159259ac656c44d03af17e3d88fc38d055889e437ebb6633753aca7cbede140ae7f02abfadc4d490d62c37d11f06be5c73ac992d
+EBUILD libgpod-0.8.3-r3.ebuild 1636 BLAKE2B 41434a2a6e95737b25677378192badd1afff279562b3c85ef1523909287ed3886ab909d9968b47546d7bf7d91c0de4910a7d9a2ae86097ac0bb4309b8d80f6d7 SHA512 e7fee7000206185411dd6d203b952e192e39d174c986d0b54c1bf4700d9f72d8b2655f5edaff79b08f3ffdb97477b9aaf83cf600d7ffb01e26143c5b9acdc967
 MISC metadata.xml 483 BLAKE2B 39ce660cb10293f1a9dcf4eed9e253c85f8c2eceb17fb380d61fa5a189c3e2676917b7482676c884ad388a84b36c1e915bfc4a278f3b9c90a79f1d3655c08476 SHA512 0cf6044e1a0bbbd172d3421b4f1eab9a7334cdf1d732f6f61e689fad2d998bf302cb5436e4a695ad9d1a1beaf5939cd269b643db4b4edc2d869469a20c2f2827
diff --git a/media-libs/libgpod/libgpod-0.8.3-r2.ebuild b/media-libs/libgpod/libgpod-0.8.3-r3.ebuild
index 17b0445aa5ba..bdbbcf9a5bc2 100644
--- a/media-libs/libgpod/libgpod-0.8.3-r2.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.3-r3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
-inherit autotools eutils ltprune mono-env python-single-r1 udev
+inherit autotools mono-env udev
 
 DESCRIPTION="Shared library to access the contents of an iPod"
 HOMEPAGE="http://www.gtkpod.org/libgpod/"
@@ -13,9 +12,7 @@ SRC_URI="mirror://sourceforge/gtkpod/${P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-
-IUSE="+gtk python +udev ios mono static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+gtk +udev ios mono"
 
 RDEPEND="
 	>=app-pda/libplist-1.0:=
@@ -25,21 +22,14 @@ RDEPEND="
 	sys-apps/sg3_utils
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	ios? ( app-pda/libimobiledevice:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=media-libs/mutagen-1.8[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygobject-2.8:2[${PYTHON_MULTI_USEDEP}]
-		')
-		)
 	udev? ( virtual/udev )
 	mono? (
 		>=dev-lang/mono-1.9.1
 		>=dev-dotnet/gtk-sharp-2.12
-		)
+	)
 "
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-1.3.24:0 )
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-libs/libxslt
 	dev-util/intltool
 	dev-util/gtk-doc-am
@@ -47,7 +37,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-DOCS="AUTHORS NEWS README* TROUBLESHOOTING"
+DOCS=( AUTHORS NEWS README{,.overview,.sqlite,.SysInfo} TROUBLESHOOTING )
 
 PATCHES=(
 	"${FILESDIR}"/${P}-comment.patch #537968
@@ -58,32 +48,32 @@ PATCHES=(
 
 pkg_setup() {
 	use mono && mono-env_pkg_setup
-	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
 	default
 
 	# mono-4 fixes from Fedora
-	sed -i "s#public DateTime#public System.DateTime#g" bindings/mono/libgpod-sharp/Artwork.cs || die
+	sed -e "s#public DateTime#public System.DateTime#g" \
+		-i bindings/mono/libgpod-sharp/Artwork.cs || die
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_enable udev) \
 		$(use_enable gtk gdk-pixbuf) \
-		$(use_enable python pygobject) \
+		--disable-pygobject \
 		--without-hal \
 		$(use_with ios libimobiledevice) \
 		--with-udev-dir="$(get_udevdir)" \
-		$(use_with python) \
+		--without-python \
 		$(use_with mono)
 }
 
 src_install() {
 	default
-	rmdir "${ED}"/tmp
-	prune_libtool_files --modules
+	rmdir "${ED}"/tmp || die
+	find "${D}" -name '*.la' -type f -delete || die
 }