[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmwireless/
commit: 891b9feab9d1718c17332ba88ba37ef84119e48a Author: David Seifert gentoo org> AuthorDate: Fri Feb 10 21:14:17 2023 + Commit: David Seifert gentoo org> CommitDate: Fri Feb 10 21:14:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=891b9fea x11-plugins/gkrellmwireless: fix IndirectInherits on multilib Signed-off-by: David Seifert gentoo.org> x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild index e20fd3092da4..c849f82400ba 100644 --- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild +++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit gkrellm-plugin toolchain-funcs +inherit gkrellm-plugin multilib toolchain-funcs DESCRIPTION="A plugin for GKrellM that monitors your wireless network card" HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php";
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmwireless/
commit: 90b75ecc881c7512e287eef2c5609e0eb766f469 Author: Sam James gentoo org> AuthorDate: Fri Feb 3 11:07:11 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 3 11:07:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b75ecc x11-plugins/gkrellmwireless: adopt Help very much still welcome, just adopting so it's not m-n and can fix the easy bugs at least. Signed-off-by: Sam James gentoo.org> x11-plugins/gkrellmwireless/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x11-plugins/gkrellmwireless/metadata.xml b/x11-plugins/gkrellmwireless/metadata.xml index 85e4ed814fa2..641cbd3703e7 100644 --- a/x11-plugins/gkrellmwireless/metadata.xml +++ b/x11-plugins/gkrellmwireless/metadata.xml @@ -1,5 +1,8 @@ https://www.gentoo.org/dtd/metadata.dtd";> - + + s...@gentoo.org + Sam James +
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmwireless/
commit: ee1b3b9ffcd86aeae8300803dc9ad6280c52879b Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Aug 29 07:35:20 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Aug 29 08:36:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee1b3b9f x11-plugins/gkrellmwireless: drop 2.0.3-r2 Closes: https://bugs.gentoo.org/867175 Signed-off-by: Andreas Sturmlechner gentoo.org> .../gkrellmwireless-2.0.3-r2.ebuild| 28 -- 1 file changed, 28 deletions(-) diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild deleted file mode 100644 index 1edfe3999836.. --- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gkrellm-plugin toolchain-funcs - -DESCRIPTION="A plugin for GKrellM that monitors your wireless network card" -SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"; -HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php"; - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="amd64 ~ppc ~sparc x86" -IUSE="" - -RDEPEND="app-admin/gkrellm:2[X]" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${PN} -PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-build-system.patch ) - -src_configure() { - tc-export CC - - PLUGIN_SO=( wireless$(get_modname) ) - default -}
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmwireless/
commit: 005a12ee9637348f3c724061e5c0aba7d70087b7 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Aug 29 07:20:59 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Aug 29 07:20:59 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005a12ee x11-plugins/gkrellmwireless: x86 stable wrt bug #867175 Signed-off-by: Agostino Sarubbo gentoo.org> x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild index 7f141af562bf..e20fd3092da4 100644 --- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild +++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="2" -KEYWORDS="amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc x86" RDEPEND="app-admin/gkrellm:2[X]" DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmwireless/
commit: 378648d89f6fede2f18adc2e44f6a1e9a1bf980a Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Aug 29 07:17:59 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Aug 29 07:17:59 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378648d8 x11-plugins/gkrellmwireless: amd64 stable wrt bug #867175 Signed-off-by: Agostino Sarubbo gentoo.org> x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild index 45819d00691d..7f141af562bf 100644 --- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild +++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="2" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc ~x86" RDEPEND="app-admin/gkrellm:2[X]" DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmwireless/, x11-plugins/gkrellmwireless/files/
commit: cd7efe7180f14955bb4911edbbcb4a74b580e8b2 Author: Thomas Bracht Laumann Jespersen laumann xyz> AuthorDate: Fri Apr 8 19:42:28 2022 + Commit: Sam James gentoo org> CommitDate: Thu Apr 21 19:54:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7efe71 x11-plugins/gkrellmwireless: update EAPI 6 -> 8 Signed-off-by: Thomas Bracht Laumann Jespersen laumann.xyz> Closes: https://github.com/gentoo/gentoo/pull/24737 Signed-off-by: Sam James gentoo.org> .../files/gkrellmwireless-2.0.3-r3-pkgconfig.patch | 27 +++ .../gkrellmwireless-2.0.3-r3.ebuild| 31 ++ 2 files changed, 58 insertions(+) diff --git a/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-r3-pkgconfig.patch b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-r3-pkgconfig.patch new file mode 100644 index ..79e72bf1ba3c --- /dev/null +++ b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-r3-pkgconfig.patch @@ -0,0 +1,27 @@ +Respect user's pkg-config +--- a/Makefile b/Makefile +@@ -1,20 +1,10 @@ + # Depends on gmake.. + # + OS = $(shell uname) ++PKG_CONFIG ?= pkg-config + +-ifeq ($(OS),FreeBSD) +- GTK_CONFIG = pkg-config gtk+-2.0 +- INCLUDE = -I/usr/src/sys +-elseif eq ($(OS),NetBSD) +- GTK_CONFIG = pkg-config gtk+-2.0 +-else +-# default to the linux +- GTK_CONFIG = pkg-config gtk+-2.0 +-endif +- +- +-GTK_CFLAGS = `$(GTK_CONFIG) --cflags` +-GTK_LIB = `$(GTK_CONFIG) --libs` ++GTK_CFLAGS = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags) ++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs) + + CFLAGS += -Wall -fPIC + CPPFLAGS += $(GTK_CFLAGS) $(GKRELLM_INCLUDE) diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild new file mode 100644 index ..45819d00691d --- /dev/null +++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r3.ebuild @@ -0,0 +1,31 @@ +# 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 plugin for GKrellM that monitors your wireless network card" +HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php"; +SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"; +S="${WORKDIR}/${PN}" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +RDEPEND="app-admin/gkrellm:2[X]" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.3-fix-build-system.patch + "${FILESDIR}"/${PN}-2.0.3-r3-pkgconfig.patch +) + +src_configure() { + tc-export CC PKG_CONFIG + + PLUGIN_SO=( wireless$(get_modname) ) + default +}
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmwireless/
commit: ec0b2cbf9259b10a7dc18aeb200f29793d8f4f81 Author: Sam James gentoo org> AuthorDate: Thu Mar 10 22:44:07 2022 + Commit: Sam James gentoo org> CommitDate: Thu Mar 10 22:44:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec0b2cbf x11-plugins/gkrellmwireless: fix commands in global scope Closes: https://bugs.gentoo.org/788067 Signed-off-by: Sam James gentoo.org> x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild index d3956e0aa0d0..1edfe3999836 100644 --- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild +++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -20,8 +20,9 @@ DEPEND="${RDEPEND}" S=${WORKDIR}/${PN} PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-build-system.patch ) -PLUGIN_SO=( wireless$(get_modname) ) - src_configure() { tc-export CC + + PLUGIN_SO=( wireless$(get_modname) ) + default }
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmwireless/, x11-plugins/gkrellmwireless/files/
commit: 9916796c05f54114c272a13c17505f522efef506 Author: David Seifert gentoo org> AuthorDate: Wed Jan 3 22:34:32 2018 + Commit: David Seifert gentoo org> CommitDate: Thu Jan 4 09:15:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9916796c x11-plugins/gkrellmwireless: Eclass update Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../gkrellmwireless-2.0.3-fix-build-system.patch | 26 ++ .../gkrellmwireless-2.0.3-r2.ebuild| 22 +- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch new file mode 100644 index 000..eb821e9b2de --- /dev/null +++ b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch @@ -0,0 +1,26 @@ +--- a/Makefile b/Makefile +@@ -16,12 +16,11 @@ + GTK_CFLAGS = `$(GTK_CONFIG) --cflags` + GTK_LIB = `$(GTK_CONFIG) --libs` + +-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) ++CFLAGS += -Wall -fPIC ++CPPFLAGS += $(GTK_CFLAGS) $(GKRELLM_INCLUDE) + LIBS = $(GTK_LIB) + LFLAGS = -shared + +-CC = gcc $(CFLAGS) $(FLAGS) +- + OBJS = wireless.o + + PLUGIN_DIR = /usr/lib/gkrellm2/plugins +@@ -32,7 +31,7 @@ + all: wireless.so + + wireless.so: $(OBJS) +- $(CC) $(OBJS) -o wireless.so $(LFLAGS) $(LIBS) ++ $(CC) $(LDFLAGS) $^ -o $@ $(LFLAGS) $(LIBS) + + clean: + rm -f *.o core *.so* *.bak *~ diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild index 85fd1b16079..d3956e0aa0d 100644 --- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild +++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit gkrellm-plugin toolchain-funcs -S="${WORKDIR}/${PN}" DESCRIPTION="A plugin for GKrellM that monitors your wireless network card" SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"; HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php"; -SLOT="2" LICENSE="GPL-2" +SLOT="2" KEYWORDS="amd64 ~ppc ~sparc x86" IUSE="" -RDEPEND="app-admin/gkrellm[X]" +RDEPEND="app-admin/gkrellm:2[X]" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${PN} +PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-build-system.patch ) -PLUGIN_SO=wireless.so +PLUGIN_SO=( wireless$(get_modname) ) -src_prepare() { - default - sed -i \ - -e '/^CC =/s:gcc $(CFLAGS) $(FLAGS):'"$(tc-getCC)"' $(FLAGS) $(CFLAGS):' \ - -e '/-o wireless.so/s: : $(LDFLAGS) :' \ - Makefile || die +src_configure() { + tc-export CC }
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmwireless/
commit: aa3737e0fb532379cc7a2823cd4369285c0856ff Author: Pacho Ramos gentoo org> AuthorDate: Wed Jul 26 10:59:52 2017 + Commit: Pacho Ramos gentoo org> CommitDate: Wed Jul 26 11:34:32 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3737e0 x11-plugins/gkrellmwireless: Drop old Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../gkrellmwireless-2.0.3-r1.ebuild| 24 -- .../gkrellmwireless/gkrellmwireless-2.0.3.ebuild | 16 --- 2 files changed, 40 deletions(-) diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r1.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r1.ebuild deleted file mode 100644 index 9cc23ad3c70..000 --- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit gkrellm-plugin toolchain-funcs - -IUSE="" -S="${WORKDIR}/${PN}" -DESCRIPTION="A plugin for GKrellM that monitors your wireless network card" -SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"; -HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php"; - -SLOT="2" -LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc ~sparc x86" - -PLUGIN_SO=wireless.so - -src_prepare() { - sed -i \ - -e '/^CC =/s:gcc $(CFLAGS) $(FLAGS):'"$(tc-getCC)"' $(FLAGS) $(CFLAGS):' \ - -e '/-o wireless.so/s: : $(LDFLAGS) :' \ - Makefile -} diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3.ebuild deleted file mode 100644 index 0caa689849c..000 --- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -inherit gkrellm-plugin - -IUSE="" -S="${WORKDIR}/${PN}" -DESCRIPTION="A plugin for GKrellM that monitors your wireless network card" -SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"; -HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php"; - -SLOT="2" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc ~sparc x86" - -PLUGIN_SO=wireless.so
[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmwireless/
commit: 4d68504044204604c3d1dd2aa5de5742e98fd03d Author: Pacho Ramos gentoo org> AuthorDate: Wed Jul 26 10:59:38 2017 + Commit: Pacho Ramos gentoo org> CommitDate: Wed Jul 26 11:34:30 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d685040 x11-plugins/gkrellmwireless: Fix dependency on gkrellm[X] Package-Manager: Portage-2.3.6, Repoman-2.3.2 RepoMan-Options: --force .../gkrellmwireless-2.0.3-r2.ebuild| 27 ++ 1 file changed, 27 insertions(+) diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild new file mode 100644 index 000..85fd1b16079 --- /dev/null +++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gkrellm-plugin toolchain-funcs + +S="${WORKDIR}/${PN}" +DESCRIPTION="A plugin for GKrellM that monitors your wireless network card" +SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"; +HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php"; + +SLOT="2" +LICENSE="GPL-2" +KEYWORDS="amd64 ~ppc ~sparc x86" +IUSE="" + +RDEPEND="app-admin/gkrellm[X]" + +PLUGIN_SO=wireless.so + +src_prepare() { + default + sed -i \ + -e '/^CC =/s:gcc $(CFLAGS) $(FLAGS):'"$(tc-getCC)"' $(FLAGS) $(CFLAGS):' \ + -e '/-o wireless.so/s: : $(LDFLAGS) :' \ + Makefile || die +}