Version bump. Remove older versions.

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

8 files changed, 20 insertions, 364 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index b8de6baea61d..fa3200105c96 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.185 2009/04/11 14:08:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.186 2009/04/12 18:07:52 arfrever Exp $
+
+*gnutls-2.6.5 (12 Apr 2009)
+
+  12 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/gnutls-2.2.5-CVE-2008-4989-V2.patch,
+  -files/gnutls-2.3.11+gcc-4.3.patch, -gnutls-2.2.5.ebuild,
+  -gnutls-2.4.1-r2.ebuild, -gnutls-2.6.0-r2.ebuild, -gnutls-2.6.3.ebuild,
+  +gnutls-2.6.5.ebuild, -gnutls-2.7.4.ebuild:
+  Version bump. Remove older versions.
 
   11 Apr 2009; Raúl Porcel <armin76@gentoo.org> gnutls-2.6.4.ebuild:
   arm/ia64/m68k/s390/sh/sparc stable wrt #264392
diff --git a/net-libs/gnutls/files/gnutls-2.2.5-CVE-2008-4989-V2.patch b/net-libs/gnutls/files/gnutls-2.2.5-CVE-2008-4989-V2.patch
deleted file mode 100644
index 154f1ba79ff3..000000000000
--- a/net-libs/gnutls/files/gnutls-2.2.5-CVE-2008-4989-V2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnutls-2.4.1/lib/x509/verify.c.orig	2008-07-01 06:45:51.000000000 +1000
-+++ gnutls-2.4.1/lib/x509/verify.c	2008-11-07 16:48:08.000000000 +1100
-@@ -414,17 +425,6 @@
-     }
- #endif
- 
--  /* Check if the last certificate in the path is self signed.
--   * In that case ignore it (a certificate is trusted only if it
--   * leads to a trusted party by us, not the server's).
--   */
--  if (gnutls_x509_crt_check_issuer (certificate_list[clist_size - 1],
--				    certificate_list[clist_size - 1]) > 0
--      && clist_size > 0)
--    {
--      clist_size--;
--    }
--
-   /* Verify the certificate path (chain) 
-    */
-   for (i = clist_size - 1; i > 0; i--)
diff --git a/net-libs/gnutls/files/gnutls-2.3.11+gcc-4.3.patch b/net-libs/gnutls/files/gnutls-2.3.11+gcc-4.3.patch
deleted file mode 100644
index b5fbfb6f365e..000000000000
--- a/net-libs/gnutls/files/gnutls-2.3.11+gcc-4.3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gnutls-2.3.11/doc/examples/ex-cxx.cpp
-===================================================================
---- gnutls-2.3.11.orig/doc/examples/ex-cxx.cpp
-+++ gnutls-2.3.11/doc/examples/ex-cxx.cpp
-@@ -4,6 +4,7 @@
- #endif
- #include <iostream>
- #include <stdexcept>
-+#include <cstring>
- #include <gnutls/gnutls.h>
- #include <gnutls/gnutlsxx.h>
- 
diff --git a/net-libs/gnutls/gnutls-2.2.5.ebuild b/net-libs/gnutls/gnutls-2.2.5.ebuild
deleted file mode 100644
index e08f83e8d049..000000000000
--- a/net-libs/gnutls/gnutls-2.2.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.2.5.ebuild,v 1.9 2008/11/04 03:40:02 vapier Exp $
-
-inherit libtool eutils
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-#SRC_URI="http://josefsson.org/gnutls/releases/${P}.tar.bz2"
-SRC_URI="mirror://gnu/gnutls/${P}.tar.bz2"
-
-# 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="zlib lzo doc nls guile bindist"
-
-RDEPEND="dev-libs/libgpg-error
-	>=dev-libs/libgcrypt-1.2.4
-	>=dev-libs/libtasn1-0.3.4
-	>=app-crypt/opencdk-0.6.4
-	nls? ( virtual/libintl )
-	guile? ( dev-scheme/guile )
-	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 guile && ! built_with_use dev-scheme/guile networking; then
-		eerror "You are trying to compile ${PN} package with USE=\"guile\""
-		eerror "while dev-scheme/guile does not have USE=\"networking\""
-		die
-	fi
-	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}"
-	elibtoolize # for sane .so versioning on FreeBSD
-}
-
-src_compile() {
-	local myconf
-	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-	econf  \
-		--without-included-opencdk \
-		$(use_with zlib) \
-		$(use_enable nls) \
-		$(use_enable guile) \
-		$(use_enable doc gtk-doc) \
-		${myconf}
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	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
-}
diff --git a/net-libs/gnutls/gnutls-2.4.1-r2.ebuild b/net-libs/gnutls/gnutls-2.4.1-r2.ebuild
deleted file mode 100644
index e0597c379f0f..000000000000
--- a/net-libs/gnutls/gnutls-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.4.1-r2.ebuild,v 1.2 2008/11/18 11:56:26 dragonheart Exp $
-
-inherit libtool eutils
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="http://www.gnu.org/software/gnutls/releases/${P}.tar.bz2"
-#SRC_URI="mirror://gnu/gnutls/${P}.tar.bz2"
-
-# 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="zlib lzo doc nls guile bindist"
-
-RDEPEND="dev-libs/libgpg-error
-	>=dev-libs/libgcrypt-1.2.4
-	>=dev-libs/libtasn1-0.3.4
-	nls? ( virtual/libintl )
-	guile? ( dev-scheme/guile )
-	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 guile && ! built_with_use dev-scheme/guile networking; then
-		eerror "You are trying to compile ${PN} package with USE=\"guile\""
-		eerror "while dev-scheme/guile does not have USE=\"networking\""
-		die
-	fi
-	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}"
-
-	epatch "${FILESDIR}"/${PN}-2.3.11+gcc-4.3.patch
-	epatch "${FILESDIR}"/gnutls-2.2.5-CVE-2008-4989-V2.patch
-
-	elibtoolize # for sane .so versioning on FreeBSD
-}
-
-src_compile() {
-	local myconf
-	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-	econf  \
-		$(use_with zlib) \
-		$(use_enable nls) \
-		$(use_enable guile) \
-		$(use_enable doc gtk-doc) \
-		${myconf}
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	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
-}
diff --git a/net-libs/gnutls/gnutls-2.6.0-r2.ebuild b/net-libs/gnutls/gnutls-2.6.0-r2.ebuild
deleted file mode 100644
index f0438e28bfc2..000000000000
--- a/net-libs/gnutls/gnutls-2.6.0-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.3 2009/01/10 01:33:11 dragonheart Exp $
-
-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"
-EAPI=1
-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 )
-	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 guile && ! built_with_use dev-scheme/guile networking; then
-		eerror "You are trying to compile ${PN} package with USE=\"guile\""
-		eerror "while dev-scheme/guile does not have USE=\"networking\""
-		die
-	fi
-	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 {} \;
-
-	epatch "${FILESDIR}"/${P}-cxx-configure.in.patch
-	epatch "${FILESDIR}"/${P}-openpgp-selftest.patch
-	eautoreconf
-	epatch "${FILESDIR}"/gnutls-2.2.5-CVE-2008-4989-V2.patch
-	elibtoolize # for sane .so versioning on FreeBSD
-}
-
-src_compile() {
-	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}
-	emake || die "emake failed"
-}
-
-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
-}
diff --git a/net-libs/gnutls/gnutls-2.6.3.ebuild b/net-libs/gnutls/gnutls-2.6.5.ebuild
index 4e774b04e297..e8fb96912301 100644
--- a/net-libs/gnutls/gnutls-2.6.3.ebuild
+++ b/net-libs/gnutls/gnutls-2.6.5.ebuild
@@ -1,9 +1,9 @@
 # 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.2 2009/01/10 01:33:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.5.ebuild,v 1.1 2009/04/12 18:07:52 arfrever Exp $
 
 EAPI="2"
-inherit eutils libtool autotools
+inherit autotools eutils libtool
 
 DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
@@ -44,10 +44,9 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	for dir in gl/m4 m4 lib/gl/m4 lib/m4 libextra/gl/m4 libextra/m4 ; do
+src_prepare() {
+	local dir
+	for dir in m4 lib/m4 libextra/m4 ; do
 		rm -f ${dir}/lt* ${dir}/libtool.m4
 	done
 	find . -name ltmain.sh -exec rm {} \;
@@ -56,7 +55,9 @@ src_unpack() {
 	# https://savannah.gnu.org/support/?106542
 	epatch "${FILESDIR}"/gnutls-2.6.0-cxx-configure.in.patch
 	epatch "${FILESDIR}"/gnutls-2.6.0-openpgp-selftest.patch
+
 	eautoreconf
+
 	elibtoolize # for sane .so versioning on FreeBSD
 }
 
@@ -64,11 +65,11 @@ 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) \
+		$(use_enable guile) \
+		$(use_enable nls) \
+		$(use_with zlib) \
 		${myconf}
 }
 
diff --git a/net-libs/gnutls/gnutls-2.7.4.ebuild b/net-libs/gnutls/gnutls-2.7.4.ebuild
deleted file mode 100644
index 5c96c2cb686e..000000000000
--- a/net-libs/gnutls/gnutls-2.7.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.7.4.ebuild,v 1.1 2009/01/10 22:45:35 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
-	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
-}