commit:     58141c64845cfb4ecaf38bb797397a320efa62ef
Author:     Thomas Bracht Laumann Jespersen <t <AT> laumann <DOT> xyz>
AuthorDate: Sat Apr  2 13:30:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 19:54:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58141c64

x11-plugins/gkrellweather: update EAPI 6 -> 8

Signed-off-by: Thomas Bracht Laumann Jespersen <t <AT> laumann.xyz>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gkrellweather-2.0.8-r2-makefile-fixes.patch    | 24 +++++++++++
 .../gkrellweather/gkrellweather-2.0.8-r2.ebuild    | 46 ++++++++++++++++++++++
 2 files changed, 70 insertions(+)

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
+}

Reply via email to