gentoo resync : 12.05.2022

3 files changed, 100 insertions, 0 deletions

diff --git a/x11-plugins/gkrellmss/Manifest b/x11-plugins/gkrellmss/Manifest
index 4773658c535e..abae15590710 100644
--- a/x11-plugins/gkrellmss/Manifest
+++ b/x11-plugins/gkrellmss/Manifest
@@ -1,5 +1,7 @@
 AUX gkrellmss-2.6-Respect-LDFLAGS.patch 498 BLAKE2B 2eb34f01a8f20325f34ba6176d68046645528fd7cddd3ee342be5df4c812e7f986b0d39d6a25e1d52d9521ca73cb30fc3784a1cf0aecc634b0618b3c09240bbd SHA512 8c050353c212ea0791b7e5160ba720ee1e91359612565bc9b074424de8d2da93a581696d54ec5210265609267c767eb8d5bb0678dcd9e1e9d7d61648a626e472
 AUX gkrellmss-2.6-fno-common.patch 195 BLAKE2B eaf45029a236aa63ac216d3a2d6e7f8481626b20f4caf3e5d24f83a09608c967cf162b261e87148911a72bab933ca799b0698f82971f90cbe156e1849d737e7d SHA512 40efc369491339139f8b54652aac155a995a078968b19d3a445d593510a655cbfc67098c0c8656ff22e5a3662824b3e9049d50a90a2a4c87b204887ad369206b
+AUX gkrellmss-2.6-r5-configure-makefile-fixes.patch 1656 BLAKE2B 37e96fc95069e98b8cb50ee7724b1ce733051d7ca9a6e500f3de00277ce7af8739ace3b9f3364fbe0e2f578894e684c2029fc4d66ef3f9e1baf184bfaad07894 SHA512 8a25784b09b35055c1c46f6310b8d71d009c9b95998119d562db93c43e57bce76a7dbfc8fe810243cea632e6ea6f197825932b59fbde718f4001f1d20ebeb464
 DIST gkrellmss-2.6.tar.gz 32082 BLAKE2B 73164229fbbf08fc781bf697653be19a41b63df46ea7fc2aac230c74ad042809f2f33d199a08ccbe20cdb5610ab2350ee32ec2a09803bb71e367d21f18e752bb SHA512 d9773cfed6e4de006df32102419773f9af5047e3fb5e7aa4c7a686b4775c3af30c14321fe404aa65ec27eb13bcd849dbd25ef4eaa2daa723177040da05c74f76
 EBUILD gkrellmss-2.6-r4.ebuild 783 BLAKE2B f3ee89bcce9b1a9887cd65025ab8aea00a39595d7826bbc37e759ee5150c39a98b0b622d010ee9727a5e8a7e99e4396860b40aec766f6d53a4576f2bb56d7c1d SHA512 dd6565f756adaa5eb320849cedbd3c89201f6347e78fb4ba5972ffc1d4b3ac39d57c287dcfa8c865f388e9530c94229a3d5a36a62b38ae487f1a47f7acbcf65f
+EBUILD gkrellmss-2.6-r5.ebuild 892 BLAKE2B a78df295f0222e402e44e5435b10bb39ed1691f0fe3cd619037b6a530f629535b51395b60227c45ce0915eb6e219b55cb6fb7c7630a9e5371c93adf67a514dcc SHA512 922baf139c354c744369291308f23930f29ec791989461f519eaa1b41ea7b9a1cebd62844ef3873abb288239d7e1d527bcb7002ee76c83a3d64e5fe1a8f19782
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellmss/files/gkrellmss-2.6-r5-configure-makefile-fixes.patch b/x11-plugins/gkrellmss/files/gkrellmss-2.6-r5-configure-makefile-fixes.patch
new file mode 100644
index 000000000000..a3eeae49cd56
--- /dev/null
+++ b/x11-plugins/gkrellmss/files/gkrellmss-2.6-r5-configure-makefile-fixes.patch
@@ -0,0 +1,61 @@
+Respect the user's pkg-config, don't call cc directly, respect CFLAGS
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -7,9 +7,9 @@ endif
+ INSTALLDIR ?= $(INSTALLROOT)/lib/gkrellm2/plugins
+ INSTALL ?= install
+ 
+-
+-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+-GTK_LIB = `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)
+ 
+ OS_NAME=$(shell uname -s)
+ 
+@@ -92,7 +92,7 @@ ifeq ($(alsa),1)
+ 	FLAGS += -DGKRELLM_ALSA
+ endif
+ 
+-CC = gcc $(FLAGS) $(CFLAGS)
++CC = $(CC)
+ 
+ OBJS = gkrellmss.o oscope.o spectrum.o sdlib.o option.o
+ 
+@@ -101,7 +101,7 @@ all:	gkrellmss.so
+ warn: ; $(WARN)
+ 
+ gkrellmss.so: $(OBJS) warn
+-	$(CC) $(OBJS) -o gkrellmss.so $(LFLAGS) $(LIBS)
++	$(CC) $(FLAGS) $(CFLAGS) $(OBJS) -o gkrellmss.so $(LFLAGS) $(LIBS)
+ 
+ 
+ clean:
+@@ -121,7 +121,12 @@ help:
+ 	@echo ""
+ 
+ gkrellmss.o: gkrellmss.c gkrellmss.h configure
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+ oscope.o: oscope.c gkrellmss.h configure
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+ spectrum.o: spectrum.c gkrellmss.h configure
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+ sdlib.o: sdlib.c gkrellmss.h sdlib-esd.c sdlib-alsa.c configure
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+ option.o: option.c gkrellmss.h configure
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+--- a/src/configure
++++ b/src/configure
+@@ -18,8 +18,9 @@ do
+ done
+ 
+ 
+-PKG_INCLUDE=`pkg-config gtk+-2.0 --cflags`
+-PKG_LIB=`pkg-config gtk+-2.0 --libs`
++PKG_CONFIG=${PKG_CONFIG-pkg-config}
++PKG_INCLUDE=$(${PKG_CONFIG} gtk+-2.0 --cflags)
++PKG_LIB=$(${PKG_CONFIG} gtk+-2.0 --libs)
+ 
+ rm -f configure.h configure.log test test.o test.c
+ 
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
new file mode 100644
index 000000000000..33ca3455e91c
--- /dev/null
+++ b/x11-plugins/gkrellmss/gkrellmss-2.6-r5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin
+
+DESCRIPTION="A plugin for GKrellM2 that has a VU meter and a sound chart"
+HOMEPAGE="http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html"
+SRC_URI="http://web.wt.net/~billw/gkrellmss/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	media-libs/alsa-lib
+	sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-r5-configure-makefile-fixes.patch
+)
+
+PLUGIN_DOCS=( Themes )
+
+src_compile() {
+	tc-export PKG_CONFIG
+	PLUGIN_SO=( src/gkrellmss$(get_modname) )
+	addpredict /dev/snd
+	emake CC="$(tc-getCC)" enable_nls=$(usex nls 1 0) without-esd=yes
+}