Make sure we link to /lib/libtermcap.so, not /usr/lib/libtermcap.a, bug #4411.

5 files changed, 29 insertions, 15 deletions

diff --git a/sys-libs/libtermcap-compat/ChangeLog b/sys-libs/libtermcap-compat/ChangeLog
index 907ae585eb5c..d322070db008 100644
--- a/sys-libs/libtermcap-compat/ChangeLog
+++ b/sys-libs/libtermcap-compat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libtermcap-compat
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/ChangeLog,v 1.16 2004/01/05 22:34:06 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/ChangeLog,v 1.17 2004/01/11 14:01:56 azarah Exp $
+
+  11 Jan 2004; Martin Schlemmer <azarah@gentoo.org>
+  libtermcap-compat-1.2.3-r1.ebuild, libtermcap-compat-1.2.3.ebuild,
+  libtermcap-compat-2.0.8.ebuild:
+  Make sure we link to /lib/libtermcap.so, not /usr/lib/libtermcap.a, bug #4411.
 
   05 Jan 2004; Seemant Kulleen <seemant@gentoo.org>
   libtermcap-compat-2.0.8.ebuild:
diff --git a/sys-libs/libtermcap-compat/Manifest b/sys-libs/libtermcap-compat/Manifest
index 6ddab832515a..5c8435fd3b86 100644
--- a/sys-libs/libtermcap-compat/Manifest
+++ b/sys-libs/libtermcap-compat/Manifest
@@ -1,9 +1,9 @@
-MD5 b0e932ef957631422702de6723f031f9 libtermcap-compat-1.2.3-r1.ebuild 1150
-MD5 e9d89ea0eb6f7a349896169b6fc8fd4e libtermcap-compat-2.0.8.ebuild 1493
-MD5 930c6744e4f71a4e1eea627fb4298508 libtermcap-compat-1.2.3.ebuild 1106
-MD5 29f9632f0684ad28652d4cf6cf0c2b2c ChangeLog 2328
+MD5 70924785b3c1fecf98bc0dc22b7dc5e4 libtermcap-compat-2.0.8.ebuild 1619
+MD5 5a7ab3bcf61202d86973847f8086784b libtermcap-compat-1.2.3.ebuild 1222
+MD5 421dcc00cb151ebed30819968d6f389f ChangeLog 2564
+MD5 091437a8dc30c3b506605d5f95fdaaf2 libtermcap-compat-1.2.3-r1.ebuild 1266
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 88a1c08b3377362fbf228dd424880fe9 files/digest-libtermcap-compat-2.0.8 211
 MD5 86463dc73dac3761dc5cfa83c3ec83ef files/digest-libtermcap-compat-1.2.3-r1 72
 MD5 86463dc73dac3761dc5cfa83c3ec83ef files/digest-libtermcap-compat-1.2.3 72
-MD5 88a1c08b3377362fbf228dd424880fe9 files/digest-libtermcap-compat-2.0.8 211
 MD5 c5389fda988845f0c56af4ec72c8d524 files/libtermcap-compat_bcopy_fix.patch 314
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-1.2.3-r1.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-1.2.3-r1.ebuild
index 4699240f6106..17e806541caa 100644
--- a/sys-libs/libtermcap-compat/libtermcap-compat-1.2.3-r1.ebuild
+++ b/sys-libs/libtermcap-compat/libtermcap-compat-1.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/libtermcap-compat-1.2.3-r1.ebuild,v 1.6 2004/01/05 22:41:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/libtermcap-compat-1.2.3-r1.ebuild,v 1.7 2004/01/11 14:01:56 azarah Exp $
 
 inherit eutils
 
@@ -35,6 +35,9 @@ src_install () {
 	rm -rf ${D}/include
 
 	cd ${D}/lib; mv libtermcap.a ../usr/lib
+	# Make sure we link to /lib/libtermcap.so, not /usr/lib/libtermcap.a,
+	# bug #4411.
+	gen_usr_ldscript libtermcap.so
 	dosym libtermcap.so.2.0.8 /lib/libtermcap.so
 
 	insinto /etc
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-1.2.3.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-1.2.3.ebuild
index 330c00eaf333..1d8e037136a7 100644
--- a/sys-libs/libtermcap-compat/libtermcap-compat-1.2.3.ebuild
+++ b/sys-libs/libtermcap-compat/libtermcap-compat-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/libtermcap-compat-1.2.3.ebuild,v 1.16 2004/01/05 22:41:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/libtermcap-compat-1.2.3.ebuild,v 1.17 2004/01/11 14:01:56 azarah Exp $
 
 MY_PN="termcap-compat"
 S="${WORKDIR}/${MY_PN}-${PV}"
@@ -33,6 +33,9 @@ src_install () {
 	rm -rf ${D}/include
 
 	cd ${D}/lib; mv libtermcap.a ../usr/lib
+	# Make sure we link to /lib/libtermcap.so, not /usr/lib/libtermcap.a,
+	# bug #4411.
+	gen_usr_ldscript libtermcap.so
 	dosym libtermcap.so.2.0.8 /lib/libtermcap.so
 
 	insinto /etc
diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8.ebuild
index bf066fd77dbe..4bba5335ce89 100644
--- a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8.ebuild
+++ b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8.ebuild,v 1.3 2004/01/05 22:41:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8.ebuild,v 1.4 2004/01/11 14:01:56 azarah Exp $
 
 inherit eutils
 
 PATCHVER=0.1
 
-MY_PN=${PN/lib/}
-MY_PN=${MY_PN/-compat/}
-MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_P}
-PATCHDIR=${WORKDIR}/patch
+MY_PN="${PN/lib/}"
+MY_PN="${MY_PN/-compat/}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+PATCHDIR="${WORKDIR}/patch"
 DESCRIPTION="Compatibility package for old termcap-based programs"
 HOMEPAGE="http://www.catb.org/~esr/terminfo/"
 SRC_URI="http://www.catb.org/~esr/terminfo/termtypes.tc.gz
@@ -48,7 +48,10 @@ src_install () {
 	rm -rf ${D}/include
 
 	cd ${D}/lib; mv libtermcap.a ../usr/lib
-	dosym libtermcap.so.2.0.8 /lib/libtermcap.so
+	# Make sure we link to /lib/libtermcap.so, not /usr/lib/libtermcap.a,
+	# bug #4411.
+	gen_usr_ldscript libtermcap.so
+	dosym libtermcap.so.${PV} /lib/libtermcap.so
 
 	insinto /etc
 	doins ${WORKDIR}/termcap