remove old versions; update package description; sanitize the ebuild code; x86

Package-Manager: portage-2.0.54

8 files changed, 57 insertions, 329 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index 63068d9f65ac..3db8c47b5a6f 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/pdnsd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.50 2006/02/07 21:34:41 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.51 2006/03/08 20:32:56 mrness Exp $
+
+  08 Mar 2006; Alin Nastac <mrness@gentoo.org> metadata.xml,
+  -pdnsd-1.1.10.ebuild, -pdnsd-1.2.2.ebuild, pdnsd-1.2.4.ebuild:
+  Remove obsolete versions. Update package description. Sanitize the ebuild
+  code, mostly by quoting strings containing env vars. Mark as stable on x86.
 
   07 Feb 2006; Simon Stelling <blubb@gentoo.org> pdnsd-1.2.3.ebuild:
   stable on amd64
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 58e067393acd..2601a0f4bbfe 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -1,39 +1,19 @@
-MD5 d30f53f3541532570822d222f837e588 ChangeLog 7554
-RMD160 d409b01fe62ba9ddf1d66fadd4ca524e72c9ddfe ChangeLog 7554
-SHA256 01c9fe2d478190ff5d62d211281ac44731621d350e96fa40cf974105e5d18f9f ChangeLog 7554
-MD5 104a9136d4e55e47186ebcc1511b9f93 files/digest-pdnsd-1.1.10 68
-RMD160 570f3724f2bdd47a7bf23fbb73088bd621035af1 files/digest-pdnsd-1.1.10 68
-SHA256 432fe3e7e417e27292d00223dca96b337e4a286c06eb5298f1d9b47ad8a7e047 files/digest-pdnsd-1.1.10 68
-MD5 a8701579c070fdd7891f1bccaf63ae95 files/digest-pdnsd-1.2.2 67
-RMD160 be79a002aa633ab9181426b679742bc9af382113 files/digest-pdnsd-1.2.2 67
-SHA256 ee64a9cb29d5f85d2fe28c6a0881640c4606612f4a58857b83c49e483a70fce4 files/digest-pdnsd-1.2.2 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bcc4f3b712728070c5a1b1852c474334 ChangeLog 7836
 MD5 841f98e9e42888ec6d3869f716017c5f files/digest-pdnsd-1.2.3 67
-RMD160 bdea6159ef5232e8d7e436170fb3725912fd8015 files/digest-pdnsd-1.2.3 67
-SHA256 6e8e085938f058223fde4a6ebd7715c9be50ad17b989dabf518f4ee015ae3633 files/digest-pdnsd-1.2.3 67
 MD5 21ca3184ba7f84328d7cfbe1c4fcb596 files/digest-pdnsd-1.2.4 67
-RMD160 e37ed27094be13f412e4673dd837cef47197489d files/digest-pdnsd-1.2.4 67
-SHA256 97c85d352566ff3e25c4f88b50bbe6f7361050930222dae2cb65a4083ffc0d32 files/digest-pdnsd-1.2.4 67
 MD5 2a7e9d9f54bd31a3675c491d0b6ee187 files/pdnsd.conf.test 377
-RMD160 fbf25b78728754fa1f9cf5259c43cce9cb22a995 files/pdnsd.conf.test 377
-SHA256 8ef1e68c43cefde86598158d2b624cbdd66d2436d681cabbc6327d34d5886058 files/pdnsd.conf.test 377
 MD5 27071ebe71d4f810d57d7cfbd4099788 files/pdnsd.online 452
-RMD160 45ecfe4acf625d62a299ee1ba46c6559901e2e66 files/pdnsd.online 452
-SHA256 6fe3f33c7c5554f9577abfc5f7dc9547ba508ab68fe3590d8f1bb9598a865e9a files/pdnsd.online 452
 MD5 65809ab9f525565a98ebe800edea45ab files/pdnsd.rc6 755
-RMD160 deb6e6eed3ad8dabcc313b6e78abdd5c574c1c35 files/pdnsd.rc6 755
-SHA256 7f6b8782a8b4fff6b0cb1b8bfebdddf5777a5788aae76044cba499023c73423f files/pdnsd.rc6 755
-MD5 4ddec129fff42063dc6b05493cd55a78 metadata.xml 264
-RMD160 733a57e0e0a1af0096238355163b4a2fa59fdd51 metadata.xml 264
-SHA256 35b9f289d83da6b872d3d6c3ea4f5e94ffc814a62771e13153022dfb8da5816d metadata.xml 264
-MD5 45a79e5f7a6854ab6782a75e6f89296a pdnsd-1.1.10.ebuild 3270
-RMD160 2c254aa1ceef18bd21db05084346ecccc9742913 pdnsd-1.1.10.ebuild 3270
-SHA256 aee0040cabe80d2b446eceba2a0cb4ebccc1c0d69724d607a80515ae627519e8 pdnsd-1.1.10.ebuild 3270
-MD5 ca9244827dd64c825a52bfea6a5c5c6c pdnsd-1.2.2.ebuild 4283
-RMD160 6b0ee4a9a9d485ab6eb1f6d03c627e3826e229f8 pdnsd-1.2.2.ebuild 4283
-SHA256 5dd7ed93d37039cf2aa17151699b9be52d3bb1dcdbbd911db956dde79424b0a0 pdnsd-1.2.2.ebuild 4283
+MD5 03c559c81ebc357c5f906e8247f1b79b metadata.xml 402
 MD5 ff5367e7e1e820b6d58bbf69326d72a1 pdnsd-1.2.3.ebuild 4280
-RMD160 8a515cb5656d92ce9566227f54f3b23dbc704125 pdnsd-1.2.3.ebuild 4280
-SHA256 ce94e5cfe76ca3dcb9b519890b77db4540f62db16f1905d3f0c9a9d15d95a970 pdnsd-1.2.3.ebuild 4280
-MD5 5959785ddd61ce87347ab590b0dbf87f pdnsd-1.2.4.ebuild 4121
-RMD160 134edab6567dd808cd8b5fe3e86e2ac27c8b50df pdnsd-1.2.4.ebuild 4121
-SHA256 20a0d823140c4e2e112533ac65d692066e7bc39e015b24a6229110162a926e42 pdnsd-1.2.4.ebuild 4121
+MD5 f08d76208d59badfa27cb87eb325423a pdnsd-1.2.4.ebuild 3885
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEDz+ZjG8pv1lIUX4RAoPSAJ4j3eMsJc09DQPvxcCReHS8+C+u+ACgxokc
+JAfbCaBfBc5vz0XAWXhT/Mk=
+=5x1k
+-----END PGP SIGNATURE-----
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.1.10 b/net-dns/pdnsd/files/digest-pdnsd-1.1.10
deleted file mode 100644
index 7054b1ed24e6..000000000000
--- a/net-dns/pdnsd/files/digest-pdnsd-1.1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 780e76f2838ebabfbfae7d52194c8018 pdnsd-1.1.10-par.tar.gz 287373
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.2.2 b/net-dns/pdnsd/files/digest-pdnsd-1.2.2
deleted file mode 100644
index 703ca64073ce..000000000000
--- a/net-dns/pdnsd/files/digest-pdnsd-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b28232086131760c91aa4c49a877ef12 pdnsd-1.2.2-par.tar.gz 445494
diff --git a/net-dns/pdnsd/metadata.xml b/net-dns/pdnsd/metadata.xml
index 488c2ad63e68..c40daa94f381 100644
--- a/net-dns/pdnsd/metadata.xml
+++ b/net-dns/pdnsd/metadata.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
-  <longdescription>Proxy DNS server designed to serve dialup workstations/networks</longdescription>
+  <herd>net-dialup</herd>
+  <longdescription>A proxy DNS server with permanent caching (the cache contents are written to hard disk on exit) 
+that is designed to cope with unreachable or down DNS servers (for example in dial-in networking).</longdescription>
 </pkgmetadata>
diff --git a/net-dns/pdnsd/pdnsd-1.1.10.ebuild b/net-dns/pdnsd/pdnsd-1.1.10.ebuild
deleted file mode 100644
index 1c12c0f0970e..000000000000
--- a/net-dns/pdnsd/pdnsd-1.1.10.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.10.ebuild,v 1.23 2005/10/04 20:29:20 mrness Exp $
-
-inherit eutils
-
-MY_P=${P}-par
-DESCRIPTION="Proxy DNS server with permanent caching"
-HOMEPAGE="http://www.phys.uu.nl/%7Erombouts/pdnsd.html http://home.t-online.de/home/Moestl"
-SRC_URI="http://www.phys.uu.nl/%7Erombouts/pdnsd/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc s390 sparc x86"
-IUSE="ipv6 debug isdn"
-
-DEPEND="virtual/libc
-	sys-apps/sed
-	sys-apps/gawk
-	sys-devel/libtool
-	sys-devel/gcc
-	sys-devel/automake
-	sys-devel/autoconf"
-RDEPEND="virtual/libc"
-
-pkg_setup() {
-	enewgroup pdnsd
-	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
-}
-
-src_compile() {
-	cd ${S} || die
-	local myconf
-
-	if use debug; then
-	 	myconf="${myconf} --with-debug=3"
-		CFLAGS="${CFLAGS} -g"
-	fi
-	[ -c /dev/urandom ] && myconf="${myconf} --with-random-device=/dev/urandom"
-
-	econf \
-		--sysconfdir=/etc/pdnsd \
-		--with-cachedir=/var/cache/pdnsd \
-		--infodir=/usr/share/info --mandir=/usr/share/man \
-		--with-default-id=pdnsd \
-		`use_enable ipv6` `use_enable isdn` \
-		${myconf} \
-		|| die "bad configure"
-
-	emake all || die "compile problem"
-}
-
-pkg_preinst() {
-	enewgroup pdnsd
-	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
-}
-
-src_install() {
-
-	emake DESTDIR=${D} install || die
-
-	# Copy cache from prev versions
-	[ -f ${ROOT}/var/lib/pdnsd/pdnsd.cache ] && \
-		cp ${ROOT}/var/lib/pdnsd/pdnsd.cache ${D}/var/cache/pdnsd/pdnsd.cache
-
-	# Don't clobber existing cache - copy prev cache so unmerging prev version
-	# doesn't remove the cache.
-	[ -f ${ROOT}/var/cache/pdnsd/pdnsd.cache ] && \
-		cp ${ROOT}/var/cache/pdnsd/pdnsd.cache ${D}/var/cache/pdnsd/pdnsd.cache
-
-	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO README.par
-	docinto contrib ; dodoc contrib/{README,dhcp2pdnsd,pdnsd_dhcp.pl}
-	docinto html ; dohtml doc/html/*
-	docinto txt ; dodoc doc/txt/*
-	newdoc doc/pdnsd.conf pdnsd.conf.sample
-
-	# Remind users that the cachedir has moved to /var/cache
-	#[ -f ${ROOT}/etc/pdnsd/pdnsd.conf ] && \
-	#	sed -e "s#/var/lib#/var/cache#g" ${ROOT}/etc/pdnsd/pdnsd.conf \
-	#	> ${D}/etc/pdnsd/pdnsd.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/pdnsd.rc6 pdnsd
-	newexe ${FILESDIR}/pdnsd.online pdnsd-online
-
-	use ipv6 && \
-		ewarn "make sure your servers in /etc/pdnsd/pdnsd.conf are reachable with IPv6"
-
-	keepdir /etc/conf.d
-	local config=${D}/etc/conf.d/pdnsd-online
-
-	${D}/usr/sbin/pdnsd --help | sed "s/^/# /g" > ${config}
-	echo -e "\n\n# Enter the interface that connects you to the dns servers" >> ${config}
-	echo "# This will correspond to /etc/init.d/net.${IFACE}" >> ${config}
-	echo -e "\n# IMPORTANT: Be sure to run depscan.sh after modifiying IFACE" >>  ${config}
-	echo "IFACE=ppp0" >> ${config}
-	echo "# Command line options" >> ${config}
-	use ipv6 && echo PDNSDCONFIG="-6" >> ${config} \
-		|| echo PDNSDCONFIG="" >> ${config}
-
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Add pdnsd to your default runlevel - rc-update add pdnsd default"
-	einfo ""
-	einfo "Add pdnsd-online to your online runlevel."
-	einfo "The online interface will be listed in /etc/conf.d/pdnsd-online"
-	einfo ""
-	einfo "Sample config file in /etc/pdnsd/pdnsd.conf.sample"
-
-}
diff --git a/net-dns/pdnsd/pdnsd-1.2.2.ebuild b/net-dns/pdnsd/pdnsd-1.2.2.ebuild
deleted file mode 100644
index ee2e6d1d8aa7..000000000000
--- a/net-dns/pdnsd/pdnsd-1.2.2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.2.ebuild,v 1.8 2005/10/04 20:29:20 mrness Exp $
-
-inherit eutils
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-HOMEPAGE="http://www.phys.uu.nl/%7Erombouts/pdnsd.html http://www.phys.uu.nl/~rombouts/pdnsd.html"
-SRC_URI="http://www.phys.uu.nl/%7Erombouts/pdnsd/releases/${P}-par.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm ppc s390 ~sparc x86"
-IUSE="ipv6 debug isdn nptl"
-
-DEPEND="virtual/libc
-	sys-apps/sed
-	sys-apps/gawk
-	sys-devel/libtool
-	sys-devel/gcc
-	sys-devel/automake
-	sys-devel/autoconf"
-RDEPEND="virtual/libc"
-
-pkg_setup() {
-	enewgroup pdnsd
-	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
-}
-
-src_compile() {
-	cd ${S} || die
-	local myconf
-
-	if useq debug; then
-	 	myconf="${myconf} --with-debug=3"
-		CFLAGS="${CFLAGS} -g"
-	fi
-	useq nptl && myconf="${myconf} --with-thread-lib=NPTL"
-
-	[ -c /dev/urandom ] && myconf="${myconf} --with-random-device=/dev/urandom"
-
-	econf \
-		--sysconfdir=/etc/pdnsd \
-		--with-cachedir=/var/cache/pdnsd \
-		--infodir=/usr/share/info --mandir=/usr/share/man \
-		--with-default-id=pdnsd \
-		`use_enable ipv6` `use_enable isdn` \
-		${myconf} \
-		|| die "bad configure"
-
-	emake all || die "compile problem"
-}
-
-pkg_preinst() {
-	# Duplicated so that binary packages work
-	enewgroup pdnsd
-	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
-}
-
-
-src_test() {
-	if [ -x /usr/bin/dig ];
-	then
-		mkdir ${T}/pdnsd
-		echo -n -e "pd12\0\0\0\0" > ${T}/pdnsd/pdnsd.cache
-		IPS=$(grep ^nameserver ${ROOT}/etc/resolv.conf | sed -e 's/nameserver \(.*\)/\tip=\1;/g' | xargs)
-		#IPS=$(grep ^nameserver ${ROOT}/etc/resolv.conf |  sed -e 's/nameserver//g' | head -n 1)
-		sed -e "s/\tip=/${IPS}/" -e "s:cache_dir=:cache_dir=${T}/pdnsd:" ${FILESDIR}/pdnsd.conf.test \
-			> ${T}/pdnsd.conf.test
-		src/pdnsd -c ${T}/pdnsd.conf.test -g -s -d -p ${T}/pid || die "couldn't start daemon"
-		find ${T} -ls
-
-		[ -s ${T}/pid ] || die "empty or no pid file created"
-		[ -S ${T}/pdnsd/pdnsd.status ] || die "no socket created"
-		src/pdnsd-ctl/pdnsd-ctl   -c ${T}/pdnsd server all up || die "failed to communicate to daemon"
-		src/pdnsd-ctl/pdnsd-ctl   -c ${T}/pdnsd status || die "failed to communicate to daemon"
-		sleep 3
-
-		dig @127.0.0.1 -p 33455 www.gentoo.org  | fgrep "status: NOERROR" || die "www.gentoo.org lookup failed"
-		kill `cat ${T}/pid` || die "failed to terminate daemon"
-	fi
-}
-
-src_install() {
-
-	emake DESTDIR=${D} install || die
-
-	# Copy cache from prev older versions
-	[ -f ${ROOT}/var/lib/pdnsd/pdnsd.cache ] && \
-		cp ${ROOT}/var/lib/pdnsd/pdnsd.cache ${D}/var/cache/pdnsd/pdnsd.cache
-
-	# Don't clobber existing cache - copy prev cache so unmerging prev version
-	# doesn't remove the cache.
-	[ -f ${ROOT}/var/cache/pdnsd/pdnsd.cache ] && \
-		rm  ${D}/var/cache/pdnsd/pdnsd.cache
-
-	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO README.par
-	docinto contrib ; dodoc contrib/{README,dhcp2pdnsd,pdnsd_dhcp.pl}
-	docinto html ; dohtml doc/html/*
-	docinto txt ; dodoc doc/txt/*
-	newdoc doc/pdnsd.conf pdnsd.conf.sample
-
-	# Remind users that the cachedir has moved to /var/cache
-	#[ -f ${ROOT}/etc/pdnsd/pdnsd.conf ] && \
-	#	sed -e "s#/var/lib#/var/cache#g" ${ROOT}/etc/pdnsd/pdnsd.conf \
-	#	> ${D}/etc/pdnsd/pdnsd.conf
-
-	newinitd ${FILESDIR}/pdnsd.rc6 pdnsd
-	newinitd ${FILESDIR}/pdnsd.online pdnsd-online
-
-
-	keepdir /etc/conf.d
-	local config=${D}/etc/conf.d/pdnsd-online
-
-	echo -e "# Enter the interface that connects you to the dns servers" >> ${config}
-	echo "# This will correspond to /etc/init.d/net.${IFACE}" >> ${config}
-	echo -e "\n# IMPORTANT: Be sure to run depscan.sh after modifiying IFACE" >>  ${config}
-	echo "IFACE=ppp0" >> ${config}
-
-	config=${D}/etc/conf.d/pdnsd
-	${D}/usr/sbin/pdnsd --help | sed "s/^/# /g" > ${config}
-	echo "# Command line options" >> ${config}
-	use ipv6 && echo PDNSDCONFIG="-a" >> ${config} \
-		|| echo PDNSDCONFIG="" >> ${config}
-
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Add pdnsd to your default runlevel - rc-update add pdnsd default"
-	einfo ""
-	einfo "Add pdnsd-online to your online runlevel."
-	einfo "The online interface will be listed in /etc/conf.d/pdnsd-online"
-	einfo ""
-	einfo "Sample config file in /etc/pdnsd/pdnsd.conf.sample"
-}
diff --git a/net-dns/pdnsd/pdnsd-1.2.4.ebuild b/net-dns/pdnsd/pdnsd-1.2.4.ebuild
index 2c82a3a66cc3..d6adc089a739 100644
--- a/net-dns/pdnsd/pdnsd-1.2.4.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.4.ebuild,v 1.2 2006/02/01 20:29:17 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.4.ebuild,v 1.3 2006/03/08 20:32:57 mrness Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.phys.uu.nl/%7Erombouts/pdnsd/releases/${P}-par.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~s390 ~sparc x86"
 IUSE="ipv6 debug isdn nptl"
 
 pkg_setup() {
@@ -47,40 +47,38 @@ pkg_preinst() {
 	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
 }
 
-
 src_test() {
 	if [ -x /usr/bin/dig ];	then
-		mkdir ${T}/pdnsd
-		echo -n -e "pd12\0\0\0\0" > ${T}/pdnsd/pdnsd.cache
-		IPS=$(grep ^nameserver ${ROOT}/etc/resolv.conf | sed -e 's/nameserver \(.*\)/\tip=\1;/g' | xargs)
-		#IPS=$(grep ^nameserver ${ROOT}/etc/resolv.conf |  sed -e 's/nameserver//g' | head -n 1)
-		sed -e "s/\tip=/${IPS}/" -e "s:cache_dir=:cache_dir=${T}/pdnsd:" ${FILESDIR}/pdnsd.conf.test \
-			> ${T}/pdnsd.conf.test
-		src/pdnsd -c ${T}/pdnsd.conf.test -g -s -d -p ${T}/pid || die "couldn't start daemon"
-		find ${T} -ls
-
-		[ -s ${T}/pid ] || die "empty or no pid file created"
-		[ -S ${T}/pdnsd/pdnsd.status ] || die "no socket created"
-		src/pdnsd-ctl/pdnsd-ctl   -c ${T}/pdnsd server all up || die "failed to communicate to daemon"
-		src/pdnsd-ctl/pdnsd-ctl   -c ${T}/pdnsd status || die "failed to communicate to daemon"
+		mkdir "${T}/pdnsd"
+		echo -n -e "pd12\0\0\0\0" > "${T}/pdnsd/pdnsd.cache"
+		IPS=$(grep ^nameserver "${ROOT}/etc/resolv.conf" | sed -e 's/nameserver \(.*\)/\tip=\1;/g' | xargs)
+		sed -e "s/\tip=/${IPS}/" -e "s:cache_dir=:cache_dir=${T}/pdnsd:" "${FILESDIR}/pdnsd.conf.test" \
+			> "${T}/pdnsd.conf.test"
+		src/pdnsd -c "${T}/pdnsd.conf.test" -g -s -d -p "${T}/pid" || die "couldn't start daemon"
+		find "${T}" -ls
+
+		[ -s "${T}/pid" ] || die "empty or no pid file created"
+		[ -S "${T}/pdnsd/pdnsd.status" ] || die "no socket created"
+		src/pdnsd-ctl/pdnsd-ctl -c "${T}/pdnsd" server all up || die "failed to start the daemon"
+		src/pdnsd-ctl/pdnsd-ctl -c "${T}/pdnsd" status || die "failed to communicate with the daemon"
 		sleep 3
 
 		dig @127.0.0.1 -p 33455 www.gentoo.org  | fgrep "status: NOERROR" || die "www.gentoo.org lookup failed"
-		kill `cat ${T}/pid` || die "failed to terminate daemon"
+		kill $(<"${T}/pid") || die "failed to terminate daemon"
 	fi
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die
 
 	# Copy cache from prev older versions
-	[ -f ${ROOT}/var/lib/pdnsd/pdnsd.cache ] && \
-		cp ${ROOT}/var/lib/pdnsd/pdnsd.cache ${D}/var/cache/pdnsd/pdnsd.cache
+	[ -f "${ROOT}/var/lib/pdnsd/pdnsd.cache" ] && \
+		cp "${ROOT}/var/lib/pdnsd/pdnsd.cache" "${D}/var/cache/pdnsd/pdnsd.cache"
 
 	# Don't clobber existing cache - copy prev cache so unmerging prev version
 	# doesn't remove the cache.
-	[ -f ${ROOT}/var/cache/pdnsd/pdnsd.cache ] && \
-		rm  ${D}/var/cache/pdnsd/pdnsd.cache
+	[ -f "${ROOT}/var/cache/pdnsd/pdnsd.cache" ] && \
+		rm  "${D}/var/cache/pdnsd/pdnsd.cache"
 
 	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO README.par
 	docinto contrib ; dodoc contrib/{README,dhcp2pdnsd,pdnsd_dhcp.pl}
@@ -88,28 +86,22 @@ src_install() {
 	docinto txt ; dodoc doc/txt/*
 	newdoc doc/pdnsd.conf pdnsd.conf.sample
 
-	# Remind users that the cachedir has moved to /var/cache
-	#[ -f ${ROOT}/etc/pdnsd/pdnsd.conf ] && \
-	#	sed -e "s#/var/lib#/var/cache#g" ${ROOT}/etc/pdnsd/pdnsd.conf \
-	#	> ${D}/etc/pdnsd/pdnsd.conf
-
-	newinitd ${FILESDIR}/pdnsd.rc6 pdnsd
-	newinitd ${FILESDIR}/pdnsd.online pdnsd-online
-
+	newinitd "${FILESDIR}/pdnsd.rc6" pdnsd
+	newinitd "${FILESDIR}/pdnsd.online" pdnsd-online
 
 	keepdir /etc/conf.d
-	local config=${D}/etc/conf.d/pdnsd-online
-
-	echo -e "# Enter the interface that connects you to the dns servers" >> ${config}
-	echo "# This will correspond to /etc/init.d/net.${IFACE}" >> ${config}
-	echo -e "\n# IMPORTANT: Be sure to run depscan.sh after modifiying IFACE" >>  ${config}
-	echo "IFACE=ppp0" >> ${config}
-
-	config=${D}/etc/conf.d/pdnsd
-	${D}/usr/sbin/pdnsd --help | sed "s/^/# /g" > ${config}
-	echo "# Command line options" >> ${config}
-	use ipv6 && echo PDNSDCONFIG="-a" >> ${config} \
-		|| echo PDNSDCONFIG="" >> ${config}
+	local config="${D}/etc/conf.d/pdnsd-online"
+
+	echo -e "# Enter the interface that connects you to the dns servers" >> "${config}"
+	echo "# This will correspond to /etc/init.d/net.${IFACE}" >> "${config}"
+	echo -e "\n# IMPORTANT: Be sure to run depscan.sh after modifiying IFACE" >> "${config}"
+	echo "IFACE=ppp0" >> "${config}"
+
+	config="${D}/etc/conf.d/pdnsd"
+	"${D}/usr/sbin/pdnsd" --help | sed "s/^/# /g" > "${config}"
+	echo "# Command line options" >> "${config}"
+	use ipv6 && echo PDNSDCONFIG="-a" >> "${config}" \
+		|| echo PDNSDCONFIG="" >> "${config}"
 }
 
 pkg_postinst() {