commit: 8b408d1a1cded105bd7c525929a878679be5d8b6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Dec 21 11:04:06 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Dec 21 12:41:54 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b408d1a
dev-libs/libiconv: drop 1.15, 1.16 Closes: https://bugs.gentoo.org/858176 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/libiconv/Manifest | 2 - .../files/libiconv-1.15-no-aix-tweaks.patch | 20 ------- .../libiconv/files/libiconv-1.15-no-gets.patch | 22 -------- dev-libs/libiconv/libiconv-1.15.ebuild | 61 ---------------------- dev-libs/libiconv/libiconv-1.16.ebuild | 52 ------------------ 5 files changed, 157 deletions(-) diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest index a37a6328727a..734dfb0008d2 100644 --- a/dev-libs/libiconv/Manifest +++ b/dev-libs/libiconv/Manifest @@ -1,3 +1 @@ -DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a -DIST libiconv-1.16.tar.gz 5166734 BLAKE2B 8e7f4d64d757db6c3ffa973c9cebcf20b34f9859a547dbba8cebe3a4865bda86f33c5be197951877c46eff5a7fc00b1b11474fb3baa036f08ac2faf97eca138c SHA512 365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7 DIST libiconv-1.17.tar.gz 5413283 BLAKE2B 1d317dd0655c680a2082c38561cdff51ac1a9181d4734a8bb1e86861dfd66f1a6c0846a90b5b88f3b38b1fa9983d9e563551f27e95a8e329896b71becceae52b SHA512 18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86 diff --git a/dev-libs/libiconv/files/libiconv-1.15-no-aix-tweaks.patch b/dev-libs/libiconv/files/libiconv-1.15-no-aix-tweaks.patch deleted file mode 100644 index d554d34564de..000000000000 --- a/dev-libs/libiconv/files/libiconv-1.15-no-aix-tweaks.patch +++ /dev/null @@ -1,20 +0,0 @@ -http://lists.gnu.org/archive/html/bug-gnu-libiconv/2018-05/msg00004.html - ---- libiconv-1.15/lib/Makefile.in -+++ libiconv-1.15/lib/Makefile.in -@@ -100,12 +100,14 @@ - - # On AIX, libiconv.a must include the object files of /lib/libiconv.a, - # otherwise the setlocale() call fails when invoked from executables linked --# with -rpath $(libdir), even if linked without -liconv. -+# with -rpath $(libdir), even if linked without -liconv. However, since -+# the --with-aix-soname flag libtool may not create libiconv.a at all. - install : all force - if [ ! -d $(DESTDIR)$(libdir) ] ; then $(mkinstalldirs) $(DESTDIR)$(libdir) ; fi - $(LIBTOOL_INSTALL) $(INSTALL) libiconv.la $(DESTDIR)$(libdir)/libiconv.la - case "@host_os@" in \ - aix*) (cd $(DESTDIR)$(libdir) && \ -+ { test -e libiconv.a || exit 0; } && \ - objects=`ar t libiconv.a`" "`ar t /lib/libiconv.a` && \ - ar x libiconv.a && ar x /lib/libiconv.a && \ - ar q libiconv.new.a $$objects && \ diff --git a/dev-libs/libiconv/files/libiconv-1.15-no-gets.patch b/dev-libs/libiconv/files/libiconv-1.15-no-gets.patch deleted file mode 100644 index 5bc20b377493..000000000000 --- a/dev-libs/libiconv/files/libiconv-1.15-no-gets.patch +++ /dev/null @@ -1,22 +0,0 @@ -hack until gzip pulls a newer gnulib version - -From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001 -From: Eric Blake <[email protected]> -Date: Thu, 29 Mar 2012 13:30:41 -0600 -Subject: [PATCH] stdio: don't assume gets any more - -Gnulib intentionally does not have a gets module, and now that C11 -and glibc have dropped it, we should be more proactive about warning -any user on a platform that still has a declaration of this dangerous -interface. - ---- a/srclib/stdio.in.h -+++ b/srclib/stdio.in.h -@@ -744,7 +744,6 @@ _GL_WARN_ON_USE (getline, "getline is un - removed it. */ - #undef gets - #if HAVE_RAW_DECL_GETS && !defined __cplusplus --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild deleted file mode 100644 index 6180c813ce14..000000000000 --- a/dev-libs/libiconv/libiconv-1.15.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit libtool multilib-minimal usr-ldscript - -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="LGPL-2+ GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="prefix static-libs" - -DEPEND="!sys-libs/glibc - !sys-libs/musl" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.15-no-gets.patch" - "${FILESDIR}/${PN}-1.15-no-aix-tweaks.patch" -) - -src_prepare() { - default - elibtoolize -} - -multilib_src_configure() { - if use prefix ; then - # In Prefix we want to have the same header declaration on every - # platform, so make configure find that it should do - # "const char * *inbuf" - export am_cv_func_iconv=no - fi - # 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 - - # we need to rename our copies #503162 - cd "${ED}"/usr/share/man || die - local f - for f in man*/*.[0-9] ; do - mv "${f}" "${f%/*}/${PN}-${f#*/}" || die - done -} diff --git a/dev-libs/libiconv/libiconv-1.16.ebuild b/dev-libs/libiconv/libiconv-1.16.ebuild deleted file mode 100644 index 346661c34d79..000000000000 --- a/dev-libs/libiconv/libiconv-1.16.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit libtool multilib-minimal usr-ldscript - -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="LGPL-2+ GPL-3+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="prefix static-libs" - -DEPEND="!sys-libs/glibc - !sys-libs/musl" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.15-no-gets.patch" - "${FILESDIR}/${PN}-1.16-fix-link-install.patch" -) - -multilib_src_configure() { - if use prefix ; then - # In Prefix we want to have the same header declaration on every - # platform, so make configure find that it should do - # "const char * *inbuf" - export am_cv_func_iconv=no - fi - # 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 - - # we need to rename our copies #503162 - cd "${ED}"/usr/share/man || die - local f - for f in man*/*.[0-9] ; do - mv "${f}" "${f%/*}/${PN}-${f#*/}" || die - done -}
