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

(Portage version: 2.1_pre6-r4)

11 files changed, 34 insertions, 274 deletions

diff --git a/sys-fs/captive/ChangeLog b/sys-fs/captive/ChangeLog
index cf871d9452ba..c318d1b65d73 100644
--- a/sys-fs/captive/ChangeLog
+++ b/sys-fs/captive/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/captive
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/ChangeLog,v 1.11 2006/01/05 11:42:39 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/ChangeLog,v 1.12 2006/03/20 21:17:13 genstef Exp $
+
+  20 Mar 2006; Stefan Schweizer <genstef@gentoo.org>
+  -files/add-extra-opts-for-user-access-to-mount-t-captive.patch,
+  -files/do-not-check-for-lufsd.patch,
+  -files/use-lufis-for-mount-t-captive.patch, -captive-1.1.5-r2.ebuild,
+  -captive-1.1.6.ebuild, captive-1.1.7.ebuild:
+  Fix DEPEND thanks to Antonio <Anton.Ananich@gmail.com> in bug 126855, also
+  remove old ebuilds.
 
   05 Jan 2006; Stefan Schweizer <genstef@gentoo.org> captive-1.1.7.ebuild:
   Fix compile problem thanks to zeaq in IRC
diff --git a/sys-fs/captive/Manifest b/sys-fs/captive/Manifest
index 9721d8fb5cc7..28b1529f5106 100644
--- a/sys-fs/captive/Manifest
+++ b/sys-fs/captive/Manifest
@@ -1,11 +1,12 @@
-MD5 9ae9f7728752ca96b50da760b705efb7 ChangeLog 2727
-MD5 e713979a7c0acc2e3f22f790a59bd5eb captive-1.1.5-r2.ebuild 2806
-MD5 631d8380563a00bc2af58eba86d02d56 captive-1.1.6.ebuild 2186
-MD5 6c879c1befe6b71733e0bcebddb126d7 captive-1.1.7.ebuild 2204
-MD5 09de72e8ea997c51e2cdd999343d63ac files/add-extra-opts-for-user-access-to-mount-t-captive.patch 647
-MD5 00da6b972db84ffd52c945b07c3204d4 files/digest-captive-1.1.5-r2 148
-MD5 08d428f29220c44d67ab40deb8eca20d files/digest-captive-1.1.6 69
-MD5 97c4866013f93fd3e57565626e0697b2 files/digest-captive-1.1.7 69
-MD5 af3ab379ab00c1a99eaaa24e67007377 files/do-not-check-for-lufsd.patch 1090
-MD5 ec2f404ce7a254d2d75101c257fdd9ce files/use-lufis-for-mount-t-captive.patch 1041
+MD5 ff218409fe14a0040b3ee8507a091d25 ChangeLog 3104
+RMD160 75da1dd33494bf7c37f97005bf7cafa675a00645 ChangeLog 3104
+SHA256 d165bbc393ab5370613bca8e90a4448b4866e9a3627b0812e20721954a28b0c0 ChangeLog 3104
+MD5 39d128cc930da610a8d9b65d2076396c captive-1.1.7.ebuild 2196
+RMD160 dae07bc9c5b3d866a9e9937f5767e59ec27fd507 captive-1.1.7.ebuild 2196
+SHA256 3cc77c011b0afbbd07b182e26abdae1a9585098e2dbd8c13c00560bb35963b12 captive-1.1.7.ebuild 2196
+MD5 862cc92a27a71feca542e2c5e42a4793 files/digest-captive-1.1.7 244
+RMD160 f633589c533ec178c3dcec46c0b1cc41715a463c files/digest-captive-1.1.7 244
+SHA256 d0c075579926c051d78cfd500cb7a9a2a0e2114a578c73257174d2d44e0b2962 files/digest-captive-1.1.7 244
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
+RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264
+SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b metadata.xml 264
diff --git a/sys-fs/captive/captive-1.1.5-r2.ebuild b/sys-fs/captive/captive-1.1.5-r2.ebuild
deleted file mode 100644
index 60ba9e6e3d8b..000000000000
--- a/sys-fs/captive/captive-1.1.5-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.5-r2.ebuild,v 1.3 2005/08/23 13:10:28 genstef Exp $
-
-inherit eutils
-
-DESCRIPTION="Captive uses binary Windows drivers for full NTFS r/w access."
-HOMEPAGE="http://www.jankratochvil.net/project/captive/"
-SRC_URI="http://www.jankratochvil.net/project/captive/dist/${P}.tar.gz
-		mirror://gentoo/captive-install-static-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 -*"
-
-IUSE="debug static"
-
-RDEPEND="sys-libs/readline
-	>=gnome-base/orbit-2.8.2
-	gnome-base/gnome-vfs
-	dev-libs/popt
-	dev-libs/glib
-	>=dev-libs/openssl-0.9.7c
-	>=dev-libs/libxml2-2.4.29
-	>=sys-fs/lufis-0.3
-	>=sys-fs/fuse-2.2"
-
-DEPEND="${RDEPEND}
-	sys-fs/ntfsprogs"
-
-pkg_setup() {
-	einfo "Adding captive user and group"
-	enewgroup captive || die "enewgroup captive failed"
-	enewuser captive -1 -1 /dev/null captive || die "enewuser captive failed"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# This is needed because that scripts will cause an sandbox violation
-	# if Xvnc is installed and its not needed anyways
-	# if it breaks, use the virtualx eclass and Xeconf
-	cd ${S}
-	epatch ${FILESDIR}/do-not-check-for-lufsd.patch
-	epatch ${FILESDIR}/use-lufis-for-mount-t-captive.patch
-	epatch ${FILESDIR}/add-extra-opts-for-user-access-to-mount-t-captive.patch
-	cp -f configure configure.orig
-	grep -v 'sh ./macros/glade-w' configure.orig > configure
-}
-
-src_compile() {
-	# disable some tests to save time ;)
-	econf `use_enable debug bug-replay` \
-		`use_enable static` \
-		--disable-install-pkg \
-		--with-readline \
-		--enable-lufs \
-		--enable-sandbox-setuid=captive \
-		--enable-sandbox-setgid=captive \
-		--enable-sandbox-chroot=/var/lib/captive \
-		--enable-man-pages \
-		--enable-sbin-mountdir=/sbin \
-		--enable-sbin-mount-fs=ntfs:fastfat:cdfs:ext2fsd \
-		--disable-gtk-doc \
-		--with-orbit-line=link \
-		--disable-glibtest --disable-orbittest \
-		--with-tmpdir=/tmp --localstatedir=/var || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodir   /var/lib/captive
-	diropts -m1777
-	dodir   /var/lib/captive/tmp
-	keepdir /var/lib/captive/tmp
-
-	dodoc AUTHORS COPYING* ChangeLog* NEWS README* TODO \
-		|| die "dodoc failed"
-
-	dosbin ${WORKDIR}/captive-install*
-}
-
-pkg_postinst() {
-	einfo "Use /usr/sbin/captive-install-acquire to search for and"
-	einfo "install the needed drivers for captive NTFS."
-	einfo ""
-	einfo "Please use \"mount -t captive-ntfs /dev/hda1 /mnt/ntfs\" to mount ntfs partitions."
-}
-
-pkg_postrm() {
-	#einfo Removing captive user
-	#userdel captive
-	#einfo Removing captive group
-	#groupdel captive
-	einfo ""
-	einfo "You will have to remove captive user and group manually"
-	einfo ""
-}
diff --git a/sys-fs/captive/captive-1.1.6.ebuild b/sys-fs/captive/captive-1.1.6.ebuild
deleted file mode 100644
index 73ad952aa133..000000000000
--- a/sys-fs/captive/captive-1.1.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.6.ebuild,v 1.1 2005/12/26 19:07:24 genstef Exp $
-
-inherit eutils
-
-DESCRIPTION="Captive uses binary Windows drivers for full NTFS r/w access."
-HOMEPAGE="http://www.jankratochvil.net/project/captive/"
-SRC_URI="http://www.jankratochvil.net/priv/captive/${P}cvs.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 -*"
-
-IUSE="debug"
-
-RDEPEND="sys-libs/readline
-	>=gnome-base/orbit-2.8.2
-	gnome-base/gnome-vfs
-	dev-libs/popt
-	dev-libs/glib
-	>=dev-libs/openssl-0.9.7c
-	>=dev-libs/libxml2-2.4.29
-	>=sys-fs/fuse-2.2"
-
-DEPEND="${RDEPEND}
-	sys-fs/ntfsprogs"
-
-S=${WORKDIR}/${P}cvs
-
-pkg_setup() {
-	einfo "Adding captive user and group"
-	enewgroup captive || die "enewgroup captive failed"
-	enewuser captive -1 -1 /dev/null captive || die "enewuser captive failed"
-}
-
-src_compile() {
-	# disable some tests to save time ;)
-	econf `use_enable debug bug-replay` \
-		--disable-static \
-		--with-readline \
-		--disable-lufs \
-		--enable-fuse \
-		--enable-sandbox-setuid=captive \
-		--enable-sandbox-setgid=captive \
-		--enable-sandbox-chroot=/var/lib/captive \
-		--enable-man-pages \
-		--enable-sbin-mountdir=/sbin \
-		--enable-sbin-mount-fs=ntfs:fastfat:cdfs:ext2fsd \
-		--disable-gtk-doc \
-		--with-orbit-line=link \
-		--disable-glibtest --disable-orbittest \
-		--with-tmpdir=/tmp --localstatedir=/var || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodir   /var/lib/captive
-	diropts -m1777
-	dodir   /var/lib/captive/tmp
-	keepdir /var/lib/captive/tmp
-
-	rm -R	${D}/etc/rc.d
-
-	dodoc AUTHORS ChangeLog README TODO
-}
-
-pkg_postinst() {
-	einfo "Use /usr/sbin/captive-install-acquire to search for and"
-	einfo "install the needed drivers for captive NTFS."
-	einfo ""
-	einfo "Please use \"mount -t captive-ntfs /dev/hda1 /mnt/ntfs\" to mount ntfs partitions."
-}
-
-pkg_postrm() {
-	#einfo Removing captive user
-	#userdel captive
-	#einfo Removing captive group
-	#groupdel captive
-	einfo ""
-	einfo "You will have to remove captive user and group manually"
-	einfo ""
-}
diff --git a/sys-fs/captive/captive-1.1.7.ebuild b/sys-fs/captive/captive-1.1.7.ebuild
index 9d35193e2de6..b3b00e06fb8c 100644
--- a/sys-fs/captive/captive-1.1.7.ebuild
+++ b/sys-fs/captive/captive-1.1.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.7.ebuild,v 1.2 2006/01/05 11:42:39 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.7.ebuild,v 1.3 2006/03/20 21:17:13 genstef Exp $
 
 inherit eutils
 
 DESCRIPTION="Captive uses binary Windows drivers for full NTFS r/w access."
 HOMEPAGE="http://www.jankratochvil.net/project/captive/"
-SRC_URI="http://www.jankratochvil.net/priv/captive/${P}cvs.tar.gz"
+SRC_URI="http://www.jankratochvil.net/project/captive/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,7 +16,6 @@ IUSE="debug gtk readline"
 
 RDEPEND="sys-libs/zlib
 	>=sys-fs/fuse-2.4
-	sys-fs/ntfsprogs
 	readline? ( sys-libs/readline )
 	>=dev-libs/openssl-0.9.7c
 	>=dev-libs/libxml2-2.4.29
@@ -26,17 +25,18 @@ RDEPEND="sys-libs/zlib
 	gnome-base/gnome-vfs
 	dev-libs/popt
 	dev-libs/glib
-	gtk? ( dev-libs/atk
-	gnome-base/libbonoboui
-	gnome-base/libgnomeui
-	media-libs/libpng
-	>x11-libs/gtk+-2.2
-	x11-libs/pango )"
+	gtk? (
+		dev-libs/atk
+		sys-fs/ntfsprogs
+		gnome-base/libbonoboui
+		gnome-base/libgnomeui
+		media-libs/libpng
+		>x11-libs/gtk+-2.2
+		x11-libs/pango
+	)"
 
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${P}cvs
-
 pkg_setup() {
 	einfo "Adding captive user and group"
 	enewgroup captive || die "enewgroup captive failed"
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;