Version bumped. Added gost USE flag.

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

5 files changed, 31 insertions, 101 deletions

diff --git a/net-dns/unbound/ChangeLog b/net-dns/unbound/ChangeLog
index f3253c8a3929..b266b269b53f 100644
--- a/net-dns/unbound/ChangeLog
+++ b/net-dns/unbound/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/unbound
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.16 2010/08/05 17:38:42 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/ChangeLog,v 1.17 2010/11/09 00:03:12 matsuu Exp $
+
+*unbound-1.4.7 (09 Nov 2010)
+
+  09 Nov 2010; MATSUU Takuto <matsuu@gentoo.org> -unbound-1.4.4.ebuild,
+  -unbound-1.4.5.ebuild, +unbound-1.4.7.ebuild, metadata.xml:
+  Version bumped. Added gost USE flag. Removed old versions.
 
 *unbound-1.4.6 (05 Aug 2010)
 
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 8585925e607d..61b3de1bb299 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -4,29 +4,27 @@ 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.4.tar.gz 4300711 RMD160 581ae8953d5624e0c2b59af94740c4d024882abe SHA1 2cb4c34ece87e43c9acc8da85d2ea1c8ea1ffe66 SHA256 0ed08d9a60670730f906a571cbd0ed8b5b78deca9417161b5df8296d77ad7f5f
-DIST unbound-1.4.5.tar.gz 4317925 RMD160 908d80acf0dfe4592922988e5ca73bdbab8d26a9 SHA1 c1f227b95448cdfd0006d6d00b3d4354500d7564 SHA256 905685836715ac715098909ae5268504322f0f226c957d18ed32895c76d8224c
 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
 EBUILD unbound-1.4.3.ebuild 1896 RMD160 c50443df8e51e1d703eda9dc3526c570bf581cbc SHA1 3b84ec75229338165125357b6c02d4d0591cfc5c SHA256 af50a41812d47bb08c28db51a747ab5bf11602b88fd4d904b8204c17ee69ac9a
-EBUILD unbound-1.4.4.ebuild 2002 RMD160 9ca5739956c235e986da815ba7bfe01a6bf36174 SHA1 6b523785288ce3b0f6a51c13ea668332df7ad7d4 SHA256 87906cf4ad1be92d08cd7c440280f2e0c3384483e0fb8a6cdb89560a72fcbae0
-EBUILD unbound-1.4.5.ebuild 2002 RMD160 f96c3f08aa87072f2c4955e0a399beb11675700d SHA1 22ba8d7e3478e65edfe686bf6e81b1a0e0a32c0f SHA256 2dd93ef4af830d6aa25e907e91b6021264a58d016bed2da6782bc621000c000a
 EBUILD unbound-1.4.6.ebuild 2002 RMD160 69281caced28177c412da7936cbce45ac37749d6 SHA1 fbfbf709e433661af90c431b0dff49e69b25ba52 SHA256 eccd4cba1d0f2403bce5ef989b81f8ac613e0f503b8a31161939b259bb00fba6
-MISC ChangeLog 2377 RMD160 e492fc1c6a7140715c00acb87b9774b5d80110b6 SHA1 ec828c7002dae33aa93ea822e0424d4cc94e2b06 SHA256 ef16224fb695db9aa4820408ef9dba60bb81fc3853788c22b008c2ebc5411ef8
-MISC metadata.xml 846 RMD160 557f4b18f0aa1acde378e261c0db224a28397cc2 SHA1 96a808a38c7f7459e46843273d72f8dbeddcb598 SHA256 1ee0b4a76549863703f1bdf9aaf124eb9dc91b20a4ade0f35f94d70d80d71b8f
+EBUILD unbound-1.4.7.ebuild 1949 RMD160 18be4809425749ad1cf0f3ebb69818af4cfa280f SHA1 6b123ea52c24e12b3714b2d9f14282780bc04f12 SHA256 dba33c7dc68068f0316c6b1771a0a01c890cfe4fd745c7c3ffe6348bb01b60a1
+MISC ChangeLog 2603 RMD160 41728275f32c170b68f62f2d60ee9c937df9f0b6 SHA1 68914f1d32956835c89f55eceeea21bb53049f26 SHA256 ed993030b5585e236a2e3ac14f850bb44b390f532b4f3f6d0f664fcf8b5b3eb2
+MISC metadata.xml 893 RMD160 3b850422df7eca3734b8cd09e4b571ec9391ea67 SHA1 8b552e0924702753b52eaebdd566e17f1965c6fc SHA256 28984589a798776b8c2e375ded0b7d1331518f88e679c8b55b68427ffb092aea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMWvezAAoJECaGw+YFKA1prAIQAKlmA1CUIrQLf9O/RpIVwlXV
-FuViaI+ihq/PvfmKVmLP0YcOfI7urQK5IWNm8nt9kxYWI/tCuU+u70TQ8Nm5/ArT
-ZtshNw1YEZ5U27oDI9D1RQI6sv2ZCnANwJcrTcyEUcsgN8aqApeo0v8qMrF9v8qK
-nRMEgPOCgv1xvDJ6vgmh97vKzeXHasO28eel6mlbOi7ZUaci0TIn48SNDeU+N8Mt
-oHzT7n1BPhnvwcNzMLO0eUPql7843i1vsh2hsltKE9+MIpf5rnDGDHa0RdvQJaQ3
-u1PiEIYNKTyWSW1FJoSLoDyS052RlwAU8bgaEpEGIN8yNvUsCsyhLbq9grG2r6t9
-O4F84wB48MYAGmi9yu+CVoz5cYfHCzt/0aAjG/I/wF5w8g0YZqFlP3LSQMobr3li
-TT6eBMxQy9t0naKXQ843GqgsWHjA2vv3S5Wy2baiDxeo0asnyKfht5bbnkBXRAbe
-mlcBaXlIW4wRUFTv/pWDPMzLcQdOtSx/ha+IFzrd/1jasPBR2zhbEKVSimTxfOEO
-iO8BB40+AZN8p8CKkTtFnllI0WfLZ56tGo52qBgF3wZj5Y18uBrW6a7phiBj2nv3
-wDjuC7UfhqJvfAimqpiiHJj16ZtsIQytc6NB9d4gGe0cV9d6R47kPiwU73HPUKm4
-gL/Pwl9UskqNBt/4fAtO
-=dkXa
+iQIcBAEBAgAGBQJM2I/OAAoJECaGw+YFKA1p4A8P/i9ugyJ3xJzjrPoqd3JSixHr
+2FdbOST6nZX0Wc+wRiF3kDPYStz9SsU21V0qJ2mRssCddAUf7X07eR7atxXbWUgL
+LrPT+EKkNh7XU8BBH7BC/lATAPGYVrRvR4eCW13rn6IdnGtUR8Tl813XSv8R7VEU
+g02Pc6XoeW0SgD+Ju5sk3Koc+1Uk6q63A0wsm9cKlc7+ZCiOMe3Pbh7wIUESVqVN
+MQVRAiAtcs696lcRNtHkCBHiFlS4/4kZ1h6l5mK2hS9EZKXiIsOhAFhIuYJi2XdY
+3evXBXZbbC99vrzaMzrjs5Rp8JAaGbrYhnDj1SMB3y8gDzzcBDn+vJaubZwY+l/z
+qw4yrMEO2VcdRpQsj20vdhpSNmLb5Y0Phx9zjqKkp2IepPuY271ufRonABu4Y9Tt
+tHZ+fTrJKila/2L9y3jH86PAcm2gaHURXUFSHv7tGTE1lo8bSFZiLV2Xs7cGwtEV
+TVPshcMVBEh+gobNOaiY55Qex1wNQb2BQR0G9qDq8BEoCkn7FbY52AGQ/gZHk0pl
+M1BJkHWPPX8KSlSSP+fco77WXXqx/QYXeORXPm6BgJMSi415RGUSM7w1pR8eJkua
+jkndKJdoG1RHmmnzEuO+LCP26BkxcVUKJNobmNVej3DRPCkbWpD9UK8eMz5oMaB8
+ill4Lw6rl6kAjldC9K0L
+=MEBO
 -----END PGP SIGNATURE-----
diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml
index 5af5dbc4dc5a..13adca7786cc 100644
--- a/net-dns/unbound/metadata.xml
+++ b/net-dns/unbound/metadata.xml
@@ -19,5 +19,6 @@ as a server, but are linked into an application) are easily possible.
 <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.4.ebuild b/net-dns/unbound/unbound-1.4.4.ebuild
deleted file mode 100644
index 4feed77b22fc..000000000000
--- a/net-dns/unbound/unbound-1.4.4.ebuild
+++ /dev/null
@@ -1,74 +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.4.ebuild,v 1.2 2010/04/23 08:51:39 grobian Exp $
-
-EAPI="3"
-
-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 ~x64-macos"
-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="${EPREFIX}"/var/run/unbound.pid \
-		--with-ldns="${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 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 "${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.5.ebuild b/net-dns/unbound/unbound-1.4.7.ebuild
index cb8c04f459e4..c3e53abc12e8 100644
--- a/net-dns/unbound/unbound-1.4.5.ebuild
+++ b/net-dns/unbound/unbound-1.4.7.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.1 2010/06/17 23:53:35 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/unbound/unbound-1.4.7.ebuild,v 1.1 2010/11/09 00:03:12 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -13,13 +13,12 @@ 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"
+IUSE="debug gost python static test threads"
 
-RDEPEND="dev-libs/libevent
+RDEPEND="dev-libs/expat
+	dev-libs/libevent
 	>=dev-libs/openssl-0.9.8
-	>=net-libs/ldns-1.4[ssl]"
-#	gost? ( >=dev-libs/openssl-1 )
+	>=net-libs/ldns-1.4[ssl,gost?]"
 
 DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
@@ -45,11 +44,11 @@ src_configure() {
 		$(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
-#		$(use_enable gost) \
 }
 
 src_install() {