gentoo auto-resync : 10:05:2024 - 00:01:13

5 files changed, 142 insertions, 2 deletions

diff --git a/x11-plugins/gkrellsun/Manifest b/x11-plugins/gkrellsun/Manifest
index ec97cef198d1..dbe32602cb02 100644
--- a/x11-plugins/gkrellsun/Manifest
+++ b/x11-plugins/gkrellsun/Manifest
@@ -1,6 +1,9 @@
 AUX gkrellsun-1.0.0-Respect-LDFLAGS.patch 259 BLAKE2B 096b8d0ea9f27909ec5662f9e8d093c4b0df017668a5ce1d16e2410248ee73190b0291e67eef0a4fd38b051375503a5c3ace8c4b5f732bad93609944b8af9c59 SHA512 f1cd7919717f3eebe3482d44d82d98ee197fb95b1a198c649c88bac1da330cc2fcbdefeab3d7cfc09cb804bd6f5aba21bd73477b91df01c79d7d918847b402cc
 AUX gkrellsun-1.0.0-r5-makefile-fixes.patch 1508 BLAKE2B 558c23011152de5e63dd2238f489d34a06b20026a21a75b5b7bcb1f5757c826d1853a384949bc56622cdb98e39e0c5d7dfc816514e70ee6bb6706e85fd572556 SHA512 b2288158dcaaf1d9df341d7cac5b5e1448ed85d81384efb7e5f4b8dc2bcd28765be315c27cf35523ca5bd7b233726821a16f3b86b5150ff5c7faad88633dfe04
+AUX gkrellsun-1.0.0-r6-include.patch 556 BLAKE2B 561bfa811796f11b0fd7aa2e30c368ce2f387862ed1cdde5421d325fbd6908e203d7458ef8970e9e839c4fbc7076378cf5c61d6168667dc93f7cc1d6273dea36 SHA512 935f2e9abe1d6c0a7e72c6f9698792cb7dbb879796c1849a6d6b3e3248e268b6bf73bcc1177a0505545022c9eb3999c1d094aac5e2e8ec79e6aa2340bab0a9ea
+AUX gkrellsun-1.0.0-r6-makefile-fixes.patch 2037 BLAKE2B a80bb778b659e3bf8ed8fcae9fef099c88caba669adb66a78fbb2eb8c06d619d9a8b91d88f031d65631685caf262f87a1a22ed7b12312b2ee56ff942c6ec5f7c SHA512 5e15aeb2505c20aee993a59f2c282f4e76018908d7ee154f4e6b5c2d7fea3e5e9199ea2867e4895114c218e5097383ab2bc8288832b262153a44d2848363eeb4
 AUX gkrellsun-1.0.0-reenable.patch 439 BLAKE2B 39e7a365ceed5d355ac296910774495f0b725151011cbc8ac603f5d6773288b67de72307d314ba26d112d24f5654aa95a25c7b9f8e02e3bfad77eae6e8515a5e SHA512 a963b8aae820dc63eaac45f4fac4999ed2cd221392b89858f7a5418dfc435022e2d8116fe6d15e2a4f8e0f454ab8d9b92b013cf8a7420ce031049b58472c06c2
 DIST gkrellsun-1.0.0.tar.gz 96970 BLAKE2B aef5bed2a077c7dccb8573bafa9a14df53c52522872d77d08b6a8d29c824d3ef09c54ea5d0b6268dd502508fed264ebc250bd558a602e41dabddab9556158668 SHA512 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a
-EBUILD gkrellsun-1.0.0-r5.ebuild 862 BLAKE2B f8e643364713ebe7c57949c426b467cdbcf1457c24c5a376e2c191ff635a0177c06438f4f13baf4542ab0f5e58eb26d07e07fa87147141143803c00ebf90154b SHA512 287a2729f6cad9b04b99b27ec846cf5303c2133a8e571cb610b132f3ff6bf036670e2cb6ae5e075a9012393f93e368faf99dc433cbc0d73648799d698276926c
+EBUILD gkrellsun-1.0.0-r5.ebuild 863 BLAKE2B 9a6aa61f0f83fbfac3e819293cb8c762c221565c9779bab374011731d8f27677c2cc58b8023ccef8583a1c96f5cbb92128150e5a163f3515254c187b90fd3898 SHA512 327a2ece47c4819a59e6a8da661d973dbbb7ed71b476181e349491c215dbf13c99fd62bbffa083989f481b34a42344e744198a1b974631b282f4204eda13e510
+EBUILD gkrellsun-1.0.0-r6.ebuild 901 BLAKE2B 3b1834dae2c7b360e66f8ed478d26119ee728b1e4fbbeaf501701caf3a341e11677b6b7588405bcea175c67c177f0cd66d5a80934648953379901e46ff699f73 SHA512 97cb432a3202a1d7600aaae9efd215d47904e118a4df810ac9435e56657d10eb4cfc52be9533650d48954cabf3e57bcb5a4103128659af0081c96bb4aa8db368
 MISC metadata.xml 319 BLAKE2B f7f9ab91890d1f42c0afa8aa3bb536c0be1d7534ff46acb28daf4d95a28ee9a28fa0583a4e2377ca42aff1b634a920080adcb1f5e3903e4e8a54ceba7f8d754b SHA512 38c45bf665448760f5d0d28adaba75217d4dce2658c93a5b3b704e395c17eacb6d5c51034cb0a61b7ad6740b1e3f524911b0f5319391bf7211ea0c3d88ccbf6d
diff --git a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r6-include.patch b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r6-include.patch
new file mode 100644
index 000000000000..d37fa73e6472
--- /dev/null
+++ b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r6-include.patch
@@ -0,0 +1,16 @@
+includes exist for a reason. No reason to use badly written extern declarations
+diff -ru gkrellsun-1.0.0.orig/src20/gkrellsun.c gkrellsun-1.0.0/src20/gkrellsun.c
+--- a/src20/gkrellsun.c	2024-04-01 09:51:43.815461580 +0000
++++ b/src20/gkrellsun.c	2024-04-01 09:53:30.245006285 +0000
+@@ -15,10 +15,9 @@
+ #endif
+ 
+ #include <math.h>
++#include <glib.h>
+ 
+ /* splint */
+-extern gchar* g_string_free (/*@only@*/ GString *, gboolean);
+-extern void pango_font_description_free (/*@owned@*/PangoFontDescription *);
+ 
+ #define PLUGIN_HEIGHT 54
+ #define SUN_WIDTH 54
diff --git a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r6-makefile-fixes.patch b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r6-makefile-fixes.patch
new file mode 100644
index 000000000000..4ea9935533a2
--- /dev/null
+++ b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r6-makefile-fixes.patch
@@ -0,0 +1,83 @@
+Call inner make in sane way, with error propagation. So build will fail on errors
+--- a/Makefile	2024-04-01 09:38:48.800355255 +0000
++++ b/Makefile	2024-04-01 09:40:12.944908086 +0000
+@@ -2,7 +2,7 @@
+ TMP=.
+ 
+ all: comment
+-	cd src20; make; cd ..
++	$(MAKE) -C src20
+ 
+ comment:
+ 	@echo
+@@ -12,12 +12,12 @@
+ 	@echo 
+ 
+ install: comment
+-	cd src20; make install; cd ..
++	$(MAKE) -C src20 install
+ 
+ distclean: clean
+ 
+ clean:
+-	cd src20; make clean; cd ..
++	$(MAKE) -C src20 clean
+ 	rm -f gkrellsun*.zip gkrellsun*.tar.gz
+ 
+ dist:
+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
index 09e8cfac5ae7..c5c9713d2d80 100644
--- a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild
+++ b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit gkrellm-plugin multilib toolchain-funcs
 
 DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times"
-HOMEPAGE="http://gkrellsun.sourceforge.net/"
+HOMEPAGE="https://gkrellsun.sourceforge.net/"
 SRC_URI="https://downloads.sourceforge.net/gkrellsun/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r6.ebuild b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r6.ebuild
new file mode 100644
index 000000000000..ad28bee612ec
--- /dev/null
+++ b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gkrellm-plugin multilib toolchain-funcs
+
+DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times"
+HOMEPAGE="https://gkrellsun.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/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}-r6-makefile-fixes.patch
+	"${FILESDIR}"/${P}-r6-include.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}
+}