Patch gearmand to have a suitable cmdline in the process listing, and thus simplify the init script greatly.

Package-Manager: portage-2.1.2.7

6 files changed, 98 insertions, 21 deletions

diff --git a/dev-perl/Gearman-Server/ChangeLog b/dev-perl/Gearman-Server/ChangeLog
index 17bf4d8089e5..8ff9299dcf25 100644
--- a/dev-perl/Gearman-Server/ChangeLog
+++ b/dev-perl/Gearman-Server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-perl/Gearman-Server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman-Server/ChangeLog,v 1.2 2007/05/13 02:18:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman-Server/ChangeLog,v 1.3 2007/05/13 08:10:05 robbat2 Exp $
+
+*Gearman-Server-1.09-r1 (13 May 2007)
+
+  13 May 2007; Robin H. Johnson <robbat2@gentoo.org>
+  files/gearmand-init.d-1.09,
+  +files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch,
+  +Gearman-Server-1.09-r1.ebuild:
+  Patch gearmand to have a suitable cmdline in the process listing, and thus
+  simplify the init script greatly.
 
 *Gearman-Server-1.09 (13 May 2007)
 
diff --git a/dev-perl/Gearman-Server/Gearman-Server-1.09-r1.ebuild b/dev-perl/Gearman-Server/Gearman-Server-1.09-r1.ebuild
new file mode 100644
index 000000000000..b0d9bf4c0c9b
--- /dev/null
+++ b/dev-perl/Gearman-Server/Gearman-Server-1.09-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman-Server/Gearman-Server-1.09-r1.ebuild,v 1.1 2007/05/13 08:10:05 robbat2 Exp $
+
+inherit perl-module
+
+DESCRIPTION="Gearman distributed job system - worker/client connector"
+HOMEPAGE="http://search.cpan.org/search?query=Gearman-Server&mode=dist"
+SRC_URI="mirror://cpan/authors/id/B/BR/BRADFITZ/${P}.tar.gz"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=dev-perl/Danga-Socket-1.57
+		>=dev-perl/Gearman-1.07
+		dev-lang/perl"
+
+mydoc="CHANGES"
+
+PATCHES="${FILESDIR}/$PN-1.09-Use-saner-name-in-process-listing.patch"
+
+src_install() {
+	perl-module_src_install
+	newinitd ${FILESDIR}/gearmand-init.d-1.09 gearmand
+	newconfd ${FILESDIR}/gearmand-conf.d-1.09 gearmand
+}
diff --git a/dev-perl/Gearman-Server/Manifest b/dev-perl/Gearman-Server/Manifest
index 135dfd721afa..f535af825c57 100644
--- a/dev-perl/Gearman-Server/Manifest
+++ b/dev-perl/Gearman-Server/Manifest
@@ -1,25 +1,33 @@
+AUX Gearman-Server-1.09-Use-saner-name-in-process-listing.patch 966 RMD160 2fd16e9c050544c37581676816704ade49a0404c SHA1 8a3f5d58086cb6aec973dd017344d3a63bf00436 SHA256 9bef8c50c1d3aa4d272c4cfb13c7459bf5712a8f774c0b6963eacebd90daa59c
+MD5 b22975e0487b116276f0a051c8e3e80d files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch 966
+RMD160 2fd16e9c050544c37581676816704ade49a0404c files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch 966
+SHA256 9bef8c50c1d3aa4d272c4cfb13c7459bf5712a8f774c0b6963eacebd90daa59c files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch 966
 AUX gearmand-conf.d-1.09 244 RMD160 2aeb7a6571eca27af584745ebfef177e5708647d SHA1 c1f9756ac9bcb9d1fe69304bdfa59a3dd1c06d63 SHA256 9dcdb7a4d58e864d91325dae183c7b9fe9f0e5281cc0066df57a4176aec5bd34
 MD5 18e4b2587110ecf34a186fc5156afa28 files/gearmand-conf.d-1.09 244
 RMD160 2aeb7a6571eca27af584745ebfef177e5708647d files/gearmand-conf.d-1.09 244
 SHA256 9dcdb7a4d58e864d91325dae183c7b9fe9f0e5281cc0066df57a4176aec5bd34 files/gearmand-conf.d-1.09 244
-AUX gearmand-init.d-1.09 777 RMD160 0e9ddc7479b46ca1c15d4c3e6eb0bae9414c1a6f SHA1 715c1bcaa1e10187a422fec01d33af9570a0a1ca SHA256 d584dd6cc7b0c24b3f49ae83b6223b97a9b55566d12da9e85260f4165903105f
-MD5 e0169e4f28bb07228abfa5a7f9941374 files/gearmand-init.d-1.09 777
-RMD160 0e9ddc7479b46ca1c15d4c3e6eb0bae9414c1a6f files/gearmand-init.d-1.09 777
-SHA256 d584dd6cc7b0c24b3f49ae83b6223b97a9b55566d12da9e85260f4165903105f files/gearmand-init.d-1.09 777
+AUX gearmand-init.d-1.09 589 RMD160 4de5f66366f37f435c2d5f55889a599247773c10 SHA1 7a108bd5839397216d1f540512884f087bde287c SHA256 6697836deaf0f7c6eb4d6a6b7336db40fd38a10054867a1d10c19ec44604290e
+MD5 0a663ae1dde1e7c838659aa64a776893 files/gearmand-init.d-1.09 589
+RMD160 4de5f66366f37f435c2d5f55889a599247773c10 files/gearmand-init.d-1.09 589
+SHA256 6697836deaf0f7c6eb4d6a6b7336db40fd38a10054867a1d10c19ec44604290e files/gearmand-init.d-1.09 589
 DIST Gearman-Server-1.08.tar.gz 11047 RMD160 0476f7dfd78bfcd71ef8987028e38e545ff49935 SHA1 11a7f11110db5e8182ace62ae44665ea17977045 SHA256 f29542a29b846e3914ac3cc84ebe9113d2e0129c55057202ab242b92f7dcaff0
 DIST Gearman-Server-1.09.tar.gz 11282 RMD160 aab3786eec7a550f08ae4e521b207c555a9fa671 SHA1 d0055d6935f592eafd4a45f032d03dd16b1cc489 SHA256 472c47d154a7168c627aad97fe04abdb3010275315e26382e13982ec4062a8cd
 EBUILD Gearman-Server-1.08.ebuild 636 RMD160 10130fda69b5e89320fc73a8e277b08907c524bc SHA1 4324c3f0780f8486230028c04d55a1b7dc83ee8f SHA256 f139ad76779f7e4bba83926a933370cc6fbd95b5d8d0e88657ca7a7741c683e1
 MD5 c3426ac85a7ac76a3fdece46ad6a575f Gearman-Server-1.08.ebuild 636
 RMD160 10130fda69b5e89320fc73a8e277b08907c524bc Gearman-Server-1.08.ebuild 636
 SHA256 f139ad76779f7e4bba83926a933370cc6fbd95b5d8d0e88657ca7a7741c683e1 Gearman-Server-1.08.ebuild 636
+EBUILD Gearman-Server-1.09-r1.ebuild 859 RMD160 ba25f8f9ef7a7de0a6bd05fb30bb1bf1e823db83 SHA1 c03d399c84666f2e14d6147b75572e6aff9b3bb5 SHA256 c6ea09a306ea5155162d88089c2c77e5140869771d883ac9fc965b4efa09cefb
+MD5 e311074e17543c8d3bb6887f43721689 Gearman-Server-1.09-r1.ebuild 859
+RMD160 ba25f8f9ef7a7de0a6bd05fb30bb1bf1e823db83 Gearman-Server-1.09-r1.ebuild 859
+SHA256 c6ea09a306ea5155162d88089c2c77e5140869771d883ac9fc965b4efa09cefb Gearman-Server-1.09-r1.ebuild 859
 EBUILD Gearman-Server-1.09.ebuild 784 RMD160 633e54cd37b167a439f0e6e0e9eff83a2ed72020 SHA1 8f732883b926cc4819d404a145a1b8234df090dc SHA256 49adcc13e278eb80ad7bc3d294f51156ca4e19c11f625ab65995433d43eb9434
 MD5 50f9e71aaadb40a30b10b7f8028df392 Gearman-Server-1.09.ebuild 784
 RMD160 633e54cd37b167a439f0e6e0e9eff83a2ed72020 Gearman-Server-1.09.ebuild 784
 SHA256 49adcc13e278eb80ad7bc3d294f51156ca4e19c11f625ab65995433d43eb9434 Gearman-Server-1.09.ebuild 784
-MISC ChangeLog 694 RMD160 e20b5073092b89c846361e0c656f30eff09de46c SHA1 cffbf3733da2b9669059065ee715908bd74b17d9 SHA256 3e1ba57813cdc3c39f5a5386bb71bb783e17379cccecdb3c183bc612065a4255
-MD5 7946bcb188a9e08d997a11a556ed907f ChangeLog 694
-RMD160 e20b5073092b89c846361e0c656f30eff09de46c ChangeLog 694
-SHA256 3e1ba57813cdc3c39f5a5386bb71bb783e17379cccecdb3c183bc612065a4255 ChangeLog 694
+MISC ChangeLog 1034 RMD160 3d508f66a2bb8dc79586a8a74a89347ba71d47f9 SHA1 c0e49a5d5de34fab173669fb585898b8d12696dc SHA256 1b00bf79e32932412a325db94a17863cb47c67631906262136cb56c8f9dc5033
+MD5 7724ca1d7c48d1683e28d7aada649cab ChangeLog 1034
+RMD160 3d508f66a2bb8dc79586a8a74a89347ba71d47f9 ChangeLog 1034
+SHA256 1b00bf79e32932412a325db94a17863cb47c67631906262136cb56c8f9dc5033 ChangeLog 1034
 MISC metadata.xml 271 RMD160 33d1e6d38b3ecde19f2a3a873476e4fc03fd0a41 SHA1 1b49b2ba691f42cbf4f86231769f560b7232453a SHA256 0670df6d1cf19fc80b5a9b574234d0d260f42c2c1889155d94922b0d63976ac2
 MD5 2df9d8023d665f58666b098375350645 metadata.xml 271
 RMD160 33d1e6d38b3ecde19f2a3a873476e4fc03fd0a41 metadata.xml 271
@@ -30,3 +38,6 @@ SHA256 1b34480144b0b83c78358a97d03748f5dee6f8e2503b8f2f01dce5319f23fbf4 files/di
 MD5 1770ce88cf8fbcdab74f5c810e2dc15a files/digest-Gearman-Server-1.09 256
 RMD160 01aa7a0445f26e3b9c562b0a28d43eed6b2c4a74 files/digest-Gearman-Server-1.09 256
 SHA256 5864b9e4832956472bb2be8f2a089fa8cc4995b71d2d2c3e7f7d875606ad36d7 files/digest-Gearman-Server-1.09 256
+MD5 1770ce88cf8fbcdab74f5c810e2dc15a files/digest-Gearman-Server-1.09-r1 256
+RMD160 01aa7a0445f26e3b9c562b0a28d43eed6b2c4a74 files/digest-Gearman-Server-1.09-r1 256
+SHA256 5864b9e4832956472bb2be8f2a089fa8cc4995b71d2d2c3e7f7d875606ad36d7 files/digest-Gearman-Server-1.09-r1 256
diff --git a/dev-perl/Gearman-Server/files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch b/dev-perl/Gearman-Server/files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch
new file mode 100644
index 000000000000..f57360673ca8
--- /dev/null
+++ b/dev-perl/Gearman-Server/files/Gearman-Server-1.09-Use-saner-name-in-process-listing.patch
@@ -0,0 +1,33 @@
+From 6d8055b1d44d745f194665458674c6e03f48f322 Mon Sep 17 00:00:00 2001
+From: Robin H. Johnson <robbat2@gentoo.org>
+Date: Sat, 12 May 2007 22:16:37 -0700
+Subject: [PATCH gearman] Use saner name in process listing.
+
+Normally the binary will turn up in the process list as:
+/usr/bin/perl $SCRIPTNAME
+
+By adding a single line, we can make it be simply '$SCRIPTNAME'.
+This makes writing init.d scripts signficently easier.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+---
+ server/gearmand |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/server/gearmand b/server/gearmand
+index 2d8bd6b..148b1f9 100755
+--- a/server/gearmand
++++ b/server/gearmand
+@@ -94,6 +94,9 @@ my (
+    );
+ my $conf_port = 7003;
+ 
++# Rename binary in process list to make init scripts saner
++$0 = $_ = $0;
++
+ Getopt::Long::GetOptions(
+                          'd|daemonize'    => \$daemonize,
+                          'p|port=i'       => \$conf_port,
+-- 
+1.5.1.4
+
diff --git a/dev-perl/Gearman-Server/files/digest-Gearman-Server-1.09-r1 b/dev-perl/Gearman-Server/files/digest-Gearman-Server-1.09-r1
new file mode 100644
index 000000000000..3ad5ab6b1b3b
--- /dev/null
+++ b/dev-perl/Gearman-Server/files/digest-Gearman-Server-1.09-r1
@@ -0,0 +1,3 @@
+MD5 3d107089f7266ab91d66d9a7bd90430f Gearman-Server-1.09.tar.gz 11282
+RMD160 aab3786eec7a550f08ae4e521b207c555a9fa671 Gearman-Server-1.09.tar.gz 11282
+SHA256 472c47d154a7168c627aad97fe04abdb3010275315e26382e13982ec4062a8cd Gearman-Server-1.09.tar.gz 11282
diff --git a/dev-perl/Gearman-Server/files/gearmand-init.d-1.09 b/dev-perl/Gearman-Server/files/gearmand-init.d-1.09
index ef445e5dbd9d..5b8c053089c9 100644
--- a/dev-perl/Gearman-Server/files/gearmand-init.d-1.09
+++ b/dev-perl/Gearman-Server/files/gearmand-init.d-1.09
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman-Server/files/gearmand-init.d-1.09,v 1.1 2007/05/13 02:18:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gearman-Server/files/gearmand-init.d-1.09,v 1.2 2007/05/13 08:10:05 robbat2 Exp $
 
 NAME="gearmand"
 BINARY="/usr/bin/gearmand"
@@ -12,23 +12,15 @@ start() {
 	# start-stop-daemon does not work properly in certain cases
 	# this hack should go away when bug #178274 is resolved.
 	ebegin "Starting $NAME"
-	${BINARY} ${GEARMAND_OPTS}
-	rc=$?
-	[ $rc -ne 0 ] && eend $rc
-	local i=0
-	# wait 4*500ms
-	while [ $i -lt 4 ] && ! [ -s $PIDFILE ]; do
-		sleep 0.5
-		i=$(($i+1))
-	done
-	# final check
-	start-stop-daemon --oknodo --start --pidfile="${PIDFILE}" \
+	start-stop-daemon --start --pidfile="${PIDFILE}" \
 		--exec ${BINARY} -- ${GEARMAND_OPTS}
 	eend $?
 }
+
 stop() {
 	ebegin "Stopping $NAME"
 	start-stop-daemon --stop --pidfile="${PIDFILE}"
 	eend $?
 }
+
 # vim: ft=gentoo-init-d: