version bump as per bug #250987 thanks to Arfrever. USE=-cxx fix as per bug #249326 by Lars Strojny with patch thanks to Arfrever. Fix libtool cleanup on 2.6.0 version.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.26-gentoo-r4 x86_64

6 files changed, 118 insertions, 13 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 8f4fac6e5b97..c546d55589d0 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/gnutls
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.175 2008/11/18 11:56:26 dragonheart Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.176 2009/01/05 07:44:37 dragonheart Exp $
+
+*gnutls-2.6.3 (05 Jan 2009)
+
+  05 Jan 2009; Daniel Black <dragonheart@gentoo.org>
+  files/gnutls-2.6.0-cxx-configure.in.patch, gnutls-2.6.0-r2.ebuild,
+  gnutls-2.6.2.ebuild, +gnutls-2.6.3.ebuild:
+  version bump as per bug #250987 thanks to Arfrever. USE=-cxx fix as per bug
+  #249326 by Lars Strojny with patch thanks to Arfrever. Fix libtool cleanup
+  on 2.6.0 version.
 
   18 Nov 2008; Daniel Black <dragonheart@gentoo.org>
   -files/gnutls-2.2.5-CVE-2008-4989.patch, -gnutls-2.4.1-r1.ebuild,
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index f7f097159449..1979b850436c 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,13 +1,15 @@
 AUX gnutls-2.2.5-CVE-2008-4989-V2.patch 650 RMD160 71ef81981ad1a95480c189145dab1ecc278b67b6 SHA1 09e53cac6797767128c745ab147db2b06aa245c6 SHA256 14c531bec64d75b3dedea801cc4f52cd884c335d95bd08c5e9e190f6170ebb5f
 AUX gnutls-2.3.11+gcc-4.3.patch 349 RMD160 192c663f741c6a2b6681b3873c199c64996d0000 SHA1 657ed9b73f7cfcbf348b94cff9f1ab9c2f8c7b59 SHA256 30dc6126ffa85a4765ca4724355759932990545c962ef2239fdb692af631e018
-AUX gnutls-2.6.0-cxx-configure.in.patch 451 RMD160 d449a7f5de65a6e8768b93dd30c0891dde66884c SHA1 628bc60599692f9d2753cc93ba4e6998552db3bc SHA256 8cfa6fa3ee545b4cd5845f4fa3b9017cddd22568c00222431136486a1b64f1bb
+AUX gnutls-2.6.0-cxx-configure.in.patch 502 RMD160 fdd7f402f2a9122f8d7db9b165670c42d83abeb8 SHA1 748b7a0f0b689169054970993d7b4a6331f52c33 SHA256 c7a3ff932c467d08b27eee7e8b5bd1ce97b200328fc90478dee5ea3a59b18f71
 DIST gnutls-2.2.5.tar.bz2 4920322 RMD160 dd48a780849fc81c0a688116984eab8f41ea8ebf SHA1 7620d092c790f0a5ac5486c3563786ca8777083d SHA256 cf2689bd5b5f095e27f7a1aa2246212ef9322c0707aeb104238e9eb0f925ae57
 DIST gnutls-2.4.1.tar.bz2 4940118 RMD160 4e21a82047add916b8ccce8aa82c36b2c9bcff90 SHA1 7a439542e6344d5ccf11a29431a0600e7fe1c735 SHA256 d91401a6828d7300dc2b1106ff99610479aa35af05d39746cacdab8cdc7be5fd
 DIST gnutls-2.6.0.tar.bz2 5112845 RMD160 1d92662edd64e93e658fc527f1dfbfc99ab3a1da SHA1 bbd9e5f3a77bfcbef5a769c67d1576e7a6e4bda5 SHA256 9270a3eab9a9371839af79be92d50b8b21e7fbe157ebe915edae8e352f4e9fb5
 DIST gnutls-2.6.2.tar.bz2 5113586 RMD160 10a37efe6bd90add75e338ca98eb09cc4ab69dc7 SHA1 2c7701b61c86d5cec8305f8741bc18bc64f33b31 SHA256 00b1f84bd2d5d10a457c3abf22371b5829fe6f0a2b2886eaf7f0a58f1cabe7c9
+DIST gnutls-2.6.3.tar.bz2 5114214 RMD160 318c91f167988f2dfcde50015491b7dc7d4eea33 SHA1 f9b6a1d6135ef0a57a5cdd9fcb3e82bc62a27dcd SHA256 eddd7ee659dcf995362cf2ce5e9b43cb9ada34e55e10d28ee6273c555a5240e7
 EBUILD gnutls-2.2.5.ebuild 2025 RMD160 af9f9b2cec5ebd1b50a48eb9acae55014d01a464 SHA1 5450b5833019cb6bc809d1ab38dbc40651e8d9b4 SHA256 57732a9022e09682530e3e271b836852f0b9de06aa42fc2b0101df72a862091e
 EBUILD gnutls-2.4.1-r2.ebuild 2095 RMD160 0caf62aa4039dcbbba64daf99769650ef1bfa481 SHA1 3f01def8f034bb1911c2c88e6330b521641ba07a SHA256 482db7b88b4649fd2d21e6a350269ef32c961542c9bf7b86c9db001865a679b5
-EBUILD gnutls-2.6.0-r2.ebuild 2415 RMD160 6c9667ee7b5adca36c69c2950f42ad8ab8da2b20 SHA1 03b154fd85a474c0f2a2c4688878c67d39d6a786 SHA256 69649f1b19cf00c0b67461f921982b9f153524df32948a71b81d2949f1493c05
-EBUILD gnutls-2.6.2.ebuild 2134 RMD160 aeaa4d5e203bb00740fe87845a420c095c33e369 SHA1 47e467688fa76a9c99924670d4ba1d6abfffe791 SHA256 0f9afc7428a8ee45139685f6c768f02d81c753d4682cb415dec33c1263c7d5a8
-MISC ChangeLog 26317 RMD160 1c0916375afb7e0a8ab13303c9ffb1322e32b0b5 SHA1 4b4dd8233c049bfbe81456865da8bd91f133a58c SHA256 07276ee792369a1e206b6d2a5ce516a4a870da2723f543571dc2143533645fde
+EBUILD gnutls-2.6.0-r2.ebuild 2523 RMD160 3a0915c0216b10b1c186e636470691b1d41ef7e6 SHA1 d1d57a70a3d2aae262c4fb4fe47f30bcfeedc498 SHA256 dda6721362a7f8624e86038c8b75f230bb15b32642004c390b03d7795c3f25d0
+EBUILD gnutls-2.6.2.ebuild 2242 RMD160 760718158a42321cbf75513e77c42ee239c335f2 SHA1 5b85b8b60cb2ebff74bba7c0d89abde6d6a6eae8 SHA256 114cc7cf6903a666766efc64ba06d78daa91494f88f287c07a7d1e1cd6539e89
+EBUILD gnutls-2.6.3.ebuild 2324 RMD160 7e5a35c6dbd1ad985511d1c2d513dba2aa8bb64f SHA1 8bfc06d578622c27d00503e2b5d791fb83a211c1 SHA256 95d3ce73989950eae0d2619227b93fa1435ca06140febdf5cba344fe030ee275
+MISC ChangeLog 26689 RMD160 4046a685f0a40138f87804b11e4c854d6736d4df SHA1 51a15e91c1b159c088b7a13adebcf2abd382b839 SHA256 d0b1839d6804c65b94621f7c7fbf351db3564a34e88dd8b77b748145602a8898
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/net-libs/gnutls/files/gnutls-2.6.0-cxx-configure.in.patch b/net-libs/gnutls/files/gnutls-2.6.0-cxx-configure.in.patch
index 9fa448b974ef..8b884b7c6218 100644
--- a/net-libs/gnutls/files/gnutls-2.6.0-cxx-configure.in.patch
+++ b/net-libs/gnutls/files/gnutls-2.6.0-cxx-configure.in.patch
@@ -8,11 +8,13 @@
  AC_PROG_LN_S
  GTK_DOC_CHECK(1.1)
  AC_PATH_PROG([GAA], [gaa])
-@@ -114,6 +113,7 @@
+@@ -114,6 +113,9 @@
    AC_LANG_PUSH(C++)
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], use_cxx=yes, use_cxx=no)
    AC_LANG_POP(C++)
 +  AC_PROG_CXX
++else
++  AM_CONDITIONAL([am__fastdepCXX], [false])
  fi
  
  AC_MSG_CHECKING([whether C99 macros are supported])
diff --git a/net-libs/gnutls/gnutls-2.6.0-r2.ebuild b/net-libs/gnutls/gnutls-2.6.0-r2.ebuild
index d8d250359ecd..9f3c17190e70 100644
--- a/net-libs/gnutls/gnutls-2.6.0-r2.ebuild
+++ b/net-libs/gnutls/gnutls-2.6.0-r2.ebuild
@@ -1,6 +1,6 @@
-# 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/net-libs/gnutls/gnutls-2.6.0-r2.ebuild,v 1.1 2008/11/18 11:54:22 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.0-r2.ebuild,v 1.2 2009/01/05 07:44:37 dragonheart Exp $
 
 inherit eutils libtool autotools
 
@@ -52,7 +52,11 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	rm m4/lt* m4/libtool.m4 build-aux/ltmain.sh
+	for dir in gl/m4 m4 lib/gl/m4 lib/m4 libextra/gl/m4 libextra/m4 ; do
+		rm -f ${dir}/lt* ${dir}/libtool.m4
+	done
+	find . -name ltmain.sh -exec rm {} \;
+
 	epatch "${FILESDIR}"/${P}-cxx-configure.in.patch
 	eautoreconf
 	epatch "${FILESDIR}"/gnutls-2.2.5-CVE-2008-4989-V2.patch
diff --git a/net-libs/gnutls/gnutls-2.6.2.ebuild b/net-libs/gnutls/gnutls-2.6.2.ebuild
index 5275b90cb66b..4cabda1e3ffa 100644
--- a/net-libs/gnutls/gnutls-2.6.2.ebuild
+++ b/net-libs/gnutls/gnutls-2.6.2.ebuild
@@ -1,6 +1,6 @@
-# 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/net-libs/gnutls/gnutls-2.6.2.ebuild,v 1.2 2008/11/18 11:26:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.2.ebuild,v 1.3 2009/01/05 07:44:37 dragonheart Exp $
 
 EAPI="2"
 inherit eutils libtool autotools
@@ -47,7 +47,11 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	rm m4/lt* m4/libtool.m4 build-aux/ltmain.sh
+	for dir in gl/m4 m4 lib/gl/m4 lib/m4 libextra/gl/m4 libextra/m4 ; do
+		rm -f ${dir}/lt* ${dir}/libtool.m4
+	done
+	find . -name ltmain.sh -exec rm {} \;
+
 	epatch "${FILESDIR}"/gnutls-2.6.0-cxx-configure.in.patch
 	eautoreconf
 	elibtoolize # for sane .so versioning on FreeBSD
diff --git a/net-libs/gnutls/gnutls-2.6.3.ebuild b/net-libs/gnutls/gnutls-2.6.3.ebuild
new file mode 100644
index 000000000000..68e8f42843f4
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.6.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.3.ebuild,v 1.1 2009/01/05 07:44:37 dragonheart Exp $
+
+EAPI="2"
+inherit eutils libtool autotools
+
+DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+
+MINOR_VERSION="${PV#*.}"
+MINOR_VERSION="${MINOR_VERSION%.*}"
+if [[ $((MINOR_VERSION % 2)) == 0 ]] ; then
+	#SRC_URI="ftp://ftp.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+else
+	SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
+fi
+unset MINOR_VERSION
+
+# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
+LICENSE="LGPL-2.1 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="bindist +cxx doc guile lzo nls zlib"
+
+RDEPEND="dev-libs/libgpg-error
+	>=dev-libs/libgcrypt-1.4.0
+	>=dev-libs/libtasn1-0.3.4
+	nls? ( virtual/libintl )
+	guile? ( dev-scheme/guile[networking] )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use lzo && use bindist; then
+		ewarn "lzo support was disabled for binary distribution of gnutls"
+		ewarn "due to licensing issues. See Bug 202381 for details."
+		epause 5
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	for dir in gl/m4 m4 lib/gl/m4 lib/m4 libextra/gl/m4 libextra/m4 ; do
+		rm -f ${dir}/lt* ${dir}/libtool.m4
+	done
+	find . -name ltmain.sh -exec rm {} \;
+
+	# the below patch is in 2.7.* as per
+	# https://savannah.gnu.org/support/?106542
+	epatch "${FILESDIR}"/gnutls-2.6.0-cxx-configure.in.patch
+	eautoreconf
+	elibtoolize # for sane .so versioning on FreeBSD
+}
+
+src_configure() {
+	local myconf
+	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
+	econf  \
+		$(use_with zlib) \
+		$(use_enable nls) \
+		$(use_enable guile) \
+		$(use_enable cxx) \
+		$(use_enable doc gtk-doc) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO
+
+	if use doc ; then
+		dodoc doc/README.autoconf doc/tex/gnutls.ps
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}