gentoo resync : 15.12.2019

3 files changed, 40 insertions, 27 deletions

diff --git a/media-sound/gmpc/Manifest b/media-sound/gmpc/Manifest
index c122de6aec58..ed82e73403c1 100644
--- a/media-sound/gmpc/Manifest
+++ b/media-sound/gmpc/Manifest
@@ -1,5 +1,6 @@
+AUX gmpc-11.8.16-AM_CONFIG_HEADER.patch 170 BLAKE2B 2b359e328445c00d63591e8b0f475784d4d7866dab3c5c8a7fd70694d0263c9a2ed3e1ff09c9973c4956818a93fea0813acdd7a7e31b455112e19da1cf579d99 SHA512 0b8c41b0b11b06f8aaac5a9be454243777da2b6c3ee1e1fa25471e72a2a6f9ae4c72d7567e30280de9fd0626a7eeb1314261ba381c4d667233124ab56563a4c3
 AUX gmpc-11.8.16-icons.patch 7380 BLAKE2B bd546a009efc5c37eb50593763fc39231f07c611805aac08b2353ad3ce283e6b948c49b0be0f232e81d94ee717a4a3b1dd7c19177659aabe5554caa873c9b672 SHA512 cabee4790552b22e31873fdd0b2c786743fdb9fe3b5eb613ec85e83e27285116e6f05c1d8ac7013d9d2b17ec765876a276804c08b1ccc6d78051991c50b769d8
 AUX gmpc-11.8.16-underlinking.patch 241 BLAKE2B 69400fae94f780e81bdf078b26c2bdca69fe03fbff42a3600a9cba2310981a94ddd01c07f418571a6168108fde11cfd02e4a40230fbbde25d4b3868e09decf19 SHA512 ff1d628f0bdf4be3d0c1130762ecb0c90f2a93cbe0d31b3df25168b04a68b0292788b7c1c5c69b243a16ccfb1185d1622d5c7e1c6d390460db37156ad5f78576
 DIST gmpc-11.8.16.tar.gz 7082909 BLAKE2B 913b7b55029f6fe78dcae7355bd571f4d6e95c4d1891e12251717b7fe846a69b52ba9cf2c65042a36295830dbec65128d0aa119d8503c934a3f09b86b42a0409 SHA512 4e5c8112edc016ac6c472b0099347a4fcd0336022e15be8d76fae449d30e533df92a4379aa98e389e624b9910ff3f528afb682f64901ea53f09e00d3d5678623
-EBUILD gmpc-11.8.16-r1.ebuild 1415 BLAKE2B 112f7a4dde75db6de18ef93449b0d9b9a2c9d45c34c0ca84135416f7bd68e19c689cbdd93be87db53f012996d6c4936d379e0e356ebbc11e863d86290437c669 SHA512 75aa3f72fdbd9a380278f482d50cf3423d1a026197844191a1ccd98b98e3b0e70e702e0a2da27d4d3483dbe8bfced1fc616ce82c1feeeb390556eecb382b54e9
+EBUILD gmpc-11.8.16-r1.ebuild 1196 BLAKE2B f60a99ebd5982b34a5dbe2199f94439685eb024bf0d857d3fccbead3210f54b5293de641ce8169e14a685bf6a05170cc44a70e66d72d60cc80892d7e9a9775a0 SHA512 ad21f5638ae6111fc8d53974049d552a232c767bc39eae3bb8102a7e05ca69b72d795a987988bc741dc3aa5a1bd959789bba7b4456edf61e30f417224849af70
 MISC metadata.xml 436 BLAKE2B 7707a0a903f8e5ce1102c1e971013a81e5472a4c998ab400df73ba200b0bd45401574a4b1314d513485d893f0ea02a4774f21220336fb1e8aa38684feba7d50d SHA512 c3c04eb47a7d3ad5eee60e3c28ce2279bdf73aa9537c351279c1a8a4efd6340dbbc74d7044edd8eac317c48a355f5a8f676b736a2447c434ff75a833af9d9a34
diff --git a/media-sound/gmpc/files/gmpc-11.8.16-AM_CONFIG_HEADER.patch b/media-sound/gmpc/files/gmpc-11.8.16-AM_CONFIG_HEADER.patch
new file mode 100644
index 000000000000..336891716b1e
--- /dev/null
+++ b/media-sound/gmpc/files/gmpc-11.8.16-AM_CONFIG_HEADER.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,7 +14,7 @@
+ 
+ 
+ 
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE
+ 
diff --git a/media-sound/gmpc/gmpc-11.8.16-r1.ebuild b/media-sound/gmpc/gmpc-11.8.16-r1.ebuild
index 9629d477e07a..0fcbc8fbc67f 100644
--- a/media-sound/gmpc/gmpc-11.8.16-r1.ebuild
+++ b/media-sound/gmpc/gmpc-11.8.16-r1.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=4
-VALA_MIN_API_VERSION=0.12
+EAPI=7
 
-inherit autotools eutils gnome2-utils vala
+inherit autotools vala xdg
 
 DESCRIPTION="A GTK+2 client for the Music Player Daemon"
 HOMEPAGE="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
@@ -13,32 +12,38 @@ SRC_URI="http://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="nls xspf +unique"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.16:2
-	dev-libs/libxml2:2
-	>=media-libs/libmpd-11.8
-	net-libs/libsoup:2.4
-	>=x11-libs/gtk+-2.18:2
+IUSE="nls +unique xspf"
+
+RDEPEND="
+	dev-db/sqlite:3=
+	dev-libs/glib:2
+	dev-libs/libxml2:2=
+	media-libs/libmpd:=
+	net-libs/libsoup:2.4=
+	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-themes/hicolor-icon-theme
-	unique? ( dev-libs/libunique:1 )
-	xspf? ( >=media-libs/libxspf-1.2 )"
-DEPEND="${RDEPEND}
+	unique? ( dev-libs/libunique:1= )
+	xspf? ( media-libs/libxspf:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	$(vala_depend)
 	app-text/gnome-doc-utils
-	>=dev-util/gob-2.0.17
+	dev-util/gob
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
-DOCS=( AUTHORS README )
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-icons.patch
+	"${FILESDIR}"/${P}-AM_CONFIG_HEADER.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch \
-		"${FILESDIR}"/${P}-icons.patch
-	sed -i -e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac || die
+	xdg_src_prepare
 	eautoreconf
 	vala_src_prepare
 }
@@ -53,7 +58,3 @@ src_configure() {
 		$(use_enable unique) \
 		$(use_enable xspf libxspf)
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }