Fix problems with resizing Vista partitions #185241 by Harald van Dijk.

Package-Manager: portage-2.1.3_rc8

5 files changed, 90 insertions, 8 deletions

diff --git a/sys-fs/ntfsprogs/ChangeLog b/sys-fs/ntfsprogs/ChangeLog
index 8f1920a3a9cb..88b81d917073 100644
--- a/sys-fs/ntfsprogs/ChangeLog
+++ b/sys-fs/ntfsprogs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/ntfsprogs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.44 2007/03/29 08:06:09 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.45 2007/07/14 17:27:51 vapier Exp $
+
+*ntfsprogs-1.13.1-r1 (14 Jul 2007)
+
+  14 Jul 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/ntfsprogs-1.13.1-resize-vista.patch, +ntfsprogs-1.13.1-r1.ebuild:
+  Fix problems with resizing Vista partitions #185241 by Harald van Dijk.
 
   29 Mar 2007; Markus Rothe <corsair@gentoo.org> ntfsprogs-1.13.1.ebuild:
   Stable on ppc64
diff --git a/sys-fs/ntfsprogs/Manifest b/sys-fs/ntfsprogs/Manifest
index df7a7afc66cd..912f80f024d5 100644
--- a/sys-fs/ntfsprogs/Manifest
+++ b/sys-fs/ntfsprogs/Manifest
@@ -5,20 +5,28 @@ AUX ntfsprogs-1.13.0-pkg-config.patch 3485 RMD160 dab70bf95732dbdb967b41243c3b3a
 MD5 73527f9a781ac73d0f8c3c6306d94d97 files/ntfsprogs-1.13.0-pkg-config.patch 3485
 RMD160 dab70bf95732dbdb967b41243c3b3a48f823bc71 files/ntfsprogs-1.13.0-pkg-config.patch 3485
 SHA256 4932fe269f43c093e73605360a3b54e2ebf86bda86ca5eac90a76060eb707b54 files/ntfsprogs-1.13.0-pkg-config.patch 3485
+AUX ntfsprogs-1.13.1-resize-vista.patch 413 RMD160 bd96a2f1d331dd321aa4f032c675c84ac68abc07 SHA1 fdcad09924db0504cab62ee11287d57b44027474 SHA256 23c74d400f46dd8d77e63d2d9ca96a3fd579a910ad7cd130f277b842c2b18e3f
+MD5 cb57360e7cbb8a53290920d054f54c18 files/ntfsprogs-1.13.1-resize-vista.patch 413
+RMD160 bd96a2f1d331dd321aa4f032c675c84ac68abc07 files/ntfsprogs-1.13.1-resize-vista.patch 413
+SHA256 23c74d400f46dd8d77e63d2d9ca96a3fd579a910ad7cd130f277b842c2b18e3f files/ntfsprogs-1.13.1-resize-vista.patch 413
 DIST ntfsprogs-1.13.0.tar.gz 860532 RMD160 17f1f185f68ce77c538058dfb05fbfb56985f3eb SHA1 14dc4c6e47974d1c9d9cd2175557e30819054b41 SHA256 a74aa19dca47c4744d0e1245687b54f0a0028e80a9b6e2ce99ba19fd8e168d57
 DIST ntfsprogs-1.13.1.tar.gz 870260 RMD160 4fea1dd03f7c4d2b7cfb05ca101aee902e1ed9d2 SHA1 a4e50f6fc10fcc1e1f562ad64bcbf9a0d46ca72a SHA256 d89f90e6b565d6fc0ebaf190799ea40fc1e25329dd120dff0c85db65f9af42b6
 EBUILD ntfsprogs-1.13.0.ebuild 1228 RMD160 3f057ce36fcab43801a8b9e7529b5ba29ad934b7 SHA1 fbc1f1e2b4cb323b456cda63dc1ec689e9c8d6a0 SHA256 47c55551cf9dc952ba813c6f1be1b7fafb3f8b2548130f0f85abc119651a2231
 MD5 fcc89211150eb74b841db155b8465a6d ntfsprogs-1.13.0.ebuild 1228
 RMD160 3f057ce36fcab43801a8b9e7529b5ba29ad934b7 ntfsprogs-1.13.0.ebuild 1228
 SHA256 47c55551cf9dc952ba813c6f1be1b7fafb3f8b2548130f0f85abc119651a2231 ntfsprogs-1.13.0.ebuild 1228
+EBUILD ntfsprogs-1.13.1-r1.ebuild 1241 RMD160 70ac33852f3a99614c8d2dd307e6af680b442cae SHA1 647fd83908a55dd91a9d5c28e24614ecf9ddbe0a SHA256 8ad3d9bd04ca646fa1542b07fdc3be8e6021c81f3ca056b1e2f66e4d309a844c
+MD5 19b31c1316be84570445647c7e4e0806 ntfsprogs-1.13.1-r1.ebuild 1241
+RMD160 70ac33852f3a99614c8d2dd307e6af680b442cae ntfsprogs-1.13.1-r1.ebuild 1241
+SHA256 8ad3d9bd04ca646fa1542b07fdc3be8e6021c81f3ca056b1e2f66e4d309a844c ntfsprogs-1.13.1-r1.ebuild 1241
 EBUILD ntfsprogs-1.13.1.ebuild 1145 RMD160 beb87c6ddd8407090607043b872ea636304f60c7 SHA1 d11c87cc14939084215d100805327174c9243c67 SHA256 d312559c4bbbc68e59aee4a4405cf30eb0a8cb0dc0ed56b6188d8134e9d39f93
 MD5 80e47cc53ec84a993d543828b716e998 ntfsprogs-1.13.1.ebuild 1145
 RMD160 beb87c6ddd8407090607043b872ea636304f60c7 ntfsprogs-1.13.1.ebuild 1145
 SHA256 d312559c4bbbc68e59aee4a4405cf30eb0a8cb0dc0ed56b6188d8134e9d39f93 ntfsprogs-1.13.1.ebuild 1145
-MISC ChangeLog 6821 RMD160 a0bad14c4463e712a6086bd285e94d3f80817b94 SHA1 2486086c38a9cdc4b1eb1e4ca3d9502fdf1d398b SHA256 fdc32c887c84152e44655b4e9c2a453929e8528041c482ac1aa50e1e1e4786db
-MD5 b6fd63bbbf1077780704714d261d432f ChangeLog 6821
-RMD160 a0bad14c4463e712a6086bd285e94d3f80817b94 ChangeLog 6821
-SHA256 fdc32c887c84152e44655b4e9c2a453929e8528041c482ac1aa50e1e1e4786db ChangeLog 6821
+MISC ChangeLog 7056 RMD160 3848458753522bf9c0179b396388addb47cfc985 SHA1 1c2a2e166dc2de29a636d7c56ef82d7e6efb2924 SHA256 ea03b2f7c5d0cafadecd9ab4e5fd72f1345fd11c33bc41a382bf18b6d1ed9bc0
+MD5 91a0a102acecc6daafb5ca164c9eee78 ChangeLog 7056
+RMD160 3848458753522bf9c0179b396388addb47cfc985 ChangeLog 7056
+SHA256 ea03b2f7c5d0cafadecd9ab4e5fd72f1345fd11c33bc41a382bf18b6d1ed9bc0 ChangeLog 7056
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -29,10 +37,13 @@ SHA256 f9aae297e7d9a19175714733ce310cb8e42292dde30b80fd1e0bb082f5e06f51 files/di
 MD5 6255f668babc556db0c8a62630706eea files/digest-ntfsprogs-1.13.1 250
 RMD160 02c85a832615928dc578c19ed2422bc6d840ec93 files/digest-ntfsprogs-1.13.1 250
 SHA256 a91e4c4e35f0f0bc901adde11c51fb5a6fe338e5a5db52617929db927f1af697 files/digest-ntfsprogs-1.13.1 250
+MD5 6255f668babc556db0c8a62630706eea files/digest-ntfsprogs-1.13.1-r1 250
+RMD160 02c85a832615928dc578c19ed2422bc6d840ec93 files/digest-ntfsprogs-1.13.1-r1 250
+SHA256 a91e4c4e35f0f0bc901adde11c51fb5a6fe338e5a5db52617929db927f1af697 files/digest-ntfsprogs-1.13.1-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGmQajp/wUKkr7RBoRAgeKAJ977Drh454volpkBSxaEJEl/zUc+wCgntvN
-+0X+grfKK+71IHZ6nLUJUa0=
-=c2h5
+iD8DBQFGmQe3p/wUKkr7RBoRArdHAKCvmhM44FycStrFsW4tIAzdZs3X0QCeNKlt
+/iZpk18YmizVSAWjBakFXe4=
+=AGQ5
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ntfsprogs/files/digest-ntfsprogs-1.13.1-r1 b/sys-fs/ntfsprogs/files/digest-ntfsprogs-1.13.1-r1
new file mode 100644
index 000000000000..ff32bd7cecf2
--- /dev/null
+++ b/sys-fs/ntfsprogs/files/digest-ntfsprogs-1.13.1-r1
@@ -0,0 +1,3 @@
+MD5 23160eb8d34abe3d2a88cd6d054faa47 ntfsprogs-1.13.1.tar.gz 870260
+RMD160 4fea1dd03f7c4d2b7cfb05ca101aee902e1ed9d2 ntfsprogs-1.13.1.tar.gz 870260
+SHA256 d89f90e6b565d6fc0ebaf190799ea40fc1e25329dd120dff0c85db65f9af42b6 ntfsprogs-1.13.1.tar.gz 870260
diff --git a/sys-fs/ntfsprogs/files/ntfsprogs-1.13.1-resize-vista.patch b/sys-fs/ntfsprogs/files/ntfsprogs-1.13.1-resize-vista.patch
new file mode 100644
index 000000000000..6e11b4d9e872
--- /dev/null
+++ b/sys-fs/ntfsprogs/files/ntfsprogs-1.13.1-resize-vista.patch
@@ -0,0 +1,15 @@
+fix from upstream for bug when resizing vista partition
+
+http://bugs.gentoo.org/185241
+
+--- ntfsprogs/ntfsresize.c
++++ ntfsprogs/ntfsresize.c
+@@ -2289,8 +2289,6 @@ static void prepare_volume_fixup(ntfs_vo
+ 	u16 flags;
+ 
+ 	flags = vol->flags | VOLUME_IS_DIRTY;
+-	if (vol->major_ver >= 2)
+-		flags |= VOLUME_MOUNTED_ON_NT4;
+ 
+ 	printf("Schedule chkdsk for NTFS consistency check at Windows "
+ 		"boot time ...\n");
diff --git a/sys-fs/ntfsprogs/ntfsprogs-1.13.1-r1.ebuild b/sys-fs/ntfsprogs/ntfsprogs-1.13.1-r1.ebuild
new file mode 100644
index 000000000000..8ea619b0059e
--- /dev/null
+++ b/sys-fs/ntfsprogs/ntfsprogs-1.13.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-1.13.1-r1.ebuild,v 1.1 2007/07/14 17:27:51 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="User tools for NTFS filesystems"
+HOMEPAGE="http://www.linux-ntfs.org/"
+SRC_URI="mirror://sourceforge/linux-ntfs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug fuse gnome"
+
+RDEPEND="fuse? ( >=sys-fs/fuse-2.3.0 )
+	crypt? ( >=dev-libs/libgcrypt-1.2.0 >=net-libs/gnutls-1.2.8 )
+	gnome? (
+		>=dev-libs/glib-2.0
+		>=gnome-base/gnome-vfs-2.0
+	)"
+DEPEND="${RDEPEND}
+	!=sys-fs/ntfs3g-0.1_beta20070714
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-resize-vista.patch
+	sed -i -e 's:-ggdb3::' configure
+}
+
+src_compile() {
+	econf \
+		$(use_enable crypt crypto) \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-module) \
+		$(use_enable gnome gnome-vfs) \
+		|| die "Configure failed"
+	emake || die "Make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed"
+	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO.* \
+		doc/attribute_definitions doc/*.txt doc/tunable_settings
+}