Version bumped, bug #397431. Fixed LICENSE.

(Portage version: 2.1.10.41/cvs/Linux x86_64)

4 files changed, 16 insertions, 85 deletions

diff --git a/net-dns/maradns/ChangeLog b/net-dns/maradns/ChangeLog
index b55df07ab3a1..a5dd44648e0e 100644
--- a/net-dns/maradns/ChangeLog
+++ b/net-dns/maradns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/maradns
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.41 2011/02/12 17:54:41 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.42 2012/01/05 13:29:59 matsuu Exp $
+
+*maradns-1.4.09 (05 Jan 2012)
+
+  05 Jan 2012; MATSUU Takuto <matsuu@gentoo.org> -maradns-1.4.03.ebuild,
+  -maradns-1.4.05.ebuild, maradns-1.4.06.ebuild, +maradns-1.4.09.ebuild:
+  Version bumped, bug #397431. Fixed LICENSE. Removed old versions.
 
   12 Feb 2011; Raúl Porcel <armin76@gentoo.org> maradns-1.4.06.ebuild:
   sparc stable wrt #352569
diff --git a/net-dns/maradns/maradns-1.4.03.ebuild b/net-dns/maradns/maradns-1.4.03.ebuild
deleted file mode 100644
index a8b1c9f3535b..000000000000
--- a/net-dns/maradns/maradns-1.4.03.ebuild
+++ /dev/null
@@ -1,76 +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/maradns/maradns-1.4.03.ebuild,v 1.5 2010/08/11 22:37:14 josejx Exp $
-
-EAPI="2"
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-HOMEPAGE="http://www.maradns.org/"
-SRC_URI="http://www.maradns.org/download/1.4/${PV}/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="authonly"
-
-DEPEND="dev-lang/perl"
-
-src_prepare() {
-	sed -i \
-		-e "s:PREFIX/man:PREFIX/share/man:" \
-		-e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \
-		build/install.locations || die
-	sed -i \
-		-e "s:-O2:\$(CFLAGS) \$(LDFLAGS):" \
-		-e "s:\$(CC):$(tc-getCC):g" \
-		-e "s:make:\$(MAKE):g" \
-		build/Makefile.linux || die
-	if use authonly ; then
-		sed -e "/provide dns/d" \
-			"${FILESDIR}/maradns.rc6" > "${T}/maradns.rc6" || die
-	else
-		cp "${FILESDIR}/maradns.rc6" "${T}/maradns.rc6" || die
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use authonly ; then
-		myconf="${myconf} --authonly"
-	fi
-	./configure ${myconf} # || die
-}
-
-src_install() {
-	if use authonly ; then
-		newsbin server/maradns.authonly maradns || die
-	else
-		dosbin server/maradns || die
-	fi
-
-	dosbin tcp/zoneserver || die
-
-	dobin tcp/getzone tcp/fetchzone tools/askmara tools/duende || die
-
-	doman doc/en/man/*.[1-9] || die
-
-	dodoc maradns.gpg.key || die
-	dodoc doc/en/{QuickStart,README,*.txt} || die
-	dohtml doc/en/*.html || die
-	dohtml -r doc/en/webpage || die
-	docinto examples; dodoc doc/en/examples/example_* || die
-
-	insinto /etc; newins doc/en/examples/example_mararc mararc || die
-	insinto /etc/maradns; newins doc/en/examples/example_csv2 db.example.net || die
-	keepdir /etc/maradns/logger || die
-
-	newinitd "${T}"/maradns.rc6 maradns || die
-	newinitd "${FILESDIR}"/zoneserver.rc6 zoneserver || die
-}
-
-pkg_postinst() {
-	enewgroup maradns 99
-	enewuser duende 66 -1 -1 maradns
-	enewuser maradns 99 -1 -1 maradns
-}
diff --git a/net-dns/maradns/maradns-1.4.06.ebuild b/net-dns/maradns/maradns-1.4.06.ebuild
index a74a2c6ce66a..1c5df7e9a649 100644
--- a/net-dns/maradns/maradns-1.4.06.ebuild
+++ b/net-dns/maradns/maradns-1.4.06.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.4.06.ebuild,v 1.5 2011/02/12 17:54:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.4.06.ebuild,v 1.6 2012/01/05 13:29:59 matsuu Exp $
 
 EAPI="2"
 inherit eutils toolchain-funcs
@@ -9,7 +9,7 @@ DESCRIPTION="Proxy DNS server with permanent caching"
 HOMEPAGE="http://www.maradns.org/"
 SRC_URI="http://www.maradns.org/download/1.4/${PV}/${P}.tar.bz2"
 
-LICENSE="as-is"
+LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="authonly"
diff --git a/net-dns/maradns/maradns-1.4.05.ebuild b/net-dns/maradns/maradns-1.4.09.ebuild
index a0cdf3034fc4..0f639399324d 100644
--- a/net-dns/maradns/maradns-1.4.05.ebuild
+++ b/net-dns/maradns/maradns-1.4.09.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.4.05.ebuild,v 1.1 2011/01/24 13:22:58 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.4.09.ebuild,v 1.1 2012/01/05 13:29:59 matsuu Exp $
 
 EAPI="2"
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Proxy DNS server with permanent caching"
 HOMEPAGE="http://www.maradns.org/"
-SRC_URI="http://www.maradns.org/download/1.4/${PV}/${P}.tar.bz2"
+SRC_URI="http://www.maradns.org/download/${PV%.*}/${P}.tar.bz2"
 
-LICENSE="as-is"
+LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="authonly"
 
 DEPEND="dev-lang/perl"
+RDEPEND=""
 
 src_prepare() {
 	sed -i \