enew{user,group} copied to pkg_preinst to fix binary packages (bug #58526).

6 files changed, 27 insertions, 44 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index a192a9e58b76..0381c765d608 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/pdnsd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.34 2004/07/18 05:25:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.35 2004/07/27 13:30:31 dragonheart Exp $
+
+  27 Jul 2004; Daniel Black <dragonheart@gentoo.org> pdnsd-1.1.10.ebuild,
+  pdnsd-1.1.11.ebuild, pdnsd-1.1.9.ebuild, -pdnsd-1.1.7a.ebuild:
+  enew{user,group} copied to pkg_preinst to fix binary packages (bug #58526).
+  Thanks to Thomas Matthijs <axxo@gentoo.org>. Removed old version
 
   18 Jul 2004; Daniel Black <dragonheart@gentoo.org> pdnsd-1.1.10.ebuild,
   pdnsd-1.1.11.ebuild:
diff --git a/net-dns/pdnsd/files/digest-pdnsd-1.1.7a b/net-dns/pdnsd/files/digest-pdnsd-1.1.7a
deleted file mode 100644
index ea2f48f09a50..000000000000
--- a/net-dns/pdnsd/files/digest-pdnsd-1.1.7a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e51a4e4ac14cc537ee3204d3e4ac8ff pdnsd-1.1.7a.tar.bz2 221084
diff --git a/net-dns/pdnsd/pdnsd-1.1.10.ebuild b/net-dns/pdnsd/pdnsd-1.1.10.ebuild
index 554472a54a13..3c6561a12c82 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 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.16 2004/07/18 05:25:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.10.ebuild,v 1.17 2004/07/27 13:30:31 dragonheart Exp $
 
 inherit eutils
 
@@ -38,6 +38,11 @@ S=${WORKDIR}/${PN}-${PV}
 # for debugging use
 use debug && RESTRICT="${RESTRICT} nostrip"
 
+pkg_setup() {
+	enewgroup pdnsd
+	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
+}
+
 src_compile() {
 	cd ${S} || die
 	local myconf
@@ -60,7 +65,7 @@ src_compile() {
 	emake all || die "compile problem"
 }
 
-pkg_setup() {
+pkg_preinst() {
 	enewgroup pdnsd
 	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
 }
diff --git a/net-dns/pdnsd/pdnsd-1.1.11.ebuild b/net-dns/pdnsd/pdnsd-1.1.11.ebuild
index 8cb13751d2fa..ba275b1184a0 100644
--- a/net-dns/pdnsd/pdnsd-1.1.11.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.11.ebuild,v 1.6 2004/07/18 05:25:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.11.ebuild,v 1.7 2004/07/27 13:30:31 dragonheart Exp $
 
 inherit eutils
 
@@ -38,6 +38,11 @@ S=${WORKDIR}/${PN}-${PV}
 # for debugging use
 use debug && RESTRICT="${RESTRICT} nostrip"
 
+pkg_setup() {
+	enewgroup pdnsd
+	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
+}
+
 src_compile() {
 	cd ${S} || die
 	local myconf
@@ -60,7 +65,8 @@ src_compile() {
 	emake all || die "compile problem"
 }
 
-pkg_setup() {
+pkg_preinst() {
+	# Duplicated so that binary packages work
 	enewgroup pdnsd
 	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
 }
diff --git a/net-dns/pdnsd/pdnsd-1.1.7a.ebuild b/net-dns/pdnsd/pdnsd-1.1.7a.ebuild
deleted file mode 100644
index 125458f6fd6f..000000000000
--- a/net-dns/pdnsd/pdnsd-1.1.7a.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.7a.ebuild,v 1.12 2004/07/14 23:38:03 agriffis Exp $
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-SRC_URI="http://home.t-online.de/home/Moestl/${P}.tar.bz2"
-HOMEPAGE="http://home.t-online.de/home/Moestl/"
-
-DEPEND="virtual/libc"
-
-SLOT="0"
-LICENSE="BSD | GPL-2"
-KEYWORDS="x86 ppc sparc "
-IUSE=""
-
-src_compile() {
-	econf \
-		--sysconfdir=/etc/pdnsd \
-		--with-cachedir=/var/lib/pdnsd \
-		|| die "bad configure"
-
-	emake all || die "compile problem"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING* ChangeLog* NEWS README THANKS TODO
-	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
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/pdnsd.rc6 pdnsd
-}
diff --git a/net-dns/pdnsd/pdnsd-1.1.9.ebuild b/net-dns/pdnsd/pdnsd-1.1.9.ebuild
index 38c8d262de3b..ebec5f066c8a 100644
--- a/net-dns/pdnsd/pdnsd-1.1.9.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.9.ebuild,v 1.10 2004/07/14 23:38:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.1.9.ebuild,v 1.11 2004/07/27 13:30:31 dragonheart Exp $
 
 inherit eutils
 
@@ -55,11 +55,14 @@ src_compile() {
 	emake all || die "compile problem"
 }
 
+pkg_preinst() {
+	enewgroup pdnsd
+	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
+}
+
 src_install() {
 	make DESTDIR=${D} install || die
 
-	enewgroup pdnsd
-	enewuser pdnsd -1 /bin/false /var/lib/pdnsd pdnsd
 	fowners pdnsd:pdnsd /var/lib/pdnsd /var/lib/pdnsd/pdnsd.cache
 
 	sed -i 's/run_as=.*/run_as="pdnsd";/' ${D}/etc/pdnsd/pdnsd.conf.sample