Move shared libraries into /lib since ncurses can link against them now #80403.

(Portage version: 2.0.51-r15)

5 files changed, 22 insertions, 10 deletions

diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog
index 979fe9bfac9b..c204abac15b4 100644
--- a/sys-libs/gpm/ChangeLog
+++ b/sys-libs/gpm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/gpm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.33 2005/01/30 19:13:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.34 2005/02/07 01:14:06 vapier Exp $
+
+*gpm-1.20.1-r3 (06 Feb 2005)
+
+  06 Feb 2005; Mike Frysinger <vapier@gentoo.org> -gpm-1.20.1-r2.ebuild,
+  +gpm-1.20.1-r3.ebuild:
+  Move shared libraries into /lib since ncurses can link against them now #80403.
 
 *gpm-1.20.1-r2 (30 Jan 2005)
 
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 21a9c3947308..ee5e44eec302 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -1,9 +1,9 @@
 MD5 f67c780bbb6083e0253275f42fc573fc ChangeLog 4943
+MD5 021a39747682e9289e17d46fdded12c0 gpm-1.20.1-r3.ebuild 1342
 MD5 81f80af7a34f9e25f9213422bcb30b09 gpm-1.20.1.ebuild 1644
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 f0b522b6f607d3d1401beeed2a7e3fe4 gpm-1.20.1-r2.ebuild 1316
+MD5 45fe96a0890eb797887f98603228df70 files/digest-gpm-1.20.1-r3 136
 MD5 1e2ab7c222263d460e9e881f7a1558c7 files/gpm-linux26-headers.patch 423
 MD5 97f0853f825f506bf47be3b8ce6f9ce9 files/digest-gpm-1.20.1 136
 MD5 d562712814b13d09904823bd3eb31269 files/gpm.conf.d 570
 MD5 b1364fd3bf27cda742dbcfc87497cc18 files/gpm.rc6 951
-MD5 ea7ad06dda6e39fd68b7ff1fd97e9ef6 files/digest-gpm-1.20.1-r2 136
diff --git a/sys-libs/gpm/files/digest-gpm-1.20.1-r2 b/sys-libs/gpm/files/digest-gpm-1.20.1-r2
deleted file mode 100644
index 68685aa4213d..000000000000
--- a/sys-libs/gpm/files/digest-gpm-1.20.1-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2c63e827d755527950d9d13fe3d87692 gpm-1.20.1.tar.bz2 565014
-MD5 bd99acbf8d09f8dbcca521e8e6489dcf gpm-1.20.1-patches-1.1.tar.bz2 7696
diff --git a/sys-libs/gpm/files/digest-gpm-1.20.1-r3 b/sys-libs/gpm/files/digest-gpm-1.20.1-r3
new file mode 100644
index 000000000000..85bf2e71b58b
--- /dev/null
+++ b/sys-libs/gpm/files/digest-gpm-1.20.1-r3
@@ -0,0 +1,2 @@
+MD5 2c63e827d755527950d9d13fe3d87692 gpm-1.20.1.tar.bz2 565014
+MD5 b608cd902d9c0145543c52a5abd7ec40 gpm-1.20.1-patches-1.2.tar.bz2 8077
diff --git a/sys-libs/gpm/gpm-1.20.1-r2.ebuild b/sys-libs/gpm/gpm-1.20.1-r3.ebuild
index 3de6789362cb..2f8e61086b26 100644
--- a/sys-libs/gpm/gpm-1.20.1-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.1-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1-r2.ebuild,v 1.1 2005/01/30 19:13:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1-r3.ebuild,v 1.1 2005/02/07 01:14:06 vapier Exp $
 
 inherit eutils toolchain-funcs
 
-PATCH_VER="1.1"
+PATCH_VER="1.2"
 DESCRIPTION="Console-based mouse driver"
 HOMEPAGE="ftp://arcana.linux.it/pub/gpm/"
 SRC_URI="ftp://arcana.linux.it/pub/gpm/${P}.tar.bz2
@@ -25,7 +25,10 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --sysconfdir=/etc/gpm || die "econf failed"
+	econf \
+		--libdir=/lib \
+		--sysconfdir=/etc/gpm \
+		|| die "econf failed"
 	emake \
 		CC=$(tc-getCC) \
 		AR=$(tc-getAR) \
@@ -36,8 +39,11 @@ src_compile() {
 src_install() {
 	make install DESTDIR="${D}" || die "make install failed"
 	# fix lib symlinks since the default is missing/bogus
-	dosym libgpm.so.1.19.0 /usr/$(get_libdir)/libgpm.so.1
-	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
+	dosym libgpm.so.1.19.0 /$(get_libdir)/libgpm.so.1
+	dosym libgpm.so.1 /$(get_libdir)/libgpm.so
+	dodir /usr/$(get_libdir)
+	mv "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/
+	gen_usr_ldscript libgpm.so
 
 	insinto /etc/gpm
 	doins conf/gpm-*.conf