From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1085018-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 5179F138334
for <garchives@archives.gentoo.org>; Mon, 22 Apr 2019 07:26:46 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1420FE087E;
Mon, 22 Apr 2019 07:26:45 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id DCB1FE087E
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Apr 2019 07:26:44 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0D8F0341FB0
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Apr 2019 07:26:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B4155C1
for <gentoo-commits@lists.gentoo.org>; Mon, 22 Apr 2019 07:26:41 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1555917994.01007b47389b4f26c4fc11a923ad829af0e6b59e.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libiconv/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/libiconv/libiconv-1.14-r2.ebuild dev-libs/libiconv/libiconv-1.14.ebuild
X-VCS-Directories: dev-libs/libiconv/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 01007b47389b4f26c4fc11a923ad829af0e6b59e
X-VCS-Branch: master
Date: Mon, 22 Apr 2019 07:26:41 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 10a4105f-a97e-437b-ad64-c811ba8d4d4c
X-Archives-Hash: f4bff633bc5138d88d981729556845f6
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
-}