Install modules into subdirectory.

Package-Manager: portage-2.1.2_pre3-r1

4 files changed, 119 insertions, 8 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 9fbd37577da3..d10b346f4d87 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/pdns
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.37 2006/09/27 19:21:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.38 2006/10/15 01:21:47 swegener Exp $
+
+*pdns-2.9.20-r2 (15 Oct 2006)
+
+  15 Oct 2006; Sven Wegener <swegener@gentoo.org> +pdns-2.9.20-r2.ebuild:
+  Install modules into subdirectory.
 
   27 Sep 2006; Sven Wegener <swegener@gentoo.org>
   -files/2.9.18-ldap-fix.patch, -pdns-2.9.18.ebuild:
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 3c5ea2fc29a8..9b33a0178d9e 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -26,10 +26,14 @@ EBUILD pdns-2.9.20-r1.ebuild 2859 RMD160 5aa227a41f8c73a8632951745e9c5f7b3abcecf
 MD5 e14d8933453a6a43145aea17e3b6c763 pdns-2.9.20-r1.ebuild 2859
 RMD160 5aa227a41f8c73a8632951745e9c5f7b3abcecfc pdns-2.9.20-r1.ebuild 2859
 SHA256 697543edac74e2cc3d7244765aae5aeb2cb8b518a8781e1844994c7e3edc1ada pdns-2.9.20-r1.ebuild 2859
-MISC ChangeLog 6322 RMD160 a26e5c2b5802949d96eeee11ef6be819a1ed2918 SHA1 73340b6c2128036e1cd9f8e0557f2e251b5f1786 SHA256 cd5a9687ab26d3def286b95b14169e672e8d61a87b63eef1a0775f466acff82f
-MD5 0197863168d8f2eb640f0816d7ffddfe ChangeLog 6322
-RMD160 a26e5c2b5802949d96eeee11ef6be819a1ed2918 ChangeLog 6322
-SHA256 cd5a9687ab26d3def286b95b14169e672e8d61a87b63eef1a0775f466acff82f ChangeLog 6322
+EBUILD pdns-2.9.20-r2.ebuild 2528 RMD160 43052c59fdb437f6db2c724420392b015e5fe24e SHA1 7d16dbd79504fd41fb0e301496d4ec8e007cbe23 SHA256 80705702654db1ae1fe67616585eb7be2584cf4ecffe556808563cdb5ac6c696
+MD5 c2f6af2e3e1c600c3a7a64f3ccd9d349 pdns-2.9.20-r2.ebuild 2528
+RMD160 43052c59fdb437f6db2c724420392b015e5fe24e pdns-2.9.20-r2.ebuild 2528
+SHA256 80705702654db1ae1fe67616585eb7be2584cf4ecffe556808563cdb5ac6c696 pdns-2.9.20-r2.ebuild 2528
+MISC ChangeLog 6465 RMD160 f1a2cbc29f94190409e7ce41d147cf5fb10bd5ad SHA1 c6bb2b26bbf67dc01951dbf1ac121504f62553f8 SHA256 61ffc289e94be87f8ea961604ea82706a63257f8e0db272005cc8b3e8aef133d
+MD5 7cefa14c8aadbac1c9da9a7618ac3e39 ChangeLog 6465
+RMD160 f1a2cbc29f94190409e7ce41d147cf5fb10bd5ad ChangeLog 6465
+SHA256 61ffc289e94be87f8ea961604ea82706a63257f8e0db272005cc8b3e8aef133d ChangeLog 6465
 MISC metadata.xml 573 RMD160 74995a273e6513bb6689ec0ad74bf5b0b0fdf5c1 SHA1 01c4329b63991b54af3559d2220251520cb7147a SHA256 26a6150230ca87a16d882d1cdac565a040e75e7bf02ee9348688569924e1bfc3
 MD5 56567ddcaf248499457a1ce74277c910 metadata.xml 573
 RMD160 74995a273e6513bb6689ec0ad74bf5b0b0fdf5c1 metadata.xml 573
@@ -37,10 +41,13 @@ SHA256 26a6150230ca87a16d882d1cdac565a040e75e7bf02ee9348688569924e1bfc3 metadata
 MD5 4d4c82f77383d45b0f3c812506353f02 files/digest-pdns-2.9.20-r1 235
 RMD160 dcc067109bce2032ef801cb2f77a19cf70b863dc files/digest-pdns-2.9.20-r1 235
 SHA256 d2ac1f7a38f80ff664956d619e704adceb479b42cb6f1b792d48efe666bb51f2 files/digest-pdns-2.9.20-r1 235
+MD5 4d4c82f77383d45b0f3c812506353f02 files/digest-pdns-2.9.20-r2 235
+RMD160 dcc067109bce2032ef801cb2f77a19cf70b863dc files/digest-pdns-2.9.20-r2 235
+SHA256 d2ac1f7a38f80ff664956d619e704adceb479b42cb6f1b792d48efe666bb51f2 files/digest-pdns-2.9.20-r2 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFGs9UI1lqEGTUzyQRAnJjAJ414npeL6349GPDQJcmycE7+M3oEQCfWyou
-wzPY30VqGz3E+cFd1aebsns=
-=d83z
+iD8DBQFFMY00I1lqEGTUzyQRArn4AJ9+caT6eNQsxH4W8GWF43t3FunxHgCbBdfm
+nsN/9vf7EsrcJphIlBQwle0=
+=gkQL
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/files/digest-pdns-2.9.20-r2 b/net-dns/pdns/files/digest-pdns-2.9.20-r2
new file mode 100644
index 000000000000..6d87ffaaad65
--- /dev/null
+++ b/net-dns/pdns/files/digest-pdns-2.9.20-r2
@@ -0,0 +1,3 @@
+MD5 33b20ef1b767f93297101f2aa09e99ed pdns-2.9.20.tar.gz 867520
+RMD160 15d433bc29e7d60549d9296fca573724574614fc pdns-2.9.20.tar.gz 867520
+SHA256 28984207c78bc5d40542d40366d74f6695a9cf3a7ec4f431d908966d4fc35e3d pdns-2.9.20.tar.gz 867520
diff --git a/net-dns/pdns/pdns-2.9.20-r2.ebuild b/net-dns/pdns/pdns-2.9.20-r2.ebuild
new file mode 100644
index 000000000000..d7ae09f2bc1b
--- /dev/null
+++ b/net-dns/pdns/pdns-2.9.20-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2006 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.1 2006/10/15 01:21:47 swegener 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? ( >=dev-db/mysql-3.23.54a )
+	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 \
+		--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
+
+	dodoc ChangeLog README TODO
+	use doc && dohtml -r codedocs/html/.
+}
+
+pkg_preinst() {
+	enewgroup pdns
+	enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+	einfo
+	einfo "PowerDNS provides multiple instances support. You can create more instances"
+	einfo "by symlinking the pdns init script to another name."
+	einfo
+	einfo "The name must be in the format pdns-<suffix> and PowerDNS will use the"
+	einfo "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+	einfo
+}