Version bump as per bug #61944. Old version cleanout too.

14 files changed, 41 insertions, 222 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 352e37c7b59e..7768126d71ab 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/gnutls
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.39 2004/12/29 03:17:17 ciaranm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.40 2005/01/05 20:38:23 dragonheart Exp $
+
+*gnutls-1.0.23 (06 Jan 2005)
+
+  06 Jan 2005; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  -files/gnutls-1.0.14-extra.h.patch, -gnutls-0.8.10.ebuild,
+  -gnutls-0.8.12.ebuild, -gnutls-1.0.14.ebuild, +gnutls-1.0.23.ebuild
+  -gnutls-1.0.4.ebuild:
+  Version bump as per bug #61944. Reported by Daniel Webert
+  <rockoo@rockoo.homelinux.org>. Ebuild by me. Old version cleanout
+  too.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 0ffaaa78d37c..1de92126d6c9 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,13 +1,8 @@
 MD5 f4e7fa97efb4222bd1b74226f7ac0640 ChangeLog 4923
-MD5 81412d7eaa9beecf365e5a3e44b00042 gnutls-0.8.12.ebuild 1280
-MD5 f77f13c1b8dded211ed9b623513bba16 gnutls-0.8.10.ebuild 1218
-MD5 6f4e63cb9fc92c548e798d4eadfc338c gnutls-1.0.17.ebuild 1844
-MD5 00bf3cd6a400fc63c44869f462fddb6c gnutls-1.0.14.ebuild 1900
-MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
+MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
 MD5 61563bcfef3b156e2b5b3ad2150c03b3 gnutls-1.0.4.ebuild 1369
-MD5 3e65b092ba91de3afba12ede1cbbb5a3 files/digest-gnutls-1.0.14 67
-MD5 cfa78b7df28ec06ca09763bd8c908ebc files/digest-gnutls-1.0.17 67
-MD5 ec1e68cbc333074c03943a0927d46c01 files/digest-gnutls-0.8.12 66
+MD5 6f4e63cb9fc92c548e798d4eadfc338c gnutls-1.0.17.ebuild 1844
+MD5 60d05b96a7b32ef83e9f726089973ec6 gnutls-1.0.23.ebuild 1629
 MD5 0f5a5be1e092fb96ea291fdf5699d05f files/digest-gnutls-1.0.4 65
-MD5 29d3e8994448eb3fe1d15c6720621b40 files/gnutls-1.0.14-extra.h.patch 479
-MD5 b2ae83a3180a66ab61bdf08669f27399 files/digest-gnutls-0.8.10 66
+MD5 cfa78b7df28ec06ca09763bd8c908ebc files/digest-gnutls-1.0.17 67
+MD5 e21500e19520a3980b3c08d655a6a9e0 files/digest-gnutls-1.0.23 66
diff --git a/net-libs/gnutls/files/digest-gnutls-0.8.10 b/net-libs/gnutls/files/digest-gnutls-0.8.10
deleted file mode 100644
index aa1afeb425a3..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-0.8.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 11130b920b1395d03e559beebf6b3c2b gnutls-0.8.10.tar.gz 1040032
diff --git a/net-libs/gnutls/files/digest-gnutls-0.8.12 b/net-libs/gnutls/files/digest-gnutls-0.8.12
deleted file mode 100644
index d87fd97c7bbc..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-0.8.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e03f5abefb95458bdeee7d7e6cbd80fb gnutls-0.8.12.tar.gz 1133976
diff --git a/net-libs/gnutls/files/digest-gnutls-1.0.14 b/net-libs/gnutls/files/digest-gnutls-1.0.14
deleted file mode 100644
index 5df8e677858c..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.0.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6bf79feb3425ad437c52c87463b70e53 gnutls-1.0.14.tar.bz2 1217095
diff --git a/net-libs/gnutls/files/digest-gnutls-1.0.23 b/net-libs/gnutls/files/digest-gnutls-1.0.23
new file mode 100644
index 000000000000..b1db79b70e12
--- /dev/null
+++ b/net-libs/gnutls/files/digest-gnutls-1.0.23
@@ -0,0 +1 @@
+MD5 949a2c86fec16216213a4582ef6a5d71 gnutls-1.0.23.tar.gz 1630814
diff --git a/net-libs/gnutls/files/digest-gnutls-1.0.4 b/net-libs/gnutls/files/digest-gnutls-1.0.4
deleted file mode 100644
index d9f2074059ea..000000000000
--- a/net-libs/gnutls/files/digest-gnutls-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e21c8d38f479adae2b8a2a7f14747f80 gnutls-1.0.4.tar.gz 1379419
diff --git a/net-libs/gnutls/files/gnutls-1.0.14-extra.h.patch b/net-libs/gnutls/files/gnutls-1.0.14-extra.h.patch
deleted file mode 100644
index ea041017cde2..000000000000
--- a/net-libs/gnutls/files/gnutls-1.0.14-extra.h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- includes/gnutls/extra.h	2004-03-25 04:43:49.000000000 -0500
-+++ includes/gnutls/extra.h.new	2004-07-24 00:31:11.716460832 -0400
-@@ -27,6 +27,10 @@
- 
- #define LIBGNUTLS_EXTRA_VERSION LIBGNUTLS_VERSION
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- /* SRP */
- 
- typedef struct DSTRUCT* gnutls_srp_server_credentials;
-@@ -119,5 +123,9 @@
- int gnutls_srp_base64_decode_alloc( const gnutls_datum *b64_data, 
-    gnutls_datum* result);
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- 
- #endif
diff --git a/net-libs/gnutls/gnutls-0.8.10.ebuild b/net-libs/gnutls/gnutls-0.8.10.ebuild
deleted file mode 100644
index bb1a91a1ad4a..000000000000
--- a/net-libs/gnutls/gnutls-0.8.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-0.8.10.ebuild,v 1.12 2004/06/24 23:11:19 agriffis Exp $
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/attic/${P}.tar.gz"
-
-IUSE="zlib doc crypt"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 alpha sparc hppa"
-
-DEPEND=">=dev-libs/libgcrypt-1.1.12
-	crypt? ( <app-crypt/opencdk-0.5.0 )
-	zlib? ( >=sys-libs/zlib-1.1 )"
-
-# gnutls has its own version of these. so let us use those instead.
-#	>=dev-libs/libtasn1-0.1
-#   >=dev-libs/lzo-1.0
-
-src_unpack() {
-	unpack ${A}
-	# allow for custom optimisation levels
-	cd ${S}; sed -i -e "s:\(CFLAGS.*\)-O2:\1:" configure
-}
-
-src_compile() {
-	econf  \
-		`use_with zlib` \
-		`use_enable crypt openpgp-authentication` \
-		--with-included-minilzo \
-		--with-included-libtasn1 || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodoc AUTHORS COPYING COPYING.LIB 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-0.8.12.ebuild b/net-libs/gnutls/gnutls-0.8.12.ebuild
deleted file mode 100644
index d26c830d47ef..000000000000
--- a/net-libs/gnutls/gnutls-0.8.12.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-0.8.12.ebuild,v 1.8 2004/06/24 23:11:19 agriffis Exp $
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/attic/${P}.tar.gz"
-
-IUSE="zlib doc crypt"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~alpha ~sparc ia64 amd64 ppc"
-
-DEPEND=">=dev-libs/libgcrypt-1.1.12
-	crypt? ( >=app-crypt/opencdk-0.5.1 )
-	zlib? ( >=sys-libs/zlib-1.1 )"
-
-# gnutls has its own version of these. so let us use those instead.
-#	>=dev-libs/libtasn1-0.1
-#   >=dev-libs/lzo-1.0
-
-src_unpack() {
-	unpack ${A}
-	# allow for custom optimisation levels
-	cd ${S}; sed -i -e "s:\(CFLAGS.*\)-O2:\1:" configure
-}
-
-src_compile() {
-	local myconf
-
-	use crypt || myconf="${myconf} --disable-openpgp-authentication"
-
-	econf  \
-		`use_with zlib` \
-		--with-included-minilzo \
-		--with-included-libtasn1 \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodoc AUTHORS COPYING COPYING.LIB 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-1.0.17.ebuild b/net-libs/gnutls/gnutls-1.0.17.ebuild
index 59a62d9d7d41..83f401138398 100644
--- a/net-libs/gnutls/gnutls-1.0.17.ebuild
+++ b/net-libs/gnutls/gnutls-1.0.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.17.ebuild,v 1.15 2004/12/23 13:39:10 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.17.ebuild,v 1.16 2005/01/05 20:38:23 dragonheart Exp $
 
 inherit eutils gnuconfig
 
diff --git a/net-libs/gnutls/gnutls-1.0.14.ebuild b/net-libs/gnutls/gnutls-1.0.23.ebuild
index caed8cf647e4..6cff964ccbba 100644
--- a/net-libs/gnutls/gnutls-1.0.14.ebuild
+++ b/net-libs/gnutls/gnutls-1.0.23.ebuild
@@ -1,31 +1,29 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.14.ebuild,v 1.6 2004/11/09 22:26:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.23.ebuild,v 1.1 2005/01/05 20:38:23 dragonheart Exp $
 
-inherit eutils
+inherit eutils gnuconfig
 
 DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.bz2"
+SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.gz"
 
 IUSE="zlib doc crypt"
-LICENSE="|| ( LGPL-2.1 GPL-2 )"
+LICENSE="LGPL-2.1 GPL-2"
 # GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~mips ~alpha ppc64"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~mips ~alpha"
+
+# Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
+# ~ppc64  ~ia64 ~hppa
 
 RDEPEND=">=dev-libs/libgcrypt-1.1.94
-	crypt? ( >=app-crypt/opencdk-0.5.3 )
+	crypt? ( >=app-crypt/opencdk-0.5.5 )
 	zlib? ( >=sys-libs/zlib-1.1 )
-	virtual/libc"
-
-# Need masking on ~amd64 ~sparc ~ppc ~mips ~alpha
-#	>=dev-libs/libtasn1-0.2
-#	>=dev-libs/lzo-1.0"
-
-# should be crypt? ( >=app-crypt/opencdk-0.5.5 ) however I did see the source for it
-# ^^ this is what configure expects.
+	virtual/libc
+	>=dev-libs/lzo-1.0
+	>=dev-libs/libtasn1-0.2.10"
 
 DEPEND="${RDEPEND}
 	sys-apps/gawk
@@ -38,22 +36,18 @@ DEPEND="${RDEPEND}
 #	libtasn1
 #	opencdk
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}/includes/gnutls; epatch ${FILESDIR}/${PN}-1.0.14-extra.h.patch
-}
-
 src_compile() {
-	#   I think this vvv gets ignored if not present
-	local myconf="--without-included-libtasn1 --without-included-opencdk"
-
+	# Needed for mips and probably others
+	gnuconfig_update
 
+	local myconf=""
 	use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
 
 	econf  \
 		`use_with zlib` \
-		--with-included-minilzo \
-		--with-included-libtasn1 \
+		--without-included-minilzo \
+		--without-included-libtasn1 \
+		 --without-included-opencdk \
 		${myconf} || die
 	emake || die
 }
diff --git a/net-libs/gnutls/gnutls-1.0.4.ebuild b/net-libs/gnutls/gnutls-1.0.4.ebuild
deleted file mode 100644
index 4656ad16fe27..000000000000
--- a/net-libs/gnutls/gnutls-1.0.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-1.0.4.ebuild,v 1.11 2004/07/29 18:35:00 geoman Exp $
-
-DESCRIPTION="A TLS 1.0 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/${P}.tar.gz"
-
-IUSE="zlib doc crypt"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 amd64 ~sparc ~ppc mips ~alpha"
-
-DEPEND=">=dev-libs/libgcrypt-1.1.90
-	crypt? ( >=app-crypt/opencdk-0.5.3 )
-	zlib? ( >=sys-libs/zlib-1.1 )"
-
-# gnutls has its own version of these. so let us use those instead.
-#	>=dev-libs/libtasn1-0.2
-#   >=dev-libs/lzo-1.0
-
-src_unpack() {
-	unpack ${A}
-	# allow for custom optimisation levels
-	cd ${S}; sed -i -e "s:\(CFLAGS.*\)-O2:\1:" configure
-}
-
-src_compile() {
-	local myconf
-
-	use crypt || myconf="${myconf} --disable-openpgp-authentication"
-
-	econf  \
-		`use_with zlib` \
-		--with-included-minilzo \
-		--with-included-libtasn1 \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	# make compatibility symlinks - 0.8.x
-	dosym /usr/lib/libgnutls.so.10 /usr/lib/libgnutls.so.7
-
-	dodoc AUTHORS COPYING COPYING.LIB 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/metadata.xml b/net-libs/gnutls/metadata.xml
index 76b9f6f406d5..7d6d787403ff 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>crypto</herd>
+<maintainer><email>crypto@gentoo.org</email></maintainer>
 <maintainer><email>liquidx@gentoo.org</email></maintainer>
 </pkgmetadata>