Fix gcc47 building (#424105) and respect LDFLAGS (#335391), also fix dependencies (#335391). Thanks to Michael Mair-Keimberger (iamnr3) for the work.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 67 insertions, 13 deletions

diff --git a/x11-plugins/gkrellmlaunch/ChangeLog b/x11-plugins/gkrellmlaunch/ChangeLog
index 97faf0e57bc0..9f8bd72b010f 100644
--- a/x11-plugins/gkrellmlaunch/ChangeLog
+++ b/x11-plugins/gkrellmlaunch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/gkrellmlaunch
 # Copyright 2002-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmlaunch/ChangeLog,v 1.15 2013/06/01 11:35:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmlaunch/ChangeLog,v 1.16 2013/08/31 14:25:01 pacho Exp $
+
+  31 Aug 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gkrellmlaunch-0.5-makefile.patch, gkrellmlaunch-0.5.ebuild:
+  Fix gcc47 building (#424105) and respect LDFLAGS (#335391), also fix
+  dependencies (#335391). Thanks to Michael Mair-Keimberger (iamnr3) for the
+  work.
 
   01 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #144305
diff --git a/x11-plugins/gkrellmlaunch/Manifest b/x11-plugins/gkrellmlaunch/Manifest
index e7ad18624903..c0e8f9313a84 100644
--- a/x11-plugins/gkrellmlaunch/Manifest
+++ b/x11-plugins/gkrellmlaunch/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gkrellmlaunch-0.5.tar.gz 22035 SHA256 e5cfd29cb206139865ef224cd16ab2389fd06648b9f22b56c3809b1c402f30f7
-EBUILD gkrellmlaunch-0.5.ebuild 491 SHA256 10b97fd92cbf4a4c5d44edbee0fc53ff2e29cb6d8556f7e30fa0ac1a7666b4b1 SHA512 5735189dd8361bb854a7f1ebc21fc3bf198abe9e31990a07e508b8e059b769430bc0f649bc88c7c3da1c9c7d12133403013b5a1fd77a6dc3272124bce14bbfc0 WHIRLPOOL 9033533ad2b014c70007f7ca67f6550fd953c0123a75c72c3f9e61168c49d5e7f6febbe48f9e6d695f94172f57a4059cf292e4659446f0712f23fe0dc78c34af
-MISC ChangeLog 2350 SHA256 c822b6f0419a2710a2544f293ceac63f08bea893fa768374567dac02e4e7aaac SHA512 3660911aedf3290f96598345198e903e88f9209d26121db017abc73a93e537cb851f86a1e250fb8ee254e629a5e90c98ead81de134572faff96fd89c578d6de6 WHIRLPOOL 963fcb810f88c76687b3d0e764e02c96a7ea5a6dc1b3e9bf9908ee79ba4f4c538c3ffbd33a139a35621be2e5a1c8e7530c7779b58a9b392056fb6ab645327f02
+AUX gkrellmlaunch-0.5-makefile.patch 808 SHA256 c7f25a1a9d27acc51660c8334e0b3082ef7d19172de804f9aaf2e06fa36287c5 SHA512 d9ec682a5502933ceec00104a745aa4b2a5cccea83dff3b144f7439241b544f42b16836286e1fba6c846dee2e9b7491cb7fa5a0ee181f8a396ac89f5af75842d WHIRLPOOL 57ba8c7e843964eae24ffdb0c3b7624335183fe25362eb7ff9a6f18c30dad0b0cddb1fe67fb0bbcc6aada6e4dd80b6f5c1f55a41aec4aee6a019c13d3a6234fe
+DIST gkrellmlaunch-0.5.tar.gz 22035 SHA256 e5cfd29cb206139865ef224cd16ab2389fd06648b9f22b56c3809b1c402f30f7 SHA512 be3a6df6a1648a61103d389dcea24454a142d64b1192156787b42546c485ed592dca916394e46bc0413110a90fa1f4e952fef077e9014274e74610efe8573693 WHIRLPOOL 6069c68007e6c4e3e19cdf9d6261101840ee744745723a6ed1b3e0234464e0557d83104a1ff14eaa4991a93a170b8e17006571bfca531920a8a282e0574aa937
+EBUILD gkrellmlaunch-0.5.ebuild 693 SHA256 0a23718f19b4dfdf23849c38b5bea783146add95399c69b3ac6512eaa39c3373 SHA512 22cb28f2ba93d8018a7dc9b75a9be03ce5b29c65911394dc5290053df89f75a02a4fecd536bd28f60abec55239e13e48215a39b044aa4b79b5503c2347343d05 WHIRLPOOL 47b90e6008d184cc51ed7690cd6420d2bdf8c6869a419938cefc676023e8e22346a4a5fff39d6422af0cf515c3f3d8c49d644228eafcd909f3ebaed58d4edb7e
+MISC ChangeLog 2622 SHA256 3b54f3aea7fa264555e083c905e74b036f73ff601115008768bc6b54f35de3ce SHA512 5ef848a40610c1d967c104ffab81269cd827930c0dcd433f0b251eb5291e015f20cb410382f33af3bfec18949a1fdc33cf4fd0444bba5a0d1a0321875606ff58 WHIRLPOOL e8d8fe818fdf867405a902dc2189a57dfdcc4e873c03fec870a5bd4d9da60ccc4f84202d88acc392c8ecf8c898557463191e00ae2192dff96dc245581d968371
 MISC metadata.xml 166 SHA256 5dba9ba575613d6cd1d28f1c9819cee44869bebba3cb8a91294bcca1402f5941 SHA512 85f57124de5c89f57dfd2f9c969701908554ebd07f50a084835ae35d91395fe79c6fa002c040546854009e700e7c65e9345fdb3a616978fab14c08939721f616 WHIRLPOOL 203631ae3c7368dbd852a4ae2d6826d6bbc02a3417f816c84c8b16220aafff00a62e5b3bb46d231e4702fbce62b4a172c8db1aac275b6c8975dc669dfc9bd7a9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGp3JYACgkQCaWpQKGI+9Sq8ACeMLEfK5VvWX7pfV13ion5iRpT
-jI0An0WjhbYPaONE0deaPJsEOqKR8C1u
-=vR71
+iEYEAREIAAYFAlIh/L8ACgkQCaWpQKGI+9RdnACfUzPARk47DyTeJPVRbiR9heGd
+IeoAn33LgMmTFLfLjz9S192Tr6KsJpcI
+=6ffD
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch b/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch
new file mode 100644
index 000000000000..31175b664837
--- /dev/null
+++ b/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch
@@ -0,0 +1,35 @@
+--- Makefile	2002-09-26 15:56:06.000000000 +0200
++++ Makefile_new	2013-03-15 17:26:19.398383410 +0100
+@@ -4,21 +4,25 @@
+ GTK_LIB = `pkg-config gtk+-2.0 --libs`
+ 
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) -g
++FLAGS = -fPIC $(GTK_INCLUDE)
+ #LIBS = $(GTK_LIB) $(IMLIB_LIB) -lefence
+ LIBS = $(GTK_LIB) $(IMLIB_LIB)
+ 
+-LFLAGS = -shared -W1 
++LFLAGS = -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ OBJS = gkrellmlaunch.o
+ 
++all: gkrellmlaunch.so
++
++%.o: %.c
++	$(CC) $(CFLAGS) $(FLAGS) -c -o $@ $<
++
+ gkrellmlaunch.so: $(OBJS)
+-	$(CC) $(OBJS) -o gkrellmlaunch.so $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) $(OBJS) -o gkrellmlaunch.so $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
+ 
+-gkrellmlaunch.o: gkrellmlaunch.c
+-
++gkrellmlaunch.o: gkrellmlaunch.c
+\ No newline at end of file
diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
index c6efaa569607..020920a375ab 100644
--- a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
+++ b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
@@ -1,14 +1,26 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild,v 1.16 2007/07/11 20:39:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild,v 1.17 2013/08/31 14:25:01 pacho Exp $
 
-inherit gkrellm-plugin
+EAPI=5
+inherit eutils gkrellm-plugin toolchain-funcs
 
-IUSE=""
-DESCRIPTION="a Program-Launcher Plugin for GKrellM2"
+DESCRIPTION="A Program-Launcher Plugin for GKrellM2"
 SRC_URI="mirror://sourceforge/gkrellmlaunch/${P}.tar.gz"
 HOMEPAGE="http://gkrellmlaunch.sourceforge.net/"
+IUSE=""
 
 SLOT="2"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc alpha amd64"
+
+RDEPEND="app-admin/gkrellm[X]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+}
\ No newline at end of file