Fix compatibility with C++.

Package-Manager: portage-2.2.0_alpha29_p2/cvs/Linux x86_64

4 files changed, 151 insertions, 2 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index a990d5517da2..d4f4aa9d5e98 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # 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.297 2011/03/25 01:19:08 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.298 2011/03/30 20:39:58 arfrever Exp $
+
+*gnutls-2.12.0-r1 (30 Mar 2011)
+
+  30 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +gnutls-2.12.0-r1.ebuild, +files/gnutls-2.12.0-C++.patch:
+  Fix compatibility with C++.
 
 *gnutls-2.12.0 (25 Mar 2011)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 5d7a6a30daff..3ffdd56a0f34 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,3 +1,4 @@
+AUX gnutls-2.12.0-C++.patch 579 RMD160 75ea095e943b1073c0cccdbe8518c7aa41bb98c1 SHA1 803a45a75cd26b85e4f21e3959033c96dc9b10be SHA256 93bd7a7e81292de8b5efc0178b836ff1e19d4747ace9ed55f6d0f188b465aad2
 DIST gnutls-2.10.4.tar.bz2 7288167 RMD160 82c3722082a35292d99ccc8cb12023244506c9cf SHA1 f0dcd7b68748b48d7b945c52b6a9e64d643e4b58 SHA256 b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8
 DIST gnutls-2.10.5.tar.bz2 7287913 RMD160 4bc886ced90742a488e00c1884e6124b37047382 SHA1 4530657082a0e754356de89a5529d1ad7a18e777 SHA256 c086d5426ef04427038db6af1a4dc62ff32694e91e759ebf9bb3380243ebd9c9
 DIST gnutls-2.11.6.tar.bz2 7743287 RMD160 c3d7456cce6fcb77b0182d13a7127c90113deb9e SHA1 6abc6aa5636a2aa87071bbdeb29ab385ccf60a58 SHA256 4ea79c7a8c215f281994f81f9b8fc80787ac83f8b1c5ff2d89fc5eedd9502c3e
@@ -7,6 +8,7 @@ EBUILD gnutls-2.10.4.ebuild 2832 RMD160 441eca1d49ebb0ad5bdf970339ea11cad19d9b43
 EBUILD gnutls-2.10.5.ebuild 2850 RMD160 d004fa27e07b9a2db2af7e9d08a691a75d26f802 SHA1 e85c2a43f042dd79329194a74ec28c31e819843f SHA256 b84b4f5f4e6bf523a5506a19dc7627216aca8a8790582a0a702e597f3543c9e7
 EBUILD gnutls-2.11.6.ebuild 3120 RMD160 4ac2752ad998c57634acd16fe95f5aa445ad82b0 SHA1 18890e66365aad1f972cb79066bea0d520e127f0 SHA256 2bccd8c39c84cc90d7d4058e843c9ea00d739d25a568c8f69347280c824c7740
 EBUILD gnutls-2.11.7.ebuild 3124 RMD160 dc8547e492d628de4afefae1be6f7b56914df54d SHA1 44f6c9587fd38b34632fb195ad3626e0577ff793 SHA256 43c3b3c64e21bdaee50597d8972be08d391a371af4929a965c40b8408cd557db
+EBUILD gnutls-2.12.0-r1.ebuild 3172 RMD160 36851ea98f86bb065c7c49c3479fb847292688c7 SHA1 60b527cf1b298c6d99094ea632523d46d0df42e2 SHA256 38bcbc18834befad8a54c1dc71eb3468c1119dde088564d52fa2a234b7ba70cd
 EBUILD gnutls-2.12.0.ebuild 3124 RMD160 5bdf263d3f0ebb7723db71e5ae5e287988f1466f SHA1 80c47717fc4c0d01fc45b02a4c994d749c34f69e SHA256 2c6f097663ffb611e1e2e86bf6542b59e03d377112ad53e8f0b944cecd91bdca
-MISC ChangeLog 44389 RMD160 fdb60d698dd3510930c9b632548d0c8e78b36e2f SHA1 91e0f49ebaa7b229fca2f64004ebc7ffa8c120ed SHA256 69e7ebbbdac49d8a4994bdae7673b8c3545ecd8b672bb94b00e9faf626fc8c5a
+MISC ChangeLog 44586 RMD160 068a36445f4cd33e0ff7a2508cb4324833ba228d SHA1 df7387995e9af45ce41554b290f940674be1af1f SHA256 c6490b27a22ed38e0925c63d16e431aac91b86bfcbe22b8f6cd72f3a82216635
 MISC metadata.xml 253 RMD160 d29cff22b196e16cfd1725a25b1e9334167d38cf SHA1 2122cdcae7f58713b95483c3da76f35dd15e8aef SHA256 98ed95679982db831ecd5feaea09ada3657c97d63a97c41aa6c894487bca5a30
diff --git a/net-libs/gnutls/files/gnutls-2.12.0-C++.patch b/net-libs/gnutls/files/gnutls-2.12.0-C++.patch
new file mode 100644
index 000000000000..eec5254dc6b8
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.0-C++.patch
@@ -0,0 +1,25 @@
+http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=66ebfc0120a47c350c4485e195f72ff851296e30
+
+--- lib/includes/gnutls/compat.h
++++ lib/includes/gnutls/compat.h
+@@ -3,6 +3,11 @@
+ #ifndef _GNUTLS_COMPAT_H
+ #define _GNUTLS_COMPAT_H
+ 
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++
+ #ifdef __GNUC__
+ 
+ #define _GNUTLS_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+@@ -345,4 +350,8 @@
+ 
+   void gnutls_transport_set_lowat (gnutls_session_t session, int num) _GNUTLS_GCC_ATTR_DEPRECATED;
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* _GNUTLS_COMPAT_H */
diff --git a/net-libs/gnutls/gnutls-2.12.0-r1.ebuild b/net-libs/gnutls/gnutls-2.12.0-r1.ebuild
new file mode 100644
index 000000000000..259c703dd007
--- /dev/null
+++ b/net-libs/gnutls/gnutls-2.12.0-r1.ebuild
@@ -0,0 +1,116 @@
+# 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.0-r1.ebuild,v 1.1 2011/03/30 20:39:58 arfrever Exp $
+
+EAPI="3"
+
+inherit autotools eutils 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.bz2"
+	else
+		SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.bz2"
+	fi
+	unset MINOR_VERSION
+fi
+
+# GPL-3 for the gnutls-extras library and LGPL for the gnutls library.
+LICENSE="LGPL-2.1 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bindist +cxx doc examples guile lzo +nettle nls test zlib"
+
+# lib/m4/hooks.m4 says that GnuTLS uses a fork of PaKChoiS.
+RDEPEND=">=dev-libs/libtasn1-0.3.4
+	nls? ( virtual/libintl )
+	guile? ( >=dev-scheme/guile-1.8[networking] )
+	nettle? ( >=dev-libs/nettle-2.1[gmp] )
+	!nettle? ( >=dev-libs/libgcrypt-1.4.0 )
+	zlib? ( >=sys-libs/zlib-1.2.3.1 )
+	!bindist? ( lzo? ( >=dev-libs/lzo-2 ) )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	test? ( app-misc/datefudge )"
+
+S="${WORKDIR}/${P%_pre*}"
+
+pkg_setup() {
+	if use lzo && use bindist; then
+		ewarn "lzo support is disabled for binary distribution of GnuTLS due to licensing issues."
+	fi
+}
+
+src_prepare() {
+	# tests/suite directory is not distributed.
+	sed -e 's|AC_CONFIG_FILES(\[tests/suite/Makefile\])|:|' -i configure.ac
+
+	sed -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' -i doc/Makefile.am
+
+	epatch "${FILESDIR}/${P}-C++.patch"
+
+	local dir
+	for dir in m4 lib/m4 libextra/m4; do
+		rm -f "${dir}/lt"* "${dir}/libtool.m4"
+	done
+	find . -name ltmain.sh -exec rm {} \;
+	for dir in . lib libextra; do
+		pushd "${dir}" > /dev/null
+		eautoreconf
+		popd > /dev/null
+	done
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+src_configure() {
+	local myconf
+	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
+	[[ "${VALGRIND_TESTS}" != "1" ]] && myconf+=" --disable-valgrind-tests"
+
+	econf --htmldir=/usr/share/doc/${P}/html \
+		$(use_enable cxx) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable guile) \
+		$(use_with !nettle libgcrypt) \
+		$(use_enable nls) \
+		$(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() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS doc/TODO || die "dodoc failed"
+
+	if use doc; then
+		dodoc doc/gnutls.{pdf,ps} || die "dodoc failed"
+		dohtml doc/gnutls.html || die "dohtml failed"
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c || die "dodoc failed"
+	fi
+}