Convert to python-single-r1. Enable multilib support, bug #499384.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 107 insertions, 15 deletions

diff --git a/net-libs/ldns/ChangeLog b/net-libs/ldns/ChangeLog
index dcac1ee2c8f6..9329dec33b57 100644
--- a/net-libs/ldns/ChangeLog
+++ b/net-libs/ldns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/ldns
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.56 2014/03/23 09:54:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.57 2014/05/13 06:18:49 mgorny Exp $
+
+*ldns-1.6.16-r1 (13 May 2014)
+
+  13 May 2014; Michał Górny <mgorny@gentoo.org> +ldns-1.6.16-r1.ebuild:
+  Convert to python-single-r1. Enable multilib support, bug #499384.
 
   23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> ldns-1.6.16.ebuild:
   Stable for alpha, wrt bug #505066
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index dd077f58318e..9c21c26a7cc6 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -5,23 +5,26 @@ AUX 1.6.12-cflags.patch 597 SHA256 3d892a2d8f99912375e491ee47c2f608c2d653d3a5b52
 DIST ldns-1.6.12.tar.gz 1057607 SHA256 b966787510a169ca0ed78f9a8a5de01fb309909575e721ead92095d4677aa51c SHA512 f928be35a5c0bc2b918f005dd592cc531451f373ed9d77a54d5207a2a80b9d525faabf75bba75483d3476cfeff75a66ad4d9527a84a983216dae4fac30213773 WHIRLPOOL 0e8cf513991850b065144568ec1ea3188ddb6bbf6b3cf08490186552884b2b2dd42ae8ab8995f54c183a989976ab292772411f2582a5bd595d4d54d25e2b4096
 DIST ldns-1.6.16.tar.gz 1109941 SHA256 24b2f9cb05797170f2021ef0e0372d4b5225ee4199f0568a15589b5c524df695 SHA512 ae32abf4fc146b4f8efb7d7751b09f629d28cbcb39d9493e5c00198b862d16274bc1bf6ac68c4fe35f177184bfe71bf68e1e6461c0fe6b6d57855549b08a4515 WHIRLPOOL e48875cd70ba915808097e67940642639092b4cd6a431cf4fd29e41ccacaa34c864ff10506f5fceb936656c06d27d8bb8c9bda2a8aa2d1d955becac461b7cecf
 EBUILD ldns-1.6.12.ebuild 1766 SHA256 f7f641d1526f7a251d998d7b9ebe7314b2b025a435e4b930a34a521e6025c1e1 SHA512 3ffc2e601d9b7069ec55bfe267681b0f46e7d472695173c5b443fd1b2e8eb5183067e2eefd0f8f1a1443b178155d6f38371cc65c5af5743b32c43cb891e07e00 WHIRLPOOL 3b737c9088d8937805dbcd637628ce87c6fdb21b76eb6dec0790fe9a97aeabd8a6b02eef8abb6a409f1d2b904a7e87bf61b9657ad7e4b20abb5911439df5ddca
+EBUILD ldns-1.6.16-r1.ebuild 2082 SHA256 e72c99fa1bb9e433b828b30daa04216cc2947a965f7fecf08aaedea7639d3ac4 SHA512 be4f4670601b1918c91edee310cf123bcc681186f5a314ddbf0d287bd3e10c0dc7c0e0fce2e3a726cbe8036d1cd3f0e38e0323c1728fc7fd253f472f3340196b WHIRLPOOL 6e9f0a05604702f78a37d49348cda95d71fdb68bbef4f7b62966843f16a4a90ee2a227b51f5b3fac9bcc796fa82ab4e665fe268e40e1cf48b83b1b8f77095b9e
 EBUILD ldns-1.6.16.ebuild 2082 SHA256 fa8a4adc4a526462062b844892d30916daa7c731833a822afc4a33dfd9df3c3a SHA512 53ce75e76c0507057ad6dd013913fe3b9026bef1f6f8b6dea60436c76dda63ef0a80acab8983484315b10a9d7eaed55a0889a003a7060ee4ba7583159cf31bd2 WHIRLPOOL ac9b9c46dad99f784376e1c5ff0dca3ec1046bf3ba371b4ff0c81f241a75524cf8d8c42a8af294bd2baca926fb6c41d9af19d8f701c1871fef6b296591e01012
-MISC ChangeLog 7884 SHA256 3ea555f77624e9d38a72cb9fafa496b2349343487529ff1ac2bbcbfde8cc51b5 SHA512 f0f419dc40d37c28c0545834b8d7a7cbd1d1c7c0f0ac9fa2fddb56aeb155fd50911b057465ad7035aaef056fa8eb099ac6b5eb10b7b0b081f52dafb464e7d47f WHIRLPOOL 1458fb53c72573713a54a8f3a771e93840c26c38cd6724b9dc8a5efb18bccd4537eaa63f65efa72f368e131e2eacdc7373929b42e58f6c4f3f2833cb189db7f9
+MISC ChangeLog 8062 SHA256 b402098150176e74d5756b083835ed56244ba9f19bcf75895d4f5d9ce5fbbb98 SHA512 403f1632133eb7ce28beb867a1d2a60268e1e4a60d02e37f75e00e578ed4e9f688a762b0d3b45fe4686448c88d5a93743a581dab6634e2951e2afe941a8f4149 WHIRLPOOL ccae7ed1df38a7bc5511b8d48ef45a28a7e2c9cd0c416e0ab8e0e7bb49c8caf138ec02049c7b6d1912a3aeb577ca9e552d003f4d13dbb225c9efcccca0874d2d
 MISC metadata.xml 631 SHA256 8d212b45e285a7a5044d194bb972a145e5520f6548181858d91495499b7fab3d SHA512 80fdf1c6cf88c97dc45cd6e5cfaab07293888fe2a6f0c234097d09e63b34c583c789f29f2b38b732a2fadcf9ca2c036bfcc4a42003454ac5a27ff6ac607b0dc4 WHIRLPOOL 1fd2335f540f7ea43fc2316e29361cda493362957d23da5aab84158f9d5d70150bd418fad79ab1a6cd4286700c5203e1678b9646fef058ebcaa9e073b52b8f9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTLq9NAAoJELp701BxlEWfwQgP/2TATxX4i5V8WBzJl5JgtpZy
-htg4bq3j1ljsmM4/hCzcQbGtMrSiaCTEV9VCaxxlU+K2N1IzUzd8n0xOxFQK3lGD
-km7xrZmIDe5x2hXHbT4afwyUxybRnbIi4VL8Xjz/enhsNT3YYGegPuL6hZLyIVOa
-+y2R2NbOl+jboFd9rkFtxGsi3IUwpP3LfoMuWVydro3KfsGSgZRWSy6Uh+aacCyC
-64ra5wmeRWpqzG7AHxXvvf71+GzLmXhzjmYe0Ex5ezOczwlNORyT4u8jMqfsoY0e
-em8zi51D9twDOUkY+eOkuTOnrwtBBl9wtnn4neYObZKSBBn0BHNR4g35cLdFhRlS
-XnFzElKGsZgz0HHEK4pZvdCEA2cIAUHAOBCKcbiqroh1ta8xaAxfEEnaw4gfxHcu
-ILA72KhIQQohNPACEt55QgqfhOIpPkFdQnYXo1FlJZVxS7GyKyz1gADxAX0T3rch
-iZYBevsfwwadz2NuQFZctSX1KDIgVyRoCymIRdS1Q+QErkQr/rIgqRJiS3DcP8c3
-63KgTRTPhB5f94qrXnNhAYlR2XNmPnjBUUrAqAc0dsQ4l5Lf06xECiAqey51PhcP
-eskd0ZcAFy7/ltpdTEhUyMWaW2oCehwXrqbjZs6NSPengwBhgwYcFFJHcZdqEIDy
-Hkf42o9HZMCObLhluN/v
-=71yI
+iQJ8BAEBCABmBQJTcblOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO44YQAL9wDr/zDU7lZiExOYsdsjJf
+Y8/z1vwxKaQvhG6UOd1lIOm2n+FlqrLEdyRHzSHhkyHrPsIXxkMNcZky5/d6zyvt
+lmEwSa7dIeZhScMEmLjIp81ep9w2liBHkqaUvZ8S313neCMZYGux9yq5KicMv3Yg
+QRAlJiswIQWs6o0yW9Pz12JQZzbiMQGthZgiNd4mjLnzOh0PcNai3+4f3SY7FLeP
+PJSwZeseQ2u/V06RhEZXjHCcHsJy0/+93nq+hSW5AkrIkenWFY4XkPXd1albxnqh
+n35H0Hht2UfZn9eJW6k00eXkCPE9v3zdbPPn3YmAx1iCSRY4PtX5E66Q8Mos0Gjr
+07aWWQkJksrQ7YXZdiuZ8Oth8qHeWyabZ69vYxNtPeniqCaGZOu/Pds6cU6WuJxB
+5E3eyI0m9BQWn6m+L4cYKHnut1qdgW3t9oQXmMoKLkh0/1zRibvr6j8egzvPZ5L6
+8ZxaenMnWy109bbXLoUQg60no51NNKsh7jdvpgN/0gSEeUQNcnqwi9IcpxtkZNJx
+L5bywVKwhvnHjjNY7b7RgddLozvhmnXw1wWRd3KuqD91YaUXh1fLnAPJOQdJNVFf
+mOCdfecTiGIv3rZLOG1zX9XaHR59NQPlg0nTFQpCWr0VCo8HCrsBRZNtKe9XqvY/
+9oFi+kZjwVyixikOjDLJ
+=B4un
 -----END PGP SIGNATURE-----
diff --git a/net-libs/ldns/ldns-1.6.16-r1.ebuild b/net-libs/ldns/ldns-1.6.16-r1.ebuild
new file mode 100644
index 000000000000..9fd1ee15ac18
--- /dev/null
+++ b/net-libs/ldns/ldns-1.6.16-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.16-r1.ebuild,v 1.1 2014/05/13 06:18:49 mgorny Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib-minimal python-single-r1
+
+DESCRIPTION="a library with the aim to simplify DNS programming in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc gost +ecdsa python +ssl static-libs vim-syntax"
+
+RESTRICT="test" # 1.6.9 has no test directory
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7:0[${MULTILIB_USEDEP}] )
+	ecdsa? ( >=dev-libs/openssl-1.0.1c:0[-bindist,${MULTILIB_USEDEP}] )
+	gost? ( >=dev-libs/openssl-1:0[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	doc? ( app-doc/doxygen )"
+
+# configure will die if ecdsa is enabled and ssl is not
+REQUIRED_USE="ecdsa? ( ssl )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/ldns-config
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable ecdsa) \
+		$(use_enable gost) \
+		$(use_enable ssl sha2) \
+		$(use_enable static-libs static) \
+		$(use_with ssl ssl "${EPREFIX}"/usr) \
+		$(multilib_native_use_with python pyldns) \
+		$(multilib_native_use_with python pyldnsx) \
+		--without-drill \
+		--without-examples \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		emake doxygen
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc ; then
+		dohtml -r doc/html/.
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README*
+
+	prune_libtool_files --modules
+	use python && python_optimize
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins libdns.vim
+	fi
+
+	einfo
+	elog "Install net-dns/ldns-utils if you want drill and examples"
+	einfo
+}