Cleanup.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x64D4CF24)

7 files changed, 7 insertions, 471 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index fe30370bd96e..768893ffad26 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/pdns
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.82 2012/11/04 21:42:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.83 2012/11/04 22:57:50 swegener Exp $
+
+  04 Nov 2012; Sven Wegener <swegener@gentoo.org>
+  -files/2.9.18-default-mysql-options.patch, -pdns-2.9.22-r1.ebuild,
+  -pdns-2.9.22.5.ebuild, -pdns-2.9.22.6.ebuild, -files/pdns-2.9.22-gcc44.patch,
+  -pdns-3.0.ebuild:
+  Cleanup.
 
 *pdns-3.1 (04 Nov 2012)
 
diff --git a/net-dns/pdns/files/2.9.18-default-mysql-options.patch b/net-dns/pdns/files/2.9.18-default-mysql-options.patch
deleted file mode 100644
index a9048e13e10d..000000000000
--- a/net-dns/pdns/files/2.9.18-default-mysql-options.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc pdns-2.9.18/modules/gmysqlbackend/smysql.cc
---- pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc	2005-04-23 23:40:15.000000000 +0200
-+++ pdns-2.9.18/modules/gmysqlbackend/smysql.cc	2005-07-17 10:38:35.363597586 +0200
-@@ -15,6 +15,9 @@
- 	       const string &password)
- {
-   mysql_init(&d_db);
-+#if MYSQL_VERSION_ID > 32349
-+  mysql_options(&d_db, MYSQL_READ_DEFAULT_GROUP, "client");
-+#endif
-   if (!mysql_real_connect(&d_db, host.empty() ? 0 : host.c_str(), 
- 			  user.empty() ? 0 : user.c_str(), 
- 			  password.empty() ? 0 : password.c_str(),
diff --git a/net-dns/pdns/files/pdns-2.9.22-gcc44.patch b/net-dns/pdns/files/pdns-2.9.22-gcc44.patch
deleted file mode 100644
index 35c1c77775e0..000000000000
--- a/net-dns/pdns/files/pdns-2.9.22-gcc44.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur pdns-2.9.22.orig/pdns/dnsparser.cc pdns-2.9.22/pdns/dnsparser.cc
---- pdns-2.9.22.orig/pdns/dnsparser.cc	2008-11-15 22:32:46.000000000 +0200
-+++ pdns-2.9.22/pdns/dnsparser.cc	2009-07-06 22:09:02.000000000 +0300
-@@ -16,6 +16,7 @@
-     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
-+#include <stdio.h>
- #include "dnsparser.hh"
- #include "dnswriter.hh"
- #include <boost/lexical_cast.hpp>
-diff -ur pdns-2.9.22.orig/pdns/rcpgenerator.cc pdns-2.9.22/pdns/rcpgenerator.cc
---- pdns-2.9.22.orig/pdns/rcpgenerator.cc	2008-11-15 23:20:27.000000000 +0200
-+++ pdns-2.9.22/pdns/rcpgenerator.cc	2009-07-06 22:07:26.000000000 +0300
-@@ -16,6 +16,7 @@
-     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
-+#include <stdio.h>
- #include "rcpgenerator.hh"
- #include "dnsparser.hh"
- #include "misc.hh"
diff --git a/net-dns/pdns/pdns-2.9.22-r1.ebuild b/net-dns/pdns/pdns-2.9.22-r1.ebuild
deleted file mode 100644
index 93805c8faf86..000000000000
--- a/net-dns/pdns/pdns-2.9.22-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.22-r1.ebuild,v 1.6 2012/06/14 02:17:35 zmedico Exp $
-
-EAPI=2
-inherit eutils multilib user
-
-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 sqlite3 static opendbx"
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( =dev-db/sqlite-2.8* )
-	sqlite3? ( =dev-db/sqlite-3* )
-	opendbx? ( dev-db/opendbx )
-	!static? ( >=dev-libs/boost-1.31 )"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.31[static-libs] )
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.9.18-default-mysql-options.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_configure() {
-	local modules="pipe geo" myconf=""
-
-	use mysql && modules="${modules} gmysql"
-	use postgres && modules="${modules} gpgsql"
-	use sqlite && modules="${modules} gsqlite"
-	use sqlite3 && modules="${modules} gsqlite3"
-	use opendbx && modules="${modules} opendbx"
-	use ldap && modules="${modules} ldap"
-	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) \
-		--with-sqlite3-lib=/usr/$(get_libdir) \
-		$(use_enable static static-binaries) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_compile() {
-	default
-
-	if use doc
-	then
-		emake -C codedocs codedocs || die "emake codedocs failed"
-	fi
-}
-
-src_install () {
-	emake 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/.
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-
-	rm -f "${D}"/usr/$(get_libdir)/powerdns/*.{a,la}
-}
-
-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
-}
diff --git a/net-dns/pdns/pdns-2.9.22.5.ebuild b/net-dns/pdns/pdns-2.9.22.5.ebuild
deleted file mode 100644
index 499dd1ab3c9b..000000000000
--- a/net-dns/pdns/pdns-2.9.22.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.22.5.ebuild,v 1.3 2012/06/14 02:17:35 zmedico Exp $
-
-EAPI=2
-inherit eutils multilib user
-
-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 sqlite3 static opendbx"
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( =dev-db/sqlite-2.8* )
-	sqlite3? ( =dev-db/sqlite-3* )
-	opendbx? ( dev-db/opendbx )
-	!static? ( >=dev-libs/boost-1.31 )"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.31[static-libs] )
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.9.18-default-mysql-options.patch
-}
-
-src_configure() {
-	local modules="pipe geo" myconf=""
-
-	use mysql && modules="${modules} gmysql"
-	use postgres && modules="${modules} gpgsql"
-	use sqlite && modules="${modules} gsqlite"
-	use sqlite3 && modules="${modules} gsqlite3"
-	use opendbx && modules="${modules} opendbx"
-	use ldap && modules="${modules} ldap"
-	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) \
-		--with-sqlite3-lib=/usr/$(get_libdir) \
-		$(use_enable static static-binaries) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_compile() {
-	default
-
-	if use doc
-	then
-		emake -C codedocs codedocs || die "emake codedocs failed"
-	fi
-}
-
-src_install () {
-	emake 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/.
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-
-	rm -f "${D}"/usr/$(get_libdir)/powerdns/*.{a,la}
-}
-
-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
-}
diff --git a/net-dns/pdns/pdns-2.9.22.6.ebuild b/net-dns/pdns/pdns-2.9.22.6.ebuild
deleted file mode 100644
index 2d91e08fea51..000000000000
--- a/net-dns/pdns/pdns-2.9.22.6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-2.9.22.6.ebuild,v 1.2 2012/06/14 02:17:35 zmedico Exp $
-
-EAPI=2
-inherit eutils multilib user
-
-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 sqlite3 static opendbx"
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( =dev-db/sqlite-2.8* )
-	sqlite3? ( =dev-db/sqlite-3* )
-	opendbx? ( dev-db/opendbx )
-	!static? ( >=dev-libs/boost-1.31 )"
-DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.31[static-libs] )
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.9.18-default-mysql-options.patch
-}
-
-src_configure() {
-	local modules="pipe geo" myconf=""
-
-	use mysql && modules="${modules} gmysql"
-	use postgres && modules="${modules} gpgsql"
-	use sqlite && modules="${modules} gsqlite"
-	use sqlite3 && modules="${modules} gsqlite3"
-	use opendbx && modules="${modules} opendbx"
-	use ldap && modules="${modules} ldap"
-	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) \
-		--with-sqlite3-lib=/usr/$(get_libdir) \
-		$(use_enable static static-binaries) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_compile() {
-	default
-
-	if use doc
-	then
-		emake -C codedocs codedocs || die "emake codedocs failed"
-	fi
-}
-
-src_install () {
-	emake 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/.
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-
-	rm -f "${D}"/usr/$(get_libdir)/powerdns/*.{a,la}
-}
-
-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
-}
diff --git a/net-dns/pdns/pdns-3.0.ebuild b/net-dns/pdns/pdns-3.0.ebuild
deleted file mode 100644
index 523dc32a970a..000000000000
--- a/net-dns/pdns/pdns-3.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.0.ebuild,v 1.8 2012/07/07 11:43:21 swegener Exp $
-
-EAPI=2
-
-inherit eutils multilib autotools user toolchain-funcs
-
-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 sqlite3 static opendbx"
-
-RDEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( =dev-db/sqlite-2.8* )
-	sqlite3? ( =dev-db/sqlite-3* )
-	opendbx? ( dev-db/opendbx )
-	!static? ( >=dev-libs/boost-1.34 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( >=dev-libs/boost-1.34[static-libs] )
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-lua-config.patch \
-		"${FILESDIR}"/${PN}-3.0-verbose-logging.patch
-	eautoreconf
-}
-
-src_configure() {
-	local modules="pipe geo" myconf=""
-
-	use mysql && modules="${modules} gmysql"
-	use postgres && modules="${modules} gpgsql"
-	use sqlite && modules="${modules} gsqlite"
-	use sqlite3 && modules="${modules} gsqlite3"
-	use opendbx && modules="${modules} opendbx"
-	use ldap && modules="${modules} ldap"
-	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) \
-		--without-lua \
-		$(use_enable static static-binaries) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake -C pdns/ext/polarssl CC="$(tc-getCC)" OFLAGS="${CFLAGS}"
-
-	default
-
-	if use doc
-	then
-		emake -C codedocs codedocs || die "emake codedocs failed"
-	fi
-}
-
-src_install () {
-	emake 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/.
-
-	# Install development headers
-	insinto /usr/include/pdns
-	doins pdns/*.hh
-	insinto /usr/include/pdns/backends/gsql
-	doins pdns/backends/gsql/*.hh
-
-	rm -f "${D}"/usr/$(get_libdir)/powerdns/*.{a,la}
-}
-
-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
-}