Fix DEPEND thanks to Antonio <Anton.Ananich@gmail.com> in bug 126855, also remove old ebuilds.

Package-Manager: portage-2.1_pre6-r4

6 files changed, 3 insertions, 68 deletions

diff --git a/sys-fs/captive/files/add-extra-opts-for-user-access-to-mount-t-captive.patch b/sys-fs/captive/files/add-extra-opts-for-user-access-to-mount-t-captive.patch
deleted file mode 100644
index 19cc713d543a..000000000000
--- a/sys-fs/captive/files/add-extra-opts-for-user-access-to-mount-t-captive.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch was introduced by me, to allow the access of other users to root-mounted captive-ntfs volumes.
-
---- captive-1.1.5/src/client/lufs/mount.captive.in.orig	2004-12-05 21:59:19.561715008 +0100
-+++ captive-1.1.5/src/client/lufs/mount.captive.in	2004-12-05 22:00:49.549034856 +0100
-@@ -127,8 +127,10 @@
- 
- warn "$0: '-n' not supported - ignored" if $nomtab;
- 
-+my $fuseopts="-oallow_other,fsname=$image";
-+
- # Use "'$oo'" to permit another expansion by bash(1) during lufsmnt(8) execution.
--my @argv=($lufsd_bin,$oo,$dir,"-s");
-+my @argv=($lufsd_bin,$oo,$dir,"-s",$fuseopts);
- 
- print STDERR "$0: @argv\n" if $verbose;
- exec $lufsd_bin @argv;
diff --git a/sys-fs/captive/files/digest-captive-1.1.5-r2 b/sys-fs/captive/files/digest-captive-1.1.5-r2
deleted file mode 100644
index 95b32005c5d8..000000000000
--- a/sys-fs/captive/files/digest-captive-1.1.5-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 dfb7ce617745695e7a908609b9370fd6 captive-1.1.5.tar.gz 2547676
-MD5 31b7337221b424cedc0cb9f7508c47d0 captive-install-static-1.1.5.tar.bz2 3012065
diff --git a/sys-fs/captive/files/digest-captive-1.1.6 b/sys-fs/captive/files/digest-captive-1.1.6
deleted file mode 100644
index 2ec670843120..000000000000
--- a/sys-fs/captive/files/digest-captive-1.1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 537ea7cab112b34ee7b8880f6b0fe34e captive-1.1.6cvs.tar.gz 3535636
diff --git a/sys-fs/captive/files/digest-captive-1.1.7 b/sys-fs/captive/files/digest-captive-1.1.7
index 94a2712a675a..648a541950d0 100644
--- a/sys-fs/captive/files/digest-captive-1.1.7
+++ b/sys-fs/captive/files/digest-captive-1.1.7
@@ -1 +1,3 @@
-MD5 8617684bf2b987b623cfa45b940bfbfc captive-1.1.7cvs.tar.gz 2892804
+MD5 34312cd854ca992f0daf0a8faabaae9a captive-1.1.7.tar.gz 2896597
+RMD160 cd1f7f8e0faf27374cfe25713bf9aebd8e3d27b7 captive-1.1.7.tar.gz 2896597
+SHA256 5bbeb56bd42a928737ee8bf804ce2b3532607bff80b398c6e2ab1762f719ef25 captive-1.1.7.tar.gz 2896597
diff --git a/sys-fs/captive/files/do-not-check-for-lufsd.patch b/sys-fs/captive/files/do-not-check-for-lufsd.patch
deleted file mode 100644
index 7dab523e60f3..000000000000
--- a/sys-fs/captive/files/do-not-check-for-lufsd.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- captive-1.1.5/configure.orig	2004-11-14 16:49:01.508382408 +0100
-+++ captive-1.1.5/configure	2004-11-14 16:50:55.054120832 +0100
-@@ -21798,21 +21798,10 @@
- 
-   test -n "$PATH_LUFSD" && break
- done
--
--	if test x$PATH_LUFSD = x;then
--		if test x$enable_lufs = xyes;then
--			{ { echo "$as_me:$LINENO: error: LUFS client was requested (--enable-lufs) but no lufsd(1) binary was found. Install 'lufs-*-*captive*' package." >&5
--echo "$as_me: error: LUFS client was requested (--enable-lufs) but no lufsd(1) binary was found. Install 'lufs-*-*captive*' package." >&2;}
--   { (exit 1); exit 1; }; }
--		else
--			{ echo "$as_me:$LINENO: WARNING: LUFS client not being compiled as no lufsd(1) binary was found. Install 'lufs-*-*captive*' package." >&5
--echo "$as_me: WARNING: LUFS client not being compiled as no lufsd(1) binary was found. Install 'lufs-*-*captive*' package." >&2;}
--		fi
--	fi
- fi
- 
- 
--if  $have_lufs_includes && test x$PATH_LUFSD != x -a x$enable_lufs != no ; then
-+if  $have_lufs_includes && test x$enable_lufs != xno ; then
-   ENABLE_LUFS_TRUE=
-   ENABLE_LUFS_FALSE='#'
- else
diff --git a/sys-fs/captive/files/use-lufis-for-mount-t-captive.patch b/sys-fs/captive/files/use-lufis-for-mount-t-captive.patch
deleted file mode 100644
index 7dc979b50631..000000000000
--- a/sys-fs/captive/files/use-lufis-for-mount-t-captive.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-This patch was introduced by me, to make "mount -t captive-ntfs" working with lufis.
-
---- captive-1.1.5/src/client/lufs/mount.captive.in.orig	2004-12-05 21:59:19.561715008 +0100
-+++ captive-1.1.5/src/client/lufs/mount.captive.in	2004-12-05 22:00:49.549034856 +0100
-@@ -28,8 +28,7 @@
- my $vardir='@localstatedir@/lib/captive';
- $vardir=~s#\$\Q{prefix}\E#'@prefix@';#ge;
- $vardir="/var/lib/captive" if $vardir=~/^@/;
--my $lufsd_bin='@PATH_LUFSD@';
--$lufsd_bin="/usr/bin/lufsd" if $lufsd_bin=~/^@/;
-+my $lufsd_bin="/usr/bin/lufis";
- my $captive_sandbox_server_bin='@sbindir@/captive-sandbox-server';
- $captive_sandbox_server_bin=~s#\$\Q{exec_prefix}\E#'@exec_prefix@';#ge;
- $captive_sandbox_server_bin=~s#\$\Q{prefix}\E#'@prefix@';#ge;
-@@ -129,7 +128,7 @@
- warn "$0: '-n' not supported - ignored" if $nomtab;
- 
- # Use "'$oo'" to permit another expansion by bash(1) during lufsmnt(8) execution.
--my @argv=($lufsd_bin,"none",$dir,"-o",$oo);
-+my @argv=($lufsd_bin,$oo,$dir,"-s");
- 
- print STDERR "$0: @argv\n" if $verbose;
- exec $lufsd_bin @argv;