[gentoo-commits] repo/gentoo:master commit in: media-plugins/gkrellmpc/
commit: 1b194723444d6c65a10130d37c03e6581d9efac0
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun May 8 06:23:11 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun May 8 06:23:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b194723
media-plugins/gkrellmpc: dropped obsolete 0.1_beta10
Bug: https://bugs.gentoo.org/843086
Signed-off-by: Miroslav Šulc gentoo.org>
.../gkrellmpc/gkrellmpc-0.1_beta10.ebuild | 41 --
1 file changed, 41 deletions(-)
diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
deleted file mode 100644
index a309150dbc98..
--- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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";
-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"
-
-src_prepare() {
- use threads && eapply "${FILESDIR}"/${P}-mt.patch
- eapply_user
-
- sed -i -e 's:gkrellm2 -p:gkrellm -p:' Makefile || die
-}
-
-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
-}
[gentoo-commits] repo/gentoo:master commit in: media-plugins/gkrellmpc/
commit: b6d520e1dbefeac891db90e7e23c6a4c2d50dcd8
Author: Jakov Smolić gentoo org>
AuthorDate: Sat May 7 10:56:05 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sat May 7 10:56:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6d520e1
media-plugins/gkrellmpc: Stabilize 0.1_beta10-r1 amd64, #843086
Signed-off-by: Jakov Smolić gentoo.org>
media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
index 6483b3733159..cd9c53fc2644 100644
--- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
+++ b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mina.naguib.ca/dist/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="threads"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-plugins/gkrellmpc/
commit: 7fe08e58ffa6de58204327c9dc29737ed644f4ee
Author: Jakov Smolić gentoo org>
AuthorDate: Sat May 7 10:55:34 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sat May 7 10:55:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fe08e58
media-plugins/gkrellmpc: Stabilize 0.1_beta10-r1 x86, #843086
Signed-off-by: Jakov Smolić gentoo.org>
media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
index 22adb571df55..6483b3733159 100644
--- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
+++ b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mina.naguib.ca/dist/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="threads"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-plugins/gkrellmpc/files/, media-plugins/gkrellmpc/
commit: 5582620b6261b390428cccebb0ccb8cd40f4ad75
Author: Thomas Bracht Laumann Jespersen laumann xyz>
AuthorDate: Fri Mar 18 20:45:47 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Apr 7 02:21:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5582620b
media-plugins/gkrellmpc: update EAPI 6 -> 8
Convert src_prepare() to use the PATCHES array, and calling default
instead of eapply_user().
Signed-off-by: Thomas Bracht Laumann Jespersen laumann.xyz>
Closes: https://github.com/gentoo/gentoo/pull/24709
Signed-off-by: Sam James gentoo.org>
.../files/gkrellmpc-0.1_beta10-r1-make-test.patch | 10 +
.../gkrellmpc/gkrellmpc-0.1_beta10-r1.ebuild | 43 ++
2 files changed, 53 insertions(+)
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 ..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 ..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
+}
[gentoo-commits] repo/gentoo:master commit in: media-plugins/gkrellmpc/files/
commit: b5c40d8f0ce46b60bcdaa4bf30f9da9f8abe1d6f
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Jan 6 09:11:45 2018 +
Commit: David Seifert gentoo org>
CommitDate: Sat Jan 13 22:40:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c40d8f
media-plugins/gkrellmpc: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/6770
.../gkrellmpc/files/gkrellmpc-0.1_beta9-mt.patch | 152 -
1 file changed, 152 deletions(-)
diff --git a/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta9-mt.patch
b/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta9-mt.patch
deleted file mode 100644
index 4de5688a2b5..000
--- a/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta9-mt.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff -uNr gkrellmpc-0.1_beta9/gkrellmpc.c gkrellmpc-0.1_beta9.mine/gkrellmpc.c
gkrellmpc-0.1_beta9/gkrellmpc.c2005-01-05 22:33:16.0 +0300
-+++ gkrellmpc-0.1_beta9.mine/gkrellmpc.c 2009-04-05 19:51:12.0
+0400
-@@ -132,7 +132,7 @@
- /* Create the status decal */
- mpc_status_decal = gkrellm_create_decal_pixmap(mpc_panel,
gkrellm_decal_misc_pixmap(), gkrellm_decal_misc_mask(), N_MISC_DECALS, style,
0, t);
- mpc_status_decal->x = w - mpc_status_decal->w;
-- gkrellm_draw_decal_pixmap(mpc_panel, mpc_status_decal, (mpc_mpd ?
D_MISC_LED1 : D_MISC_LED0));
-+ gkrellm_draw_decal_pixmap(mpc_panel, mpc_status_decal,
(mpc_mpd_connected() ? D_MISC_LED1 : D_MISC_LED0));
-
- /* Update t */
- t += mpc_label_decal->h > mpc_status_decal->h ? mpc_label_decal->h :
mpc_status_decal->h;
-@@ -254,7 +254,7 @@
- static gint x_scroll;
-
- /* Try to connect to mpd */
-- if (!mpc_mpd && mpc_ticker->ten_second_tick) {
-+ if (!mpc_mpd_connected() && mpc_ticker->ten_second_tick) {
- mpc_mpd_connect();
- }
-
-@@ -428,7 +428,7 @@
- status = mpc_mpd_get("status\n");
- currentsong = mpc_mpd_get("currentsong\n");
-
-- if (!mpc_mpd) {
-+ if (!mpc_mpd_connected()) {
- mpc_update_label("NO MPD");
- mpc_update_songname("");
- }
-diff -uNr gkrellmpc-0.1_beta9/mpd.c gkrellmpc-0.1_beta9.mine/mpd.c
gkrellmpc-0.1_beta9/mpd.c 2005-01-05 22:33:16.0 +0300
-+++ gkrellmpc-0.1_beta9.mine/mpd.c 2009-04-05 20:30:38.0 +0400
-@@ -12,18 +12,32 @@
- #include
- #include
-
-+#include
-+#include
-+
- GIOChannel * mpc_mpd = NULL;
-+pthread_mutex_t mpc_mutex = { { 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0, { 0 }
} }; //PTHREAD_MUTEX_INITIALIZER;
-+
-+gboolean mpc_mpd_connected() {
-+ if(pthread_mutex_trylock(&mpc_mutex)){
-+ return (FALSE);
-+ }
-+ pthread_mutex_unlock(&mpc_mutex);
-+ return (gboolean)mpc_mpd;
-+}
-
- /*
- * Connects to the MPD server, sets up the mpd object, sets the status decal
to ON
- */
--gboolean mpc_mpd_connect() {
-+void* mpc_mpd_connect_worker(void* arg) {
- int sockfd;
- struct hostent *server;
- struct sockaddr_in serv_addr;
- gchar * line;
- gchar ** parts;
- gboolean retval;
-+
-+ pthread_mutex_lock(&mpc_mutex);
-
- if (mpc_mpd) {
- /*
-@@ -33,11 +47,11 @@
- }
-
- if (!mpc_conf_hostname || !mpc_conf_port) {
-- return (FALSE);
-+ goto err;
- }
-
-- if ((sockfd = socket(PF_INET, SOCK_STREAM, 0)) == -1) return(FALSE);
-- if (!(server = gethostbyname(mpc_conf_hostname))) return(FALSE);
-+ if ((sockfd = socket(PF_INET, SOCK_STREAM, 0)) == -1) goto err;
-+ if (!(server = gethostbyname(mpc_conf_hostname))) goto err;
-
- bzero((char *) &serv_addr, sizeof(serv_addr));
- serv_addr.sin_family = AF_INET;
-@@ -46,7 +60,7 @@
- server->h_length);
- serv_addr.sin_port = htons(mpc_conf_port);
-
-- if (connect(sockfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) <
0) return(FALSE);
-+ if (connect(sockfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) <
0) goto err;
-
- /* Getup the mpd object */
- mpc_mpd = g_io_channel_unix_new(sockfd);
-@@ -72,29 +86,40 @@
- retval = FALSE;
- }
-
-- if (retval) {
-- gkrellm_draw_decal_pixmap(mpc_panel, mpc_status_decal,
D_MISC_LED1);
-- mpc_update_label("MPD");
-- mpc_update_songname("");
-- }
-
-- return(retval);
-+err:
-+ pthread_mutex_unlock(&mpc_mutex);
-+ return NULL;
-+}
-+
-+gboolean mpc_mpd_connect() {
-+ pthread_attr_t attr;
-+ pthread_t thread_id;
-+
-+ if(pthread_mutex_trylock(&mpc_mutex)){
-+ return (FALSE);
-+ }
-+
-+ pthread_attr_init(&attr);
-+ pthread_create(&thread_id, &attr, mpc_mpd_connect_worker, NULL);
-+
-+ pthread_mutex_unlock(&mpc_mutex);
-+
-+ return (FALSE);
- }
-
- /*
- * Disconnects fro
[gentoo-commits] repo/gentoo:master commit in: media-plugins/gkrellmpc/
commit: 459cd87d74d65ce6e1a71406da85abd4a8bb0e09
Author: David Seifert gentoo org>
AuthorDate: Wed Jan 3 22:34:34 2018 +
Commit: David Seifert gentoo org>
CommitDate: Thu Jan 4 09:16:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=459cd87d
media-plugins/gkrellmpc: Eclass update
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-plugins/gkrellmpc/Manifest | 1 -
.../gkrellmpc/gkrellmpc-0.1_beta10.ebuild | 17 ++
.../gkrellmpc/gkrellmpc-0.1_beta9-r1.ebuild| 38 --
3 files changed, 10 insertions(+), 46 deletions(-)
diff --git a/media-plugins/gkrellmpc/Manifest b/media-plugins/gkrellmpc/Manifest
index fbb4c80df54..6d9b079d427 100644
--- a/media-plugins/gkrellmpc/Manifest
+++ b/media-plugins/gkrellmpc/Manifest
@@ -1,2 +1 @@
DIST gkrellmpc-0.1_beta10.tar.gz 25388 BLAKE2B
2e3c97e7d5887e1c3ea6a693cde19470e476943658de607266aac9a3ecbc2a5215fcc266638909d2ad024f303adb19475504ea4f7b79b3e97f566d90899721d3
SHA512
f5d687264f08146bf1eb54aee6d42a200fb97008a355d26a68be91b04e4bd622fc222725bf498c0837eacb8b94d6aede5aa1a05ed504fe5f9b790a9cd08d3973
-DIST gkrellmpc-0.1_beta9.tar.gz 22029 BLAKE2B
2c69e1cfc8ac8a1966263caaeb8234d0607d1e8bac8df3df2ef0f0141a6523396aa376ce4b1d00a0bf269eecfbb9d88efe3f28610271c7bc1286a549480070bc
SHA512
8ea5b2964e8f430ec391d1dc475f00c6b3b7843952884c62c0fa76131f05a4e61f0dcbf4d1da38c3686e261027c409af28c1d36b87d383468abd4329313fb2db
diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
index 42c2ab21767..a309150dbc9 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 54940aa5bf0..000
--- 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
-}
[gentoo-commits] repo/gentoo:master commit in: media-plugins/gkrellmpc/
commit: 1af69f06907de4d296a203b77f511547daddd53f
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Oct 29 23:15:35 2017 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Oct 29 23:16:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1af69f06
media-plugins/gkrellmpc: x86 stable (bug #626252)
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
index 5aeac220657..42c2ab21767 100644
--- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
+++ b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=2
@@ -10,7 +10,7 @@ SRC_URI="http://mina.naguib.ca/dist/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="threads"
RDEPEND=">=app-admin/gkrellm-2[X]
[gentoo-commits] repo/gentoo:master commit in: media-plugins/gkrellmpc/
commit: 04083788b585df5782e18e366608b9a248754321
Author: Tobias Klausmann gentoo org>
AuthorDate: Mon Jul 31 12:21:44 2017 +
Commit: Tobias Klausmann gentoo org>
CommitDate: Mon Jul 31 12:56:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04083788
media-plugins/gkrellmpc-0.1_beta10-r0: amd64 stable
Gentoo-Bug: 626252
media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
index e11a06fc843..5aeac220657 100644
--- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
+++ b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mina.naguib.ca/dist/${P}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="threads"
RDEPEND=">=app-admin/gkrellm-2[X]
