version bump + old version cleanout

(Portage version: 2.1.4.4)

3 files changed, 11 insertions, 79 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 1607cc388d97..2647ce99a9ec 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.154 2008/05/21 16:17:21 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.155 2008/06/01 05:11:12 dragonheart Exp $
+
+*gnutls-2.3.11 (01 Jun 2008)
+
+  01 Jun 2008; Daniel Black <dragonheart@gentoo.org> -gnutls-2.2.2.ebuild,
+  -gnutls-2.2.3.ebuild, +gnutls-2.3.11.ebuild:
+  version bump _ old version cleanout
 
   21 May 2008; Tobias Scherbaum <dertobi123@gentoo.org> gnutls-2.2.5.ebuild:
   ppc stable, bug #222823
diff --git a/net-libs/gnutls/gnutls-2.2.2.ebuild b/net-libs/gnutls/gnutls-2.2.2.ebuild
deleted file mode 100644
index f238b0fcf627..000000000000
--- a/net-libs/gnutls/gnutls-2.2.2.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.2.ebuild,v 1.6 2008/03/26 13:05:42 jer Exp $
-
-inherit libtool autotools 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"
-
-# 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="--disable-lzo" || myconf="$(use_enable lzo)"
-	econf  \
-		--without-included-opencdk \
-		$(use_with zlib) \
-		$(use_with lzo) \
-		$(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.2.3.ebuild b/net-libs/gnutls/gnutls-2.3.11.ebuild
index b38305d7d5d8..362b1222a74d 100644
--- a/net-libs/gnutls/gnutls-2.2.3.ebuild
+++ b/net-libs/gnutls/gnutls-2.3.11.ebuild
@@ -1,12 +1,13 @@
 # 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.3.ebuild,v 1.1 2008/05/06 17:27:20 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.3.11.ebuild,v 1.1 2008/06/01 05:11:12 dragonheart Exp $
 
 inherit libtool autotools 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="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"
@@ -48,11 +49,10 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	use bindist && myconf="--disable-lzo" || myconf="$(use_enable lzo)"
+	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
 	econf  \
 		--without-included-opencdk \
 		$(use_with zlib) \
-		$(use_with lzo) \
 		$(use_enable nls) \
 		$(use_enable guile) \
 		$(use_enable doc gtk-doc) \