Version bumped. Fixed GNU stack issue. Added SUPPORT_PYTHON_ABIS="1".

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

4 files changed, 34 insertions, 96 deletions

diff --git a/net-dns/unbound/ChangeLog b/net-dns/unbound/ChangeLog
index e8398a975c43..23df5426b5f4 100644
--- a/net-dns/unbound/ChangeLog
+++ b/net-dns/unbound/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/unbound
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.26 2011/05/31 13:31:03 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.27 2011/07/03 01:28:00 matsuu Exp $
+
+*unbound-1.4.11 (03 Jul 2011)
+
+  03 Jul 2011; MATSUU Takuto <matsuu@gentoo.org> -unbound-1.4.8.ebuild,
+  -unbound-1.4.9.ebuild, +unbound-1.4.11.ebuild:
+  Version bumped. Fixed GNU stack issue. Added SUPPORT_PYTHON_ABIS="1". Removed
+  old versions.
 
   31 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> unbound-1.4.10.ebuild:
   x86 stable wrt security bug #368981
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 8449e4472641..59a58fee7d21 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -4,17 +4,25 @@ Hash: SHA1
 AUX unbound.confd 171 RMD160 090f4e941ed9469ea2b444c9862fff3a490e992e SHA1 cafbec0f4b23849bbc4288c8bc4d81cd867e4f6e SHA256 7da812ef83f8f8b9351363525ab6bebd5348faed76d0ae424dcbd7cb6a830dfd
 AUX unbound.initd 1174 RMD160 76161ab351f85b1e80895f01cc74269ee020dad7 SHA1 a453e1ad4c1e0ea9c4eacab3f2d185e0e764f538 SHA256 7465e1035f3cfbbc1e356ba6d0fff3a5c74fb8b9f2cc1d092a91fae27f23b582
 DIST unbound-1.4.10.tar.gz 4476504 RMD160 7102613a43e566d542ca6b571094a8fef3b901e0 SHA1 ac9ab61a51e147ade69ca8b043fee2ed76336a62 SHA256 dace571f8906e858cebaa347824e3e0be711c830cc6eb747eb6c2246e2e5ecea
-DIST unbound-1.4.8.tar.gz 4474063 RMD160 08082658e4b7f0e82e7e3feae1acea42e1956fb4 SHA1 557a9c10de9a83f88cd7c66d44488f1cb65de4fa SHA256 5bf4060d2e778a1268498f4937583726d1d36909d7f40900ee31a722a64d506f
-DIST unbound-1.4.9.tar.gz 4470329 RMD160 9c34c55f776f4506afb775c8f44df84a64854073 SHA1 f2ac7b4ef1d1b330e2dd5e2eedeb6fd2bbad8478 SHA256 da0b989fe8cf10e43481343873eaedf60bef63be473c86d73d0254b79c5916b7
+DIST unbound-1.4.11.tar.gz 4503148 RMD160 988b8090a3ef39c690443a6e099a83711d7983d0 SHA1 3dbd7854b05b1e48fcc088be50e4c7aafc8d7306 SHA256 19e44dd7a737de678456885483002c6cd84147d334c7323cb3674d2012c82b4b
 EBUILD unbound-1.4.10.ebuild 2419 RMD160 c55fae766d013a86192a00fbd38bd77a235dae6c SHA1 d69824ec01a94e76ba938772f099fd9e14adea4d SHA256 1fefffefc77469f7c11e27226a9ef793b007e29f8f98aef1260d1803d7c19341
-EBUILD unbound-1.4.8.ebuild 2243 RMD160 6126d8d30ecacd1ba60954476f0e4f9e862b8e79 SHA1 5f75f28efe86f1baa2d362ab55a035d50b523188 SHA256 ced9835ed5c7a4b2b606a8caba7e32e675aa72e25ba913915359b61708caa404
-EBUILD unbound-1.4.9.ebuild 2332 RMD160 2f4373a37be8abd740dfd1a40226692bde18ea7a SHA1 3557a8cee3bb1ce2045d1a502f0e207fbeed87ac SHA256 def6aed359acbd6dddb6731b6359b087708df696c279aa19da188d44401f203e
-MISC ChangeLog 3915 RMD160 88932a5d2b784d2bfd030f6b3144f8d85037b006 SHA1 0decbeb4746784dab39f167dcb479b44cc99eb1a SHA256 b7b62b60a2914be4b0f307397ac4939d3a853d5a03a3e944b24713e01cb98cab
+EBUILD unbound-1.4.11.ebuild 2454 RMD160 78d8bf060a5a0c579088daf69461278d48ccc6ea SHA1 8e72f4afec697d86fca225eb10a8b6bea90700fe SHA256 cb16826f59b4454b279c459edac2ac765a0dadf0fee0a499d421a421ac17f379
+MISC ChangeLog 4160 RMD160 a867be72e4a41a3bc92d2a915a4e49afa9440dc6 SHA1 7711bc06b54b132c4e80ec3f39066284073b5de3 SHA256 ba99f72edc0ae18db4a28107298ee40c30d7d4eb260d8be21afe18a09e1b85a8
 MISC metadata.xml 1031 RMD160 0bd78b9a39982efbd2fcb3f95a97ab7765b98154 SHA1 94fd9c91b82a6a747c51d8d4bef073be7f3a58ee SHA256 d13d3e25ea0b34e78b692a6c7045903841d4ed7b0551589febe4fe36a9f25a7d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3k7Z0ACgkQuUQtlDBCeQL+KACdF3EZqYqBq5frVkLUuhDv34dR
-K2MAn2saJBGflTKqjzL8h/AEVVfbUfaK
-=YGo+
+iQIcBAEBAgAGBQJOD8WpAAoJECaGw+YFKA1p11cQAJlhxJRQofFF7ZAVGGd9NivT
+U29GsgA1UvA7+dHnw4vN68Vn9Mk+rA5KOr0YshtnaHqUz6L+dt6q+UEapTzq5Vlh
+b1IOFTBxDs7pYtuH4HVnTNxipA6GykyL+gM1aRfmMwnpENS+EyFekOy6lgVEatx1
+uaRemuZTPivUjkFhx3M8Rdg3YHb1XAPScIFrhSIqVhSf+nJTBinz86n2KhehREHz
+1zQx96n6yhYFKnifvFVS3YLQEQOTEJCtQXPSdiqNNlYv+kgSsxcw8Ts9kGRGceKF
+hK98Gfo7c/Iq3MEeZJTbt9+kpRqzOancxCSAV7TE7QI/mN8bXBqQaId7ga58rM+/
+H+DOF/SNZmEXN24xh/j4qA1wx7iCfke/KiIkwU2PTkEVreUtmzhc7646kTlHjT+V
+0ZNG6oiuXAs8NYabi5naQJm0oWyWPBQin5cxQMQJBQXYtDI0pt3cqrjCKnvEDdxT
+RzOcDqgDuuSOIGVN+4iCAEAE7YatEj/ZyhCmo11OQVfSzbLD8hT6AcJiRMXqQCFf
+Um+a7H2T10mIcVXGMji4cJHc6oM+vhOD/76I0bLS6bayM40hzUgxvlU2qoLvsu98
+CkNhe6b/GiZ8Lpzjz3qUkkfgSciI8lFCrbI5MDQI5kM0iKC80xhKhggJnvNgKF7X
+INsyBB4umTfwU5N/B8jh
+=RODh
 -----END PGP SIGNATURE-----
diff --git a/net-dns/unbound/unbound-1.4.9.ebuild b/net-dns/unbound/unbound-1.4.11.ebuild
index 9ed6137753c1..3797c3328b80 100644
--- a/net-dns/unbound/unbound-1.4.9.ebuild
+++ b/net-dns/unbound/unbound-1.4.11.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.9.ebuild,v 1.1 2011/04/11 15:01:36 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.11.ebuild,v 1.1 2011/07/03 01:28: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/"
@@ -33,12 +36,12 @@ RDEPEND="${RDEPEND}
 	net-dns/dnssec-root"
 
 pkg_setup() {
-	python_set_active_version 2
 	enewgroup unbound
 	enewuser unbound -1 -1 /etc/unbound unbound
 }
 
 src_configure() {
+	append-ldflags -Wl,-z,noexecstack || die
 	econf \
 		--with-pidfile="${EPREFIX}"/var/run/unbound.pid \
 		--with-ldns="${EPREFIX}"/usr \
@@ -64,7 +67,10 @@ 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
 	fi
 
 	newinitd "${FILESDIR}/unbound.initd" unbound || die "newinitd failed"
diff --git a/net-dns/unbound/unbound-1.4.8.ebuild b/net-dns/unbound/unbound-1.4.8.ebuild
deleted file mode 100644
index 0d6864b7c76e..000000000000
--- a/net-dns/unbound/unbound-1.4.8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.8.ebuild,v 1.3 2011/05/11 19:37:25 angelos Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-inherit eutils python
-
-DESCRIPTION="A validating, recursive and caching DNS resolver"
-HOMEPAGE="http://unbound.net/"
-SRC_URI="http://unbound.net/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="debug gost python static-libs test threads"
-
-RDEPEND="dev-libs/expat
-	dev-libs/libevent
-	>=dev-libs/openssl-0.9.8
-	>=net-libs/ldns-1.6.5[ssl,gost?]"
-
-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() {
-	python_set_active_version 2
-	enewgroup unbound
-	enewuser unbound -1 -1 /etc/unbound unbound
-}
-
-src_configure() {
-	econf \
-		--with-pidfile="${EPREFIX}"/var/run/unbound.pid \
-		--with-ldns="${EPREFIX}"/usr \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
-		$(use_enable debug) \
-		$(use_enable debug lock-checks) \
-		$(use_enable debug alloc-checks) \
-		$(use_enable debug alloc-lite) \
-		$(use_enable debug alloc-nonregional) \
-		$(use_enable gost) \
-		$(use_enable static-libs static) \
-		$(use_with threads pthreads) \
-		$(use_with python pyunbound) \
-		$(use_with python pythonmodule) \
-		--disable-rpath || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# bug #299016
-	if use python ; then
-		find "${ED}$(python_get_sitedir)" "(" -name "*.a" -o -name "*.la" ")" -type f -delete || die
-	fi
-
-	newinitd "${FILESDIR}/unbound.initd" unbound || die "newinitd failed"
-	newconfd "${FILESDIR}/unbound.confd" unbound || die "newconfd failed"
-
-	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES} || die "dodoc failed"
-
-	# bug #315519
-	#exeinto /usr/libexec/munin/plugins
-	#doexe contrib/unbound_munin_ || die "doexe failed"
-	dodoc contrib/unbound_munin_ || die "dodoc failed"
-
-	docinto selinux
-	dodoc contrib/selinux/* || die "dodoc failed"
-
-	exeinto /usr/share/${PN}
-	doexe contrib/update-anchor.sh || die "doexe failed"
-}