gentoo resync : 12.05.2022

3 files changed, 116 insertions, 0 deletions

diff --git a/x11-plugins/gkrelltop/Manifest b/x11-plugins/gkrelltop/Manifest
index 3302e26ffa61..e0195ca97df9 100644
--- a/x11-plugins/gkrelltop/Manifest
+++ b/x11-plugins/gkrelltop/Manifest
@@ -1,4 +1,6 @@
 AUX gkrelltop-2.2.13-fix-build-system.patch 1088 BLAKE2B 8b8b00fde60ace4fc98848eb436224419f7ec1a13a5da232a28081ecb47825be039aa9a515768478d1bc0fb7114ba040929d9ac05edcbd78bcd0b24562e824fc SHA512 d53dcd1cce67b6b18c5e6ab3cf679a16510cfb8f811d90f47315a5d2161364ee47f1c975c85b26886145c40a95ef7c77a944a0056ada470c176d8791b2b0f2b0
+AUX gkrelltop-2.2.13-r3-pkgconfig.patch 1993 BLAKE2B 96ed9ff7e38513586dfcdecf7e714e53867c50eadebd96061cd99f743add1c0571c00ec0ebe1431e78889ed1142e6c98bb538f483ecb81453ffbce435eb16767 SHA512 edfe721f4a184dd0dee5d23c3bf13444f9a5fc4a54df414461ddf8098a3ff5e07d1b38ac54d7c3311b1131e8683b24795bfb42df5e02625f7aeb47ce6f5efc6f
 DIST gkrelltop_2.2.13.orig.tar.gz 49023 BLAKE2B d2857b6d73fca2a2933f4bcaa207dbf34f9bbc2bb9de922d564a865d2238b91d9bbcfbdf5753d7976d941d9ba98c9e7b81812018a2d9d1ac07984e26c3317382 SHA512 9479c5b860833671451b6fb8583e741b1ac755ed76b7e73dffd65d13d30d0b5da1916436901642f738e0d72f8c8696f4dea9c041a203e76d309f2782acf7024e
 EBUILD gkrelltop-2.2.13-r2.ebuild 945 BLAKE2B 73554d39c2cb6085814aa2fe940ee4d5e410aca555db717d1460aac8644c9e8b65aa525f937ff25b33bf17f09dba6345042e2003aa9b682d54b00509c34f006c SHA512 94bd96cd7100d8769e447d98689a8e9fca101fac5117d10133065064dabcb2d195ca0c4738a72dc77d159dea1b0a1d0cbdeb640a9d37a0e05f071e99c986eaee
+EBUILD gkrelltop-2.2.13-r3.ebuild 1035 BLAKE2B d213cb7ffe8ad0ca10f2037fc7d09b416d5be174ac47d6cbb4484d88c1a4554746ce608917a30cf4d4e7f14e36848f7d3417d5ba298792de711d1d3fe1856481 SHA512 ad8c5743ad1fa86bdca730644c1567c21f8c76c67aa66c638a00be5d15297ac8b2f0f49d3d8320bd79389a531f6709d0a4e1a1a03619ea316d777308338e1f06
 MISC metadata.xml 247 BLAKE2B 4c2928903af2aef15b40f59ae2cd005af84ac0552409301181fcededae0eedd5f7a7986106c9b25b25f6a170e18c9e5115ea14711a0639b351dac2cd6205bfbb SHA512 14c94ed4ec200fdcc265fbd2a1012c9cb143d98a6a28bfdad509c834a742803b1a62398034a36e4160b216f250f01292e642dc05621162008633e3ae4484faf1
diff --git a/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch
new file mode 100644
index 000000000000..552190827da5
--- /dev/null
+++ b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch
@@ -0,0 +1,67 @@
+Makefile and configure should respect user's pkg-config
+--- a/Makefile
++++ b/Makefile
+@@ -28,9 +28,10 @@
+ OSFLAG = $(shell uname | tr '[:lower:]' '[:upper:]')
+ SHELL=/bin/sh
+ 
++PKG_CONFIG ?= pkg-config
+ GKRELL1FLAG=1
+ #find out if we have gkrellm 2 or 1 (from the gtk+ version)
+-GKRELL1FLAG=$(shell bash -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0')
++GKRELL1FLAG=$(shell bash -c "${PKG_CONFIG} gtk+-2.0 --cflags &>/dev/null && echo 0")
+ GKRELLTOP = gkrelltop.so
+ OBJ = top_three.o gkrelltop.o 
+ EXTRA = krell_panel1.xpm
+@@ -43,7 +44,8 @@ endif
+ 
+ ifeq ($(GKRELL1FLAG),0)
+ # Parameters for gkrellm version 2.*
+-CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall `pkg-config gtk+-2.0 --cflags`
++GTK_INCLUDE=$(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall ${GTK_INCLUDE}
+ LIBS =  
+ CC += $(CFLAGS) $(CFLAGS2)
+ 
+@@ -69,8 +71,9 @@ LIBSD = `glib-config --libs`
+ LIBSD = 
+ CONFIGURE_ARGS += --with-glib12
+ else
+-CFLAGSD = -D$(OSFLAG) -fPIC -Wall `pkg-config glib-2.0 --cflags`
+-LIBSD = `pkg-config glib-2.0 --libs`
++GLIB_INCLUDE=$(shell ${PKG_CONFIG} glib-2.0 --cflags)
++CFLAGSD = -D$(OSFLAG) -fPIC -Wall ${GLIB_INCLUDE}
++LIBSD = $(shell ${PKG_CONFIG} glib-2.0 --libs)
+ LIBSD = 
+ endif
+ INSTALLDIRD ?= $(PREFIXD)/$(DESTDIR)
+diff --git a/configure b/configure
+index f0b7366..99f58d8 100755
+--- a/configure
++++ b/configure
+@@ -4,8 +4,9 @@
+ # There is no need to run this configure before doing a make.
+ #
+ 
+-GLIB_INCLUDE=`pkg-config --cflags glib-2.0`
+-GLIB_LIBS=`pkg-config --libs glib-2.0`
++PKG_CONFIG=${PKG_CONFIG-pkg-config}
++GLIB_INCLUDE=$(${PKG_CONFIG} --cflags glib-2.0)
++GLIB_LIBS=$(${PKG_CONFIG} --libs glib-2.0)
+ 
+ for i
+ do
+@@ -17,8 +18,8 @@ do
+ done
+ 
+ 
+-PKG_INCLUDE=`pkg-config gkrellm --cflags --silence-errors`
+-PKG_LIBS=`pkg-config gkrellm --libs --silence-errors`
++PKG_INCLUDE=$(${PKG_CONFIG} gkrellm --cflags --silence-errors)
++PKG_LIBS=$(${PKG_CONFIG} gkrellm --libs --silence-errors)
+ 
+ if [ "$PKG_INCLUDE" = "" ]
+ then
+-- 
+2.34.1
+
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild
new file mode 100644
index 000000000000..c9faf9266655
--- /dev/null
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild
@@ -0,0 +1,47 @@
+# 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 which displays the top three processes"
+HOMEPAGE="https://sourceforge.net/projects/gkrelltop"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
+S="${WORKDIR}/${P}.orig"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-libs/glib:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.13-fix-build-system.patch
+	"${FILESDIR}"/${PN}-2.2.13-r3-pkgconfig.patch
+)
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	PLUGIN_SERVER_SO=( gkrelltopd$(get_modname) )
+	PLUGIN_SO=( gkrelltop$(get_modname) )
+
+	default
+}
+
+src_compile() {
+	use X || local target="server"
+	emake ${target}
+}
+
+pkg_postinst() {
+	einfo "To enable the gkrelltopd server plugin, you must add the following"
+	einfo "line to /etc/gkrellmd.conf:"
+	einfo "\tplugin-enable gkrelltopd"
+}