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

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

4 files changed, 28 insertions, 16 deletions

diff --git a/dev-libs/tntnet/ChangeLog b/dev-libs/tntnet/ChangeLog
index 26519b5b8889..2e5292a80d2d 100644
--- a/dev-libs/tntnet/ChangeLog
+++ b/dev-libs/tntnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/tntnet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.11 2009/03/17 08:10:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/ChangeLog,v 1.12 2009/05/30 20:21:07 arfrever Exp $
+
+  30 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  tntnet-1.6.3.ebuild, +files/tntnet-1.6.3-gnutls-2.8.patch:
+  Fix building with >=net-libs/gnutls-2.7.1 (bug #268450).
 
   17 Mar 2009; Matthias Schwarzott <zzam@gentoo.org> tntnet-1.6.0-r1.ebuild,
   tntnet-1.6.1.ebuild, tntnet-1.6.2.ebuild, tntnet-1.6.3.ebuild:
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index f8ce9501ba5c..0514afe87248 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tntnet-1.6.3-gcc43.patch 278 RMD160 55965541e8e6327d570586a0b2efc184c6fdd176 SHA1 10da481e0ca9535d4a8d36340cdbd8d6afd6c7c6 SHA256 b1365de53b6914755dc03299e4df02c71d3c990dab52f0def9342fa2c6a53c21
+AUX tntnet-1.6.3-gnutls-2.8.patch 362 RMD160 e7f7f45c8c065b5bc60ca0598f64af07eb8983ef SHA1 09602f20a4b30dbb48912b84f20b402c20a4308f SHA256 13c67c5e69dac2a12d0b0ae575def550eca0ee2296704902e2225dc3577a3075
 DIST tntnet-1.6.0.tar.gz 1898635 RMD160 7e0607da0ccc1285147253493287a9adfafe3b1b SHA1 a5719d7a518105ec224670bc4f2846ad7bb2e144 SHA256 1cd469fd5a4ff5c14bff851151c8ef05bf3e978e79d923307fd0023d70903d64
 DIST tntnet-1.6.1.tar.gz 1948115 RMD160 6e9e8021b4d7f905cbfa05a4ad65ff250977da5e SHA1 7e22f17d89dba36f1fe8f712dc01aa4fc1912c95 SHA256 389bd267458ca8b45ce6e3a081160f2aeb4ffb6d7e0bb57749407f706a82d951
 DIST tntnet-1.6.2.tar.gz 1947826 RMD160 aaaa3deb2b76dc0082c8f64876f0280738b85caa SHA1 2b8c122484defb51514882d4961f2502a1388fed SHA256 3c610fc5de9abb0888c03fb610eb5fbe3fd282e5b77e87a3ce7a44ad12da6884
@@ -9,13 +7,6 @@ DIST tntnet-1.6.3.tar.gz 1952122 RMD160 321b40dbcb1bfd9b1b0e69130c2b9c141106fe25
 EBUILD tntnet-1.6.0-r1.ebuild 1251 RMD160 271b5a4adf2bf521104c2f04ec79bba8e2030751 SHA1 3c34da67166ff936283536bfbae7419345fa37b8 SHA256 f02ea8b70aa2eb183c0eba71c1954bbd9530d49e10c4372fa468cd24ad8d5afd
 EBUILD tntnet-1.6.1.ebuild 1450 RMD160 5dc5ba76b6b5e1f1aa7bbd90fc4c8ea0bcfcb4e9 SHA1 c02f0d707143778dc4432ad69a7029084543283b SHA256 683f88104f3cc6c9806349d2d5e411c98ea79e9cf14594ab700a5d7118363976
 EBUILD tntnet-1.6.2.ebuild 1450 RMD160 b14660592edcf49b8207cdce4d4329c7a72ee68a SHA1 4d39d51ad6c602d12dcfe078c3e4f7e2359b12c6 SHA256 567a9469d53d0276f4202b43939e9e84297d7f8014ced33b82925cae729bc051
-EBUILD tntnet-1.6.3.ebuild 1555 RMD160 ca70f6efa9b7daa8f77b785061546335b1f9a23e SHA1 82483eadd87dc6534c60a822bed68ddf27c559c9 SHA256 11a1993e1c62a84acbf62f90db30ced2f078716ee36c3a4f34db6b8bedeeacb0
-MISC ChangeLog 1899 RMD160 19906295c0858e9ebcdfe2fdae5e15a1140d1796 SHA1 08e5ca39f1b6dfe261c5f736e05ce722e0da1c5f SHA256 3f6af48cee1203fcb23edec6f3b762ccb7103b8cee68b45743fc9aba431593e4
+EBUILD tntnet-1.6.3.ebuild 1668 RMD160 12aaacc367381cb65128efb7cbd413e13806445b SHA1 342fa0f039af718bf0a6df2999f7ca3c647fef53 SHA256 60871a5b8bfb88b0c3f7a85d9046073e0da8fd12ac0990ecbd13cb2144824fdb
+MISC ChangeLog 2097 RMD160 284fe30ea08de99aaf08d119896ce36bc7b08fd5 SHA1 3036cd50747df28966aaa704b9c8575e5a2ba1db SHA256 7ae2274ca47702b0661907588efadb3082775fdffed8874e396e2bc709aa8d85
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm/WxEACgkQt2vP6XvVdOcLZwCfdp9IFdJpM/KtlE3rMChgjK83
-0EIAn0OtsNAxuG4EZgomF9afB3P2Sbvr
-=J5iK
------END PGP SIGNATURE-----
diff --git a/dev-libs/tntnet/files/tntnet-1.6.3-gnutls-2.8.patch b/dev-libs/tntnet/files/tntnet-1.6.3-gnutls-2.8.patch
new file mode 100644
index 000000000000..1d63c820f1ea
--- /dev/null
+++ b/dev-libs/tntnet/files/tntnet-1.6.3-gnutls-2.8.patch
@@ -0,0 +1,13 @@
+--- framework/common/Makefile.am
++++ framework/common/Makefile.am
+@@ -117,8 +117,8 @@
+ 	tnt/gcryptinit.h \
+ 	tnt/gnutls.h
+ 
+-libtntnet_la_LDFLAGS += `libgnutls-config --libs`
+-libtntnet_la_CXXFLAGS += `libgnutls-config --cflags`
++libtntnet_la_LDFLAGS += `pkg-config gnutls --libs`
++libtntnet_la_CXXFLAGS += `pkg-config gnutls --cflags`
+ endif
+ 
+ if MAKE_OPENSSL
diff --git a/dev-libs/tntnet/tntnet-1.6.3.ebuild b/dev-libs/tntnet/tntnet-1.6.3.ebuild
index ab2959d68657..1dea4e295901 100644
--- a/dev-libs/tntnet/tntnet-1.6.3.ebuild
+++ b/dev-libs/tntnet/tntnet-1.6.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-1.6.3.ebuild,v 1.4 2009/03/17 08:10:51 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tntnet/tntnet-1.6.3.ebuild,v 1.5 2009/05/30 20:21:07 arfrever Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="A modular, multithreaded webapplicationserver extensible with C++."
 HOMEPAGE="http://www.tntnet.org/index.hms"
@@ -20,13 +20,17 @@ RDEPEND="dev-libs/cxxtools
 		!gnutls? ( dev-libs/openssl )
 	)"
 DEPEND="${RDEPEND}
-	app-arch/zip"
+	app-arch/zip
+	ssl? ( gnutls? ( dev-util/pkgconfig ) )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-gnutls-2.8.patch"
+
+	eautoreconf
 }
 
 src_compile() {