Fix building with gcc4.

(Portage version: 2.0.51.21)

5 files changed, 128 insertions, 13 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index c1fc53a48908..9c2f67aabb5f 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.66 2005/05/01 14:38:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.67 2005/05/04 09:01:22 azarah Exp $
+
+*gnutls-1.2.3-r1 (04 May 2005)
+
+  04 May 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/gnutls-1.2.3-gcc4.patch, +gnutls-1.2.3-r1.ebuild:
+  Fix building with gcc4.
 
 *gnutls-1.0.17 (01 May 2005)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 0ebbc2ae9674..8852f54ca58f 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 932efab9330c40ac21310f28c2cc1464 gnutls-1.2.3-r1.ebuild 2418
 MD5 bac8d7576ec18e90f80905ac6c2b44dc ChangeLog 9595
-MD5 08081d2e15793082b967a6f59be65f4f gnutls-1.0.17.ebuild 2420
 MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
+MD5 08081d2e15793082b967a6f59be65f4f gnutls-1.0.17.ebuild 2420
 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 29d8c263065fa5908f9b6d9e5ea265b7 files/gnutls-1.2.3-gcc4.patch 417
+MD5 5deb0ddb33596df840a663273ddf9c2b files/digest-gnutls-1.2.3-r1 66
 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)
-
-iD8DBQFCdOoOmdTrptrqvGERAowcAKCMONipbURedqe2pokWBARxruYxGQCghYr7
-RWyqPFEQHJRr3rvq8W3Y4/0=
-=VJtd
------END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/digest-gnutls-1.2.3-r1 b/net-libs/gnutls/files/digest-gnutls-1.2.3-r1
new file mode 100644
index 000000000000..5a5d15d2859e
--- /dev/null
+++ b/net-libs/gnutls/files/digest-gnutls-1.2.3-r1
@@ -0,0 +1 @@
+MD5 4986c2bf8ce533d6b5d4dd6f9f1bbdf1 gnutls-1.2.3.tar.bz2 2446437
diff --git a/net-libs/gnutls/files/gnutls-1.2.3-gcc4.patch b/net-libs/gnutls/files/gnutls-1.2.3-gcc4.patch
new file mode 100644
index 000000000000..018415c0a67a
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-1.2.3-gcc4.patch
@@ -0,0 +1,15 @@
+--- gnutls-1.2.3/libextra/openpgp/openpgp.h.orig	2005-04-30 13:18:13.000000000 +0200
++++ gnutls-1.2.3/libextra/openpgp/openpgp.h	2005-04-30 13:18:29.000000000 +0200
+@@ -92,10 +92,12 @@
+ 
+ #else				/* no opencdk */
+ 
++/*
+ typedef void *gnutls_openpgp_key_t;
+ typedef void *gnutls_openpgp_privkey_t;
+ typedef void *gnutls_openpgp_keyring_t;
+ typedef void *gnutls_openpgp_trustdb_t;
++*/
+ 
+ #endif /* ENABLE_OPENPGP */
+ 
diff --git a/net-libs/gnutls/gnutls-1.2.3-r1.ebuild b/net-libs/gnutls/gnutls-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..39fa9b4dbb3c
--- /dev/null
+++ b/net-libs/gnutls/gnutls-1.2.3-r1.ebuild
@@ -0,0 +1,101 @@
+# 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.2.3-r1.ebuild,v 1.1 2005/05/04 09:01:22 azarah 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"
+
+IUSE="zlib doc crypt"
+
+LICENSE="LGPL-2.1 GPL-2"
+# GPL-2 for the gnutls-extras library and LGPL for the gnutls library.
+
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~mips ~alpha ~ppc64 ~ia64"
+
+# Removed keywords awaiting >=dev-libs/libtasn1-0.2.10 keywords (bug #61944)
+#  ~ia64 ~hppa
+
+RDEPEND=">=dev-libs/libgcrypt-1.2.0
+	>=app-crypt/opencdk-0.5.5
+	zlib? ( >=sys-libs/zlib-1.1 )
+	virtual/libc
+	>=dev-libs/lzo-1.0
+	>=dev-libs/libtasn1-0.2.11
+	dev-libs/libgpg-error"
+
+
+#	crypt? ( >=app-crypt/opencdk-0.5.5 )
+
+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}
+	# Fix building with gcc4.
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
+src_compile() {
+	# Needed for mips and probably others
+	gnuconfig_update
+
+	local myconf=""
+	# use crypt || myconf="${myconf} --disable-extra-pki --disable-openpgp-authentication"
+
+	econf  \
+		`use_with zlib` \
+		--without-included-minilzo \
+		--without-included-libtasn1 \
+		--without-included-opencdk \
+		${myconf} || die
+	emake || die
+
+	# gtk-doc removed - bug #80906
+	# 		`use_enable doc gtk-doc`
+}
+
+src_install() {
+	emake DESTDIR=${D} install || 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
+}
+
+pkg_postinst() {
+	ewarn "An API has changed in gnutls. This is why the library has gone from "
+	ewarn "libgnutls.so.11 (or 10) to libgnutls.so.12."
+	ewarn
+	ewarn "What is required is a revdep-rebuild."
+	ewarn "To show you what is needed to rebuild"
+	ewarn 'revdep-rebuild --soname-regexp libgnutls.so.1[0-1] -- -p'
+	ewarn ""
+	ewarn "Then do:"
+	ewarn 'revdep-rebuild --soname-regexp libgnutls.so.1[0-1]'
+	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"
+
+}