Fix building with -Wl,--as-needed wrt #323595 by Diego E. Pettenò.

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

diff --git a/app-editors/ne/ChangeLog b/app-editors/ne/ChangeLog
index f368961806070ce6744f5dda4cf836338bd86001..a93a49137c187ffc10d5335c7cc3097a47367126 100644 (file)
--- a/app-editors/ne/ChangeLog
+++ b/app-editors/ne/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/ne
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ChangeLog,v 1.40 2010/05/31 11:56:35 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ChangeLog,v 1.41 2010/06/11 19:12:30 ssuominen Exp $
+
+  11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> ne-2.1.ebuild,
+  +files/ne-2.1-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #323595 by Diego E. Pettenò.
 
   31 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> ne-2.0.3.ebuild:
   x86 stable wrt bug #320911

diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest
index c966eb18278ad85f0d411df66b008c33fff4ff01..dc4757da02d0aa0c6346520e3d0ff8dbdd55be19 100644 (file)
--- a/app-editors/ne/Manifest
+++ b/app-editors/ne/Manifest
@@ -1,3 +1,4 @@
+AUX ne-2.1-asneeded.patch 331 RMD160 9a2fa105d05d3df24fbadd6bb7998e9471f36b2d SHA1 1ab47bc8bc77ec2af01f8641cf8f57942e8bfa23 SHA256 88fc33b84d2a02d52e010937f08ab7d745bd2a2ff5a2f86a8b9b2574db0e8ef5
 DIST ne-1.42.tar.gz 1101117 RMD160 ab96587f07b8519ef0c6e91c5da0381983531565 SHA1 aeca172197a8a18774cc22d4b698bd3bc6b7c683 SHA256 1989a346179924d379e167685225b57f8100c7431bbd17865f212cb83015c7d0
 DIST ne-1.43.tar.gz 1135016 RMD160 803964b3ff5a8f15360ecd5e792e4eef78483c5d SHA1 181d3559e3cb81f4b2caa82bc3af2268c82f8841 SHA256 2d8c2ad14e5554497d6880a21102201e610da40ee806a8e3e35ea076566a8057
 DIST ne-2.0.3.tar.gz 1102424 RMD160 4ee477a8bac1a2c47983d7cfc6f698ecac76d887 SHA1 9dd848041b9c719659182b2cf8b03b6753b99291 SHA256 7ba91b956f9308128236b9e3ded4307e061ad0558f9270eae9845c82951ab34e
@@ -5,6 +6,6 @@ DIST ne-2.1.tar.gz 1016020 RMD160 81c1b1dcfce55d09db03c7c58fb39d73c5f769e8 SHA1
 EBUILD ne-1.42.ebuild 921 RMD160 da951f8e6f3703cc4d0c4b63b9ac78c1d39e6e7c SHA1 795d2850b4ee29dbe17362bc5fa9d92772032370 SHA256 50307275973e0324fc56e5d2632ac66da70bee9d68f7d2cfe1db25b18d4465b7
 EBUILD ne-1.43.ebuild 927 RMD160 05cf84cad2f8779193e6c91db53ce59c5700e661 SHA1 50644e8c66c9eb50c75cb9af6a78ebc325bc1461 SHA256 af9e7239a7b3b7cd21f8d7db4de890bb3e274ea0041feba556ed6626c7dadd20
 EBUILD ne-2.0.3.ebuild 1146 RMD160 b93162fb80899ea675aba19410f95b62512f695e SHA1 983d1c8958d40c5a7186efd2816e994b6e33dc8a SHA256 547a8208e945f0c1227d0159e001e6ae78665f07dab5f76afbe1944294dd33f2
-EBUILD ne-2.1.ebuild 1147 RMD160 fc7b4502b30d2a074af07fa2bad809c841724ee5 SHA1 c5143f67010c7d658ea505af3b4532876c3578ee SHA256 09c8b36b06e6da39e53e6508deb808be2a4a41512869f7a2585c2b5cda35a95e
-MISC ChangeLog 4587 RMD160 a02ad703a5dc1c50c7e76cf62f13029d8136aa0e SHA1 a32d4ea1a87f97a277998eb95ecd972e4dad3d25 SHA256 71f4a41b4fdf5de6176e66679661454053f13b73302e18952110c9e8459c6066
+EBUILD ne-2.1.ebuild 1199 RMD160 fed0e68eed17a3da0dd6a98ee1b7cd23cf64c722 SHA1 3f56607324501d5df569acb3adf1dc39a2ed082a SHA256 54075cef7313b45975cd193cc109e640c08073ef3f68e193afe9ebe745291b69
+MISC ChangeLog 4758 RMD160 cf79dc3df1d5366c7c57b87c69eb193308fe16d8 SHA1 1ffd902f594b285b01ba9c7e7047ae462d7ff550 SHA256 acfe0bc371718d8f29a29f603cdd4c63b24007dc6547107f8b4f2b36ad593aa2
 MISC metadata.xml 275 RMD160 ad0fdafce64cbea0d006884115316cf5f70801d5 SHA1 d10e8e23d447011aeb215aa269aa0e83e731ed26 SHA256 b55e269465f7e464177aafbdc11ce83af81af2c4ec8fae3c976e8919441ff9b6

diff --git a/app-editors/ne/files/ne-2.1-asneeded.patch b/app-editors/ne/files/ne-2.1-asneeded.patch
new file mode 100644 (file)
index 0000000..8483d15
--- /dev/null
+++ b/app-editors/ne/files/ne-2.1-asneeded.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/323595
+
+--- src/makefile
++++ src/makefile
+@@ -104,7 +104,7 @@
+ LIBS=$(if $(NE_TERMCAP)$(NE_ANSI),,-lcurses)
+ 
+ ne:   $(OBJS) $(if $(NE_TERMCAP)$(NE_ANSI),$(TERMCAPOBJS),)
+-      $(CC) -lm $(OPTS) $(LDFLAGS) $^ $(LIBS) -o $(PROGRAM)
++      $(CC) $(OPTS) $(LDFLAGS) $^ -lm $(LIBS) -o $(PROGRAM)
+ 
+ clean:
+       rm -f *.o core

diff --git a/app-editors/ne/ne-2.1.ebuild b/app-editors/ne/ne-2.1.ebuild
index 1b944328362f4a79f7d73af8b0ccc68814fa4819..2c32c09132dbf87d23f9f0c7990e75ebcdde2328 100644 (file)
--- a/app-editors/ne/ne-2.1.ebuild
+++ b/app-editors/ne/ne-2.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-2.1.ebuild,v 1.1 2010/05/21 16:53:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-2.1.ebuild,v 1.2 2010/06/11 19:12:30 ssuominen Exp $
 
 EAPI="2"
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
 HOMEPAGE="http://ne.dsi.unimi.it/"
@@ -20,7 +20,8 @@ DEPEND="${RDEPEND}
        dev-lang/perl"
 
 src_prepare() {
-       sed -i -e s/-O3// "${S}"/src/makefile
+       sed -i -e 's/-O3//' src/makefile || die
+       epatch "${FILESDIR}"/${P}-asneeded.patch
 }
 
 src_compile() {