Cleanup. Removed patches for bugs that have been fixed.

(Portage version: 2.1.5_rc2)

8 files changed, 13 insertions, 124 deletions

diff --git a/net-dns/pdns-recursor/ChangeLog b/net-dns/pdns-recursor/ChangeLog
index e761e3c27ae3..090b90b00d7a 100644
--- a/net-dns/pdns-recursor/ChangeLog
+++ b/net-dns/pdns-recursor/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/pdns-recursor
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.17 2008/03/31 19:50:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.18 2008/04/06 23:34:25 swegener Exp $
+
+  06 Apr 2008; Sven Wegener <swegener@gentoo.org>
+  -files/pdns-recursor-3.1.4-chdir.patch,
+  -files/pdns-recursor-3.1.4-gcc42.patch,
+  -files/pdns-recursor-3.1.4-statedir.patch,
+  -files/pdns-recursor-3.1.5-chdir.patch,
+  -files/pdns-recursor-3.1.5-statedir.patch, -pdns-recursor-3.1.4.ebuild,
+  pdns-recursor-3.1.5.ebuild:
+  Cleanup. Removed patches for bugs that have been fixed.
 
   31 Mar 2008; Markus Meier <maekke@gentoo.org> pdns-recursor-3.1.5.ebuild:
   amd64/x86 stable, security bug #215567
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-chdir.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-chdir.patch
deleted file mode 100644
index d30ca4286c02..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-chdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- pdns-recursor/pdns_recursor.cc
-+++ pdns-recursor/pdns_recursor.cc
-@@ -1565,6 +1565,10 @@
-     }
-   }
-   
-+  // this is needed to really get into the chroot. and even without chroot
-+  // enabled it's nice to not block the directory we're currently in.
-+  chdir("/");
-+  
-   Utility::dropPrivs(newuid, newgid);
-   g_fdm->addReadFD(s_rcc.d_fd, handleRCC); // control channel
- #endif 
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-gcc42.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-gcc42.patch
deleted file mode 100644
index f20d25baa19a..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-gcc42.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- pdns/recursor_cache.cc
-+++ pdns/recursor_cache.cc
-@@ -11,7 +11,10 @@
- #include "config.h"
- 
- #ifdef GCC_SKIP_LOCKING
--#include <bits/atomicity.h>
-+#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
-+# include <ext/atomicity.h>
-+#else
-+# include <bits/atomicity.h>
- // This code is ugly but does speedup the recursor tremendously on multi-processor systems, and even has a large effect (20, 30%) on uniprocessor 
- namespace __gnu_cxx
- {
-@@ -32,6 +35,7 @@
-   }
- }
- #endif
-+#endif
- 
- string simpleCompress(const string& label)
- {
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-statedir.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-statedir.patch
deleted file mode 100644
index e0096c873a8c..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-statedir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- pdns-recursor/config.h
-+++ pdns-recursor/config.h
-@@ -1,5 +1,5 @@
- #define SYSCONFDIR "/etc/powerdns/" 
--#define LOCALSTATEDIR "/var/run/" 
-+#define LOCALSTATEDIR "/var/lib/powerdns" 
- #define VERSION "3.1.4"
- #define RECURSOR
- #ifndef WIN32
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.5-chdir.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.5-chdir.patch
deleted file mode 100644
index d30ca4286c02..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.5-chdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- pdns-recursor/pdns_recursor.cc
-+++ pdns-recursor/pdns_recursor.cc
-@@ -1565,6 +1565,10 @@
-     }
-   }
-   
-+  // this is needed to really get into the chroot. and even without chroot
-+  // enabled it's nice to not block the directory we're currently in.
-+  chdir("/");
-+  
-   Utility::dropPrivs(newuid, newgid);
-   g_fdm->addReadFD(s_rcc.d_fd, handleRCC); // control channel
- #endif 
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.5-statedir.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.5-statedir.patch
deleted file mode 100644
index 2bd1690084a3..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.5-statedir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- pdns-recursor/config.h
-+++ pdns-recursor/config.h
-@@ -1,5 +1,5 @@
- #define SYSCONFDIR "/etc/powerdns/" 
--#define LOCALSTATEDIR "/var/run/" 
-+#define LOCALSTATEDIR "/var/lib/powerdns" 
- #define VERSION "3.1.5"
- #define RECURSOR
- #ifndef WIN32
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild
deleted file mode 100644
index a780a638bfc4..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild
+++ /dev/null
@@ -1,52 +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-recursor/pdns-recursor-3.1.4.ebuild,v 1.6 2007/09/22 19:34:04 swegener Exp $
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="http://www.powerdns.com/"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.33.1"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-statedir.patch
-	epatch "${FILESDIR}"/${P}-chdir.patch
-	epatch "${FILESDIR}"/${P}-gcc42.patch
-}
-
-src_compile() {
-	filter-flags -ftree-vectorize
-
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dosbin pdns_recursor rec_control || die "dosbin failed"
-	doman pdns_recursor.1 rec_control.1 || die "doman failed"
-
-	insinto /etc/powerdns
-	doins "${FILESDIR}"/recursor.conf || die "doins failed"
-
-	doinitd "${FILESDIR}"/precursor || die "doinitd failed"
-
-	# Pretty ugly, uh?
-	dodir /var/lib/powerdns/var/lib
-	dosym ../.. /var/lib/powerdns/var/lib/powerdns
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.1.5.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.1.5.ebuild
index a6a0be9b9315..0f04bc78cded 100644
--- a/net-dns/pdns-recursor/pdns-recursor-3.1.5.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-3.1.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.5.ebuild,v 1.2 2008/03/31 19:50:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.5.ebuild,v 1.3 2008/04/06 23:34:25 swegener Exp $
 
-inherit toolchain-funcs flag-o-matic eutils
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="The PowerDNS Recursor"
 HOMEPAGE="http://www.powerdns.com/"
@@ -19,10 +19,8 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-statedir.patch
-	epatch "${FILESDIR}"/${P}-chdir.patch
+	sed -i -e s:/var/run/:/var/lib/powerdns: "${S}"/config.h || die
 }
 
 src_compile() {