[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-imonc/files/, x11-plugins/gkrellm-imonc/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-imonc/files/, x11-plugins/gkrellm-imonc/

[Michael Orlitzky]

commit:     51d8d2f1eaf8ca67459dddeed5dc6ce584fc1a46
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  7 04:06:55 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 04:07:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d8d2f1

x11-plugins/gkrellm-imonc: new revision that respects LDFLAGS.

This is another revision thanks to Michael Mair-Keimberger. His patch
fixes the Makefile so that it adds $(LDFLAGS) in the right spots, and
also happens to fix $(CC) in the process. An EAPI=2 USE-dependency was
added for gkrellm (also part of the patch), and the ebuild was updated
to use EAPI=6.

Gentoo-Bug: 335013

Package-Manager: portage-2.2.28

 .../files/gkrellm-imonc-makefile.patch             | 35 ++++++++++++++++++++++
 .../gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild      | 29 ++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-makefile.patch b/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-makefile.patch
new file mode 100644
index 0000000..598e5d8
--- /dev/null
+++ b/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-makefile.patch
@@ -0,0 +1,35 @@
+--- a/Makefile	2003-05-17 20:08:29.000000000 +0200
++++ b/Makefile	2013-03-13 18:24:24.552941672 +0100
+@@ -9,12 +9,10 @@
+ GTK_INCLUDE = $(shell pkg-config gtk+-2.0 --cflags)
+ GTK_LIB = $(shell pkg-config gtk+-2.0 --libs)
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ 
+-LFLAGS = -shared
+-
+-CC = gcc 
++LFLAGS = -shared 
+ 
+ #
+ # files
+@@ -30,7 +28,7 @@
+ 
+ 
+ %.o : %.c
+-	$(CC) $(CFLAGS) $(FLAGS) -c $< -o $@ 
++	$(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) -c $< -o $@ 
+ 
+ 
+ all:
+@@ -41,7 +39,7 @@
+ 
+ $(TARGET): $(OBJECTS)
+ 	@echo -e "\n\n>> linking\n"
+-	$(CC) $(OBJECTS) -o $@ $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) -o $@ $(LFLAGS) $(LIBS)
+ 	@echo -e "\n<< done "
+ 
+ install: gkrellm-imonc.so

diff --git a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
new file mode 100644
index 0000000..856afe7
--- /dev/null
+++ b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit gkrellm-plugin
+
+DESCRIPTION="A GKrellM2 plugin to control a fli4l router"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2"
+HOMEPAGE="http://${PN}.sourceforge.net/"
+
+# The COPYING file contains the GPLv2, but the file headers say GPLv2+.
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="app-admin/gkrellm[X]"
+DEPEND+=" ${COMMON_DEPEND}"
+RDEPEND+=" ${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-imonc/files/, x11-plugins/gkrellm-imonc/

[Sam James]

commit:     8f9e87f6a70d983ff038555d5850dffd7388bd9c
Author:     Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Mon Apr  4 12:21:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 19:54:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f9e87f6

x11-plugins/gkrellm-imonc: update EAPI 6 -> 8

Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/gkrellm-imonc-0.2-r2-pkgconfig.patch     | 15 ++++++++++
 .../gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild      | 32 ++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-0.2-r2-pkgconfig.patch b/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-0.2-r2-pkgconfig.patch
new file mode 100644
index 000000000000..c8c1d8fe46ff
--- /dev/null
+++ b/x11-plugins/gkrellm-imonc/files/gkrellm-imonc-0.2-r2-pkgconfig.patch
@@ -0,0 +1,15 @@
+Respect user's pkg-config
+--- a/Makefile
++++ b/Makefile
+@@ -6,8 +6,9 @@ DISTRIB_DIR= gkrellm-imonc-$(VERSION)
+ #
+ #
+ 
+-GTK_INCLUDE = $(shell pkg-config gtk+-2.0 --cflags)
+-GTK_LIB = $(shell pkg-config gtk+-2.0 --libs)
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)

diff --git a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild
new file mode 100644
index 000000000000..a06fa4d4fd66
--- /dev/null
+++ b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r2.ebuild
@@ -0,0 +1,32 @@
+# 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 GKrellM2 plugin to control a fli4l router"
+HOMEPAGE="http://gkrellm-imonc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2"
+S="${WORKDIR}/${PN}-src-${PV}"
+
+# The COPYING file contains the GPLv2, but the file headers say GPLv2+.
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-makefile.patch
+	"${FILESDIR}"/${P}-r2-pkgconfig.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}