From 05a1b0972b7d1a395cf58201f921dc0d4cf8fb75 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <mjo@gentoo.org>
Date: Sat, 6 Aug 2016 21:44:18 -0400
Subject: x11-plugins/gkrellm-xkb: new revision fixing CFLAGS/LDFLAGS.

This new revision is thanks to Michael Mair-Keimberger who patched
three bugs at once. He made the build system respect CFLAGS and
LDFLAGS, and updated the ebuild to use USE dependencies rather than
just crashing if gkrellm was built without X support.

Gentoo-Bug: 338786
Gentoo-Bug: 421723
Gentoo-Bug: 428388

Package-Manager: portage-2.2.28
---
 .../gkrellm-xkb/files/gkrellm-xkb-makefile.patch   | 35 ++++++++++++++++++++++
 x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild | 28 +++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch
 create mode 100644 x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild

(limited to 'x11-plugins/gkrellm-xkb')

diff --git a/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch
new file mode 100644
index 000000000000..425a0a0417ee
--- /dev/null
+++ b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-makefile.patch
@@ -0,0 +1,35 @@
+This patch is by Michael Mair-Keimberger, as part of bug 338786. It
+teaches the Makefile to support the user's LDFLAGS.
+
+Gentoo-Bug: 338786
+
+--- a/Makefile	2004-01-05 07:34:36.000000000 +0100
++++ b/Makefile	2013-03-15 22:11:58.105227982 +0100
+@@ -5,18 +5,16 @@
+ GKRELLM_INCLUDE = -I$(PREFIX)/include
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+ GTK_LIB = `$(GTK_CONFIG) --libs`
+-FLAGS = -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+-CFLAGS ?= -O -g
+-CFLAGS += $(FLAGS)
++FLAGS = -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+-CC ?= gcc
++CC = $(CC)
+ INSTALL = install -c
+ INSTALL_PROGRAM = $(INSTALL) -s
+ PIX = caps_off.xpm caps_on.xpm num_off.xpm num_on.xpm
+ 
+ xkb.so: main.o
+-	$(CC) $(FLAGS) main.o -o xkb.so $(LIBS) $(LFLAGS)
++	$(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) main.o -o xkb.so $(LIBS) $(LFLAGS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
+@@ -25,4 +23,4 @@
+ 	$(INSTALL_PROGRAM) xkb.so $(PLUGIN_DIR)	
+ 	
+ main.o: main.c $(PIX)
+-	$(CC) $(FLAGS) -c main.c
++	$(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) -c main.c
diff --git a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild
new file mode 100644
index 000000000000..b5dffc2b7f6c
--- /dev/null
+++ b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit gkrellm-plugin
+
+DESCRIPTION="XKB keyboard switcher for gkrellm2"
+HOMEPAGE="http://tripie.sweb.cz/gkrellm/xkb/"
+SRC_URI="http://tripie.sweb.cz/gkrellm/xkb/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="app-admin/gkrellm[X]"
+RDEPEND+=" ${COMMON_DEPEND}"
+DEPEND+=" ${COMMON_DEPEND}"
+
+PLUGIN_SO=xkb.so
+
+PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
-- 
cgit v1.2.3-65-gdbad