Fix underlinking (merged in patch with other Makefile modifications), bug #369465

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 125 insertions, 7 deletions

diff --git a/x11-plugins/bfm/ChangeLog b/x11-plugins/bfm/ChangeLog
index 8cb05220f020..0a9a9f508c0a 100644
--- a/x11-plugins/bfm/ChangeLog
+++ b/x11-plugins/bfm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/bfm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bfm/ChangeLog,v 1.18 2014/08/10 20:01:11 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bfm/ChangeLog,v 1.19 2015/01/20 10:02:25 voyageur Exp $
+
+*bfm-0.6.4-r2 (20 Jan 2015)
+
+  20 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org> +bfm-0.6.4-r2.ebuild,
+  +files/bfm-0.6.4-makefile.patch:
+  Fix underlinking (merged in patch with other Makefile modifications), bug
+  #369465
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> bfm-0.6.4-r1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/x11-plugins/bfm/Manifest b/x11-plugins/bfm/Manifest
index 898cdd38d535..d3efe3c876c8 100644
--- a/x11-plugins/bfm/Manifest
+++ b/x11-plugins/bfm/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST bfm-0.6.4.tar.bz2 50634 SHA256 e5afb9eaebb67428c441c1eb0a98e5ad1aae46d2dcfe36567f9151c763ca04f9
+AUX bfm-0.6.4-makefile.patch 1772 SHA256 f7b1eb0ccc8c4034bf672e0cc480192fbea65868690b4269e92386e0dab40bcc SHA512 9b419e95357d6d70fd8c6dc6c36823351906bddc80815e08e991e5fd32a4bd68ee70937679fd244df8facfe1dd3bbe9ccfbc96c6fe301d04b7ab8da9815afae6 WHIRLPOOL d32659d06e19f5a56284b90d2a2b198943f389932bdbf66bc48755aee9852c5c93b92a7282e77999da7c8af30ca96304faa119da429c45c8faf4adce9fd27cfe
+DIST bfm-0.6.4.tar.bz2 50634 SHA256 e5afb9eaebb67428c441c1eb0a98e5ad1aae46d2dcfe36567f9151c763ca04f9 SHA512 4255e31d1e04bbcd007be7a616184f97b2fb73711c2070859919666685848d75d5641396f206a6a6d70c656cbf8e97357aed3d663dc6d63ed1e7eb426d13f81c WHIRLPOOL 44b73dfe07d30f83aadd9e919dcdc004e60583e00d28df4b6c202db746b571c34cfb0c854536672338e614c61cc9e789b2adc0877bfd45d975b997a7d60f07f2
 EBUILD bfm-0.6.4-r1.ebuild 1356 SHA256 d8f68bcc549cb02f713be6f9d752425572ecd0aa5dd505956b4cb5ba8cb6e417 SHA512 755f1288d6df2b40fb84343a7c15b72253b2ace6767aaec802c758743c379ba2e0db8371b245f4fcb0c4caa6ff65a378e03b1f7392a4ade6b17bbb1a889059b0 WHIRLPOOL e302ea74e3319776dd888280c55ec4eabe6c0f9e6eb97b6a4991b56ad8b06ba05f9cd486f584667567c24b1329ec6ceea7d2a4891e9e03a1202f23ac31152d12
-MISC ChangeLog 2348 SHA256 6505d121aed6abac28d21dd727b4d162cba57e0ef6a2a4f174d779202b0dcb3c SHA512 49895f68e55ba5471d56d9f5f33e0c4d6d426c6f35b08fd3b478d7f6ecfb217e07805e3d327f42b139d621522b7ded98fbd17cf017ff184abe05ea356f3f603b WHIRLPOOL 48b344d8fedf63adc99e4c51602bdb49ab05afbd0181a9f070edb9b8a62fcd81f3739043be80d2781ef59a65de684e5831738f80948eb405c03cc3a70d28044c
+EBUILD bfm-0.6.4-r2.ebuild 1079 SHA256 92133dbb41e66c3aec0d6aa795ba1eb3499ce960089efd008d1c3e5553a2efb2 SHA512 3fd88da896a812adbb13b552500ed649c875f67f98befbf898cdfd59ac07b455714d4af45cdd43fe1191cb983686e30344a12b3712305609e9c7068aa0d1aba8 WHIRLPOOL 62b828d0ea3d3150138af2fd4c50ee0bddf6ab030e97de378dd0c4505b2c4c3bebdc1cd49813a5e9922d762bd5e4002bac209cea56a3196f218e4c88a7869524
+MISC ChangeLog 2578 SHA256 21c8fab128e868e7f90d653a2a3f33ba18e88751c05f60eba4d95e60777fd89d SHA512 18dd4e975c5386e38ac6305c209ded1640bf5de574ebe3fce4c5d3e51a5771a3b892e87bb93f2b3c97b632126b8c0b5775827e46ba0fca0e5cc765e01115d3ae WHIRLPOOL d4d72d3bc7059fbfd195887299eddd07b0533121b3f32a63a21e07eb16c9f1a12f9e511187e2c8e687a500931fb50c20b1685330a61346cf800bbeda0932457a
 MISC metadata.xml 264 SHA256 68f042d61abeb44f3a69ed9be88e43ec37aa60cca1afbb174491a73a32c2aea8 SHA512 30f75209199c17a70f2f0489ab868ecc619c19c20cb0c7e85a974bec04dffc6728272f3a705b098b5f4639e7ab2b2d03522d96d21230758aefd68fb665444b86 WHIRLPOOL 9f73afa1b89b67612ed2ba4df9b8ea90fa186b65e4df977bf3bc99299d472078796fd0ef0e559f10c7b38738d8f652f74fb08647dc46f924a6bc8ea68ee16ba6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPnz4gACgkQcaHudmEf86paTwCfS/f3s72NC5IXRjpAKCuZiQhH
-V80AnRyg9P0bpaZrj75guSnihABf3Edd
-=YUFD
+iF4EAREIAAYFAlS+J7YACgkQFYEBGcdFJfKB3QD5AaKOE5ubzP1pdj0n/HYVrpSR
+sih5SDpr7DAzZi/uhbwA/2zRCvrcJHHxR8r4ZeKjqL5ELu1xbE7liY90LIwOHFLd
+=FsKa
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/bfm/bfm-0.6.4-r2.ebuild b/x11-plugins/bfm/bfm-0.6.4-r2.ebuild
new file mode 100644
index 000000000000..5fc895cea51f
--- /dev/null
+++ b/x11-plugins/bfm/bfm-0.6.4-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bfm/bfm-0.6.4-r2.ebuild,v 1.1 2015/01/20 10:02:25 voyageur Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="a dockapp and gkrellm plug-in combining timecop's bubblemon and wmfishtime"
+HOMEPAGE="http://www.jnrowe.ukfsn.org/projects/bfm.html"
+SRC_URI="http://www.jnrowe.ukfsn.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="gkrellm"
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gkrellm? ( >=app-admin/gkrellm-2 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" GENTOO_LDFLAGS="${LDFLAGS}"
+	use gkrellm && emake gkrellm CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin bubblefishymon
+
+	doman doc/*.1
+	dodoc ChangeLog* README* doc/*.sample
+
+	if use gkrellm; then
+		insinto /usr/$(get_libdir)/gkrellm2/plugins
+		doins gkrellm-bfm.so
+	fi
+}
diff --git a/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch b/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch
new file mode 100644
index 000000000000..ef47930c5dc5
--- /dev/null
+++ b/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch
@@ -0,0 +1,66 @@
+--- Makefile.orig	2015-01-20 10:56:34.791157688 +0100
++++ Makefile	2015-01-20 10:56:48.135154215 +0100
+@@ -26,21 +26,21 @@
+ EXTRA += $(WMAN)
+ 
+ # gtk cflags and gtk lib flags
+-GTK_CFLAGS = $(shell gtk-config --cflags)
++GTK_CFLAGS += $(shell gtk-config --cflags)
+ GTK_LIBS = $(shell gtk-config --libs)
+ 
+-GTK2_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags)
++GTK2_CFLAGS += $(shell pkg-config gtk+-2.0 --cflags)
+ GTK2_LIBS = $(shell pkg-config gtk+-2.0 --libs)
+ 
+ 
+ # optimization cflags
+-#CFLAGS = -O3 -Wall ${EXTRA}
+-CFLAGS = ${EXTRA}
++#CFLAGS += -O3 -Wall ${EXTRA}
++CFLAGS += ${EXTRA}
+ 
+ # profiling cflags
+-# CFLAGS = -ansi -Wall -pg -O3 ${EXTRA} -DPRO
++# CFLAGS += -ansi -Wall -pg -O3 ${EXTRA} -DPRO
+ # test coverage cflags
+-# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g ${EXTRA} -DPRO
++# CFLAGS += -fprofile-arcs -ftest-coverage -Wall -ansi -g ${EXTRA} -DPRO
+ 
+ 
+ SHELL = sh
+@@ -53,9 +53,9 @@
+ GKRELLM_SRCS = gkrellm-bfm.c
+ GKRELLM_OBJS = gkrellm-bfm.o
+ GKRELLM_BFM = gkrellm-bfm.so
+-LDFLAGS = -shared -Wl
++LDFLAGS += -shared -Wl
+ 
+-STRIP = strip
++STRIP = true
+ 
+ CC = gcc
+ 
+@@ -70,6 +70,7 @@
+ else
+ 	CFLAGS+=-DNET_DEVICE=\"$(NET_DEVICE)\"
+ endif
++	LIBS = -lm -lX11
+ 	SRCS += sys_linux.c
+ 	OBJS += sys_linux.o
+ 	INSTALL = -m 755
+@@ -129,12 +130,12 @@
+ 	$(STRIP) $(GKRELLM_BFM)
+ 
+ bubblefishymon: clean_obj
+-	$(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEFISHYMON) \
+-		$(LIBS) $(GTK2_LIBS) $(SRCS)
++	$(CC) $(GTK2_CFLAGS) $(CFLAGS) $(SRCS) $(GENTOO_LDFLAGS) -o $(BUBBLEFISHYMON) \
++		$(LIBS) $(GTK2_LIBS)
+ 	$(STRIP) $(BUBBLEFISHYMON)
+ 
+ bubblefishymon1: clean_obj
+-	$(CC) $(GTK_CFLAGS) $(CFLAGS) -o $(BUBBLEFISHYMON) \
++	$(CC) $(GTK_CFLAGS) $(CFLAGS) $(SRCS) $(GENTOO_LDFLAGS) -o $(BUBBLEFISHYMON) \
+ 		$(LIBS) $(GTK_LIBS) $(SRCS)
+ 	$(STRIP) $(BUBBLEFISHYMON)
+