[sys-auth/munge] Move dir creation to init.d and eapi bump

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

4 files changed, 34 insertions, 24 deletions

diff --git a/sys-auth/munge/ChangeLog b/sys-auth/munge/ChangeLog
index 3dea28863430..b2225c2df86f 100644
--- a/sys-auth/munge/ChangeLog
+++ b/sys-auth/munge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/munge
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/ChangeLog,v 1.10 2011/10/04 17:27:37 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/ChangeLog,v 1.11 2012/04/18 12:14:01 alexxy Exp $
+
+*munge-0.5.10-r1 (18 Apr 2012)
+
+  18 Apr 2012; Alexey Shvetsov <alexxy@gentoo.org> +munge-0.5.10-r1.ebuild,
+  -munge-0.5.10.ebuild, files/munged.initd:
+  [sys-auth/munge] Move dir creation to init.d and eapi bump
 
   04 Oct 2011; Justin Lecher <jlec@gentoo.org> munge-0.5.10.ebuild,
   metadata.xml:
diff --git a/sys-auth/munge/Manifest b/sys-auth/munge/Manifest
index bcbba6c7e3ec..8b0c2d27287b 100644
--- a/sys-auth/munge/Manifest
+++ b/sys-auth/munge/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX munged.confd 410 RMD160 d2bb7fbf45253f6f4441e1953bafe36a8d41f7cd SHA1 26bf6e224276638dcb180ec543a6711a4200c060 SHA256 da77587b40217b6a5e0cff2c9d8a405cff34c42496d14626710934cb08e662c1
-AUX munged.initd 1027 RMD160 f8b992ded580f33a5719a7af23c56ed67034f5ba SHA1 2f11c9c4bbff34a029f2c2c5990421e6ae20b262 SHA256 e95546c51d3fa6365d4babb1a876175120a46610b69da3adeb9a480f7c3ea775
+AUX munged.initd 1177 RMD160 4ae83c699478b9d6c9d3a1dec9c3ab82ad5a7037 SHA1 9dda7c9312e29298a346c6e1bf9368d1375119f3 SHA256 153f1de109d48f18893dd7650d40decb3e707c07ca8410910b8b3ab22e4fbb24
 DIST munge-0.5.10.tar.bz2 424285 RMD160 d461bd002dde7114608993dacb6a5535a9047f2b SHA1 2abd4103dc99549e2d8d002d845e301304f3fbbf SHA256 00e0125c2895877b555872647b0a98d13838a54acda78614bb6c6e70daadabc6
-EBUILD munge-0.5.10.ebuild 1532 RMD160 23894c58c3d784c1574aee89ca7a0f3f538af3d8 SHA1 7eb5ff20550576bf63604c9681f10fa545fcec19 SHA256 806446343db27eb0fe21788ca68a35cf7c5593b52add46e087510f6c14e1a26f
-MISC ChangeLog 1429 RMD160 be8c98cb85ac6e65fa43540a41a38275d006c329 SHA1 601f7937a341f1f29d5f4de97f283d42a0486772 SHA256 5c19f6cb7aa360071c216130d3c07958521cbd606da4190e1caada6cd85d37bb
+EBUILD munge-0.5.10-r1.ebuild 1348 RMD160 7b91f7c0f1f3cc4fb6a6308b9c2ef127625056ab SHA1 bd60a726b68901f2caa07ec05c4a047e861a295e SHA256 92f19581ca3bbe3de22a836958dbc9897e877a1d1e62d3fb6722558b988b24ec
+MISC ChangeLog 1645 RMD160 6a0547cff71f7fb592d89e7e473c667c0626f6d8 SHA1 bb53e3f5cffce12946410ecd76f09be539fc275e SHA256 ccbbacb0f8d9d56f3ce717688d5e4584822c09c2d751c6d27f3f81db25b7a035
 MISC metadata.xml 981 RMD160 89f72130929f868f54de0243da0f29de00cbeced SHA1 b504406ab8ab97f143216dcfcfdf1bc51711e881 SHA256 893cfbe96fc2dd0b867b224d07e303419540f2b7e9039f39d221a0d3aea4dc8a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk93T5sACgkQ/ejvha5XGaPY6ACgkQY+MFUIGCYBKHdzSLygmZ8D
-CVgAnjzWB6ZfGUj4wGCKzsTvaL7l06bA
-=JvjN
+iQIcBAEBCAAGBQJPjrAIAAoJEOf+E+/4L5LmUd8QAKGpjMR8CAy578KZSAA4Vu6L
+3AVV/8bvaA5rqm8Rheb/+6M99ToI64x+3p8bFaEz16eLe5c0R37r1V/oDAF1PLEJ
+N7Z+AKnWdGRIws86IBOxjW58KuX2LBLMi0TAyKPBL/0Xpq/5ruNNTc4n0trMWdk1
+SyPVNHYD3f3Mq+bIvqReJeG/QyJI0AOGBzazKIVot6ZjT8lAvG8R8MZs1RhEdoXv
+pKxgORNuhnSd71/1c/MMmfqasU8S5j9tMnbU6tnDKl6WDGe48BvYPEc5f0HNpuYj
+HcznXSjo/tZvHfgR3ZBaBXb+iE9rJ9EOl7n2IK1TkgogxXe2wqXzTUIiOGX+07YE
+WVwomNimqRK4Lf2d18YcHjTjR3S9kfonUSEc+YNvk4zZWY/p9awuGLCU4M7AIrCs
+5rByXnsVR4RZbOBw+8WACkn4gTC2toxCeyfsumcd8WaYFFzv/m40m4x9mL0StXaB
+uZfeDR8kcZXvum6LdmpihaHtloOsgQZStHqarPYPX/LgsbqW9BpRNvY38oM5H0O4
+1LpIqr/pWfZdAMMV/+sT1DUhyMQI1u8TmwTL1B7pXn26rsc1fS4VFPTiYjid4BP4
+iQSKP0Oi5Dn4J3/wn+KdF+ZDJ9EO9o6EJxXnQpT/9cdwJosXtJwHDd9VjpVlFEcr
+fsRnST0AetmAS/pWD8Nb
+=S6EZ
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/munge/files/munged.initd b/sys-auth/munge/files/munged.initd
index 74583857ad02..8d0d9e3414df 100644
--- a/sys-auth/munge/files/munged.initd
+++ b/sys-auth/munge/files/munged.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/files/munged.initd,v 1.1 2010/11/14 23:04:40 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/files/munged.initd,v 1.2 2012/04/18 12:14:00 alexxy Exp $
 
 depend() {
 	after localmount
@@ -20,6 +20,9 @@ start() {
 		eerror "Failed to verify/create munge key"
 		eend 1 && exit 1
 	fi
+	checkpath -d -m 755 -o munge:munge /var/run/munge
+	checkpath -d -m 711 -o munge:munge /var/lib/munge
+	checkpath -d -m 700 -o munge:munge /var/log/munge
 	start-stop-daemon -S /usr/sbin/munged \
 		--user munge \
 		--group munge \
diff --git a/sys-auth/munge/munge-0.5.10.ebuild b/sys-auth/munge/munge-0.5.10-r1.ebuild
index 6e0fd7989603..1cdafdd34935 100644
--- a/sys-auth/munge/munge-0.5.10.ebuild
+++ b/sys-auth/munge/munge-0.5.10-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/munge-0.5.10.ebuild,v 1.2 2011/10/04 17:27:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/munge-0.5.10-r1.ebuild,v 1.1 2012/04/18 12:14:01 alexxy Exp $
 
-EAPI=3
+EAPI=4
 inherit eutils
 
 DESCRIPTION="An authentication service for creating and validating credentials"
@@ -43,15 +43,6 @@ src_install() {
 	diropts -o munge -g munge -m700
 	dodir /etc/munge || die
 
-	diropts -o munge -g munge -m711
-	dodir /var/lib/munge || die
-
-	diropts -o munge -g munge -m755
-	dodir /var/run/munge || die
-
-	diropts -o munge -g munge -m700
-	dodir /var/log/munge || die
-
 	[ -d "${D}"/etc/init.d ] && rm -r "${D}"/etc/init.d
 	[ -d "${D}"/etc/default ] && rm -r "${D}"/etc/default
 	[ -d "${D}"/etc/sysconfig ] && rm -r "${D}"/etc/sysconfig