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

["Michał Górny" <mgorny@gentoo.org>]

commit:     01007b47389b4f26c4fc11a923ad829af0e6b59e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 22 07:09:29 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 07:26:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01007b47

dev-libs/libiconv: Drop redundant versions

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/libiconv/libiconv-1.14-r2.ebuild | 55 -------------------------------
 dev-libs/libiconv/libiconv-1.14.ebuild    | 43 ------------------------
 2 files changed, 98 deletions(-)

diff --git a/dev-libs/libiconv/libiconv-1.14-r2.ebuild b/dev-libs/libiconv/libiconv-1.14-r2.ebuild
deleted file mode 100644
index 54709b52977..00000000000
--- a/dev-libs/libiconv/libiconv-1.14-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit libtool toolchain-funcs multilib-minimal
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-DEPEND="!sys-libs/glibc
-	!userland_GNU? ( !sys-apps/man-pages )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-no-gets.patch
-	eapply_user
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Disable NLS support because that creates a circular dependency
-	# between libiconv and gettext
-	ECONF_SOURCE="${S}" \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}/html" \
-		--disable-nls \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}" -name 'lib*.la' -delete
-
-	# Install in /lib as utils installed in /lib like gnutar
-	# can depend on this
-	gen_usr_ldscript -a iconv charset
-
-	# If we have a GNU userland, we probably have sys-apps/man-pages
-	# installed, which means we want to rename our copies #503162.
-	# The use of USELAND=GNU is kind of a hack though ...
-	if use userland_GNU ; then
-		cd "${ED}"/usr/share/man || die
-		local f
-		for f in man*/*.[0-9] ; do
-			mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
-		done
-	fi
-}

diff --git a/dev-libs/libiconv/libiconv-1.14.ebuild b/dev-libs/libiconv/libiconv-1.14.ebuild
deleted file mode 100644
index fc464c4b6e9..00000000000
--- a/dev-libs/libiconv/libiconv-1.14.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit 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="amd64 arm ~mips ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="!sys-libs/glibc
-	!sys-apps/man-pages"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Make sure that libtool support is updated to link "the linux way"
-	# on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	# Disable NLS support because that creates a circular dependency
-	# between libiconv and gettext
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}/html" \
-		--disable-nls \
-		--enable-shared \
-		--enable-static
-}
-
-src_install() {
-	default
-
-	# Install in /lib as utils installed in /lib like gnutar
-	# can depend on this
-	gen_usr_ldscript -a iconv charset
-}