add patch for forced --as-needed linker flag (bug 272653), patch provided by Priit Laes <amd@astore20.com> in bug 232491; ported to EAPI 2

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 46 insertions, 10 deletions

diff --git a/sci-libs/parmgridgen/ChangeLog b/sci-libs/parmgridgen/ChangeLog
index 681f2725abe2..62b8d163d3bb 100644
--- a/sci-libs/parmgridgen/ChangeLog
+++ b/sci-libs/parmgridgen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/parmgridgen
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmgridgen/ChangeLog,v 1.1 2009/04/25 16:04:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmgridgen/ChangeLog,v 1.2 2009/07/21 08:01:31 fauli Exp $
+
+  21 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+  parmgridgen-1.0.ebuild, +files/parmgridgen-1.0-as-needed.patch:
+  add patch for forced --as-needed linker flag (bug 272653), patch provided
+  by Priit Laes <amd@astore20.com> in bug 232491
+  Ported to EAPI 2
 
 *parmgridgen-1.0 (25 Apr 2009)
 
diff --git a/sci-libs/parmgridgen/Manifest b/sci-libs/parmgridgen/Manifest
index dcdbceb39cf2..0a6866346cae 100644
--- a/sci-libs/parmgridgen/Manifest
+++ b/sci-libs/parmgridgen/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX parmgridgen-1.0-as-needed.patch 985 RMD160 682d577c1ae745cceefbc037e9a438dfe51ec810 SHA1 70c366201b47030eb27dae2e13733ecbce7d3964 SHA256 65d03d0696d0198f3cc1a60f63be36d76410c2d088adf54cc917fc48c795fefa
 AUX parmgridgen-1.0-autotools.patch 14205 RMD160 a323c1541af2a83b2dd61746e71732d2db0f260b SHA1 ca22ea4586b7fdac3e23861fb15d606c128df76d SHA256 241765986bc276716ceea19b3d2a23ce6b2218b84687938c5dd283ce4d14cfe0
 DIST ParMGridGen-1.0.tar.gz 2623528 RMD160 3df10be4341c9b9d73f8b4047027b2be8c56bd92 SHA1 506d90cf0e88da16b389332e34a6118b380e9bf2 SHA256 62cdb6e48cfc59124e5d5d360c2841e0fc2feecafe65bda110b74e942740b395
-EBUILD parmgridgen-1.0.ebuild 853 RMD160 44b621bd2394d44ab42697bbb743011254ab83fe SHA1 10dc9f2269f2943a3d5e53941c4fb8f95d994c9f SHA256 d7f949f78d69daef6d54662f56b0be9a3874f6657980720a8a1156cc76e94e60
-MISC ChangeLog 892 RMD160 1a47253d0d7d7b6c455c726d7d9f0a3167a5f9d3 SHA1 eb26e41642376d7e3d3a2bd6b4ccd480ca954d61 SHA256 9d2b621df852bbc6f8eb7fd85d12a949276e4b1c70fdcd48c640535bfe6b57c7
+EBUILD parmgridgen-1.0.ebuild 840 RMD160 7d8e3ee29bef249edf7c94a9d5e2cb5e3bdf2ae0 SHA1 f1d48bf3d4144aa102b0154f4c23de34f4dd5bee SHA256 7966d0830979b31c659f3540dc764661ebaae001870aa2315d53773988258d3d
+MISC ChangeLog 1156 RMD160 5c0fd4563807a6614553e0794c9c6be53ed961da SHA1 8d425feebcee47eaf6764c6102710d604e412aac SHA256 cd6e32a2d8374c0b3340e1c4d08ed8c14db8e6bc0c4929c5ffda2dac35c11958
 MISC metadata.xml 255 RMD160 dbe77cd804a4411e8445c05f6e632fdc2f72d082 SHA1 94e7a8d2d43907279488b984c3dcd9fd1888ce25 SHA256 28c7b0445a5f2eb0d524ff3afcef712ecbf345592d26142f71a3ef9bca653d4b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkplde8ACgkQNQqtfCuFneND9gCdHPfH+R+LWz0zlHIwBhg+OeQy
+kDcAn2BvFHYXQoFcfT6Jy5rWEH++XtGw
+=45ff
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch b/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch
new file mode 100644
index 000000000000..4f9addda4228
--- /dev/null
+++ b/sci-libs/parmgridgen/files/parmgridgen-1.0-as-needed.patch
@@ -0,0 +1,19 @@
+--- MGridGen/Lib/Makefile.am.old	2009-03-10 09:28:13.000000000 +0200
++++ MGridGen/Lib/Makefile.am	2009-03-10 09:28:07.000000000 +0200
+@@ -8,3 +8,5 @@
+ lib_LTLIBRARIES = libMGridGen.la
+ libMGridGen_la_SOURCES = aratio.c  coarsen.c  kwayfm.c  match.c  merge.c  mgridgen.c  refine.c  setup.c
+ libMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0
++
++libMGridGen_la_LIBADD = ../IMlib/libIMlib.la
+--- ParMGridGen/ParLib/Makefile.am.old	2009-03-10 09:31:43.000000000 +0200
++++ ParMGridGen/ParLib/Makefile.am	2009-03-10 09:35:13.000000000 +0200
+@@ -8,3 +8,8 @@
+ lib_LTLIBRARIES = libParMGridGen.la
+ libParMGridGen_la_SOURCES = comm.c  debug.c  grsetup.c  ikeysort.c  memory.c  move.c  parmgridgen.c  setup.c  util.c
+ libParMGridGen_la_LDFLAGS = -no-undefined -export-dynamic -version-info 1:0:0
++
++libParMGridGen_la_LIBADD = \
++	$(top_builddir)/MGridGen/IMlib/libIMlib.la \
++	$(top_builddir)/MGridGen/Lib/libMGridGen.la \
++	../IMParMetis-2.0/ParMETISLib/libIMparmetis.la
diff --git a/sci-libs/parmgridgen/parmgridgen-1.0.ebuild b/sci-libs/parmgridgen/parmgridgen-1.0.ebuild
index a7c0a04926fd..1d9521db5fb9 100644
--- a/sci-libs/parmgridgen/parmgridgen-1.0.ebuild
+++ b/sci-libs/parmgridgen/parmgridgen-1.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmgridgen/parmgridgen-1.0.ebuild,v 1.1 2009/04/25 16:04:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmgridgen/parmgridgen-1.0.ebuild,v 1.2 2009/07/21 08:01:31 fauli Exp $
+
+EAPI=2
 
 inherit eutils autotools
 
@@ -24,15 +26,13 @@ pkg_setup(){
 	export CC=mpicc
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}/${P}-autotools.patch"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 	eautoreconf
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README Doc/*.pdf || die "dodoc failed"
+	emake DESTDIR="${D}" install || die
+	dodoc README Doc/*.pdf || die
 }