Version bump and remove old.

(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)

3 files changed, 9 insertions, 117 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 3249e99e0ee5..beba88af2709 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.320 2011/11/08 22:43:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.321 2011/11/12 23:20:03 radhermit Exp $
+
+*gnutls-3.0.8 (12 Nov 2011)
+
+  12 Nov 2011; Tim Harder <radhermit@gentoo.org> -gnutls-2.12.12.ebuild,
+  -gnutls-3.0.5.ebuild, +gnutls-3.0.8.ebuild:
+  Version bump and remove old.
 
 *gnutls-3.0.7 (08 Nov 2011)
 *gnutls-2.12.14 (08 Nov 2011)
diff --git a/net-libs/gnutls/gnutls-2.12.12.ebuild b/net-libs/gnutls/gnutls-2.12.12.ebuild
deleted file mode 100644
index d02d1fe09040..000000000000
--- a/net-libs/gnutls/gnutls-2.12.12.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.12.ebuild,v 1.2 2011/11/05 19:28:49 hwoarang Exp $
-
-EAPI="3"
-
-inherit autotools libtool
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-
-if [[ "${PV}" == *pre* ]]; then
-	SRC_URI="http://daily.josefsson.org/${P%.*}/${P%.*}-${PV#*pre}.tar.gz"
-else
-	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
-fi
-
-# LGPL-2.1 for libgnutls library and GPL-3 for libgnutls-extra library.
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib"
-
-RDEPEND="app-crypt/p11-kit
-	>=dev-libs/libtasn1-0.3.4
-	nls? ( virtual/libintl )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nettle? ( >=dev-libs/nettle-2.1[gmp] )
-	!nettle? ( >=dev-libs/libgcrypt-1.4.0 )
-	zlib? ( >=sys-libs/zlib-1.2.3.1 )
-	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-pkg_setup() {
-	if use lzo && use bindist; then
-		ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
-	fi
-}
-
-src_prepare() {
-	# tests/suite directory is not distributed.
-	sed -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' -i configure.ac
-
-	sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
-
-	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 {} \;
-	for dir in . lib libextra; do
-		pushd "${dir}" > /dev/null
-		eautoreconf
-		popd > /dev/null
-	done
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	local myconf
-	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-	[[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
-
-	econf --htmldir=/usr/share/doc/${P}/html \
-		$(use_enable cxx) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable guile) \
-		$(use_with !nettle libgcrypt) \
-		$(use_enable nls) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_test() {
-	if has_version dev-util/valgrind && [[ "${VALGRIND_TESTS}" != "1" ]]; then
-		elog
-		elog "You can set VALGRIND_TESTS=\"1\" to enable Valgrind tests."
-		elog
-	fi
-
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
-
-	if use doc; then
-		dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
-		dohtml doc/gnutls.html || die "dohtml failed"
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c || die "dodoc failed"
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.0.5.ebuild b/net-libs/gnutls/gnutls-3.0.8.ebuild
index f0bf1af82d59..8eb87863578c 100644
--- a/net-libs/gnutls/gnutls-3.0.5.ebuild
+++ b/net-libs/gnutls/gnutls-3.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.0.5.ebuild,v 1.2 2011/11/05 19:28:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.0.8.ebuild,v 1.1 2011/11/12 23:20:03 radhermit Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ fi
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="+cxx doc examples guile +nettle nls pkcs11 static-libs test zlib"
+IUSE="+cxx doc examples guile nls pkcs11 static-libs test zlib"
 
 RDEPEND=">=dev-libs/libtasn1-0.3.4
 	>=dev-libs/nettle-2.2[gmp]