gentoo resync : 16.04.2022

3 files changed, 55 insertions, 0 deletions

diff --git a/media-plugins/gkrellmpc/Manifest b/media-plugins/gkrellmpc/Manifest
index ea51d3acd56c..e42f1fb09025 100644
--- a/media-plugins/gkrellmpc/Manifest
+++ b/media-plugins/gkrellmpc/Manifest
@@ -1,4 +1,6 @@
 AUX gkrellmpc-0.1_beta10-mt.patch 4392 BLAKE2B 2a249c576091573c4f5c92f622b0d9ac1a8ffb1a38c0b4a6f8b1d475ea2db85c1358deaec8ac72570d09379167f63deb5a947711928ab86525a7eeb5980b7b9d SHA512 5928192cde4513470f9af952d6aa8a3b5044a6bdcc8aead26420a2cc7e9ed21dd3ac0043a5d481559c6eaad770de54c44b6d5395efb1baa2de80bc26d2536cdb
+AUX gkrellmpc-0.1_beta10-r1-make-test.patch 285 BLAKE2B 44ea0867743d219907fde694b05cc7567f86105546b0fbf47186a00467e5d07c294ea22a3c620b702efdbd479d5620f84c92e4c049947493967c6bd80ca27486 SHA512 ca89fa4f53b3c31ca0902be258980510d71355156606ae84fa187fefb1574c11f0f71cf20b41a56c4f86835a170b801df0e0918873d3d28c01a7d7bbf3579c09
 DIST gkrellmpc-0.1_beta10.tar.gz 25388 BLAKE2B 2e3c97e7d5887e1c3ea6a693cde19470e476943658de607266aac9a3ecbc2a5215fcc266638909d2ad024f303adb19475504ea4f7b79b3e97f566d90899721d3 SHA512 f5d687264f08146bf1eb54aee6d42a200fb97008a355d26a68be91b04e4bd622fc222725bf498c0837eacb8b94d6aede5aa1a05ed504fe5f9b790a9cd08d3973
+EBUILD gkrellmpc-0.1_beta10-r1.ebuild 864 BLAKE2B 84aaa3f316e955a9b9f61ce8b181a3cb1be779129bafcc92aef15be8041df3879b9377384c899ef88cf903228e168484b66b3e5461795462934cbcca971db398 SHA512 bbbd780a420280fb2273cdd45ee3cdaeef7f033f35a025d933d0be72f74b15e7183ac9d0a8f00ccc45236209c8d899ce614b175220b2ab63b52d54e6d7ba4105
 EBUILD gkrellmpc-0.1_beta10.ebuild 859 BLAKE2B 89421c770f6ced3a94022a4a3659b9a180644431c395145b4093e7b3177f40933c22bfb6bc6cee152a41c8841a9339507ffcda64f9976c3ab50c7941946c1471 SHA512 37bbf33f883dd373f490e947030c4dcf4d92fdbbf0d8d79cbe17795e085def544e05e3c8016e53eff7eb6e94276aebb59bb0b630a2eecb2afccc446b5a61bad4
 MISC metadata.xml 347 BLAKE2B d62b664aa75bf7dd141b70486d142f2db34c1580eaaa872d73457dbbdcc7b7967abc9096eee7a14ef22f5e6eb01e2df04fa7f87afdaa6a23d0a0470e2795fb68 SHA512 07bc016c43af13a53dd6ff3024c9412625e8e88472dfb45349b6cbcfc2b5a7e5451f7ac4cfeb5d1d88a8ea778e9b3e2c73d03f854d002d78a99e00bf35559b2f
diff --git a/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta10-r1-make-test.patch b/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta10-r1-make-test.patch
new file mode 100644
index 000000000000..9f2007e768d4
--- /dev/null
+++ b/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta10-r1-make-test.patch
@@ -0,0 +1,10 @@
+Makefile: Run gkrellm, not gkrellm2 for test
+
+--- a/Makefile
++++ b/Makefile
+@@ -90,4 +90,4 @@ deinstall uninstall:
+ 	if [ -f ~/.gkrellm2/plugins/gkrellmpc.so ]; then rm -f ~/.gkrellm2/plugins/gkrellmpc.so; fi 
+ 
+ test: gkrellmpc.so
+-	gkrellm2 -p gkrellmpc.so
++	gkrellm -p gkrellmpc.so
diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
new file mode 100644
index 000000000000..22adb571df55
--- /dev/null
+++ b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="A gkrellm plugin to control the MPD (Music Player Daemon)"
+HOMEPAGE="http://mpd.wikia.com/wiki/Client:GKrellMPC"
+SRC_URI="http://mina.naguib.ca/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"
+
+PATCHES=( "${FILESDIR}/${PF}"-make-test.patch )
+
+src_prepare() {
+	if use threads; then
+		PATCHES+=( "${FILESDIR}/${P}"-mt.patch )
+	fi
+	default
+}
+
+src_configure() {
+	tc-export CC
+}
+
+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
+}