Fix compilation with gnutls-3 with Fedora patch (#421421)

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 21 insertions, 44 deletions

diff --git a/www-apache/mod_gnutls/ChangeLog b/www-apache/mod_gnutls/ChangeLog
index 397399362da7..a65eb7086df4 100644
--- a/www-apache/mod_gnutls/ChangeLog
+++ b/www-apache/mod_gnutls/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_gnutls
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/ChangeLog,v 1.32 2013/01/03 19:09:37 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/ChangeLog,v 1.33 2014/01/01 18:50:58 pacho Exp $
+
+  01 Jan 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/mod_gnutls-0.5.10-no-extra.patch, -mod_gnutls-0.5.10.ebuild,
+  mod_gnutls-0.5.10-r1.ebuild:
+  Fix compilation with gnutls-3 with Fedora patch (#421421)
 
 *mod_gnutls-0.5.10-r1 (03 Jan 2013)
 
diff --git a/www-apache/mod_gnutls/files/mod_gnutls-0.5.10-no-extra.patch b/www-apache/mod_gnutls/files/mod_gnutls-0.5.10-no-extra.patch
new file mode 100644
index 000000000000..c629f6b6bf6e
--- /dev/null
+++ b/www-apache/mod_gnutls/files/mod_gnutls-0.5.10-no-extra.patch
@@ -0,0 +1,11 @@
+diff -up mod_gnutls-0.5.10/include/mod_gnutls.h.in.no-extra mod_gnutls-0.5.10/include/mod_gnutls.h.in
+--- mod_gnutls-0.5.10/include/mod_gnutls.h.in.no-extra	2011-07-08 23:29:46.000000000 +0200
++++ mod_gnutls-0.5.10/include/mod_gnutls.h.in	2013-03-07 09:08:49.833348848 +0100
+@@ -28,7 +28,6 @@
+ #include "ap_release.h"
+ 
+ #include <gnutls/gnutls.h>
+-#include <gnutls/extra.h>
+ #include <gnutls/openpgp.h>
+ #include <gnutls/x509.h>
+ 
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild
index ec68f808700c..adfef3d824d1 100644
--- a/www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild
+++ b/www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild,v 1.1 2013/01/03 19:09:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/mod_gnutls-0.5.10-r1.ebuild,v 1.2 2014/01/01 18:50:58 pacho Exp $
 
 EAPI="5"
 inherit apache-module autotools eutils
@@ -27,6 +27,7 @@ need_apache2
 src_prepare() {
 	epatch "${FILESDIR}/${P}-httpd24.patch"
 	epatch "${FILESDIR}/${PN}_apr_memcache_m4_dirty.patch"
+	epatch "${FILESDIR}/${P}-no-extra.patch"
 	epatch_user
 	eautoreconf
 }
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.5.10.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.5.10.ebuild
deleted file mode 100644
index e248d2ed5f4b..000000000000
--- a/www-apache/mod_gnutls/mod_gnutls-0.5.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_gnutls/mod_gnutls-0.5.10.ebuild,v 1.1 2012/10/12 07:02:10 patrick Exp $
-
-EAPI="3"
-
-inherit apache-module ssl-cert
-
-DESCRIPTION="mod_gnutls uses GnuTLS to provide SSL/TLS encryption for Apache2, similarly to mod_ssl"
-HOMEPAGE="http://www.outoforder.cc/projects/apache/mod_gnutls/"
-SRC_URI="http://www.outoforder.cc/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=net-libs/gnutls-2.10.0"
-RDEPEND="${DEPEND}"
-
-APACHE2_MOD_CONF="47_${PN}"
-APACHE2_MOD_DEFINE="GNUTLS"
-
-DOCFILES="NEWS NOTICE README README.ENV"
-
-need_apache2
-
-src_configure() {
-	econf --with-apxs="${APXS}"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	mv -f src/.libs/libmod_gnutls.so src/.libs/${PN}.so
-	keepdir /var/cache/${PN}
-	apache-module_src_install
-}