Removed dependency on openrc (bug #533820). Removed old version. Let the ebuild create the cachedir if it's not already available

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 35 insertions, 131 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index 26f02f4ae588..ddd3fbca1176 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/pdnsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.125 2014/05/03 20:34:27 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.126 2014/12/29 07:27:25 polynomial-c Exp $
+
+  29 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -pdnsd-1.2.9a.ebuild,
+  pdnsd-1.2.9a-r1.ebuild:
+  Removed dependency on openrc (bug #533820). Removed old version. Let the
+  ebuild create the cachedir if it's not already available.
 
   03 May 2014; Mikle Kolyada <zlogene@gentoo.org> pdnsd-1.2.9a-r1.ebuild:
   alpha/arm/ia64/ppc/sparc stable wrt bug #509380
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 41b235d4c455..ce4f038fae1a 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -9,16 +9,23 @@ AUX pdnsd.resolvconf-r1 17538 SHA256 40bdcc876ba8bb86069d52f8023fed468974004f47c
 AUX pdnsd.service 269 SHA256 c0db5c9844b3d882f8c6f22db839006f6616a0690b6bbd6bb4668207590f0e82 SHA512 c1504f52fb30ba197bd3c3450f200f2f274bf73f7a6436bc317ad9affc18e9c5edcb8555913a4aa9c6bf44b935e0c9cd005b4f5b0fd56eed6e11914f63db9ef2 WHIRLPOOL ed8fcdbe4acef862a3faff7322ff8fa4c2ed3923fe3931dfed6887425c52061132022c465f01082b4d76a2f15624ddb9b39886b766817897603853aed93abe1a
 AUX pdnsd.tmpfiles 37 SHA256 db6537c715c0acfd47a4ca64fce3cbb29913705462a0abbb32fdabef38cdab52 SHA512 7beacc66e8504ca0f8e613dfc8ed2479362f1ebc98ffab902622b36c795fe75e176d9f0a330ad74e10a7f7b1597cce068d94eea6511a75b941e42b2458b76df5 WHIRLPOOL f785b6980c7e1748384a4f56f6744263ab28944e42b1741f7ebe1e3e6a5638b8fbcae5f0b4e9295127258908174bfb2ffdf9b01cd89e28d80017f2e156e25e5f
 DIST pdnsd-1.2.9a-par.tar.gz 516061 SHA256 bb5835d0caa8c4b31679d6fd6a1a090b71bdf70950db3b1d0cea9cf9cb7e2a7b SHA512 4fde296642306aa986ddb7cad0b5991bcd397656d93ef4962706276848c7fa62c664a40198e807d029637f116e8000c237d98b91cbbfec5c08b134d8bb3adf81 WHIRLPOOL 9f1f94d6aece1d5cdffe4799e532b1f88217e8d0fef83d097fd03a24a958ad551154efa1f1b719a31315be5e225f33cc7da5c40e3f13a0acba6686e0f6376573
-EBUILD pdnsd-1.2.9a-r1.ebuild 3797 SHA256 4a6a0342e7babb583efc71ecdd56d529f0014e376409d2a4ede4b99b08b0da0a SHA512 02753c32838dd78c2e9feaff88df7254d98d967b4b4a7579c6e0092063c0486613a6d49a3c00dad60e30c67cfdef9a625859df01b32f4d78cdd48a2c19fa92ba WHIRLPOOL 515e5643750b1c74868b8367a967560b65e5aad32ce8cc2d5725407cfc31e8dd0a519ca671ed308689e2e4f20d8c7a6fb6f802e7be54b1c9d4b4263a5cbffcd4
-EBUILD pdnsd-1.2.9a.ebuild 3677 SHA256 b111b88061084cfbbc144d4d4340b542181792e95353eb6850af469c0e75137c SHA512 15faf2f5cda3d4eb690f8b9f3cf767741b33854bea5e61dc5f513906e962fcdf10917570b15d93a2cf3b1dc90d93d703b0d62ce1278e77b2e1c8fad2d1c100f5 WHIRLPOOL 837549ba0069d9cc49822f8faa8237e98df5cc692ffb0342aaa07e12e1fceb0478610da7f5922c093da47f571350d9ca03b027982cbd83ab0fcefff0d353593b
-MISC ChangeLog 19166 SHA256 da8b6f13233b34b2c79cbd189b5965503012f0c524ca1524740983c91d072f75 SHA512 db5164ed68b517f933ea9325d66cd88b099fe662fc7fad3f9ba2715e11c3b95c726605bf78c8f8bb8305f16da2f75de51916f1b3c05d14f3e6d706119ffa7472 WHIRLPOOL 62a430e090f99e7ec6e643dc64948835fe20edcc4749422c40888a3f510667f05e17948fbe2f6c9af446955714445717af826c9a0c0b18fe31ba8d04578036d1
+EBUILD pdnsd-1.2.9a-r1.ebuild 4191 SHA256 62df258bc51bf2f12184f89c81bca502e6a3d1adabd2cf15b94d2e77bda4fe72 SHA512 5edb0ce91e8cf26eb2c06302cc5d50abad140eb0d0095f7b19992ed2d934cb3effaf21cb10f10cfc5c8c89275a43aa8657a55a29136a5bade9abcecefb933808 WHIRLPOOL 84e0120aeaa278792ad807fe4e2caecd7b016a2772d12567318e6957973844f619015076e24f1a45c2f5070a902170ad9ceff276bfe52855f80416c4af925325
+MISC ChangeLog 19409 SHA256 cb507c9b3ac12d2756192e8e5c6699e92e4a2a3777144f23366bb31b267f3e91 SHA512 003f24fd2ab739f3b1d78b7072e6240cc4e9ae794e97961baa6ef781661678f4b7fcc82b2a885d3d9e10c4c0e6502173493bb4daac7a5de35e37102efcfd0151 WHIRLPOOL 5e29cebe43037ddfe31c9d64c9fd606546287de2dc3c12575335412f895b5796821707f23b56c9f369f45b64e5d45bced50e90eb871923de1571318e69f36062
 MISC metadata.xml 832 SHA256 3c197153f23083829e0a999a45a347df60829a03fd0bb3124e65943fcd00cbe8 SHA512 e8fc00a1d55acab6c01bc6fea75cb4271a8e1286666fdc639bb1cf9c7412ca0a8a92a97320e66ee821a2716d45378a977542265229f6c27fdf7e4bff286b5466 WHIRLPOOL 7c63c4f9292833e373011f578cba0a292b577c2492d57b17239b77a03438ea7251b65137a346baa74912dad10b7d5e9f60ce75a4ceea9b5daa5ed6251bbec396
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iJwEAQEIAAYFAlNlVCIACgkQG9wOWsQutdYHEQP/ayu9GdmwVXHQGEVpGZsoVOV7
-im7HYcD9Ox7YdvOmgHW1OY9VF/+XVEshe1YseNBcNbOD7fZjxK88eINgUd3uSsPp
-I5hWrQUamJWC8DKAsGrPJxwaJMir6I5jrhFbCN/kGev9cIF3mVmks2ZLW0ugxyPq
-Sjzvq4RpsWj7LpE726s=
-=+gSk
+iQIcBAEBCAAGBQJUoQJeAAoJEPiazRVxLXTFSqYP/3bcMLUb3+IVOZXqKcs5rxHJ
+Vm/gAxsB+3CRaDgcKdIQUGLfYxXizsxvQFMsDdkNWWs0AvptBfCXxIT8EM3gF0DR
+FrCs7U2AzIFdkkJ1I0RN8ggRxgZB1a3j1dEQU8cef7ioeAC2/ExaOhXPSyXFrDdh
+YgA+3QC6jg/hgHEguGkrcIUqEoEzAKSdjAlvcsz1PXt2KutOdfgTDHeEEdAthzzl
+VHTBaeeiYl52W++O8w7+m75qTRG4kTkQhTJWTtxKye7jpHBGOhRfoc1JWvhyBa9x
+JRJsd/DkXriSngejZnYP62ZsCaI31ClU++4KCWzlTQUfQSpuUl7cMgOpqeQTfoyL
+yxgT6wg6vKdd6Q5pdr9Q63dbSR8zZ2qd7Ha3nl6QGzON25aYhg4w+xgU3Rv7G8FQ
+g7bxip5q2CVUYTMWrhpjzOEtyJdW2D7nKXcxOfzlfrCpxLkTtY0O/DNz5S98bTPB
++YpQGaEt5tUOFgywEWhxGfzfKnUTV6jnuTpxgesmmgTciK5y7nai3nVnK4KBx+/I
+Qoda/lpemYiURXkoSYDymlNgUChph1psgKEd5w3qs5b7EZJdyrNeyAXZzZiLYT1z
+OqBjp3QB7sR5cqwEG4WWh/CIL7Us4MLE2hYuIdLrU/X1a4YVWB8HV5Z/+6P2yNeZ
+YvAHjdCRsiDoHA8ThKzp
+=TX5G
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild b/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
index d1104c13d283..2406ab821fc0 100644
--- a/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild,v 1.3 2014/05/03 20:34:27 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.9a-r1.ebuild,v 1.4 2014/12/29 07:27:25 polynomial-c Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ~s390 sparc x86"
 IUSE="debug ipv6 isdn +urandom test"
 
-RDEPEND="sys-apps/openrc"
+RDEPEND=""
 DEPEND="test? ( net-dns/bind-tools )"
 
 pkg_setup() {
@@ -118,4 +118,15 @@ pkg_postinst() {
 	elog "The online interface will be listed in /etc/conf.d/pdnsd-online"
 	elog ""
 	elog "Sample config file in /etc/pdnsd/pdnsd.conf.sample"
+
+	# The tmpfiles.d configuration does not come into effect before the
+	# next reboot so create the cachedir now.
+	local cachedir="/var/cache/pdnsd"
+	if [[ ! -d ${cachedir} ]] ; then
+		mkdir ${cachedir} || eerror "Failed to create cache"
+	fi
+	chown pdnsd:pdnsd ${cachedir} \
+		|| eerror "Failed to set ownership for cachedir"
+	chmod 0750 ${cachedir} \
+		|| eerror "Failed to set permissions for cachedir"
 }
diff --git a/net-dns/pdnsd/pdnsd-1.2.9a.ebuild b/net-dns/pdnsd/pdnsd-1.2.9a.ebuild
deleted file mode 100644
index d1327ad3eb80..000000000000
--- a/net-dns/pdnsd/pdnsd-1.2.9a.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.9a.ebuild,v 1.10 2014/01/18 19:53:50 ago Exp $
-
-EAPI=5
-
-inherit user
-
-DESCRIPTION="Proxy DNS server with permanent caching"
-HOMEPAGE="http://members.home.nl/p.a.rombouts/pdnsd/"
-SRC_URI="http://members.home.nl/p.a.rombouts/pdnsd/releases/${P}-par.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ~s390 sparc x86"
-IUSE="debug ipv6 isdn +urandom test"
-
-RDEPEND="sys-apps/openrc"
-DEPEND="test? ( net-dns/bind-tools )"
-
-pkg_setup() {
-	enewgroup pdnsd
-	enewuser pdnsd -1 -1 /var/lib/pdnsd pdnsd
-}
-
-src_configure() {
-	local myconf=""
-	use debug && myconf="${myconf} --with-debug=3"
-	use urandom && myconf="${myconf} --with-random-device=/dev/urandom"
-
-	econf \
-		--disable-dependency-tracking \
-		--sysconfdir=/etc/pdnsd \
-		--with-cachedir=/var/cache/pdnsd \
-		--with-default-id=pdnsd \
-		$(use_enable ipv6) $(use_enable ipv6 ipv6-startup) \
-		$(use_enable isdn) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	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
-
-	newinitd "${FILESDIR}/pdnsd.rc7" pdnsd
-	newinitd "${FILESDIR}/pdnsd.online.2" pdnsd-online
-
-	mkdir "${T}"/confd || die
-
-	cat - > "${T}"/confd/pdnsd-online <<EOF
-# Make sure to change the rc_need variable to the service for the
-# interface that connects you to the dns servers.
-#
-# For instance if you use a PPP connection on ppp0 to connect, set
-#   rc_need="net.ppp0"
-
-rc_need="net.lo"
-EOF
-
-	# Don't try to do the smart thing and add the --help output here:
-	# it will cause the file to be etc-updated if the help text
-	# changes and fails when cross-compiling.
-	cat - > "${T}"/confd/pdnsd <<EOF
-# Command line options, check pdnsd --help for a list of valid
-# parameters. Note that most of the options that can be given at
-# command-line are also available as configuration parameters in
-# /etc/pdnsd/pdnsd.conf
-PDNSDCONFIG=""
-EOF
-
-	doconfd "${T}"/confd/*
-
-	# gentoo resolvconf support
-	exeinto /etc/resolvconf/update.d
-	newexe "${FILESDIR}/pdnsd.resolvconf-r1" pdnsd
-}
-
-src_test() {
-	fail_kill() {
-		kill -9 $(<"${T}"/pid)
-		die "$1"
-	}
-
-	mkdir "${T}/pdnsd" || die
-	echo -n -e "pd12\0\0\0\0" > "${T}/pdnsd/pdnsd.cache"
-	IPS=$(grep ^nameserver /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"
-	sleep 3
-
-	find "${T}" -ls
-	[ -s "${T}/pid" ] || die "empty or no pid file created"
-	[ -S "${T}/pdnsd/pdnsd.status" ] || fail_kill "no socket created"
-	src/pdnsd-ctl/pdnsd-ctl -c "${T}/pdnsd" server all up || fail_kill "failed to start the daemon"
-	src/pdnsd-ctl/pdnsd-ctl -c "${T}/pdnsd" status || fail_kill "failed to communicate with the daemon"
-	sleep 3
-
-	dig @127.0.0.1 -p 33455 localhost > "${T}"/dig.output 2>&1
-	cat "${T}"/dig.output || die
-	fgrep -q "status: NOERROR" "${T}"/dig.output || fail_kill "www.gentoo.org lookup failed"
-
-	kill $(<"${T}/pid") || fail_kill "failed to terminate daemon"
-}
-
-pkg_postinst() {
-	elog
-	elog "Add pdnsd to your default runlevel - rc-update add pdnsd default"
-	elog ""
-	elog "Add pdnsd-online to your online runlevel."
-	elog "The online interface will be listed in /etc/conf.d/pdnsd-online"
-	elog ""
-	elog "Sample config file in /etc/pdnsd/pdnsd.conf.sample"
-}