Fix building with -Wl,--as-needed wrt #277675 by Kacper Kowalik.

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

4 files changed, 46 insertions, 8 deletions

diff --git a/sys-fs/chironfs/ChangeLog b/sys-fs/chironfs/ChangeLog
index 626db618a93f..5de3f7a4c2e7 100644
--- a/sys-fs/chironfs/ChangeLog
+++ b/sys-fs/chironfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/chironfs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/chironfs/ChangeLog,v 1.2 2009/06/24 07:42:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/chironfs/ChangeLog,v 1.3 2009/12/21 14:30:19 ssuominen Exp $
+
+  21 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> chironfs-1.1.1.ebuild,
+  +files/chironfs-1.1.1-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #277675 by Kacper Kowalik.
 
   24 Jun 2009; Daniel Black <dragonheart@gentoo.org> chironfs-1.0.0.ebuild,
   chironfs-1.1.1.ebuild:
diff --git a/sys-fs/chironfs/Manifest b/sys-fs/chironfs/Manifest
index 05ef7d90dc2f..5f3ab56e6170 100644
--- a/sys-fs/chironfs/Manifest
+++ b/sys-fs/chironfs/Manifest
@@ -1,6 +1,7 @@
+AUX chironfs-1.1.1-asneeded.patch 851 RMD160 d5bf69006cbe36f2b5950bd52bc0535db0f4b79c SHA1 bfae002b657e6b8369fc6313cb11709e433aa0dd SHA256 e6a751c9af629bce48a274ea6c73662ab47c0379d680e9956d1283e6f5b5353f
 DIST chironfs-1.0.0.tar.gz 400809 RMD160 272de4529771dc9cb64dc994bc412902778e05da SHA1 6ed5dc0962d81b7923ba12734a01acf0e8642b93 SHA256 d05dfd7b15ade7f881464a78c176526f086571a7f15948214686349f0e9a86f9
 DIST chironfs-1.1.1.tar.gz 444036 RMD160 29cc8fb3aac8148d3238a6b79bb002d7f8aad826 SHA1 cc92d8ed39a1594da0422408daf080681efe7ba5 SHA256 9381aa3773fb4797e6aed5a3a5e83a3d342e7950aab3f63fc94a4fdca92791c9
 EBUILD chironfs-1.0.0.ebuild 609 RMD160 77856703ae08a8d596d529b4364bbc94c5cc5818 SHA1 251ed8e68c67fe230854bab00d3b4b71dc8ddd65 SHA256 0dcf3df667474c77ab5466c19f31ad8b2eb2c86731bc82b93f500a5299422318
-EBUILD chironfs-1.1.1.ebuild 609 RMD160 7298e7ae34fd12369fc1812de5ed9b2bf7b977c6 SHA1 8371afc8edc961aebec4e5a38811f6e3c85dd6ad SHA256 fe9a11e67071ae6ba775a051f3e5700d8c6f64abfebdf25bae6d8bd2f7e2daf6
-MISC ChangeLog 579 RMD160 4d5c113645cca5685e47b93c6dd6dae862ea2a01 SHA1 1c28084dda7eebb97ad8c130bf6aed7dcb7c127e SHA256 d9cf6c594bc9fdd395dc4774a562f5ec63476c926933a8b4f30cee7e3bac2a46
+EBUILD chironfs-1.1.1.ebuild 687 RMD160 c1ad4616261583ede04df4ad4d054fea13be2bc0 SHA1 cc4db9b72c4d2d37075aa55a67acec1d9375fbc3 SHA256 b6d7f55a9ff8a66632364ea6066f56dc8884c68deb9ebbf877e63a00bc4cc334
+MISC ChangeLog 762 RMD160 a8c151ff240f334c9a3d6923be4624d58217d9c0 SHA1 ab2ac44811dd7aa7d3b66ca285675877f905b6ad SHA256 95addeb834712347f437c24764f351240fe995c96a1b8b3d7c8b1ffccf5c3fb8
 MISC metadata.xml 546 RMD160 057a777f5799058f34cd36aae3089e84379ab3e9 SHA1 1e3351d1f6c89aaf9551bccd841b9e6ba04bc435 SHA256 fcc1099ea9f1b45717f395f508ef37570c2966510fcebbe1368fce4cbbd65357
diff --git a/sys-fs/chironfs/chironfs-1.1.1.ebuild b/sys-fs/chironfs/chironfs-1.1.1.ebuild
index 78992e30caba..89b681d33ef4 100644
--- a/sys-fs/chironfs/chironfs-1.1.1.ebuild
+++ b/sys-fs/chironfs/chironfs-1.1.1.ebuild
@@ -1,18 +1,27 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/chironfs/chironfs-1.1.1.ebuild,v 1.2 2009/06/24 07:42:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/chironfs/chironfs-1.1.1.ebuild,v 1.3 2009/12/21 14:30:19 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Chiron FS - A FUSE based replication filesystem"
-SRC_URI="http://chironfs.googlecode.com/files/${P}.tar.gz"
 HOMEPAGE="http://www.furquim.org/chironfs/"
+SRC_URI="http://chironfs.googlecode.com/files/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
 SLOT="0"
-RDEPEND=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
+
 DEPEND="sys-fs/fuse"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die 'install failure'
+	emake DESTDIR="${D}" install || die
 	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${P}
 }
diff --git a/sys-fs/chironfs/files/chironfs-1.1.1-asneeded.patch b/sys-fs/chironfs/files/chironfs-1.1.1-asneeded.patch
new file mode 100644
index 000000000000..5e4788952c90
--- /dev/null
+++ b/sys-fs/chironfs/files/chironfs-1.1.1-asneeded.patch
@@ -0,0 +1,24 @@
+--- chironfs-1.1.1.orig/src/Makefile.am	2008-06-21 07:39:46.000000000 +0200
++++ chironfs-1.1.1/src/Makefile.am	2009-10-23 21:42:55.511789469 +0200
+@@ -4,7 +4,9 @@
+ chironfs_SOURCES = chironfs.c chiron-conf.c chirondbg.c chironfs.h chiron-types.h chironfn.c chironfn.h chironoper.h
+ chirctl_SOURCES = chirctl.c chirondbg.c chirctl.h chironfs.h chiron-types.h chironfn.c chironfn.h
+ if FREEBSD
+-OSLD=-pthread -liconv -lfuse -L/usr/local/lib
++OSLD=-liconv -lfuse -L/usr/local/lib
++chironfs_LDFLAGS = -pthread
++chirctl_LDFLAGS = -pthread
+ else
+ if NETBSD
+ OSLD=-lrefuse
+@@ -12,7 +14,8 @@
+ OSLD=-lfuse
+ endif
+ endif
+-chironfs_LDFLAGS = -lm ${OSLD}
++chironfs_LDADD = -lm ${OSLD}
+ chironfs_OBJSS = chironfs.o chiron-conf.o chirondbg.o chironfn.o
+-chirctl_LDFLAGS = -lm ${OSLD}
++chirctl_LDADD = -lm ${OSLD}
+ chirctl_OBJSS = chirctl.o chirondbg.o chironfn.o
++