Revbump. Don't use deprecated start-stop-daemon options, bug 392777.

Package-Manager: portage-2.1.10.41/cvs/Linux i686
RepoMan-Options: --force

diff --git a/app-admin/chef-solr/ChangeLog b/app-admin/chef-solr/ChangeLog
index d7e2f7353c5bd9298476fbed671548d42b1f06af..251fe56a35022b8e373bf7bf559287f2dd6efa48 100644 (file)
--- a/app-admin/chef-solr/ChangeLog
+++ b/app-admin/chef-solr/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/chef-solr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.6 2011/07/25 09:19:37 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/ChangeLog,v 1.7 2011/12/31 20:07:50 idl0r Exp $
+
+*chef-solr-0.10.2-r1 (31 Dec 2011)
+*chef-solr-0.9.12-r1 (31 Dec 2011)
+
+  31 Dec 2011; Christian Ruppert <idl0r@gentoo.org> -chef-solr-0.9.12.ebuild,
+  +chef-solr-0.9.12-r1.ebuild, -chef-solr-0.10.2.ebuild,
+  +chef-solr-0.10.2-r1.ebuild, files/initd/chef-solr,
+  files/initd/chef-solr-indexer:
+  Revbump. Don't use deprecated start-stop-daemon options, bug 392777.
 
 *chef-solr-0.10.2 (25 Jul 2011)
 

diff --git a/app-admin/chef-solr/Manifest b/app-admin/chef-solr/Manifest
index 339e72471559c3e94a86a5585dd5d653fbe7c769..024736a43c9f4adc8314a3271386d1de317f9c4a 100644 (file)
--- a/app-admin/chef-solr/Manifest
+++ b/app-admin/chef-solr/Manifest
@@ -1,23 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX confd/chef-solr 484 RMD160 e22dd730499f4481b29a2a77c7342493ab5fc409 SHA1 2638ad8bf59eecc9277111b5c03f0eb49198b2cd SHA256 ea37affe6ad52aec57a51cd072afd0874323a8fee8c9d1901f1cdaebbb023863
 AUX confd/chef-solr-indexer 572 RMD160 0bafc3f07b52f8f503afe1bb28cc75355d53bb76 SHA1 5c9a9c0bb128b947ac558b6475ccf3e566bb26a8 SHA256 3999d2c92e83d8363200665027e3d725ef725b294bac0deae5bf6f112c2204bb
-AUX initd/chef-solr 1098 RMD160 4e5a4fc959fed74df4b47124ec4fc4ebc5c538b6 SHA1 e9e4f24687a64fa3cdb3f35076940e63609e7c29 SHA256 aa706dfd0c5e2a03613faee712456a32cb0866b57cc307ee2c28c031ea7f126e
-AUX initd/chef-solr-indexer 1196 RMD160 7efbcdc5babcfbd6b3bf93f42321dbaa060956ac SHA1 7a66f3f8859a6228ae73940f0839e0228a778746 SHA256 53336a2955db097fbf0fb0bf4651c6a5ebdd821f21074b52ce36cc1bc58b572a
+AUX initd/chef-solr 1105 RMD160 bc16c7eb65c9f6a25c9bb3b6b7e185d7211ec947 SHA1 6fa6be7f52ed361a674435711f27325bd8ef9978 SHA256 bd80f04600cab39326c87004e97215db515f38da299e1e38a5ab934a467c1687
+AUX initd/chef-solr-indexer 1203 RMD160 e6df68f2791634e1dcd19408617b0dfe7d43ceae SHA1 0205d8e2264c695ed5f5e26b55203743f04e5667 SHA256 23a2471f53c08192292abccd280a39b6457026995cf8dfb566ee34d45716ab02
 AUX solr.rb 1615 RMD160 4b455e7cf704e6bc61d97501e5e8ce0532b76f67 SHA1 7592c5bebc882eb9327ac25cb23f967965414931 SHA256 cdbc00a83674727fe18396188e30b8b361033977bbccf9094e560021a53266c1
 DIST chef-solr-0.10.2.gem 10223104 RMD160 1675cd9216cbc33d28143ad0abf99033c7b73a51 SHA1 2f6541dafdc3c0cbf00ba7fb3e922dc16476cc46 SHA256 29fba89983ef43e20a29261b2b1154458c59c039c6a1813594a96d43c5d8b721
 DIST chef-solr-0.9.12.gem 18473984 RMD160 d133c4addc0ba205b5a3cf4d88ffddfdb01867f1 SHA1 f01ab68d7627cee2ab70851bece3042af6ac094d SHA256 54c10050c914b69876683cd4a2f90ef9ac04b3ec04e41b5406e279487f88185b
-EBUILD chef-solr-0.10.2.ebuild 1032 RMD160 0a93d2f28fb8cfc0d16164ddd560ad3f953b6c77 SHA1 9ae7665ea34350545ff14b56a96c9471166736af SHA256 0c809e0680b4fbd07ba17a0bb6b374821e4d91c34d2fa037535344900b1fb231
-EBUILD chef-solr-0.9.12.ebuild 1200 RMD160 e4c416b9afdf9655652077955c130afa53c18153 SHA1 5d864865fee6a248a0780f3edd011f140d4dc713 SHA256 79f69de14dfb5b50f71f058fc810eb956a1a10a9d736c51a4d2b41d82c37f6c5
-MISC ChangeLog 1217 RMD160 fed77da63961cac365a2c79c37c3475ec6cd590c SHA1 12f71a1240ad3d87dfc735cd8a8f8f859fefc825 SHA256 cb8d572fefe3badd755d80da733753d20c504a893ae2bff29c6bb547dc8212d4
+EBUILD chef-solr-0.10.2-r1.ebuild 1034 RMD160 5bbe17e98fc8b398075b5f7897d8e2fc72c8bba9 SHA1 4c0ae9bf1fa599c2861d2e52af02fe8652a70ec2 SHA256 31929723564da53668cd5310dccc7085a496085540a54b1c5bcb812bcc0933d7
+EBUILD chef-solr-0.9.12-r1.ebuild 1202 RMD160 1db8da8b328374e7e451f2831f94b23acc1e65d4 SHA1 fd5c6d661f49cb6759d3f4ca69c5ae0b7a1a7bb8 SHA256 abea67cb6e8b86346b46f794ea78aeff70eab7df61fdacf7c89bc09e53f15825
+MISC ChangeLog 1581 RMD160 e46e3928e485d0beed1d1142aab5a6c902bfb3f6 SHA1 c22d66973e3fa132db68764e2bdceee960638f82 SHA256 36cdbe1da17baccb4b77afb1e7b0d5dfe6c6f3e4f0583b997a52996dd3f92fa6
 MISC metadata.xml 234 RMD160 cb149fcd7945b8906164cad81daf559757035cde SHA1 9bf4056cf71e3eb7153bb319e8bd24ede9a205b6 SHA256 9f3ea84c59dfbd2d2dd7f1e6f0b959540e27cc9caad4f77e6e76774ce98505a6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk589RMACgkQfXuS5UK5QB0wKAQApZvTaCxsvYJXgAdbGpFN+Fzq
-8jcNT8BOun9G233p8FsvprG9h4kIYr5hSRvHDj+rUxSwhzbOO1ul4i17WclOnfgW
-VOe2KHrdOpygBJAH/xgcXUOLmdxxNHidSTlySxD7Z9CIaHJvK6e0yzkHLqA3z/ez
-/4afjxZxngWRyVhrN3k=
-=hOO6
------END PGP SIGNATURE-----

diff --git a/app-admin/chef-solr/chef-solr-0.10.2.ebuild b/app-admin/chef-solr/chef-solr-0.10.2-r1.ebuild
similarity index 94%
rename from app-admin/chef-solr/chef-solr-0.10.2.ebuild
rename to app-admin/chef-solr/chef-solr-0.10.2-r1.ebuild
index 79482860df7e8b94df87572b52737028e8410f4d..efbc6f28cbe3c36d554ab865470dc10a254e064f 100644 (file)
--- a/app-admin/chef-solr/chef-solr-0.10.2.ebuild
+++ b/app-admin/chef-solr/chef-solr-0.10.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.10.2.ebuild,v 1.1 2011/07/25 09:19:37 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.10.2-r1.ebuild,v 1.1 2011/12/31 20:07:50 idl0r Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"

diff --git a/app-admin/chef-solr/chef-solr-0.9.12.ebuild b/app-admin/chef-solr/chef-solr-0.9.12-r1.ebuild
similarity index 95%
rename from app-admin/chef-solr/chef-solr-0.9.12.ebuild
rename to app-admin/chef-solr/chef-solr-0.9.12-r1.ebuild
index d988867c83e4a87fb6e497acc81482179404df73..c4fd166f39fd7c52996a22566e5f19d4b1e6219a 100644 (file)
--- a/app-admin/chef-solr/chef-solr-0.9.12.ebuild
+++ b/app-admin/chef-solr/chef-solr-0.9.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.9.12.ebuild,v 1.1 2011/01/07 14:19:52 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-0.9.12-r1.ebuild,v 1.1 2011/12/31 20:07:50 idl0r Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"

diff --git a/app-admin/chef-solr/files/initd/chef-solr b/app-admin/chef-solr/files/initd/chef-solr
index 1c48727f562a70ab92e9759eb8d4728e4ff04380..edde4b2ed2769c643a117909dcdba10ab451c0c1 100644 (file)
--- a/app-admin/chef-solr/files/initd/chef-solr
+++ b/app-admin/chef-solr/files/initd/chef-solr
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -26,7 +26,7 @@ fix_owners() {
 start() {
        ebegin "Starting Chef SOLR"
        fix_owners
-       start-stop-daemon --start --quiet --chuid ${CHEF_USER}:${CHEF_GROUP} \
+       start-stop-daemon --start --quiet --user ${CHEF_USER} --group ${CHEF_GROUP} \
                --pidfile ${CHEF_SOLR_PIDFILE} --name java --exec \
                ${CHEF_SOLR_BINARY} -- -d -P ${CHEF_SOLR_PIDFILE} -c ${CONFIGFILE} \
                -L ${CHEF_SOLR_LOGFILE} ${CHEF_SOLR_OPTS} > /dev/null

diff --git a/app-admin/chef-solr/files/initd/chef-solr-indexer b/app-admin/chef-solr/files/initd/chef-solr-indexer
index 09772bab08867a62dcf7ef210957b359cbe7aedd..6b30113423bdca98e71afba236e4cdfff87af54a 100644 (file)
--- a/app-admin/chef-solr/files/initd/chef-solr-indexer
+++ b/app-admin/chef-solr/files/initd/chef-solr-indexer
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -25,7 +25,7 @@ fix_owners() {
 start() {
        ebegin "Starting Chef SOLR indexer"
        fix_owners
-       start-stop-daemon --start --quiet --chuid ${CHEF_USER}:${CHEF_GROUP} \
+       start-stop-daemon --start --quiet --user ${CHEF_USER} --group ${CHEF_GROUP} \
                --pidfile ${CHEF_SOLR_INDEXER_PIDFILE} --exec ${CHEF_SOLR_INDEXER_BINARY} \
                -- -d -P ${CHEF_SOLR_INDEXER_PIDFILE} -L ${CHEF_SOLR_INDEXER_LOGFILE} \
                -c ${CONFIGFILE} ${CHEF_SOLR_INDEXER_OPTS}