added C++ header stubs into extra.h

Package-Manager: portage-2.0.51-r14

5 files changed, 130 insertions, 18 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 443f5684ba30..ed45bf1f661a 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.46 2005/01/23 21:45:40 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.47 2005/01/24 08:15:56 trapni Exp $
+
+*gnutls-1.1.23-r1 (24 Jan 2005)
+
+  24 Jan 2005; Christian Parpart <trapni@gentoo.org>
+  +files/gnutls-1.1.23-extra.h.patch, +gnutls-1.1.23-r1.ebuild:
+  added C++ header stubs into extra.h
 
   24 Jan 2005; Daniel Black <dragonheart@gentoo.org> gnutls-1.0.23.ebuild,
   gnutls-1.1.23.ebuild:
@@ -71,7 +77,7 @@
   07 Aug 2004; Tom Martin <slarti@gentoo.org> gnutls-1.0.17.ebuild:
   Stable on amd64, bug 59231.
 
-  07 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> gnutls-1.0.17.ebuild:
+  07 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> gnutls-1.0.17.ebuild:
   Stable on alpha, bug 59231.
 
   06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> gnutls-1.0.17.ebuild:
@@ -117,7 +123,7 @@
   gnutls-0.8.12.ebuild, gnutls-1.0.4.ebuild:
   Fix use invocation
 
-  17 May 2004; Bryan Østergaard <kloeri@gentoo.org> gnutls-1.0.4.ebuild:
+  17 May 2004; Bryan Østergaard <kloeri@gentoo.org> gnutls-1.0.4.ebuild:
   Add ~alpha.
 
   02 May 2004; Stephen P. Becker <geoman@gentoo.org> gnutls-1.0.4.ebuild:
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 2a8d832e28e6..ddd3471eae5c 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1fed05a54690917ebf0cd9a9e92fc977 ChangeLog 6421
-MD5 b99e7100a78e724dfb69ce4293825959 gnutls-1.1.23.ebuild 2194
-MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
+MD5 757a9a818bc4aa21517c65fd3e88689b ChangeLog 6617
 MD5 d48def440d5d8c9047ffed1bcdea2a3f gnutls-1.0.17.ebuild 2428
 MD5 4c20cebdafb97e826e68cfa19f49272f gnutls-1.0.23.ebuild 2188
-MD5 29d3e8994448eb3fe1d15c6720621b40 files/gnutls-1.0.14-extra.h.patch 479
+MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
+MD5 fef5462630d6f58262244537de3beafd gnutls-1.1.23-r1.ebuild 2325
+MD5 b99e7100a78e724dfb69ce4293825959 gnutls-1.1.23.ebuild 2194
 MD5 e21500e19520a3980b3c08d655a6a9e0 files/digest-gnutls-1.0.23 66
-MD5 cfa78b7df28ec06ca09763bd8c908ebc files/digest-gnutls-1.0.17 67
 MD5 0d66c99930a1284b50b8d518f3a4f944 files/digest-gnutls-1.1.23 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB9BsamdTrptrqvGERAnjoAJ9imrBNX5h9aacc4aLCLCIz3J8GggCdF1Un
-GQPzGjiRFeBMBkC3ctQuZrk=
-=bRSp
------END PGP SIGNATURE-----
+MD5 cfa78b7df28ec06ca09763bd8c908ebc files/digest-gnutls-1.0.17 67
+MD5 29d3e8994448eb3fe1d15c6720621b40 files/gnutls-1.0.14-extra.h.patch 479
+MD5 0d66c99930a1284b50b8d518f3a4f944 files/digest-gnutls-1.1.23-r1 67
+MD5 b05c5880a316adbf69d52cd9d9f56e08 files/gnutls-1.1.23-extra.h.patch 390
diff --git a/net-libs/gnutls/files/digest-gnutls-1.1.23-r1 b/net-libs/gnutls/files/digest-gnutls-1.1.23-r1
new file mode 100644
index 000000000000..6ffe70cd2830
--- /dev/null
+++ b/net-libs/gnutls/files/digest-gnutls-1.1.23-r1
@@ -0,0 +1 @@
+MD5 0b7d0d66f5ffff1ede40a38d8d2ac478 gnutls-1.1.23.tar.bz2 2185376
diff --git a/net-libs/gnutls/files/gnutls-1.1.23-extra.h.patch b/net-libs/gnutls/files/gnutls-1.1.23-extra.h.patch
new file mode 100644
index 000000000000..3decb747edcc
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-1.1.23-extra.h.patch
@@ -0,0 +1,22 @@
+--- extra.h.orig	2005-01-24 09:02:43.587224432 +0100
++++ extra.h	2005-01-24 09:03:11.704949888 +0100
+@@ -28,6 +28,10 @@
+ 
+ #define LIBGNUTLS_EXTRA_VERSION LIBGNUTLS_VERSION
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* Openpgp certificate stuff 
+  */
+ 
+@@ -76,4 +80,8 @@
+  */
+ const char* gnutls_extra_check_version( const char *req_version);
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
diff --git a/net-libs/gnutls/gnutls-1.1.23-r1.ebuild b/net-libs/gnutls/gnutls-1.1.23-r1.ebuild
new file mode 100644
index 000000000000..51452241bff9
--- /dev/null
+++ b/net-libs/gnutls/gnutls-1.1.23-r1.ebuild
@@ -0,0 +1,90 @@
+# 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.1.23-r1.ebuild,v 1.1 2005/01/24 08:15:56 trapni 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/devel/${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"
+
+# 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.5 )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	virtual/libc
+	>=dev-libs/lzo-1.0
+	>=dev-libs/libtasn1-0.2.10
+	dev-libs/libgpg-error"
+
+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_compile() {
+	cd "${S}/includes/gnutls"
+	epatch "${FILESDIR}/${PN}-1.1.23.h.patch" || die "Cannot patch gnutls/extra.h"
+	cd "${OLDPWD}"
+
+	# 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
+}
+
+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 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 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"
+
+}