gentoo resync : 12.05.2022

4 files changed, 126 insertions, 0 deletions

diff --git a/x11-plugins/i8krellm/Manifest b/x11-plugins/i8krellm/Manifest
index fcdaeaf0c78c..96d23f5cc4e1 100644
--- a/x11-plugins/i8krellm/Manifest
+++ b/x11-plugins/i8krellm/Manifest
@@ -1,4 +1,7 @@
 AUX i8krellm-2.5-Respect-LDFLAGS.patch 187 BLAKE2B 20c7ea678a56d705c2289bec2690e4254594fb1815101c4a4ac18f77a4de639b9a71392925d197db98033d716ba9cb604509da9858bd7d40f5cc5d7b23b2771c SHA512 78b953668ee6041f01f56c67cb0b2f3eb680585e833df0bdbc577c31b68d7155cd27e90ece352e50b6b93b189c6f996e5c45c93214f8a2fd31deecc26e22ec14
+AUX i8krellm-2.5-r3-makefile-fixes.patch 1459 BLAKE2B 3cc267b4ff16d339430d1d19dcc011a65dfb03c5db86d0806fe41f05f9c73736d9ec0dd4bcc541923fb9fb8aa796e942d030436fbb442ab8b04737d63c0a1b2f SHA512 7824a0682c25933152398f3e99f771db9f778e09a63344bffa8dda86968a862cc6b4f8d89893a9856bb133483b2437feb8c20d04644579ae25f0fb4f841e4aad
+AUX i8krellm-2.5-r3-rm-gkrellm1-support.patch 1319 BLAKE2B 825df0a3e71a48c84d79552090c4f3fb0fdca803f2420381c9caaf401f5f089a482cf7f54ecde086d5820f797ed204a9525d07d9e57c1c7a2fd0c52acf9f6daa SHA512 d5c6f417cf7486e05e621054c84dba13b174e33684e32a0d3554cb5c64477661691f9388904329ba71c928e5c580193ecb82a7fd2be9824ad1d675cdf08d582b
 DIST i8krellm-2.5.tar.gz 15378 BLAKE2B be6af7ce0ee2986fd5463fba2b747721407fe3d06bcd1ae7e30dc273a883fd2f9a092ab73b97b6f7d20dd87454eec28db9e12d701dcaec4dda9267af889e662b SHA512 d1cd452fc83c24369b4773d959e0182bd5c7fe317bed6a1df716c1576f5ba078a4e82d202ff641f0784532b77a51d466e57ffc675895a1875a868d92caf79576
 EBUILD i8krellm-2.5-r2.ebuild 509 BLAKE2B fece596d5c46ac1b92a0a2db1ffedaa01a8501cab672a4983c267e0b5a221fee4ce20c9b2d442db5f66006e2d0c09f53723223a8a0b57b8c160031d9a9e3587f SHA512 dda3d7d3a229cb49908a9d2a9b828b95b9361dbcd20c9a2c2c1de0cb477672aa605aa42f64498ca125959afa668233074d06c6995624ed223700df1e2ec0b7d9
+EBUILD i8krellm-2.5-r3.ebuild 703 BLAKE2B 7fe6be4964ff3b2f220c43859c3bc5a08e082c06d439132671c3058a587b35361b48ed8c88c473ca4f06fd63b30ac3738943e7664ec1b8ee784c8926d3eadff2 SHA512 12bb2e69f2176a508e26895bf02cf86a88913de1f42f600f0c91e92a414e5b176ffc7a1ce06295308060a7b3d9d0fc4f23a939a01f6c30b6d226201b4ca9a420
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/i8krellm/files/i8krellm-2.5-r3-makefile-fixes.patch b/x11-plugins/i8krellm/files/i8krellm-2.5-r3-makefile-fixes.patch
new file mode 100644
index 000000000000..154c4f293179
--- /dev/null
+++ b/x11-plugins/i8krellm/files/i8krellm-2.5-r3-makefile-fixes.patch
@@ -0,0 +1,42 @@
+Respect user's pkg-config, don't call gcc directly, respect CFLAGS
+--- a/Makefile
++++ b/Makefile
+@@ -8,14 +8,14 @@ LFLAGS += $(LDFLAGS)
+ 
+ ## Support for GKrellM 2.0
+ #
+-GTK2_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+-GTK2_LIB = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK2_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++GTK2_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ SINSTALLDIR2 = /usr/share/gkrellm2/plugins
+ UINSTALLDIR2 = $(HOME)/.gkrellm2/plugins
+-FLAGS2 = -O2 -Wall -fPIC -I. $(GTK2_INCLUDE)
++FLAGS2 = -fPIC -I. $(GTK2_INCLUDE)
+ LIBS2 = $(GTK2_LIB)
+-CC2 = gcc $(FLAGS2) -DGKRELLM2
+-CC2F = gcc $(FLAGS2) -DFAKE -DGKRELLM2
++CC = $(CC)
+ OBJS2 = i8krellm.o
+ 
+ # seems to barf without the @echo....
+@@ -23,14 +23,14 @@ i8krellm: i8krellm.so
+ 	@echo ""
+ 
+ i8krellm.so: $(OBJS2)
+-	$(CC2) $(OBJS2) -o i8krellm.so $(LFLAGS) $(LIBS2)
++	$(CC) $(CFLAGS) $(CFLAGS) $(FLAGS2) -DGKRELLM2 $(OBJS2) -o i8krellm.so $(LFLAGS) $(LIBS2)
+ 
+ fake: i8krellm.c prop-anim.xpm
+-	$(CC2F) -c -o i8krellm.o i8krellm.c
+-	$(CC2F) $(OBJS2) -o i8krellm.so $(LFLAGS) $(LIBS2)
++	$(CC) $(CFLAGS) $(FLAGS2) -DFAKE -DGKRELLM2 -c -o i8krellm.o i8krellm.c
++	$(CC) $(CFLAGS) $(FLAGS2) -DFAKE -DGKRELLM2 $(OBJS2) -o i8krellm.so $(LFLAGS) $(LIBS2)
+ 
+ i8krellm.o: i8krellm.c prop-anim.xpm
+-	$(CC2) -c -o i8krellm.o i8krellm.c
++	$(CC) $(CFLAGS) $(FLAGS2) -DGKRELLM2 -c -o i8krellm.o i8krellm.c
+ 
+ site_install: i8krellm.so
+ 	install -c -s -m 644 i8krellm.so $(SINSTALLDIR2)
diff --git a/x11-plugins/i8krellm/files/i8krellm-2.5-r3-rm-gkrellm1-support.patch b/x11-plugins/i8krellm/files/i8krellm-2.5-r3-rm-gkrellm1-support.patch
new file mode 100644
index 000000000000..e46e0d6ac21c
--- /dev/null
+++ b/x11-plugins/i8krellm/files/i8krellm-2.5-r3-rm-gkrellm1-support.patch
@@ -0,0 +1,50 @@
+Remove support for gkrellm1
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,4 @@
+ # To build for GKrellM v2, just type 'make' and 'make install'
+-# For GKrellM v1, type 'make i8krellm1' and 'make install1'
+ # 
+ 
+ LFLAGS = -shared
+@@ -43,40 +42,3 @@ install: i8krellm.so
+ 
+ clean:
+ 	rm -f *.o core *.so
+-
+-
+-## Support for GKrellM 1.2
+-#
+-GTK_INCLUDE = `gtk-config --cflags`
+-GTK_LIB = `gtk-config --libs` -lpthread
+-IMLIB_INCLUDE = `imlib-config --cflags-gdk`
+-IMLIB_LIB = `imlib-config --libs-gdk`
+-SINSTALLDIR = /usr/share/gkrellm/plugins
+-UINSTALLDIR = $(HOME)/.gkrellm/plugins
+-FLAGS = -O2 -Wall -fPIC -I. $(GTK_INCLUDE) $(IMLIB_INCLUDE)
+-LIBS = $(GTK_LIB) $(IMLIB_LIB)
+-CC = gcc $(FLAGS)
+-CCF = gcc $(FLAGS) -DFAKE
+-OBJS = i8krellm.o
+-
+-i8krellm1.so: $(OBJS)
+-#	@echo "========> i8krellm1.so"
+-	$(CC) $(OBJS) -o i8krellm1.so $(LFLAGS) $(LIBS)
+-
+-i8krellm1.o: i8krellm.c prop-anim.xpm
+-#	@echo "========> i8krellm1.o"
+-	$(CC) -c -o i8krellm1.o i8krellm.c
+-
+-fake1: i8krellm.c prop-anim.xpm
+-	$(CCF) -c -o i8krellm1.o i8krellm.c
+-	$(CCF) $(OBJS) -o i8krellm1.so $(LFLAGS) $(LIBS)
+-
+-site_install1: i8krellm1.so
+-	install -c -s -m 644 i8krellm1.so $(SINSTALLDIR)
+-
+-user_install1: i8krellm1.so
+-	install -c -s -m 644 i8krellm1.so $(UINSTALLDIR)
+-
+-install1: i8krellm1.so
+-	install -c -s -m 644 i8krellm1.so $(UINSTALLDIR)
+-
diff --git a/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild b/x11-plugins/i8krellm/i8krellm-2.5-r3.ebuild
new file mode 100644
index 000000000000..5bdff0ee4969
--- /dev/null
+++ b/x11-plugins/i8krellm/i8krellm-2.5-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="GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks"
+SRC_URI="http://www.coding-zone.com/${P}.tar.gz"
+HOMEPAGE="http://www.coding-zone.com/?page=i8krellm"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	>=app-laptop/i8kutils-1.5"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
+	"${FILESDIR}"/${P}-r3-makefile-fixes.patch
+	"${FILESDIR}"/${P}-r3-rm-gkrellm1-support.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake CC="$(tc-getCC)"
+}