Trim old ebuilds and cleanup, also prepare for upstream distfile rename.

(Portage version: 2.2.0_alpha1/cvs/Linux x86_64)

10 files changed, 16 insertions, 816 deletions

diff --git a/dev-perl/mogilefs-server/ChangeLog b/dev-perl/mogilefs-server/ChangeLog
index b65d3577451f..69468ea41912 100644
--- a/dev-perl/mogilefs-server/ChangeLog
+++ b/dev-perl/mogilefs-server/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-perl/mogilefs-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/ChangeLog,v 1.16 2010/08/20 21:14:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/ChangeLog,v 1.17 2010/10/29 03:28:45 robbat2 Exp $
+
+  29 Oct 2010; Robin H. Johnson <robbat2@gentoo.org>
+  -mogilefs-server-2.30.ebuild,
+  -files/mogilefs-server-2.30-pidfile-etc.patch,
+  -mogilefs-server-2.32.ebuild, -mogilefs-server-2.33.ebuild,
+  -mogilefs-server-2.33-r1.ebuild, -mogilefs-server-2.34.ebuild,
+  -mogilefs-server-2.35.ebuild, -mogilefs-server-2.36.ebuild,
+  mogilefs-server-2.37.ebuild:
+  Trim old ebuilds and cleanup, also prepare for upstream distfile rename.
 
 *mogilefs-server-2.37 (20 Aug 2010)
 
diff --git a/dev-perl/mogilefs-server/files/mogilefs-server-2.30-pidfile-etc.patch b/dev-perl/mogilefs-server/files/mogilefs-server-2.30-pidfile-etc.patch
deleted file mode 100644
index 96b047486221..000000000000
--- a/dev-perl/mogilefs-server/files/mogilefs-server-2.30-pidfile-etc.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-commit c938d5081c9b4028e45dfdcc25ae6188579bea0c
-Author: robbat2 <robbat2@f67b2e87-0811-0410-a7e0-dd94e48410d6>
-Date:   Fri Jan 16 10:29:08 2009 +0000
-
-    Update CHANGES for mogstored pidfile.
-    
-    git-svn-id: http://code.sixapart.com/svn/mogilefs/trunk@1285 f67b2e87-0811-0410-a7e0-dd94e48410d6
-
-commit b116bd5960baeee2aca7e762d08cf56eea0ae34a
-Author: robbat2 <robbat2@f67b2e87-0811-0410-a7e0-dd94e48410d6>
-Date:   Fri Jan 16 10:28:14 2009 +0000
-
-    Include a pidfile in mogstored finally, abusing the pidfile functionality of perlbal.
-    
-    git-svn-id: http://code.sixapart.com/svn/mogilefs/trunk@1284 f67b2e87-0811-0410-a7e0-dd94e48410d6
-
-commit 2a8dc9e352d49dc31860c783cf3c90d14cdbbb35
-Author: robbat2 <robbat2@f67b2e87-0811-0410-a7e0-dd94e48410d6>
-Date:   Fri Jan 16 10:05:15 2009 +0000
-
-    New FSCK work and error for BCNT for bad devcount values (they would not otherwise be caught unless the triggered another fix).
-    
-    git-svn-id: http://code.sixapart.com/svn/mogilefs/trunk@1283 f67b2e87-0811-0410-a7e0-dd94e48410d6
-
-commit 7117e2da2260834887a388bedd48a9b791c5c528
-Author: robbat2 <robbat2@f67b2e87-0811-0410-a7e0-dd94e48410d6>
-Date:   Thu Jan 15 05:40:33 2009 +0000
-
-    If the testcases were being run with default mysql (eg empty password for root), they tried to call mogdbsetup ... --dbpassword= ..., which mogdbsetup (Getopt::Long actually) promptly complained about. Make the password fields take an optional argument to prevent this.
-    
-    git-svn-id: http://code.sixapart.com/svn/mogilefs/trunk@1282 f67b2e87-0811-0410-a7e0-dd94e48410d6
-
-MERGED:
-
-diff --git a/server/CHANGES b/server/CHANGES
-index f164f61..3e84b91 100644
---- a/server/CHANGES
-+++ b/server/CHANGES
-@@ -1,3 +1,8 @@
-+        * mogstored: pidfile support
-+
-+        * New FSCK work and error for BCNT for bad devcount values (they would
-+          not otherwise be caught unless the triggered another fix).
-+
- 2009-01-12: Release version 2.30
- 
-         * fsck will now fix broken 'devcount' cols.
-diff --git a/server/TODO b/server/TODO
-index 9c64c6b..3a88c96 100644
---- a/server/TODO
-+++ b/server/TODO
-@@ -93,8 +93,5 @@
- :: [replicate(12648)] Copier failed replicating 15693848
- ......
- 
---- fsck should catch weird state where file exists in 'file' table with
--   devcount>0 but does not exist in file_on. Or count does not match.
--
- -- fsck for case where row from file_to_replicate(fid,fromdevid) does not exist
-    in file_on(fid,devid). This is a byproduct of a failed inject.
-diff --git a/server/lib/MogileFS/FID.pm b/server/lib/MogileFS/FID.pm
-index dc10ee4..1fdc9e9 100644
---- a/server/lib/MogileFS/FID.pm
-+++ b/server/lib/MogileFS/FID.pm
-@@ -14,6 +14,7 @@ sub new {
-         dkey     => undef,
-         length   => undef,
-         classid  => undef,
-+        devcount => undef,
-         _loaded  => 0,
-         _devids  => undef,   # undef, or pre-loaded arrayref devid list
-     }, $class;
-diff --git a/server/lib/MogileFS/Store.pm b/server/lib/MogileFS/Store.pm
-index 2a75bcb..bb8b27f 100644
---- a/server/lib/MogileFS/Store.pm
-+++ b/server/lib/MogileFS/Store.pm
-@@ -1237,7 +1237,7 @@ sub get_fids_above_id {
- 
-     my @ret;
-     my $dbh = $self->dbh;
--    my $sth = $dbh->prepare("SELECT fid, dmid, dkey, length, classid ".
-+    my $sth = $dbh->prepare("SELECT fid, dmid, dkey, length, classid, devcount ".
-                             "FROM   file ".
-                             "WHERE  fid > ? ".
-                             "ORDER BY fid LIMIT $limit");
-diff --git a/server/lib/MogileFS/Worker/Fsck.pm b/server/lib/MogileFS/Worker/Fsck.pm
-index dcd4360..1735797 100644
---- a/server/lib/MogileFS/Worker/Fsck.pm
-+++ b/server/lib/MogileFS/Worker/Fsck.pm
-@@ -25,6 +25,7 @@ use constant EV_CANT_FIX         => "GONE";
- use constant EV_START_SEARCH     => "SRCH";
- use constant EV_FOUND_FID        => "FOND";
- use constant EV_RE_REPLICATE     => "REPL";
-+use constant EV_BAD_COUNT        => "BCNT";
- 
- use POSIX ();
- 
-@@ -200,6 +201,16 @@ sub check_fid {
-         return $fix->();
-     }
- 
-+    # This is a simple fixup case
-+    unless (scalar($fid->devids) == $fid->devcount) {
-+        # log a bad count
-+        $fid->fsck_log(EV_BAD_COUNT);
-+
-+        # TODO: We could fix this without a complete fix pass
-+        # $fid->update_devcount();
-+        return $fix->();
-+    }
-+
-     # in the fast case, do nothing else (don't check if assumed file
-     # locations are actually there).  in the fast case, all we do is
-     # check the replication policy, which is already done, so finish.
-@@ -342,6 +353,12 @@ sub fix_fid {
-         return HANDLED;
-     }
- 
-+    # Clean up the device count if it's wrong
-+    unless(scalar($fid->devids) == $fid->devcount) {
-+        $fid->update_devcount();
-+        $fid->fsck_log(EV_BAD_COUNT);
-+    }
-+
-     return HANDLED;
- }
- 
-diff --git a/server/mogdbsetup b/server/mogdbsetup
-index de9b73c..fd1941a 100755
---- a/server/mogdbsetup
-+++ b/server/mogdbsetup
-@@ -30,9 +30,9 @@ usage()
-                       "dbport=s"         => \$args{dbport},
-                       "dbname=s"         => \$args{dbname},
-                       "dbrootuser=s"     => \$args{dbrootuser},
--                      "dbrootpassword=s" => \$args{dbrootpass},
-+                      "dbrootpassword:s" => \$args{dbrootpass},
-                       "dbuser=s"         => \$args{dbuser},
--                      "dbpassword=s"     => \$args{dbpass},
-+                      "dbpassword:s"     => \$args{dbpass},
-                       "help"             => \$opt_help,
-                       "verbose"          => \$opt_verbose,
-                       "yes"              => \$opt_yes,
-diff --git a/server/mogstored b/server/mogstored
-index 1bb0184..de720d6 100755
---- a/server/mogstored
-+++ b/server/mogstored
-@@ -68,6 +68,7 @@ my $docroot     = "/var/mogdata";
- my $default_config = "/etc/mogilefs/mogstored.conf";
- my $server      = $ENV{MOGSTORED_SERVER_TYPE} || "perlbal";
- my $serverbin   = "";
-+my $pidfile     = undef;
- 
- # Rename binary in process list to make init scripts saner
- $0 = "mogstored";
-@@ -82,6 +83,7 @@ my %config_opts = (
-                    'maxconns=i'   => \$max_conns,
-                    'server=s'     => \$server,
-                    'serverbin=s'  => \$serverbin,
-+                   'pidfile=s'    => \$pidfile,
-                    );
- usage() unless Getopt::Long::GetOptions(%config_opts);
- 
-@@ -92,7 +94,7 @@ $opt_config = $default_config if ! $opt_config && -e $default_config;
- load_config_file($opt_config => \%config_opts) if $opt_config;
- 
- # initialize basic required Perlbal machinery, for any HTTP server
--Perlbal::run_manage_commands(qq{
-+my $perlbal_init = qq{
-    CREATE SERVICE mogstored
-      SET role = web_server
-      SET docroot = $docroot
-@@ -101,7 +103,9 @@ Perlbal::run_manage_commands(qq{
-     CREATE SERVICE mgmt
-        SET role = management
-      ENABLE mgmt
--}, sub { print STDERR "$_[0]\n"; });
-+};
-+$perlbal_init .= "\nSERVER pidfile = $pidfile" if defined($pidfile);
-+Perlbal::run_manage_commands($perlbal_init , sub { print STDERR "$_[0]\n"; });
- 
- # start HTTP server
- my $httpsrv_class = "Mogstored::HTTPServer::" . ucfirst($server);
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.30.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.30.ebuild
deleted file mode 100644
index d278a32cb11c..000000000000
--- a/dev-perl/mogilefs-server/mogilefs-server-2.30.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 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.30.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.60
-		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 or Postgresql server for this
-#SRC_TEST="do"
-
-# Missed the cut for 2.30, but will be in next release
-PATCHES=( "${FILESDIR}/${P}-pidfile-etc.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.30 mogstored
-	newinitd "${FILESDIR}"/mogstored-init.d-2.30 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.30 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
-}
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.32.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.32.ebuild
deleted file mode 100644
index 6fc69363ec8d..000000000000
--- a/dev-perl/mogilefs-server/mogilefs-server-2.32.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2009 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.32.ebuild,v 1.1 2009/11/04 02:20:50 robbat2 Exp $
-
-EAPI=2
-MODULE_AUTHOR="DORMANDO"
-inherit perl-module
-
-DESCRIPTION="Server for the MogileFS distributed file system"
-HOMEPAGE="http://www.danga.com/mogilefs/"
-
-IUSE="mysql sqlite postgres"
-
-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.61
-		>=dev-perl/Sys-Syscall-0.22
-		>=dev-perl/Perlbal-1.73
-		dev-perl/IO-AIO
-		>=dev-perl/Gearman-Server-1.09
-		dev-perl/Gearman-Client-Async
-		dev-perl/libwww-perl
-		>=dev-perl/MogileFS-Client-1.09
-		dev-perl/Cache-Memcached
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		sqlite? ( dev-perl/DBD-SQLite )"
-mydoc="CHANGES TODO"
-
-# You need a local MySQL or Postgresql server for this
-#SRC_TEST="do"
-
-#PATCHES=(  )
-
-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_prepare() {
-	# If we are not in a cutting edge Git source, we would prefer to not install
-	# duplicates of these.
-	#sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
-	mv -f "${S}/lib/mogdeps" "${S}"
-}
-
-src_compile() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	perl-module_src_compile || die "perl-module_src_compile failed"
-}
-
-src_install() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	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.30 mogstored
-	newinitd "${FILESDIR}"/mogstored-init.d-2.30 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.30 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
-}
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.33-r1.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.33-r1.ebuild
deleted file mode 100644
index 2bfb163b764c..000000000000
--- a/dev-perl/mogilefs-server/mogilefs-server-2.33-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2009 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.33-r1.ebuild,v 1.1 2009/11/29 01:01:09 robbat2 Exp $
-
-EAPI=2
-MODULE_AUTHOR="DORMANDO"
-inherit perl-module
-
-DESCRIPTION="Server for the MogileFS distributed file system"
-HOMEPAGE="http://www.danga.com/mogilefs/"
-
-IUSE="mysql sqlite postgres"
-
-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.61
-		>=dev-perl/Sys-Syscall-0.22
-		>=dev-perl/Perlbal-1.73
-		dev-perl/IO-AIO
-		dev-perl/libwww-perl
-		>=dev-perl/MogileFS-Client-1.09
-		dev-perl/Cache-Memcached
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		sqlite? ( dev-perl/DBD-SQLite )"
-mydoc="CHANGES TODO"
-
-# You need a local MySQL or Postgresql server for this
-#SRC_TEST="do"
-
-#PATCHES=(  )
-
-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_prepare() {
-	for f in Makefile.PL MANIFEST ; do
-		if [ -f "${S}"/${f}.orig ]; then
-			cp -f "${S}"/${f}{.orig,}
-		else
-			cp -f "${S}"/${f}{,.orig}
-		fi
-	done
-	# If we are not in a cutting edge Git source, we would prefer to not install
-	# duplicates of these.
-	sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
-	sed -i -e '/^lib\/mogdeps/d' "${S}"/MANIFEST
-	mv -f "${S}/lib/mogdeps" "${S}"
-}
-
-src_compile() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	perl-module_src_compile || die "perl-module_src_compile failed"
-}
-
-src_install() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	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.30 mogstored
-	newinitd "${FILESDIR}"/mogstored-init.d-2.30 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.30 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
-}
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.33.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.33.ebuild
deleted file mode 100644
index b01e1550861e..000000000000
--- a/dev-perl/mogilefs-server/mogilefs-server-2.33.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 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.33.ebuild,v 1.2 2009/11/28 23:11:46 robbat2 Exp $
-
-EAPI=2
-MODULE_AUTHOR="DORMANDO"
-inherit perl-module
-
-DESCRIPTION="Server for the MogileFS distributed file system"
-HOMEPAGE="http://www.danga.com/mogilefs/"
-
-IUSE="mysql sqlite postgres"
-
-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.61
-		>=dev-perl/Sys-Syscall-0.22
-		>=dev-perl/Perlbal-1.73
-		dev-perl/IO-AIO
-		dev-perl/libwww-perl
-		>=dev-perl/MogileFS-Client-1.09
-		dev-perl/Cache-Memcached
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		sqlite? ( dev-perl/DBD-SQLite )"
-mydoc="CHANGES TODO"
-
-# You need a local MySQL or Postgresql server for this
-#SRC_TEST="do"
-
-#PATCHES=(  )
-
-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_prepare() {
-	# If we are not in a cutting edge Git source, we would prefer to not install
-	# duplicates of these.
-	#sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
-	mv -f "${S}/lib/mogdeps" "${S}"
-}
-
-src_compile() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	perl-module_src_compile || die "perl-module_src_compile failed"
-}
-
-src_install() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	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.30 mogstored
-	newinitd "${FILESDIR}"/mogstored-init.d-2.30 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.30 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
-}
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.34.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.34.ebuild
deleted file mode 100644
index bb92c7155abc..000000000000
--- a/dev-perl/mogilefs-server/mogilefs-server-2.34.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2009 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.34.ebuild,v 1.1 2009/12/08 21:41:20 robbat2 Exp $
-
-EAPI=2
-MODULE_AUTHOR="DORMANDO"
-inherit perl-module
-
-DESCRIPTION="Server for the MogileFS distributed file system"
-HOMEPAGE="http://www.danga.com/mogilefs/"
-
-IUSE="mysql sqlite postgres"
-
-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.61
-		>=dev-perl/Sys-Syscall-0.22
-		>=dev-perl/Perlbal-1.73
-		dev-perl/IO-AIO
-		dev-perl/libwww-perl
-		>=dev-perl/MogileFS-Client-1.09
-		dev-perl/Cache-Memcached
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		sqlite? ( dev-perl/DBD-SQLite )"
-mydoc="CHANGES TODO"
-
-# You need a local MySQL or Postgresql server for this
-#SRC_TEST="do"
-
-#PATCHES=(  )
-
-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_prepare() {
-	for f in Makefile.PL MANIFEST ; do
-		if [ -f "${S}"/${f}.orig ]; then
-			cp -f "${S}"/${f}{.orig,}
-		else
-			cp -f "${S}"/${f}{,.orig}
-		fi
-	done
-	# If we are not in a cutting edge Git source, we would prefer to not install
-	# duplicates of these.
-	sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
-	sed -i -e '/^lib\/mogdeps/d' "${S}"/MANIFEST
-	mv -f "${S}/lib/mogdeps" "${S}"
-}
-
-src_compile() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	perl-module_src_compile || die "perl-module_src_compile failed"
-}
-
-src_install() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	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.30 mogstored
-	newinitd "${FILESDIR}"/mogstored-init.d-2.30 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.30 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
-}
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.35.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.35.ebuild
deleted file mode 100644
index eae46d052436..000000000000
--- a/dev-perl/mogilefs-server/mogilefs-server-2.35.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2010 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.35.ebuild,v 1.1 2010/04/03 00:00:29 robbat2 Exp $
-
-EAPI=2
-MODULE_AUTHOR="DORMANDO"
-inherit perl-module
-
-DESCRIPTION="Server for the MogileFS distributed file system"
-HOMEPAGE="http://www.danga.com/mogilefs/"
-
-IUSE="mysql sqlite postgres"
-
-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.61
-		>=dev-perl/Sys-Syscall-0.22
-		>=dev-perl/Perlbal-1.74
-		dev-perl/IO-AIO
-		dev-perl/libwww-perl
-		>=dev-perl/MogileFS-Client-1.11
-		>=dev-perl/MogileFS-Utils-2.16
-		dev-perl/Cache-Memcached
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		sqlite? ( dev-perl/DBD-SQLite )"
-mydoc="CHANGES TODO"
-
-# You need a local MySQL or Postgresql server for this
-#SRC_TEST="do"
-
-#PATCHES=(  )
-
-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_prepare() {
-	for f in Makefile.PL MANIFEST ; do
-		if [ -f "${S}"/${f}.orig ]; then
-			cp -f "${S}"/${f}{.orig,}
-		else
-			cp -f "${S}"/${f}{,.orig}
-		fi
-	done
-	# If we are not in a cutting edge Git source, we would prefer to not install
-	# duplicates of these.
-	sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
-	sed -i -e '/^lib\/mogdeps/d' "${S}"/MANIFEST
-	mv -f "${S}/lib/mogdeps" "${S}"
-}
-
-src_compile() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	perl-module_src_compile || die "perl-module_src_compile failed"
-}
-
-src_install() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	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.30 mogstored
-	newinitd "${FILESDIR}"/mogstored-init.d-2.30 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.30 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
-}
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.36.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.36.ebuild
deleted file mode 100644
index c331f42b4485..000000000000
--- a/dev-perl/mogilefs-server/mogilefs-server-2.36.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2010 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.36.ebuild,v 1.1 2010/04/23 18:22:18 robbat2 Exp $
-
-EAPI=2
-MODULE_AUTHOR="DORMANDO"
-inherit perl-module
-
-DESCRIPTION="Server for the MogileFS distributed file system"
-HOMEPAGE="http://www.danga.com/mogilefs/"
-
-IUSE="mysql sqlite postgres"
-
-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.61
-		>=dev-perl/Sys-Syscall-0.22
-		>=dev-perl/Perlbal-1.74
-		dev-perl/IO-AIO
-		dev-perl/libwww-perl
-		>=dev-perl/MogileFS-Client-1.11
-		>=dev-perl/MogileFS-Utils-2.16
-		dev-perl/Cache-Memcached
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		sqlite? ( dev-perl/DBD-SQLite )"
-mydoc="CHANGES TODO"
-
-# You need a local MySQL or Postgresql server for this
-#SRC_TEST="do"
-
-#PATCHES=(  )
-
-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_prepare() {
-	for f in Makefile.PL MANIFEST ; do
-		if [ -f "${S}"/${f}.orig ]; then
-			cp -f "${S}"/${f}{.orig,}
-		else
-			cp -f "${S}"/${f}{,.orig}
-		fi
-	done
-	# If we are not in a cutting edge Git source, we would prefer to not install
-	# duplicates of these.
-	sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
-	sed -i -e '/^lib\/mogdeps/d' "${S}"/MANIFEST
-	mv -f "${S}/lib/mogdeps" "${S}"
-}
-
-src_compile() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	perl-module_src_compile || die "perl-module_src_compile failed"
-}
-
-src_install() {
-	export MOGILE_NO_BUILTIN_DEPS=1
-	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.30 mogstored
-	newinitd "${FILESDIR}"/mogstored-init.d-2.30 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.30 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
-}
diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild
index 2f7c1482d78d..e6925a081650 100644
--- a/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2010 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.37.ebuild,v 1.1 2010/08/20 21:14:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.37.ebuild,v 1.2 2010/10/29 03:28:45 robbat2 Exp $
 
 EAPI=2
 MODULE_AUTHOR="DORMANDO"
+MY_PN=mogilefs-server
+MY_P="${MY_PN}-${PV}"
+MODULE_A="${MY_P}.tar.gz"
 inherit perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
@@ -18,7 +21,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 # Upstream site recommends this,
 # but it breaks Perlbal
 # dev-perl/Perlbal-XS-HTTPHeaders
-DEPEND="dev-perl/Net-Netmask
+RDEPEND="dev-perl/Net-Netmask
 		>=dev-perl/Danga-Socket-1.61
 		>=dev-perl/Sys-Syscall-0.22
 		>=dev-perl/Perlbal-1.74
@@ -30,6 +33,7 @@ DEPEND="dev-perl/Net-Netmask
 		mysql? ( dev-perl/DBD-mysql )
 		postgres? ( dev-perl/DBD-Pg )
 		sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}"
 mydoc="CHANGES TODO"
 
 # You need a local MySQL or Postgresql server for this