Version bump (bug #263725, thanks to jlec) and fixed for as-needed (bug #248350). Added a static use flag for static library building switch.

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

7 files changed, 98 insertions, 95 deletions

diff --git a/dev-libs/libf2c/ChangeLog b/dev-libs/libf2c/ChangeLog
index fdd8ca164349..b7bb05f7219e 100644
--- a/dev-libs/libf2c/ChangeLog
+++ b/dev-libs/libf2c/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/libf2c
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/ChangeLog,v 1.31 2008/11/26 16:43:36 ranger Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/ChangeLog,v 1.32 2009/04/07 12:16:44 bicatali Exp $
+
+*libf2c-20090407 (07 Apr 2009)
+
+  07 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/libf2c-20021004-shared-object.patch,
+  files/20070912-link-shared-libf2c-correctly.patch,
+  +files/20090407-link-shared-libf2c-correctly.patch,
+  -libf2c-20021004-r1.ebuild, +libf2c-20090407.ebuild:
+  Version bump (bug #263725, thanks to jlec) and fixed for as-needed (bug
+  #248350). Added a static use flag for static library building switch.
 
   26 Nov 2008; Brent Baude <ranger@gentoo.org> libf2c-20070912.ebuild:
   stable ppc64, bug 245830
diff --git a/dev-libs/libf2c/Manifest b/dev-libs/libf2c/Manifest
index 26690ff4e73b..5579351b02f4 100644
--- a/dev-libs/libf2c/Manifest
+++ b/dev-libs/libf2c/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 20051004-add-ofiles-dep.patch 439 RMD160 c4ca7645c0df795c8cc9be31cb6e9704a9b6285a SHA1 4453a9f1e4d59e87cd4a1a0ef1bc780bca6917d0 SHA256 3f688297b45515c1e386bb7f94ad36bf0f6a3497a0baff759b54d943cbec7d8f
-AUX 20070912-link-shared-libf2c-correctly.patch 344 RMD160 f8040f1f0fa5301edb8ef0ab37b23d13d3e3afb8 SHA1 076995d1f09eb80c4c8d893ed02f9c009e068ab3 SHA256 6a26f57fb2a8c6a5d15e494d382f3c9fbd714b459f0c539d0ac7d833e7a80a32
-AUX libf2c-20021004-shared-object.patch 1437 RMD160 677bdc26114f038423dece6d3e6db93fb2808060 SHA1 dce18f92aadbf760369bef276968f118c66521a9 SHA256 339c786cdada1f1c95505db5fd2529643dcade97b3213f93941e05e22c8e56b9
+AUX 20070912-link-shared-libf2c-correctly.patch 356 RMD160 e979e8870e063f2f5b6764b0c199a13e940f2c64 SHA1 f8192db58e9c66984c77da74db4b07b6913d9023 SHA256 23e36c6802d29bdec559b59fbd9713f21a28896307647149601a99767c4c58db
+AUX 20090407-link-shared-libf2c-correctly.patch 358 RMD160 18d38638a542dc00b6ff3b1c03f7ecaaa2cb5ec8 SHA1 142235a5504bd725f157ff61c82e649a9b0e79f4 SHA256 32d80ec1dfaf4af785cf6d66ed9082ab6d9d1248ac40149ef3a83b8338311898
 DIST libf2c-20070912.zip 128622 RMD160 bc2da3c0a61583cca238995c43871cf2221aa404 SHA1 d84e692cc295adb45a80ae888db920b582fa49d6 SHA256 9403da6e0ea3f20012f351ff1525efd7fc0d696b82ab7219f711f21e73d09ec0
-DIST libf2c.zip 123393 RMD160 8407a1e801a136fd3388cbc71aab6c8b578100c7 SHA1 cafa2f1ef69b9e85d25cbc73ab2d82d1811e3fde SHA256 0a23ed0d677711c0e2691fc45422cfeaab08258c367fdd04854d4067d3058c06
-EBUILD libf2c-20021004-r1.ebuild 846 RMD160 e5c42792a85ebdf2b2769fe104a408d21ec83239 SHA1 d692153cf5fe7ee6b4cf34f05126a8c373ed6226 SHA256 5a626549fe6bde3e16c7c561e7038d41d83f6904f016cf45e4ed9a9d12561d07
+DIST libf2c-20090407.zip 128822 RMD160 090023bc8cb548d1f1ed9684d22e30c01293a4d5 SHA1 786a282571ffb9ade10e63ceff80ca33d452c821 SHA256 5b3503d1560f0f12649baa94ad5ce8ff7e363ca3507c10bfc4afc8cfdb07fe92
 EBUILD libf2c-20070912.ebuild 1407 RMD160 c2aeae69a8012980d175ead373541f313254d6e0 SHA1 ecdb1e664fc5cf25c87ef26751bcf082d248181e SHA256 2781996b6547f2a0a22f7a016f7f31e6e0877a9e2527576ccf7715685036ef60
-MISC ChangeLog 4148 RMD160 69cadafa5570b9a9dd040f0bed31186e17d3ce40 SHA1 c48c3180c3f0b032652435cd85c5202a80807c35 SHA256 a3526eff7a5164ce7242513a7a63278f7f8fcb059cbca060b7d621f83410f526
+EBUILD libf2c-20090407.ebuild 1465 RMD160 8bc651512c4d3ae7e0f98c2e84057d6a8aa83964 SHA1 36e57fa530bf24d4c827c7f61d7c163935278712 SHA256 35405fa2abb79b83119b5434b64e2e78740b2691e8964af31d48d71ddd3de302
+MISC ChangeLog 4592 RMD160 942fc65646d9db012b219787450ae9459f36174c SHA1 a027af698388abfa013b307726c85414c5f5d54d SHA256 a35d5f9ad2c7d3e683c58c9e157e6ba4cd1529859292961cbc578393607910da
 MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknbRDQACgkQ1ycZbhPLE2B46QCfUGcLRF0aVB+U5e+BVMMwg5nP
+IkIAoK/sAVcVmETLYje6CAWRJXD7pJhP
+=jCYu
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libf2c/files/20070912-link-shared-libf2c-correctly.patch b/dev-libs/libf2c/files/20070912-link-shared-libf2c-correctly.patch
index d8f20a942d89..261b76eb6c29 100644
--- a/dev-libs/libf2c/files/20070912-link-shared-libf2c-correctly.patch
+++ b/dev-libs/libf2c/files/20070912-link-shared-libf2c-correctly.patch
@@ -5,7 +5,7 @@
  
  libf2c.so: $(OFILES)
 -	cc -shared -o libf2c.so $(OFILES)
-+	$(CC) -shared -Wl,-soname,libf2c.so.2 -lm -o libf2c.so.2 $(OFILES)
++	$(CC) -shared $(LDFLAGS) -Wl,-soname,libf2c.so.2 -lm $(OFILES) -o libf2c.so.2 
  
  ### If your system lacks ranlib, you don't need it; see README.
  
diff --git a/dev-libs/libf2c/files/20090407-link-shared-libf2c-correctly.patch b/dev-libs/libf2c/files/20090407-link-shared-libf2c-correctly.patch
new file mode 100644
index 000000000000..35b3bb135c08
--- /dev/null
+++ b/dev-libs/libf2c/files/20090407-link-shared-libf2c-correctly.patch
@@ -0,0 +1,11 @@
+--- makefile.u.orig	2008-07-07 23:27:41.000000000 -0700
++++ makefile.u	2008-07-07 23:28:39.000000000 -0700
+@@ -82,7 +82,7 @@
+ ## of "cc -shared".
+ 
+ libf2c.so: $(OFILES)
+-	$(CC) -shared -o libf2c.so $(OFILES)
++	$(CC) -shared $(LDFLAGS) -Wl,-soname,libf2c.so.2 -lm $(OFILES) -o libf2c.so.2
+ 
+ ### If your system lacks ranlib, you don't need it; see README.
+ 
diff --git a/dev-libs/libf2c/files/libf2c-20021004-shared-object.patch b/dev-libs/libf2c/files/libf2c-20021004-shared-object.patch
deleted file mode 100644
index baab44a6bd5a..000000000000
--- a/dev-libs/libf2c/files/libf2c-20021004-shared-object.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- makefile.u.orig	2004-06-30 23:30:44.980603208 +0200
-+++ makefile.u	2004-06-30 23:33:28.220786928 +0200
-@@ -17,6 +17,7 @@
- # compile, then strip unnecessary symbols
- .c.o:
- 	$(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
-+	$(CC) -c -DSkip_f2c_Undefs $(CFLAGS) -fPIC $*.c -o shared/$*.o
- 	ld -r -x -o $*.xxx $*.o
- 	mv $*.xxx $*.o
- ## Under Solaris (and other systems that do not understand ld -x),
-@@ -63,7 +64,14 @@
- # For INTEGER*8 support (which requires system-dependent adjustments to
- # f2c.h), add $(QINT) to the libf2c.a dependency list below...
- 
--all: f2c.h signal1.h sysdep1.h libf2c.a
-+dirs:
-+	mkdir -p shared
-+
-+libf2c.so: $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
-+	$(HALF) $(CMP) $(EFL) $(CHAR) $(I77) $(TIME)
-+	gcc -shared -o libf2c.so shared/*.o
-+
-+all: dirs f2c.h signal1.h sysdep1.h libf2c.a libf2c.so
- 
- libf2c.a: $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
- 	$(HALF) $(CMP) $(EFL) $(CHAR) $(I77) $(TIME)
-@@ -74,9 +82,11 @@
- 
- f77vers.o: f77vers.c
- 	$(CC) -c f77vers.c
-+	$(CC) -fPIC -c f77vers.c -o shared/f77vers.o
- 
- i77vers.o: i77vers.c
- 	$(CC) -c i77vers.c
-+	$(CC) -fPIC -c i77vers.c -o shared/i77vers.o
- 
- # To get an "f2c.h" for use with "f2c -C++", first "make hadd"
- hadd: f2c.h0 f2ch.add
-@@ -108,7 +118,7 @@
- 	-ranlib $(LIBDIR)/libf2c.a
- 
- clean:
--	rm -f libf2c.a *.o arith.h signal1.h sysdep1.h
-+	rm -f libf2c.a *.o shared/*.o arith.h signal1.h sysdep1.h
- 
- backspac.o:	fio.h
- close.o:	fio.h
diff --git a/dev-libs/libf2c/libf2c-20021004-r1.ebuild b/dev-libs/libf2c/libf2c-20021004-r1.ebuild
deleted file mode 100644
index e4c6bbdefed1..000000000000
--- a/dev-libs/libf2c/libf2c-20021004-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20021004-r1.ebuild,v 1.14 2008/11/06 15:05:15 bicatali Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Library that converts FORTRAN to C source."
-HOMEPAGE="ftp://ftp.netlib.org/f2c/index.html"
-SRC_URI="ftp://ftp.netlib.org/f2c/${PN}.zip"
-
-LICENSE="libf2c"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-shared-object.patch
-}
-
-src_compile() {
-	emake -f makefile.u all \
-		CFLAGS="${CFLAGS}" \
-		CC="$(tc-getCC)" \
-		|| die
-}
-
-src_install () {
-	dolib.a libf2c.a
-	dolib libf2c.so
-	insinto /usr/include
-	doins f2c.h
-	dodoc README Notice
-}
diff --git a/dev-libs/libf2c/libf2c-20090407.ebuild b/dev-libs/libf2c/libf2c-20090407.ebuild
new file mode 100644
index 000000000000..8f0edc89d680
--- /dev/null
+++ b/dev-libs/libf2c/libf2c-20090407.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20090407.ebuild,v 1.1 2009/04/07 12:16:44 bicatali Exp $
+
+EAPI=2
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Library that converts FORTRAN to C source."
+HOMEPAGE="ftp://ftp.netlib.org/f2c/index.html"
+# copy this one and rename it on the gentoo mirrors
+#SRC_URI="ftp://ftp.netlib.org/f2c/${PN}.zip"
+SRC_URI="mirror://gentoo/${P}.zip"
+
+LICENSE="libf2c"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="static"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/20051004-add-ofiles-dep.patch
+	epatch "${FILESDIR}"/${PV}-link-shared-libf2c-correctly.patch
+}
+
+src_compile() {
+	emake \
+		-f makefile.u \
+		libf2c.so \
+		CFLAGS="${CFLAGS} -fPIC" \
+		CC="$(tc-getCC)" \
+		|| die "libf2c.so failed"
+
+	# Clean up files so we can recompile without PIC for the static lib
+	if use static; then
+		rm *.o || die "clean failed"
+		emake \
+			-f makefile.u \
+			all \
+			CFLAGS="${CFLAGS}" \
+			CC="$(tc-getCC)" \
+			|| die "all failed"
+	fi
+}
+
+src_install () {
+	dolib libf2c.so.2 || die "dolib failed"
+	dosym libf2c.so.2 /usr/$(get_libdir)/libf2c.so
+	if use static; then
+		dolib.a libf2c.a || die "dolib.a failed"
+	fi
+	insinto /usr/include
+	doins f2c.h || die "f2c.h install failed"
+	dodoc README Notice || die "doc install failed"
+}