Bump for file fixes in right spot (#77564)

Package-Manager: portage-2.0.51.19

5 files changed, 112 insertions, 2 deletions

diff --git a/dev-ruby/mod_ruby/ChangeLog b/dev-ruby/mod_ruby/ChangeLog
index 87c5447f84d3..ec21f64d992a 100644
--- a/dev-ruby/mod_ruby/ChangeLog
+++ b/dev-ruby/mod_ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/mod_ruby
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/ChangeLog,v 1.9 2005/04/08 12:26:55 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/ChangeLog,v 1.10 2005/04/13 12:44:21 caleb Exp $
+
+*mod_ruby-1.2.4-r2 (13 Apr 2005)
+
+  13 Apr 2005; Caleb Tennis <caleb@gentoo.org> +files/21_mod_ruby.conf,
+  +mod_ruby-1.2.4-r2.ebuild:
+  Bump for file fixes in right spot (#77564)
 
   08 Apr 2005; Caleb Tennis <caleb@gentoo.org> mod_ruby-1.2.4-r1.ebuild:
   minor formatting fix (Bug #88316)
diff --git a/dev-ruby/mod_ruby/Manifest b/dev-ruby/mod_ruby/Manifest
index cf569881d905..486c069f77b9 100644
--- a/dev-ruby/mod_ruby/Manifest
+++ b/dev-ruby/mod_ruby/Manifest
@@ -1,10 +1,13 @@
 MD5 ca3971be5992c98df25220e1a4e7782a mod_ruby-1.2.2.ebuild 1958
 MD5 18a1d02fea28a3aafaac7e05f81d3152 mod_ruby-1.2.4.ebuild 1957
+MD5 a5f2f28c7117c3d8f0195323fee82c57 mod_ruby-1.2.4-r2.ebuild 1031
 MD5 0a3b2010518d678dcb74dacf8511fe28 mod_ruby-1.0.7.ebuild 927
 MD5 2b4d5ae65d1dc92adf5c70292819be42 mod_ruby-1.2.4-r1.ebuild 1136
-MD5 6f8d34b1642e542c2f38f1cc69b63cd7 ChangeLog 4078
+MD5 594bc7b5071758685ae0222908bdc4f8 ChangeLog 4260
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 d87224e9645bea207d6db5f6a2079e97 files/21_mod_ruby.conf 1281
 MD5 1c959dc0f47469dfabd1a9c0aad3898c files/digest-mod_ruby-1.2.4-r1 66
+MD5 1c959dc0f47469dfabd1a9c0aad3898c files/digest-mod_ruby-1.2.4-r2 66
 MD5 70674a49abbe9321ac65cf4932c0ad23 files/mod_ruby.conf 846
 MD5 fa5123111f5278201525d49f658b4a3b files/digest-mod_ruby-1.0.7 65
 MD5 094ecc3f9ad4a6698c2ef4ee0c8139cc files/digest-mod_ruby-1.2.2 65
diff --git a/dev-ruby/mod_ruby/files/21_mod_ruby.conf b/dev-ruby/mod_ruby/files/21_mod_ruby.conf
new file mode 100644
index 000000000000..0f8eda7f28a6
--- /dev/null
+++ b/dev-ruby/mod_ruby/files/21_mod_ruby.conf
@@ -0,0 +1,55 @@
+<IfDefine RUBY>
+  <IfModule !mod_ruby.c>
+    LoadModule ruby_module    modules/mod_ruby.so
+  </IfModule>
+</IfDefine>
+
+# taken from the example file
+# If the ruby module is installed, this will be enabled.
+<IfModule mod_ruby.c>
+  # for Apache::RubyRun
+  RubyRequire apache/ruby-run
+
+  # exec files under /ruby as ruby scripts.
+  <Location /ruby>
+    SetHandler ruby-object
+    RubyHandler Apache::RubyRun.instance
+    Options ExecCGI 
+  </Location>
+
+  # exec *.rbx as ruby scripts.
+  <Files *.rbx>
+    SetHandler ruby-object
+    RubyHandler Apache::RubyRun.instance
+  </Files>
+
+  # # for Apache::ERubyRun
+  # RubyRequire apache/eruby-run
+  #
+  # # handle files under /eruby as eRuby files by eruby.
+  # <Location /eruby>
+  #   SetHandler ruby-object
+  #   RubyHandler Apache::ERubyRun.instance
+  #   Options ExecCGI 
+  # </Location>
+  #
+  # # handle *.rhtml as eruby files.
+  # <Files *.rhtml>
+  #   SetHandler ruby-object
+  #   RubyHandler Apache::ERubyRun.instance
+  # </Files>
+
+  # # for Apache::ERbRun
+  # RubyRequire apache/erb-run
+  #
+  # # handle files under /erb as eRuby files by ERb.
+  # <Location /erb>
+  #   SetHandler ruby-object
+  #   RubyHandler Apache::ERbRun.instance
+  #   Options ExecCGI 
+  # </Location>
+
+  # # for debug
+  # RubyRequire auto-reload
+</IfModule>
+
diff --git a/dev-ruby/mod_ruby/files/digest-mod_ruby-1.2.4-r2 b/dev-ruby/mod_ruby/files/digest-mod_ruby-1.2.4-r2
new file mode 100644
index 000000000000..235102d8b969
--- /dev/null
+++ b/dev-ruby/mod_ruby/files/digest-mod_ruby-1.2.4-r2
@@ -0,0 +1 @@
+MD5 2b803c021297517eecb3dc6cf77b9534 mod_ruby-1.2.4.tar.gz 107797
diff --git a/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild b/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild
new file mode 100644
index 000000000000..4b2fde1faef6
--- /dev/null
+++ b/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild,v 1.1 2005/04/13 12:44:21 caleb Exp $
+
+inherit apache-module
+
+DESCRIPTION="Embeds the Ruby interpreter into Apache"
+HOMEPAGE="http://modruby.net/"
+SRC_URI="http://modruby.net/archive/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~sparc ~x86 ~ppc ~amd64 ~ppc64"
+IUSE="doc"
+
+DEPEND="virtual/ruby
+	doc? ( dev-ruby/rdtool )"
+
+APACHE1_MOD_CONF="mod_ruby"
+APACHE2_MOD_CONF="21_mod_ruby"
+APACHE1_MOD_DEFINE="RUBY"
+APACHE2_MOD_DEFINE="RUBY"
+APACHE1_MOD_FILE="$S/mod_ruby.so"
+APACHE2_MOD_FILE="$S/mod_ruby.so"
+DOCFILES="ChangeLog COPYING README.* doc/*.html doc/*.css"
+
+need_apache
+
+src_compile() {
+	if [ "${APACHE_VERSION}" == "2" ]; then
+		APXS=${APXS2}
+		APACHE_BASEDIR=${APACHE2_BASEDIR}
+	else
+		APXS=${APXS1}
+		APACHE_BASEDIR=${APACHE1_BASEDIR}
+	fi
+
+	./configure.rb --with-apxs=${APXS}
+
+	emake || die
+
+	if use doc; then
+		cd doc
+		emake
+	fi
+}