Version bumped. The ebuild is submitted by TANABE Ken-ichi.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 53 insertions, 15 deletions

diff --git a/net-dns/unbound/ChangeLog b/net-dns/unbound/ChangeLog
index 810e44f31b07..048c1e1a0a0c 100644
--- a/net-dns/unbound/ChangeLog
+++ b/net-dns/unbound/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/unbound
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.34 2012/01/04 17:39:58 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.35 2012/01/30 15:58:00 matsuu Exp $
+
+*unbound-1.4.15 (30 Jan 2012)
+
+  30 Jan 2012; MATSUU Takuto <matsuu@gentoo.org> -unbound-1.4.10.ebuild,
+  +unbound-1.4.15.ebuild:
+  Version bumped. The ebuild is submitted by TANABE Ken-ichi. Removed old
+  version.
 
   04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   unbound-1.4.13_p2.ebuild:
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 1c234a33ae5f..3cd643464ea5 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -1,21 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX unbound-1.4.12-gentoo.patch 639 RMD160 f3092ab9149ff47d0948aa650ba923e9e059b168 SHA1 6c753f0bc2dce7679a19d69d4ac4321c5c3270c5 SHA256 8223261764f067355a5c013b2c8b13384480c91782fc42ae339dcc8bed843448
 AUX unbound.confd 171 RMD160 090f4e941ed9469ea2b444c9862fff3a490e992e SHA1 cafbec0f4b23849bbc4288c8bc4d81cd867e4f6e SHA256 7da812ef83f8f8b9351363525ab6bebd5348faed76d0ae424dcbd7cb6a830dfd
 AUX unbound.initd 1479 RMD160 9c0b945bc2bd2497c023d4d77f15a7656695d4da SHA1 37fcde8b17c8e2339e47c0298dfd8f3488dd7f3c SHA256 62cac1d151351d1e843cd0d8cc502ef92a3b47d818f620d2995601e0c6e7eadc
-DIST unbound-1.4.10.tar.gz 4476504 RMD160 7102613a43e566d542ca6b571094a8fef3b901e0 SHA1 ac9ab61a51e147ade69ca8b043fee2ed76336a62 SHA256 dace571f8906e858cebaa347824e3e0be711c830cc6eb747eb6c2246e2e5ecea
 DIST unbound-1.4.13p2.tar.gz 3525904 RMD160 5b574faa0b9e701a4e1c186cdc70cf26c38848e0 SHA1 474339a182147ee91ec712057f75f417a455a8de SHA256 2f6814a4cc33883964c2833075990328fa330f966c3804ad20a92807428c22c1
 DIST unbound-1.4.14.tar.gz 3546634 RMD160 136aff9812eebace73c26b608f6411bd048215cc SHA1 1435029abe63d0106213acb9f173b885183cf1d7 SHA256 c15b85145e3175f3d933837071b4ffaae8da4a394139ac0e7f3dfee11712e7d3
-EBUILD unbound-1.4.10.ebuild 2419 RMD160 c55fae766d013a86192a00fbd38bd77a235dae6c SHA1 d69824ec01a94e76ba938772f099fd9e14adea4d SHA256 1fefffefc77469f7c11e27226a9ef793b007e29f8f98aef1260d1803d7c19341
+DIST unbound-1.4.15.tar.gz 3562742 RMD160 ef65e82ed5db61c15a310a60dc7aca17af13d878 SHA1 bbda46664ea8391ca7986300ce98a79787c0e322 SHA256 729d427c00c160de4ee66945d762b3282677e957407450152088369216a30020
 EBUILD unbound-1.4.13_p2.ebuild 2984 RMD160 8d8e7f94c6ddcd1c9e7df06f15fc750f11eb1de1 SHA1 c729f90f4a1f6f3d74b8a98e4f666abd5c0338db SHA256 9ec93fc5dc93031af4238175a3cfda944d8ffa4027c5804efe4d2bfcbbe58ffd
 EBUILD unbound-1.4.14.ebuild 2935 RMD160 905cc30df7a42a5cbb41afb9bd09495e1ee16e8c SHA1 05ce6d2c2c425c453360ee0f2333cf3f6c38dc15 SHA256 7b7e8e719a2834f26f7bd513d9a09354f9024f22161b68632e1f0075732e87e1
-MISC ChangeLog 5399 RMD160 9894c02b46a0690af6e72d668b0c579992a73025 SHA1 b8ff8e4db12dbaabd6a57c5158b414790fbf021c SHA256 d689f9e20c0b7961edadb3b638438107255c5fd081129d7513f5cfc61439a819
+EBUILD unbound-1.4.15.ebuild 2935 RMD160 d29d751dac5edcb2622541afeff4c0e431ee0247 SHA1 165ec8bfaccd72d8f19a0b8e5c41dff248b1b007 SHA256 1fb979723fe580f0554b9040f1813c48914af36f0b8f43b40315147b59c4d62d
+MISC ChangeLog 5611 RMD160 1203b8589f0fab7f4d9b1c1731999b9cdfba77ce SHA1 79d2ae9cc7a23bd3ee22f204f13710158d4c00fa SHA256 f91f24b44ae07540cbb615ae26bb4e8d092f0a630c8d868a9f4bf459fa9ab7b3
 MISC metadata.xml 1010 RMD160 224fdc30aba9888e1ea0528e24ca539926949ee9 SHA1 2402b2272dc2f4343c270245805bad619e427b50 SHA256 6f2382bca4bb186e9e7c6c08debbfa3b1d90de2f574d387d63115852510a10cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8EjvUACgkQuUQtlDBCeQIaSQCeK4MGJYUHJ2S4r/8/AP9MmKOX
-CSsAn03Qnd0gqUe5hjwsXcN8kzKZPKbk
-=hjFe
+iQIcBAEBAgAGBQJPJr4TAAoJECaGw+YFKA1p1i4QAJSqE28XqKElDqJWcCoI7vlg
+SwNIXHzVzdkeE+y4/B1btms/EZxkKZe9lt+/P5IliecjW9vDyFIFjYdOQynnJ5hw
+N89LIy7vepdPK6H1TarSRTWNe68l4Ul/CDNT8oZJZWo+VxxWcp5IJnOl2cO5cNvp
+YjckX3HQDcP2DcXsyNcYnjsMxJpBQFAw44eTzGnhXNon1QZRDSKuBnnf+CAuFpEE
+yGxHh4w0iviLzZEPXoMKWtPOkWQerJOIyfkWgNkHXrrZmj1dK4wWq3KRDRjegy/V
+PSf2q0QeroLarZCpTKbXs5hkTQ/uluvQWjUTBHnzmIvfIA4u4xaCeAaRHzMk91fx
+ZX4fcKEmOBSPyISjok0dArCYE73WgbvBuSg4sB+JXGNAq6mB1HIKTGNDHYbnm4Dt
+2gnfolNF1aIikvGF/pxCv34URQOv1yKNAiNsTWi7sfj9umZyBunf5QPzT6kB69vL
+C6vFzsvTpb72Lp0wdWEeS0+s++QOYBerN1KDoVIxZog7sdl8vyb0N7wxBsZVC9bT
+0hbh25nARTXUe+ryQwZF72WMjnvi/kU0c91jrchgKH/1JyAVfU48oRRVDeAM4alm
+Os3svJZ9y30W8ieKDgKsliB4k6NyULExsiNrlA20D+Runb+APHJ5P3bLIN46L44B
+qpTfND28C+kOqxL+Y/cz
+=0eAx
 -----END PGP SIGNATURE-----
diff --git a/net-dns/unbound/unbound-1.4.10.ebuild b/net-dns/unbound/unbound-1.4.15.ebuild
index 20bbea48e010..e67c169b12ac 100644
--- a/net-dns/unbound/unbound-1.4.10.ebuild
+++ b/net-dns/unbound/unbound-1.4.15.ebuild
@@ -1,10 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.10.ebuild,v 1.3 2011/05/31 13:31:03 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.15.ebuild,v 1.1 2012/01/30 15:58:00 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
-inherit eutils python
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit eutils flag-o-matic python
 
 DESCRIPTION="A validating, recursive and caching DNS resolver"
 HOMEPAGE="http://unbound.net/"
@@ -12,7 +15,7 @@ SRC_URI="http://unbound.net/downloads/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="debug gost python static-libs test threads"
 
 RDEPEND="dev-libs/expat
@@ -33,12 +36,22 @@ RDEPEND="${RDEPEND}
 	net-dns/dnssec-root"
 
 pkg_setup() {
-	python_set_active_version 2
 	enewgroup unbound
 	enewuser unbound -1 -1 /etc/unbound unbound
+
+	use python && python_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"
 }
 
 src_configure() {
+	append-ldflags -Wl,-z,noexecstack || die
 	econf \
 		--with-pidfile="${EPREFIX}"/var/run/unbound.pid \
 		--with-ldns="${EPREFIX}"/usr \
@@ -64,7 +77,7 @@ src_install() {
 
 	# bug #299016
 	if use python ; then
-		find "${ED}$(python_get_sitedir)" "(" -name "*.a" -o -name "*.la" ")" -type f -delete || die
+		find "${ED}" -name '_unbound.{la,a}' -delete || die
 	fi
 	if ! use static-libs ; then
 		find "${ED}" -name "*.la" -type f -delete || die
@@ -86,3 +99,11 @@ src_install() {
 	exeinto /usr/share/${PN}
 	doexe contrib/update-anchor.sh || die "doexe failed"
 }
+
+pkg_postinst() {
+	use python && python_mod_optimize unbound.py unboundmodule.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup unbound.py unboundmodule.py
+}