[gentoo-commits] repo/gentoo:master commit in: net-dns/libidn2/, net-dns/libidn2/files/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     7e8349388eb7acc6a0536c863f5639ffae8efffc
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 18:28:05 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 18:28:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e834938

net-dns/libidn2: Old.

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 net-dns/libidn2/Manifest                           |  2 -
 net-dns/libidn2/files/libidn2-0.12-Werror.patch    | 11 -----
 net-dns/libidn2/files/libidn2-0.12-examples.patch  | 11 -----
 net-dns/libidn2/files/libidn2-0.16-cross.patch     | 28 -----------
 net-dns/libidn2/files/libidn2-0.16-gengetopt.patch | 11 -----
 net-dns/libidn2/files/libidn2-pkgconfig.diff       | 42 -----------------
 net-dns/libidn2/libidn2-0.16-r1.ebuild             | 54 ----------------------
 net-dns/libidn2/libidn2-2.0.2.ebuild               | 50 --------------------
 8 files changed, 209 deletions(-)

diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index cf60c35156c..dced8f06272 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,3 +1 @@
-DIST libidn2-0.16.tar.gz 1494295 SHA256 2fad9efff4082ae2143f69df76339ca99379e0e0f4231455f5d3d9d2089c688f SHA512 85f41c79bd2b88f2724383461a78e56b47e52e66e3f088d631a922438742938721d26aeebef17f6ca4fd028d95dfb5b0fa298a96982ef777c07fefe5244d1e73 WHIRLPOOL be10d0e2994e4fa0e31d710b358c7375e9454b4291bd4603a683a6ddb737241442007f04893395b36d7ef636614b6982354840bb07570e2a6b8f6aa2d888996a
-DIST libidn2-2.0.2.tar.gz 1925342 SHA256 8cd62828b2ab0171e0f35a302f3ad60c3a3fffb45733318b3a8205f9d187eeab SHA512 c8fd1114fc8df2030abf7c1044da4022989a1cd7ecd92309f62ad0b51b1fcf40418dccd2e397a8335c5e99998130f25339dcb576b4bc88888e3ef0df89714dad WHIRLPOOL fc60b6b8da20b60c851001788541ede0b7ce64ea9701a229b7312b748b02cf99f70d14070ffd64967f6b970f1ce43589956bad693d13f8b51ddde27515fd47c1
 DIST libidn2-2.0.4.tar.gz 2008524 SHA256 644b6b03b285fb0ace02d241d59483d98bc462729d8bb3608d5cad5532f3d2f0 SHA512 1e51bd4b8f8907531576291f1c2a8865d17429b4105418b4c98754eb982cd1cbb3adbeab4ec0c1c561d2dba11d876c7c09e5dc5b315c55a2c24986d7a2a3b4d2 WHIRLPOOL 0caf45267c06bd6d78fc80673a90f718686a98408b2bd668e415b0ee8a5639199091320f9877a25c89de324219e96cd72b7c7d2e4fa52fa7322604b82aede3ce

diff --git a/net-dns/libidn2/files/libidn2-0.12-Werror.patch b/net-dns/libidn2/files/libidn2-0.12-Werror.patch
deleted file mode 100644
index 9ab14656f9e..00000000000
--- a/net-dns/libidn2/files/libidn2-0.12-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@
- AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_MACRO_DIR([m4])
--AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects])
-+AM_INIT_AUTOMAKE([-Wall subdir-objects])
- AC_CANONICAL_HOST
- 
- AC_PROG_CC

diff --git a/net-dns/libidn2/files/libidn2-0.12-examples.patch b/net-dns/libidn2/files/libidn2-0.12-examples.patch
deleted file mode 100644
index 4972fece578..00000000000
--- a/net-dns/libidn2/files/libidn2-0.12-examples.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -15,7 +15,7 @@
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- 
--SUBDIRS = lib . src doc examples tests po
-+SUBDIRS = lib . src doc tests po
- ACLOCAL_AMFLAGS = -I m4
- EXTRA_DIST = m4/gnulib-cache.m4
- 

diff --git a/net-dns/libidn2/files/libidn2-0.16-cross.patch b/net-dns/libidn2/files/libidn2-0.16-cross.patch
deleted file mode 100644
index bf963e9f467..00000000000
--- a/net-dns/libidn2/files/libidn2-0.16-cross.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.com/jas/libidn2/issues/6
-
-the release ships with this source file, so don't regen it on every build.
-doing so breaks cross-compilation currently.
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -66,7 +66,8 @@
- noinst_PROGRAMS = gentr46map
- gentr46map_LDADD = $(LTLIBUNISTRING)
- 
--tr46map_data.c: gentr46map.c gentr46map$(EXEEXT) $(TR46MAP) $(NFCQC)
-+tr46map_data.c: $(srcdir)/gentr46map.c $(TR46MAP) $(NFCQC)
-+	$(MAKE) gentr46map$(EXEEXT)
- 	$(builddir)/gentr46map$(EXEEXT) > $@.new
- 	mv $@.new $@
- 
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -34,7 +34,7 @@
- dist_man_MANS = idn2.1 $(gdoc_MANS)
- CLEANFILES = $(dist_man_MANS) lookup.c register.c stamp-vti version.texi $(srcdir)/libidn2.info
- 
--idn2.1: $(top_srcdir)/src/idn2.c $(top_srcdir)/src/idn2.ggo $(top_srcdir)/configure.ac
-+idn2.1: $(top_srcdir)/src/idn2.c $(top_srcdir)/src/idn2.ggo
- 	$(HELP2MAN) \
- 		--name="Libidn2 Internationalized Domain Names (IDNA2008/TR46) conversion" \
- 		--output=$@ \

diff --git a/net-dns/libidn2/files/libidn2-0.16-gengetopt.patch b/net-dns/libidn2/files/libidn2-0.16-gengetopt.patch
deleted file mode 100644
index 80b10de1b80..00000000000
--- a/net-dns/libidn2/files/libidn2-0.16-gengetopt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -30,7 +30,7 @@
- libidn2_cmd_la_LIBADD = ../lib/libgnu.la
- libidn2_cmd_la_CFLAGS =
- 
--idn2_cmd.c idn2_cmd.h: idn2.ggo Makefile.am
-+idn2_cmd.c idn2_cmd.h: idn2.ggo
- 	gengetopt --unamed-opts --no-handle-version --no-handle-help \
- 		--set-package="idn2" \
- 		--input $^ --file-name idn2_cmd

diff --git a/net-dns/libidn2/files/libidn2-pkgconfig.diff b/net-dns/libidn2/files/libidn2-pkgconfig.diff
deleted file mode 100644
index a5406bd862a..00000000000
--- a/net-dns/libidn2/files/libidn2-pkgconfig.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/609188
-
-diff --git a/Makefile.am b/Makefile.am
-index f851231..438b4ce 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -113,3 +113,6 @@ check-coverage:
- 
- clean-local:
- 	rm -rf */*.gc?? */*/*.gc?? $(LCOV_INFO) lcov
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = libidn2.pc
-diff --git a/configure.ac b/configure.ac
-index bfaff9a..6087f20 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -86,6 +86,7 @@ AC_CONFIG_FILES([
-   examples/Makefile
-   idn2.h
-   lib/Makefile
-+  libidn2.pc
-   po/Makefile.in
-   src/Makefile
-   tests/Makefile
-diff --git a/libidn2.pc.in b/libidn2.pc.in
-new file mode 100644
-index 0000000..0dade23
---- /dev/null
-+++ b/libidn2.pc.in
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+includedir=@includedir@
-+libdir=@libdir@
-+
-+Name: libidn2
-+Description: Library implementing IDNA2008 and TR46
-+Version: @PACKAGE_VERSION@
-+Cflags: -I${includedir}
-+Libs: -L${libdir} -lidn2
-+Libs.private: @LTLIBICONV@ @LTLIBUNISTRING@

diff --git a/net-dns/libidn2/libidn2-0.16-r1.ebuild b/net-dns/libidn2/libidn2-0.16-r1.ebuild
deleted file mode 100644
index 44f0043788a..00000000000
--- a/net-dns/libidn2/libidn2-0.16-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
-SRC_URI="
-	mirror://gnu-alpha/libidn/${P}.tar.gz
-"
-
-LICENSE="GPL-2+ LGPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12-Werror.patch
-	"${FILESDIR}"/${PN}-0.12-examples.patch
-	"${FILESDIR}"/${PN}-0.16-gengetopt.patch
-	"${FILESDIR}"/${PN}-0.16-cross.patch
-	"${FILESDIR}"/${PN}-pkgconfig.diff
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-gtk-doc
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}

diff --git a/net-dns/libidn2/libidn2-2.0.2.ebuild b/net-dns/libidn2/libidn2-2.0.2.ebuild
deleted file mode 100644
index d2719918e52..00000000000
--- a/net-dns/libidn2/libidn2-2.0.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="An implementation of the IDNA2008 specifications (RFCs 5890, 5891, 5892, 5893)"
-HOMEPAGE="https://www.gnu.org/software/libidn/#libidn2 https://gitlab.com/jas/libidn2"
-SRC_URI="
-	mirror://gnu/libidn/${P}.tar.gz
-"
-
-LICENSE="GPL-2+ LGPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/libunistring[${MULTILIB_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	sys-apps/help2man
-"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Darwin ar chokes when TMPDIR doesn't exist (as done for some
-		# reason in the Makefile)
-		sed -i -e '/^TMPDIR = /d' Makefile.in || die
-		export TMPDIR="${T}"
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-gtk-doc
-}
-
-multilib_src_install() {
-	default
-
-	prune_libtool_files
-}