Revision bump: fix building with net-libs/gnutls[nettle] (bug #361307); avoid playing with configure to remove cflags mangling on USE=debug; only depend on libconfig when USE=crypt is enabled.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 79 insertions, 16 deletions

diff --git a/sys-fs/ntfsprogs/ChangeLog b/sys-fs/ntfsprogs/ChangeLog
index f2217b929fe9..53107eaf7bb2 100644
--- a/sys-fs/ntfsprogs/ChangeLog
+++ b/sys-fs/ntfsprogs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/ntfsprogs
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.72 2010/12/13 08:49:59 xmw Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.73 2011/03/30 14:41:43 flameeyes Exp $
+
+*ntfsprogs-2.0.0-r3 (30 Mar 2011)
+
+  30 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ntfsprogs-2.0.0-r2.ebuild, +ntfsprogs-2.0.0-r3.ebuild,
+  +files/ntfsprogs-2.0.0-cryptolink.patch:
+  Revision bump: fix building with net-libs/gnutls[nettle] (bug #361307); avoid
+  playing with configure to remove cflags mangling on USE=debug; only depend on
+  libconfig when USE=crypt is enabled.
 
   13 Dec 2010; Michael Weber <xmw@gentoo.org> ntfsprogs-2.0.0-r1.ebuild:
   sparc stable (bug 275704)
diff --git a/sys-fs/ntfsprogs/Manifest b/sys-fs/ntfsprogs/Manifest
index 1b8e56720308..62907015e648 100644
--- a/sys-fs/ntfsprogs/Manifest
+++ b/sys-fs/ntfsprogs/Manifest
@@ -1,5 +1,9 @@
+-----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-cryptolink.patch 1503 RMD160 979e9237ef65b0b45a261082f056c9aa296da0ff SHA1 05b03318592ebb350cda7e0f74ced669b9e316fa SHA256 96e3a156864ace0b480da8aa4acc9f800934982692a0e517f023434b8d9c17da
 AUX ntfsprogs-2.0.0-erange.patch 1033 RMD160 7f1d106deb07855b385e37e5a12ab0940159236c SHA1 29d3455b059ddd87513fff38ed08fd8f8de76d0f SHA256 ef0258c4a245eb9ec6e99d52e931f6b2e63dcf45b648cd5f9076c312188f718a
 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
@@ -7,6 +11,13 @@ DIST ntfsprogs-1.13.1.tar.gz 870260 RMD160 4fea1dd03f7c4d2b7cfb05ca101aee902e1ed
 DIST ntfsprogs-2.0.0.tar.gz 903949 RMD160 8c1cae5091c4eb56a6e3fcd021ad172d39777f6c SHA1 c433189eb0955beb7360c6a475cc97083c5cd020 SHA256 143f7380d3627b92cea6f0929d22fc2c28b6bdd09a0e428cf638ae5c5b7c31f0
 EBUILD ntfsprogs-1.13.1-r1.ebuild 1521 RMD160 7948192110e8db652789e11749b7df2f82c08ab6 SHA1 ca25a31bf43aededf12f1a97f60bb69fd88571d0 SHA256 7e2d4d321d8f12aab3064a403ec19df7bda5ffcd7f80e00360760b4b5eec2510
 EBUILD ntfsprogs-2.0.0-r1.ebuild 1701 RMD160 220e0b068d79f7aabbb15a55a8fad831c7d62776 SHA1 2f81a5747c2502f28d604845c5dc5006a17123d5 SHA256 a3b1f0972d33b3c4b4f5f610c25c89a6b7ffad917fb06ad7b8b687c0cbea5c70
-EBUILD ntfsprogs-2.0.0-r2.ebuild 1756 RMD160 ea550b8dffb276a5ace021d22d95749727eddb4a SHA1 5565778513eb65d0a07bd9aca90a92fe373560c9 SHA256 74d561870025d1885215b122341319999bdae21bb9e591d10c542d33b16f590f
-MISC ChangeLog 10667 RMD160 aeab60cca67629297bbbc29a8dc7001fe4aefc70 SHA1 0db5f4f047de515da733c1ecf4906f0ab58023a2 SHA256 d3290aced0253ea55937715eee9cebe7875fbf9aca656434be40c0c2f4a16177
+EBUILD ntfsprogs-2.0.0-r3.ebuild 1804 RMD160 5d7a50344a5efdf7ff9809bec393b8fba7b05877 SHA1 f31bbcef3f18b51a69bbc6e6b1b9503ad9f40a84 SHA256 a36331874397f5b02fa817a8aa2efd5f932c6271bd3830c3b7928d7bbe265ac0
+MISC ChangeLog 11065 RMD160 a150ae8cf9109555416cb1728fe6612750b766c4 SHA1 49480032be1ccae0e2d85ada55449bc609fb8240 SHA256 0ffa6abe056ba2f821ea86efda1334699264182e126126774f2e0656f4c7a9f3
 MISC metadata.xml 223 RMD160 9f10fdaf4d9785ae7201c6e1f412b1e58e844d65 SHA1 8d3ae39172303e1fec9f1cc12d5d685f124eb42a SHA256 f1b190e5666562a1e3ac232a0fa507dc68bfad520521814c75db2fcecdef6861
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2TQSwACgkQAiZjviIA2Xg3eQCfbDnEwnXPxm8BQ4eN/YaD8kcT
+a1sAoII163pKFxxmZ0tS7LcXAmjQT66s
+=5E8w
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-cryptolink.patch b/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-cryptolink.patch
new file mode 100644
index 000000000000..c1d773cbc722
--- /dev/null
+++ b/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-cryptolink.patch
@@ -0,0 +1,37 @@
+Index: ntfsprogs-2.0.0/ntfsprogs/Makefile.am
+===================================================================
+--- ntfsprogs-2.0.0.orig/ntfsprogs/Makefile.am
++++ ntfsprogs-2.0.0/ntfsprogs/Makefile.am
+@@ -124,9 +124,9 @@ ntfsdump_logfile_LDFLAGS= $(AM_LFLAGS)
+ 
+ if ENABLE_CRYPTO
+ ntfsdecrypt_SOURCES	= ntfsdecrypt.c utils.c utils.h
+-ntfsdecrypt_LDADD	= $(AM_LIBS)
+-ntfsdecrypt_LDFLAGS	= $(AM_LFLAGS) `libgnutls-config --libs`
+-ntfsdecrypt_CFLAGS	= `libgnutls-config --cflags`
++ntfsdecrypt_LDADD	= $(AM_LIBS) $(GNUTLS_LIBS) $(LIBGCRYPT_LIBS)
++ntfsdecrypt_LDFLAGS	= $(AM_LFLAGS)
++ntfsdecrypt_CFLAGS	= $(GNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
+ endif
+ 
+ # Extra targets
+Index: ntfsprogs-2.0.0/libntfs/Makefile.am
+===================================================================
+--- ntfsprogs-2.0.0.orig/libntfs/Makefile.am
++++ ntfsprogs-2.0.0/libntfs/Makefile.am
+@@ -34,12 +34,13 @@ linux_ntfsincludedir = -I$(top_srcdir)/i
+ lib_LTLIBRARIES = libntfs.la
+ 
+ libntfs_la_LDFLAGS = -version-info $(LTVERSION_LIBNTFS) -no-undefined
++libntfs_la_LIBADD =
+ libntfs_la_CFLAGS = $(LIBNTFS_CFLAGS) \
+ 	-DLTVERSION_LIBNTFS=\"$(LTVERSION_LIBNTFS)\"
+ 
+ if ENABLE_CRYPTO
+-libntfs_la_LDFLAGS += `libgnutls-config --libs` `pkg-config --libs libconfig`
+-libntfs_la_CFLAGS += `libgnutls-config --cflags` `pkg-config --cflags libconfig`
++libntfs_la_LIBADD += $(GNUTLS_LIBS)   $(LIBGCRYPT_LIBS)   $(libconfig_LIBS)
++libntfs_la_CFLAGS += $(GNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(libconfig_CFLAGS)
+ endif
+ 
+ libntfs_la_SOURCES =	\
diff --git a/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r2.ebuild b/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r3.ebuild
index 9a3a6fc89e1a..f5f50a3fdacc 100644
--- a/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r2.ebuild
+++ b/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r2.ebuild,v 1.1 2010/07/24 06:29:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r3.ebuild,v 1.1 2011/03/30 14:41:43 flameeyes Exp $
 
-inherit eutils
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="User tools for NTFS filesystems"
 HOMEPAGE="http://www.linux-ntfs.org/"
@@ -13,9 +13,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="crypt debug fuse gnome minimal"
 
-RDEPEND="dev-libs/libconfig
+RDEPEND="
 	fuse? ( >=sys-fs/fuse-2.7.0 )
-	crypt? ( >=dev-libs/libgcrypt-1.2.0 >=net-libs/gnutls-1.2.8 )
+	crypt? (
+		>=dev-libs/libgcrypt-1.2.0
+		>=net-libs/gnutls-1.2.8
+		>=dev-libs/libconfig-1.0.1
+	)
 	gnome? (
 		>=dev-libs/glib-2.0
 		>=gnome-base/gnome-vfs-2.0
@@ -28,22 +32,24 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	#epatch "${FILESDIR}"/${P}-extras.patch #218601
-	epatch "${FILESDIR}"/${P}-gnutls-2.8.patch
 	epatch "${FILESDIR}"/${P}-erange.patch #329445
-	use minimal || sed -i 's:^EXTRA_PROGRAMS =:bin_PROGRAMS +=:' ntfsprogs/Makefile.in #218601
-	sed -i \
-		-e '/CFLAGS/s:-ggdb3\>::' \
-		-e '/CFLAGS/s:-O0\>::' \
-		configure || die
+	epatch "${FILESDIR}"/${P}-cryptolink.patch #361307
+
+	use minimal || sed -i 's:^EXTRA_PROGRAMS.*+\?=:bin_PROGRAMS +=:' ntfsprogs/Makefile.am #218601
+
+	eautoreconf
 }
 
 src_compile() {
+	# Avoid --enable-debug as that will set -O0 -ggdb3
+	use debug && append-flags -DDEBUG
+
 	econf \
 		$(use_enable crypt crypto) \
-		$(use_enable debug) \
 		$(use_enable fuse ntfsmount) \
 		$(use_enable gnome gnome-vfs) \
 		|| die "Configure failed"
+
 	emake || die "Make failed"
 }