remove calls to base from go-mono.eclass

3 files changed, 7 insertions, 150 deletions

diff --git a/www-apache/mod_mono/Manifest b/www-apache/mod_mono/Manifest
index 39c7ef2..6526e4a 100644
--- a/www-apache/mod_mono/Manifest
+++ b/www-apache/mod_mono/Manifest
@@ -1 +1 @@
-DIST mod_mono-2.10.tar.bz2 259321 SHA256 a8ba3a8785f2deb13b4c0b1dedb4aa9405077309c9c42d99694cedfcc0f9e3f7 SHA512 b0cb9e8125f2ae124c6c2de259afa04ccb194fb45f7b3968f5cce85df25a8d505a49313429b2ce7fef51d02586ce1af8a7e1e47d2750b4dc478600ba86ea77de WHIRLPOOL 87db32cfe8590c454bde57a9dd4a79c6b22a4b84cadb3ae2e467fd2aa6491dbd8313b5cb5982410c430401aa1668e789979924f3fd1fbe585723b8b2331f353a
+DIST mod_mono-3.12.tar.gz 61089 SHA256 94a396b6156775e33734bfc974d7d558df892f9da9a7f5f471c66eb7c5800cb0 SHA512 3456d110d801207083504da8ed0c87c1b824722b62f27cd77113433893f931119a5ab9570a76c8f7252d3b7b4715d825980d602c5927f873a382caa2c7d04644 WHIRLPOOL 39d97d14b5938068372ef992b85f5c90fb9bc9eaac95d7a31f84d602914439b4ba001334f3842d0d11605341402cd478d3db5e1125832b65b48b04b753f68409
diff --git a/www-apache/mod_mono/files/mod_mono-2.10-apache-2.4.patch b/www-apache/mod_mono/files/mod_mono-2.10-apache-2.4.patch
deleted file mode 100644
index 86694bf..0000000
--- a/www-apache/mod_mono/files/mod_mono-2.10-apache-2.4.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-Sólo en mod_mono-2.10.new/: attachment.cgi?id=402888
-diff -ur mod_mono-2.10/configure.in mod_mono-2.10.new/configure.in
---- mod_mono-2.10/configure.in	2011-01-13 23:32:35.000000000 +0100
-+++ mod_mono-2.10.new/configure.in	2015-06-07 21:09:26.417127319 +0200
-@@ -336,6 +336,16 @@
- ], [
- ])
- 
-+AC_TRY_RUN([
-+	#include <ap_release.h>
-+	int main ()
-+	{
-+		return (AP_SERVER_MAJORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER == 4) ? 0 : 1;
-+	}
-+], [
-+	APACHE_VER=2.4
-+], [
-+])
- fi
- 
- if test ! "$APACHE_VER" = "1.3" -a ! "$APACHE_VER" = "retry" ; then
-@@ -385,6 +395,10 @@
- 	AC_DEFINE([APACHE22],,[Compiling for Apache >= 2.2 ])
- fi
- 
-+if test "$APACHE_VER" = "2.4" ; then
-+	AC_DEFINE([APACHE24],,[Compiling for Apache >= 2.4 ])
-+fi
-+
- # check for --with-mono-default-config-dir
- DFLT_MONO_CONFIG_DIR=`$APXS -q SYSCONFDIR`/mod-mono-applications
- AC_ARG_WITH(mono-default-config-dir,
-diff -ur mod_mono-2.10/src/mod_mono.c mod_mono-2.10.new/src/mod_mono.c
---- mod_mono-2.10/src/mod_mono.c	2011-01-13 23:32:35.000000000 +0100
-+++ mod_mono-2.10.new/src/mod_mono.c	2015-06-07 21:09:26.421127351 +0200
-@@ -386,7 +386,11 @@
- apache_get_userid ()
- {
- #ifdef HAVE_UNIXD
--	return unixd_config.user_id;
-+#if defined(APACHE24)
-+  return ap_unixd_config.user_id;
-+#else
-+  return unixd_config.user_id;
-+#endif
- #else
- 	return ap_user_id;
- #endif
-@@ -396,7 +400,11 @@
- apache_get_groupid ()
- {
- #ifdef HAVE_UNIXD
--	return unixd_config.group_id;
-+#if defined(APACHE24)
-+	return ap_unixd_config.user_id;
-+#else
-+  return unixd_config.user_id;
-+#endif
- #else
- 	return ap_group_id;
- #endif
-@@ -406,7 +414,11 @@
- apache_get_username ()
- {
- #ifdef HAVE_UNIXD
-+#if defined(APACHE24)
-+	return ap_unixd_config.user_name;
-+#else 
- 	return unixd_config.user_name;
-+#endif
- #else
- 	return ap_user_name;
- #endif
-@@ -485,8 +497,12 @@
- 
- #if defined (AP_NEED_SET_MUTEX_PERMS) && defined (HAVE_UNIXD)
- 		DEBUG_PRINT (1, "Setting mutex permissions for %s", xsp->dashboard_lock_file);
-+#if defined(APACHE24)
-+		rv = ap_unixd_set_global_mutex_perms (xsp->dashboard_mutex);
-+#else 
- 		rv = unixd_set_global_mutex_perms (xsp->dashboard_mutex);
--		if (rv != APR_SUCCESS) {
-+#endif
-+    if (rv != APR_SUCCESS) {
- 			ap_log_error (APLOG_MARK, APLOG_CRIT, STATCODE_AND_SERVER (rv),
- 				      "Failed to set mutex permissions for %s",
- 				      xsp->dashboard_lock_file);
-@@ -850,10 +866,14 @@
- #if defined(APACHE22)
- 	return c->remote_addr->port;
- #else
-+#if defined(APACHE24)
-+  return c->client_addr->port;
-+#else 
- 	apr_port_t port;
- 	apr_sockaddr_port_get (&port, c->remote_addr);
- 	return port;
- #endif
-+#endif
- 
- }
- 
-@@ -863,10 +883,14 @@
- #if defined(APACHE22)
- 	return r->connection->local_addr->port;
- #else
-+#if defined(APACHE24)
-+	return r->connection->local_addr->port;
-+#else
- 	apr_port_t port;
- 	apr_sockaddr_port_get (&port, r->connection->local_addr);
- 	return port;
- #endif
-+#endif
- }
- 
- static const char *
-@@ -1977,9 +2001,12 @@
- 	size += info.local_ip_len + sizeof (int32_t);
- 
- 	size += sizeof (int32_t);
--
--	info.remote_ip_len = strlen (r->connection->remote_ip);
--	size += info.remote_ip_len + sizeof (int32_t);
-+#if defined(APACHE24)
-+  info.remote_ip_len = strlen (r->connection->client_ip);
-+#else 
-+  info.remote_ip_len = strlen (r->connection->remote_ip);
-+#endif
-+  size += info.remote_ip_len + sizeof (int32_t);
- 
- 	size += sizeof (int32_t);
- 
-@@ -2026,7 +2053,11 @@
- 	i = LE_FROM_INT (i);
- 	memcpy (ptr, &i, sizeof (i));
- 	ptr += sizeof (int32_t);
-+#if defined(APACHE24)
-+	ptr += write_string_to_buffer (ptr, 0, r->connection->client_ip, info.remote_ip_len);
-+#else 
- 	ptr += write_string_to_buffer (ptr, 0, r->connection->remote_ip, info.remote_ip_len);
-+#endif
- 	i = connection_get_remote_port (r->connection);
- 	i = LE_FROM_INT (i);
- 	memcpy (ptr, &i, sizeof (i));
-Sólo en mod_mono-2.10.new/src: mod_mono.c.orig
diff --git a/www-apache/mod_mono/mod_mono-2.10-r1.ebuild b/www-apache/mod_mono/mod_mono-3.12-r1.ebuild
index 48caacb..c7463f8 100644
--- a/www-apache/mod_mono/mod_mono-2.10-r1.ebuild
+++ b/www-apache/mod_mono/mod_mono-3.12-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 
 # Watch the order of these!
-inherit autotools apache-module eutils mono
+inherit autotools apache-module eutils go-mono mono
 
 KEYWORDS="~amd64 ~x86"
 
@@ -14,6 +14,10 @@ HOMEPAGE="http://www.mono-project.com/Mod_mono"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="debug"
+EGIT_COMMIT="f21ce5a86a610aba053042324970706a9c424681"
+SRC_URI="https://github.com/mono/mod_mono/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${PV}.tar.gz"
+RESTRICT="mirror"
+S="${WORKDIR}/mod_mono-${EGIT_COMMIT}"
 
 CDEPEND=""
 DEPEND="${CDEPEND}"
@@ -32,8 +36,6 @@ src_prepare() {
 	sed -e "s:@LIBDIR@:$(get_libdir):" "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
 		> "${WORKDIR}/${APACHE2_MOD_CONF##*/}.conf" || die
 
-	epatch "${FILESDIR}"/${PN}-2.10-apache-2.4.patch
-
 	eautoreconf
 	go-mono_src_prepare
 }
@@ -46,6 +48,7 @@ src_configure() {
 		--with-apr-config="/usr/bin/apr-1-config" \
 		--with-apu-config="/usr/bin/apu-1-config"
 }
+
 src_compile() {
 	go-mono_src_compile
 }