Fix building with >=net-libs/gnutls-2.7.1 (bug #268488).

Package-Manager: portage-14624-svn/cvs/Linux x86_64

4 files changed, 35 insertions, 21 deletions

diff --git a/sys-fs/ntfsprogs/ChangeLog b/sys-fs/ntfsprogs/ChangeLog
index fbeb0c7242d0..31d8fbd0d3e5 100644
--- a/sys-fs/ntfsprogs/ChangeLog
+++ b/sys-fs/ntfsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/ntfsprogs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.68 2009/07/11 00:55:09 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.69 2009/10/17 22:15:49 arfrever Exp $
+
+  17 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  ntfsprogs-1.13.1-r1.ebuild, +files/ntfsprogs-1.13.1-gnutls-2.8.patch:
+  Fix building with >=net-libs/gnutls-2.7.1 (bug #268488).
 
   11 Jul 2009; <chainsaw@gentoo.org> ntfsprogs-2.0.0-r1.ebuild:
   Marked stable on AMD64 for bug #275704; tested on a dual Opteron 2354.
diff --git a/sys-fs/ntfsprogs/Manifest b/sys-fs/ntfsprogs/Manifest
index 66607011c6f2..b5a17ee9ce21 100644
--- a/sys-fs/ntfsprogs/Manifest
+++ b/sys-fs/ntfsprogs/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ntfsprogs-1.13.1-gnutls-2.8.patch 331 RMD160 e9bff5bf95c40e887595ede347275a7ffcb25989 SHA1 3bb14f141357a5b2da3344748085950069a9a379 SHA256 8af8785b5a0af32d2a315dc838efeac31d8cfda0b1c8faef671eff9897715ca4
 AUX ntfsprogs-1.13.1-resize-vista.patch 413 RMD160 bd96a2f1d331dd321aa4f032c675c84ac68abc07 SHA1 fdcad09924db0504cab62ee11287d57b44027474 SHA256 23c74d400f46dd8d77e63d2d9ca96a3fd579a910ad7cd130f277b842c2b18e3f
 AUX ntfsprogs-2.0.0-extras.patch 1188 RMD160 31c9dca960018cdf4586939fad094e318c30f8e4 SHA1 87c06d2f2d86d53a09a013697222138c7675163c SHA256 77ccf07e969d56ffd3ab328dc55dc5f5d64e94e79c13aedbecd64c210364fb26
 AUX ntfsprogs-2.0.0-gnutls-2.8.patch 2061 RMD160 5104ee53970544ca0857ba1ae045727256eb0ac2 SHA1 1e669b0beaa5db6e1c7f3ab9e687b8f324251275 SHA256 5eb7bfe9088c29344741e6bcaefd349fb7a95d54f15252651efc611866a2828c
 DIST ntfsprogs-1.13.1.tar.gz 870260 RMD160 4fea1dd03f7c4d2b7cfb05ca101aee902e1ed9d2 SHA1 a4e50f6fc10fcc1e1f562ad64bcbf9a0d46ca72a SHA256 d89f90e6b565d6fc0ebaf190799ea40fc1e25329dd120dff0c85db65f9af42b6
 DIST ntfsprogs-2.0.0.tar.gz 903949 RMD160 8c1cae5091c4eb56a6e3fcd021ad172d39777f6c SHA1 c433189eb0955beb7360c6a475cc97083c5cd020 SHA256 143f7380d3627b92cea6f0929d22fc2c28b6bdd09a0e428cf638ae5c5b7c31f0
-EBUILD ntfsprogs-1.13.1-r1.ebuild 1235 RMD160 9f54c932e2470b693a1af3da181c05f308d66505 SHA1 dcaafdbc242b27df86c08635ef823a1e5800f241 SHA256 8f132072f400ee3a7edd376c83be3a99df4d39bfd77efc1d7ccad3ff1a88c875
+EBUILD ntfsprogs-1.13.1-r1.ebuild 1521 RMD160 7948192110e8db652789e11749b7df2f82c08ab6 SHA1 ca25a31bf43aededf12f1a97f60bb69fd88571d0 SHA256 7e2d4d321d8f12aab3064a403ec19df7bda5ffcd7f80e00360760b4b5eec2510
 EBUILD ntfsprogs-2.0.0-r1.ebuild 1707 RMD160 3f34e038751cd858b535f5ba19aea05d40a52913 SHA1 9d05e396d018eb1a722601c3777ead2b66c4f361 SHA256 9071ad61ecf570a42fca8e2a7a297e847bf6c4a538af070d398cceaf13643959
 EBUILD ntfsprogs-2.0.0.ebuild 1258 RMD160 e300b0cae307165d70b51956d4b1c27523678240 SHA1 3df05d9b7de68f437599a3be26237e41a3c9a03d SHA256 79063d1e4374c1df589552d83e51d604b264df0dca19d35ac6c36e0a74e83881
-MISC ChangeLog 10010 RMD160 5d0ddae5d6bfc813cffcc1aa8249b2d744185b72 SHA1 c0023f2086674186762d487de8b20cd40593121e SHA256 61797133a4b2e4a714604dc509dd49e4a7dc2ef6a367983b9a13f8df5706eb37
+MISC ChangeLog 10215 RMD160 8b72719646899747f336b7359b8810879799f7d8 SHA1 cf3cfc72745f153ffc84b8f61838fac65eafa4a2 SHA256 5804727f137879a377dcaa0c0d5848e59a40ca6945f82014b54aeacb5d7aa0f8
 MISC metadata.xml 223 RMD160 9f10fdaf4d9785ae7201c6e1f412b1e58e844d65 SHA1 8d3ae39172303e1fec9f1cc12d5d685f124eb42a SHA256 f1b190e5666562a1e3ac232a0fa507dc68bfad520521814c75db2fcecdef6861
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpX4vsACgkQp5vW4rUFj5pgagCfXrdN9GPCqTR+fpTJqp+0wGaR
-e04AoJhMsgXHEo8aL7isIt2QJS8kV66Z
-=cy6A
------END PGP SIGNATURE-----
diff --git a/sys-fs/ntfsprogs/files/ntfsprogs-1.13.1-gnutls-2.8.patch b/sys-fs/ntfsprogs/files/ntfsprogs-1.13.1-gnutls-2.8.patch
new file mode 100644
index 000000000000..0af3fbcbb2c6
--- /dev/null
+++ b/sys-fs/ntfsprogs/files/ntfsprogs-1.13.1-gnutls-2.8.patch
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -245,7 +245,7 @@
+ 		fi
+ 	])
+ 	have_libgnutls=false
+-	AM_PATH_LIBGNUTLS(1.2.8, [ have_libgnutls=true ],
++	PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.2.8, [ have_libgnutls=true ],
+ 	[
+ 		if test "$enable_crypto" = "yes"; then
+ 			AC_MSG_ERROR([Linux-NTFS crypto code requires the gnutls library.])
diff --git a/sys-fs/ntfsprogs/ntfsprogs-1.13.1-r1.ebuild b/sys-fs/ntfsprogs/ntfsprogs-1.13.1-r1.ebuild
index b7d15a81ef4c..e491561f677a 100644
--- a/sys-fs/ntfsprogs/ntfsprogs-1.13.1-r1.ebuild
+++ b/sys-fs/ntfsprogs/ntfsprogs-1.13.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.8 2008/03/10 04:12:26 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-1.13.1-r1.ebuild,v 1.9 2009/10/17 22:15:49 arfrever Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="User tools for NTFS filesystems"
 HOMEPAGE="http://www.linux-ntfs.org/"
@@ -27,7 +27,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-resize-vista.patch
-	sed -i -e 's:-ggdb3::' configure
+	epatch "${FILESDIR}"/${P}-gnutls-2.8.patch
+	sed -i -e 's:-ggdb3::' configure.ac
+	eautoreconf
 }
 
 src_compile() {
@@ -35,13 +37,19 @@ src_compile() {
 		$(use_enable crypt crypto) \
 		$(use_enable debug) \
 		$(use_enable fuse fuse-module) \
-		$(use_enable gnome gnome-vfs) \
-		|| die "Configure failed"
-	emake || die "Make failed"
+		$(use_enable gnome gnome-vfs)
+	emake || die "emake failed"
+	emake extras || die "emake extras failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dobin ntfsprogs/.libs/{ntfsdump_logfile,ntfswipe,ntfstruncate,ntfsmove,ntfsmftalloc} || die "dobin failed"
+	if use crypt; then
+		dobin ntfsprogs/.libs/ntfsdecrypt || die "dobin failed"
+	fi
+
 	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO.* \
 		doc/attribute_definitions doc/*.txt doc/tunable_settings
 }