Stable on x86, ppc, sparc. Changed version 1.1.10 to use $ROOT when checking on the existing installation.

3 files changed, 17 insertions, 10 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index b2030bc977e7..3415a677e846 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/pdnsd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.21 2004/03/28 01:07:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.22 2004/04/03 02:42:42 dragonheart Exp $
+
+  03 Apr 2004; Daniel Black <dragonheart@gentoo.org> pdnsd-1.1.10.ebuild:
+  Stable on x86, ppc, sparc. Changed version 1.1.10 to use when checking on the
+  existing installation.
 
   28 Mar 2004; Daniel Black <dragonheart@gentoo.org> pdnsd-1.1.6-r7.ebuild,
   pdnsd-1.1.9.ebuild:
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 4c0dd54979ca..5c1028293c1f 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -1,8 +1,8 @@
-MD5 b4592b5e4a59b442f11968d7c9e83ca1 ChangeLog 3236
+MD5 81770404c5e271b602a7a10eecb5a3ae ChangeLog 3416
 MD5 cd82be4729ad0da13f8e5e396dd29840 metadata.xml 437
 MD5 a415c002ad5217367da41f607bf6cad6 pdnsd-1.1.7a.ebuild 990
 MD5 51d039a99ad0ee24d4390b5cb8d85892 pdnsd-1.1.9.ebuild 2670
-MD5 41ac34a42c237516c92dc74df21a09ce pdnsd-1.1.10.ebuild 3105
+MD5 a7c645a574331c5f146440dbd10cb389 pdnsd-1.1.10.ebuild 3254
 MD5 729266103aee86613f32b6e39c03172f files/digest-pdnsd-1.1.7a 65
 MD5 2f4f436df1064eb21409e1ef613be068 files/digest-pdnsd-1.1.9 67
 MD5 d5e1cbb93d8bb06254e9daac8df76d8d files/pdnsd.online 459
diff --git a/net-dns/pdnsd/pdnsd-1.1.10.ebuild b/net-dns/pdnsd/pdnsd-1.1.10.ebuild
index c8f616df49d8..1fd8ee26d23b 100644
--- a/net-dns/pdnsd/pdnsd-1.1.10.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.4 2004/03/15 23:40:47 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.10.ebuild,v 1.5 2004/04/03 02:42:42 dragonheart Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ LICENSE="BSD | GPL-2"
 # Should work on  alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc 
 # REF http://packages.debian.org/cgi-bin/search_packages.pl?searchon=names&version=all&exact=1&keywords=pdnsd
 
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
 
 S=${WORKDIR}/${PN}-${PV}
 
@@ -63,10 +63,13 @@ src_install() {
 	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
 
 	# Copy cache from prev versions
-	[ -f /var/lib/pdnsd/pdnsd.cache ] && cp /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
-	[ -f /var/cache/pdnsd/pdnsd.cache ] && rm ${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 COPYING* ChangeLog* NEWS README THANKS TODO README.par
 	docinto contrib ; dodoc contrib/{README,dhcp2pdnsd,pdnsd_dhcp.pl}
@@ -75,8 +78,8 @@ src_install() {
 	newdoc doc/pdnsd.conf pdnsd.conf.sample
 
 	# Remind users that the cachedir has moved to /var/cache
-	[ -f /etc/pdnsd/pdnsd.conf ] && \
-		sed -e "s#/var/lib#/var/cache#g" /etc/pdnsd/pdnsd.conf \
+	[ -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