Remove captive, already masked and ntfs3g is a way better replacement
authorStefan Schweizer <genstef@gentoo.org>
Sun, 15 Apr 2007 16:29:24 +0000 (16:29 +0000)
committerStefan Schweizer <genstef@gentoo.org>
Sun, 15 Apr 2007 16:29:24 +0000 (16:29 +0000)
sys-fs/captive/ChangeLog [deleted file]
sys-fs/captive/Manifest [deleted file]
sys-fs/captive/captive-1.1.7-r1.ebuild [deleted file]
sys-fs/captive/files/captive-fuse-2.6.0_pre3.patch [deleted file]
sys-fs/captive/files/captive-popt.diff [deleted file]
sys-fs/captive/files/digest-captive-1.1.7-r1 [deleted file]
sys-fs/captive/metadata.xml [deleted file]

diff --git a/sys-fs/captive/ChangeLog b/sys-fs/captive/ChangeLog
deleted file mode 100644 (file)
index 9e0b184..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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.18 2006/09/12 20:11:06 genstef Exp $
-
-  12 Sep 2006; Stefan Schweizer <genstef@gentoo.org>
-  +files/captive-popt.diff, captive-1.1.7-r1.ebuild:
-  fix popt linking thanks to David Li <matrixhax0r@gmail.com> in bug 147332
-
-  12 Aug 2006; Stefan Schweizer <genstef@gentoo.org>
-  +files/captive-fuse-2.6.0_pre3.patch, captive-1.1.7-r1.ebuild:
-  2.6.0_pre3 fix thanks to Leo <sir_kalot@yahoo.it> in bug 143544
-
-  01 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
-  captive-1.1.7-r1.ebuild:
-  Add addwrite for bug #133357
-
-  05 Apr 2006; Stefan Schweizer <genstef@gentoo.org>
-  captive-1.1.7-r1.ebuild:
-  Remove old workaround, thanks to John Zheng <johnzheng@gmail.com>
-
-  01 Apr 2006; Stefan Schweizer <genstef@gentoo.org>
-  captive-1.1.7-r1.ebuild:
-  Make postinfo note more verbose thanks to Chris Slycord <cslycord@gmail.com>
-  in bug 128215
-
-*captive-1.1.7-r1 (25 Mar 2006)
-
-  25 Mar 2006; Stefan Schweizer <genstef@gentoo.org> -captive-1.1.7.ebuild,
-  +captive-1.1.7-r1.ebuild:
-  Revision bump thanks to Antonio <Anton.Ananich@gmail.com> in bug 127545
-
-  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
-
-  05 Jan 2006; Stefan Schweizer <genstef@gentoo.org> +captive-1.1.7.ebuild:
-  version bump
-
-*captive-1.1.7 (05 Jan 2006)
-
-  05 Jan 2006; Stefan Schweizer <genstef@gentoo.org> +captive-1.1.7.ebuild:
-  version bump
-
-  29 Dec 2005; Stefan Schweizer <genstef@gentoo.org> ChangeLog:
-  version bump
-
-*captive-1.1.6 (26 Dec 2005)
-
-  26 Dec 2005; Stefan Schweizer <genstef@gentoo.org> +captive-1.1.6.ebuild:
-  version bump, closes #98137
-
-  23 Aug 2005; Stefan Schweizer <genstef@gentoo.org>
-  captive-1.1.5-r2.ebuild:
-  Fix enewuser for BSD, bug 103421
-
-  05 Mar 2005; Stefan Schweizer <genstef@gentoo.org>
-  -captive-1.1.5-r1.ebuild:
-  Cleaning up old versions
-
-  15 Feb 2005; Stefan Schweizer <genstef@gentoo.org>
-  captive-1.1.5-r2.ebuild:
-  Adding new depend on >=fuse-2.2 .. it does not work with old versions(1.4)
-  as I learned from Milbo in #gentoo-anfaenger in IRC, thanks. I also added a
-  dep on >=lufis-0.3 to make sure that people can take advantage of the uid=
-  and gid= options and because it is more likely then that lufis is rebuilt
-  when upgrading fuse from 1.4 to 2.2 .. rebuilding lufis is necessary when
-  upgrading fuse major versions.
-
-*captive-1.1.5-r2 (13 Feb 2005)
-
-  13 Feb 2005; Stefan Schweizer <genstef@gentoo.org>
-  +files/add-extra-opts-for-user-access-to-mount-t-captive.patch,
-  +captive-1.1.5-r2.ebuild:
-  New ebuild with static tarball to solve =gnome-vfs-2.6* depend and
-  gnome-vfs-problems, reported in bug 77239 thanks to Dylan Wakefield
-  <dylanw@telpacific.com.au> and solve mount problems to allow other users to
-  umount the device as reported in bug 75825 thanks to Thomas Bettler
-  <bettlertho@sis.unibe.ch>, Alexander Schneider <A.Schneider@magicspace.de>,
-  Marc Gallagher <marcgallagher@gmail.com>, Lars Petersen <lpetersen@gmx.net>
-  and Alistair <alistair@stuffthatworks.com.au>
-
-*captive-1.1.5-r1 (05 Dec 2004)
-
-  05 Dec 2004; Stefan Schweizer <genstef@gentoo.org>
-  +files/use-lufis-for-mount-t-captive.patch, +captive-1.1.5-r1.ebuild,
-  -captive-1.1.5.ebuild:
-  Adding a patch to make "mount -t captive-ntfs" working, bumping the revision
-  to send it out.
-
-  03 Dec 2004; Stefan Schweizer <genstef@gentoo.org>
-  +files/do-not-check-for-lufsd.patch:
-  Adding missing patch
-
-*captive-1.1.5 (02 Dec 2004)
-
-  02 Dec 2004; Stefan Schweizer <genstef@gentoo.org> +metadata.xml,
-  +captive-1.1.5.ebuild:
-  Adding captive thanks to various people from bug 32929
-
diff --git a/sys-fs/captive/Manifest b/sys-fs/captive/Manifest
deleted file mode 100644 (file)
index a5cae40..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-AUX captive-fuse-2.6.0_pre3.patch 357 RMD160 8eb16ac396d52eb2b880690238b473b0661766ef SHA1 1145b070f494b13aa91d42f569e20713fdadcc21 SHA256 ece98c449381689f3dbf1858290266623ccba46ff93800dcc4f145b20e2fb053
-MD5 9de1490a39143b9ae317e3f902583e22 files/captive-fuse-2.6.0_pre3.patch 357
-RMD160 8eb16ac396d52eb2b880690238b473b0661766ef files/captive-fuse-2.6.0_pre3.patch 357
-SHA256 ece98c449381689f3dbf1858290266623ccba46ff93800dcc4f145b20e2fb053 files/captive-fuse-2.6.0_pre3.patch 357
-AUX captive-popt.diff 2173 RMD160 b5185d4ac84d3bd61128690b3f77beb3017e6acc SHA1 db1e9b9d0bed21edeea0a77248c993e678e41598 SHA256 2f5c864e2123eb03483c46c3429f82d89e58ee568e0b682ec9960ee2e93d14e7
-MD5 fc026f46eda6c25aa89dc2cf27bbaf46 files/captive-popt.diff 2173
-RMD160 b5185d4ac84d3bd61128690b3f77beb3017e6acc files/captive-popt.diff 2173
-SHA256 2f5c864e2123eb03483c46c3429f82d89e58ee568e0b682ec9960ee2e93d14e7 files/captive-popt.diff 2173
-DIST captive-1.1.7.tar.gz 2896597 RMD160 cd1f7f8e0faf27374cfe25713bf9aebd8e3d27b7 SHA1 510afe3d9b5da69732b05a3195a2b0c654ab8c3b SHA256 5bbeb56bd42a928737ee8bf804ce2b3532607bff80b398c6e2ab1762f719ef25
-EBUILD captive-1.1.7-r1.ebuild 2521 RMD160 3c887a1eacf8a212ced05d08f823d8a9b5db76af SHA1 5681f2607303b9ddea50a215a9d8f513fb09f24b SHA256 6dbbd5befebbe5255b1f0153cd91392b3de862fdae43481a0d34c6c55fad8cbf
-MD5 a804e417357b73c3fcf51c5bf051eaee captive-1.1.7-r1.ebuild 2521
-RMD160 3c887a1eacf8a212ced05d08f823d8a9b5db76af captive-1.1.7-r1.ebuild 2521
-SHA256 6dbbd5befebbe5255b1f0153cd91392b3de862fdae43481a0d34c6c55fad8cbf captive-1.1.7-r1.ebuild 2521
-MISC ChangeLog 4121 RMD160 d22edc37cfc5834b2e797eee902b3fb0d3a8bb6d SHA1 1ad6e8e1d0f0242f06961c622e48d33b9d7d52bd SHA256 578368e6072faaedd079ec077737c1e70d8f94774c4c1710bc885a53b831b81c
-MD5 d272afab6c088f92baf07c93ef502f59 ChangeLog 4121
-RMD160 d22edc37cfc5834b2e797eee902b3fb0d3a8bb6d ChangeLog 4121
-SHA256 578368e6072faaedd079ec077737c1e70d8f94774c4c1710bc885a53b831b81c ChangeLog 4121
-MISC metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 SHA1 310c846802ac0f01334ee8677c428e2962594d01 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b
-MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
-RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264
-SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b metadata.xml 264
-MD5 862cc92a27a71feca542e2c5e42a4793 files/digest-captive-1.1.7-r1 244
-RMD160 f633589c533ec178c3dcec46c0b1cc41715a463c files/digest-captive-1.1.7-r1 244
-SHA256 d0c075579926c051d78cfd500cb7a9a2a0e2114a578c73257174d2d44e0b2962 files/digest-captive-1.1.7-r1 244
diff --git a/sys-fs/captive/captive-1.1.7-r1.ebuild b/sys-fs/captive/captive-1.1.7-r1.ebuild
deleted file mode 100644 (file)
index f0053e5..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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-r1.ebuild,v 1.7 2006/09/12 20:11:06 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 -*"
-
-IUSE="debug gtk readline"
-
-RDEPEND="sys-libs/zlib
-       >=sys-fs/fuse-2.4
-       readline? ( sys-libs/readline )
-       >=dev-libs/openssl-0.9.7c
-       >=dev-libs/libxml2-2.4.29
-       >=gnome-base/orbit-2.8.2
-       gnome-base/gconf
-       gnome-base/libbonobo
-       gnome-base/gnome-vfs
-       dev-libs/popt
-       dev-libs/glib
-       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}"
-
-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}
-       cd ${S}
-       if has_version '>=sys-fs/fuse-2.6.0_pre3'; then
-               epatch ${FILESDIR}/captive-fuse-2.6.0_pre3.patch
-       fi
-       epatch ${FILESDIR}/captive-popt.diff
-}
-
-src_compile() {
-       # Addwrite to fix all sandbox problems, bug #133357 see also gnome2.eclass: bug #128289
-       addwrite /root/.gnome2_private /root/.gnome2 /root/.gconfd /root/.gconf
-
-       # disable some tests to save time ;)
-       econf $(use_enable debug bug-replay) \
-               $(use_with readline) \
-               $(use_enable gtk install-pkg) \
-               --enable-fuse \
-               --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."
-       ewarn "captive-install-acquire is only provided with USE=gtk"
-       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/files/captive-fuse-2.6.0_pre3.patch b/sys-fs/captive/files/captive-fuse-2.6.0_pre3.patch
deleted file mode 100644 (file)
index a653908..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- captive-1.1.7/src/client/fuse/main.c.orig  2006-08-12 22:54:51.000000000 +0200
-+++ captive-1.1.7/src/client/fuse/main.c       2006-08-12 23:06:58.000000000 +0200
-@@ -116,7 +116,7 @@
-                * FIXME: Why?
-                */
-               }
--      fuse_teardown(capfuse_fuse,capfuse_fd,capfuse_mountpoint);
-+      fuse_teardown(capfuse_fuse,capfuse_mountpoint);
- }
- int main(int argc,char **argv)
diff --git a/sys-fs/captive/files/captive-popt.diff b/sys-fs/captive/files/captive-popt.diff
deleted file mode 100644 (file)
index 05e8fa0..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
---- captive-1.1.7/src/client/cmdline/Makefile.in       2006-01-26 16:20:40.000000000 -0500
-+++ captive-1.1.7/src/client/cmdline/Makefile.in       2006-09-12 10:44:22.110968408 -0400
-@@ -459,7 +459,7 @@
-               utf8.h
- captive_cmdline_CFLAGS = $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) 
--captive_cmdline_LDADD = $(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(READLINE_LIBS) $(INTLLIBS)
-+captive_cmdline_LDADD = $(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(READLINE_LIBS) $(INTLLIBS) $(POPT_LIBS)
- captive_cmdline_LDFLAGS = $(READLINE_LDFLAGS)
- @ENABLE_MAN_PAGES_TRUE@captive_cmdline_man_cond = captive-cmdline.1
- man_MANS = $(captive_cmdline_man_cond)
---- captive-1.1.7/src/client/sandbox-server/Makefile.in        2006-01-26 16:20:43.000000000 -0500
-+++ captive-1.1.7/src/client/sandbox-server/Makefile.in        2006-09-12 10:50:15.509243704 -0400
-@@ -401,7 +401,7 @@
-               main.c
- captive_sandbox_server_CFLAGS = $(ORBIT_CFLAGS) $(LINC_CFLAGS) $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) 
--captive_sandbox_server_LDADD = $(ORBIT_LIBS)   $(LINC_LIBS)   $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(captive_library) $(INTLLIBS)
-+captive_sandbox_server_LDADD = $(ORBIT_LIBS)   $(LINC_LIBS)   $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(captive_library) $(INTLLIBS) $(POPT_LIBS)
- @ENABLE_MAN_PAGES_TRUE@captive_sandbox_server_man_cond = captive-sandbox-server.1
- man_MANS = $(captive_sandbox_server_man_cond)
- all: $(BUILT_SOURCES)
---- captive-1.1.7/src/client/fuse/Makefile.in  2006-01-26 16:20:41.000000000 -0500
-+++ captive-1.1.7/src/client/fuse/Makefile.in  2006-09-12 10:55:57.854199360 -0400
-@@ -505,7 +505,7 @@
- mount_captive_CFLAGS = $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) \
-       $(FUSE_CFLAGS) -DLIBEXECDIR="$(libexecdir)" \
-       -DVARLIBCAPTIVEDIR="$(localstatedir)/lib/$(PACKAGE)"
--mount_captive_LDADD = $(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(FUSE_LIBS)   $(INTLLIBS)
-+mount_captive_LDADD = $(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(FUSE_LIBS)   $(INTLLIBS)   $(POPT_LIBS)
- mount_captive_LDFLAGS = $(READLINE_LDFLAGS)
- @ENABLE_FUSE_TRUE@@ENABLE_SBIN_MOUNT_TRUE@mount_captive_cond = mount.captive
- @ENABLE_FUSE_TRUE@@ENABLE_SBIN_MOUNT_TRUE@initd_SCRIPTS_cond = captive
diff --git a/sys-fs/captive/files/digest-captive-1.1.7-r1 b/sys-fs/captive/files/digest-captive-1.1.7-r1
deleted file mode 100644 (file)
index 648a541..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-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/metadata.xml b/sys-fs/captive/metadata.xml
deleted file mode 100644 (file)
index c8f81b3..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>kernel</herd>
-  <maintainer>
-    <email>genstef@gentoo.org</email>
-    <name>Stefan Schweizer</name>
-  </maintainer>
-</pkgmetadata>