Upstream version bump. (bug #123865)

(Portage version: 2.1_pre5-r1)

5 files changed, 252 insertions, 7 deletions

diff --git a/app-backup/boxbackup/ChangeLog b/app-backup/boxbackup/ChangeLog
index d983c2e1a75d..5eda8eba4858 100644
--- a/app-backup/boxbackup/ChangeLog
+++ b/app-backup/boxbackup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-backup/boxbackup
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/boxbackup/ChangeLog,v 1.4 2005/12/13 15:47:44 grobian Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/boxbackup/ChangeLog,v 1.5 2006/03/05 13:16:02 grobian Exp $
+
+*boxbackup-0.10 (05 Mar 2006)
+
+  05 Mar 2006; Fabian Groffen <grobian@gentoo.org>
+  +files/boxbackup-0.10-gentoo.patch, +boxbackup-0.10.ebuild:
+  Upstream version bump.  Thanks to Rajiv Aaron Manglani (rajiv@g.o) for
+  reminding.  (bug #123865)
 
   13 Dec 2005; Fabian Groffen <grobian@gentoo.org> boxbackup-0.09-r1.ebuild:
   Marked x86 after some period of flawless functioning.
diff --git a/app-backup/boxbackup/Manifest b/app-backup/boxbackup/Manifest
index cfbb569ab309..cf27ddafb25f 100644
--- a/app-backup/boxbackup/Manifest
+++ b/app-backup/boxbackup/Manifest
@@ -1,10 +1,39 @@
-MD5 936de91838c313ef0556bb504e740028 boxbackup-0.09-r1.ebuild 2327
 MD5 997d16153ee47362002b995019aa5ce5 ChangeLog 1159
-MD5 ba0035547f2be94605ff4fda2e70cb31 metadata.xml 542
+RMD160 37d91e38ef1b50afa606157c916e80c0032aab7e ChangeLog 1159
+SHA256 96797cb224e154df33f4e4aecc018f42bcd88699c0a93d67823228ba0ee8eb00 ChangeLog 1159
+MD5 936de91838c313ef0556bb504e740028 boxbackup-0.09-r1.ebuild 2327
+RMD160 f4de0b9e4fdc05de0fcb1d74ff6a1e64bcca8e33 boxbackup-0.09-r1.ebuild 2327
+SHA256 04266fd5e515f2ad18e1c4549fa87c65fe1b8ef3c1a536d72e1b2265770482f1 boxbackup-0.09-r1.ebuild 2327
 MD5 d561b4735dee4eb7a3466f3d27c0f002 boxbackup-0.09.ebuild 2227
+RMD160 494081616fd7a5a48ae704ce7dee0ba37b0c9e57 boxbackup-0.09.ebuild 2227
+SHA256 e090eda1336bfb3fc941e52e952e69d1ca54f78ceec1db6d4e732dcdf5857ba0 boxbackup-0.09.ebuild 2227
+MD5 3a56d89fac6b8385ced92d7fb7ea027e boxbackup-0.10.ebuild 1834
+RMD160 a0fe5ede9ac683fef7e91254ee21908aaafa32d1 boxbackup-0.10.ebuild 1834
+SHA256 8bf82c4e130b816432453d9dc40d6b00f65f0b86cc5eadefced67b4823028953 boxbackup-0.10.ebuild 1834
+MD5 22fd10d35901d4aa9cf973bc57e90e04 files/bbackupd.rc 514
+RMD160 45e049878c4e15161f10c66d832ce2a74fe1851a files/bbackupd.rc 514
+SHA256 bde55e7983a10f48ba7e1643baae29be2570d9259b0d87516f1638bd5a4b24e5 files/bbackupd.rc 514
 MD5 c5bf24fdd27367aeea4b3833683683e7 files/bbstored.rc 526
+RMD160 7dca1b7a53730b7ae1320fcb96c150f5d6c1f71d files/bbstored.rc 526
+SHA256 fbcb3f3d4a348c3c2880cdc4926c17a8ee680329ed6681e5baab7cefc7849302 files/bbstored.rc 526
 MD5 10ad8802434518abe87eba09444a4855 files/boxbackup-0.09-darwin.patch 443
-MD5 a5aea4f1d604c930129b8efc62612f51 files/digest-boxbackup-0.09-r1 138
-MD5 a5aea4f1d604c930129b8efc62612f51 files/digest-boxbackup-0.09 138
+RMD160 42eb57cb8b427461af369da2867596564b39801a files/boxbackup-0.09-darwin.patch 443
+SHA256 8063c7b0e26829ac7c58eaf87ecce92df77c9e4b189e2311555c40c29c7437d9 files/boxbackup-0.09-darwin.patch 443
 MD5 21a608266d776fcc9099d8d58418f8ed files/boxbackup-0.09-gentoo.patch 6695
-MD5 22fd10d35901d4aa9cf973bc57e90e04 files/bbackupd.rc 514
+RMD160 698dd7b6d8dffc648a4ade458c8ffb0ba82397a4 files/boxbackup-0.09-gentoo.patch 6695
+SHA256 b5bbeefb639fcaa9658a20bc0e6ab6d839b1db36bca3386ec7cc47d9c04fed2d files/boxbackup-0.09-gentoo.patch 6695
+MD5 2f73db2211fd42f2cd394255b2e79672 files/boxbackup-0.10-gentoo.patch 4616
+RMD160 94a652d6b52fb71f8a6ce492a40179afa6ed5b12 files/boxbackup-0.10-gentoo.patch 4616
+SHA256 76b052551e5b8696a098defafea0016991254e82f32c5f9c12ba49c396b955c4 files/boxbackup-0.10-gentoo.patch 4616
+MD5 a5aea4f1d604c930129b8efc62612f51 files/digest-boxbackup-0.09 138
+RMD160 5bf7871504d9a05026f2ccaa1bb2e361f8c565bb files/digest-boxbackup-0.09 138
+SHA256 5debd6d89b0d48d87935635beb12bb8228f58f6998429a663694e2003ecfd13e files/digest-boxbackup-0.09 138
+MD5 a5aea4f1d604c930129b8efc62612f51 files/digest-boxbackup-0.09-r1 138
+RMD160 5bf7871504d9a05026f2ccaa1bb2e361f8c565bb files/digest-boxbackup-0.09-r1 138
+SHA256 5debd6d89b0d48d87935635beb12bb8228f58f6998429a663694e2003ecfd13e files/digest-boxbackup-0.09-r1 138
+MD5 f78ca85ecd9a67cb385844e429257616 files/digest-boxbackup-0.10 235
+RMD160 f2d275e5d7d46b32dc3a4f5189fddb8db080fff5 files/digest-boxbackup-0.10 235
+SHA256 75c6e20e9ba97e4fd3a9269fc722f3fd1ba9a56bdfd0f1c1adacf14d0f29f63d files/digest-boxbackup-0.10 235
+MD5 ba0035547f2be94605ff4fda2e70cb31 metadata.xml 542
+RMD160 13e2df1f655881bf683e51c6a557fa11a0d6178c metadata.xml 542
+SHA256 9a6290d541010fe606f097f80ae8f56680c8d7e41cecea9cc6ce3ff7a173d7ef metadata.xml 542
diff --git a/app-backup/boxbackup/boxbackup-0.10.ebuild b/app-backup/boxbackup/boxbackup-0.10.ebuild
new file mode 100644
index 000000000000..611cafc88b9a
--- /dev/null
+++ b/app-backup/boxbackup/boxbackup-0.10.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/boxbackup/boxbackup-0.10.ebuild,v 1.1 2006/03/05 13:16:02 grobian Exp $
+
+inherit eutils
+
+DESCRIPTION="A completely automatic on-line backup system"
+HOMEPAGE="http://www.fluffy.co.uk/boxbackup/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~ppc-macos ~x86"
+IUSE="client-only"
+DEPEND="sys-libs/zlib
+	sys-libs/db
+	>=dev-libs/openssl-0.9.7
+	>=dev-lang/perl-5.6"
+RDEPEND="${DEPEND}
+	virtual/mta"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}"-gentoo.patch
+}
+
+src_compile() {
+	econf || die "configure failed"
+	make || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+	make DESTDIR="${D}" install-backup-client || die "client install failed"
+	use client-only || \
+		make DESTDIR="${D}" install-backup-server || die "server install failed"
+
+	dodoc *.txt
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/bbackupd.rc bbackupd
+	use client-only || \
+		newexe ${FILESDIR}/bbstored.rc bbstored
+
+	keepdir /etc/boxbackup
+
+	# move executables from /usr/bin to /usr/sbin, as configuration of
+	# this is unfortunately not optimal
+	mv "${D}/usr/bin" "${D}/usr/sbin" || die "could not move files from bin to sbin"
+}
+
+pkg_preinst() {
+	if ! use client-only;
+	then
+		enewgroup bbstored
+		enewuser bbstored -1 -1 -1 bbstored
+	fi
+}
+
+pkg_postinst() {
+	while read line; do einfo "${line}"; done <<EOF
+After configuring the boxbackup client and/or server, you can start
+the boxbackup daemons using the init scripts /etc/init.d/bbackupd
+and /etc/init.d/bbstored.
+More information about configuring the client can be found at
+${HOMEPAGE}client.html,
+and more information about configuring the server can be found at
+${HOMEPAGE}server.html.
+EOF
+}
diff --git a/app-backup/boxbackup/files/boxbackup-0.10-gentoo.patch b/app-backup/boxbackup/files/boxbackup-0.10-gentoo.patch
new file mode 100644
index 000000000000..1e925e85065c
--- /dev/null
+++ b/app-backup/boxbackup/files/boxbackup-0.10-gentoo.patch
@@ -0,0 +1,137 @@
+grobian@gentoo.org:
+* change /etc/box into /etc/boxbackup
+* don't do anything in /usr/local/bin, install in /usr/sbin instead
+* remove Darwin/OSX Fink support and dynamic parallelising
+* respect DESTDIR on install
+
+--- boxbackup-0.10/bin/bbackupd/bbackupd-config
++++ boxbackup-0.10/bin/bbackupd/bbackupd-config
+@@ -56,7 +56,7 @@
+ Usage:
+ 	bbackupd-config config-dir backup-mode account-num server-hostname working-dir backup-dir [more backup directories]
+ 
+-config-dir usually /etc/box
++config-dir usually /etc/boxbackup
+ backup-mode is lazy or snapshot
+     lazy mode runs continously, uploading files over a specified age
+     snapshot mode uploads a snapshot of the filesystem when instructed explicitly
+@@ -92,7 +92,7 @@
+ }
+ 
+ # default locations
+-my $default_config_location = '/etc/box/bbackupd.conf';
++my $default_config_location = '/etc/boxbackup/bbackupd.conf';
+ 
+ # command line parameters
+ my ($config_dir,$backup_mode,$account_num,$server,$working_dir,@tobackup) = @ARGV;
+@@ -540,7 +540,7 @@
+    more files will be backed up. You want to know about this.
+ 
+ 6) Start the backup daemon with the command
+-      /usr/local/bin/bbackupd$daemon_args
++      /usr/sbin/bbackupd$daemon_args
+    in /etc/rc.local, or your local equivalent.
+    Note that bbackupd must run as root.
+ __E
+@@ -550,7 +550,7 @@
+ 
+ 7) Set up a cron job to run whenever you want a snapshot of the
+    file system to be taken. Run the command
+-      /usr/local/bin/bbackupctl -q$ctl_daemon_args sync
++      /usr/sbin/bbackupctl -q$ctl_daemon_args sync
+ __E
+ }
+ print <<__E;
+--- boxbackup-0.10/bin/bbstored/bbstored-config
++++ boxbackup-0.10/bin/bbstored/bbstored-config
+@@ -57,7 +57,7 @@
+ Usage:
+ 	bbstored-config config-dir server-hostname username [raidfile-config]
+ 
+-config-dir usually /etc/box
++config-dir usually /etc/boxbackup
+ server-hostname is the hostname used by clients to connect to this server
+ username is the user to run the server under
+ raidfile-config is optional. Use if you have a non-standard raidfile.conf file.
+@@ -83,7 +83,7 @@
+ }
+ 
+ # default locations
+-my $default_config_location = '/etc/box/bbstored.conf';
++my $default_config_location = '/etc/boxbackup/bbstored.conf';
+ 
+ # command line parameters
+ my ($config_dir,$server,$username,$raidfile_config) = @ARGV;
+@@ -270,7 +270,7 @@
+ 4) Create accounts with bbstoreaccounts
+ 
+ 5) Start the backup store daemon with the command
+-      /usr/local/bin/bbstored$daemon_args
++      /usr/sbin/bbstored$daemon_args
+    in /etc/rc.local, or your local equivalent.
+ 
+ ===================================================================
+--- boxbackup-0.10/lib/raidfile/raidfile-config
++++ boxbackup-0.10/lib/raidfile/raidfile-config
+@@ -57,7 +57,7 @@
+ Usage:
+ 	raidfile-config config-dir block-size dir0 [dir1 dir2]
+ 
+-config-dir usually /etc/box
++config-dir usually /etc/boxbackup
+ block-size must be a power of two, and usually the block or fragment size of your filing system
+ dir0, dir1, dir2 are the directories used as the root of the raid file system
+ 
+--- boxbackup-0.10/lib/raidfile/RaidFileController.h
++++ boxbackup-0.10/lib/raidfile/RaidFileController.h
+@@ -120,7 +120,7 @@
+ 	~RaidFileController();
+ 	
+ public:
+-	void Initialise(const char *ConfigFilename = "/etc/box/raidfile.conf");
++	void Initialise(const char *ConfigFilename = "/etc/boxbackup/raidfile.conf");
+ 	int GetNumDiscSets() {return mSetList.size();}
+ 
+ 	// --------------------------------------------------------------------------
+--- boxbackup-0.10/infrastructure/BoxPlatform.pm.in
++++ boxbackup-0.10/infrastructure/BoxPlatform.pm.in
+@@ -37,26 +37,6 @@
+ 
+ 	# where to put the files
+	$install_into_dir = '@bindir_expanded@';
+-
+-	# if it's Darwin,
+-	if($build_os eq 'Darwin')
+-	{
+-		# see how many processors there are, and set make flags accordingly
+-		my $cpus = `sysctl hw.ncpu`;
+-		if($cpus =~ m/hw.ncpu:\s(\d+)/ && $1 > 1)
+-		{
+-			print "$1 processors detected, will set make to perform concurrent jobs\n";
+-			$sub_make_options = ' -j '.($1 + 1);
+-		}
+-		
+-		# test for fink installation
+-		if(-d '/sw/include' && -d '/sw/lib')
+-		{
+-			print "Fink installation detected, will use headers and libraries\n\n\n";
+-			$platform_compile_line_extra = '-I/sw/include ';
+-			$platform_link_line_extra = '-L/sw/lib ';
+-		}
+-	}
+ }
+ 
+ sub make_flag
+
+--- boxbackup-0.10/infrastructure/makeparcels.pl
++++ boxbackup-0.10/infrastructure/makeparcels.pl
+@@ -172,7 +172,8 @@
+ 			$name = $1;
+ 		}
+ 
+-		print SCRIPT "install $name $install_into_dir\n";
++		print SCRIPT "mkdir -p \${DESTDIR}$install_into_dir/\n";
++		print SCRIPT "install $name \${DESTDIR}$install_into_dir/$name\n";
+ 	}
+ 	
+ 	close SCRIPT;
diff --git a/app-backup/boxbackup/files/digest-boxbackup-0.10 b/app-backup/boxbackup/files/digest-boxbackup-0.10
new file mode 100644
index 000000000000..1ed0acad0c41
--- /dev/null
+++ b/app-backup/boxbackup/files/digest-boxbackup-0.10
@@ -0,0 +1,3 @@
+MD5 2dc02d87932fdb222ed019443ddcf444 boxbackup-0.10.tgz 842450
+RMD160 26f906f37a3b095026ddf12c9284e16515ceb752 boxbackup-0.10.tgz 842450
+SHA256 09e88f4ee26b76b3d6e6a0cf3fc374e55d79dd84e9884dfc6a7635593862d361 boxbackup-0.10.tgz 842450