Version bumped.

(Portage version: 2.1.9.50/cvs/Linux x86_64)

4 files changed, 14 insertions, 122 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/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
-}