gentoo resync : 29.10.2017

9 files changed, 2 insertions, 218 deletions

diff --git a/net-dns/libidn2/Manifest b/net-dns/libidn2/Manifest
index 1ba2b497f70f..73cb101fa4d8 100644
--- a/net-dns/libidn2/Manifest
+++ b/net-dns/libidn2/Manifest
@@ -1,14 +1,5 @@
-AUX libidn2-0.12-Werror.patch 271 SHA256 5347ec484401e39bb2a78a77398589fb30dd7de6c85d5b1cf705309533f03002 SHA512 089cd5d7b0d8d6103559c7706863306acf5beffbbd914a242cd36448c0bead07359ff011a14c1c70a507647f64b3dd79d8ef9ee94d758b927a6d240f074448cf WHIRLPOOL 43641903b6b4c55c652ef16bd0763c00ce1abd7bf43af7e9cd391522bb4156603340eeaad1bfe6b88e7f88d0ff4a90cccc191241622f1bd55a87714a14183d97
-AUX libidn2-0.12-examples.patch 241 SHA256 939a52b77f03c284c8f8b9e66df7af330d9c27d679a69d087bba8b57af0fe9a6 SHA512 5c3c391d207520a2ad5e43374f834fb186c4f545ec49769809fcb57e19355d5e892f9027d2e3ea196a4f95bcf04c734979233bfa5719f71c17b255e8784ae2e0 WHIRLPOOL 16265ed84920ad63471dc75241a81181f20735c09da8e603e2656478747299953262566466c61efea5641d85af879a5a1b5308d0669081982aeb9c658fb8801e
-AUX libidn2-0.16-cross.patch 966 SHA256 02e10090f97c537fd21d10cc936b7f40898f2fd656310405da3f238317f6f13d SHA512 742effd6f2b6ba068c103c3944152a5976b50d51f69252e4770267b4d1ba23772563e9307dc004b06a4c9080b53f85f1c6feb0f0a175f8baae17e60cfcbfb803 WHIRLPOOL c7a1bf8342bf0ce556d718b47c3f3712a33a87f787c84172072d033a2f428df10ce0b0c080e6f47db804243ec5d25cd45c4eb5a08e29af73bcff765962ca8d07
-AUX libidn2-0.16-gengetopt.patch 335 SHA256 0a0ffd51e4e1106ac768332f2391de4fc42e740fd7a42cdca4a1a1d2c805143a SHA512 88573e1b2ae1b084f6b79323228d706dc421efee423c27b516a983173d3814d297f5b7a86577c3a07930bacbc7d4e1c0118f1b758ad81363df352d21d38aaf0e WHIRLPOOL afd3028cc1f2fc749ab6e0b5269a1f6c948dd0476b3f3bed907e861f503ea6ce64a9d474b99acd0b06081a438de003dcc1cae93f22de42362b4ac4fa1238de68
-AUX libidn2-pkgconfig.diff 979 SHA256 971f4e9b3fdc30cde2ff8c761fe908cc26d1417b5a8b0cfbbf9324a513e3b59e SHA512 2d75029e2a3d259b716b7dc3428570028a25b9488aabad01c4a593445c012b801905df581b7ab60fc076a32355aed73b2ddc0f32c3f2d13eba97bf502a334b5c WHIRLPOOL 1d3f1333fefb977a321b5202ccc48666b2dbf2b6ebdc99c208f7c5c0358a05620278039fe50df0c986ef57dc363a97b89b133056f8611363167ee5f51a0b1c30
-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
-EBUILD libidn2-0.16-r1.ebuild 1245 SHA256 0149630898a3379290f58ca48229c00ac63f1345e41632a73a86b81dc8e67f51 SHA512 ccd3857fe7b69afb6e5a214f4c32a638558af0ee8d5d63f16d0e3ef7a5ce0a5c7b12f2e920203e2aee1dfd747ca83700ff291aeaf0c0d8427d7a114944e5a873 WHIRLPOOL 2795ee6c77820bbbb2d892bf7409f5ab6e39138ff8aa0a1c6b8e55e7f1403ebecb67a6cf82e90642e97f8ebb072a418dfa4097f3a58c05280749de8f22fb6321
-EBUILD libidn2-2.0.2.ebuild 1215 SHA256 e26f15e66939fcccb1ff14d392e5d8e58b541edd8fb951d6d3728a056ad572cd SHA512 405982e2c61c980bf2f14fd31255abca41590ef60b1010651846d1d1a8ef64bc282e94b2dd4b460c5ae1912610e0ac69417fa0fa19018e8c30424d153b1f52f4 WHIRLPOOL b87ff2d1d4d131652228fd8c3c9df4b58ab1607218fc083e95835d5da533257795a0c7d714d7fb1b6594f1646b2a8d8f80837f2a6f29ae7eb39ce10531673f70
-EBUILD libidn2-2.0.4.ebuild 1230 SHA256 39ab46e5d9d46bf5118a4573df1b7556be6146efcbb642b4b208eea3cb7bc09a SHA512 a3015fc0d0f51a91d2e646e18358ce91942b0c03338c38f3cb562ee49fa10e1eb9a43eb0bcbcdf2164ad5912d788039ed85ac23f8620b93b57183809df387099 WHIRLPOOL 2445e13b07ff42a11b6776c598f356b5987463385325b8bbcd2e964001500b4783be023300a6b6e76fc5425a9d6437e3d43a2f2c8b1bb29482998ccded17dc8d
+EBUILD libidn2-2.0.4.ebuild 1229 SHA256 3d0c9638fc91d223f19d50aec5d0dafe0263dfba58bd91fdefef54261583a0e7 SHA512 c1f7d5073bb16b0488dc90a212e36b05abaf5685f2b4e0b7ce6c228626e247559766e81d71adb1362e00db7c4b77ca124bda30cbb0c6d33bf8f09c47018dc281 WHIRLPOOL e9aa29d8317884df0b6417252d0f8443eeaf9c4e50fb74a8e4020a11c98453ca4737256a3329eb7e1e5d41e81f3f2de368c6cc4199414950da68c347a754edbd
 MISC ChangeLog 3828 SHA256 aefe244e873ffa922bd5fe4ec1e5e04c0a9e53b4b800ba7d45c852e42c59a174 SHA512 86f81bda7e03947c297ae9e43a099aefdc6998a8167cda8a1528cc331b7de0375269606e1c5ce0b78a4f24099916d2e484337919043b6a1562ebcdab58aba454 WHIRLPOOL 6875b1f712a7dd8e351d47711a458104cc915acd3bc0e0c7e3b1322c2844f8a5403aecfa106cf50e33be416b3d126449af713dc29bf45918f6bcca6a47e5b30b
 MISC ChangeLog-2015 523 SHA256 c7b427322922dc669c3a7181888c9db6e86e5e5dadb447c224a6a6fc9ae5e838 SHA512 383ea04d0912da873aa4c53f2750274e44cc964968da2c7766c34f50d7f6294443856900ac962c642d84976e0135ff43dad3d51b9655aac1bb0d56f209af52ff WHIRLPOOL f0e45be2ab24678fef9bdba1634e27841d3cc841e3c76ed6db9189735a4d44c51680d8877ee1b8c4421030d0f53ebab6fc262749f46c3609229294c33e23de81
 MISC metadata.xml 210 SHA256 59333e331c55cfd39ab5a54817053590464e735d79003424078790bad0f03885 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54 WHIRLPOOL 4720a4dc9840fd244dc5c4ce9695cdb0007a36c7b0262d4db8a8b0fec37fc718fd0c33f87c9ca0cfd5f5f09b6fe42f1cf93103a85de3f2c3d5dce10a82ef082d
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 9ab14656f9e8..000000000000
--- 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 4972fece578d..000000000000
--- 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 bf963e9f4673..000000000000
--- 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 80b10de1b80f..000000000000
--- 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 a5406bd862a1..000000000000
--- 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 44f0043788a3..000000000000
--- 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 d2719918e52a..000000000000
--- 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
-}
diff --git a/net-dns/libidn2/libidn2-2.0.4.ebuild b/net-dns/libidn2/libidn2-2.0.4.ebuild
index 7b568184d25d..c647d4fc56a3 100644
--- a/net-dns/libidn2/libidn2-2.0.4.ebuild
+++ b/net-dns/libidn2/libidn2-2.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 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"
+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="