Version bumped.

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

5 files changed, 31 insertions, 132 deletions

diff --git a/net-libs/ldns/ChangeLog b/net-libs/ldns/ChangeLog
index 582de3a93be8..8dbe50afc2b8 100644
--- a/net-libs/ldns/ChangeLog
+++ b/net-libs/ldns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/ldns
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.17 2011/05/11 19:36:54 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.18 2011/06/01 23:05:47 matsuu Exp $
+
+*ldns-1.6.10 (01 Jun 2011)
+
+  01 Jun 2011; MATSUU Takuto <matsuu@gentoo.org> -ldns-1.6.6.ebuild,
+  -ldns-1.6.7.ebuild, -ldns-1.6.8.ebuild, +ldns-1.6.10.ebuild:
+  Version bumped. Removed old versions.
 
   11 May 2011; Christoph Mende <angelos@gentoo.org> ldns-1.6.9.ebuild:
   Stable on amd64 wrt bug #362015
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 03aa65244fa9..03b6628bc6f7 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,25 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ldns-1.6.3-r3151-fix-double-free.patch 1264 RMD160 18f47bab53b72cfb9658fca61b3057ce186a3f34 SHA1 0aa15c79b258ca73780aa8e8355cea9dc9101fbe SHA256 35b87013de606bff37f18ce7f9f6bc9c7cb49c0daa1655d2268cd5414330e46b
 AUX ldns-1.6.8-swig.patch 658 RMD160 1416571f7afa6ca7171bb0da8e068d78c8805b20 SHA1 be20a8596cb399e0f69a3637fcae60aa21a98c1c SHA256 870ce09cd4a6c4ec82bc21822a26c4d62fcfa99f8283d225ec15ec0c37d2dfdc
+DIST ldns-1.6.10.tar.gz 999717 RMD160 0401368c96c5b1ae9a781ee4c9441652a5e86af5 SHA1 7798a32c6f50a4fb7d56ddf772163dc1cb79c1a4 SHA256 a421aa71230045e0d22a97db8c4ffbc049ee06b064de141912da270db7217a8f
 DIST ldns-1.6.4.tar.gz 895432 RMD160 1c9d78c01bc8ba6825cdc56b0be81236015e9ebd SHA1 9015968ad3ddd015c750c15b60e60b9cccd393ec SHA256 ad4d0142a84463ea646571656254694b5325545bc12bbb238358a0506e6eeb05
-DIST ldns-1.6.6.tar.gz 955239 RMD160 b66da600370b965712bf35c7d57fb9e745249ebb SHA1 d9615d6d0021ec35fb089635cba6401bc87ac962 SHA256 04e001d281434debf13d065bddb51d2f26a2427bcf658127bd3690640e7bff41
-DIST ldns-1.6.7.tar.gz 962100 RMD160 0c501e7bc21c1a13da8a32eb0454c219f414b919 SHA1 667173af99641997de248d211da0705874d1f030 SHA256 f718b28c9b5243ea6aba8514581d746974161eb5d6781bdbbe46f5ce13294ba8
 DIST ldns-1.6.8.tar.gz 968066 RMD160 480e85795ed48725e41fdb18770235a35030af54 SHA1 e736160f36b7dcc0303269d3c0a9be88b7ad10c4 SHA256 8f0180aa742964f7d14256c48fd4a4d175d192422dd7d00b1dbc2d5281db403e
 DIST ldns-1.6.9.tar.gz 984563 RMD160 525fc08801500681257342e8789f0afc813b2b28 SHA1 30d136792433bef44454dc1c70bf55449160c3ad SHA256 13a0b666ba391920e1e584b773ccb07f5f2227020763b4777689b9bb635b871e
+EBUILD ldns-1.6.10.ebuild 1672 RMD160 adc32995e9b8848580265807d42581586fa9da84 SHA1 b7bcd1071dace103ab0ef9d5f5cf2d7de6bf204e SHA256 d9b3710aca2e11c3573960bae51c2ca7c1f47d25b3b072a9b6b81501c804412d
 EBUILD ldns-1.6.4.ebuild 1273 RMD160 3e1aabc1d815c0362c24ba3ab11b7dec01fec90e SHA1 e6cc54421d884962be66728e9ba09cc81ae43729 SHA256 8c5e383c95ee23744d21d653a8c092c092d0f1c7d6bb8487d6429eafe9e13b81
-EBUILD ldns-1.6.6.ebuild 1413 RMD160 333896e762d33688e133269835f3290951be05c6 SHA1 2353528e00e57ed8396be2433098109b7c83e2f5 SHA256 f1a1b7ba3bd3fa946deaf683962e9f695fbb54f580bd0aafb0d29bb9a46c1fd3
-EBUILD ldns-1.6.7.ebuild 1473 RMD160 4b2ec4cab7facd65f058a6f770940488f8b83095 SHA1 e08d9c676ff123de1b8e5c4fdbad457cc324a64e SHA256 c3050407e0ad90f882d5a8b4d62623dd8a5af96890215e576abbfbf50b1406af
 EBUILD ldns-1.6.8-r1.ebuild 1606 RMD160 e1fe1f91d52c4634e8e18cfa63081c7f278ae816 SHA1 404c161059a032e0f05d80ac960a6547b11b7062 SHA256 f311fc0f6789b9bd12f45db7f300f5552fb9e6d109f08c1b0199be8249887652
-EBUILD ldns-1.6.8.ebuild 1539 RMD160 c23f11cadd81064d67edfec767a28154a8202035 SHA1 bc2a37e3e6835673bcf8afd859bd3e95972a86ab SHA256 b24575538cd2844243879bd30066c177d3ec8f5354b142ca5c0fc29d4d6d387f
 EBUILD ldns-1.6.9.ebuild 1585 RMD160 f91e21160cdc7a8f8ddbe24adea6cd0cdd632b18 SHA1 57057f378263bf814df33934deef6a860108c70a SHA256 6ac1541a6d9a0a37698846d434b8bfa6538e71c819ef9efdea5d7c5a2bf71c07
-MISC ChangeLog 2476 RMD160 116c1fe1b39e5967d476980feda910732f9b223b SHA1 ae7a4039c502ab83a9b7ac943d9b8154a674e6d1 SHA256 0ac36bdafd151007150fd5ed1642253a5f7f66b20d8bcfe101fa7634c5f63aed
+MISC ChangeLog 2676 RMD160 73884f34b5169527cf00d7b02b7e9eeb05d75895 SHA1 c185423b7aee83bde3ff623bcf28fb3c6ba44d4f SHA256 7e78798dfd14b94706eb0eb022456b7207e41f01f13e1c91fccbf0d592828ef1
 MISC metadata.xml 543 RMD160 665e41a6e71b272a1373eab9cdcebc8cedb794e2 SHA1 8bf152132525e1a975710752ea4a0b17842156b0 SHA256 f00e986f3eb952ece2c1b44cca538dcf7b6e043516acbe142733df8ca90eda3e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3K5VsACgkQmWq1bYTyC0NvmwEArrOiBmRtRCFiwBsAuMWe94z3
-SNfz3FNH1uC3hQpDBEsBAIz3+YSYqE13EzMT7028DEkx8C+tc3qONOIEHkFfH/XG
-=PgY6
+iQIcBAEBAgAGBQJN5sXaAAoJECaGw+YFKA1pstEP/RDfqllr5hctvEDJgVdrT0u3
+PLWu+PQUvoHM9a5nLNAJWcACOa4AJkpD/Bm+RLWeTiL1/a/Er30REbY0q3CkblB5
+p9z7OFk1j8/zY6kJs8uoQ8MSr5U0q9QLntO9vsOWoD+CQ71WfECK4sxCbADrE1mg
++vwt2G5VDrbI75dhNgvbiSUzRNyRGXeTDyN5HO6KVCC0OBo+rnKcKDnLLg09sBLl
+Hwup3wUF4F8uqIi80E6UKba0ON86KCTr9dyD3KMu9hMEAuYiW5Ad6Jqg8FjbeLcG
+0GqY4LY8i/gEJRpHDspFfvjQaQHMjEjUb2WNA2vdugM4rPsefBl0B/3CfUyvDXRJ
+lElMwULDpw37GeusBsjDaCSYBJMq4cvj9kbkiwA2OsF9T1DXgqd1g6DufphIXBGF
+DYDvREJWnouM4i74xT8YI7WSGB5VoRpuERmhBoOxkUTL/j09ku3dMbqfbjJTbMym
+MBf0OF0Y7gleflbicNA+j3P02+lOH0cmT6IwYLkQwnbXJRlcREjl9pBCGwFyk0gX
+i0+hVkxiC90ZU97cKjyyGdnk2Vh1GqGznYgC370jo4NE+do5Rj1Ih4Hh6SVuJJf2
+kA2Ab+v88nwAzZOFliiqpYUps5wY53y5EZBlQLe4Puus+2YdK9IijBI/Wfe1sqoO
+2iNG9+EsSs4y2o6kuQkP
+=m3TQ
 -----END PGP SIGNATURE-----
diff --git a/net-libs/ldns/ldns-1.6.8.ebuild b/net-libs/ldns/ldns-1.6.10.ebuild
index ffda4bb5cc02..ed3fc2a7d3a7 100644
--- a/net-libs/ldns/ldns-1.6.8.ebuild
+++ b/net-libs/ldns/ldns-1.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.8.ebuild,v 1.1 2011/01/25 13:36:37 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.10.ebuild,v 1.1 2011/06/01 23:05:47 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.4"
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
 IUSE="doc gost python ssl static-libs vim-syntax"
 
+RESTRICT="test" # 1.6.9 has no test directory
+
 RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7 )
 	gost? ( >=dev-libs/openssl-1 )"
 DEPEND="${RDEPEND}
@@ -51,6 +53,10 @@ src_install() {
 		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
+
 	if use doc ; then
 		dohtml doc/html/* || die "dohtml failed"
 	fi
diff --git a/net-libs/ldns/ldns-1.6.6.ebuild b/net-libs/ldns/ldns-1.6.6.ebuild
deleted file mode 100644
index c2f0a0a86fb6..000000000000
--- a/net-libs/ldns/ldns-1.6.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.6.ebuild,v 1.1 2010/08/11 00:15:33 matsuu Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.4"
-
-inherit multilib python
-
-DESCRIPTION="ldns is a library with the aim to simplify DNS programing in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
-IUSE="doc python ssl vim-syntax"
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7 )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_configure() {
-	econf \
-		$(use_enable ssl sha2) \
-		$(use_with ssl) \
-		$(use_with python pyldns) \
-		--disable-rpath || die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc ; then
-		emake doxygen || die "emake doxygen failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc Changelog README* || die "dodoc failed"
-
-	if use python ; then
-		rm "${ED}/usr/$(get_libdir)"/python*/site-packages/_ldns.*a || die
-	fi
-
-	if use doc ; then
-		dohtml doc/html/* || die "dohtml failed"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins libdns.vim || die "doins libdns.vim failed"
-	fi
-}
diff --git a/net-libs/ldns/ldns-1.6.7.ebuild b/net-libs/ldns/ldns-1.6.7.ebuild
deleted file mode 100644
index fb9a2abe15be..000000000000
--- a/net-libs/ldns/ldns-1.6.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.7.ebuild,v 1.1 2010/11/09 00:00:42 matsuu Exp $
-
-EAPI="3"
-PYTHON_DEPEND="python? 2:2.4"
-
-inherit multilib python
-
-DESCRIPTION="ldns is a library with the aim to simplify DNS programing in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
-IUSE="doc gost python ssl vim-syntax"
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7 )
-	gost? ( >=dev-libs/openssl-1 )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_configure() {
-	econf \
-		$(use_enable gost) \
-		$(use_enable ssl sha2) \
-		$(use_with ssl) \
-		$(use_with python pyldns) \
-		--disable-rpath || die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc ; then
-		emake doxygen || die "emake doxygen failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc Changelog README* || die "dodoc failed"
-
-	if use python ; then
-		rm "${ED}/usr/$(get_libdir)"/python*/site-packages/_ldns.*a || die
-	fi
-
-	if use doc ; then
-		dohtml doc/html/* || die "dohtml failed"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins libdns.vim || die "doins libdns.vim failed"
-	fi
-}