5 files changed, 21 insertions, 126 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index beba88af2709..622cc4c1fa0a 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
 # 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.321 2011/11/12 23:20:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.322 2011/11/26 01:18:31 radhermit Exp $
+
+  26 Nov 2011; Tim Harder <radhermit@gentoo.org> gnutls-2.12.14.ebuild,
+  -gnutls-3.0.7.ebuild, gnutls-3.0.8.ebuild:
+  Remove old and build in the source tree.
 
 *gnutls-3.0.8 (12 Nov 2011)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 1e1e06b92f89..4cf8c941ab4b 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -3,22 +3,20 @@ Hash: SHA512
 
 DIST gnutls-2.10.5.tar.bz2 7287913 RMD160 4bc886ced90742a488e00c1884e6124b37047382 SHA1 4530657082a0e754356de89a5529d1ad7a18e777 SHA256 c086d5426ef04427038db6af1a4dc62ff32694e91e759ebf9bb3380243ebd9c9
 DIST gnutls-2.12.14.tar.bz2 7166618 RMD160 855c89c46898e7b934a8f6b7466d3089031c9f9a SHA1 e5680f78ee51ff9ebb9749b39504d3e981a19242 SHA256 5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3
-DIST gnutls-3.0.7.tar.xz 4292724 RMD160 fde59594f617c18d32eaa15bbac9e7e45dd8fd2d SHA1 b99aed5cb48e1c156a2e2c6b2becb6c049c299af SHA256 32c744274a8cb01887cdd5e72717b77fd3d31b3337c94c7b138fc16edac7b7c0
 DIST gnutls-3.0.8.tar.xz 4257072 RMD160 b8ae537d21701954cbdd9baf76c14b465766b48d SHA1 b62457ff7422034b6f2974633e78c81fca5a8213 SHA256 ba4e194be89035b468e5db18e0582de42c9876f6cf91d56699de0986aa3c9761
 EBUILD gnutls-2.10.5.ebuild 2837 RMD160 08f973e7eab9f993a3be578f84455f623df06969 SHA1 00d1384fcb7b2f720a23decdb5c2563be3680da3 SHA256 62595d10eff18850b36d623cb66cbcdccc6d5e01ae71b5d06fd5898e165f139e
-EBUILD gnutls-2.12.14.ebuild 3135 RMD160 88251de44cf0c853bc6a7481ad4576f330cf3642 SHA1 216750229e71d5b19cb8103f68a512c6c83dee36 SHA256 b40701f16f92520f26c92e7465d06b51387b59102f010ef8c49efe566a81dd3a
-EBUILD gnutls-3.0.7.ebuild 2686 RMD160 9d07e833183c94d2975564a94645a70cf9a0db97 SHA1 b4920173cb4be3eaab0100c0dbc722b5546d3197 SHA256 5d45c2d5fba853a4532e45d6da2c2b86f1502e9c3003bc76c1636660ac73afe6
-EBUILD gnutls-3.0.8.ebuild 2686 RMD160 b4a87dfcef6f1b29de2d2e5f6d898ba240cf474d SHA1 445b945b9997b2b095806c1c12478688bac38eb6 SHA256 8898056850479b494984633c47b31f34f8c51e4ca87760e8e210ac52af495505
-MISC ChangeLog 48356 RMD160 298e3079d1085a0fb2a61cb66d90591d9e1c24ac SHA1 740d62fa9c961096f39b16029f9a4f5be89dd46d SHA256 8223e77ad9a7a4a19287afded94bd02b81a9d2c6220908a8844d631ca5b0eadb
+EBUILD gnutls-2.12.14.ebuild 3164 RMD160 6c586f32b308d4ceac829eff9e79b5195dcce518 SHA1 dfa7add330abfffabe4f698e5b7ff265de635429 SHA256 e6674262ba9226245fa6271ecb4d2ca6947cb6122dd0193aba487a1c62abc97c
+EBUILD gnutls-3.0.8.ebuild 2715 RMD160 0039ae8d05e4f79bc9a22a26744e880e426578bd SHA1 6e046c9638ff3fdc1a58dd887f6167d3d42e0a57 SHA256 ca1729ea11ad6ab22f2e23b4d5e1c7f01aa56836b1775ea2a8bb05b9d80219de
+MISC ChangeLog 48517 RMD160 153fb73f40c908220d5d75f398ab10d12cfb584f SHA1 8f003f315b8ac7cfd24286877fc715d2c76e99cf SHA256 2aa9d77c0915aa56113aa19b590b81a20b5d50749f7f18e782774c8faef21323
 MISC metadata.xml 340 RMD160 e973767590edb923f2828ef545293617b4b19554 SHA1 e42964b82af04a3d6de8307186a33d18a12af326 SHA256 a2bf9aefe44513df9e611a974c08d7f26b987c0c48c134a0d6f5177ca6a8676d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOvv8tAAoJEEqz6FtPBkyjgFUIAIrxIPtgKhnRyjJ4CJj5SO6+
-wjBWMftRn9mRkUI2mu3BE3lOp6NM/RX4LIrMXm27je9gjA6GJjfZKeQwEEp6Dfye
-hmjAe3iYZQvCJGoOCG96X1zDXBbIQyrc9Fqdc44BCrc7qpUzHkaI+dH/jaVt+Q0Q
-aS7DBePguhnV8d+pub3Wv+o12/kCJxzBtS7glFEnKdTvfycWRCa+VyMZ4oE9a43h
-UlXUowhPkfuRHIlKs26pN1h8P0AEucDmf4tuyd/gISI3OfjxsttnatWhEowT4BqS
-R9nxl2rPYkNEsdORaMA5h62QXnvDzekIFGNs9gEy6/2H083wXFlD5mgZ3IjGpqw=
-=Mbew
+iQEcBAEBCgAGBQJO0D5tAAoJEEqz6FtPBkyjCCoH+gOaKTB66MVuojU6ARCdcLji
+3Z2sdEVx6VakikqbAb5rw6hmbl6hZKN8tbpTWBpJUIPbXHHEMtwgI5A3fAaMbTDd
+ibdIPCbFeaaR5zXvZRi1s0qfIcNKWTWAt7fEd74Vw0EMCu+JdSbDnlwbTpFI/asg
+Y9G+wa8pKHjZAGv8S3Xg+hGaqMjv/rwbkjnJ/5MojXJ+ZOZ0eCH8M9i1pmll0DJ1
+iOWVV2L6Mui3Gptogkuh8edMkgHiMhr70ABLGr+oDRWMGvffSV5aJHd6Yn90o92E
+Z0EuUxb4YTRcrHHbA2oUcplRDCzgiOldO74B90IU/1RHE6AsdTfvP/mMAyWvF0k=
+=XtZV
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-2.12.14.ebuild b/net-libs/gnutls/gnutls-2.12.14.ebuild
index 7ccf57020715..158eadef80b7 100644
--- a/net-libs/gnutls/gnutls-2.12.14.ebuild
+++ b/net-libs/gnutls/gnutls-2.12.14.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-2.12.14.ebuild,v 1.1 2011/11/08 22:43:31 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.14.ebuild,v 1.2 2011/11/26 01:18:31 radhermit Exp $
 
 EAPI=4
 
@@ -45,6 +45,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P%_pre*}"
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
 
 pkg_setup() {
diff --git a/net-libs/gnutls/gnutls-3.0.7.ebuild b/net-libs/gnutls/gnutls-3.0.7.ebuild
deleted file mode 100644
index dd543ea62bf3..000000000000
--- a/net-libs/gnutls/gnutls-3.0.7.ebuild
+++ /dev/null
@@ -1,111 +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-3.0.7.ebuild,v 1.1 2011/11/08 22:43:31 radhermit Exp $
-
-EAPI=4
-
-inherit autotools-utils 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.xz"
-	else
-		SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
-	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="+cxx doc examples guile nls pkcs11 static-libs test zlib"
-
-RDEPEND=">=dev-libs/libtasn1-0.3.4
-	>=dev-libs/nettle-2.2[gmp]
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( app-crypt/p11-kit )
-	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
-
-S="${WORKDIR}/${P%_pre*}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-src_prepare() {
-	local dir
-
-	# tests/suite directory is not distributed.
-	sed -i \
-		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
-		configure.ac || die
-
-	sed -i \
-		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
-		doc/Makefile.am || die
-
-	for dir in m4 gl/m4; do
-		rm -f "${dir}/lt"* "${dir}/libtool.m4"
-	done
-	find . -name ltmain.sh -exec rm {} \;
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	local myconf
-	[[ ${VALGRIND_TESTS} != 1 ]] && myconf+=" --disable-valgrind-tests"
-
-	econf \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		$(use_enable static-libs static) \
-		$(use_enable cxx) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-pdf) \
-		$(use_enable guile) \
-		$(use_enable nls) \
-		$(use_with pkcs11 p11-kit) \
-		$(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() {
-	default
-
-	remove_libtool_files all
-
-	if use doc; then
-		dodoc doc/gnutls.{pdf,ps}
-		dohtml doc/gnutls.html
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.0.8.ebuild b/net-libs/gnutls/gnutls-3.0.8.ebuild
index 8eb87863578c..66ef52ffd7b4 100644
--- a/net-libs/gnutls/gnutls-3.0.8.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.8.ebuild,v 1.1 2011/11/12 23:20:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.0.8.ebuild,v 1.2 2011/11/26 01:18:31 radhermit Exp $
 
 EAPI=4
 
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P%_pre*}"
 
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
 DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
 
 src_prepare() {