Cleanup and also ensure that mogilefsd only starts after postgres in case that is the backend in use.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

9 files changed, 16 insertions, 237 deletions

diff --git a/dev-perl/mogilefs-server/ChangeLog b/dev-perl/mogilefs-server/ChangeLog
index f4274967afb4..fd672326620d 100644
--- a/dev-perl/mogilefs-server/ChangeLog
+++ b/dev-perl/mogilefs-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-perl/mogilefs-server
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/ChangeLog,v 1.8 2009/11/04 02:20:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/ChangeLog,v 1.9 2009/11/04 02:29:22 robbat2 Exp $
+
+  04 Nov 2009; Robin H. Johnson <robbat2@gentoo.org>
+  files/mogilefsd-init.d-2.16, -files/mogilefsd.conf-2.16,
+  -files/mogstored-conf.d-2.16, -files/mogstored-init.d-2.16,
+  -files/mogilefs-server-2.16-Use-saner-name-in-process-listing.patch,
+  -mogilefs-server-2.20.ebuild, files/mogstored-init.d-2.30:
+  Cleanup and also ensure that mogilefsd only starts after postgres in case
+  that is the backend in use.
 
 *mogilefs-server-2.32 (04 Nov 2009)
 
diff --git a/dev-perl/mogilefs-server/Manifest b/dev-perl/mogilefs-server/Manifest
index d6af5e07aece..a61b1fc8faa9 100644
--- a/dev-perl/mogilefs-server/Manifest
+++ b/dev-perl/mogilefs-server/Manifest
@@ -1,19 +1,13 @@
-AUX mogilefs-server-2.16-Use-saner-name-in-process-listing.patch 2206 RMD160 13fa408a8f043952645c83528d029da8666672dc SHA1 f5530a4dd4e6e4736148c029aa470838eb1591b3 SHA256 13ce164a11a65c62234710a078664e65c6b8aaff9627bafef6d7da7b6e158ae1
 AUX mogilefs-server-2.30-pidfile-etc.patch 7123 RMD160 e0feb3e9bc4a9adbfa0a6dd1cdd282c0aacc163e SHA1 106c52eef7d95690ae662fec2783941ee2d9524e SHA256 6c14979fafe2218a45ae85dbe11410b7079e0da0c3186a1e60071e8716e66d16
 AUX mogilefsd-conf.d-2.16 243 RMD160 16fbfb5cc01b66d5fccb6c6dde3a0fb44639d815 SHA1 4c64bb9436f0948bd91d874d97d598fd638dc217 SHA256 aa9346fa1945cf86a1a82a8e05f7f685b56cba4aa1803637e1df50efe23fc95d
-AUX mogilefsd-init.d-2.16 574 RMD160 7ee5c074cea7f3abad78cb423474681e073d5aef SHA1 53ed2fb0adcf8ec5c20b09c4d53d2d6c3309e7bf SHA256 0eb18535713ccb23c79cc5c1a5a80e3203b640b40a55db38b000f95d4f8257d6
-AUX mogilefsd.conf-2.16 725 RMD160 31c211342c162a6e4ae12bd691ca0fc80800e0ca SHA1 57af6f8394157be83b689cf2d3f3e1181e6c157b SHA256 b65b5de23c2d1f2d37ea0de51c1f6d24f2b0ec4b4389b2155f13c6466c1bcefd
+AUX mogilefsd-init.d-2.16 602 RMD160 26beec8da787d4764f2275ce0d9300b59227f0bc SHA1 7b20c373a49981bec0beaa62daa1727fbc91d776 SHA256 2472391d9e20bf6d71c27071f087476365ec7902b4e3b00951e75af436faa75e
 AUX mogilefsd.conf-2.30 754 RMD160 7354099a80998906b764f0f44a6939a7939d9337 SHA1 2248544a1c3135e5ef4ee0837679a5ee57faba55 SHA256 acf4df23ee4b958e879c1f77d59635c5c25e0c92c898e984ec60c785698c3e19
-AUX mogstored-conf.d-2.16 262 RMD160 150f954df0caa5a6811305549585842899e3d37f SHA1 c093682ea8f14a1288b6adccd8b18ae74c3e1308 SHA256 bb457a80ea94ecea031f72459ead7c095c13634c4db06639a9532a7435dcc7dc
 AUX mogstored-conf.d-2.30 222 RMD160 044a8b3b32a9fe565d40439cf535ba0c6e1bd97f SHA1 c58c8fa019f89898a56dc9e2e969b419295ef084 SHA256 5e2c0feab38ea178d065210478c76c82fa3e21e61dd69543acd529828fd945e0
-AUX mogstored-init.d-2.16 489 RMD160 84d779d4de768bd6275df423c039781c30c22728 SHA1 8427da63409087146776405ef78211cbd7a467b0 SHA256 4ff22d3b92b560a5a9b4d1a9d3c2caccb9cf72800764ee9c2b612a7125279ce5
-AUX mogstored-init.d-2.30 524 RMD160 7b5ed1092aec76b9de1606cc0aee6719ab1cf1ae SHA1 d698693e8be7afb860012774dab3485b4d30c179 SHA256 d84bbded8c58ffca37f7f65704e812a509cc55426b21524fa85242eeea2b7275
+AUX mogstored-init.d-2.30 511 RMD160 bb5d935656054795d502e92b3be3d547400e5e28 SHA1 f89a5d86057ff64150521f0c898b546a19c70d10 SHA256 258dabda95cdff8a96a096a60207a6ab18219d701c362a24c2c1a352f9ca98e1
 AUX mogstored.conf-2.16 533 RMD160 cd71a9c0dff8603bdf7202fe7e99eda0d420382b SHA1 4d38d398a1bd32b610cf2b7f139d39dcc1f894a9 SHA256 dab55055cc503ce98baa456be94e71666e51a0aae2ee890a7681f28e46115ea1
-DIST mogilefs-server-2.20.tar.gz 264741 RMD160 fb4f73ff82962367a9031649b5a6c5087db1ddcd SHA1 466030a56ef639327ec63289ffc9885c29736b9c SHA256 d121648db6dc385be913963a9120cf5ffe7cbfa74b6593ef4e32dc9eb36ecb37
 DIST mogilefs-server-2.30.tar.gz 272840 RMD160 971bfb7ade359750a66f74b5d5b5b0e69650eae3 SHA1 4bf6efb8e3484137417d60a99510285f8ac31f2c SHA256 0458706defcfccf1258dbcbff4fe14901ba53ea9404994da1dce0ce2d9bbfdea
 DIST mogilefs-server-2.32.tar.gz 295422 RMD160 eb0d44e9afcd25cb64b0388e39ae3e870b6c0e7f SHA1 1a9246d2d08fd6b0f751253f0618bd01043e5b66 SHA256 3dbc1812e765e9212c3887e6005c9e656c2cc2a04091b4e995ca2c47666ca879
-EBUILD mogilefs-server-2.20.ebuild 2205 RMD160 431a0de580fb6cf8fc880a9648c613023774a1ef SHA1 7a7a7a4d760fa28607c1eaa8a8bd5d3677aacbcf SHA256 f7d45214ba9275c943c4048ed2a851afa4c201bb205e44f2c9c1f853d8621ec9
 EBUILD mogilefs-server-2.30.ebuild 2231 RMD160 5747a845de2ce2646d9f0df49012156db0c1f814 SHA1 2aec6ff026641c89b5b6cbc56903fe968cd13c18 SHA256 01fc79adc33fa98d3884e393b6fc620f1526b08c27b7a86a2b0184ffdb483f6f
 EBUILD mogilefs-server-2.32.ebuild 2457 RMD160 f7d5c315727a7938f4e331df4e3baf274bec9df2 SHA1 e79196d72a3cbb8c35a634877babad71360b5313 SHA256 4c9104a5bcfc79492e4c711376f0413fa5069b22c793ed189a4c252b12ae1723
-MISC ChangeLog 1969 RMD160 898fad833c7b9a8ef7bcf818a897341e78de63a8 SHA1 5966328a81212eeac8ffd8eccecc3651c7d30b3d SHA256 8628b174cadbd0918ae4062b2a0e50b2eccf8ed4190df52f12cfd37a3f64e3b1
+MISC ChangeLog 2382 RMD160 ff6ece882619b3f4e91fa3f5d332478fd5f731f6 SHA1 06dcbc95c4ca5f10946c14227c85a3dc3be6496d SHA256 d9ae09f0511ff79da0c3e364068367caab15d9c6ae6b5b27ff1deb58b65484cc
 MISC metadata.xml 271 RMD160 33d1e6d38b3ecde19f2a3a873476e4fc03fd0a41 SHA1 1b49b2ba691f42cbf4f86231769f560b7232453a SHA256 0670df6d1cf19fc80b5a9b574234d0d260f42c2c1889155d94922b0d63976ac2
diff --git a/dev-perl/mogilefs-server/files/mogilefs-server-2.16-Use-saner-name-in-process-listing.patch b/dev-perl/mogilefs-server/files/mogilefs-server-2.16-Use-saner-name-in-process-listing.patch
deleted file mode 100644
index 55eba2def58f..000000000000
--- a/dev-perl/mogilefs-server/files/mogilefs-server-2.16-Use-saner-name-in-process-listing.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From d532647546d36ac5bc269d3437a01a50054370fc Mon Sep 17 00:00:00 2001
-From: Robin H. Johnson <robbat2@gentoo.org>
-Date: Sat, 12 May 2007 23:36:07 -0700
-Subject: [PATCH mogilefs] 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/mogautomount |    3 +++
- server/mogdbsetup   |    3 +++
- server/mogilefsd    |    3 +++
- server/mogstored    |    3 +++
- 4 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/server/mogautomount b/server/mogautomount
-index 68ca723..f3cefe6 100755
---- a/server/mogautomount
-+++ b/server/mogautomount
-@@ -3,6 +3,9 @@
- use strict;
- use Getopt::Long;
- 
-+# Rename binary in process list to make init scripts saner
-+$0 = $_ = $0;
-+
- my ($help, $verbose);
- usage(0) unless GetOptions(
-                            'help' => \$help,
-diff --git a/server/mogdbsetup b/server/mogdbsetup
-index 155dbf9..ecf29ad 100755
---- a/server/mogdbsetup
-+++ b/server/mogdbsetup
-@@ -4,6 +4,9 @@ use Getopt::Long;
- use lib 'lib';
- use MogileFS::Store;
- 
-+# Rename binary in process list to make init scripts saner
-+$0 = $_ = $0;
-+
- my %args = (
-             dbhost => "localhost",
-             dbname => "mogilefs",
-diff --git a/server/mogilefsd b/server/mogilefsd
-index b8224f3..2b64c32 100755
---- a/server/mogilefsd
-+++ b/server/mogilefsd
-@@ -12,6 +12,9 @@ use warnings;
- use lib 'lib';
- use MogileFS::Server;
- 
-+# Rename binary in process list to make init scripts saner
-+$0 = $_ = $0;
-+
- my $s = MogileFS::Server->server;
- $s->run;
- 
-diff --git a/server/mogstored b/server/mogstored
-index ccb26c4..1c7ed4a 100755
---- a/server/mogstored
-+++ b/server/mogstored
-@@ -47,6 +47,9 @@ my $default_config = "/etc/mogilefs/mogstored.conf";
- my $server      = $ENV{MOGSTORED_SERVER_TYPE} || "perlbal";
- my $serverbin   = "";
- 
-+# Rename binary in process list to make init scripts saner
-+$0 = $_ = $0;
-+
- my %config_opts = (
-                    'iostat'       => \$opt_iostat,
-                    'daemonize|d'  => \$opt_daemonize,
--- 
-1.5.1.4
-
diff --git a/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16 b/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16
index 6a36e7df6dd7..af9d29844a89 100644
--- a/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16
+++ b/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16,v 1.1 2007/05/16 11:11:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogilefsd-init.d-2.16,v 1.2 2009/11/04 02:29:23 robbat2 Exp $
 
 NAME="mogilefsd"
 BINARY="/usr/bin/mogilefsd"
@@ -7,8 +7,8 @@ MOGILE_UID="mogile"
 MOGILE_GID="mogile"
 
 depend() {
-	use net
-	after mysql
+	use net mysql postgresql
+	after mysql postgresql
 }
 
 start() {
diff --git a/dev-perl/mogilefs-server/files/mogilefsd.conf-2.16 b/dev-perl/mogilefs-server/files/mogilefsd.conf-2.16
deleted file mode 100644
index 3c79f0eb186e..000000000000
--- a/dev-perl/mogilefs-server/files/mogilefsd.conf-2.16
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogilefsd.conf-2.16,v 1.1 2007/05/16 11:11:17 robbat2 Exp $
-
-# System user
-user = mogile
-# These are set inside the Gentoo conf.d/mogilefsd
-#pidfile = /var/run/mogile/mogilefsd.pid
-#daemonize = 1
-
-# Database settings
-db_dsn	= DBI:mysql:mogilefs
-db_user	= mogile
-# You must insert your password here!
-db_pass	= __PASSWORD__
-
-# Network settings
-#conf_port = 7001
-#listen = 10.0.0.1:7001, 
-
-# Storage
-#mog_root = /mnt/mogilefs
-
-# Plugins
-#plugins = ...
-
-# Tuning knobs
-#query_jobs = 20
-#delete_jobs = 1
-#replicate_jobs = 1
-#monitor_jobs = 1
-#reaper_jobs = 1
-#min_free_space = 100
-#max_disk_age = 5
-#node_timeout = 2
-#old_repl_compat = 1
-#default_mindevcount = 2
diff --git a/dev-perl/mogilefs-server/files/mogstored-conf.d-2.16 b/dev-perl/mogilefs-server/files/mogstored-conf.d-2.16
deleted file mode 100644
index 965a962ee2d6..000000000000
--- a/dev-perl/mogilefs-server/files/mogstored-conf.d-2.16
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogstored-conf.d-2.16,v 1.1 2007/05/16 11:11:17 robbat2 Exp $
-#Pidfile not yet supported by upstream
-#PIDFILE="/var/run/mogile/mogstored.pid"
-MOGSTORED_OPTS="--daemonize"
-# vim: ft=gentoo-conf-d:
diff --git a/dev-perl/mogilefs-server/files/mogstored-init.d-2.16 b/dev-perl/mogilefs-server/files/mogstored-init.d-2.16
deleted file mode 100644
index 878cb6de7538..000000000000
--- a/dev-perl/mogilefs-server/files/mogstored-init.d-2.16
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogstored-init.d-2.16,v 1.1 2007/05/16 11:11:17 robbat2 Exp $
-
-NAME="mogstored"
-BINARY="/usr/bin/mogstored"
-
-depend() {
-	use net
-	after mysql mogilefsd
-}
-
-start() {
-	ebegin "Starting $NAME"
-	start-stop-daemon --start --quiet \
-		--exec ${BINARY} -- ${MOGSTORED_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping $NAME"
-	start-stop-daemon --stop --quiet \
-		--exec ${BINARY}
-	eend $?
-}
-
-# vim: ft=gentoo-init-d:
diff --git a/dev-perl/mogilefs-server/files/mogstored-init.d-2.30 b/dev-perl/mogilefs-server/files/mogstored-init.d-2.30
index bd3775cbbbeb..59090a7f880c 100644
--- a/dev-perl/mogilefs-server/files/mogstored-init.d-2.30
+++ b/dev-perl/mogilefs-server/files/mogstored-init.d-2.30
@@ -1,12 +1,11 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogstored-init.d-2.30,v 1.1 2009/02/23 09:59:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/files/mogstored-init.d-2.30,v 1.2 2009/11/04 02:29:23 robbat2 Exp $
 
 NAME="mogstored"
 BINARY="/usr/bin/mogstored"
 
 depend() {
 	use net
-	after mysql
 	before mogilefsd
 }
 
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.20.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.20.ebuild
deleted file mode 100644
index 4ddc42ddad8c..000000000000
--- a/dev-perl/mogilefs-server/mogilefs-server-2.20.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.20.ebuild,v 1.2 2009/02/23 10:01:04 robbat2 Exp $
-
-MODULE_AUTHOR="DORMANDO"
-inherit perl-module
-
-DESCRIPTION="Server for the MogileFS distributed file system"
-HOMEPAGE="http://www.danga.com/mogilefs/"
-
-IUSE="mysql sqlite"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-# Upstream site recommends this,
-# but it breaks Perlbal
-# dev-perl/Perlbal-XS-HTTPHeaders
-DEPEND="dev-perl/Net-Netmask
-		>=dev-perl/Danga-Socket-1.57
-		>=dev-perl/Sys-Syscall-0.22
-		>=dev-perl/Perlbal-1.57
-		dev-perl/IO-AIO
-		dev-perl/Gearman-Server
-		dev-perl/Gearman-Client-Async
-		dev-perl/libwww-perl
-		dev-perl/Cache-Memcached
-		mysql? ( dev-perl/DBD-mysql )
-		sqlite? ( dev-perl/DBD-SQLite )
-		dev-lang/perl"
-mydoc="CHANGES TODO"
-
-# You need a local MySQL server for this
-#SRC_TEST="do"
-
-# Merged upstream
-#PATCHES="${FILESDIR}/${PN}-2.16-Use-saner-name-in-process-listing.patch"
-
-MOGILE_USER="mogile"
-
-pkg_setup() {
-	# Warning! It is important that the uid is constant over Gentoo machines
-	# As mogilefs may be used with non-local block devices that move!
-	enewuser ${MOGILE_USER} 460 -1 -1
-}
-src_compile() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	perl-module_src_compile || die "perl-module_src_compile failed"
-}
-
-src_install() {
-	perl-module_src_install || die "perl-module_src_install failed"
-	cd "${S}"
-
-	newconfd "${FILESDIR}"/mogilefsd-conf.d-2.16 mogilefsd
-	newinitd "${FILESDIR}"/mogilefsd-init.d-2.16 mogilefsd
-
-	newconfd "${FILESDIR}"/mogstored-conf.d-2.16 mogstored
-	newinitd "${FILESDIR}"/mogstored-init.d-2.16 mogstored
-
-	diropts -m 700 -o ${MOGILE_USER}
-	keepdir /var/run/mogile
-	keepdir /var/mogdata
-	keepdir /mnt/mogilefs
-	diropts -m 755 -o root
-
-	dodir /etc/mogilefs
-	insinto /etc/mogilefs
-	insopts -m 600 -o root -g ${MOGILE_USER}
-	newins "${FILESDIR}"/mogilefsd.conf-2.16 mogilefsd.conf
-	newins "${FILESDIR}"/mogstored.conf-2.16 mogstored.conf
-}
-
-pkg_postinst() {
-	chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
-	chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
-}