Version bumped. Removed *.la files.

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

7 files changed, 50 insertions, 242 deletions

diff --git a/net-dns/unbound/ChangeLog b/net-dns/unbound/ChangeLog
index 0dc443663d72..e3d66d434d4b 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.23 2011/05/11 19:37:25 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.24 2011/05/25 15:41:15 matsuu Exp $
+
+*unbound-1.4.10 (25 May 2011)
+
+  25 May 2011; MATSUU Takuto <matsuu@gentoo.org> -unbound-1.4.3.ebuild,
+  -unbound-1.4.6.ebuild, -unbound-1.4.7.ebuild, -unbound-1.4.7-r1.ebuild,
+  +unbound-1.4.10.ebuild:
+  Version bumped. Removed *.la files. Removed old versions.
 
   11 May 2011; Christoph Mende <angelos@gentoo.org> unbound-1.4.8.ebuild:
   Stable on amd64 wrt bug #362015
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 374d0adc840b..1758d6cca1e2 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -1,25 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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.3.tar.gz 4283735 RMD160 6fd7403c13afa683d2dad2e9cfd66ef32a12e4ee SHA1 4b4b979683993452359eccf4f60cf9404600da9d SHA256 7c212228234547af776d51067a04a8c32f572e5db493e16a269370da4413070f
-DIST unbound-1.4.6.tar.gz 4384085 RMD160 d5d8cd19096aa8c0624ecfb8f57ce0276ab5c1d4 SHA1 b0d7c58f173c5c80cc81345f6766555f96bde20d SHA256 9c2ce107b551dbd65d007549caea13ecba7dd30d690821f2bafa9da2d047b9de
-DIST unbound-1.4.7.tar.gz 4455592 RMD160 84eea9dc45521bd346abbad346c1c3b2441fa56f SHA1 6e9d663b414bcbbc7db75d0fc3b9174e45ec0951 SHA256 fe17ef4639f965cbf0864d0e49ec00d567d7c4ab9f199f2a6f00842b6e48016c
+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
-EBUILD unbound-1.4.3.ebuild 1896 RMD160 c50443df8e51e1d703eda9dc3526c570bf581cbc SHA1 3b84ec75229338165125357b6c02d4d0591cfc5c SHA256 af50a41812d47bb08c28db51a747ab5bf11602b88fd4d904b8204c17ee69ac9a
-EBUILD unbound-1.4.6.ebuild 2004 RMD160 170db492ccf780f839e4d032b0a1289195f7d513 SHA1 88063589659b6ab966568e70ee3aa2f65deaf28d SHA256 60eadc3f44c594b31ae986a6e5aab1985be085762dd866ad31cb2c661dac1249
-EBUILD unbound-1.4.7-r1.ebuild 2076 RMD160 f08945c4a7430f8402696dc41cd9feef20381dee SHA1 a6dd68b39a338b2bec631598c828107271e42834 SHA256 259a39346567dd8d9345bf76fea78a467f34036e3621245b92ac181f60f14b8f
-EBUILD unbound-1.4.7.ebuild 1951 RMD160 4c6e85bedce53793fedc4aa76533273961c1daeb SHA1 af65d6e921d2bf2ce352f54abc45dce2ca088702 SHA256 1f3230bb4fab68e355a64b64047dcbd0a39788d34eb2f072a05c4490d3fe3509
+EBUILD unbound-1.4.10.ebuild 2417 RMD160 a7f1207ff80d56b46b752c9c563ca851bdf0601b SHA1 5debf088204d799ef6a7c75509fec7935229f15b SHA256 fb5c2033003dd2cb9eeca1a6e7af21b2e3ccc3fb513f4c7e098414daa25d618a
 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 3421 RMD160 7dc10c9bad7277459039c0dd459318a7f01f5a81 SHA1 21eff5323ea4860b3c137ff9c43c65a912400ffb SHA256 358682df5904ee639b7c6a839424ee443d35adc8cda09d4a8a378146e02a500f
-MISC metadata.xml 1135 RMD160 7ea390c95a36d5ea6d633c4fcfcb1e2564b636f2 SHA1 7c2fa5ac4b1e8190e7be10868c3e5ec9c1a0f10e SHA256 6c6282992cbfe044d031852ba7da02042e1fbffcdc6f4f7a4306631adbda5271
+MISC ChangeLog 3684 RMD160 d812ead9a52801cd3b19d20e072f09278bf9cf75 SHA1 0711e753e34e0d8264960f4340762a8d46c9893f SHA256 9775748b215c14afea836d0ecd1405408dd820365a72ecaf221a264e7b4ad739
+MISC metadata.xml 1031 RMD160 0bd78b9a39982efbd2fcb3f95a97ab7765b98154 SHA1 94fd9c91b82a6a747c51d8d4bef073be7f3a58ee SHA256 d13d3e25ea0b34e78b692a6c7045903841d4ed7b0551589febe4fe36a9f25a7d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3K5XwACgkQmWq1bYTyC0NO1wD8DLgA3p+7Th6siOkrq4qioqfi
-+H06ZvHUDbvacSYEyEoBAKJVrDXVtfV1yRfhfqVfcM+yOi72b9qedP3B045X6Lbl
-=KgDM
+iQIcBAEBAgAGBQJN3SMlAAoJECaGw+YFKA1pztAQAJFNRZjJC1P2Bw9rBSDGtsHW
+ZC9AjuSztaYPt3eWnQyFqEvtlC7Yc3K3jAgGgVf4pfZzrOp0QEBy95FpJdLh8N0J
+I56NPWHbekAMSG+4RFOXhjAg5/Ayrc/qo1ThErYow/FoBsTO6JoSVADglqUKlaQQ
+zE34vJJHn3YTblNgTqrWj+3Ap3M3oIrGlf5cG0zFoHsLae9S4lVKwT/i7o//SN6S
+Q9QrSvFljsKl96qR+MwqRhty1bN7R+HtH9PDWMERDww3HNwKMsY9JNo5kcriSU5+
+0QhtZu0ecpkq8W5MQuiMAgGv+vJ9wSB2VDFUJ5w6p+jV0JaZGJvE4DmRLF//nFJn
+2sYZEDHn4vgS+Oddo0h1OxlPOVdhrZAkmQd7a4TFGztUy3qo54CvbdThmXwF/Mmi
+tI6OaBo3+pGq23K4tloutbg9iR2ceWH3J0QQkH5SmPO2P2MgunCSbFJ2j5h55Emt
+oCO5gagCZgjvnI1ZQxGov4U458X2j2Q5gS+UO7S5w5lEH1yZkDGatECG4bJ/76XN
+iO/Yr5QMFSvj4UzW8eFZqGMi5WJ+qx9hNZGJCmttvqA63PrD5VhMm6/Ha8Jr8fMN
+1aPjV0Z1bg4ADq2+OEEiZMIGOHnhcYgSYEuTfkdot+iRk2JhvCAKYw7DqvHBWU59
+CheTe0BJiSos+32ZFqDp
+=SNOB
 -----END PGP SIGNATURE-----
diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml
index 3df92ef0dcfe..fcea16afe957 100644
--- a/net-dns/unbound/metadata.xml
+++ b/net-dns/unbound/metadata.xml
@@ -24,7 +24,6 @@ DNSSEC (secure DNS) validation and stub-resolvers (that do not run
 as a server, but are linked into an application) are easily possible.
 </longdescription>
 <use>
-  <flag name='libevent'>Use <pkg>dev-libs/libevent</pkg> instead of internal select based events</flag>
   <flag name='gost'>Enable GOST support</flag>
 </use>
 </pkgmetadata>
diff --git a/net-dns/unbound/unbound-1.4.7-r1.ebuild b/net-dns/unbound/unbound-1.4.10.ebuild
index ffbd1f255713..63d374321b37 100644
--- a/net-dns/unbound/unbound-1.4.7-r1.ebuild
+++ b/net-dns/unbound/unbound-1.4.10.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.7-r1.ebuild,v 1.1 2010/12/07 15:08:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.10.ebuild,v 1.1 2011/05/25 15:41:15 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
-inherit eutils multilib python
+inherit eutils python
 
 DESCRIPTION="A validating, recursive and caching DNS resolver"
 HOMEPAGE="http://unbound.net/"
@@ -13,7 +13,7 @@ SRC_URI="http://unbound.net/downloads/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="debug gost python static test threads"
+IUSE="debug gost python static-libs test threads"
 
 RDEPEND="dev-libs/expat
 	dev-libs/libevent
@@ -45,15 +45,18 @@ src_configure() {
 		--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 static-exe) \
+		$(use_enable static-libs static) \
 		$(use_with threads pthreads) \
 		$(use_with python pyunbound) \
-		$(use_with python pythonmodule) || die
+		$(use_with python pythonmodule) \
+		--disable-rpath || die
+
+		# 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) \
 }
 
 src_install() {
@@ -61,16 +64,25 @@ src_install() {
 
 	# bug #299016
 	if use python ; then
-		rm "${ED}/usr/$(get_libdir)"/python*/site-packages/_unbound.*a || die
+		find "${ED}$(python_get_sitedir)" "(" -name "*.a" -o -name "*.la" ")" -type f -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"
 	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,update-itar,split-itar}.sh || die "doexe failed"
+	doexe contrib/update-anchor.sh || die "doexe failed"
 }
diff --git a/net-dns/unbound/unbound-1.4.3.ebuild b/net-dns/unbound/unbound-1.4.3.ebuild
deleted file mode 100644
index a8c754353a6e..000000000000
--- a/net-dns/unbound/unbound-1.4.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.3.ebuild,v 1.4 2010/03/29 21:54:46 maekke Exp $
-
-EAPI="2"
-
-inherit autotools eutils multilib
-
-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"
-IUSE="debug libevent python static test threads"
-
-RDEPEND=">=dev-libs/openssl-0.9.8
-	>=net-libs/ldns-1.4[ssl]
-	libevent? ( dev-libs/libevent )"
-#	gost? ( >=dev-libs/openssl-1 )
-
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)"
-
-pkg_setup() {
-	enewgroup unbound
-	enewuser unbound -1 -1 /etc/unbound unbound
-}
-
-src_prepare() {
-	sed -i -e "s:\(withval\|thedir\)/lib:\1/$(get_libdir):" configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-pidfile=/var/run/unbound.pid \
-		--with-ldns=/usr \
-		$(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 static static-exe) \
-		$(use_with libevent) \
-		$(use_with threads pthreads) \
-		$(use_with python pyunbound) \
-		$(use_with python pythonmodule) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# bug #299016
-	if use python ; then
-		rm "${D}/usr/$(get_libdir)"/python*/site-packages/_unbound.*a || 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"
-
-	exeinto /usr/share/${PN}
-	doexe contrib/{update-anchor,update-itar,split-itar}.sh || die "doexe failed"
-}
diff --git a/net-dns/unbound/unbound-1.4.6.ebuild b/net-dns/unbound/unbound-1.4.6.ebuild
deleted file mode 100644
index 58c4fa2c2594..000000000000
--- a/net-dns/unbound/unbound-1.4.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.6.ebuild,v 1.2 2010/11/15 16:13:16 matsuu Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-inherit eutils multilib 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 test threads"
-IUSE="debug python static test threads"
-
-RDEPEND="dev-libs/libevent
-	>=dev-libs/openssl-0.9.8
-	>=net-libs/ldns-1.6.5[ssl]"
-#	gost? ( >=dev-libs/openssl-1 )
-
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	test? (
-		net-dns/ldns-utils[examples]
-		dev-util/splint
-		app-text/wdiff
-	)"
-
-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 \
-		$(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 static static-exe) \
-		$(use_with threads pthreads) \
-		$(use_with python pyunbound) \
-		$(use_with python pythonmodule) || die
-#		$(use_enable gost) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# bug #299016
-	if use python ; then
-		rm "${ED}/usr/$(get_libdir)"/python*/site-packages/_unbound.*a || 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
-	dodoc contrib/unbound_munin_ || die "dodoc failed"
-
-	exeinto /usr/share/${PN}
-	doexe contrib/{update-anchor,update-itar,split-itar}.sh || die "doexe failed"
-}
diff --git a/net-dns/unbound/unbound-1.4.7.ebuild b/net-dns/unbound/unbound-1.4.7.ebuild
deleted file mode 100644
index b549ce80a08c..000000000000
--- a/net-dns/unbound/unbound-1.4.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.7.ebuild,v 1.2 2010/11/15 16:13:16 matsuu Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2"
-inherit eutils multilib 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 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
-	)"
-
-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 \
-		$(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 static-exe) \
-		$(use_with threads pthreads) \
-		$(use_with python pyunbound) \
-		$(use_with python pythonmodule) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# bug #299016
-	if use python ; then
-		rm "${ED}/usr/$(get_libdir)"/python*/site-packages/_unbound.*a || 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
-	dodoc contrib/unbound_munin_ || die "dodoc failed"
-
-	exeinto /usr/share/${PN}
-	doexe contrib/{update-anchor,update-itar,split-itar}.sh || die "doexe failed"
-}