Changed "need net" to "use net" in init script (bug #484658). Converted ebuild to EAPI-5. Took over maintenance

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

5 files changed, 47 insertions, 39 deletions

diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index d0a352a24261..69235d29821e 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/pdnsd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.111 2012/12/19 01:18:33 polynomial-c Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.112 2013/10/08 06:06:58 polynomial-c Exp $
+
+  08 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> pdnsd-1.2.9a.ebuild,
+  files/pdnsd.rc7, metadata.xml:
+  Changed "need net" to "use net" in init script (bug #484658). Converted
+  ebuild to EAPI-5. Took over maintenance.
 
   19 Dec 2012; Lars Wendler <polynomial-c@gentoo.org> files/pdnsd.rc7:
   Small fix in the new init.d file.
diff --git a/net-dns/pdnsd/Manifest b/net-dns/pdnsd/Manifest
index 900c8aa8bba2..f81a0db132c1 100644
--- a/net-dns/pdnsd/Manifest
+++ b/net-dns/pdnsd/Manifest
@@ -5,28 +5,28 @@ AUX pdnsd.conf.test 377 SHA256 8ef1e68c43cefde86598158d2b624cbdd66d2436d681cabbc
 AUX pdnsd.online.1 669 SHA256 b4bc97c47bcda1713c98d4cf8de583d4dbb26ec7b9c064252d15e493977af09b SHA512 22cea420d3054ae8c70e4645e052eb9ab7dc1f8a89ec382cf9a3f75f7f0c4295b14a82aecb35ad9671535d5c2136b6be872cbcc66307e30cec818ebd0c091d24 WHIRLPOOL 87dfc72208837b619631f4674f1cb9c0336b7cfb6b30fa5eabbf4a42a54e5db3c300ad6ba503172154dbb4a57f7be51cd6678c176fa0858a5f2e720aa71a4fe7
 AUX pdnsd.online.2 682 SHA256 eb771771c79a81608355c8f01ae595a35125d379fc6d502274dbc7f81685df8d SHA512 8c218673c22e3cde7fad3ddc49a90e6d7664e6a1c8c983eb7ad668179e4fbd8fa083c579ed87d48cad4a4c762f35b08df7de1fbf46c9b755c76d3a1ad7430924 WHIRLPOOL 47840e7b5701696d956ab47bc73ea7598f6eaf8df05c6569ffd20b51d05542aeb44628b26a58010e0ef57bf5d8f76a652ca168b0bdf311a46a8f9c38fff6e0df
 AUX pdnsd.rc6.1 956 SHA256 75e0327c6f91f36388a9184f640a80a2671142edc54bceb9f3312f2ad8052fcd SHA512 cdc61a6fd8176f76f65b49fedddf7c89213a6ea4eb6f0a876e83facd2bb369dd86613dce25b92ca0008525c52a3a0c31873e4eee3dba6e3804b1554c12572f06 WHIRLPOOL 90ffa1999d1218c09c7c19faebda8ded86ee5577d19e12d8e719d62b373e117a261bcd85cfbd54ba83ed7379dc4b49321720e77a4d43edbdc3d37a901870aced
-AUX pdnsd.rc7 728 SHA256 ebe8587a83166c4818d1498facba43c89d392e82515e327ea774c85d816df938 SHA512 a1fa5d8d9a4fb5045c641168076c1fd05cdf887b795d56b7995501a7a80e6adc782f8777ab7b466bb790ed665cbb28623a4f39e011e09e6a716c397f263b04bf WHIRLPOOL f0558a9c1eb3a270012101916a49b3f9c81ec5862d59a7cc1459733e3b4aa6eac8873eb88799472de6e16bdd90f612403e57fe4f9fba08fe27acc09949cb9a8d
+AUX pdnsd.rc7 727 SHA256 829e8f4959be9d26184bb6cf6f24424d90e93958100b36976673fb7749547204 SHA512 e0aec37df421f9860b67e65ffcd4cea37b1170fd1826d9995439eab3aaf27fa35b8fc7467eaffa8292eed206ef8eac32903d3120ff3fbec9fe88f2e6042bb008 WHIRLPOOL 6fdefc373c9c788f838dddab8ad2371e18fa6def58e6874671904a0bc4822a5e6a52d8095d60face87902f4120c9f10b2504b2f7bc526ac04c0a6bf2006b0b4f
 AUX pdnsd.resolvconf-r1 17538 SHA256 40bdcc876ba8bb86069d52f8023fed468974004f47c235c202ca7eac88aa0fe3 SHA512 22a92df825d560ec03860c1a9a6000f32e19b33ccda0f6412830ebca13499e6d45161267bb30658aa9ed4b5862bae04e304e25358c30ee6d80a9deea90ba989f WHIRLPOOL c6c08c105be3986d1d0c8b86d2cf9f0a36e2608b207ec3db084f46f55dd6f0764d999179133783ac055c75c14542d049f3240cb11036c162eeb5d820811ca3cb
 DIST pdnsd-1.2.8-par.tar.gz 471303 SHA256 5f3cade09e445f034430863ba65047a4ab2f581b86f3eab0d0981646e7ec244e
 DIST pdnsd-1.2.9a-par.tar.gz 516061 SHA256 bb5835d0caa8c4b31679d6fd6a1a090b71bdf70950db3b1d0cea9cf9cb7e2a7b SHA512 4fde296642306aa986ddb7cad0b5991bcd397656d93ef4962706276848c7fa62c664a40198e807d029637f116e8000c237d98b91cbbfec5c08b134d8bb3adf81 WHIRLPOOL 9f1f94d6aece1d5cdffe4799e532b1f88217e8d0fef83d097fd03a24a958ad551154efa1f1b719a31315be5e225f33cc7da5c40e3f13a0acba6686e0f6376573
 EBUILD pdnsd-1.2.8-r4.ebuild 3781 SHA256 e50c16041bb0dea093d24f38a53dda4f2534ec97ec0e451251f46842f1ae3127 SHA512 1c4f8da51b009f0c5989ddb1a558ee14823c7f4dbb16611c75ff3e0711e8603aa00378c4a0b81e418d75c9d2e7bc22d85dddda31af78629a4b624f26101828ea WHIRLPOOL 46442b9a2a49a2c317a6ac7378c365ae49cd36a354064a7d684c9ab554cea0bd1cf3676f5cea665dc6cfb9099df4404b2033dc642d80d2b0dec5f117bd91565f
-EBUILD pdnsd-1.2.9a.ebuild 3785 SHA256 1438aa2178a9bf1e8aac623c540f54e173ed197b2f3dd7e4e14ccb0b2f6d86cd SHA512 ba0b97102337e64f32db6c4c600c77428bccb867f7ca75fa6ee6741cf5d562bb29283d94e8cef3688f2e72a35ea3710a788ca45002adc5b4e9adf4fc5a83a465 WHIRLPOOL 34c7f0f22a7c3a688dc0290b39f1f6ae7105353a20ca8f50711c8a05846a57cbca7791b2f77e175e34645e8cdc55bd58c19b4260139423f4ef8ab45fe8c2830c
-MISC ChangeLog 17269 SHA256 9193f86708ec81de842ab4caa81147986a8537d6a469de124ff742f0937913b3 SHA512 6717d1c364e13b701f4094c33a112c0cacebd2cb95f4528a70c920d3d9f3744f16da0d61c9081e364bca11453c02453a920ef95ae78d7d1fc28c4f0faaf22d69 WHIRLPOOL 4de2a00dd74d4ad38caa0d8299fc239ec3935a2985b948e618cce32e400c1896d540cc616927c9d0fb3ba290e98168528b13ea07fde68d19a9711739d36bbbb0
-MISC metadata.xml 720 SHA256 0d162429a7a31a51f09f460c7c6e6a311c7f0d920495594deb7bfc986fe6224d SHA512 4b44abf9e2aba32bc60aba011b593401dc3b8bbed4d2e20f04f93f69c8bc67580c5c24946507e4e24ea802a6b05da7a3433d48b2cf0184764d15a60a61d6b6b9 WHIRLPOOL 7b1d1b25c56aa2536f3365ef0fb32cff4945ef09a352fc036614636acb8bf3d48c56e7d7934cb4543e4fa88bd8946f935a71ac9d1eb4d8e6ec9f63b339a094e8
+EBUILD pdnsd-1.2.9a.ebuild 3685 SHA256 bca1acd30da209463d22dd1c9a9196ef4df99dd77ac76575ff06b890fde8d185 SHA512 0db0314ec42b267096bc28b8a21ae05d0ad9d0b7d041bd4596a61e35843ed3fba330c3c3654fc8d2949ed0bbf230376bbe0bbdcafb5cbcda31477d3a07ecdc26 WHIRLPOOL ceacb1163ec1de63b49b11a31c0da2c6a29d10c9acaf86cbb906294ca7166600e65577ba35eea94537232ed11cf85d1bff2dcd273a1ada348dfadcb9085041b3
+MISC ChangeLog 17495 SHA256 907503fbcb4c5bf16491b691153c57745a2a7e9b3296bbe6f8fdfc7fb668509d SHA512 4497bed33f43c1127c3a23da1af79939292a9da0693600134b3042bd45882f4a0208f28a24eb6f8530fa5c8699c66d05f45f84c634e144927a03e8722b3027a5 WHIRLPOOL a8d1ccd97b24ee669b15cda3f643938e7ca7f52992b1df87960dcfd3df6d3ed91e772f73730468385617c492b319255de0351085fdc2d429a79672f4bedfd5f7
+MISC metadata.xml 832 SHA256 3c197153f23083829e0a999a45a347df60829a03fd0bb3124e65943fcd00cbe8 SHA512 e8fc00a1d55acab6c01bc6fea75cb4271a8e1286666fdc639bb1cf9c7412ca0a8a92a97320e66ee821a2716d45378a977542265229f6c27fdf7e4bff286b5466 WHIRLPOOL 7c63c4f9292833e373011f578cba0a292b577c2492d57b17239b77a03438ea7251b65137a346baa74912dad10b7d5e9f60ce75a4ceea9b5daa5ed6251bbec396
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ0RXqAAoJEPiazRVxLXTFffUQAIoTK7ccWbGYAVaoNcS1sms/
-H+foe5iGYTFBLsjtINpFYHWgaUowU9NhDjfPfHujFHGyPyV29qqjrhwY5Psv52BH
-iywZ97YXG3jAxdAU5N5puKR7Vb0cpCCReauub6ePBVxRTcuWzQQqt1Jb9n8DRnMi
-R56U6brSC9bLPNwHyFfCyPy4PE/Y33yZzjEnQY7u9o444zpMGfBUsNhLQWZhwr2q
-o2+sI4WGKwswGjOul++ww1vkt+g3ifF81Uw408/hg1t7fVk2v5DzWAfHK1FExtqk
-vD7Ze+I3GX79KHodsjDON73kHsHanRRIa4r8aggP+TbWUSbOAEICHBveVHKQQ0N3
-yYevGpNkXpG6emdsclAdyqawuDWb7HP3XgEnyuQZcW3sPnZFoxxoVjuSlmplnDxG
-qmG9nJnQNNGC+LcjytkCveQwBM/ibD+Oq1akmwxIRi3f2YqpTr1lwGzDg0GIuGkP
-Fr8cqRMFn6sDuAOKCo9l4No6IGEk6nq8sZ8Ao7Bve+Nj7l6QeMn57uLv3BYXUtPw
-J3NVseuaNjWogjxPqipv6SPHjqqOmBH4GTh3fAEddgjxeZfYKbIABk32opd3uA3F
-9YWppj0tqhHfk1DnZhpCjTNF1g0JJ6VZ9CKw3LYArzLeP9gKnC7NG1BDvlyMf6Kz
-iMmAiN/jTkhiVxxWCr56
-=qAW8
+iQIcBAEBCAAGBQJSU6EDAAoJEPiazRVxLXTFalEP/RU/uV2Pi0Q3GRagzzU000jp
+GU1qNW9T/+uziSGWfs9gZMESP/2AZCeDU1Ij++y3SoLxp2GMYgkuaWtVffG7i3Ga
+wmijydR0hYosE6RKrVEELga2G/lRKoJ8NGI8ceWLs+DhriPzkNjUYag6ggXUL+Pr
+DeodiJopNd9psq3NsB6Cq9Feb3UihGX6buvJGXASDP0CSrgpDJecPeokF1ktfAyQ
+HeKHXuoCFZPTfUm0IDsFNpEwReIEsSbPy9inOwOeuBWN7JEf/NcUd/DLcpoxbY//
+nH7RoU47PAupXZ3wDezdryygIXTd2njpf4Hjm4P/te4nGbX46i2tHTTr/raLKhPA
+9v5In5Ja+HZ2Ti1tgJusi7Y4/N88hQA8A0XTcErp1CHFEKiFnrVpsDX7ESeNQHH1
+BYsIDep0hup7b3nhSZrYEBYzEf+jOmugSTIKnNLhRp8wvynww1yFFrnHS6ccNSyf
+F+vEPGx4h3wM838nfqNODg0+5vYi4sA1u6ZppJPoJYydnWEdFfQuxMZc7rf0Sg7E
+4ApRb3dT997IUN50zRg9MIRwibe6cyUY0uCDcNYSn3Kq6lJAHQ+IZRqypg5Q7zmH
+7S7WxKokIiy2+SGPYX4/sg/MzoLHiw6BnjILKL1lAM1caLxKUQe0dVdrJnm79NGE
+YETeJvGffMKJyr8chujg
+=FdwD
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdnsd/files/pdnsd.rc7 b/net-dns/pdnsd/files/pdnsd.rc7
index 92122b1217f0..f6c91add617c 100644
--- a/net-dns/pdnsd/files/pdnsd.rc7
+++ b/net-dns/pdnsd/files/pdnsd.rc7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc7,v 1.2 2012/12/19 01:18:33 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc7,v 1.3 2013/10/08 06:06:58 polynomial-c Exp $
 
 pidfile="/var/run/pdnsd.pid"
 command="/usr/sbin/pdnsd"
@@ -9,7 +9,7 @@ command_args="-s -t -d -p ${pidfile} ${PDNSDCONFIG}"
 extra_started_commands="reload"
 
 depend() {
-	need net
+	use net
 	provide dns
 }
 
diff --git a/net-dns/pdnsd/metadata.xml b/net-dns/pdnsd/metadata.xml
index d440a20e725a..796f42735df4 100644
--- a/net-dns/pdnsd/metadata.xml
+++ b/net-dns/pdnsd/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-dialup</herd>
+    <maintainer>
+      <email>polynomial-c@gentoo.org</email>
+      <name>Lars Wendler</name>
+    </maintainer>
   <longdescription>
     A proxy DNS server with permanent caching (the cache contents are
     written to hard disk on exit) that is designed to cope with
diff --git a/net-dns/pdnsd/pdnsd-1.2.9a.ebuild b/net-dns/pdnsd/pdnsd-1.2.9a.ebuild
index 0b913e0ceb62..a6acc3a1eb83 100644
--- a/net-dns/pdnsd/pdnsd-1.2.9a.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.9a.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.1 2012/12/19 01:14:36 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.9a.ebuild,v 1.2 2013/10/08 06:06:58 polynomial-c Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit user
 
@@ -35,23 +35,22 @@ src_configure() {
 		--with-default-id=pdnsd \
 		$(use_enable ipv6) $(use_enable ipv6 ipv6-startup) \
 		$(use_enable isdn) \
-		${myconf} \
-		|| die "bad configure"
+		${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 
-	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO README.par || die
-	docinto contrib ; dodoc contrib/{README,dhcp2pdnsd,pdnsd_dhcp.pl} || die
-	docinto html ; dohtml doc/html/* || die
-	docinto txt ; dodoc doc/txt/* || die
-	newdoc doc/pdnsd.conf pdnsd.conf.sample || die
+	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 || die
-	newinitd "${FILESDIR}/pdnsd.online.2" pdnsd-online || die
+	newinitd "${FILESDIR}/pdnsd.rc7" pdnsd
+	newinitd "${FILESDIR}/pdnsd.online.2" pdnsd-online
 
-	mkdir "${T}"/confd
+	mkdir "${T}"/confd || die
 
 	cat - > "${T}"/confd/pdnsd-online <<EOF
 # Make sure to change the rc_need variable to the service for the
@@ -74,7 +73,7 @@ EOF
 PDNSDCONFIG=""
 EOF
 
-	doconfd "${T}"/confd/* || die
+	doconfd "${T}"/confd/*
 
 	# gentoo resolvconf support
 	exeinto /etc/resolvconf/update.d
@@ -87,7 +86,7 @@ src_test() {
 		die "$1"
 	}
 
-	mkdir "${T}/pdnsd"
+	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" \