Rebased patch for #307109

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 21 insertions, 5 deletions

diff --git a/www-apache/mod_mono/ChangeLog b/www-apache/mod_mono/ChangeLog
index 627ee604191b..616a94bfe085 100644
--- a/www-apache/mod_mono/ChangeLog
+++ b/www-apache/mod_mono/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_mono
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.63 2010/02/27 00:22:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.64 2010/02/27 21:06:57 patrick Exp $
+
+  27 Feb 2010; Patrick Lauer <patrick@gentoo.org>
+  +files/mono26_auto_application_aspnet2.patch, mod_mono-2.6.ebuild:
+  Rebased patch for #307109
 
 *mod_mono-2.6 (27 Feb 2010)
 
diff --git a/www-apache/mod_mono/Manifest b/www-apache/mod_mono/Manifest
index a9cdb7902b4f..b0e3df528651 100644
--- a/www-apache/mod_mono/Manifest
+++ b/www-apache/mod_mono/Manifest
@@ -3,6 +3,7 @@ AUX 1.2.4/70_mod_mono.conf 2431 RMD160 77fb57f7a3318c1c3f073b61406a44541c08de04
 AUX 1.2.6/70_mod_mono.conf 2435 RMD160 4319ce42e7bd1e85b9ac0f015c69d9e9a2423610 SHA1 7fa26f1be41499b680125fee13bb92541ebf7a19 SHA256 d38e0cc6f05e205f2548863fe303b05820f69d2cdcee522ed163204bdde18fba
 AUX 1.9/70_mod_mono.conf 2435 RMD160 4319ce42e7bd1e85b9ac0f015c69d9e9a2423610 SHA1 7fa26f1be41499b680125fee13bb92541ebf7a19 SHA256 d38e0cc6f05e205f2548863fe303b05820f69d2cdcee522ed163204bdde18fba
 AUX 2.2/70_mod_mono.conf 2889 RMD160 043de9191ac08efd75998d4a57ead84fa2c528cd SHA1 2d6d2dcc5e1e7aadfa1452cdd34afd66d879d751 SHA256 1ab3424a4d9365e21ef55e5bda0af3efedb2bfb71b039b022eb54f6dacadb0f1
+AUX mono26_auto_application_aspnet2.patch 389 RMD160 88d9690e0878a2a9773e5f8d63275c0f54771e88 SHA1 412f1db7bc9cbe83644cc348ffe5900b29f440cd SHA256 25faa39dc3fb0bea15101a037af35b44d56f72545e62f4862e90a86a731ba9fe
 AUX mono_auto_application_aspnet2.patch 426 RMD160 0a42409e521d0b64c3dcfe363a55030093d435b0 SHA1 6fe254ce56665cdf71bcfc2947a364eea940860d SHA256 166e09aae2ce8a44dbdb7793b6d02eaf610b76050f4cb7bec341ee6fcbf86393
 DIST mod_mono-1.2.1.tar.gz 335399 RMD160 2d19954cc0f3e349d9f025d277519395f243e8db SHA1 902f1904123816fd94304f92450fccc83509167a SHA256 078554a25ff0cf4b6196702b1b75ee341dd969a4a3ae34bb2f889f1b7542f646
 DIST mod_mono-1.2.4.tar.bz2 252763 RMD160 9508440272b53dbea2a086aad60fda563e00eb31 SHA1 c579227e020aaa6e244562f1f1e198343b54a1f3 SHA256 9c77a263680fa5bd00ebbb222d607a2a19121b501d86bfd7e259a402c8cdea4f
@@ -17,7 +18,7 @@ EBUILD mod_mono-2.0.9999.ebuild 1946 RMD160 7c3f3988790fce1a7ec8d92bbcfc0b73d147
 EBUILD mod_mono-2.0.ebuild 1439 RMD160 5f61a62f877233da67209c05ff23cacbba02f415 SHA1 d75cddf89681822df399576f038666b85ed730dc SHA256 2cdb32f2e9609837518a2ba5916bcf88b95bb7c78464a1912a897336138e0112
 EBUILD mod_mono-2.4.2.ebuild 1892 RMD160 294ec39e75f852cec2030983dfd5d1360e206808 SHA1 5fac04d1ebb8ba77656c60d8e5c5a3902d13833f SHA256 c267dbd75da10c12507f656f46a8a2a540885c1a53203ff404ff30fb574224fd
 EBUILD mod_mono-2.4.9999.ebuild 1946 RMD160 1a8319df8cf13f9e3ba9b3d1aee46757ad7aa458 SHA1 1fc10495c29929ba605390383fc9d6ae443cc071 SHA256 4bb15e0afc5a59d2c6b9a70b1ff0245e6647b4e8358e25f36e029b68509515b4
-EBUILD mod_mono-2.6.ebuild 1894 RMD160 485a7fde67bbca58bf14f43a57d92bcfa75e0fe0 SHA1 eb0894392e56f4c01b1937465679415c54187ddd SHA256 d71bc49fc8cb5da441211c2cdbb6b5f250400293aa45730aa502a398ee6255d7
+EBUILD mod_mono-2.6.ebuild 1896 RMD160 11f2e55ed4b14c96f3bb68c656075da85e83bd00 SHA1 13d73d5903350d87abebace6bdc43a07110674dc SHA256 760c48e539f1217c303aa42d7240d79ebb53100fcd49719360c5c0425e749bd8
 EBUILD mod_mono-9999.ebuild 1942 RMD160 1c8e3d0b9be6807cfedb1b6b7d5c2d58b4dacfc7 SHA1 8b31e5efe810ab4a0c223346797b1b109e2c1fce SHA256 507d9b8b20c08c24a05aef86876bf69463484429f0e3b1c291e90671521a1f2a
-MISC ChangeLog 12190 RMD160 1efbf3b6fcebe9d8ee8d5e3f6acf30dd5893a3b1 SHA1 b7cdcadce10e29bde205059b9c28305506557d22 SHA256 3429a50b9fdecd1bac6b2006f9bfe9a14af6c5149ba585a6a0d85862c8861438
+MISC ChangeLog 12338 RMD160 5a83a6c61218b97d65afee848dea6a80be62e559 SHA1 53d2c4274a2ee3570260150b629543bd1d20bbdc SHA256 57165f54ba0ee55ad0f2468125de54465b3943aa5e5b253d46f38cde5e7f2e7e
 MISC metadata.xml 636 RMD160 467d975ed94c4ee63b7efed6bc150218da18f2f2 SHA1 3d777853d126987468af2aed231be4ab99b57a4f SHA256 be234bbb8b48e2b0335462ef8183b6e9756ace4e3ea08c96419b400727f934e9
diff --git a/www-apache/mod_mono/files/mono26_auto_application_aspnet2.patch b/www-apache/mod_mono/files/mono26_auto_application_aspnet2.patch
new file mode 100644
index 000000000000..a04e2efe56c7
--- /dev/null
+++ b/www-apache/mod_mono/files/mono26_auto_application_aspnet2.patch
@@ -0,0 +1,11 @@
+--- src/mod_mono.h	2009-09-25 16:01:20.000000000 +0000
++++ src/mod_mono.h.new	2010-02-27 21:00:27.000000000 +0000
+@@ -89,7 +89,7 @@
+ #define DIRECTORY_SEPARATOR	"/"
+ #endif
+ 
+-#define MODMONO_SERVER_PATH	MONO_PREFIX "/bin/mod-mono-server"
++#define MODMONO_SERVER_PATH	MONO_PREFIX "/bin/mod-mono-server2"
+ #define WAPIDIR			"/tmp"
+ #define DOCUMENT_ROOT		NULL
+ #define APPCONFIG_FILE		NULL
diff --git a/www-apache/mod_mono/mod_mono-2.6.ebuild b/www-apache/mod_mono/mod_mono-2.6.ebuild
index 7fe366af360c..006edcafc910 100644
--- a/www-apache/mod_mono/mod_mono-2.6.ebuild
+++ b/www-apache/mod_mono/mod_mono-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-2.6.ebuild,v 1.1 2010/02/27 00:22:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-2.6.ebuild,v 1.2 2010/02/27 21:06:57 patrick Exp $
 
 EAPI=2
 
@@ -30,7 +30,7 @@ src_prepare() {
 	sed -e "s:@LIBDIR@:$(get_libdir):" "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
 		> "${WORKDIR}/${APACHE2_MOD_CONF##*/}.conf" || die
 	go-mono_src_prepare
-	use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch"
+	use aspnet2 && epatch "${FILESDIR}/mono26_auto_application_aspnet2.patch"
 }
 
 src_configure() {