Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 124 insertions, 15 deletions

diff --git a/net-dns/libidn/ChangeLog b/net-dns/libidn/ChangeLog
index 7a9a9876ae40..dab8e2ed7e1e 100644
--- a/net-dns/libidn/ChangeLog
+++ b/net-dns/libidn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/libidn
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.223 2015/07/03 10:24:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/ChangeLog,v 1.224 2015/07/09 05:03:41 jer Exp $
+
+*libidn-1.31 (09 Jul 2015)
+
+  09 Jul 2015; Jeroen Roovers <jer@gentoo.org> +libidn-1.31.ebuild:
+  Version bump.
 
   03 Jul 2015; Agostino Sarubbo <ago@gentoo.org> libidn-1.30.ebuild:
   Stable for alpha, wrt bug #552160
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index cfbd13442cfe..d0dfecdf4686 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -4,24 +4,16 @@ Hash: SHA256
 AUX 50libidn-gentoo.el 455 SHA256 b8b5a7df3ef312b47ef44d7b5c9180e06e9d8b9cbe43fa67b8511296381ff937 SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501 WHIRLPOOL e2925be57973d4f2d9adebaa63bc9a2d63daa0c4ac571790fd564fe4b7a4d5d8db62a0e342a5043b28e2c506bb62f86e9f967e5a680dd50261fa1dfb4214b260
 DIST libidn-1.29.tar.gz 3474087 SHA256 fb82747dbbf9b36f703ed27293317d818d7e851d4f5773dedf3efa4db32a7c7c SHA512 4e316d3e2d39d052227f3cc915341692815ab59a1fb56a25dff564329cadfd9e7738f07697bbc7f5f2577827cdbfd9af2cb89487c74ead97a77a186d37a97e30 WHIRLPOOL 61128dd5a49c3ffdc900f92f9ed3b3a73c3c193abc4ef6ef0b9c8e963cb635dfcf0074d5a5a71317d855300f2b1a59a91e7958359f1b29df5a6ec188d9e72819
 DIST libidn-1.30.tar.gz 3474545 SHA256 39b9fc94d74081c185757b12e0891ce5a22db55268e7d1bb24533ff4432eb053 SHA512 066b3bd098f2ef39361ee42ec0abfcc69ba695b1565a81905e2047fa453c328a2d674703ac873a4e5a349632151ce5d6d56328b93fae42ca5e658190949a26a9 WHIRLPOOL a6fff4c283e0a556d8d5772f496468761030200935aa649d31e7e305cc1c215e578d13c518470f062b5cf54fb893c6c259023d88aa209216039a2319e7ed5dce
+DIST libidn-1.31.tar.gz 3481725 SHA256 afdf2fce91faea483ce24e26b5e3a9235e332029c9265d07214fd1cfaa08df08 SHA512 a845d48c1d22d37ae829df03a7a40263bc3bf50403844bc52844a209bd536c7461f65132560d381aac533e10e7633397a3a47180f5b871bcab2f9f2d0132ac61 WHIRLPOOL d817318533d0be3686029d03c28bf151f208c9d39cba1db18b0bef1022d72d63530c119200cea50555c0eb3fdee2a9c680e190f7c8706f7283fa78a5aa9cf156
 EBUILD libidn-1.29.ebuild 2828 SHA256 48acd7ab0e939522138b36ea8c022025103917e2d7e86acdc7f2f4de2eea93d4 SHA512 a01b0ae90c705f2f4e29d694d7cae40bb240aa91a3a9cd650ad621dd73daf20117e21ed2b879b00465f035b4fbc3c634f46cdaf77d45545eef7e9d60cf6f93d4 WHIRLPOOL 136914c166b21908ffe0e9259d80774fb2f4b7447b7e16354a13a5b96a034d32272b7b88fa1b8c107a891887f24a6e0e77fdeb70bda4503e67dcd8c1289bd2f3
 EBUILD libidn-1.30.ebuild 2832 SHA256 d7c563e3d7b18da9e8ebdc61979b7efd526ec82888db45c1af6124dbc2a78f03 SHA512 7e81fc359f2b299db1e12ae2d5c2f99de90d250637fbc83d1d015c5596627a3055155de9e65c2a8d29e561cd1281aa93b2570c4e3c582afec9ff5a6cf617b71a WHIRLPOOL daf40ae2a32136e1c15c58a07c2cee595ee731fc1547c141d0c5b8ca3577fc5336d1f4d42bcae9468da1b9eb6dcbe700314e14eee7415a787ea0a472d1a6b399
-MISC ChangeLog 26176 SHA256 ef1dd4118f641b4a0b7ba6d88b708582029be859672e5ab415bee58a91dc90dc SHA512 a0cc33cd7fb1a71383119207508cc37a3012c221176002891ff6d34d388f3a80e1b91a6f66a888daf4911c935017e02fece162cb6d2f26ee82bbf4ee3a258362 WHIRLPOOL 6c1263a51240aad3c0f44f5eeb3b10bf9abc792b4c9cc40935c40942537edca197a2b1ebd2f7ccdc6e10810e81b6fdb39a834510c7e84d235b69a9f975232252
+EBUILD libidn-1.31.ebuild 2837 SHA256 201310c02dffe7c3b631dd1cf9d57590d6fc95e3bf9ad7ae7a383f1f764d6e00 SHA512 ef0933cce5de3b36271eb331476ecd8107eae2b8111b8f49d73edebc69eab62099208e42d8ace829e92632213960155d95a2d8133d41857f74e59b10d0098ef5 WHIRLPOOL d9cf9a041888e1844eaa7060964c80378834684b91db859c251cb7d8e7e829e3b17e0656e6aa4163c826010ab3c3e065c815945104e07d812be634b6f3e9db3d
+MISC ChangeLog 26289 SHA256 a72a2a08dbdfe048dc1dc50b3b9946049680d9d109e245a2368c0169e7707e08 SHA512 e946f63fe728778420ea8e82b0115255daaf62a0133484a349ac180855722030c7067a01b001a0c5fa6c3a52d6699e2245736f243362fd09e67bfd73a5000e29 WHIRLPOOL f94fdb1d9be15f4d615a86c673ee354f79e36659e19f18b5ca9362af2c0c3264728b3886d6c53c4f8b8526a9a6e085f0db18afffe01d273e35077f5721a69ee0
 MISC metadata.xml 230 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce SHA512 a7a1138a00026b873623549a80248ee704c039921fd65203098c1f81c9c4532f142de26a2743720e6a108273f4ac547a8707909f3e6001dd5844b0e7e275dba7 WHIRLPOOL dc42bdbbe8863903771b14c2511223d0a3c2c94d543cc2e211269312e522bc6cb352af4568a4a307ad1163c6feb8852d61652694ae00616f6abbdcecf840d5d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVlmLKAAoJELp701BxlEWfVBYP/i8rLIBUyiu6kA7Pnzpq3nfT
-L0bd+4Ox7L7v7s9jYbFJoGkjI9EDMKgihli4abbLUBzaLuNw8gemhBXskc3eI1hn
-y0/uRwtg1gGc9Wre9d6SvJn/mCcMJGFFsxpBUU5Ye+iec/if6r1dGTUOZynlD9aG
-EZmXlXUVyZaJ4EYbtT1QK1SOgaVZF5g4Uvw+0om6eMtd56w/jtOX5kYebDsqA1hn
-YhD1axX7S+D/R2qRHaN1taYbKfW1ysaNmC/V3y3uLlcITyK0kN+J9Z+kU52ludar
-jYKqz6gAwK5bYUEV3WZf1JPpRqWvx85OsZN5pPbKCsGhtF/79O9EQHcvGKz6mjfc
-JDZBQ92h1MSsl88b53FneVdVX+Kn2jcGMf1QA6AN1q5zeGFeDZQ9NNaC3zETRagK
-kHAB6c5SYonS+ssyFhcG/9nYMtEQe7ulfHHRoAE+TSoTYpb+LT1AJfGrVxv7+4MU
-/9wahHhFK+RL5sleswqJ6EKDSs7LdREzS/+j1QeYjVT8482Xj9QPX/CuNAPOQhP2
-Fbun0Z6ZT9fzpf1aHH5jQuuOc8ZX9nmoYiiSNbNZKIMUQvGKAibWFbTcOhDiV7zn
-jOmjIpR9H74Imi4vGkpE9otCwhX/2nZX+un4LALt1OXG8XkZwurtGt87WmbYD3LK
-nj3fFAT9wLAs+jTMJ+Ow
-=ARsU
+iEYEAREIAAYFAlWeAK4ACgkQVWmRsqeSphMT8wCdF+8GuWkXp7NsZAOkBQr1gRHg
+ENIAniQdX3+qILqJcZwSkR0nLLzrGfJ5
+=+VB5
 -----END PGP SIGNATURE-----
diff --git a/net-dns/libidn/libidn-1.31.ebuild b/net-dns/libidn/libidn-1.31.ebuild
new file mode 100644
index 000000000000..57f60e110006
--- /dev/null
+++ b/net-dns/libidn/libidn-1.31.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.31.ebuild,v 1.1 2015/07/09 05:03:41 jer Exp $
+
+EAPI=5
+inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal
+
+DESCRIPTION="Internationalized Domain Names (IDN) implementation"
+HOMEPAGE="http://www.gnu.org/software/libidn/"
+SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs java mono nls static-libs"
+
+DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
+COMMON_DEPEND="
+	emacs? ( virtual/emacs )
+	mono? ( >=dev-lang/mono-0.95 )
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( >=sys-devel/gettext-0.17 )
+	java? (
+		>=virtual/jdk-1.5
+		doc? ( dev-java/gjdoc )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.5 )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+pkg_setup() {
+	mono-env_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	# bundled, with wrong bytecode
+	rm "${S}/java/${P}.jar" || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(multilib_native_use_enable java) \
+		$(multilib_native_use_enable mono csharp mono) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		--disable-silent-rules \
+		--disable-valgrind-tests \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-packager-bug-reports="https://bugs.gentoo.org" \
+		--with-packager-version="r${PR}" \
+		--with-packager="Gentoo"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use emacs; then
+		elisp-compile "${S}"/src/*.el || die
+	fi
+}
+
+multilib_src_test() {
+	# only run libidn specific tests and not gnulib tests (bug #539356)
+	emake -C tests check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use java; then
+		java-pkg_newjar java/${P}.jar ${PN}.jar || die
+		rm -r "${ED}"/usr/share/java || die
+
+		if use doc ; then
+			java-pkg_dojavadoc doc/java
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	if use emacs; then
+		# *.el are installed by the build system
+		elisp-install ${PN} "${S}"/src/*.elc
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	else
+		rm -r "${ED}/usr/share/emacs" || die
+	fi
+
+	einstalldocs
+	if use doc ; then
+		dohtml -r doc/reference/html/.
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}