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.

(Portage version: 2.2_rc20/cvs/Linux 2.6.26-gentoo-r4 x86_64)

5 files changed, 112 insertions, 9 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/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
+}