close #9810

7 files changed, 67 insertions, 65 deletions

diff --git a/sys-apps/linux-ntfs/ChangeLog b/sys-apps/linux-ntfs/ChangeLog
index 2c370006fbcc..8b79feb698a1 100644
--- a/sys-apps/linux-ntfs/ChangeLog
+++ b/sys-apps/linux-ntfs/ChangeLog
@@ -1,19 +1,16 @@
 # ChangeLog for sys-apps/linux-ntfs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-ntfs/ChangeLog,v 1.3 2002/07/21 20:05:56 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-ntfs/ChangeLog,v 1.4 2002/11/02 07:51:43 woodchip Exp $
+
+*linux-ntfs-1.6.0 (02 Nov 2002)
+
+  02 Nov 2002; Donny Davies <woodchip@gentoo.org> :
+  Compile the project ourselves, thanks to cory@visi.name; #9810.
 
 *linux-ntfs-1.5.0-r1 (1 Feb 2002)
 
-  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
-  updated keywords (-ppc -sparc -sparc64) - this is a binary pkg for x86
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org> :
+  updated keywords (-ppc -sparc -sparc64) - this is a binary pkg for x86.
 
-  14 Jul 2002; phoen][x <phoenix@gentoo.org> linux-ntfs-1.5.0-r1.ebuild :
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> :
   Added LICENSE, KEYWORDS, SLOT.
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/sys-apps/linux-ntfs/files/50ntfs b/sys-apps/linux-ntfs/files/50ntfs
deleted file mode 100644
index 277b52fda452..000000000000
--- a/sys-apps/linux-ntfs/files/50ntfs
+++ /dev/null
@@ -1,4 +0,0 @@
-PATH=/opt/linux-ntfs/bin
-ROOTPATH=/opt/linux-ntfs/bin
-LDPATH=/opt/linux-ntfs/lib
-MANPATH=/opt/linux-ntfs/share/man
diff --git a/sys-apps/linux-ntfs/files/digest-linux-ntfs-1.5.0-r1 b/sys-apps/linux-ntfs/files/digest-linux-ntfs-1.5.0-r1
deleted file mode 100644
index fea2744768ec..000000000000
--- a/sys-apps/linux-ntfs/files/digest-linux-ntfs-1.5.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 85fbcbe76c254c8af8571f2eb9ca15c2 linux-ntfs-1.5.0-1.i386.rpm 82502
-MD5 74a5e18b484c22bdab6d51961a349e86 linux-ntfs-devel-1.5.0-1.i386.rpm 70942
diff --git a/sys-apps/linux-ntfs/files/digest-linux-ntfs-1.6.0 b/sys-apps/linux-ntfs/files/digest-linux-ntfs-1.6.0
new file mode 100644
index 000000000000..ae1f99f736e7
--- /dev/null
+++ b/sys-apps/linux-ntfs/files/digest-linux-ntfs-1.6.0
@@ -0,0 +1 @@
+MD5 414a63a29086963ce150bb214f972b8c linux-ntfs-1.6.0.tar.gz 318600
diff --git a/sys-apps/linux-ntfs/files/linux-ntfs-1.6.0-gcc3.2.patch b/sys-apps/linux-ntfs/files/linux-ntfs-1.6.0-gcc3.2.patch
new file mode 100644
index 000000000000..1fd14b969290
--- /dev/null
+++ b/sys-apps/linux-ntfs/files/linux-ntfs-1.6.0-gcc3.2.patch
@@ -0,0 +1,13 @@
+--- include/types.h.orig	2002-10-15 12:22:55.000000000 -0400
++++ include/types.h	2002-10-15 12:23:29.000000000 -0400
+@@ -55,8 +55,8 @@
+  * structure.
+  */
+ typedef union {
+-	__u8;	/* Unnamed __u8 to serve as default when just using
+-		   a_val without specifying any of the below. */
++	__u8 _default;	/* Unnamed __u8 to serve as default when just using
++			   a_val without specifying any of the below. */
+ 	STANDARD_INFORMATION std_inf;
+ 	ATTR_LIST_ENTRY al_entry;
+ 	FILE_NAME_ATTR filename;
diff --git a/sys-apps/linux-ntfs/linux-ntfs-1.5.0-r1.ebuild b/sys-apps/linux-ntfs/linux-ntfs-1.5.0-r1.ebuild
deleted file mode 100644
index 8b2816f073f8..000000000000
--- a/sys-apps/linux-ntfs/linux-ntfs-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-ntfs/linux-ntfs-1.5.0-r1.ebuild,v 1.9 2002/10/20 18:54:50 vapier Exp $
-
-# NB: This project actually requires >=gcc.2.96!  This ebuild installs an
-# rpm binary package into /opt.  Eventually we'll compile it ourselves..
-
-DESCRIPTION="Utilities and library for accessing NTFS filesystems"
-HOMEPAGE="http://linux-ntfs.sourceforge.net/"
-KEYWORDS="x86 -ppc -sparc -sparc64"
-SLOT="0"
-LICENSE="GPL-2"
-
-S=${WORKDIR}/${P}
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}-${PR/r/}.i386.rpm
-	mirror://sourceforge/${PN}/${PN}-devel-${PV}-${PR/r/}.i386.rpm"
-DEPEND="virtual/glibc app-arch/rpm2targz"
-
-src_unpack() {
-	local i
-	for i in ${A}
-	do
-		rpm2targz ${DISTDIR}/${i}
-		tar zxf ${i/rpm/tar.gz}
-		rm -f ${i/rpm/tar.gz}
-	done
-}
-
-src_compile() { :; }
-
-src_install() {
-	cd ${D}
-	mkdir -p opt/${PN}
-	mv ${WORKDIR}/usr/* opt/${PN}
-	cd opt/${PN}
-
-	mv sbin/mkntfs bin
-	rm -rf sbin
-
-	mkdir -p ${D}/usr/share/doc ${D}/usr/include
-	mv share/doc/${PN}-${PV} ${D}/usr/share/doc/${PF}
-	rm -rf share/doc
-	dosym /opt/${PN}/include/ntfs /usr/include/ntfs
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/50ntfs
-}
diff --git a/sys-apps/linux-ntfs/linux-ntfs-1.6.0.ebuild b/sys-apps/linux-ntfs/linux-ntfs-1.6.0.ebuild
new file mode 100644
index 000000000000..be012517ec40
--- /dev/null
+++ b/sys-apps/linux-ntfs/linux-ntfs-1.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/linux-ntfs/linux-ntfs-1.6.0.ebuild,v 1.1 2002/11/02 07:51:43 woodchip Exp $
+
+DESCRIPTION="Utilities and library for accessing NTFS filesystems"
+HOMEPAGE="http://linux-ntfs.sourceforge.net/"
+
+S=${WORKDIR}/${P}
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.tar.gz"
+DEPEND=">=sys-devel/gcc-2.96"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	patch -p0 <${FILESDIR}/${P}-gcc3.2.patch || die
+}
+
+src_compile() {
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	# a normal user cannot run ntfsfix
+	cd ${D}
+	mv usr/bin/ntfsfix usr/sbin
+	rm -rf usr/bin
+	cd ${S}
+
+	# lot's of docs (a good thing :)
+	dodoc CREDITS ChangeLog NEWS README TODO.include TODO.mkntfs TODO.ntfsfix \
+		doc/attribute_definitions doc/attributes.txt doc/compression.txt \
+		doc/system_files.txt doc/system_security_descriptors.txt \
+		doc/tunable_settings
+}