version bump by tom@whyscream.net

Package-Manager: portage-2.2.0_alpha194/cvs/Linux x86_64

5 files changed, 40 insertions, 9 deletions

diff --git a/net-dns/nsd/ChangeLog b/net-dns/nsd/ChangeLog
index d80fa7786a18..d68f81bb808f 100644
--- a/net-dns/nsd/ChangeLog
+++ b/net-dns/nsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/nsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/ChangeLog,v 1.6 2013/04/03 21:06:18 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/ChangeLog,v 1.7 2013/08/12 11:23:45 wschlich Exp $
+
+*nsd-3.2.16 (12 Aug 2013)
+*nsd-4.0.0_beta5 (12 Aug 2013)
+
+  12 Aug 2013; Wolfram Schlich <wschlich@gentoo.org> +files/nsd_munin_.patch,
+  +nsd-3.2.16.ebuild, +nsd-4.0.0_beta5.ebuild, -nsd-3.2.15-r1.ebuild,
+  -nsd-4.0.0_beta4-r1.ebuild:
+  version bump by tom@whyscream.net
 
 *nsd-3.2.15-r1 (03 Apr 2013)
 
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index 5bc2fbba67ab..29f5e72b7dcd 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -2,9 +2,10 @@ AUX nsd.initd 1473 SHA256 121a11fb6bb16f6f4a8a7de85fe3b9737240f48a3e01336cfe98c0
 AUX nsd.munin-conf 238 SHA256 41eed9d020fef71324bb80ba291153e62810189057e84446136304490f00507a SHA512 b543f4d604b8abaa88383f413d5b08699c9581fd68f0aafa0df7d0dfaedff12f4c8e00b6787d010dda79eeed1911a9feff63ae66e655382e61c5b7734d3f5249 WHIRLPOOL 110187052074e5501c7e72d4b55fe6a3fcd4830bea4ce40a669405aeeaedce4b030f1a41e763801553910c2f9320e62c6076d2a321b968ef3b2585303931dccf
 AUX nsd3-patch.cron 378 SHA256 c711346df2d9d6ffe6e1fe3e701f5e316078b085a6dcb1091a6909e42141bbb7 SHA512 660321b4df86895c1769671cca6847e36d77d8108ff827d0e338bb052317490582c27967870a866a5fb84088e4a109e2cf5cc67c631f4bd4ef5af1595db47849 WHIRLPOOL d74e3a5da2a67484f922b6bfe5993ff993c7ec6852fb2e50b7d5d69e2e668dba73b4c08b2b4639310be129f485a29bf02c66969ca180c570e93712d1f6903452
 AUX nsd3.initd-r1 1817 SHA256 32c2980a0d72f0069e21967cdc64432289fa28172d90e915b51824f0818f8c41 SHA512 eeb697d61e9423dd5ff7264a5cdcc61efaa1113f0c7d402384567fc33b7c4974d0c694226d94167c42ba72c981ab546a3d5f66ceade5cf3a8209c44822f36851 WHIRLPOOL 2e3863b6795397d74b7148d24d23d1b6098fb6bcc0be25a1db8d2e9abc25f39b0f816c15363d752a634c1135cb765ef2d42b60d31fce8593727ba9c2c043ea75
-DIST nsd-3.2.15.tar.gz 909346 SHA256 a1a0eaf88c2d788fcdafd6848a1ff45e113e95cfc17a87fb0e71eab34ffdad64 SHA512 ed431f8b4ed2d28bba3ec05db7ea9d176b5be6daee4ca086a5bad65606c82abb15653ae6c664b3a32b88becf8a99f3aa6b447583af12ac677bd5dd84962b070b WHIRLPOOL 1c230c08a7af92bf2c67b467fdf1f5f6807c3ff6e04657d80bd3496c7e999baa16ca007294318e72279ac4da2c311d0f952b13fafcc0d7dab1096f699373700a
-DIST nsd-4.0.0b4.tar.gz 1014056 SHA256 ed29019d6e8aface4c32e22c9968aa9688acf98f8356112c4ee89a923022cc2b SHA512 5ad0de69b1cf85ecb3f54c0741969e67657c94c4c9646a3191d3b0a6fc08d9ac3b544e3c3fc99e09791ff9f4fb11f255308a3049648c0d6cdf718e2376cc1cd4 WHIRLPOOL 2784005e5fceb63bf058f8afa91d0fbf829707a5e8cb833ff9c5b440a2208357c0363041ac9e831374d9208093a4d29d88ac079bc02616922b8793e3a262883b
-EBUILD nsd-3.2.15-r1.ebuild 2070 SHA256 c263b5b3f28b6b820b7780152451fdc74283c17289b6d45c7e24b0733a8f709c SHA512 a9c834140cc97d2ffc03c1e800afe330e5630d769dc413c17667c2d4770c19c229265cd062a62b1a7dbb6ad3a5c59e9c2b7fe82ca989358948c4c81256c1ae0e WHIRLPOOL be894d2151620231b8a32e85f2783085f4726957fd9a5f2f0a7844130a71f52355a13cbf9df7d25faf5c205225a0f0db2fdf7b128540b7b36f4a638d7ec40f11
-EBUILD nsd-4.0.0_beta4-r1.ebuild 2541 SHA256 b5f7039f439a1fd26815eb352b1bfc92fc7a7f040373733499daba1b9379e5d6 SHA512 a849107b6d25a2cc868bb04dbfdf21f70e411f288a71316302a3b66385e6f034f1fd5fd08cbfd35b4d1ad0c3946fd45ce35ff6960c893a41d7fa86804275ca02 WHIRLPOOL adae537818f1f2eb5239351124712e9a81e62f78e6f7e388a36cf506118a8418197a3dc7363dcf10015345611656a0081cd2b5b35b911fd0878d30087d73cc1f
-MISC ChangeLog 1491 SHA256 4bf0255eda28505348099ec39812ca8f0dc18bebbc4c216424a55ca4ba1256de SHA512 c1a2bf89673b5cc3ccc578c62be76f2cc1bf7acbb386306210d67221b1a888c88ec351ba6f921968a1ce7339e209b405f3d504f6ac2f672052f0874d4d918fc3 WHIRLPOOL bb442127887d995558c16b4c15a083dc493fa36cc975f1aebdfa25d0f1a6de788255ce9a2595bc828271b3146a72173a48ffa87da49777a0f29b01c0a902f076
+AUX nsd_munin_.patch 615 SHA256 4600523d5b2c5f703a18c524d95a28839dbf717a32d764452c2fb93a9e238066 SHA512 c270601037fc43ab81c824181d1dc54894073c8879e469a0bd067abce62d174168633ac6d5a8636f44e85fc750e4bea1392debc3013b8c4f6cde2c2c5d686ac6 WHIRLPOOL 2d61acb5e6a6a131b29a993ad6f84e676375081104587cf1f9b3f309c23bfd14a69bf48be41e200de28bcb4641c10ef985047173a129ac2567d7d5c109a5bf0a
+DIST nsd-3.2.16.tar.gz 917815 SHA256 15a5fd69ea80345eefced83a58b40e8f262a06ac4f7f83606d33033b167d6604 SHA512 361934717b1975a68c074e0f1fe324259a5939871a6e76f5d7d0535f02a129f0940b16fb544b111c8c8849439c75387e2f50223a2ef3442bac66a2be23bcd529 WHIRLPOOL a3f86839aa24548f033d21b1cbe40b95ef45ea6fc6a7e89e84667a9224fc0b3fe5f57c162a774a2b9a18ae0c98ade397eef3e65a0b7985d9b84318b55740ff84
+DIST nsd-4.0.0b5.tar.gz 1032007 SHA256 e949c9406562ace1c158a53a53cc4bbf57a6861bd55d5c72373be844ddddb2ac SHA512 fbe2b0d45859c08cd2bb109f77e0014bc6f2de42acc0916b588ee8a48d601fb95fd523ecf54cc0ca549517d99f9380ef5751e36c2dbad111f2af6d9c4fccb721 WHIRLPOOL 66a5b1e021cae2adfd88539da0ff96117e64ffb9cd8a3858a8ac3abf358bc731bc4de23d4d15810c436042ecfdcc8d5ed8c3153ac39cc88610c68367693743fb
+EBUILD nsd-3.2.16.ebuild 2067 SHA256 4151834d9cda77e645d4a58c96d287d7e1e57d53a9fbe73c0029e57a2f7e7cf2 SHA512 84604efa50046612013145b4a6092999770ba3448857466d50ba86ea730b68204318bc1c89b0861ac84bd440324ebcdb62bec974e66766b7db024d34dc0845f4 WHIRLPOOL 33886f2a30780d8663b4e839d6f434f326b0adb3ed0cfb9b9ae278ecac3603b65c05e7a8fd8706df500bb306209ad730e1f29ee5ecd8317a040a6f2bdacd7485
+EBUILD nsd-4.0.0_beta5.ebuild 2661 SHA256 cce19b24e7bb6947c82d10ada384a6a385a958e8e0dd56e792aa6e6c60295c68 SHA512 d41cca00471f4b69a82b6dae73e351c015f0e6e80dd87458cda87280e742edcd0906160413171df7787e6535068326aed07cca14d052395613e0aa1bb35ea3a4 WHIRLPOOL c67e83e3e0acdd7b7b39b1db20d551b2a3f3cc822b069b1d1f4dfd0e97a68d765dd217f039af7d6899027b227348307ea2099ed3d3a8fe26c6df03bbf749a46a
+MISC ChangeLog 1764 SHA256 e40309b2f866bb9c9e4325609f1445d5a223314b0d09b74150739b45277df40a SHA512 f00187401880dcbbcb5eb0b27e025dde5b3305b7b31b4d420a49a49f102be69426fbdd6772a4709d2511116fbbb06463328161099d43cd1d375ae5d44ef46ff0 WHIRLPOOL 8a2f740b84948af360b82d2942a1bcc8821613cc7eccd6f53a21a42f351fd9c16d6e00e1261c6fee9d3b26797ce119c0987e3d49d06a6effd83a27c5e2771a57
 MISC metadata.xml 1351 SHA256 9242e72da72026ab7eb633fd3c54165f7f209ed2b7db5b1f9f458b2fc7b86487 SHA512 0e3960a410aed0b061efe259689926eb39c0d81037bdcdcc6553b25e341967ffc5929d53c00bc7bedb7ce7b9d0188e5179ee4eb0b5648db82609458e4e06986b WHIRLPOOL bb3a0cae913b9f743a57976f1a6e80dec1943f32ca2550612116f9636a17f363376ae00e64e0f5dee3c4c0ab436d6cf4af227a8db6164c7041c6ffd509eb91e6
diff --git a/net-dns/nsd/files/nsd_munin_.patch b/net-dns/nsd/files/nsd_munin_.patch
new file mode 100644
index 000000000000..96902f4ed195
--- /dev/null
+++ b/net-dns/nsd/files/nsd_munin_.patch
@@ -0,0 +1,17 @@
+--- contrib/nsd_munin_.orig	2013-08-08 23:14:27.000000000 +0200
++++ contrib/nsd_munin_	2013-08-08 23:41:24.000000000 +0200
+@@ -87,10 +87,10 @@
+ 
+ =cut
+ 
+-state=${statefile:-/usr/local/var/munin/plugin-state/nsd-state}
+-conf=${nsd_conf:-/usr/local/etc/nsd.conf}
+-ctrl=${nsd_control:-/usr/local/sbin/nsd-control}
+-chkconf=${nsd_checkconf:-/usr/local/sbin/nsd-checkconf}
++state=${statefile:-$MUNIN_PLUGSTATE/nsd-state}
++conf=${nsd_conf:-/etc/nsd/nsd.conf}
++ctrl=${nsd_control:-/usr/sbin/nsd-control}
++chkconf=${nsd_checkconf:-/usr/sbin/nsd-checkconf}
+ lock=$state.lock
+ 
+ # number of seconds between polling attempts.
diff --git a/net-dns/nsd/nsd-3.2.15-r1.ebuild b/net-dns/nsd/nsd-3.2.16.ebuild
index 2e407a42031e..f461b9ad0694 100644
--- a/net-dns/nsd/nsd-3.2.15-r1.ebuild
+++ b/net-dns/nsd/nsd-3.2.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-3.2.15-r1.ebuild,v 1.1 2013/04/03 21:06:18 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-3.2.16.ebuild,v 1.1 2013/08/12 11:23:45 wschlich Exp $
 
 EAPI=4
 
diff --git a/net-dns/nsd/nsd-4.0.0_beta4-r1.ebuild b/net-dns/nsd/nsd-4.0.0_beta5.ebuild
index 601004e78fc7..f46a11242030 100644
--- a/net-dns/nsd/nsd-4.0.0_beta4-r1.ebuild
+++ b/net-dns/nsd/nsd-4.0.0_beta5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-4.0.0_beta4-r1.ebuild,v 1.1 2013/04/03 19:10:39 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-4.0.0_beta5.ebuild,v 1.1 2013/08/12 11:23:45 wschlich Exp $
 
 EAPI=4
 
-inherit user
+inherit user eutils
 
 DESCRIPTION="An authoritative only, high performance, open source name server"
 HOMEPAGE="http://www.nlnetlabs.nl/projects/nsd"
@@ -37,6 +37,11 @@ pkg_setup() {
 	enewuser nsd -1 -1 -1 nsd
 }
 
+src_prepare() {
+	# Fix the paths in the munin plugin to match our install
+	epatch "${FILESDIR}"/nsd_munin_.patch
+}
+
 src_configure() {
 	econf \
 		--enable-largefile \