summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2008-03-19 17:24:02 +0000
committerMichael Haubenwallner <haubi@gentoo.org>2008-03-19 17:24:02 +0000
commitffa3d175e18683595c34a5c03483a243042a8520 (patch)
tree3df2aac62e4bb4973eda8f24ccd2c6790ad4c0b2
parentrm old versions (diff)
downloadgentoo-2-ffa3d175e18683595c34a5c03483a243042a8520.tar.gz
gentoo-2-ffa3d175e18683595c34a5c03483a243042a8520.tar.bz2
gentoo-2-ffa3d175e18683595c34a5c03483a243042a8520.zip
moving libraries with more specific names. See bug #210239
(Portage version: 2.1.4.4)
-rw-r--r--dev-libs/libiconv/ChangeLog6
-rw-r--r--dev-libs/libiconv/libiconv-1.12.ebuild8
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-libs/libiconv/ChangeLog b/dev-libs/libiconv/ChangeLog
index a800573463a1..79444099b74e 100644
--- a/dev-libs/libiconv/ChangeLog
+++ b/dev-libs/libiconv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libiconv
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.29 2008/02/21 22:20:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.30 2008/03/19 17:24:02 haubi Exp $
+
+ 19 Mar 2008; Michael Haubenwallner <haubi@gentoo.org>
+ libiconv-1.12.ebuild:
+ moving libraries with more specific names. See bug #210239
*libiconv-1.12 (21 Feb 2008)
diff --git a/dev-libs/libiconv/libiconv-1.12.ebuild b/dev-libs/libiconv/libiconv-1.12.ebuild
index e3128fda75eb..e6daeca8d31b 100644
--- a/dev-libs/libiconv/libiconv-1.12.ebuild
+++ b/dev-libs/libiconv/libiconv-1.12.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/libiconv/libiconv-1.12.ebuild,v 1.1 2008/02/21 22:20:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.12.ebuild,v 1.2 2008/03/19 17:24:02 haubi Exp $
inherit eutils multilib flag-o-matic libtool toolchain-funcs
@@ -51,7 +51,7 @@ src_install() {
# Move static libs and creates ldscripts into /usr/lib
dodir /$(get_libdir)
- mv "${D}"/usr/$(get_libdir)/*.so* "${D}/$(get_libdir)" || die
- gen_usr_ldscript libiconv.so
- gen_usr_ldscript libcharset.so
+ mv "${D}"/usr/$(get_libdir)/lib{iconv,charset}*$(get_libname)* "${D}/$(get_libdir)" || die
+ gen_usr_ldscript libiconv$(get_libname)
+ gen_usr_ldscript libcharset$(get_libname)
}