gentoo resync : 04.01.2018

3 files changed, 11 insertions, 48 deletions

diff --git a/media-plugins/gkrellmpc/Manifest b/media-plugins/gkrellmpc/Manifest
index d90c2cb2f898..9d5d0b02187c 100644
--- a/media-plugins/gkrellmpc/Manifest
+++ b/media-plugins/gkrellmpc/Manifest
@@ -1,7 +1,5 @@
 AUX gkrellmpc-0.1_beta10-mt.patch 4392 BLAKE2B 2a249c576091573c4f5c92f622b0d9ac1a8ffb1a38c0b4a6f8b1d475ea2db85c1358deaec8ac72570d09379167f63deb5a947711928ab86525a7eeb5980b7b9d SHA512 5928192cde4513470f9af952d6aa8a3b5044a6bdcc8aead26420a2cc7e9ed21dd3ac0043a5d481559c6eaad770de54c44b6d5395efb1baa2de80bc26d2536cdb
 AUX gkrellmpc-0.1_beta9-mt.patch 4427 BLAKE2B e3aea0f5a15cf589dd614a4080c38c04a39bf590cab23d1986fea74d05826582c97877d824f670e222e887257a2f4fe147c175d8aa9a505ede2e1aae3e181761 SHA512 0bf96cba88e6b2596b86318f72a87842d0641068a18bb3a07a9b5654296322bb12e58f281e8ab412e2f9a4c6fc5e0aef9714e91b97ec41d41c39cf5ec720b09b
 DIST gkrellmpc-0.1_beta10.tar.gz 25388 BLAKE2B 2e3c97e7d5887e1c3ea6a693cde19470e476943658de607266aac9a3ecbc2a5215fcc266638909d2ad024f303adb19475504ea4f7b79b3e97f566d90899721d3 SHA512 f5d687264f08146bf1eb54aee6d42a200fb97008a355d26a68be91b04e4bd622fc222725bf498c0837eacb8b94d6aede5aa1a05ed504fe5f9b790a9cd08d3973
-DIST gkrellmpc-0.1_beta9.tar.gz 22029 BLAKE2B 2c69e1cfc8ac8a1966263caaeb8234d0607d1e8bac8df3df2ef0f0141a6523396aa376ce4b1d00a0bf269eecfbb9d88efe3f28610271c7bc1286a549480070bc SHA512 8ea5b2964e8f430ec391d1dc475f00c6b3b7843952884c62c0fa76131f05a4e61f0dcbf4d1da38c3686e261027c409af28c1d36b87d383468abd4329313fb2db
-EBUILD gkrellmpc-0.1_beta10.ebuild 863 BLAKE2B e0a5ef3e3b16d01c6635880450283e4d608b8081a38fb1c32edd49d8dcdbc61d343f80c1d7bb4951cfbc9b070a1214d7485648bd59db00e6cb996ee59bc4468b SHA512 11aa9cdb555ba832680015657bb9ff37ed39180a8726d94f7af094bc22879120acc19f4dea5aeb517b5ff42f8d25d720cd999508616d86e5b67d8317c8cac83b
-EBUILD gkrellmpc-0.1_beta9-r1.ebuild 867 BLAKE2B 6d2d5a64bd7a5adce1a28990ceb5a10801dbf9fc2efc40f1a138a37d573ae8ccf8b7b197ef6a923ec0aa35c0c5f3a6a0d8f5ffff897ecda0a018a3d40df8103f SHA512 fca79f66eaf151ac367ea293f071d4bc562beb4214f58d1d094233bc9150c19ca98a48fd7877e8e6867f3fd78b8fba566524046bd67a1f299002c22bd594bb76
+EBUILD gkrellmpc-0.1_beta10.ebuild 859 BLAKE2B 89421c770f6ced3a94022a4a3659b9a180644431c395145b4093e7b3177f40933c22bfb6bc6cee152a41c8841a9339507ffcda64f9976c3ab50c7941946c1471 SHA512 37bbf33f883dd373f490e947030c4dcf4d92fdbbf0d8d79cbe17795e085def544e05e3c8016e53eff7eb6e94276aebb59bb0b630a2eecb2afccc446b5a61bad4
 MISC metadata.xml 346 BLAKE2B d69895932fc6b3694132354e64a117da6105daa64ba1cb40a41ea2597f96c3e548c02196b2fda8256ef7813ab71d2b668b0d83e89caef95d4ae444a884668fe6 SHA512 119190e5845f3d61be09d34f525870e139c566f3ec4838c23425b764dd1c53507286c55d437e620d4e9958e195dfd58bc778cca58afc97cb4b52c76ba05f56c0
diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
index 42c2ab217677..a309150dbc98 100644
--- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
+++ b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils gkrellm-plugin toolchain-funcs
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="A gkrellm plugin to control the MPD (Music Player Daemon)"
 HOMEPAGE="http://mpd.wikia.com/wiki/Client:GKrellMPC"
@@ -13,7 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="threads"
 
-RDEPEND=">=app-admin/gkrellm-2[X]
+RDEPEND="
+	app-admin/gkrellm:2[X]
 	net-misc/curl"
 DEPEND="${RDEPEND}"
 
@@ -21,13 +23,14 @@ DEPEND="${RDEPEND}"
 RESTRICT="test"
 
 src_prepare() {
+	use threads && eapply "${FILESDIR}"/${P}-mt.patch
+	eapply_user
+
 	sed -i -e 's:gkrellm2 -p:gkrellm -p:' Makefile || die
-	use threads && epatch "${FILESDIR}"/${P}-mt.patch
 }
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake || die
 }
 
 pkg_postinst() {
diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta9-r1.ebuild b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta9-r1.ebuild
deleted file mode 100644
index 54940aa5bf07..000000000000
--- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta9-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils gkrellm-plugin toolchain-funcs
-
-DESCRIPTION="A gkrellm plugin to control the MPD (Music Player Daemon)"
-HOMEPAGE="http://mpd.wikicities.com/wiki/Client:GKrellMPC"
-SRC_URI="http://www.topfx.com/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="threads"
-
-RDEPEND=">=app-admin/gkrellm-2[X]
-	net-misc/curl"
-DEPEND="${RDEPEND}"
-
-# Will open gkrellm in X11 display
-RESTRICT="test"
-
-src_prepare() {
-	sed -i -e 's:gkrellm2 -p:gkrellm -p:' Makefile || die
-	use threads && epatch "${FILESDIR}"/${P}-mt.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake || die
-}
-
-pkg_postinst() {
-	if use threads; then
-		elog "If you can't connect MPD, please unset USE threads."
-		elog "See, https://bugs.gentoo.org/276970 for information."
-	fi
-}