summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2007-01-23 07:17:54 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2007-01-23 07:17:54 +0000
commitc5e45c0ab7f5c8793c297da50cbbb678cdd57efd (patch)
tree3a176fc5d0cf7e4cbf8cc4c5760489b3a90c093e
parentUse toolchain-funcs's gen_usr_ldscript. See bug #144529. (diff)
downloadgentoo-2-c5e45c0ab7f5c8793c297da50cbbb678cdd57efd.tar.gz
gentoo-2-c5e45c0ab7f5c8793c297da50cbbb678cdd57efd.tar.bz2
gentoo-2-c5e45c0ab7f5c8793c297da50cbbb678cdd57efd.zip
Use toolchain-funcs's gen_usr_ldscript. See bug #144529.
(Portage version: 2.1.2-r1)
-rw-r--r--dev-libs/libiconv/ChangeLog7
-rw-r--r--dev-libs/libiconv/libiconv-1.11.ebuild12
2 files changed, 8 insertions, 11 deletions
diff --git a/dev-libs/libiconv/ChangeLog b/dev-libs/libiconv/ChangeLog
index ea99e8e05d5d..b7dc2687a1e0 100644
--- a/dev-libs/libiconv/ChangeLog
+++ b/dev-libs/libiconv/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/libiconv
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.27 2006/12/02 18:57:25 flameeyes Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.28 2007/01/23 07:17:54 flameeyes Exp $
+
+ 23 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> libiconv-1.11.ebuild:
+ Use toolchain-funcs's gen_usr_ldscript. See bug #144529.
02 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> libiconv-1.11.ebuild:
Block man-pages as they both install iconv(3) manpage.
diff --git a/dev-libs/libiconv/libiconv-1.11.ebuild b/dev-libs/libiconv/libiconv-1.11.ebuild
index 962aec9c1293..babc0c06454d 100644
--- a/dev-libs/libiconv/libiconv-1.11.ebuild
+++ b/dev-libs/libiconv/libiconv-1.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.11.ebuild,v 1.7 2006/12/02 18:57:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.11.ebuild,v 1.8 2007/01/23 07:17:54 flameeyes Exp $
-inherit eutils multilib flag-o-matic autotools libtool
+inherit eutils multilib flag-o-matic libtool toolchain-funcs
DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
@@ -59,10 +59,4 @@ src_install() {
gen_usr_ldscript libcharset.so
use build && rm -rf "${D}/usr"
-
- preserve_old_lib /lib/$(get_libdir)/libiconv.so.4
-}
-
-pkg_postinst() {
- preserve_old_lib_notify /lib/$(get_libdir)/libiconv.so.4
}