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

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

[David Seifert]

commit:     a573eb974e9204b58c7d2395e957de76a2f525ba
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 22:34:33 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan  4 09:16:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a573eb97

x11-plugins/gkrellkam: Eclass update

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../gkrellkam/files/gkrellkam-2.0.0-makefile.patch |  4 ++--
 x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild       | 27 +++++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
index 83178b4b0ff..f897f4102b6 100644
--- a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
+++ b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile	2002-10-23 18:36:20.000000000 +0200
-+++ Makefile_new	2013-03-16 14:02:42.979029588 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -12,10 +12,10 @@
  # This should point to the GKrellM headers
  GKRELLM_HDRS = /usr/include

diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
index ae3ad974d5d..bbb98a01715 100644
--- a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
+++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
@@ -1,35 +1,36 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit eutils gkrellm-plugin toolchain-funcs
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
 
 MY_P=${P/-/_}
 
 DESCRIPTION="an Image-Watcher-Plugin for GKrellM2"
 SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
 HOMEPAGE="http://gkrellkam.sourceforge.net"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86 ppc sparc alpha amd64"
+IUSE=""
 
-RDEPEND="net-misc/wget
-	 app-admin/gkrellm[X]"
+RDEPEND="
+	 app-admin/gkrellm:2[X]
+	 net-misc/wget"
 DEPEND="${RDEPEND}"
 
-PLUGIN_SO=gkrellkam2.so
-PLUGIN_DOCS="example.list"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
 }
 
-src_install () {
+src_install() {
+	local PLUGIN_SO=( ${PN}2$(get_modname) )
+	local PLUGIN_DOCS=( example.list )
+
 	gkrellm-plugin_src_install
 	doman gkrellkam-list.5
 }

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

[Sam James]

commit:     8e5f9cf044af35d05b8a6f4e68efe05d4acd2c37
Author:     Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Sat Mar 26 15:00:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 19:54:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e5f9cf0

x11-plugins/gkrellkam: 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/gkrellkam-2.0.0-r1-pkgconfig.patch       | 13 +++++++
 x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild    | 40 ++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-r1-pkgconfig.patch b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-r1-pkgconfig.patch
new file mode 100644
index 000000000000..c5993890fe6e
--- /dev/null
+++ b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-r1-pkgconfig.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -12,8 +12,9 @@ DESTDIR =
+ # This should point to the GKrellM headers
+ GKRELLM_HDRS = /usr/include
+ 
++PKG_CONFIG ?= pkg-config
+ CC = $(CC)
+-GTKFLAGS := $(shell pkg-config gtk+-2.0 --cflags)
++GTKFLAGS := $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
+ CFLAGS := $(CFLAGS) -fPIC $(GTKFLAGS) -I$(GKRELLM_HDRS)
+ LFLAGS = -shared
+ INST_DIR := $(DESTDIR)/usr/lib/gkrellm2/plugins

diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..951eb4818034
--- /dev/null
+++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+MY_P=${P/-/_}
+
+DESCRIPTION="an Image-Watcher-Plugin for GKrellM2"
+HOMEPAGE="http://gkrellkam.sourceforge.net"
+SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	net-misc/wget"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-r1-pkgconfig.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	local PLUGIN_SO=( ${PN}2$(get_modname) )
+	local PLUGIN_DOCS=( example.list )
+
+	gkrellm-plugin_src_install
+	doman gkrellkam-list.5
+}