Do not keep /var/run subdirectory but create it as needed, and replace --chuid with --user, by Marien Zwart (bug #431980).

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

4 files changed, 20 insertions, 14 deletions

diff --git a/net-misc/apt-cacher-ng/ChangeLog b/net-misc/apt-cacher-ng/ChangeLog
index ebf1906c49e6..c6c7d6c254eb 100644
--- a/net-misc/apt-cacher-ng/ChangeLog
+++ b/net-misc/apt-cacher-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/apt-cacher-ng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.14 2012/08/07 00:04:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.15 2012/08/20 00:32:23 jer Exp $
+
+*apt-cacher-ng-0.7.7-r1 (20 Aug 2012)
+
+  20 Aug 2012; Jeroen Roovers <jer@gentoo.org> -apt-cacher-ng-0.7.7.ebuild,
+  +apt-cacher-ng-0.7.7-r1.ebuild, files/initd:
+  Do not keep /var/run subdirectory but create it as needed, and replace
+  --chuid with --user, by Marien Zwart (bug #431980).
 
 *apt-cacher-ng-0.7.7 (06 Aug 2012)
 
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index feac6efb3bb6..bc7bcf27ad76 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -3,18 +3,18 @@ Hash: SHA256
 
 AUX confd 90 SHA256 cabcc9da711514913e5136c82842c750bab8a9658aeeb88da5a266e0d69b29a1 SHA512 14412f717ad334e6ce5cf65b9b0968fc3ab27e93f3d3ce52d39e0b646694e8e7d7905ede25feeabad6ef3301b5644677f30e27b867ff32f665ab6c4e2cd0a662 WHIRLPOOL b6e2a87ef590b806a128bc7198b2d278fede6bdd6b5326f3dd1bcbda193e8c56248a997e01e624e4c7468b9f459c8d18fc3c9631263dd560ff0601bf5dde3598
 AUX cron.daily 459 SHA256 6ec7ceeead17ef5a84d5ec5472d38810d9e1478213643da5f3fd9863dde40094 SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a WHIRLPOOL e9c69a8d21a38435522f02fd7ac4b2924ad641e2058a9bc3ae051f155eee500e33d116cf868328a665d082c616c42ba3e5de751437ba24eef193541975e792db
-AUX initd 780 SHA256 dbdbd14df1d3a83a887eb8f7d0d014efbad78e01ad6722627ca7c43fbe4025d5 SHA512 4d92beac4d3970a58af2e86409d07d40f95142ae04e3a307b032bc2c9a5fbf236898984555c2b17332f22258b484fa215e979e20145a34279751347bcdb976f2 WHIRLPOOL 98d7cd585ccd48d31d8619dfe5a3b302ba1e63666f484f0a442a42b4f9b6aa36657fcb33ce3a72063d076070bd58aab93782ada2aeaf58a829b4fe96681b7181
+AUX initd 830 SHA256 d9fd5c213c65f74779f444337fec93304771f4bd560baf712d1f6e7c04fdd1e1 SHA512 284592c02d32d4be7eefa4743e3e46782100bb101648de523f16defe944103d212315f9d3113c74706c355041005390b2e56bbe6486b83f16a013011fe76d9b2 WHIRLPOOL 6e0f81474025444124f762e3343c279ecd7af494b08f6fc0e02120a1f0864f945949df64558c27a5f21be48786e2d2202aba5a78a4b2282ed3035888e12ebd15
 AUX logrotate 377 SHA256 6f1624d655383452a6d56d69327d41b80379cc667ad2d481ca94f8ea78f7a65b SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885 WHIRLPOOL 80037bc359ffb860ce19e2493d10597f81e02138368ad2bce002da8f4a725cdeee61662478efff4755f0f8a0c9f376263fd6b56505eddddd5c18c1a33f7d22b8
 DIST apt-cacher-ng_0.7.6.orig.tar.xz 256572 SHA256 1d455ab662da05103b7abd903c1ac209c100532d81a0252c6c30e5ed6c475926 SHA512 7773cbca3f916a363cde062bd8be7dd6d4ca54acd87fc3817fea7a8cd30681382a8cdc51e45c8bcac1094d312adec1c62257344457cf340bdebb58a31aad1f98 WHIRLPOOL faf898d38fb1871e2cadd2864766ff2d5f30173b7a0346e9b645fd9b73e127f8766567161ea9ec4ff6dc70d1cac32107bb913fcec8f14ea13f9928979913b53e
 DIST apt-cacher-ng_0.7.7.orig.tar.xz 256848 SHA256 794e47ad073e1288903dc984b6ee3ee6a951919df31d577867c8678e305c85a9 SHA512 162661a02385264267dc022ffa6a91cc3f8750a30dd990c237054105072e00a72a8e3075e80e249dbd56ffaa7820b1dd50dace56f75bde4da32f5cf00bbe37ca WHIRLPOOL dbade92d41aeb633d50a03739a03534cd8e9005991e1fe05c4a110ee875307f8ca5d63604bf0361c34488738d1ee58a744b5561e02337b14a84f139458bb42af
 EBUILD apt-cacher-ng-0.7.6.ebuild 2329 SHA256 93d3339de2f1f87d12060f4f219a32308996f8d5af525c5172115966efc5435b SHA512 10fd34d11cd9adc262b5c7f42039075041da961ea8db938e947d9ca2cb67a69c9c8f235838966f09778a3c105faff80f1875e2291d7a728cbc769ff2df6857d0 WHIRLPOOL ad1810e5d9085a820f97696a6e2b74be869ecde3f21017c5cd2fabcd3b1dfea794d9b9b12d3e10b1d7a36844c173317b9e0fca4679c67da075e9d1383738d7ad
-EBUILD apt-cacher-ng-0.7.7.ebuild 2329 SHA256 eabbf38372b885110242128e54548abff11dbb68c4158f73383b853ad87e43e0 SHA512 80613b9133a7f767517c0db513d3dc21683d64d2c0f2da167b7c6f61a6f199dc9ac4d0dd2ed9326d021c8889c0b015d54821a1000b4d36df0587b7b45c56adc2 WHIRLPOOL 1f363d6250a1bb7b814856aea08a867775eb559b1e485a23d61792117d21eb92b68fa48317424afcae59603a6d8dbfbe3d68ca4a54fff5f8ce1ac5045e5c1645
-MISC ChangeLog 2519 SHA256 a02104f8164a2068d205cfb4c435364c5a94e054211c565ba9034ae1a2e234d5 SHA512 7c711815390047228b74cc0df780b02d2ab402d2e18ed0726076145c55679188917492f7f721cf96f3f378c9a53822062e651c513b42a33d87a8ca8b5f8fe565 WHIRLPOOL 03c6b7372bdbf84d9947abcca16ff116a5a0ed56313d1382610a3530466e7c0fb84d55a961d9793cf09eb21dd5addbc8d3904fb8572eae6bce4da5c9fb2e5c72
+EBUILD apt-cacher-ng-0.7.7-r1.ebuild 2289 SHA256 36e819e812034e5e355d69619d80bc7d7ea11839a2f41d7aa1c8d2c03af3bc9f SHA512 21a1632eda60fe60d8e2dca0c78a95c8630ee8e3392b3d3fc96c14fab6bc107f351a30d8e4e9e46c8011191fa990458912f368593124e641d849105509fca7d5 WHIRLPOOL 809d25c6b447959725fab5d4d759a1dfb26367ec7142d6147bef1f147981e74a1ca2e750daf552094199f44ea7f5dc622f2afed8318b9944ff69c7077014dcb6
+MISC ChangeLog 2809 SHA256 eb99c949c7448132211a93eabee38d4ca89d0b3b319abb49a8642c77c9196ea9 SHA512 b6867e08383d01610dc107e4969e08bd070ea73080eff30b00edad0af5e09d0bad630afb99bc573e9b19a78b29a0d4f06430aa2beedb5c7d181b36376f5c5635 WHIRLPOOL e69d27234d6e83714c8d49ff778d6ffdd40d4031bab78f5ccfd862d294d70097bd4344415b74574d1dc0be1f9fb5626a169385343bb0bebcf5734dc69a5ec7f0
 MISC metadata.xml 387 SHA256 83e4af4a9dff85e9d5d58a7704abff4dad046540b992c819a8203d529673e6d0 SHA512 5208a00d95e1f640eb0e10bd448f90465fa61eb3b9139406287af49b14511ead780a7bf613924b8e41dadba6fb1da2939683fe64ee97fb27ef2baaf494331c28 WHIRLPOOL e8fa3d5a1b746fb808e082eec20f734d4d309625f4f485df443f477a79d4f9fe358935cab369c7311f9432366a0e5fbf8ecb1a3377393ffc43922af265983de6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAgW6UACgkQVWmRsqeSphPHngCfeIib8pwlDOHuF/yxrIYpdvgQ
-bV0An06x7xkQcGimho4ELK2VDSwyvTfg
-=zgAf
+iEYEAREIAAYFAlAxhZ0ACgkQVWmRsqeSphPx3gCcCwX2g4XZ9aRmpN2Cc1s93JLH
+fNgAn1gA+AKBA/ZvVlsNgsR/2Y5l6VoZ
+=OUE4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.7.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.7-r1.ebuild
index 684b89880943..54388b947a11 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.7.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.7.ebuild,v 1.1 2012/08/07 00:04:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.7-r1.ebuild,v 1.1 2012/08/20 00:32:23 jer Exp $
 
 EAPI="4"
 
@@ -101,10 +101,8 @@ src_install() {
 	dodir /var/log/${PN}
 	# Some directories must exists
 	keepdir /var/log/${PN}
-	keepdir /var/run/${PN}
 	fowners -R ${PN}:${PN} \
 		/etc/${PN} \
 		/var/log/${PN} \
-		/var/cache/${PN} \
-		/var/run/${PN}
+		/var/cache/${PN}
 }
diff --git a/net-misc/apt-cacher-ng/files/initd b/net-misc/apt-cacher-ng/files/initd
index c7df24365095..00a869ee4425 100644
--- a/net-misc/apt-cacher-ng/files/initd
+++ b/net-misc/apt-cacher-ng/files/initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/net-misc/apt-cacher-ng/files/initd,v 1.1 2011/05/24 21:48:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/files/initd,v 1.2 2012/08/20 00:32:23 jer Exp $
 
 NAME="apt-cacher-ng"
 DAEMON="/usr/sbin/$NAME"
@@ -16,8 +16,9 @@ depend() {
 
 start() {
 	ebegin "Starting $NAME"
+	checkpath -d -m 0755 -o ${NAME}:${NAME} ${RUNDIR}
 	start-stop-daemon --start --exec $DAEMON \
-	    --chuid $NAME --group $NAME \
+	    --user $NAME --group $NAME \
 	    --pidfile $PIDFILE \
 	    -- $DAEMON_OPTS
 	eend $?