diff --git a/app-backup/backuppc/ChangeLog b/app-backup/backuppc/ChangeLog
new file mode 100644
index 0000000..94d451e
--- /dev/null
+++ b/app-backup/backuppc/ChangeLog
@@ -0,0 +1,8 @@
+*backuppc-3.1.0 (29 Sep 2009)
+
+29 Sep 2009; Lenno Nagel <lenno@nagel.ee> +backuppc-3.1.0.ebuild:
+	Wrote a new ebuild for 3.1.0 based on the old versions.
+	I really hope this is much cleaner and more reliable than the
+	other ebuilds that have been floating around for BackupPC.
+	Hopefully this will make it to the main portage tree one day :)
+
diff --git a/app-backup/backuppc/Manifest b/app-backup/backuppc/Manifest
index c1cad74..3381724 100644
--- a/app-backup/backuppc/Manifest
+++ b/app-backup/backuppc/Manifest
@@ -1,9 +1,11 @@
-AUX Manifest 1563 RMD160 ef49fd1fb7531c66534825e72e775ac27732d22f SHA1 9d16c1aaae219cf0e0d612c7ed9b6a438b5412c6 SHA256 943bf82ee6e368ae6c35762555f8ffc701a7c3fe1e6779ce7a3092cb1efac314
+AUX 01-fix-configure.pl.patch 1291 RMD160 38231594d522e2451860a11b4e6e8a9d00c31c08 SHA1 c31a58ad3fda61d2564640b0deb5ce1f05a3cd76 SHA256 580d37cfb12426dd94dfbc3a7b4c3b66e96e6cfe054799dd2c408713b52c6de5
+AUX 02-fix0config.pl-formatting.patch 23107 RMD160 2988eae80072de4500164c7b040afa40099c8fad SHA1 941aadcd51ef3c1cf45fde54930eee7fa0fd5710 SHA256 6a14705f0c988f00013afc93ca87fbff6dbd294d3846b95ddcf4a21fcd40146a
+AUX 03-reasonable-config.pl-defaults.patch 1169 RMD160 38cbfd0ea93f115a62733496f0b0823bd31ed45e SHA1 1db261efbbde5968f55daee3067d35131bbc7ac1 SHA256 7477d7964d99a5def28eaeb75bc11a03d5ad4ddfb509b6a1c6fed80033bbc24d
+AUX 04-add-docdir-marker.patch 471 RMD160 12a2d0451c792f38b082ae1636b605094085f43b SHA1 da52df9313a98ac07d739f003c64d6c185c29992 SHA256 155efd966ee694562a6737bcada613dcb179002efb44b3cad90afc0f1a686cfd
 AUX apache2-backuppc.conf 3064 RMD160 5eba0c1b294c67d421dedf325b81e86eb07080e3 SHA1 319be2c7f270e56d553fa2cf3fa873d15e3a0c67 SHA256 3f92aa053a411889faccc2cfd9ea65864de446cc28bcb32f0056ab37bb18fa4c
 AUX apache2-backuppc.init 3800 RMD160 9a4a4c55671738447ef131480ca41506baf947b8 SHA1 6ffef133a0b523e4e0d428b8a5282632303d61a2 SHA256 a8b29805a82315f47e0b8e8583c530ba0e4c0b0393001bed4cd2759c2a0c6bb9
-AUX fixperms 346 RMD160 39d6e106a3bfa2a4334669d6805a9957b89568e5 SHA1 2640b3a4051329c1d26338b4249a8f745600c2b6 SHA256 e02650bbc126e89aa3abd3a6ecb0300ccbab9e730472f9c4821e47e8139c4c5d
 AUX httpd.conf 12111 RMD160 f0634267afcc5e3246699e8e9235b3c64a19c3e4 SHA1 efd4fa124bae05ec4c4f7c181add7ccd70156e16 SHA256 5c19a8faa28a0a2e28a281a4131eb99987720e1120678803bbe99c0ca08c3658
-AUX postinstall-en.txt 854 RMD160 8dc6eb81f9519b820baa2b63a59fc2362607045a SHA1 db15cfd9c3ed8b4f9c534495e28a293866af33f6 SHA256 2ce9a8cc59c3331875e34415f2d8b1a72927596622f35fe8f18dbacc17b8fd65
 DIST BackupPC-3.1.0.tar.gz 474981 RMD160 22d4cb6dd76f846fde489a301852f50e8db1ae1d SHA1 3bd6d637f4f08f2fda44a12668b91d47c4abb0a7 SHA256 49a2744cb9aaf27b298ec3d2e83e46fdb86fb3596922beb3904cb6ae552c148a
 EBUILD backuppc-3.1.0-r1.ebuild 5983 RMD160 0eff96a9b8851a0400fca98941ca4f91b5b22fe2 SHA1 a06db0829e4679c7e6dbe54cfd281c4194cccd7f SHA256 3e4263b6f688efaff1d6109fa4b809ef0820c1bc76b9577b3fdb5eee70c8d560
 EBUILD backuppc-3.1.0.ebuild 6522 RMD160 36347b875b9e7fad234cb75a85da5123bd08d786 SHA1 34d98ac932afc21c19bf095fe6ee6c31eb5a7ad0 SHA256 d208b3f9fdc6d216ca083f7096b7271a89b37b7965135ffa0835d077dda649f3
+MISC ChangeLog 343 RMD160 b0e96f64e301b88d9451959e0c835eb23d0fe993 SHA1 4f0d0f0791888ee392b813cb6faaa6f38ad15022 SHA256 6ca68a6d8f63df04726c5cad654fa5bb1aedcfffece0ed9c3f27c0d13c4a2521
diff --git a/app-backup/backuppc/files/01-fix-configure.pl.patch b/app-backup/backuppc/files/01-fix-configure.pl.patch
new file mode 100644
index 0000000..b68dfe7
--- /dev/null
+++ b/app-backup/backuppc/files/01-fix-configure.pl.patch
@@ -0,0 +1,36 @@
+--- configure.pl.orig	2009-09-29 01:52:58.000000000 +0300
++++ configure.pl	2009-09-29 20:41:18.000000000 +0300
+@@ -1,4 +1,4 @@
+-#!/bin/perl
++#!/usr/bin/perl
+ #============================================================= -*-perl-*-
+ #
+ # configure.pl: Configuration and installation program for BackupPC
+@@ -157,7 +157,7 @@
+ # config file to get all the defaults.
+ #
+ my $ConfigPath = "";
+-my $ConfigFileOK = 1;
++my $ConfigFileOK = 0;
+ while ( 1 ) {
+     if ( $ConfigFileOK && -f "/etc/BackupPC/config.pl" ) {
+         $ConfigPath = "/etc/BackupPC/config.pl";
+@@ -212,7 +212,8 @@
+         $bpc->{LogDir} = $Conf{LogDir}  = "$Conf{TopDir}/log"
+                     if ( $Conf{LogDir} eq '' );
+     }
+-    $bpc->{ConfDir} = $Conf{ConfDir} = $confDir;
++    # Disable this as it's not really neccessary for this ebuild
++    # $bpc->{ConfDir} = $Conf{ConfDir} = $confDir;
+     my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort}, 1);
+     if ( $err eq "" ) {
+         print <<EOF;
+@@ -718,7 +719,7 @@
+     if ( $Conf{CgiDir} =~ m{cgi-bin(/.*)} ) {
+ 	$Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin$1/BackupPC_Admin'";
+     } else {
+-	$Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin/BackupPC_Admin'";
++	$Conf{CgiURL} = "'http://$Conf{ServerHost}/BackupPC_Admin'";
+     }
+ }
+ 
diff --git a/app-backup/backuppc/files/02-fix0config.pl-formatting.patch b/app-backup/backuppc/files/02-fix0config.pl-formatting.patch
new file mode 100644
index 0000000..fe5c36d
--- /dev/null
+++ b/app-backup/backuppc/files/02-fix0config.pl-formatting.patch
@@ -0,0 +1,791 @@
+--- conf/config.pl.orig		2009-09-30 14:30:54.035496661 +0300
++++ conf/config.pl		2009-09-30 14:30:54.035496661 +0300
+@@ -87,7 +87,7 @@
+ # Default value prevents any access from group other, and prevents
+ # group write.
+ #
+-$Conf{UmaskMode} = 027;
++$Conf{UmaskMode} = 27;
+ 
+ #
+ # Times at which we wake up, check all the PCs, and schedule necessary
+@@ -113,7 +113,31 @@
+ # you want BackupPC_nightly to run (eg: when you don't expect a lot
+ # of regular backups to run).
+ #
+-$Conf{WakeupSchedule} = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23];
++$Conf{WakeupSchedule} = [
++  1,
++  2,
++  3,
++  4,
++  5,
++  6,
++  7,
++  8,
++  9,
++  10,
++  11,
++  12,
++  13,
++  14,
++  15,
++  16,
++  17,
++  18,
++  19,
++  20,
++  21,
++  22,
++  23
++];
+ 
+ #
+ # Maximum number of simultaneous backups to run.  If there
+@@ -218,9 +242,9 @@
+ # Full path to various commands for archiving
+ #
+ $Conf{SplitPath} = '';
+-$Conf{ParPath}   = '';
+-$Conf{CatPath}   = '';
+-$Conf{GzipPath}  = '';
++$Conf{ParPath} = '';
++$Conf{CatPath} = '';
++$Conf{GzipPath} = '';
+ $Conf{Bzip2Path} = '';
+ 
+ #
+@@ -288,11 +312,11 @@
+ #                with configure.pl to change InstallDir.
+ #   CgiDir     - Apache CGI directory for BackupPC_Admin
+ #
+-$Conf{TopDir}      = '';
+-$Conf{ConfDir}     = '';
+-$Conf{LogDir}      = '';
+-$Conf{InstallDir}  = '';
+-$Conf{CgiDir}      = '';
++$Conf{TopDir} = '';
++$Conf{ConfDir} = '';
++$Conf{LogDir} = '';
++$Conf{InstallDir} = '';
++$Conf{CgiDir} = '';
+ 
+ #
+ # Whether BackupPC and the CGI script BackupPC_Admin verify that they
+@@ -302,7 +326,7 @@
+ # BackupPC might be accidently started as root or the wrong user,
+ # or if the CGI script is not installed correctly.
+ #
+-$Conf{BackupPCUserVerify} = 1;
++$Conf{BackupPCUserVerify} = '1';
+ 
+ #
+ # Maximum number of hardlinks supported by the $TopDir file system
+@@ -319,7 +343,7 @@
+ # Advanced option for asking BackupPC to load additional perl modules.
+ # Can be a list (array ref) of module names to load at startup.
+ #
+-$Conf{PerlModuleLoad}     = undef;
++$Conf{PerlModuleLoad} = undef;
+ 
+ #
+ # Path to init.d script and command to use that script to start the
+@@ -341,7 +365,7 @@
+ # needs to be a full path and you can't include shell syntax like
+ # redirection and pipes; put that in a script if you need it.
+ #
+-$Conf{ServerInitdPath} = '';
++$Conf{ServerInitdPath} = undef;
+ $Conf{ServerInitdStartCmd} = '';
+ 
+ 
+@@ -359,7 +383,7 @@
+ # time taken for the backup, plus the granularity of $Conf{WakeupSchedule}
+ # will make the actual backup interval a bit longer.
+ #
+-$Conf{FullPeriod} = 6.97;
++$Conf{FullPeriod} = '6.97';
+ 
+ #
+ # Minimum period in days between incremental backups (a user requested
+@@ -369,7 +393,7 @@
+ # time taken for the backup, plus the granularity of $Conf{WakeupSchedule}
+ # will make the actual backup interval a bit longer.
+ #
+-$Conf{IncrPeriod} = 0.97;
++$Conf{IncrPeriod} = '0.97';
+ 
+ #
+ # Number of full backups to keep.  Must be >= 1.
+@@ -444,7 +468,9 @@
+ #    $Conf{FullKeepCnt} = 4;
+ #    $Conf{FullKeepCnt} = [4];
+ #
+-$Conf{FullKeepCnt} = 1;
++$Conf{FullKeepCnt} = [
++  1
++];
+ 
+ #
+ # Very old full backups are removed after $Conf{FullAgeMax} days.  However,
+@@ -456,7 +482,7 @@
+ # full backups to exceed $Conf{FullAgeMax}.
+ #
+ $Conf{FullKeepCntMin} = 1;
+-$Conf{FullAgeMax}     = 90;
++$Conf{FullAgeMax} = 90;
+ 
+ #
+ # Number of incremental backups to keep.  Must be >= 1.
+@@ -473,7 +499,7 @@
+ # matter how old they are.
+ #
+ $Conf{IncrKeepCntMin} = 1;
+-$Conf{IncrAgeMax}     = 30;
++$Conf{IncrAgeMax} = 30;
+ 
+ #
+ # Level of each incremental.  "Level" follows the terminology
+@@ -551,7 +577,9 @@
+ # meaning each incremental backed up all the files that
+ # changed since the last full.
+ #
+-$Conf{IncrLevels} = [1];
++$Conf{IncrLevels} = [
++  1
++];
+ 
+ #
+ # Disable all full and incremental backups.  These settings are
+@@ -617,7 +645,7 @@
+ # The default is off.  You can turn this on or off at any
+ # time without affecting existing backups.
+ #
+-$Conf{IncrFill} = 0;
++$Conf{IncrFill} = '0';
+ 
+ #
+ # Number of restore logs to keep.  BackupPC remembers information about
+@@ -669,7 +697,7 @@
+ #       '*' => ['/myFiles', '/important'],      # these are other shares
+ #    };
+ #
+-$Conf{BackupFilesOnly} = undef;
++$Conf{BackupFilesOnly} = {};
+ 
+ #
+ # List of directories or files to exclude from the backup.  For Smb,
+@@ -719,7 +747,7 @@
+ #       '*' => ['/junk', '/dont_back_this_up'], # these are for other shares
+ #    };
+ #
+-$Conf{BackupFilesExclude} = undef;
++$Conf{BackupFilesExclude} = {};
+ 
+ #
+ # PCs that are always or often on the network can be backed up after
+@@ -750,7 +778,7 @@
+ # to just set $Conf{WakeupSchedule} to a restricted schedule.
+ #
+ $Conf{BlackoutBadPingLimit} = 3;
+-$Conf{BlackoutGoodCnt}      = 7;
++$Conf{BlackoutGoodCnt} = 7;
+ 
+ #
+ # One or more blackout periods can be specified.  If a client is
+@@ -793,11 +821,17 @@
+ # Saturday night.
+ #
+ $Conf{BlackoutPeriods} = [
+-    {
+-	hourBegin =>  7.0,
+-	hourEnd   => 19.5,
+-	weekDays  => [1, 2, 3, 4, 5],
+-    },
++  {
++    'hourEnd' => '19.5',
++    'weekDays' => [
++      1,
++      2,
++      3,
++      4,
++      5
++    ],
++    'hourBegin' => 7
++  }
+ ];
+ 
+ #
+@@ -806,7 +840,7 @@
+ # backed up.  If you have shares that might be empty (and therefore an
+ # empty backup is valid) you should set this flag to 0.
+ #
+-$Conf{BackupZeroFilesIsFatal} = 1;
++$Conf{BackupZeroFilesIsFatal} = '1';
+ 
+ ###########################################################################
+ # How to backup a client
+@@ -898,7 +932,9 @@
+ #
+ # This setting only matters if $Conf{XferMethod} = 'smb'.
+ #
+-$Conf{SmbShareName} = 'C$';
++$Conf{SmbShareName} = [
++  'C$'
++];
+ 
+ #
+ # Smbclient share user name.  This is passed to smbclient's -U argument.
+@@ -951,9 +987,7 @@
+ # needs to be a full path and you can't include shell syntax like
+ # redirection and pipes; put that in a script if you need it.
+ #
+-$Conf{SmbClientFullCmd} = '$smbClientPath \\\\$host\\$shareName'
+-	    . ' $I_option -U $userName -E -N -d 1'
+-            . ' -c tarmode\\ full -Tc$X_option - $fileList';
++$Conf{SmbClientFullCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -N -d 1 -c tarmode\\ full -Tc$X_option - $fileList';
+ 
+ #
+ # Command to run smbclient for an incremental dump.
+@@ -965,9 +999,7 @@
+ # needs to be a full path and you can't include shell syntax like
+ # redirection and pipes; put that in a script if you need it.
+ #
+-$Conf{SmbClientIncrCmd} = '$smbClientPath \\\\$host\\$shareName'
+-	    . ' $I_option -U $userName -E -N -d 1'
+-	    . ' -c tarmode\\ full -TcN$X_option $timeStampFile - $fileList';
++$Conf{SmbClientIncrCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -N -d 1 -c tarmode\\ full -TcN$X_option $timeStampFile - $fileList';
+ 
+ #
+ # Command to run smbclient for a restore.
+@@ -983,9 +1015,7 @@
+ # needs to be a full path and you can't include shell syntax like
+ # redirection and pipes; put that in a script if you need it.
+ #
+-$Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName'
+-            . ' $I_option -U $userName -E -N -d 1'
+-            . ' -c tarmode\\ full -Tx -';
++$Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -N -d 1 -c tarmode\\ full -Tx -';
+ 
+ #
+ # Which host directories to backup when using tar transport.  This can be a
+@@ -1016,7 +1046,9 @@
+ #
+ # This setting only matters if $Conf{XferMethod} = 'tar'.
+ #
+-$Conf{TarShareName} = '/';
++$Conf{TarShareName} = [
++  '/'
++];
+ 
+ #
+ # Full command to run tar on the client.  GNU tar is required.  You will
+@@ -1057,9 +1089,7 @@
+ # needs to be a full path and you can't include shell syntax like
+ # redirection and pipes; put that in a script if you need it.
+ #
+-$Conf{TarClientCmd} = '$sshPath -q -x -n -l root $host'
+-                    . ' env LC_ALL=C $tarPath -c -v -f - -C $shareName+'
+-                    . ' --totals';
++$Conf{TarClientCmd} = '$sshPath -q -x -n -l root $host env LC_ALL=C $tarPath -c -v -f - -C $shareName+ --totals';
+ 
+ #
+ # Extra tar arguments for full backups.  Several variables are substituted at
+@@ -1118,9 +1148,7 @@
+ # needs to be a full path and you can't include shell syntax like
+ # redirection and pipes; put that in a script if you need it.
+ #
+-$Conf{TarClientRestoreCmd} = '$sshPath -q -x -l root $host'
+-		   . ' env LC_ALL=C $tarPath -x -p --numeric-owner --same-owner'
+-		   . ' -v -f - -C $shareName+';
++$Conf{TarClientRestoreCmd} = '$sshPath -q -x -l root $host env LC_ALL=C $tarPath -x -p --numeric-owner --same-owner -v -f - -C $shareName+';
+ 
+ #
+ # Full path for tar on the client. Security caution: normal users should not
+@@ -1188,7 +1216,9 @@
+ #
+ #     $Conf{RsyncShareName} = ['/', '/var', '/data', '/boot'];
+ #
+-$Conf{RsyncShareName} = '/';
++$Conf{RsyncShareName} = [
++  '/'
++];
+ 
+ #
+ # Rsync daemon port on the client, for $Conf{XferMethod} = "rsyncd".
+@@ -1217,7 +1247,7 @@
+ # connect to an rsyncd on the client that is not password protected.
+ # Turn off at your own risk.
+ #
+-$Conf{RsyncdAuthRequired} = 1;
++$Conf{RsyncdAuthRequired} = '1';
+ 
+ #
+ # When rsync checksum caching is enabled (by adding the
+@@ -1240,7 +1270,7 @@
+ #   
+ # This setting has no effect unless checksum caching is turned on.
+ #   
+-$Conf{RsyncCsumCacheVerifyProb} = 0.01;
++$Conf{RsyncCsumCacheVerifyProb} = '0.01';
+ 
+ #
+ # Arguments to rsync for backup.  Do not edit the first set unless you
+@@ -1257,32 +1287,17 @@
+ #     ];
+ #
+ $Conf{RsyncArgs} = [
+-	    #
+-	    # Do not edit these!
+-	    #
+-            '--numeric-ids',
+-            '--perms',
+-            '--owner',
+-            '--group',
+-            '-D',
+-            '--links',
+-            '--hard-links',
+-            '--times',
+-            '--block-size=2048',
+-            '--recursive',
+-
+-	    #
+-	    # Rsync >= 2.6.3 supports the --checksum-seed option
+-            # which allows rsync checksum caching on the server.
+-	    # Uncomment this to enable rsync checksum caching if
+-            # you have a recent client rsync version and you want
+-            # to enable checksum caching.
+-	    #
+-	    #'--checksum-seed=32761',
+-
+-	    #
+-	    # Add additional arguments here
+-	    #
++  '--numeric-ids',
++  '--perms',
++  '--owner',
++  '--group',
++  '-D',
++  '--links',
++  '--hard-links',
++  '--times',
++  '--block-size=2048',
++  '--recursive',
++  '--specials'
+ ];
+ 
+ #
+@@ -1294,34 +1309,19 @@
+ # the corresponding CGI restore option will be removed.
+ #
+ $Conf{RsyncRestoreArgs} = [
+-	    #
+-	    # Do not edit these!
+-	    #
+-	    '--numeric-ids',
+-	    '--perms',
+-	    '--owner',
+-	    '--group',
+-	    '-D',
+-	    '--links',
+-            '--hard-links',
+-	    '--times',
+-	    '--block-size=2048',
+-	    '--relative',
+-	    '--ignore-times',
+-	    '--recursive',
+-
+-	    #
+-	    # Rsync >= 2.6.3 supports the --checksum-seed option
+-            # which allows rsync checksum caching on the server.
+-	    # Uncomment this to enable rsync checksum caching if
+-            # you have a recent client rsync version and you want
+-            # to enable checksum caching.
+-	    #
+-	    #'--checksum-seed=32761',
+-
+-	    #
+-	    # Add additional arguments here
+-	    #
++  '--numeric-ids',
++  '--perms',
++  '--owner',
++  '--group',
++  '-D',
++  '--links',
++  '--hard-links',
++  '--times',
++  '--block-size=2048',
++  '--relative',
++  '--ignore-times',
++  '--recursive',
++  '--specials'
+ ];
+ 
+ #
+@@ -1418,7 +1418,7 @@
+ #
+ # Set to 0 to disable this feature.
+ #
+-$Conf{ArchivePar} = 0;
++$Conf{ArchivePar} = '0';
+ 
+ #
+ # Archive Size Split
+@@ -1454,9 +1454,7 @@
+ # needs to be a full path and you can't include shell syntax like
+ # redirection and pipes; put that in a script if you need it.
+ #
+-$Conf{ArchiveClientCmd} = '$Installdir/bin/BackupPC_archiveHost'
+-	. ' $tarCreatePath $splitpath $parpath $host $backupnumber'
+-	. ' $compression $compext $splitsize $archiveloc $parfile *';
++$Conf{ArchiveClientCmd} = '$Installdir/bin/BackupPC_archiveHost $tarCreatePath $splitpath $parpath $host $backupnumber $compression $compext $splitsize $archiveloc $parfile *';
+ 
+ #
+ # Full path for ssh. Security caution: normal users should not
+@@ -1528,7 +1526,7 @@
+ # setting this flag is a great way to verify that the machines have
+ # their netbios name set correctly before turning on DCHP.
+ #
+-$Conf{FixedIPNetBiosNameCheck} = 0;
++$Conf{FixedIPNetBiosNameCheck} = '0';
+ 
+ #
+ # Full path to the ping command.  Security caution: normal users
+@@ -1705,13 +1703,13 @@
+ # needs to be a full path and you can't include shell syntax like
+ # redirection and pipes; put that in a script if you need it.
+ #
+-$Conf{DumpPreUserCmd}     = undef;
+-$Conf{DumpPostUserCmd}    = undef;
+-$Conf{DumpPreShareCmd}    = undef;
+-$Conf{DumpPostShareCmd}   = undef;
+-$Conf{RestorePreUserCmd}  = undef;
++$Conf{DumpPreUserCmd} = undef;
++$Conf{DumpPostUserCmd} = undef;
++$Conf{DumpPreShareCmd} = undef;
++$Conf{DumpPostShareCmd} = undef;
++$Conf{RestorePreUserCmd} = undef;
+ $Conf{RestorePostUserCmd} = undef;
+-$Conf{ArchivePreUserCmd}  = undef;
++$Conf{ArchivePreUserCmd} = undef;
+ $Conf{ArchivePostUserCmd} = undef;
+ 
+ #
+@@ -1735,7 +1733,7 @@
+ # that snapshots or dumps a database which fails because
+ # of some database error.
+ #
+-$Conf{UserCmdCheckStatus} = 0;
++$Conf{UserCmdCheckStatus} = '0';
+ 
+ #
+ # Override the client's host name.  This allows multiple clients
+@@ -1773,7 +1771,7 @@
+ # rounded up (ie: 2.5 means a user will never receive email more
+ # than once every 3 days).
+ #
+-$Conf{EMailNotifyMinDays} = 2.5;
++$Conf{EMailNotifyMinDays} = '2.5';
+ 
+ #
+ # Name to use as the "from" name for email.  Depending upon your mail
+@@ -1828,7 +1826,7 @@
+ # When there have been no backups in this number of days the user
+ # is sent an email.
+ #
+-$Conf{EMailNotifyOldBackupDays} = 7.0;
++$Conf{EMailNotifyOldBackupDays} = 7;
+ 
+ #
+ # This subject and message is sent to a user if their PC has not recently
+@@ -1855,7 +1853,7 @@
+ # How old the most recent backup of Outlook files has to be before
+ # notifying user.
+ #
+-$Conf{EMailNotifyOldOutlookDays} = 5.0;
++$Conf{EMailNotifyOldOutlookDays} = 5;
+ 
+ #
+ # This subject and message is sent to a user if their Outlook files have
+@@ -1884,10 +1882,9 @@
+ # to utf8 then BackupPC_sendEmail will use utf8 for
+ # the email body.
+ #
+-$Conf{EMailHeaders} = <<EOF;
+-MIME-Version: 1.0
++$Conf{EMailHeaders} = 'MIME-Version: 1.0
+ Content-Type: text/plain; charset="iso-8859-1"
+-EOF
++';
+ 
+ ###########################################################################
+ # CGI user interface configuration settings
+@@ -1960,7 +1957,7 @@
+ #      be rendered as a link to http://myhost/users/craig.html.
+ #
+ $Conf{CgiUserHomePageCheck} = '';
+-$Conf{CgiUserUrlCreate}     = 'mailto:%s';
++$Conf{CgiUserUrlCreate} = 'mailto:%s';
+ 
+ #
+ # Date display format for CGI interface.  A value of 1 uses US-style
+@@ -1975,12 +1972,12 @@
+ # the user is listed in the host file (as either the user or in moreUsers)
+ # are displayed.
+ #
+-$Conf{CgiNavBarAdminAllHosts} = 1;
++$Conf{CgiNavBarAdminAllHosts} = '1';
+ 
+ #
+ # Enable/disable the search box in the navigation bar.
+ #
+-$Conf{CgiSearchBoxEnable} = 1;
++$Conf{CgiSearchBoxEnable} = '1';
+ 
+ #
+ # Additional navigation bar links.  These appear for both regular users
+@@ -1990,31 +1987,34 @@
+ # just literally displaying name.
+ #
+ $Conf{CgiNavBarLinks} = [
+-    {
+-        link  => "?action=view&type=docs",
+-        lname => "Documentation",    # actually displays $Lang->{Documentation}
+-    },
+-    {
+-        link  => "http://backuppc.wiki.sourceforge.net",
+-        name  => "Wiki",              # displays literal "Wiki"
+-    },
+-    {
+-        link  => "http://backuppc.sourceforge.net",
+-        name  => "SourceForge",      # displays literal "SourceForge"
+-    },
++  {
++    'link' => '?action=view&type=docs',
++    'lname' => 'Documentation',
++    'name' => undef
++  },
++  {
++    'link' => 'http://backuppc.wiki.sourceforge.net',
++    'lname' => undef,
++    'name' => 'Wiki'
++  },
++  {
++    'link' => 'http://backuppc.sourceforge.net',
++    'lname' => undef,
++    'name' => 'SourceForge'
++  }
+ ];
+ 
+ #
+ # Hilight colors based on status that are used in the PC summary page.
+ #
+ $Conf{CgiStatusHilightColor} = {
+-    Reason_backup_failed           => '#ffcccc',
+-    Reason_backup_done             => '#ccffcc',
+-    Reason_no_ping                 => '#ffff99',
+-    Reason_backup_canceled_by_user => '#ff9900',
+-    Status_backup_in_progress      => '#66cc99',
+-    Disabled_OnlyManualBackups     => '#d1d1d1',   
+-    Disabled_AllBackupsDisabled    => '#d1d1d1',          
++  'Reason_backup_failed' => '#ffcccc',
++  'Reason_backup_done' => '#ccffcc',
++  'Reason_backup_canceled_by_user' => '#ff9900',
++  'Reason_no_ping' => '#ffff99',
++  'Disabled_OnlyManualBackups' => '#d1d1d1',
++  'Status_backup_in_progress' => '#66cc99',
++  'Disabled_AllBackupsDisabled' => '#d1d1d1'
+ };
+ 
+ #
+@@ -2042,7 +2042,7 @@
+ #                 'pl'  => 'text/plain',
+ #          };
+ #
+-$Conf{CgiExt2ContentType} = { };
++$Conf{CgiExt2ContentType} = {};
+ 
+ #
+ # URL (without the leading http://host) for BackupPC's image directory.
+@@ -2067,7 +2067,7 @@
+ #
+ # Whether the user is allowed to edit their per-PC config.
+ #
+-$Conf{CgiUserConfigEditEnable} = 1;
++$Conf{CgiUserConfigEditEnable} = '1';
+ 
+ #
+ # Which per-host config variables a non-admin user is allowed
+@@ -2081,87 +2081,87 @@
+ # sorts of bad things.
+ #
+ $Conf{CgiUserConfigEdit} = {
+-        FullPeriod                => 1,
+-        IncrPeriod                => 1,
+-        FullKeepCnt               => 1,
+-        FullKeepCntMin            => 1,
+-        FullAgeMax                => 1,
+-        IncrKeepCnt               => 1,
+-        IncrKeepCntMin            => 1,
+-        IncrAgeMax                => 1,
+-        IncrLevels                => 1,
+-        IncrFill                  => 1,
+-        PartialAgeMax             => 1,
+-        RestoreInfoKeepCnt        => 1,
+-        ArchiveInfoKeepCnt        => 1,
+-        BackupFilesOnly           => 1,
+-        BackupFilesExclude        => 1,
+-        BackupsDisable            => 1,
+-        BlackoutBadPingLimit      => 1,
+-        BlackoutGoodCnt           => 1,
+-        BlackoutPeriods           => 1,
+-        BackupZeroFilesIsFatal    => 1,
+-        ClientCharset             => 1,
+-        ClientCharsetLegacy       => 1,
+-        XferMethod                => 1,
+-        XferLogLevel              => 1,
+-        SmbShareName              => 1,
+-        SmbShareUserName          => 1,
+-        SmbSharePasswd            => 1,
+-        SmbClientFullCmd          => 0,
+-        SmbClientIncrCmd          => 0,
+-        SmbClientRestoreCmd       => 0,
+-        TarShareName              => 1,
+-        TarFullArgs               => 1,
+-        TarIncrArgs               => 1,
+-        TarClientCmd              => 0,
+-        TarClientRestoreCmd       => 0,
+-        TarClientPath             => 0,
+-        RsyncShareName            => 1,
+-        RsyncdClientPort          => 1,
+-        RsyncdPasswd              => 1,
+-        RsyncdUserName            => 1,
+-        RsyncdAuthRequired        => 1,
+-        RsyncCsumCacheVerifyProb  => 1,
+-        RsyncArgs                 => 1,
+-        RsyncRestoreArgs          => 1,
+-        RsyncClientCmd            => 0,
+-        RsyncClientRestoreCmd     => 0,
+-        RsyncClientPath           => 0,
+-        ArchiveDest               => 1,
+-        ArchiveComp               => 1,
+-        ArchivePar                => 1,
+-        ArchiveSplit              => 1,
+-        ArchiveClientCmd          => 0,
+-        FixedIPNetBiosNameCheck   => 1,
+-        NmbLookupCmd              => 0,
+-        NmbLookupFindHostCmd      => 0,
+-        PingMaxMsec               => 1,
+-        PingCmd                   => 0,
+-        ClientTimeout             => 1,
+-        MaxOldPerPCLogFiles       => 1,
+-        CompressLevel             => 1,
+-        ClientNameAlias           => 1,
+-        DumpPreUserCmd            => 0,
+-        DumpPostUserCmd           => 0,
+-        RestorePreUserCmd         => 0,
+-        RestorePostUserCmd        => 0,
+-        ArchivePreUserCmd         => 0,
+-        ArchivePostUserCmd        => 0,
+-        DumpPostShareCmd          => 0,
+-        DumpPreShareCmd           => 0,
+-        UserCmdCheckStatus        => 0,
+-        EMailNotifyMinDays        => 1,
+-        EMailFromUserName         => 1,
+-        EMailAdminUserName        => 1,
+-        EMailUserDestDomain       => 1,
+-        EMailNoBackupEverSubj     => 1,
+-        EMailNoBackupEverMesg     => 1,
+-        EMailNotifyOldBackupDays  => 1,
+-        EMailNoBackupRecentSubj   => 1,
+-        EMailNoBackupRecentMesg   => 1,
+-        EMailNotifyOldOutlookDays => 1,
+-        EMailOutlookBackupSubj    => 1,
+-        EMailOutlookBackupMesg    => 1,
+-        EMailHeaders              => 1,
++  'EMailOutlookBackupSubj' => '1',
++  'ClientCharset' => '1',
++  'TarFullArgs' => '1',
++  'RsyncdPasswd' => '1',
++  'IncrKeepCnt' => '1',
++  'PartialAgeMax' => '1',
++  'FixedIPNetBiosNameCheck' => '1',
++  'SmbShareUserName' => '1',
++  'EMailFromUserName' => '1',
++  'ArchivePreUserCmd' => '0',
++  'PingCmd' => '0',
++  'FullAgeMax' => '1',
++  'PingMaxMsec' => '1',
++  'CompressLevel' => '1',
++  'DumpPreShareCmd' => '0',
++  'BackupFilesOnly' => '1',
++  'EMailNotifyOldBackupDays' => '1',
++  'EMailAdminUserName' => '1',
++  'RsyncCsumCacheVerifyProb' => '1',
++  'BlackoutPeriods' => '1',
++  'NmbLookupFindHostCmd' => '0',
++  'MaxOldPerPCLogFiles' => '1',
++  'TarClientCmd' => '0',
++  'EMailNotifyOldOutlookDays' => '1',
++  'SmbSharePasswd' => '1',
++  'SmbClientIncrCmd' => '0',
++  'FullKeepCntMin' => '1',
++  'RsyncArgs' => '1',
++  'ArchiveComp' => '1',
++  'TarIncrArgs' => '1',
++  'EMailUserDestDomain' => '1',
++  'TarClientPath' => '0',
++  'RsyncClientCmd' => '0',
++  'IncrFill' => '1',
++  'RestoreInfoKeepCnt' => '1',
++  'UserCmdCheckStatus' => '0',
++  'RsyncdClientPort' => '1',
++  'IncrAgeMax' => '1',
++  'RsyncdUserName' => '1',
++  'RsyncRestoreArgs' => '1',
++  'ClientCharsetLegacy' => '1',
++  'SmbClientFullCmd' => '0',
++  'ArchiveInfoKeepCnt' => '1',
++  'BackupZeroFilesIsFatal' => '1',
++  'EMailNoBackupRecentMesg' => '1',
++  'FullKeepCnt' => '1',
++  'TarShareName' => '1',
++  'EMailNoBackupEverSubj' => '1',
++  'TarClientRestoreCmd' => '0',
++  'EMailNoBackupRecentSubj' => '1',
++  'ArchivePar' => '1',
++  'XferLogLevel' => '1',
++  'ArchiveDest' => '1',
++  'ClientTimeout' => '1',
++  'EMailNotifyMinDays' => '1',
++  'RsyncdAuthRequired' => '1',
++  'SmbClientRestoreCmd' => '0',
++  'ClientNameAlias' => '1',
++  'DumpPostShareCmd' => '0',
++  'IncrLevels' => '1',
++  'EMailOutlookBackupMesg' => '1',
++  'BlackoutBadPingLimit' => '1',
++  'BackupFilesExclude' => '1',
++  'FullPeriod' => '1',
++  'ArchivePostUserCmd' => '0',
++  'RsyncClientRestoreCmd' => '0',
++  'IncrPeriod' => '1',
++  'RsyncShareName' => '1',
++  'RestorePostUserCmd' => '0',
++  'BlackoutGoodCnt' => '1',
++  'ArchiveClientCmd' => '0',
++  'ArchiveSplit' => '1',
++  'XferMethod' => '1',
++  'NmbLookupCmd' => '0',
++  'BackupsDisable' => '1',
++  'SmbShareName' => '1',
++  'RestorePreUserCmd' => '0',
++  'IncrKeepCntMin' => '1',
++  'EMailNoBackupEverMesg' => '1',
++  'EMailHeaders' => '1',
++  'DumpPreUserCmd' => '0',
++  'RsyncClientPath' => '0',
++  'DumpPostUserCmd' => '0'
+ };
+
diff --git a/app-backup/backuppc/files/03-reasonable-config.pl-defaults.patch b/app-backup/backuppc/files/03-reasonable-config.pl-defaults.patch
new file mode 100644
index 0000000..123a289
--- /dev/null
+++ b/app-backup/backuppc/files/03-reasonable-config.pl-defaults.patch
@@ -0,0 +1,46 @@
+--- conf/config.pl.formatted	2009-09-30 14:30:54.035496661 +0300
++++ conf/config.pl	2009-10-04 14:14:30.235570477 +0300
+@@ -1297,6 +1297,7 @@
+   '--times',
+   '--block-size=2048',
+   '--recursive',
++  '--checksum-seed=32761',
+   '--specials'
+ ];
+ 
+@@ -1321,6 +1322,7 @@
+   '--relative',
+   '--ignore-times',
+   '--recursive',
++  '--checksum-seed=32761',
+   '--specials'
+ ];
+ 
+@@ -1917,7 +1919,7 @@
+ #    --> administrative users are only craig and celia'.
+ #
+ $Conf{CgiAdminUserGroup} = '';
+-$Conf{CgiAdminUsers}     = '';
++$Conf{CgiAdminUsers}     = 'backuppc';
+ 
+ #
+ # URL of the BackupPC_Admin CGI script.  Used for email messages.
+@@ -1964,7 +1966,7 @@
+ # dates (MM/DD), a value of 2 uses full YYYY-MM-DD format, and zero
+ # for international dates (DD/MM).
+ #
+-$Conf{CgiDateFormatMMDD} = 1;
++$Conf{CgiDateFormatMMDD} = 2;
+ 
+ #
+ # If set, the complete list of hosts appears in the left navigation
+@@ -2138,7 +2140,7 @@
+   'EMailNotifyMinDays' => '1',
+   'RsyncdAuthRequired' => '1',
+   'SmbClientRestoreCmd' => '0',
+-  'ClientNameAlias' => '1',
++  'ClientNameAlias' => '0',
+   'DumpPostShareCmd' => '0',
+   'IncrLevels' => '1',
+   'EMailOutlookBackupMesg' => '1',
+
diff --git a/app-backup/backuppc/files/04-add-docdir-marker.patch b/app-backup/backuppc/files/04-add-docdir-marker.patch
new file mode 100644
index 0000000..c047cf4
--- /dev/null
+++ b/app-backup/backuppc/files/04-add-docdir-marker.patch
@@ -0,0 +1,12 @@
+--- lib/BackupPC/CGI/View.pm.orig	2009-09-30 19:08:34.353577546 +0300
++++ lib/BackupPC/CGI/View.pm	2009-09-30 19:16:01.982412712 +0300
+@@ -86,7 +86,7 @@
+         $file = $bpc->ConfDir() . "/hosts";
+         $linkHosts = 1;
+     } elsif ( $type eq "docs" ) {
+-        $file = $bpc->InstallDir() . "/doc/BackupPC.html";
++        $file = "__DOCDIR__/BackupPC.html";
+     } elsif ( $host ne "" ) {
+         if ( !defined($In{num}) ) {
+             # get the latest LOG file
+
diff --git a/app-backup/backuppc/files/Manifest b/app-backup/backuppc/files/Manifest
deleted file mode 100644
index 7b5e853..0000000
--- a/app-backup/backuppc/files/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST BackupPC-3.1.0.tar.gz 474981 RMD160 22d4cb6dd76f846fde489a301852f50e8db1ae1d SHA1 3bd6d637f4f08f2fda44a12668b91d47c4abb0a7 SHA256 49a2744cb9aaf27b298ec3d2e83e46fdb86fb3596922beb3904cb6ae552c148a
-EBUILD backuppc-3.1.0.ebuild 6522 RMD160 36347b875b9e7fad234cb75a85da5123bd08d786 SHA1 34d98ac932afc21c19bf095fe6ee6c31eb5a7ad0 SHA256 d208b3f9fdc6d216ca083f7096b7271a89b37b7965135ffa0835d077dda649f3
-MISC apache2-backuppc.conf 3064 RMD160 5eba0c1b294c67d421dedf325b81e86eb07080e3 SHA1 319be2c7f270e56d553fa2cf3fa873d15e3a0c67 SHA256 3f92aa053a411889faccc2cfd9ea65864de446cc28bcb32f0056ab37bb18fa4c
-MISC apache2-backuppc.init 3800 RMD160 9a4a4c55671738447ef131480ca41506baf947b8 SHA1 6ffef133a0b523e4e0d428b8a5282632303d61a2 SHA256 a8b29805a82315f47e0b8e8583c530ba0e4c0b0393001bed4cd2759c2a0c6bb9
-MISC attachment.cgi?id=194075 3064 RMD160 5eba0c1b294c67d421dedf325b81e86eb07080e3 SHA1 319be2c7f270e56d553fa2cf3fa873d15e3a0c67 SHA256 3f92aa053a411889faccc2cfd9ea65864de446cc28bcb32f0056ab37bb18fa4c
-MISC fixperms 346 RMD160 39d6e106a3bfa2a4334669d6805a9957b89568e5 SHA1 2640b3a4051329c1d26338b4249a8f745600c2b6 SHA256 e02650bbc126e89aa3abd3a6ecb0300ccbab9e730472f9c4821e47e8139c4c5d
-MISC httpd.conf 12111 RMD160 f0634267afcc5e3246699e8e9235b3c64a19c3e4 SHA1 efd4fa124bae05ec4c4f7c181add7ccd70156e16 SHA256 5c19a8faa28a0a2e28a281a4131eb99987720e1120678803bbe99c0ca08c3658
-MISC postinstall-en.txt 854 RMD160 8dc6eb81f9519b820baa2b63a59fc2362607045a SHA1 db15cfd9c3ed8b4f9c534495e28a293866af33f6 SHA256 2ce9a8cc59c3331875e34415f2d8b1a72927596622f35fe8f18dbacc17b8fd65
diff --git a/app-backup/backuppc/files/fixperms b/app-backup/backuppc/files/fixperms
deleted file mode 100644
index f91f8ca..0000000
--- a/app-backup/backuppc/files/fixperms
+++ /dev/null
@@ -1,19 +0,0 @@
-Options  +execCGI
-AddHandler cgi-script .cgi
-DirectoryIndex index.cgi
-
-AuthType Basic
-AuthName "BackupPC cgi interface"
-AuthUserFile /etc/BackupPC/authUser
-Require valid-user
-Allow from all 
-
-<Files BackupPC_Admin>
-        Order allow,deny
-        Deny from all
-</Files>
-
-<Files .htaccess>
-        Order allow,deny
-        Deny from all
-</Files>
diff --git a/app-backup/backuppc/files/postinstall-en.txt b/app-backup/backuppc/files/postinstall-en.txt
deleted file mode 100644
index 77e531a..0000000
--- a/app-backup/backuppc/files/postinstall-en.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-The default username and password are both backuppc. Edit
-/etc/BackupPC/authUser to change these to your preferred values using the
-htpasswd2 utility, such as:
-# htpasswd2 -c /etc/BackupPC/authUser admin
-
-This will prompt you for a new password and change the username to admin.
-\`man htpasswd' for more options.
-
-Please make sure to edit /etc/BackupPC/config.pl to suit your needs. If you 
-change the username or want the backuppc user to have admin rights in the web 
-interface be sure to change \$Conf{CgiAdminUsers} to the correct value.
-
-To add backuppc to your default startup scripts run:
-# rc-update add backuppc default
-# rc-update add apache2-backuppc default
-
-Then start it with:
-# /etc/init.d/backuppc start
-# /etc/init.d/apache2-backuppc start
-
-Navigate using your webbrowser to http://localhost:28000/BackupPC_Admin 
-for the web interface.