re-added files so arm and mips still work

(Portage version: 2.0.51.20-r5)

5 files changed, 128 insertions, 11 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 1d3bf0be4183..c1fc53a48908 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.65 2005/05/01 04:13:01 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.66 2005/05/01 14:38:51 dragonheart Exp $
+
+*gnutls-1.0.17 (01 May 2005)
+
+  01 May 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/gnutls-1.0.17-extra.h.patch, +gnutls-1.0.17.ebuild:
+  re-added files so arm and mips still work
 
   01 May 2005; Daniel Black <dragonheart@gentoo.org>
   -files/gnutls-1.0.14-extra.h.patch, -files/gnutls-1.1.23-extra.h.patch,
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 1dd923ec7f98..53f79da4ba30 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 70c9f135ad6ecb5e7c744ef6add87635 ChangeLog 9406
+MD5 2f8bf292135bde9a0f6ed367063ba7f6 gnutls-1.0.17.ebuild 2446
 MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
 MD5 b6426179fa836937aebbaf0525459536 gnutls-1.0.25.ebuild 2217
 MD5 ed5936b60bf83992a3dce18dcee1659f gnutls-1.2.3.ebuild 2314
+MD5 29d3e8994448eb3fe1d15c6720621b40 files/gnutls-1.0.17-extra.h.patch 479
+MD5 cfa78b7df28ec06ca09763bd8c908ebc files/digest-gnutls-1.0.17 67
 MD5 ee48c699bf5727fa6284864dc62d1c14 files/digest-gnutls-1.0.25 66
 MD5 5deb0ddb33596df840a663273ddf9c2b files/digest-gnutls-1.2.3 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCdFdYmdTrptrqvGERAuxgAKCRfnQIWhoNG97i+ILHH5syNLWuuQCgkG50
-gRzOvwTTtZDE4/gDcYYpZ28=
-=M6yw
------END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/digest-gnutls-1.0.17 b/net-libs/gnutls/files/digest-gnutls-1.0.17
new file mode 100644
index 000000000000..9eab78f55b64
--- /dev/null
+++ b/net-libs/gnutls/files/digest-gnutls-1.0.17
@@ -0,0 +1 @@
+MD5 0c2bf9257cd8651e7c1abbdb0601e8c1 gnutls-1.0.17.tar.bz2 1232606
diff --git a/net-libs/gnutls/files/gnutls-1.0.17-extra.h.patch b/net-libs/gnutls/files/gnutls-1.0.17-extra.h.patch
new file mode 100644
index 000000000000..ea041017cde2
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-1.0.17-extra.h.patch
@@ -0,0 +1,23 @@
+--- 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-1.0.17.ebuild b/net-libs/gnutls/gnutls-1.0.17.ebuild
new file mode 100644
index 000000000000..a73d6aa0dd25
--- /dev/null
+++ b/net-libs/gnutls/gnutls-1.0.17.ebuild
@@ -0,0 +1,94 @@
+# 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.20 2005/05/01 14:38:51 dragonheart Exp $
+
+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"
+
+# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
+LICENSE="|| ( LGPL-2.1 GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="zlib doc crypt"
+
+RDEPEND=">=dev-libs/libgcrypt-1.1.94
+	crypt? ( >=app-crypt/opencdk-0.5.5 )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	virtual/libc
+	dev-libs/libgpg-error"
+
+# Need masking on ~amd64 ~sparc ~ppc ~mips ~alpha
+#	>=dev-libs/libtasn1-0.2
+#	>=dev-libs/lzo-1.0"
+
+DEPEND="${RDEPEND}
+	sys-apps/gawk
+	sys-apps/grep
+	sys-devel/gcc
+	sys-devel/libtool"
+
+
+# gnutls has its own version of these. should maybe avoid using.
+#	libtasn1
+#	opencdk
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/includes/gnutls; epatch ${FILESDIR}/${P}-extra.h.patch
+}
+
+src_compile() {
+	# Needed for mips and probablly others
+	gnuconfig_update
+
+	#   I think this vvv gets ignored if not present
+	local myconf="--without-included-libtasn1 --without-included-opencdk"
+
+
+	use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
+
+	econf  \
+		`use_with zlib` \
+		--with-included-lzo \
+		--with-included-libtasn1 \
+		${myconf} || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR=${D} install || 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
+}
+
+pkg_postinst() {
+	ewarn "An API has changed in gnutls. This is why the library has gone from "
+	ewarn "libgnutls.so.10 to libgnutls.so.11."
+	ewarn
+	ewarn "What is required is a revdep-rebuild."
+	ewarn "To show you what is needed to rebuild"
+	ewarn "revdep-rebuild --soname libgnutls.so.10 -- -p"
+	ewarn ""
+	ewarn "Then do:"
+	ewarn "revdep-rebuild --soname libgnutls.so.10"
+	einfo ""
+	einfo "Afterward just try:"
+	einfo "revdep-rebuild -- -p"
+	einfo "to see if there are any other packages broken."
+	einfo "To rebuild these:"
+	einfo "revdep-rebuild"
+
+}