From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0FA4815808D for ; Thu, 21 Apr 2022 19:55:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 360D4E0AA3; Thu, 21 Apr 2022 19:55:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46295E0AA6 for ; Thu, 21 Apr 2022 19:55:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9FBB7341B15 for ; Thu, 21 Apr 2022 19:55:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC0113F1 for ; Thu, 21 Apr 2022 19:55:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650570876.ef22f7ce168f7ff7115dab8cf81af29bc4497a5a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellsun/, x11-plugins/gkrellsun/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/gkrellsun/files/gkrellsun-1.0.0-r5-makefile-fixes.patch x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild X-VCS-Directories: x11-plugins/gkrellsun/ x11-plugins/gkrellsun/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ef22f7ce168f7ff7115dab8cf81af29bc4497a5a X-VCS-Branch: master Date: Thu, 21 Apr 2022 19:55:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7e20ef16-0f3c-41fa-9f70-5f4c6f6abedb X-Archives-Hash: 4cddf160d894ba798ea819b4a164c1fa commit: ef22f7ce168f7ff7115dab8cf81af29bc4497a5a Author: Thomas Bracht Laumann Jespersen laumann xyz> AuthorDate: Sat Apr 2 13:01:03 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 21 19:54:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef22f7ce x11-plugins/gkrellsun: update EAPI 6 -> 8 Signed-off-by: Thomas Bracht Laumann Jespersen laumann.xyz> Signed-off-by: Sam James gentoo.org> .../files/gkrellsun-1.0.0-r5-makefile-fixes.patch | 56 ++++++++++++++++++++++ x11-plugins/gkrellsun/gkrellsun-1.0.0-r5.ebuild | 37 ++++++++++++++ 2 files changed, 93 insertions(+) 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} +}