Enable multilib support, bug #499380.

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

3 files changed, 133 insertions, 15 deletions

diff --git a/net-dns/unbound/ChangeLog b/net-dns/unbound/ChangeLog
index 0d7ae2948774..bf95aebaffd4 100644
--- a/net-dns/unbound/ChangeLog
+++ b/net-dns/unbound/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/unbound
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.65 2014/01/14 14:00:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.66 2014/05/13 19:17:43 mgorny Exp $
+
+*unbound-1.4.21-r2 (13 May 2014)
+
+  13 May 2014; Michał Górny <mgorny@gentoo.org> +unbound-1.4.21-r2.ebuild:
+  Enable multilib support, bug #499380.
 
   14 Jan 2014; Agostino Sarubbo <ago@gentoo.org> unbound-1.4.21-r1.ebuild:
   Stable for x86, wrt bug #494572
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 08d9dcf08530..0f22562d8897 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -20,23 +20,26 @@ EBUILD unbound-1.4.18.ebuild 2828 SHA256 cc00c3b28d449416ac28dd696a5a5b9af2f0c81
 EBUILD unbound-1.4.19.ebuild 2828 SHA256 37c243b8a8a4262e2f67553357f4f9df6614fc6ff02bccbb65495ee321155942 SHA512 699486127e124cb91bad6444a664f4bcdab57b52f9bb41e1ca61566e5d266287fb8c7a5e948100ecf53a853da1fb5db79deef85aa3fd45fb9a6bdc7bf76d3fc1 WHIRLPOOL 3e271998af677cf1ec93de8ecd9fb6aaa4792f2d92d12bd3ead88b275ea8e4bb0c68a21d02af877c5b3eeced73730f9117c0c8cdfefdf7617ba90a453f93d940
 EBUILD unbound-1.4.20.ebuild 2679 SHA256 3678e6092bc5528ccd8ab022eb8001488e51e73cf7b593e25404c3a3fb79e551 SHA512 34cd70bf8051b9fb2a693f2a06c373be8fbf6627229e2db4250aaae47203a6dd6617ef1da2587edf396680e9541926991f615532b031a4429ff40353dfd7b8fe WHIRLPOOL 709689cc8d32189a1eba7781d3c36694d6ac7db7edfb25aa58d6749ae33051215fef2b8f97438f5f14c44f194cbee0348209ab4a3e051759812c5c4c9e4fbd73
 EBUILD unbound-1.4.21-r1.ebuild 2856 SHA256 a7658c94d557783354a4cc622d09832b8cc29402b4fda956d15d96288578c8e5 SHA512 75044476f120dd80a87cf15fdaaf694ea39e74d32492d3c037e20ed9ff4b2aa5b8a8ddf7a663a2ee77ca43e01757364164cf22e074e4446452367e1fd00b045e WHIRLPOOL e30553d64e6ff3ec174bac8790211050282082519fcff2926b859c4fb104fa3af0c59f11fe4eb4de2e2a35464e721ef63a93dd15bfa733250986deb15482e095
+EBUILD unbound-1.4.21-r2.ebuild 3182 SHA256 2447fec551ce5588781be97bd082b7281c5a87e3164c620d2aab99c3f9fba11a SHA512 745b55d8ae77f4ea89b1efca18abaf6487985c9bf8d5c2040bbaf42d304b4265a27322ba05bef416e803981095f074ab6ad3229eef891aa7d535097734837869 WHIRLPOOL 4026d96df8f9eeda88dcc1093fdff49098035fbac486618a7a64eabeac0e8fd1cef78369bf54f92f2570cd83dda1df3408d730e5ec5aa8cde463aa2dea332d21
 EBUILD unbound-1.4.21.ebuild 2684 SHA256 db67ecbafc4ccbe5849cbbfde6449bc901a821f9c243d2aca5b1189bd13f9224 SHA512 c3b7e141970abb02b51bd0bae2185cf52d6d0af689dcf30e19964ec6336be819517e227c1fdd97ecfaaf1222c1f3d3167d777729b097bb9f2c25c1831bfbfc26 WHIRLPOOL ce01a40a8f8c6f7e22992f766c761e4329bd16304d05c02f1ae2afc4fccf5ea1fd5bb5fa5b0152954690cf7f46ccd8743bc58a06417e798e1cf7ae4b2443902e
-MISC ChangeLog 9627 SHA256 bdad644353a522f461ac04045f7d7e3af03a38a2f73be052115d971c3f56405c SHA512 e52049dab735d2d5a342bf556ca61a4c5758a108a7864d3da74eb017d25677eda278982e5ca2a958b0dafa28b915bb2db4ecc4caa3a9275d3b933838fe809379 WHIRLPOOL b004463579d1798307a90faa0538329b555fab78cb07ccc19278d64dcf4c76192c2a181bbd0470e40ae9647a6b5c66fb019b63c518d4bf261379cea905c266a7
+MISC ChangeLog 9782 SHA256 b88b0ade3121e9aef38045b3abd9595e9f270b12261d012b77594dbb9ff597ed SHA512 54fe371c1c2acc0ed1b83bc67a015816508d18d8c1dbe91b08d2c6a6b7d32d4e8a92ce9835b12abebc148c25358efa5fe6cdc9ee1b1999fcc7616001d4d68f3e WHIRLPOOL d5df85155a893476b55d8b39247e8c548216ea47015dee327904982ff5b43860f89cfcc195c1dfa23a8c7cb023166958aa1d71e76f1c80dfac187446717a2670
 MISC metadata.xml 1037 SHA256 c510014e7928b8c5a5cadf237c985c2cbea9b7e3101ae555e19393febf022788 SHA512 64ab9119a1d82cf9fd1d8b8ea99a11174003b62576307c4d2f9af091a6710d23102d9465c816e815a6409b76eaba577a8ad12200a8bee565d99ab2884a9c4c50 WHIRLPOOL e23196ec459f0afa4d52339f2eccac65affc80dea467b219f43b9394ce600bd208616da75915bfd84c0c036949d70f0d33775ae13cf216f3af118a6f384281fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS1UL6AAoJELp701BxlEWfJ9MQAMhQuO8Fa43LtsHHSdbOGAsM
-/AvVYlGQ2hn8b7T2xkA7i8VXb6CYlz421bcG6LPAMRkPxuodOETEuIpCoFgRa5WP
-9I9thEYrSJUHbSZ2wgFC5lU3OegZi5Ghvme0Px75wT2uIi1mFTqLT1PoQvJoPsY1
-xbCZ5fOdKDN3McuhkrK8jsCDUB3bmYNl+7uOof0jeYOEUcMqPnKhkjx9cQFgHbJs
-KaL9fJwKZUro0KhWJwenvcVwzSBCP6/y/0vmttRQbr5xdvEc4Mi2KKaJstBgYH/D
-rRieRS60Rt0Ei/ALjAH6dc6vLtPVqWZhVnaWM9pm2/QlhJC0BI5XnhnVcvOny+XZ
-z6/krh6Ko6hQrLkLYIIHT6MwGLpT4Z5PMJUUIm0+IdQnS8196+afJPpnqZgAqJ6G
-E/S36Hdrl5InRRlWVhPEmjYpjHsnlNIciUu/oS9woaHJfPvkduXm199eez0+5dwg
-cYLrP2Vzis8AXd63M3DKEN/4J57RZm7FHPwpuV8meXgSjwV30sEGhA1Etq2URfuo
-hHpJR458FTLMmc2jnUCTFNzGZ4i4dDG8FP8/cNZke5/YdHyqKI1JO0mAMN27StOS
-RQC8kY9J+4ei2cluqgM4EbKe7QE5dF9OhlbX3ALqV+/XF4xC/Zdj+QkHlU+2RUKJ
-XDm26duhZeANa06RUN6l
-=Y07K
+iQJ8BAEBCABmBQJTcm/ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOAfkQAKFZRr3GnUe1wRex0X+Mystc
+QEShDVeEzdVat8eTudg0g649mXnvDeSOhMk4mGwlFUmee3XGtlha/kRawCU9/Myd
+/92Ul3YC6mfXvfcFOf4tCE+tdORwDf+dsPEnbQ/+rv4aic+t8gGpc4hzHdTj+vJM
+R0EdG34TBtA2buklFnRm0YYh/rT2Xi+FUeL79VJybi1YOUky8ZUYN4gF6YN8I5wI
+o/wTrMp04s8JMRa9GDAdHRW94GaKjGMIlXOBFmq3ucmHLofBpfxKhbmOoShZbVqh
+lBlnOiG2k9HIZGTGylN26d6x0n7cfBuiV0oJyCZr7hVLVrv5nafFmA6RXknPU646
+GliijqRJnraAUcApCgs4s2vLKoH8aDnVqKigDuQYL/AzeSuvSfpTN4UFsqENu8Y9
+mc+iQUHymdi/Dxk2xlYAnre5HkGFaj+u2UZQOwPXSDTiDd6c4PxvPrH6JwEQ8Z45
+DfcaKfmVuxrqDf/2OijpVZL9Ifjka2kStYYBZj5wASBUUKp8qLfXHRt8Lga8k1vA
+zUS4fxm8EoGvlSeot0M1QIthqpCEqSvMdjPYehF0Sb0QODdWc/mpBh4Vhk9G69rY
+00JK1BwhGVa7lySnWM136S0VelNfcn27zh1fTipUeT5CEb0jrX1U7vg2gf7coNbs
+5zxJaqhb+KNec+tiQt9o
+=GXJK
 -----END PGP SIGNATURE-----
diff --git a/net-dns/unbound/unbound-1.4.21-r2.ebuild b/net-dns/unbound/unbound-1.4.21-r2.ebuild
new file mode 100644
index 000000000000..7c7a25ea018a
--- /dev/null
+++ b/net-dns/unbound/unbound-1.4.21-r2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.21-r2.ebuild,v 1.1 2014/05/13 19:17:43 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils flag-o-matic multilib-minimal python-single-r1 systemd user
+
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="http://unbound.net/"
+SRC_URI="http://unbound.net/downloads/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="debug gost python selinux static-libs test threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+
+RDEPEND="dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/libevent[${MULTILIB_USEDEP}]
+	>=dev-libs/openssl-0.9.8[${MULTILIB_USEDEP}]
+	>=net-libs/ldns-1.6.13[ecdsa,ssl,gost?,${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-bind )"
+
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	test? (
+		net-dns/ldns-utils[examples]
+		dev-util/splint
+		app-text/wdiff
+	)"
+
+# bug #347415
+RDEPEND="${RDEPEND}
+	net-dns/dnssec-root"
+
+pkg_setup() {
+	enewgroup unbound
+	enewuser unbound -1 -1 /etc/unbound unbound
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# To avoid below error messages, set 'trust-anchor-file' to same value in
+	# 'auto-trust-anchor-file'.
+	# [23109:0] error: Could not open autotrust file for writing,
+	# /etc/dnssec/root-anchors.txt: Permission denied
+	epatch "${FILESDIR}"/${PN}-1.4.12-gentoo.patch
+
+	# required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gost) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_with python pythonmodule) \
+		$(multilib_native_use_with python pyunbound) \
+		$(use_with threads pthreads) \
+		--disable-rpath \
+		--enable-ecdsa \
+		--with-ldns="${EPREFIX}"/usr \
+		--with-libevent="${EPREFIX}"/usr \
+		--with-pidfile="${EPREFIX}"/var/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks) \
+		# $(use_enable debug alloc-checks) \
+		# $(use_enable debug alloc-lite) \
+		# $(use_enable debug alloc-nonregional) \
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound.initd unbound
+	newconfd "${FILESDIR}"/unbound.confd unbound
+
+	systemd_dounit "${FILESDIR}"/unbound.service
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+}