x11-plugins/gkrellaclock: new revision to fix CC, CFLAGS, and LDFLAGS.

The build system for this package was a crude Makefile that has been
mostly replaced. The inspiration for the fixes was taken from a patch
by Gentoo user Michael Mair-Keimberger, who was also kind enough to
post an updated ebuild (which I've updated further to EAPI=6).

Gentoo-Bug: 339243

Package-Manager: portage-2.2.28

2 files changed, 83 insertions, 0 deletions

diff --git a/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch b/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch
new file mode 100644
index 000000000000..6b48b6bf9015
--- /dev/null
+++ b/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch
@@ -0,0 +1,53 @@
+diff --git a/Makefile b/Makefile
+index eb2b8ad..c89fa17 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,39 +1,12 @@
+ GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+ GTK_LIB = `pkg-config gtk+-2.0 --libs`
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) 
+-LIBS = $(GTK_LIB) 
+-LFLAGS = -shared
++CFLAGS += -fPIC $(GTK_INCLUDE)
++LIBS = $(GTK_LIB)
++LDFLAGS += -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
+-
+-OBJS = gkrellaclock.o
+-
+-gkrellaclock.so: $(OBJS)
+-	$(CC) $(OBJS) -o gkrellaclock.so $(LFLAGS) $(LIBS) 
++gkrellaclock.so: gkrellaclock.o
++	$(CC) $(CFLAGS) $(OBJS) -o gkrellaclock.so $(LDFLAGS) $(LIBS)
+ 
+ clean:
+-	rm -f *.o core *.so* *.bak *~
+-
+-gkrellaclock.o: gkrellaclock.c
+-
+-install:
+-	if [ -d /usr/local/lib/gkrellm2/plugins/ ] ; then \
+-		install -c -s -m 644 gkrellaclock.so /usr/local/lib/gkrellm2/plugins/ ; \
+-	elif [ -d /usr/lib/gkrellm2/plugins/ ] ; then \
+-        	install -c -s -m 644 gkrellaclock.so /usr/lib/gkrellm2/plugins/ ; \
+-	else \
+-		install -D -c -s -m 644 gkrellaclock.so /usr/lib/gkrellm2/plugins/gkrellaclock.so ; \
+-	fi
+-userinstall:
+-	if [ -d $(HOME)/.gkrellm2/plugins/ ] ; then \
+-		install -c -s -m 644 gkrellaclock.so $(HOME)/.gkrellm2/plugins/ ; \
+-	else \
+-		install -D -c -s -m 644 gkrellaclock.so $(HOME)/.gkrellm2/plugins/gkrellaclock.so ; \
+-	fi
+-
+-uninstall:
+-	rm -f /usr/local/lib/gkrellm2/plugins/gkrellaclock.so
+-	rm -f /usr/lib/gkrellm2/plugins/gkrellaclock.so
+-	rm -f $(HOME)/.gkrellm2/plugins/gkrellaclock.so
+-
++	rm -f gkrellaclock.*o
+diff --git a/gkrellaclock.o b/gkrellaclock.o
+index e2db7c1..002ab3a 100644
+Binary files a/gkrellaclock.o and b/gkrellaclock.o differ
diff --git a/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..8aadef9cec89
--- /dev/null
+++ b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="Nice analog clock for GKrellM2"
+HOMEPAGE="http://www.gkrellm.net/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="app-admin/gkrellm[X]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
+
+S="${WORKDIR}/${P/a/A}"
+
+src_compile() {
+	# The tarball contains a pre-compiled x86 object that needs to be
+	# removed if we're going to build it properly. See bug 166133.
+	rm -f gkrellaclock.o || die 'failed to remove gkrellaclock.o'
+	emake CC="$(tc-getCC)"
+}