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

(Portage version: 13625-svn/cvs/Linux x86_64)

3 files changed, 61 insertions, 2 deletions

diff --git a/sys-fs/ntfsprogs/ChangeLog b/sys-fs/ntfsprogs/ChangeLog
index f61b655979f7..e1d0b59c6efb 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.64 2009/01/19 00:02:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.65 2009/05/29 23:52:02 arfrever Exp $
+
+  29 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  ntfsprogs-2.0.0-r1.ebuild, +files/ntfsprogs-2.0.0-gnutls-2.8.patch:
+  Fix building with >=net-libs/gnutls-2.7.1 (bug #268488).
 
   19 Jan 2009; Mike Frysinger <vapier@gentoo.org> ntfsprogs-2.0.0-r1.ebuild:
   Modify generated files to avoid extra autotools depends #253805.
diff --git a/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-gnutls-2.8.patch b/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-gnutls-2.8.patch
new file mode 100644
index 000000000000..28b2a0d57e1f
--- /dev/null
+++ b/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-gnutls-2.8.patch
@@ -0,0 +1,52 @@
+--- libntfs/Makefile.am
++++ libntfs/Makefile.am
+@@ -38,8 +38,8 @@
+ 	-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_LDFLAGS += `pkg-config --libs gnutls libconfig`
++libntfs_la_CFLAGS += `pkg-config --cflags gnutls libconfig`
+ endif
+ 
+ libntfs_la_SOURCES =	\
+--- libntfs/Makefile.in
++++ libntfs/Makefile.in
+@@ -61,8 +61,8 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-@ENABLE_CRYPTO_TRUE@am__append_1 = `libgnutls-config --libs` `pkg-config --libs libconfig`
+-@ENABLE_CRYPTO_TRUE@am__append_2 = `libgnutls-config --cflags` `pkg-config --cflags libconfig`
++@ENABLE_CRYPTO_TRUE@am__append_1 = `pkg-config --libs gnutls libconfig`
++@ENABLE_CRYPTO_TRUE@am__append_2 = `pkg-config --cflags gnutls libconfig`
+ subdir = libntfs
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(srcdir)/libntfs-gnomevfs.8.in $(srcdir)/libntfs.8.in \
+--- ntfsprogs/Makefile.am
++++ ntfsprogs/Makefile.am
+@@ -125,8 +125,8 @@
+ 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_LDFLAGS	= $(AM_LFLAGS) `pkg-config --libs gnutls`
++ntfsdecrypt_CFLAGS	= `pkg-config --cflags gnutls`
+ endif
+ 
+ # Extra targets
+--- ntfsprogs/Makefile.in
++++ ntfsprogs/Makefile.in
+@@ -449,8 +449,8 @@
+ ntfsdump_logfile_LDFLAGS = $(AM_LFLAGS)
+ @ENABLE_CRYPTO_TRUE@ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h
+ @ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDADD = $(AM_LIBS)
+-@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs`
+-@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `libgnutls-config --cflags`
++@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `pkg-config --libs gnutls`
++@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `pkg-config --cflags gnutls`
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r1.ebuild b/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r1.ebuild
index f9065cdbd42c..21a59f42e35f 100644
--- a/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r1.ebuild
+++ b/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r1.ebuild
@@ -1,6 +1,8 @@
 # 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-2.0.0-r1.ebuild,v 1.4 2009/01/19 00:02:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r1.ebuild,v 1.5 2009/05/29 23:52:02 arfrever Exp $
+
+inherit eutils
 
 DESCRIPTION="User tools for NTFS filesystems"
 HOMEPAGE="http://www.linux-ntfs.org/"
@@ -26,6 +28,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	#epatch "${FILESDIR}"/${P}-extras.patch #218601
+	epatch "${FILESDIR}"/${P}-gnutls-2.8.patch
 	use minimal || sed -i 's:^EXTRA_PROGRAMS =:bin_PROGRAMS +=:' ntfsprogs/Makefile.in #218601
 	sed -i \
 		-e '/CFLAGS/s:-ggdb3\>::' \