Fix building with -Wl,--as-needed.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 50 insertions, 24 deletions

diff --git a/x11-misc/bubblemon/ChangeLog b/x11-misc/bubblemon/ChangeLog
index 143a6c5c52c0..165a9431b6d5 100644
--- a/x11-misc/bubblemon/ChangeLog
+++ b/x11-misc/bubblemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/bubblemon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/ChangeLog,v 1.36 2010/01/10 18:39:54 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/ChangeLog,v 1.37 2010/03/20 17:00:03 ssuominen Exp $
+
+  20 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  bubblemon-1.46-r1.ebuild, +files/bubblemon-1.46-asneeded.patch:
+  Fix building with -Wl,--as-needed.
 
   10 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   bubblemon-1.46-r1.ebuild, bubblemon-2.0.14.ebuild:
diff --git a/x11-misc/bubblemon/Manifest b/x11-misc/bubblemon/Manifest
index dda3020ea988..2138b4ee3de9 100644
--- a/x11-misc/bubblemon/Manifest
+++ b/x11-misc/bubblemon/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX bubblemon-1.46-asneeded.patch 509 RMD160 04963a864f93254345e6ca02bb71fadda4df822b SHA1 8f19a9e9a7d570e513364bba88a4d09d20e016ea SHA256 6b6502b6e1b0e82b38bc4b28161039705eb24785b122594adacc769138ba2017
 AUX bubblemon-1.46-gtk.patch 3435 RMD160 45e2d5d562237ec1b45553a21cc003796058dccd SHA1 ed04fadb80b5942f5358986881de53ced0d26984 SHA256 6e02353acaebba6d0b0d2fc51ad200e5d499523e933586c41770bf4b652208b1
 DIST bubblemon-2.0.14.tar.gz 221193 RMD160 1a175178b6ca4f74d3c8d60e2112d03423266c85 SHA1 66990aef47eb4a6fc6197c2ccb82f2ab3d605baf SHA256 720641a930005468fbfefe055b2aa77a2c02c6c2df050794223dce40afb5e261
 DIST bubblemon-dockapp-1.46.tar.gz 40001 RMD160 79e8be36cd11a2c6f4998cd747b6125696603a81 SHA1 172de9ea7d78e4578143469187a72da8f836647a SHA256 f928073d3c69b2668e89b93cdcca5f390437831aab3eac3aa2129f8713e79dbf
-EBUILD bubblemon-1.46-r1.ebuild 1006 RMD160 db10ef0f493a906ea60d3227c7dae9684eb2bed5 SHA1 edf8fbfc15a7ef5a4b09784e65c3c0a5a693d44f SHA256 89042f5fa24b9a72890c97341d7d1e179d4b5c3585d1fdef29877e77636b25fe
+EBUILD bubblemon-1.46-r1.ebuild 1078 RMD160 6578f3d4b018ed3965ffbae2a6cb1a6666e54846 SHA1 62a755d430169045f5395c2904c59ea7c30ed67d SHA256 9a1325bcf11bab03ea486cec1f873538508cd24eb7c08d0f454641f2b975da05
 EBUILD bubblemon-2.0.14.ebuild 1046 RMD160 dbbe89e2a1295d8cabcb11d067f457768ed41bf2 SHA1 1521a85db81495f866c501e2b5fba911e769698a SHA256 d8c92836f6a4d6279674b8d936365437f629fee076933eca885524eb8456ddc5
-MISC ChangeLog 4497 RMD160 757ea64dac1e03fd160ec222edf84ca8a176eb24 SHA1 a90cda20c36d2ecb951dbd35a7eb01782342fec9 SHA256 1cd7ac527c4d57a6d530ddc5a6415a81cabed36dabb58d34435a7e1eec97fdba
+MISC ChangeLog 4659 RMD160 418cf84f40669112987bf4683ae1ef8757b177b4 SHA1 4b2bb6315a7d192dc9c89772c7d1785bc54c9a1d SHA256 dfae5b004a3b354f0701ae591953255be181065b310ee0007b8cbb0fc9f4a52c
 MISC metadata.xml 475 RMD160 e1a44b901b512304f79749d9fc6e169e39ee7637 SHA1 f2d0cb73e5f48d43773179277def5e21b0863fd2 SHA256 3e736094fe08714e3ad07d7264f2fb0963c06d278975ee53227c73d8227ac3dd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktKHwAACgkQNQqtfCuFneMj8ACfZQyuUwvxTeJKu4PfhabwEw6m
-8awAoILq9HMS3pO2B4bEIy1WW2SSKpgR
-=kFTn
------END PGP SIGNATURE-----
diff --git a/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild b/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild
index d1bd31473835..1ac3b3a0bcd9 100644
--- a/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild
+++ b/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild,v 1.8 2010/01/10 18:39:54 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild,v 1.9 2010/03/20 17:00:03 ssuominen Exp $
 
-inherit eutils
+EAPI=2
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A fun monitoring applet for your desktop, complete with swimming duck"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
@@ -13,30 +14,30 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2"
+RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 S=${WORKDIR}/${PN}-dockapp-${PV}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gtk.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk.patch \
+		"${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_compile() {
+	tc-export CC
 	emake GENTOO_CFLAGS="${CFLAGS}" || die "emake failed."
 }
 
-src_install () {
-	dobin bubblemon
+src_install() {
+	dobin bubblemon || die
 
 	dodoc ChangeLog README doc/Xdefaults.sample
 
 	insinto /usr/share/${PN}
-	doins misc/{*.xcf,*.wav}
+	doins misc/*.{xcf,wav} || die
 
 	exeinto /usr/share/${PN}
-	doexe misc/wakwak.sh
+	doexe misc/wakwak.sh || die
 }
diff --git a/x11-misc/bubblemon/files/bubblemon-1.46-asneeded.patch b/x11-misc/bubblemon/files/bubblemon-1.46-asneeded.patch
new file mode 100644
index 000000000000..3988f3796964
--- /dev/null
+++ b/x11-misc/bubblemon/files/bubblemon-1.46-asneeded.patch
@@ -0,0 +1,30 @@
+--- Makefile
++++ Makefile
+@@ -32,14 +32,12 @@
+ OBJS = bubblemon.o
+ BUBBLEMON = bubblemon
+ 
+-LDFLAGS = -shared -Wl
+-
+ STRIP = strip
+ 
+-CC = gcc
++CC ?= gcc
+ INSTALLMAN = -m 644
+ 
+-
++LIBS = -lX11
+ 
+ # special things for Linux
+ ifeq ($(OS), Linux)
+@@ -91,8 +89,8 @@
+ all: $(BUBBLEMON)
+ 
+ bubblemon: clean_obj
+-	$(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEMON) \
+-		$(LIBS) $(GTK2_LIBS) $(SRCS)
++	$(CC) $(LDFLAGS) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEMON) \
++		$(SRCS) $(LIBS) $(GTK2_LIBS)
+ 
+ clean_obj:
+ 	rm -rf *.o