gentoo resync : 12.05.2022

3 files changed, 65 insertions, 0 deletions

diff --git a/x11-plugins/gkrellm-xkb/Manifest b/x11-plugins/gkrellm-xkb/Manifest
index 1a6ba96d56d7..7872888185f6 100644
--- a/x11-plugins/gkrellm-xkb/Manifest
+++ b/x11-plugins/gkrellm-xkb/Manifest
@@ -1,4 +1,6 @@
+AUX gkrellm-xkb-1.05-r2-pkgconfig.patch 822 BLAKE2B dd522a931ba9fa01917afb9b1939078acc1dd65186bdccb63d3b861718290fa6765f69b37f2550f8d79088492688c01b6471f0700ee3266c91ec12c09ebaebad SHA512 e20e30a46e62a0f81b33a23eb0e120032eecdaa3f793c9bca9bf29e0faef4b277182c80b8f7ebf54b1675d57026ec79cbcb5d39fb200f3d13761402f432cfb47
 AUX gkrellm-xkb-makefile.patch 1030 BLAKE2B 24b53321c36b974541f77347a38da677a4b8b91408e7cdfb5de6f44bc07c3be9ff338937a957c3e9dcc1c6795d96addb020f4e5f4776d1c048dac549be9fd6de SHA512 2a9e3959ad0920126f1c93193f76b087590f5428fe2b8d1cd66670343547ed8030937723b4a0a71e620d1ac518ae4a36231aced63d88171976ea1cf1d3c2c4b7
 DIST gkrellm-xkb-1.05.tar.gz 37775 BLAKE2B 5b074d2777c250d1f7aeca4402401f36f7aed29ca2c7bf286348e73687b85f53b152b4cdb862c38ff7325a718dc694c0a921e8ec3ecefb52ad6646e1345a2101 SHA512 451c66c875af8dcb6998ba1b6242332002328b81112315cd6eee453612cbd8e23f78d7b829224d623cee90b08445b721dfd60e2483a710f4f97860c82654ba2e
 EBUILD gkrellm-xkb-1.05-r1.ebuild 593 BLAKE2B 7f167d781e0eba76e6dfe4bf62e939f380ac062543cbc471e3c3a4061583b7d5e8c172e2ea3e26f1fa8f75e9582c9283792296ca51a831f123d9d7562144037a SHA512 7ca25520f0919d3482c577ab22bb5f76db74b67ad9527379e37e6976bfa4cc049521a7d13fce95c5317652361a14936b53963e3dd015aaebc7963ef7262a6331
+EBUILD gkrellm-xkb-1.05-r2.ebuild 677 BLAKE2B f36b9df5f570ae39f7f165ff2e8be708eda15bfd8182e6d2bad65b929c01756dea69c0d62bf8ae151f3ea1767d9ad3c0fab950c7b5f824a3b22f590197eb584a SHA512 91a26d5b2a7bb9d858a098bbc5a8d446da98a7813d4bee321f38e3d7cc46198963e1ab90eb83de77f8c699cd2d54ba0935eb65131f10ec13e5447df1fa53c311
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch
new file mode 100644
index 000000000000..59208c8814bb
--- /dev/null
+++ b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch
@@ -0,0 +1,30 @@
+From f4cd320421d80075c280dc23115d00ecefb8501c Mon Sep 17 00:00:00 2001
+From: Thomas Bracht Laumann Jespersen <t@laumann.xyz>
+Date: Sat, 26 Mar 2022 16:08:49 +0100
+Subject: [PATCH] pkgconfig
+
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 13f2dd3..a63b4ab 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,10 @@
+ 
+ PREFIX ?= /usr/local
+-GTK_CONFIG = pkg-config gtk+-2.0
++PKG_CONFIG ?= pkg-config
+ PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins
+ GKRELLM_INCLUDE = -I$(PREFIX)/include
+-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)
+ FLAGS = -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+-- 
+2.34.1
+
diff --git a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild
new file mode 100644
index 000000000000..c148d04e190e
--- /dev/null
+++ b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="XKB keyboard switcher for gkrellm2"
+HOMEPAGE="http://tripie.sweb.cz/gkrellm/xkb/"
+SRC_URI="http://tripie.sweb.cz/gkrellm/xkb/dist/${P}.tar.gz"
+
+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_configure() {
+	PLUGIN_SO=( xkb$(get_modname) )
+	default
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}