From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 12 May 2022 16:42:50 +0300
Subject: gentoo resync : 12.05.2022

---
 x11-plugins/gkrellsun/Manifest                     |  2 +
 .../files/gkrellsun-1.0.0-r5-makefile-fixes.patch  | 56 ++++++++++++++++++++++
 x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild    | 37 ++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r5-makefile-fixes.patch
 create mode 100644 x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild

(limited to 'x11-plugins/gkrellsun')

diff --git a/x11-plugins/gkrellsun/Manifest b/x11-plugins/gkrellsun/Manifest
index 50d389653b53..4238ae4b8dfd 100644
--- a/x11-plugins/gkrellsun/Manifest
+++ b/x11-plugins/gkrellsun/Manifest
@@ -1,5 +1,7 @@
 AUX gkrellsun-1.0.0-Respect-LDFLAGS.patch 334 BLAKE2B 18bc916fd4d6834731cc02a720347a49a926f57f8477c8ee91bf9711b92aecc85b427a77d53edc6658ffe6b918b61b7d52a0ca0d7215b2008ec71710a34a985f SHA512 093ab16f6852b9a75a9c2e31a7ddf3ad6a407fd5c0f881340980f3f59b3c9abe10fa1855e09e9a73bd53cd3b3d532e3372bb227d95614e7fcbc014637c3ee906
+AUX gkrellsun-1.0.0-r5-makefile-fixes.patch 1508 BLAKE2B 558c23011152de5e63dd2238f489d34a06b20026a21a75b5b7bcb1f5757c826d1853a384949bc56622cdb98e39e0c5d7dfc816514e70ee6bb6706e85fd572556 SHA512 b2288158dcaaf1d9df341d7cac5b5e1448ed85d81384efb7e5f4b8dc2bcd28765be315c27cf35523ca5bd7b233726821a16f3b86b5150ff5c7faad88633dfe04
 AUX gkrellsun-1.0.0-reenable.patch 520 BLAKE2B fab0e90b893620b8d1724e21953845fbbc990948712f25ff0f4903ef51bcbcb00f3d3989cc8f9cbbc515daff3391c14a37a260f07309f3fe400915c293a8eefe SHA512 e4cfba81e20e08f2fc5fd005e5ff2e630a90f2cd1743334440b7f78f2de256959347d93f9e1c25416b9d151dd5465087dbf3e39a30429023cd9e9c635dcda229
 DIST gkrellsun-1.0.0.tar.gz 96970 BLAKE2B aef5bed2a077c7dccb8573bafa9a14df53c52522872d77d08b6a8d29c824d3ef09c54ea5d0b6268dd502508fed264ebc250bd558a602e41dabddab9556158668 SHA512 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a
 EBUILD gkrellsun-1.0.0-r4.ebuild 713 BLAKE2B 9805d4325f1fd913da2669f9571cd782bb79efe745136255ba54daf7ab40e7b9067313e5a7d8b957997204fd1b2b3a726f39d4515411421d2f9cf775690f3217 SHA512 be3a78bcaa82881393be99866a905bb93bd3d4462ae89002a49eea90f999bd792bd8c2d4cf4f98bcc2e3881482bffd6cce817f0c90a9edead5cab0b659a0a937
+EBUILD gkrellsun-1.0.0-r5.ebuild 843 BLAKE2B ba7c73df95285e6d7b7396dffefa45d6d4e03c7bac394f0c718fca8209b3d677c4eea14848dcec90e9201a26efcd690d6bce4ddfc355733b9aed693ff1a88bf2 SHA512 fc09573dc46020d8cf00f1ab680a1b0fd15cc31a6442d2bc9d2f11b3f1169efc455064530e9fd7ee26b93a9ee8a7b74e3819d03d55929b22a8f2f79c30a6dd63
 MISC metadata.xml 247 BLAKE2B 2a5e52fe46bb870c82fb6f16e032fca8d7ee30da5d39bc7deae966d57cbb8d79d2efa4b36da3c415e74cfd49a9e7553254fc9c575838c86f433a53283fe74254 SHA512 fe10588aacdd43055f05ef7a9fd5147056c5de9d813740995e152972185872b30a1781a5b7096085fac3eea6bd80a45cc1679904052dfc701a0885344a5ca599
diff --git a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r5-makefile-fixes.patch b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r5-makefile-fixes.patch
new file mode 100644
index 000000000000..186933030860
--- /dev/null
+++ b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r5-makefile-fixes.patch
@@ -0,0 +1,56 @@
+Don't call gcc directly, remove -O2 -Wall flags, respect user's pkg-config
+--- a/src20/Makefile
++++ b/src20/Makefile
+@@ -1,8 +1,8 @@
+ PACKAGE ?= gkrellsun
+ 
+-GTK_CONFIG ?=pkg-config gtk+-2.0
+-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)
+ 
+ INSTALL ?= install
+ 
+@@ -11,7 +11,7 @@ INSTALLDIR ?= $(DESTDIR)$(PREFIX)
+ PLUGINDIR ?= $(INSTALLDIR)/lib/gkrellm2/plugins
+ LOCALEDIR ?= $(INSTALLDIR)/share/locale
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++FLAGS = -fPIC $(GTK_INCLUDE)
+ #FLAGS = -g -Wall -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+@@ -25,7 +25,7 @@ endif
+ FLAGS += -DPACKAGE="\"$(PACKAGE)\""
+ export PACKAGE LOCALEDIR
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ OBJS = gkrellsun.o CalcEphem.o Moon.o MoonRise.o
+ 
+@@ -37,10 +37,10 @@ all: gkrellsun.so
+ 
+ gkrellsun.so: $(OBJS)
+ 	(cd po && ${MAKE})
+-	$(CC) $(OBJS) -o gkrellsun.so $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(FLAGS) $(OBJS) -o gkrellsun.so $(LFLAGS) $(LIBS)
+ 
+ suninfo: suninfo.o CalcEphem.o Moon.o MoonRise.o
+-	$(CC) $^ -o suninfo -lm $(LIBS)
++	$(CC) $(CFLAGS) $(FLAGS) $^ -o suninfo -lm $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
+@@ -49,7 +49,8 @@ gkrellsun.o: gkrellsun.c $(IMAGES)
+ 
+ $(OBJS): CalcEphem.h Moon.h MoonRise.h
+ 
+-#%.o: %.c
++%.o: %.c
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
+ 
+ install: gkrellsun.so
+ 	(cd po && ${MAKE} install )
diff --git a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild
new file mode 100644
index 000000000000..4d5e865d0b77
--- /dev/null
+++ b/x11-plugins/gkrellsun/gkrellsun-1.0.0-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 toolchain-funcs
+
+DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times"
+HOMEPAGE="http://gkrellsun.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-reenable.patch
+	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
+	"${FILESDIR}"/${P}-r5-makefile-fixes.patch
+)
+
+src_configure() {
+	PLUGIN_SO=( src20/gkrellsun$(get_modname) )
+	default
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	use nls && local myconf="enable_nls=1"
+	emake CC="$(tc-getCC)" ${myconf}
+}
-- 
cgit v1.2.3