[gentoo-commits] repo/gentoo:master commit in: dev-libs/libiconv/

[Anthony G. Basile]

commit:     c0e3d86393da35f30d8f02d9b75c15055d3e1846
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 11:03:05 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 11:03:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e3d863

dev-libs/libiconv: remove older masked version

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 dev-libs/libiconv/Manifest               |  1 -
 dev-libs/libiconv/libiconv-1.13.1.ebuild | 57 --------------------------------
 2 files changed, 58 deletions(-)

diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index f6974165fad..1f26b8b7862 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,2 +1 @@
-DIST libiconv-1.13.1.tar.gz 4716070 SHA256 55a36168306089009d054ccdd9d013041bfc3ab26be7033d107821f1c4949a49 SHA512 8475b020769e66f56e476143b81da032e10b02b76b8b49468ce0d8c5658dca1a36940da5cde2fc7e82add2679fc9efe5cd2ea10ccd349682ff85a64d10101662 WHIRLPOOL 5f8b8f72176a3e80e416e3d0535e9ec77322f9a268567c7175f521d1cd3b15818779f28a0e50bac29048c26c14bb149450b81cc5af2d824ff4fc3c2559e0a97c
 DIST libiconv-1.14.tar.gz 4984397 SHA256 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387 WHIRLPOOL e96337209a4f86eccb112e94c3cd6b668b2a8fc4b05ed7becaa2f6fbc9279f7b32ec1fa4b086e61520bfffea5d4f7a1cad58bdb266b5f0aa7d02b89aeed9759a

diff --git a/dev-libs/libiconv/libiconv-1.13.1.ebuild b/dev-libs/libiconv/libiconv-1.13.1.ebuild
deleted file mode 100644
index 5f07febde8a..00000000000
--- a/dev-libs/libiconv/libiconv-1.13.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils multilib flag-o-matic libtool toolchain-funcs
-
-DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
-HOMEPAGE="https://www.gnu.org/software/libiconv/"
-SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="!sys-libs/glibc
-	!sys-apps/man-pages"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# This patch is needed as libiconv 1.10 provides (and uses) new functions
-	# and they are not present in the old libiconv.so, and this breaks the
-	# ${DESTDIR} != ${prefix} that we use. It's a problem for Solaris, but we
-	# don't have to deal with it for now.
-	#epatch "${FILESDIR}"/${PN}-1.10-link.patch
-
-	# Make sure that libtool support is updated to link "the linux way" on
-	# FreeBSD.
-	elibtoolize
-}
-
-src_compile() {
-	# Install in /lib as utils installed in /lib like gnutar
-	# can depend on this
-
-	# Disable NLS support because that creates a circular dependency
-	# between libiconv and gettext
-
-	econf \
-		--disable-nls \
-		--enable-shared \
-		--enable-static \
-		 || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install || die "make install failed"
-
-	# Move static libs and creates ldscripts into /usr/lib
-	dodir /$(get_libdir)
-	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)
-}