gentoo resync : 02.03.2018

6 files changed, 99 insertions, 9 deletions

diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index 185c40c58078..f15968aa382f 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -1,4 +1,8 @@
 AUX idnkit-1.0-autotools.patch 1843 BLAKE2B 75043eeccb34f00b9faab57d7db7ec6081192090afa4438e83df7bf02dc5ae047c4597153649aa0d4b1f658a37809687d91602d2ce61bf8cc7b3e878ed21b993 SHA512 1c405d1b72d678394284936d9130450b366f7a53bdf586fb6d4331b72c2d6672a19f2322a7f284067259ed0c0dd973865d9b117ae6c15cc8a1d41c734ef0a4ce
+AUX idnkit-1.0-test-subdirs.patch 289 BLAKE2B 6c9237cd1d17785a5d0a379d610ddc6b6e7b604c14a5680e24b80f5d9188413fe4e8f5dbbc55e72fe5d4c453c94efd231110238f68ced316986abeb6134f8173 SHA512 63d76f9ad95fc83c00259d41dcfdd47442bfda6f1dfe861a824146ded113d18284c1fe6f0f5ff1eba05a9a38055e7e8fdc3579fc14a3b441d831a9bd5b75af7a
+AUX idnkit-2.3-log_h.patch 734 BLAKE2B 696ebd7daeca2c3ff3c5103c54a0bb566a62e5eaba669bc35be2891cb100fc24b532fdb6309ba90c5a2261e1b6cbd522d9e8b535c4dfa96053d151f5a938cc35 SHA512 96e61794c0dbd9b36f65d367930c326722ff362d2335e3b734a205e957031ea4d3cb8c60f0feccb9b646f9cabf045b7d340366b32bf6ea52d7a753867f71935b
 DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808b2bf9582ec9b6dcb8606de7a006937a2f8d8fce386dbc328e074b95ca504464c1ed6d16acc7be82d9904f2c2b4 SHA512 74f2db007a1991610f62a7a060d534f724f08395a16a7d76fda0824e9017aa47ffe4e251c90d0481218b70534fcd2b32724a66223042f59c1e16c1ff39f3be19
-EBUILD idnkit-1.0-r2.ebuild 1000 BLAKE2B 350bf38bada2873a943099d1142ba5025d1d7ebacf069c1ae622c004168772afd4f20f07c5d0bd4e6fab14a073d32ce150af7ed01707a985052dfb04e22bc28b SHA512 36b1fde9ab9b026e168cb5cc1a012404b9c0e408b8fd20073620fd14dc8fa234da14bd8526eff847ca86c2029b576312cf5f23a4f16c36bf1a0cb2e7834b49fe
-MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
+DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
+EBUILD idnkit-1.0-r2.ebuild 1058 BLAKE2B 11b1bd1d8baa95dfa3483fe482938a37871cb347bcff34943554a7c490af71fba29a457acb8dd5f97237ec8685599c6e187a3c088db4d32d218a09d2ee2972f1 SHA512 03a7a1c838acf7c90bec72ecbdd6901bc97cbc9d8ed85c6180329f2672f7e4a0cdd941d64384fbddc6697e5976f849f3f5cd428e347df47f969431bd4db00270
+EBUILD idnkit-2.3.ebuild 677 BLAKE2B d29b3a45d31ae32c7f4a7c7c1429f9ada5c773cd6a8f25a31ca8eebd7ecb3cb74039bcfb70503f8ac66a9fd99a4082cf3f954293290097b34b4694acff76ef60 SHA512 0d5c735a42161587ccd56a2917b0647d153ca72a7eee712cd070f27c31c80ae02d8fc8722ff0a49ceedf2c24b08c7f9746b5e593b10a081bd3f799a846d3df44
+MISC metadata.xml 290 BLAKE2B 9b8f414f2eb140cd1c4c9b290bbd4f3d36e58649b68a9ed478ba55661df34bd1f8e1ea9c6d132e2edc4365bb8d4abd5f78d9b0f24e588d548354f63057da0b78 SHA512 5ae703d1a74d5fe45ac66f8f4922b754999932112931b8ba1f46d4a2e769a5d7130b4a418bf687d857a89f20e287d85e384236848c0e01747d0aa1c1ea350492
diff --git a/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch b/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch
new file mode 100644
index 000000000000..3e6dcf13b15e
--- /dev/null
+++ b/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch
@@ -0,0 +1,10 @@
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -296,6 +296,7 @@
+ 	rm -f Makefile
+ 
+ test check: test-localdir test-subdirs
++test-subdirs: test-localdir
+ 
+ @LITEONLY_TRUE@test-localdir: $(TESTLITELIB).la $(SAMPLES)
+ @LITEONLY_FALSE@test-localdir: $(TESTLIB).la $(TESTLITELIB).la $(SAMPLES)
diff --git a/net-dns/idnkit/files/idnkit-2.3-log_h.patch b/net-dns/idnkit/files/idnkit-2.3-log_h.patch
new file mode 100644
index 000000000000..975ea0b58dbf
--- /dev/null
+++ b/net-dns/idnkit/files/idnkit-2.3-log_h.patch
@@ -0,0 +1,38 @@
+net-dns/bind-tools uses idn/log.h
+
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -1,6 +1,7 @@
+ nobase_include_HEADERS = \
+ 	idn/api.h \
+ 	idn/export.h \
++	idn/log.h \
+ 	idn/res.h \
+ 	idn/resconf.h \
+ 	idn/result.h
+@@ -22,7 +23,6 @@
+ 	idn/langlocalmap.h \
+ 	idn/localconverter.h \
+ 	idn/localencoding.h \
+-	idn/log.h \
+ 	idn/logmacro.h \
+ 	idn/lowercasemap.h \
+ 	idn/maplist.h \
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -226,6 +226,7 @@
+ nobase_include_HEADERS = \
+	idn/api.h \
+	idn/export.h \
++	idn/log.h \
+	idn/res.h \
+	idn/resconf.h \
+	idn/result.h
+@@ -247,7 +248,6 @@
+	idn/langlocalmap.h \
+	idn/localconverter.h \
+	idn/localencoding.h \
+-	idn/log.h \
+	idn/logmacro.h \
+	idn/lowercasemap.h \
+	idn/maplist.h \
diff --git a/net-dns/idnkit/idnkit-1.0-r2.ebuild b/net-dns/idnkit/idnkit-1.0-r2.ebuild
index b6ea6ce3499f..d49a09a1fa6f 100644
--- a/net-dns/idnkit/idnkit-1.0-r2.ebuild
+++ b/net-dns/idnkit/idnkit-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://www.nic.ad.jp/ja/idn/idnkit/download/sources/${P}-src.tar.gz"
 
 LICENSE="JNIC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
 DEPEND="virtual/libiconv"
@@ -21,7 +21,8 @@ S=${WORKDIR}/${P}-src
 src_prepare() {
 	# Bug 263135, old broken libtool bundled
 	rm -f aclocal.m4 || die "rm failed"
-	epatch "${FILESDIR}/${P}-autotools.patch"
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	epatch "${FILESDIR}"/${P}-test-subdirs.patch
 	mv configure.{in,ac} || die
 	eautoreconf
 }
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
new file mode 100644
index 000000000000..6935a9252545
--- /dev/null
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ltprune
+
+DESCRIPTION="Toolkit for Internationalized Domain Names (IDN)"
+HOMEPAGE="https://jprs.co.jp/idn/"
+SRC_URI="${HOMEPAGE}${P}.tar.bz2"
+
+LICENSE="JPRS"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="liteonly static-libs"
+DEPEND="
+	virtual/libiconv
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3-log_h.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable liteonly)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+}
diff --git a/net-dns/idnkit/metadata.xml b/net-dns/idnkit/metadata.xml
index f8bd6f3f34f9..568bd4ccbd6d 100644
--- a/net-dns/idnkit/metadata.xml
+++ b/net-dns/idnkit/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+</maintainer>
+<use>
+<flag name="liteonly">Compile and install lite library only</flag>
+</use>
 </pkgmetadata>