gentoo resync : 28.04.2021

3 files changed, 21 insertions, 43 deletions

diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index cc534b505767..db3cf87d3cd1 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -1,7 +1,6 @@
 AUX libgpod-0.8.3-comment.patch 611 BLAKE2B 6ed4cfbb6ca1ca6876f835bdad2b9d11a8ad147c0f0f584436791fa84e40e15dcbfe163a47dedc688eecf4db84610df81ab01ae2c1266324a8cebadd914627e2 SHA512 a9d042745d8095a8188e57d82c8e1b00acb41f45da1510b2615d29b607b52ae49e54d3482e5021d085501f3705f4ad0fa79796cd4262c74acd0b4f34f8450a44
-AUX libgpod-0.8.3-mono4.patch 334 BLAKE2B 06b76b3939c6b38e9b9bab8aa0d5b471a04032976ed9a9f53c690cda9bc3e19ba63a08af0c9e0929f184ba20cc20409826493c0be51e4d4d0b95f73ffa50006b SHA512 293e1c72b60175d4aa5d092955fa84f53120461b39545bde0827a0c76b583f22d14a940534c4a5b79c68edf00250d81dab1524accbc6f4eb2e487afe399c324c
 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-r3.ebuild 1636 BLAKE2B 41434a2a6e95737b25677378192badd1afff279562b3c85ef1523909287ed3886ab909d9968b47546d7bf7d91c0de4910a7d9a2ae86097ac0bb4309b8d80f6d7 SHA512 e7fee7000206185411dd6d203b952e192e39d174c986d0b54c1bf4700d9f72d8b2655f5edaff79b08f3ffdb97477b9aaf83cf600d7ffb01e26143c5b9acdc967
+EBUILD libgpod-0.8.3-r5.ebuild 1442 BLAKE2B ae8cf010fd070cb8606bf68f86b62026117c963ae171df07f9fc349069b5d4ab8529f9fe7909aff745189f1927deadd3a33e4bdc92581ee80678fc55567d5f4f SHA512 78debbb5e4f2cc5be53339afdae48c54491639c9e77629dc0e7b1f9fbf50c4859b2d02e0b964c6cbf6af85f5f5eb2374443e5d5bc7972ef4338b2214253d3398
 MISC metadata.xml 483 BLAKE2B 39ce660cb10293f1a9dcf4eed9e253c85f8c2eceb17fb380d61fa5a189c3e2676917b7482676c884ad388a84b36c1e915bfc4a278f3b9c90a79f1d3655c08476 SHA512 0cf6044e1a0bbbd172d3421b4f1eab9a7334cdf1d732f6f61e689fad2d998bf302cb5436e4a695ad9d1a1beaf5939cd269b643db4b4edc2d869469a20c2f2827
diff --git a/media-libs/libgpod/files/libgpod-0.8.3-mono4.patch b/media-libs/libgpod/files/libgpod-0.8.3-mono4.patch
deleted file mode 100644
index 9cb57b464ffc..000000000000
--- a/media-libs/libgpod/files/libgpod-0.8.3-mono4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgpod-0.8.3/m4/mono.m4.orig	2015-05-18 12:25:35.417699745 +0100
-+++ libgpod-0.8.3/m4/mono.m4	2015-05-18 12:25:53.488079557 +0100
-@@ -34,7 +34,7 @@
- 
- AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER],
- [
--	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, gmcs)
-+	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, mcs)
- ])
- 
- AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME],
diff --git a/media-libs/libgpod/libgpod-0.8.3-r3.ebuild b/media-libs/libgpod/libgpod-0.8.3-r5.ebuild
index bdbbcf9a5bc2..3cef30ca197a 100644
--- a/media-libs/libgpod/libgpod-0.8.3-r3.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.3-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools mono-env udev
+inherit autotools udev
 
 DESCRIPTION="Shared library to access the contents of an iPod"
 HOMEPAGE="http://www.gtkpod.org/libgpod/"
@@ -12,21 +12,17 @@ SRC_URI="mirror://sourceforge/gtkpod/${P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="+gtk +udev ios mono"
+IUSE="+gtk ios +udev"
 
 RDEPEND="
 	>=app-pda/libplist-1.0:=
 	>=dev-db/sqlite-3:3
 	>=dev-libs/glib-2.16:2
 	dev-libs/libxml2:2
-	sys-apps/sg3_utils
+	sys-apps/sg3_utils:0=
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	ios? ( app-pda/libimobiledevice:= )
 	udev? ( virtual/udev )
-	mono? (
-		>=dev-lang/mono-1.9.1
-		>=dev-dotnet/gtk-sharp-2.12
-	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -40,40 +36,34 @@ BDEPEND="
 DOCS=( AUTHORS NEWS README{,.overview,.sqlite,.SysInfo} TROUBLESHOOTING )
 
 PATCHES=(
-	"${FILESDIR}"/${P}-comment.patch #537968
-	"${FILESDIR}"/${P}-segfault.patch #565052
-	"${FILESDIR}"/${P}-mono4.patch
+	"${FILESDIR}"/${P}-comment.patch # bug 537968
+	"${FILESDIR}"/${P}-segfault.patch # bug 565052
 	"${FILESDIR}"/${P}-pkgconfig_overlinking.patch
 )
 
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-}
-
 src_prepare() {
 	default
-
-	# mono-4 fixes from Fedora
-	sed -e "s#public DateTime#public System.DateTime#g" \
-		-i bindings/mono/libgpod-sharp/Artwork.cs || die
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable udev) \
-		$(use_enable gtk gdk-pixbuf) \
-		--disable-pygobject \
-		--without-hal \
-		$(use_with ios libimobiledevice) \
-		--with-udev-dir="$(get_udevdir)" \
-		--without-python \
-		$(use_with mono)
+	local myeconfargs=(
+		--disable-pygobject
+		--disable-static
+		--without-hal
+		--without-mono
+		--without-python
+		--with-udev-dir="$(get_udevdir)"
+		$(use_enable gtk gdk-pixbuf)
+		$(use_with ios libimobiledevice)
+		$(use_enable udev)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
+	rm "${ED}"/usr/$(get_libdir)/pkgconfig/libgpod-sharp.pc || die
 	rmdir "${ED}"/tmp || die
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 }