Use correct pid file, bug 389463

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

4 files changed, 39 insertions, 33 deletions

diff --git a/net-print/lprng/ChangeLog b/net-print/lprng/ChangeLog
index 3204cb325723..9ec869ed4fb3 100644
--- a/net-print/lprng/ChangeLog
+++ b/net-print/lprng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/lprng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/ChangeLog,v 1.60 2012/02/05 13:58:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/ChangeLog,v 1.61 2012/08/23 20:23:41 dilfridge Exp $
+
+*lprng-3.8.35-r1 (23 Aug 2012)
+
+  23 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> -lprng-3.8.35.ebuild,
+  +lprng-3.8.35-r1.ebuild, files/lprng-init:
+  Use correct pid file, bug 389463
 
   05 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org> lprng-3.8.35.ebuild:
   no HOWTO anymore
diff --git a/net-print/lprng/Manifest b/net-print/lprng/Manifest
index 3b256c6ace4d..705a1ee65420 100644
--- a/net-print/lprng/Manifest
+++ b/net-print/lprng/Manifest
@@ -1,32 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX lprng-3.8.27-certs.diff 1120 RMD160 fefdc7d11b98fbd54cba3173b0634c48013f9cb7 SHA1 315858dcd7c44236c7a45cdded82a568c83f0e22 SHA256 5e824162b235375337a421876ce543e28f53b4d25f790d6747af73807d060f68
-AUX lprng-3.8.28-krb.diff 428 RMD160 5f9a9896c1ffe032156e0ca773d469cc831d4136 SHA1 8e0bd9c6790099347fecb22934cb4e9ef1e31c8a SHA256 265955a2c521bab8c3f5a12da9b148a0558015fdcc299400361941f0e95b7a77
-AUX lprng-3.8.28-lpq.diff 383 RMD160 057f85a0873bed28e6dbbc8e50a886ad8db40655 SHA1 2200119511c4c1668618271a6c92df9da7a416b6 SHA256 2494154c1b49124f928b68f0c5d61d62a304881344e7a5dddf3e110b58ce238d
-AUX lprng-3.8.28-make.diff 364 RMD160 7d1cb0e4f6a5a87d8d851658ad53d38b73bfc931 SHA1 7169238303b65e73e110f1bcdac5e429446c7ac6 SHA256 0b52d36f0be51120489056be1064b8b44201c6d1f9f1412b51e55e7591a2dec7
-AUX lprng-init 994 RMD160 9065bc8e29e30e06224570e4a07a557e7d98bf27 SHA1 cb711d10d82db52164e7325836fa4c91de9a59d5 SHA256 2b247e66daf120a9960cabc3bf3eddcdd096b32f3c8f20689662a2bb9de03be5
-AUX printcap 661 RMD160 1b45dbc09a87729d202efb2738f15a33bf72a719 SHA1 8337d47cad350b3dca61094bafa8ac1809843055 SHA256 6a91fc37ba2467903b5e7e3717fd5bf07ea59b404184849d64daf31ac200c985
-DIST LPRng-3.8.28.tgz 10212500 RMD160 f0460d7fa7d1ea0ce6b49fcb656905fdda3d0d41 SHA1 f4373004adb1439819600701bb98517137daf1fc SHA256 c22e9c20ac71f97daca79c68b8d70631ef51d34652ff37b8cb8413a3ebcb914d
-DIST LPRng-3.8.35.tgz 12512453 RMD160 d7a9f2ce94a52227a205e6849268f4195bd230ef SHA1 374bdd28245e015b85e59b20c2b0cdb490127b54 SHA256 c9909a0b94f8611b8d2faeb1199e292a53b74bf7d16c363b810dce25b7623c37
-EBUILD lprng-3.8.28.ebuild 2058 RMD160 114c84c7d397fd45797983b3cadc7ab4a176c76f SHA1 ff88fd73fee255b5a62995999b1686b2cbea4ed2 SHA256 77ac87521ed2bb16700aa75e7d27f069fc631348c8c6e79dc709b6b1b4b32b02
-EBUILD lprng-3.8.35.ebuild 1957 RMD160 1f2ece9f9b3c5f3d573ca64c3d7c11e321f6025b SHA1 83a8ac0b93def0db214b6dd0a1019e3e932fe3bb SHA256 d0170c9f6e5a09df344c22e778ecf5c82e7c048650011da0f90953bd7adeb11f
-MISC ChangeLog 7845 RMD160 e5e076718d7bcf56e7c0037470d80220c1b5537b SHA1 75db6a7d58f3adbf5a8a5d41b4d5a08358b584fb SHA256 782ad051662ebcb7c8225597dc4dd8328caafe6d3b74c2a158386d28bd5f1495
-MISC metadata.xml 233 RMD160 3c4fd0a84bb475a13d2006285bea2ce6deb9090d SHA1 04b0678447cdf5bfa103c398c73a0e90f19dfbd0 SHA256 5ff619159c47d92b89c79b0f439761e3fc2b1205d5ab3c548f39babc07ca5a89
+AUX lprng-3.8.27-certs.diff 1120 SHA256 5e824162b235375337a421876ce543e28f53b4d25f790d6747af73807d060f68 SHA512 14d88ff3a78632f5f3ef69fd64a20adc745ca1169b3b7dc57d0374f279946b1be5c60e29370e1513222ebd1055d5840e8e3e843166e958be70119b42cbdfb4de WHIRLPOOL 56c91bc03a0f70a728fe1b86931a176dba73416ba685a771f4e081838d79a05dc0464e7e3b8408d5103d2d4429563528b05c6a0beb0d47b398282950949e9a72
+AUX lprng-3.8.28-krb.diff 428 SHA256 265955a2c521bab8c3f5a12da9b148a0558015fdcc299400361941f0e95b7a77 SHA512 70d7ea3d86d361d402063099e77aeb3d5dfc6e68823e2d00cfa1d3551d6a463a11ec736195d803faccf52dd82cc1965f4164d33536c794aab46b28bfd8f64788 WHIRLPOOL f118f064e29a93ae4b12be7ff134466e72d648a59f6f3544c232a8a60d2883dbc0342f12334d3fe319740c09275eebf44fe2883791ace84ffe814b0944eceeb3
+AUX lprng-3.8.28-lpq.diff 383 SHA256 2494154c1b49124f928b68f0c5d61d62a304881344e7a5dddf3e110b58ce238d SHA512 e921ea62ea60d0eb1127ac0d7f6a5dec7c5d4c2a7aa4e62e91b1471908ab3ab59927af4e4b072d3f904c0319c6823413c206db6971d6ecf79818a2713f527772 WHIRLPOOL 67e694db51086d5498efae3d93f45899c58cb04402b75740e94047659ecea8c2fa84a2d3e5c832f95522674bab8c8b3ad43a26e2ef707cd1208a50f9f4783741
+AUX lprng-3.8.28-make.diff 364 SHA256 0b52d36f0be51120489056be1064b8b44201c6d1f9f1412b51e55e7591a2dec7 SHA512 bddbcb12596daf86b9d4fdf270a57549626522081d46ae89eafa4eb4aee173a701732093646fb0f448653a94715e90eea379a7716839ec5769dea5e16c9b12f0 WHIRLPOOL 5b941c4f0e78c77080753f0c1f91ffc474c376ae9dfc5efeef9130f82b65ffe41696e4072062bcfec11206d5c83ef9a24f291dc08e5046f5a09d2a16d6a14682
+AUX lprng-init 1053 SHA256 f3555f562b2603d5870d5f0f65e183127e5ff57684f3f542d7482f091881da65 SHA512 b05bef2c722867d7e1b2b766f29695659211cdc95a11a553741a66dfd8e91ddab1f5909b22457197a7b6712e8c83ca8b3630de192ba4a4fcdc198d9ee89ba372 WHIRLPOOL 9f2201b9483ba73dba34258c08936448e9425da18c7ca6320b3dab3a57f87de9b68a06e58bea25bf72d0a3eaf6114c81fa0a2020bcf9f054cbafc072bb7d3db3
+AUX printcap 661 SHA256 6a91fc37ba2467903b5e7e3717fd5bf07ea59b404184849d64daf31ac200c985 SHA512 c506fcc35a01c2fb93875aa9c0c2668a2c1e43d7a6afa3827b11dd9bb16d59529b8878c9346035bad9dd7df380da3ba58ff1e7856f78d6b94c992c14f218c3d7 WHIRLPOOL 59b4c18b83f40bfaa4a9ce8c59ae505c8ea5c14fceb9714c0c4aaf04bdba02d2610f0f333abc36a966098bad9df4e04ca3c7b57ca27034f371acd1a79152012f
+DIST LPRng-3.8.28.tgz 10212500 SHA256 c22e9c20ac71f97daca79c68b8d70631ef51d34652ff37b8cb8413a3ebcb914d
+DIST LPRng-3.8.35.tgz 12512453 SHA256 c9909a0b94f8611b8d2faeb1199e292a53b74bf7d16c363b810dce25b7623c37
+EBUILD lprng-3.8.28.ebuild 2058 SHA256 77ac87521ed2bb16700aa75e7d27f069fc631348c8c6e79dc709b6b1b4b32b02 SHA512 ea3c1d74dcca58090b01069b161a541f97f112d8cabbdd5d88da9ceecee08cf449a08ada43ae16387e8110f5f8fc6b9889a1af46bbd5717ab4e1b36a6d97cf87 WHIRLPOOL b199802321fb7a84c4e2d78d2886f0cf9ef6538deebaef6118ef859d7dd8bedc2c22c43b1700c1295eabd7567c92d68b15a905b400aa43d15b75670503a66b6e
+EBUILD lprng-3.8.35-r1.ebuild 1960 SHA256 07a41fd3c03dc10ae29ee397a6f26d1186ab7582451a75f4d225e96f15d4464a SHA512 b88a27a65d5fc6485c271cd3abd7d4580e46a70ac9d8ec98720bb65dda75ecb963968c36790b2c71b32de70e2ae1f3c9b1c0c6ca2c6f1136105355f5b3003d3f WHIRLPOOL 04f640f8625672ff01426770bd8a73ad4897ead9257c529e02c5c287003ddde64395f5a41877cbac4b9c134aaa74a64d0c5b54e9cd29ccda130975082a7250e2
+MISC ChangeLog 8037 SHA256 305b5b232e26151f59d7acc4cafbdea3a35883656c8c5db61d425c77cce9e65a SHA512 77926d17bde41e978f18c8e2464f833335a5fd3aa9aee8d77db4ac1d45082684dce1d611c144c999aabbdebfc4aaee49c90cf4f74355623f566e3fafe038957f WHIRLPOOL e11a044e8087e8abb9afd646e18a06fdcdc8db836ee2ae197a0ea395a0a9fcc581d9c60dd48252e1231a0c74576375a6e1fb68b85d070fbacd77804cae0d892c
+MISC metadata.xml 233 SHA256 5ff619159c47d92b89c79b0f439761e3fc2b1205d5ab3c548f39babc07ca5a89 SHA512 65b9e2cf4a16963cb389bcc300cb6cce0a8dabd44efc1f66831e5630773f7d0dcb0e450e9d2a2430aff0a23b3dc3b2e73584bb312550b2fbbf984724572a491f WHIRLPOOL eb82a798ef26cacac52a33f2d7953c71d3abc254ce06840cf7f763ebc0369b65253dfcb0a2b934f32677f8c5525285e42b8326cc65a86f3d33a57f4c6269a591
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPLos7AAoJEEb+UGWnxTyHlHwQALgUn3EnCqncXCv+uMtIGn3a
-LbmcD9HSM2VAYUSUcSNtcENm2j3r+3YQHuWq+GaP+XLZ+Yo7QMgXHL5sA51IYwJ4
-EGoSAEmkHEljxV3pVaJGuQl8lgmC4Y1LPnxocOrhQklwEcVg+1K3evpbMTB9TeWa
-18Oqud7rIfm6MCsOGXsUFqk/v1cBGy/W5KcpTUOQpA9IFU/Bd1cCbB30szGDd4ym
-hu2ov1qjDITQvCJtGYchrY3lWj6h4DmFBWVfVGKmbFufbxsCkZZnIQ5gxgY+M4fo
-EVMp51YPPykXkTyECuLffLxeZpuq/UC3dI3neNV14TLY1eRjWaJlMInn+RGhsTRd
-wux4E1AjmNHkuvra7HKJvA8GeknoY4jcHQiPxqf+7VTtwGHxkaVNtfFqglEYGBWq
-TAv/FcOOFeOXvXEcTiJG9PpM5CFcNLJufexBFMmzJRUBBhgzunifLemZwfAdDRS9
-xRGQMYwMnFV4b3551ptcaeImzYLQJgBsmoKNomYl3LO6MSn9B4aT/5WetrgryOpj
-qZH5oCuEkEmeg6i9G7ofQv5V/TC06sl6W5/VGv1oQkpYJ2tpIbVJm0ftJ7/M4iVS
-/ukcpGLwmtdxlDbbYtW+GWDzwU9N7SlzC0eQns63F99dCIW8HrM30EBzOzvmrL6O
-vPlGd4JZHPy7IrGqJRdm
-=/Lsz
+iQIcBAEBCAAGBQJQNpG9AAoJEEb+UGWnxTyHbGcP/i5wdjlqdRC0gmH9glC4PC5O
+/aV2Qg40jGRTaG9Exyi0TUxik8i5rOlZMvbF5nPHPqKick3MbTSVSuHbvP67azvt
+jpI3lBHQDUBca8TZ1hoKvvITq6F5mT8al7yMoBnAPHsnKz+wE6FoCSoM5izAD9SO
+Tc9HDBGLgZ82tvm3YutRKNQMRp88Hh8DYiZKhDmPB2vId7WU7BHHfnnUwk4plt7k
+LTYXN6+8bTnYnTDYv6REMfgEWbs7V6OYte24oyH+KY9f6ov3QuC8Ip1ReBJ2DInS
+++bEsipO2jN5bSsD/x8y5zAbC0cU+Y8Qf68oQ8y//HygZcSwGkXwcg/USgEBJQPk
+I89OBbl8KZzrUXEB7WhQKdPTQNtzdc/t9yf/E1s9OIPCQ9lopNaQWAxsiOU9s4G+
+Zwv4kA4jZrPrdcmhNJyv363tWkXQ8dBI7wU/MV+EQMZ8mGY1kOwUue246KhLOSBu
+JwPHX8jJWO+4mSNGjYfU/0OZ5tx4xPadRnfc4DTF8zxnFQENp5aDoFgf7ze6f5eR
+G/9WqXSmsHtbIoKXFHKK5xrQcWyZb23WECjkw3aoCIrCO0j64GJ9wnfWI8InwKBd
+H3begGfyHmNksoeN9ErlfmGwgCcNnEJt7K+kmjD48Ybz6T8iMIYWBjAadNnd8aPg
+6NTQpLOoQgBxUFAk8lzP
+=EW2f
 -----END PGP SIGNATURE-----
diff --git a/net-print/lprng/files/lprng-init b/net-print/lprng/files/lprng-init
index fd4bb40ad00a..01ec7995bb56 100644
--- a/net-print/lprng/files/lprng-init
+++ b/net-print/lprng/files/lprng-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/files/lprng-init,v 1.4 2004/07/15 00:22:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/files/lprng-init,v 1.5 2012/08/23 20:23:41 dilfridge Exp $
 
 depend() {
 	need net
@@ -28,12 +28,12 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting lpd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/lpd
+	start-stop-daemon --start --pidfile "/var/run/lpd.515" --quiet --exec /usr/sbin/lpd
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping lpd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/lpd
+	start-stop-daemon --stop --pidfile "/var/run/lpd.515" --quiet --exec /usr/sbin/lpd
 	eend $?
 }
diff --git a/net-print/lprng/lprng-3.8.35.ebuild b/net-print/lprng/lprng-3.8.35-r1.ebuild
index 5b59daba87e2..bc9681c9804f 100644
--- a/net-print/lprng/lprng-3.8.35.ebuild
+++ b/net-print/lprng/lprng-3.8.35-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-print/lprng/lprng-3.8.35.ebuild,v 1.2 2012/02/05 13:58:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/lprng-3.8.35-r1.ebuild,v 1.1 2012/08/23 20:23:41 dilfridge Exp $
 
 EAPI=4