Fix detection of >=net-libs/gnutls-2.7.1 (bug #268501).

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

4 files changed, 25 insertions, 17 deletions

diff --git a/www-client/kazehakase/ChangeLog b/www-client/kazehakase/ChangeLog
index bb728e6949f3..72f5ce003c9a 100644
--- a/www-client/kazehakase/ChangeLog
+++ b/www-client/kazehakase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/kazehakase
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/ChangeLog,v 1.70 2009/01/04 02:27:49 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/ChangeLog,v 1.71 2009/05/30 20:42:35 arfrever Exp $
+
+  30 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  kazehakase-0.5.6-r1.ebuild, +files/kazehakase-0.5.6-gnutls-2.8.patch:
+  Fix detection of >=net-libs/gnutls-2.7.1 (bug #268501).
 
   04 Jan 2009; Markus Meier <maekke@gentoo.org> kazehakase-0.5.6.ebuild:
   amd64/x86 stable, bug #245556
diff --git a/www-client/kazehakase/Manifest b/www-client/kazehakase/Manifest
index d9fe60fbfb93..0c7dea0fbf27 100644
--- a/www-client/kazehakase/Manifest
+++ b/www-client/kazehakase/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kazehakase-0.5.4-xulrunner19.patch 4437 RMD160 2300ca1c55626f0a7ac6ceee05aa718b5946355d SHA1 d3ddf857154b9d5ab134d558c11be522c7c81109 SHA256 79a663e897ba16257fe5fbe60f20c5ac5fbb02135507009aaec54c2623065703
 AUX kazehakase-0.5.5-xulrunner19.patch 11988 RMD160 327158aa44c72447f15a35761ea8939dcc8ba2ea SHA1 d5fc51eb697bbdcc8f747fc84cf4003d176c0332 SHA256 feb53a32de9ea7f3cf50922090c749c375947c85544813d138c4308d87209c0a
+AUX kazehakase-0.5.6-gnutls-2.8.patch 325 RMD160 2de2eca304b62de9b01a14efe5eac3f4679af2b7 SHA1 79224b661c1c95d6cbd9d862785581046cbd83dc SHA256 cbed54f40fb06aae9a7b1b8e52b97e6e7edf3a402e293f188387de1b25d4e485
 DIST kazehakase-0.5.0.tar.gz 1369196 RMD160 32fc4561c11ce39e301dd64897c9dc09e764d714 SHA1 1075ca8bb14212f993781d8baaeb885b4970fba8 SHA256 4bc0ec3fd18b8240c67d76e0cb898fe59cfd3e91b3f5f602d5d3a3cc7e5f7603
 DIST kazehakase-0.5.5.tar.gz 1403464 RMD160 e1d980bc1cd6008434f778d3a82211a9fe7469f0 SHA1 0de2c674f427384dca82ee28b571066a9553db2c SHA256 0effc67f489743e1e9a1b7fe402380b7021b166dc85a768721b670753401e3a4
 DIST kazehakase-0.5.6.tar.gz 1405935 RMD160 484c6e2088b6d1491b052e845584b820e4473983 SHA1 a11e13d05962884f6f4e94eb8215e85c4847960c SHA256 fb7407952ee5031a66318dfc7e9c4ee6bffe25b6824354ce02a8fb540ccbf92a
 EBUILD kazehakase-0.5.0.ebuild 1267 RMD160 f4dc8fce0164c5c83d9b8291a57d99dff7add91d SHA1 56d94cef173a54fadc4fac3127d32db90fad9800 SHA256 cf013614df466becc1d80f290c58cf65c7f6a603429b1c001b0e501dd124842c
 EBUILD kazehakase-0.5.5-r1.ebuild 1448 RMD160 27b6e7092318a91635a86318111490c32198b909 SHA1 216ef614e52b7dfd5fdc68c06434271929df32cc SHA256 9484186013d6fe2e57673944b446a4b567ddea0a9553c3d8ad7bc29c6503ec1e
-EBUILD kazehakase-0.5.6-r1.ebuild 1416 RMD160 968a5ae9fa4521ad52a63492764da6bdbec82ee7 SHA1 432822fd9c130eb0ee448bd6ed6502c2d96a64ac SHA256 6cd71949febc888a3354c2f4318531322c3fbf5ee1f5b634512ed485279a87d7
+EBUILD kazehakase-0.5.6-r1.ebuild 1485 RMD160 9fc4484b5fcf2e6fd3122e10dee0787f2c3c3f9a SHA1 3aa2877b8c052c6f609f3114969a9575672d76e8 SHA256 410a2d9f8ea70c7e9e6d874f38b58ac0d38afe1ed88a9cfb1c612f329918c58d
 EBUILD kazehakase-0.5.6.ebuild 1448 RMD160 312945b943a9b5ae447336595c5c01c92a5d5d88 SHA1 62203ffc54c444289a51c55b3c47be7281d05f84 SHA256 1823856554d45e4e2d72de6baffc3320c1e76ead95339944706c939fc895c819
-MISC ChangeLog 16494 RMD160 49a6eeee5a9ed1f3555c275bb83754c2c7e2d844 SHA1 386ee3dc3ed5cf17d850801a0ecf9cdc0cc48cbe SHA256 7abc5b6a62e01462b38d75d4b89866404a91150207d204c730874aadcf475bc4
+MISC ChangeLog 16700 RMD160 1c071ddce61d27b8fa59de39cfb230af7345981a SHA1 a8ef7cdf38be396092fd596f56d9ed5cc105974d SHA256 76f124c44b2795b3494dd8b17cc7e7b76a3e4fa26164689803796f53a15a8626
 MISC metadata.xml 463 RMD160 4c86a27110e266ef404fec9712f4651f283c5a05 SHA1 1b4a35fa52c06a7e72e5b9176d1f07cdf680f84b SHA256 91586a6e4cdd465caac5826207f51461fdf0a667866557cc8f48eb08df457004
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklgHq0ACgkQkKaRLQcq0GI8tACdHEA9QOkIfaKmyCypEol7qBHQ
-OokAn3Q9Dt35/ToyWlzCUSkdtivYKP4n
-=A/Cv
------END PGP SIGNATURE-----
diff --git a/www-client/kazehakase/files/kazehakase-0.5.6-gnutls-2.8.patch b/www-client/kazehakase/files/kazehakase-0.5.6-gnutls-2.8.patch
new file mode 100644
index 000000000000..0651ea1263b5
--- /dev/null
+++ b/www-client/kazehakase/files/kazehakase-0.5.6-gnutls-2.8.patch
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -168,7 +168,7 @@
+  			  Disable GNU TLS suport],,
+ 			  disable_ssl=no)
+ if test x"$disable_ssl" = "xno"; then
+-   AM_PATH_LIBGNUTLS(1.2.0,
++   PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.2.0,
+ 	AC_DEFINE(USE_SSL, 1, [Define using GNU TLS]),
+ 	AC_MSG_WARN([[libgnutls was not found.]]))
+ fi
diff --git a/www-client/kazehakase/kazehakase-0.5.6-r1.ebuild b/www-client/kazehakase/kazehakase-0.5.6-r1.ebuild
index 8daf8cf1e7e3..988c4738b4a7 100644
--- a/www-client/kazehakase/kazehakase-0.5.6-r1.ebuild
+++ b/www-client/kazehakase/kazehakase-0.5.6-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/www-client/kazehakase/kazehakase-0.5.6-r1.ebuild,v 1.1 2008/12/16 15:51:23 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/kazehakase/kazehakase-0.5.6-r1.ebuild,v 1.2 2009/05/30 20:42:35 arfrever Exp $
 
-inherit eutils flag-o-matic
+inherit autotools eutils flag-o-matic
 
 IUSE="hyperestraier migemo ruby ssl webkit"
 
@@ -36,6 +36,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-0.5.5-xulrunner19.patch
+	epatch "${FILESDIR}"/${P}-gnutls-2.8.patch
+	eautoreconf
 }
 
 src_compile() {