Fix building with -Wl,--no-as-needed wrt #248417 by Kevin Pyle.

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

4 files changed, 63 insertions, 8 deletions

diff --git a/sys-fs/davl/ChangeLog b/sys-fs/davl/ChangeLog
index bf5e31f82505..9c88c93b3c09 100644
--- a/sys-fs/davl/ChangeLog
+++ b/sys-fs/davl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/davl
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/davl/ChangeLog,v 1.2 2007/10/29 16:57:49 welp Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/davl/ChangeLog,v 1.3 2009/12/21 14:42:08 ssuominen Exp $
+
+  21 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> davl-1.2.1.ebuild,
+  +files/davl-1.2.1-asneeded.patch:
+  Fix building with -Wl,--no-as-needed wrt #248417 by Kevin Pyle.
 
   29 Oct 2007; Peter Weller <welp@gentoo.org> davl-1.2.1.ebuild:
   Dropped ~amd64 keyword wrt bug 181248
diff --git a/sys-fs/davl/Manifest b/sys-fs/davl/Manifest
index 7a6a9dda382f..95ada21a3182 100644
--- a/sys-fs/davl/Manifest
+++ b/sys-fs/davl/Manifest
@@ -1,4 +1,5 @@
+AUX davl-1.2.1-asneeded.patch 1167 RMD160 05b5dc4ddf7b8c78c152dff708dd28c05ba66166 SHA1 88a3edf9a2ab525d2c42e588431183486e4d58e2 SHA256 0211d1eca5b36ad72b5d593c424cdfe4296bf01cb968f9940cf52087b07786d2
 DIST davl-1.2.1.tar.bz2 47033 RMD160 d333b593e12a6bfea6848624d2b38adff995660d SHA1 5c2a7e9f569f6eaa5766a813f865d9e9617748dc SHA256 5da8d9deaf914db9b39119442291bbaf03dc415d6e3ef2fb364bb82d8322a915
-EBUILD davl-1.2.1.ebuild 584 RMD160 2afb8d703a904494cf26a076dee46b00cb8ef0f8 SHA1 3bffd456da5fd5dde8a0f73ce408976f982e4f2f SHA256 714efa486214615d3f34f268b554a56e8d0366ddc0501225999847dd5691d3c5
-MISC ChangeLog 516 RMD160 22bf0566acce234594f0428d6230c34dccf69e4b SHA1 4cdf318d6f582e51e99454a4e53cf9dc16377ef3 SHA256 be519708c6989e7bec8cede440cfc6e1653e19c8b2538e6875271df243aeee69
+EBUILD davl-1.2.1.ebuild 676 RMD160 38a0664ec94d9234b99dfb8980ac5d906581cb22 SHA1 2f6c91dc8f8be08318b8d9abb85a786b07054b9d SHA256 b25cc72b3486491ab0fc9ef85241c4d57845af853bb7bdb5531c64cb1a4e0b96
+MISC ChangeLog 697 RMD160 21f11e462063a3e2ab6e865947476be98188a036 SHA1 d13b2b8443ed99f89600478d7fab5604b7251cc9 SHA256 0b17d628928d9c4d3452ed5d08059721f38555d8acff638a882ec51cc7ddb5c8
 MISC metadata.xml 223 RMD160 f88bcdebf752bcc3933b4159df5d8f9f7d487ca1 SHA1 4a17e70b26b3bba2ec6eddb403ff890bb8bcf13f SHA256 98c023870e5fbbcc4f050a192947b7b6bbd239041c9f921b3fbf64b03523019f
diff --git a/sys-fs/davl/davl-1.2.1.ebuild b/sys-fs/davl/davl-1.2.1.ebuild
index 7bb137a33c08..f1ec7fe8a6e1 100644
--- a/sys-fs/davl/davl-1.2.1.ebuild
+++ b/sys-fs/davl/davl-1.2.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/davl/davl-1.2.1.ebuild,v 1.2 2007/10/29 16:57:49 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/davl/davl-1.2.1.ebuild,v 1.3 2009/12/21 14:42:08 ssuominen Exp $
+
+inherit eutils
 
 DESCRIPTION="Visualizes the fragmentation status of ext2/3 filesystems"
 HOMEPAGE="http://davl.sourceforge.net/"
@@ -8,12 +10,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=sys-fs/e2fsprogs-1.38
 	>=x11-libs/gtk+-2.6"
-RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
 
 src_install() {
 	dobin src/cdavl/cdavl src/gdavl/gdavl
diff --git a/sys-fs/davl/files/davl-1.2.1-asneeded.patch b/sys-fs/davl/files/davl-1.2.1-asneeded.patch
new file mode 100644
index 000000000000..ad3a6bd4aa43
--- /dev/null
+++ b/sys-fs/davl/files/davl-1.2.1-asneeded.patch
@@ -0,0 +1,43 @@
+diff -ur a/src/cdavl/Makefile b/src/cdavl/Makefile
+--- a/src/cdavl/Makefile	2005-08-03 23:25:17.000000000 -0500
++++ b/src/cdavl/Makefile	2009-02-12 23:30:25.000000000 -0600
+@@ -4,10 +4,6 @@
+ include $(PATH_LIST)
+ 
+ 
+-CC = gcc
+-DEBUG =
+-#DEBUG = -DDEBUG
+-CFLAGS = -Wall -g -O -D_FILE_OFFSET_BITS=64 $(DEBUG)
+ HEADERS = cdavl.h ../common/util.h ../drv/liveinfo_app.h
+ OBJS = ../common/util.o
+ CDAVL = cdavl
+diff -ur a/src/gdavl/Makefile b/src/gdavl/Makefile
+--- a/src/gdavl/Makefile	2005-08-03 23:25:17.000000000 -0500
++++ b/src/gdavl/Makefile	2009-02-12 23:31:31.000000000 -0600
+@@ -4,22 +4,14 @@
+ include $(PATH_LIST)
+ 
+ 
+-CC = gcc
+-CFLAGS1 = -Wall -g -O `gtk-config --cflags --libs`
+-CFLAGS2 = -Wall -g -O `pkg-config --cflags --libs gtk+-2.0`
+-CFLAGS = -D$(GTK_VER)
+-ifeq ($(GTK_VER), GTK2)
+-	CFLAGS += $(CFLAGS2)
+-else
+-	CFLAGS += $(CFLAGS1)
+-endif
++CFLAGS += -D$(GTK_VER) `pkg-config --cflags gtk+-2.0`
++LDLIBS = `pkg-config --libs gtk+-2.0`
+ DEBUG =
+ #DEBUG = -D DEBUG
+ GDAVL = gdavl
+ 
+ 
+-$(GDAVL): gdavl.c if.c gdavl.h
+-	$(CC) $(CFLAGS) $(DEBUG) -o $(GDAVL) gdavl.c if.c
++$(GDAVL): gdavl.o if.o
+ 
+ clean:
+ 	rm -rf $(GDAVL) *.o test/*.png test/log test/test.log