gentoo resync : 12.05.2022

3 files changed, 72 insertions, 0 deletions

diff --git a/x11-plugins/gkrellstock/Manifest b/x11-plugins/gkrellstock/Manifest
index a7580a842acf..cb3b2d3a7272 100644
--- a/x11-plugins/gkrellstock/Manifest
+++ b/x11-plugins/gkrellstock/Manifest
@@ -1,4 +1,6 @@
 AUX gkrellstock-0.5-ldflags.patch 412 BLAKE2B 93761f0b972727b6b20a74ac0fd14ec2f359557f2067a53ee7ced7d63f6f33921b58554597e2d50d0f3dfffb6dd9812fae9a1458ad610ceb7b00d06ab959dc28 SHA512 626b1953988ce00d76270a779fcf7c5a2c0b599cd57ec0873ce2328c6cbbaaf7042cb8d608da9b0398205d29879c37ef9179edadf980ad5601b6eecac5fb7613
+AUX gkrellstock-0.5.1-r2-makefile-fixes.patch 738 BLAKE2B 27138c0c06fb68afac1c9969cf622fea840306ae43d560473c8582c72ffa1ef6b8cde669c44f987632902019323b3b5f4cfc02f2b194ebbceb7e0d1f58e726cc SHA512 82296fe20ea73cf946ffab587045a8aa8f5786cdd95eec231ecc7dc4f677b9b9f15cfc19c76cbaa756658aa77335795cb731e2538c83529e7f4ea7a14afd862c
 DIST gkrellstock-0.5.1.tar.gz 22385 BLAKE2B c948651631aba700a23fd3ef6c74b564662383ee2bb69cf9ee8a3dad2f35d9e45ae6839f0c576aab0f0aa9eb296ba624bf3077ba2312a6b853bf7174fda6a25e SHA512 040e6271a0b0ca3f7be52cc64076a8d1b538fc7607a9ae54acf1c9dc176b094c1483b10c1813a929dcf47dff4fee8c18b7ca58472343c83edfa58a32edc7776c
 EBUILD gkrellstock-0.5.1-r1.ebuild 815 BLAKE2B b68e9617abac731b24c8e7592a1ee94926162bb31dfb6be0c4a994966900579efa98f366482ccaafcbdb2cd2752f7dea02bf9241669ea0b22bddbb20add58599 SHA512 d477f91245e229ccbb61dac07046f0ea86507a244c497d22e8767f580a3428829f5d33e9af6c10115882d4ae79bb76229f94ed2a56078c97cbc3b641b804a67e
+EBUILD gkrellstock-0.5.1-r2.ebuild 892 BLAKE2B 0e2728e2b8710ba467c8388f4b5faebac96b570f4ff559ccbe738d2f4ef0873b1603847c6623ade8749d57a2b920d67da3de90c852bd70a0075b4c77d3a8839c SHA512 4088f8c2b5b7f8cc54f11cbdb0359a36ce1c3781f742c59113e06497ac155d97085e3e2a43b22a2495c28bbf0b2b70146f47fefb3a92d44757a8bc196901d2f7
 MISC metadata.xml 254 BLAKE2B 49d91c777a85789ee0f89df10065775aa549cb6ae181946d5afa17289f935e07588f77a5a3ab8d4b3c4dc561284f8261935d904b9311745e9dae2e1f7c5390ed SHA512 105c93e1064549cd25550fc7f33e6f21394ab5e9a3117835a5d0ec4ef502fb662f1fae81cda787aea39b5da43d9c3dd65138ab3c2e14ac398e41344e87b4c8e7
diff --git a/x11-plugins/gkrellstock/files/gkrellstock-0.5.1-r2-makefile-fixes.patch b/x11-plugins/gkrellstock/files/gkrellstock-0.5.1-r2-makefile-fixes.patch
new file mode 100644
index 000000000000..1b827a749272
--- /dev/null
+++ b/x11-plugins/gkrellstock/files/gkrellstock-0.5.1-r2-makefile-fixes.patch
@@ -0,0 +1,26 @@
+Respect the user's pkg-config, remove "-O2 -Wall" flags, don't call gcc directly
+--- a/Makefile
++++ b/Makefile
+@@ -1,16 +1,17 @@
+-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)
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ OBJS = gkrellstock.o
+ 
+ gkrellstock.so: $(OBJS)
+-	$(CC) $(LDFLAGS) $(OBJS) -o gkrellstock.so $(LFLAGS) $(LIBS) 
++	$(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) $(OBJS) -o gkrellstock.so $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
diff --git a/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild
new file mode 100644
index 000000000000..6fcbaee5ee28
--- /dev/null
+++ b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="Get Stock quotes plugin for Gkrellm2"
+HOMEPAGE="http://gkrellstock.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellstock/${P}.tar.gz"
+S="${WORKDIR}/${P/s/S}"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	dev-perl/libwww-perl
+	dev-perl/Finance-Quote"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5-ldflags.patch
+	"${FILESDIR}"/${PN}-0.5.1-r2-makefile-fixes.patch
+)
+
+src_configure() {
+	tc-export PKG_CONFIG
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0)
+	append-flags -fPIC
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	gkrellm-plugin_src_install
+	dobin GetQuote2
+}