Cleanup.

Package-Manager: portage-2.1.5_rc7

4 files changed, 10 insertions, 214 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 0187d44be191..2bf45325d292 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/pdns
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.48 2008/05/02 10:24:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.49 2008/05/07 18:46:10 swegener Exp $
+
+  07 May 2008; Sven Wegener <swegener@gentoo.org> -pdns-2.9.20-r1.ebuild,
+  -pdns-2.9.20-r2.ebuild:
+  Cleanup.
 
   02 May 2008; Markus Meier <maekke@gentoo.org> pdns-2.9.21.ebuild:
   amd64/x86 stable, bug #219748
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 96cc07bfabf1..3f42cccb3c05 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -5,17 +5,14 @@ AUX 2.9.18-default-mysql-options.patch 606 RMD160 bfc5e2aeee2bc3e01a62a430b087e7
 AUX 2.9.20-ldap-deprecated.patch 457 RMD160 edcb367abfc83853e4739cc6646ca593ae7d5e9e SHA1 858cfe5e7169329f13dfb547c5ae8ff436eff64f SHA256 862728373669f7ea5544de7021c394cc0efa3ff5c65551d6657dad85cb654097
 AUX 2.9.21-gcc-4.3.patch 4762 RMD160 08fe799699d103b6aa422e00993fcd80789d0317 SHA1 4baa3ce459b88a7dbbb422291f04cfb0aabc58ca SHA256 a3f8f35f9403216de7e596eb3f6248ed148cee85bef44d6f40020b9f52a79e57
 AUX pdns 1253 RMD160 f576dd3edda7b22155ebc2cb8c060459ba871471 SHA1 174beeed51f22fbe35f883b22465a94f6c569d85 SHA256 d4b1e4ae4330c8572ed8a9b16d3a1524d62f1380f22f33ba581aaf9599e44113
-DIST pdns-2.9.20.tar.gz 867520 RMD160 15d433bc29e7d60549d9296fca573724574614fc SHA1 45fde296f17d2feaac779c206cf467d1dae2aaa1 SHA256 28984207c78bc5d40542d40366d74f6695a9cf3a7ec4f431d908966d4fc35e3d
 DIST pdns-2.9.21.tar.gz 991071 RMD160 ed53de20a4e660ab2537b3c888b0a85225764a51 SHA1 2b86e4b44ef43db308c62e32b10ed0d5221a45c9 SHA256 4b24db683ba2217caa1edf54545841dcdfa6fd27b66017577d8b0dd54f8e7ed5
-EBUILD pdns-2.9.20-r1.ebuild 2839 RMD160 2c6af0a40e7c2321a74ce09b41090bfb5fea1843 SHA1 3470b930e6485c67ec13f8c69700d544d19ade13 SHA256 2fd42bf5a7bf810b1757920dff04e22083c927666731583b8bca24fb880cbc3f
-EBUILD pdns-2.9.20-r2.ebuild 2616 RMD160 49732c749f3ba355f83d321a4af07ef501c506e8 SHA1 7a1336f4e382bec3e89ec911b0f78008b73a9fbc SHA256 ca643a016e785064b53add364e21c95c1d31d9b433d969564e36e2c2fd57a49f
 EBUILD pdns-2.9.21.ebuild 2930 RMD160 37eacdc91f7eba1be449159bb2af1b68aed4f5c6 SHA1 d16d7f2e1c2ac6b2a2a0c21071b80da2754627b0 SHA256 7f723813b4b633849eb8529a45df79684f11ce4754de94e096a7723783fa762a
-MISC ChangeLog 7643 RMD160 defba8013444b53c95a0111f4033737096ac3577 SHA1 93d72d5c9f56cb477073efece600ce0d5d09adc9 SHA256 52bd48f85c87fc179d5407a14eb08406b9a1f8c0e5c6976e7a0d4e51320ece47
+MISC ChangeLog 7757 RMD160 ffa82bed57f3afe74a159ad107590bbbb50f1bf7 SHA1 12f9fe699b014982704b4320abdc25f8b6a759d5 SHA256 ca39a6b62e92bd64dc63446c060569c05bf3955fb4efc4c86385ae168ea35fad
 MISC metadata.xml 573 RMD160 74995a273e6513bb6689ec0ad74bf5b0b0fdf5c1 SHA1 01c4329b63991b54af3559d2220251520cb7147a SHA256 26a6150230ca87a16d882d1cdac565a040e75e7bf02ee9348688569924e1bfc3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkga7B0ACgkQkKaRLQcq0GI33wCfVhg/rFiy5Rp/C4SdHf74YPKx
-xrMAnjkBNAsa3G8SzidCR9HALYqGF4KH
-=2R6U
+iD8DBQFIIfj4I1lqEGTUzyQRAgmHAJ469UjErd8PkJTsC/jjRRRh+JQq1wCfd+0K
+SRtys9/jtClIENAvNXzNAXc=
+=Dk2M
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/pdns-2.9.20-r1.ebuild b/net-dns/pdns/pdns-2.9.20-r1.ebuild
deleted file mode 100644
index 9ef22657879d..000000000000
--- a/net-dns/pdns/pdns-2.9.20-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.20-r1.ebuild,v 1.6 2007/05/06 09:16:12 genone Exp $
-
-inherit multilib eutils autotools
-
-DESCRIPTION="The PowerDNS Daemon"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.gz"
-HOMEPAGE="http://www.powerdns.com/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc ldap mysql postgres sqlite static tdb"
-
-DEPEND="mysql? ( virtual/mysql )
-	postgres? ( >=dev-cpp/libpqpp-4.0-r1 )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( =dev-db/sqlite-2.8* )
-	tdb? ( dev-libs/tdb )
-	>=dev-libs/boost-1.31"
-
-RDEPEND="${DEPEND}"
-
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/2.9.18-default-mysql-options.patch
-	epatch "${FILESDIR}"/2.9.20-ldap-deprecated.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	local modules="pipe geo" myconf=""
-
-	use mysql && modules="${modules} gmysql"
-	use postgres && modules="${modules} gpgsql"
-	use sqlite && modules="${modules} gsqlite"
-	use ldap && modules="${modules} ldap"
-	use tdb && modules="${modules} xdb"
-	use debug && myconf="${myconf} --enable-verbose-logging"
-
-	econf \
-		--sysconfdir=/etc/powerdns \
-		--disable-recursor \
-		--with-modules= \
-		--with-dynmodules="${modules}" \
-		--with-pgsql-includes=/usr/include \
-		--with-pgsql-lib=/usr/$(get_libdir) \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		--with-sqlite-lib=/usr/$(get_libdir) \
-		$(use_enable static static-binaries) \
-		${myconf} \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
-
-	if use doc
-	then
-		emake -C codedocs codedocs || die "emake codedocs failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
-	# set defaults: setuid=pdns, setgid=pdns
-	sed -i -e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
-		"${D}"/etc/powerdns/pdns.conf
-
-	doinitd "${FILESDIR}"/pdns
-
-	dodoc ChangeLog README TODO
-	use doc && dohtml -r codedocs/html/.
-}
-
-pkg_preinst() {
-	enewgroup pdns
-	enewuser pdns -1 -1 /var/empty pdns
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "ATTENTION: The config files have moved from /etc to /etc/powerdns!"
-	ewarn
-	ewarn "ATTENTION: The recursor component has been split out to net-dns/pdns-recursor!"
-	ewarn
-	elog
-	elog "pdns now provides multiple instances support. You can create more instances"
-	elog "by symlinking the pdns init script to another name."
-	elog
-	elog "The name must be in the format pdns-<suffix> and PowerDNS will use the"
-	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
-	elog
-	elog "Also all backends, except the bind and random backends, are now compiled as"
-	elog "loadable modules and must be loaded with load-modules= in the configuration"
-	elog "file."
-	elog
-}
diff --git a/net-dns/pdns/pdns-2.9.20-r2.ebuild b/net-dns/pdns/pdns-2.9.20-r2.ebuild
deleted file mode 100644
index 31add4821c5c..000000000000
--- a/net-dns/pdns/pdns-2.9.20-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.20-r2.ebuild,v 1.5 2007/05/06 09:16:12 genone Exp $
-
-inherit multilib eutils autotools
-
-DESCRIPTION="The PowerDNS Daemon"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.gz"
-HOMEPAGE="http://www.powerdns.com/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ldap mysql postgres sqlite static tdb opendbx"
-
-DEPEND="mysql? ( virtual/mysql )
-	postgres? ( >=dev-cpp/libpqpp-4.0-r1 )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( =dev-db/sqlite-2.8* )
-	opendbx? ( dev-db/opendbx )
-	tdb? ( dev-libs/tdb )
-	>=dev-libs/boost-1.31"
-
-RDEPEND="${DEPEND}"
-
-DEPEND="${DEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/2.9.18-default-mysql-options.patch
-	epatch "${FILESDIR}"/2.9.20-ldap-deprecated.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	local modules="pipe geo" myconf=""
-
-	use mysql && modules="${modules} gmysql"
-	use postgres && modules="${modules} gpgsql"
-	use sqlite && modules="${modules} gsqlite"
-	use opendbx && modules="${modules} opendbx"
-	use ldap && modules="${modules} ldap"
-	use tdb && modules="${modules} xdb"
-	use debug && myconf="${myconf} --enable-verbose-logging"
-
-	econf \
-		--sysconfdir=/etc/powerdns \
-		--libdir=/usr/$(get_libdir)/powerdns \
-		--disable-recursor \
-		--with-modules= \
-		--with-dynmodules="${modules}" \
-		--with-pgsql-includes=/usr/include \
-		--with-pgsql-lib=/usr/$(get_libdir) \
-		--with-mysql-lib=/usr/$(get_libdir) \
-		--with-sqlite-lib=/usr/$(get_libdir) \
-		$(use_enable static static-binaries) \
-		${myconf} \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
-
-	if use doc
-	then
-		emake -C codedocs codedocs || die "emake codedocs failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	mv "${D}"/etc/powerdns/pdns.conf{-dist,}
-
-	# set defaults: setuid=pdns, setgid=pdns
-	sed -i \
-		-e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
-		"${D}"/etc/powerdns/pdns.conf
-
-	doinitd "${FILESDIR}"/pdns
-
-	keepdir /var/empty
-
-	dodoc ChangeLog README TODO
-	use doc && dohtml -r codedocs/html/.
-}
-
-pkg_preinst() {
-	enewgroup pdns
-	enewuser pdns -1 -1 /var/empty pdns
-}
-
-pkg_postinst() {
-	elog
-	elog "PowerDNS provides multiple instances support. You can create more instances"
-	elog "by symlinking the pdns init script to another name."
-	elog
-	elog "The name must be in the format pdns-<suffix> and PowerDNS will use the"
-	elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
-	elog
-}