Really including soname into shared library

(Portage version: 2.2_rc12/cvs/Linux 2.6.25-gentoo-r7 x86_64)

5 files changed, 14 insertions, 61 deletions

diff --git a/dev-libs/libf2c/ChangeLog b/dev-libs/libf2c/ChangeLog
index 5f944e3b52c6..99790c9f36e2 100644
--- a/dev-libs/libf2c/ChangeLog
+++ b/dev-libs/libf2c/ChangeLog
@@ -1,6 +1,10 @@
 # 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.26 2008/07/08 17:17:59 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/ChangeLog,v 1.27 2008/11/06 15:05:15 bicatali Exp $
+
+  06 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  files/20070912-link-shared-libf2c-correctly.patch, libf2c-20070912.ebuild:
+  Really including soname into shared library
 
   08 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   libf2c-20070912.ebuild:
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 de85b6dbb471..d8f20a942d89 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 -lm -o libf2c.so $(OFILES)
++	$(CC) -shared -Wl,-soname,libf2c.so.2 -lm -o libf2c.so.2 $(OFILES)
  
  ### If your system lacks ranlib, you don't need it; see README.
  
diff --git a/dev-libs/libf2c/libf2c-20021004-r1.ebuild b/dev-libs/libf2c/libf2c-20021004-r1.ebuild
index 5fe6851c89e8..e4c6bbdefed1 100644
--- a/dev-libs/libf2c/libf2c-20021004-r1.ebuild
+++ b/dev-libs/libf2c/libf2c-20021004-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.13 2005/09/10 11:42:52 agriffis Exp $
+# $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
 
@@ -16,12 +16,12 @@ IUSE=""
 DEPEND="virtual/libc
 	app-arch/unzip"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-shared-object.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-shared-object.patch
 }
 
 src_compile() {
diff --git a/dev-libs/libf2c/libf2c-20051004.ebuild b/dev-libs/libf2c/libf2c-20051004.ebuild
deleted file mode 100644
index 31a76423e07d..000000000000
--- a/dev-libs/libf2c/libf2c-20051004.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20051004.ebuild,v 1.2 2007/08/23 13:12:09 uberlord 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"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="libf2c"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-add-ofiles-dep.patch
-}
-
-src_compile() {
-	emake \
-		-f makefile.u \
-		all \
-		CFLAGS="${CFLAGS}" \
-		CC="$(tc-getCC)" \
-		|| die "all failed"
-
-	# Clean up files so we can recompile PIC for the shared lib
-	rm *.o || die "clean failed"
-
-	emake \
-		-f makefile.u \
-		libf2c.so \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CC="$(tc-getCC)" \
-		|| die "libf2c.so failed"
-}
-
-src_install () {
-	dolib.a libf2c.a || die "dolib.a failed"
-	dolib libf2c.so || die "dolib failed"
-	insinto /usr/include
-	doins f2c.h || die "f2c.h install failed"
-	dodoc README Notice || die "doc install failed"
-}
diff --git a/dev-libs/libf2c/libf2c-20070912.ebuild b/dev-libs/libf2c/libf2c-20070912.ebuild
index e6cf14731c92..2208896433da 100644
--- a/dev-libs/libf2c/libf2c-20070912.ebuild
+++ b/dev-libs/libf2c/libf2c-20070912.ebuild
@@ -1,6 +1,6 @@
 # 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-20070912.ebuild,v 1.4 2008/07/09 15:32:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20070912.ebuild,v 1.5 2008/11/06 15:05:15 bicatali Exp $
 
 inherit toolchain-funcs eutils
 
@@ -48,7 +48,8 @@ src_compile() {
 
 src_install () {
 	dolib.a libf2c.a || die "dolib.a failed"
-	dolib libf2c.so || die "dolib failed"
+	dolib libf2c.so.2 || die "dolib failed"
+	dosym libf2c.so.2 /usr/$(get_libdir)/libf2c.so
 	insinto /usr/include
 	doins f2c.h || die "f2c.h install failed"
 	dodoc README Notice || die "doc install failed"