gentoo resync : 12.05.2022

3 files changed, 72 insertions, 0 deletions

diff --git a/x11-plugins/gkrellweather/Manifest b/x11-plugins/gkrellweather/Manifest
index 97bd61fe5b6e..0918b190ff89 100644
--- a/x11-plugins/gkrellweather/Manifest
+++ b/x11-plugins/gkrellweather/Manifest
@@ -1,6 +1,8 @@
 AUX gkrellweather-2.0.8-Move-GrabWeather.patch 2162 BLAKE2B d6a38021b10cf0ec97eaaa9dcf0c5e3b78599f57b008054d55bb64abaa2318620345a2bac43168da57af9660d895150d25f3ff248ceb1233ce221dd5910bb805 SHA512 9c078e68f28c829f19e4e8e2836795508f5b124aa2a7b8535857266d16b9ba6404604e1527751dee99e632237be106eed456bebc2b14f69799a46888ab9699ff
 AUX gkrellweather-2.0.8-Respect-LDFLAGS.patch 398 BLAKE2B bfcabffaf7c27dfeef18065f585f269ba003cf7370c5164e4fb23ad53baa1b497ab8c31abb70e3da301358138c1cdd8eb495a8e6623167d163175d5b37407b91 SHA512 09fb94ff819152970640bd4e0a6c2435bf2bf1d5f8ae8817efc195437f2103065bcd38142d3a412d8e509b7c020c674ea25bbc331148daab61ce3e70928712fa
+AUX gkrellweather-2.0.8-r2-makefile-fixes.patch 597 BLAKE2B 7f2f3a6718dce714203d02a42c04721c591c49b7ed4c1faeac2e190d700ae87b0edf5a0568984295c1763e620db8849c05673d73cb7c1877e7d19ff8af345097 SHA512 43a0f81a7884a37f7a3436004aa32ccffdcebbedd19027a01edb87e2e3447485d1eee33607787bf75586177e051c171435105a9e661ce1ac701d6800d5925eb2
 AUX gkrellweather-2.0.8-update-locations.patch 567 BLAKE2B aff5c3d4bb291d0a97c21c946c81aca539fed0076f553a8570d5a76ac597061fde58a4dcefcd3de6e5d2ecafcf3aabdcd7392fe3c07649534a09809e357ae318 SHA512 963e81b73812fb1bc18e2c29bb8f69b655032441b537dc7a3a083e2331e0337a5faec86940f2779546aa024d59944fd6d5fb7f88f474d2e22532bd85cbe37c6b
 DIST gkrellweather-2.0.8.tgz 20227 BLAKE2B 7c3fd369e323229359bc397e07b422b625a14038aff573cf7c3fd6218c733a1d69f5754dcb86ab2172a8a5ae08fbab022a87100a6422c5e8b3b3068e108fd9a7 SHA512 da9408ebc9518fe805d3f0dd9496b4aeb805a2ab6566b619b61fc25c91122c0ee45e2a7b804206b2ee08300309dd9b1e1c3b6605a41c594cf75fd39b58767264
 EBUILD gkrellweather-2.0.8-r1.ebuild 1009 BLAKE2B 2bbc1ad4813f494603f36fea6299b4638b434a82ded3c68847d374d30816aa37dc9ecbf16c659a944351058e0c5860be86d77af3a6234f029bf74bafbf8f1fa0 SHA512 ba2136390538be84ab3c7351b9fdcd4f3c573445ae2e2285a6a3750083eb039d71e11a9a5f42a32d366c22e3c41c54dddb8b3979491c00eb489bdb2f908aa91f
+EBUILD gkrellweather-2.0.8-r2.ebuild 1076 BLAKE2B 07e0d18a50dafa92c8be53a43c9f854535892fc51a83958507b0e7ddc24ccdc0e0d7c2dab90ab17a4adb10d87bff3c963b039a830cbecb94ac018faf12f9ec4f SHA512 82ebf77294bd4c25bdaf45e8c00fc80dab8e005ed7553cc37130f3f5eb209b86421d48165b8938f9d8f66209177d9192c2acbd02dce8d6558bf467a34158ff16
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-r2-makefile-fixes.patch b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-r2-makefile-fixes.patch
new file mode 100644
index 000000000000..aa35e565e508
--- /dev/null
+++ b/x11-plugins/gkrellweather/files/gkrellweather-2.0.8-r2-makefile-fixes.patch
@@ -0,0 +1,24 @@
+Respect user's pkg-config, don't call gcc directly
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,9 @@
+ PKGNAME = gkrellweather
+ VERSION = 2.0.8
+-CFLAGS = -O2 -std=gnu99 -Wall -fPIC `pkg-config gtk+-2.0 --cflags`
+-LIBS = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags)
++CFLAGS = -std=gnu99 -fPIC $(GTK_INCLUDE)
++LIBS =  $(shell ${PKG_CONFIG} gtk+-2.0 --libs)
+ LFLAGS = -shared
+ PREFIX = /usr/local
+ 
+@@ -16,7 +18,7 @@ endif
+ CFLAGS += -DPACKAGE="\"$(PKGNAME)\""
+ export PKGNAME LOCALEDIR
+ 
+-CC = gcc
++CC = $(CC)
+ 
+ OBJS = gkrellweather.o
+ 
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild
new file mode 100644
index 000000000000..1a70885d8d3c
--- /dev/null
+++ b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r2.ebuild
@@ -0,0 +1,46 @@
+# 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="GKrellM2 Plugin that monitors a METAR station and displays weatherinfo"
+HOMEPAGE="https://sites.google.com/site/makovick/gkrellm-plugins"
+SRC_URI="https://sites.google.com/site/makovick/projects/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-lang/perl
+	net-misc/wget
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
+	"${FILESDIR}"/${P}-Move-GrabWeather.patch
+	"${FILESDIR}"/${P}-update-locations.patch
+	"${FILESDIR}"/${P}-r2-makefile-fixes.patch
+)
+
+src_configure() {
+	append-cflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0)
+	append-flags -fPIC
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake PREFIX="${EPREFIX}"/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	gkrellm-plugin_src_install
+
+	exeinto /usr/libexec/gkrellweather
+	doexe GrabWeather
+}