updated for Apache2

5 files changed, 93 insertions, 6 deletions

diff --git a/dev-ruby/mod-ruby/ChangeLog b/dev-ruby/mod-ruby/ChangeLog
index 9ffad056cad7..b9942539c879 100644
--- a/dev-ruby/mod-ruby/ChangeLog
+++ b/dev-ruby/mod-ruby/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for dev-ruby/mod-ruby
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/ChangeLog,v 1.2 2002/07/08 01:52:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/ChangeLog,v 1.3 2002/11/29 11:28:02 woodchip Exp $
 
-*mod-ruby-0.9.7 ( 10 Mar 2002 )
+*mod-ruby-1.0.1 (29 Nov 2002)
+
+  29 Nov 2002; Donny Davies <woodchip@gentoo.org> : Updated for Apache2.
+
+*mod-ruby-0.9.7 (10 Mar 2002)
 
   10 Mar 2002; Karl Trygve Kalleberg <karltk@gentoo.org> all :
   
diff --git a/dev-ruby/mod-ruby/files/20_mod_ruby.conf b/dev-ruby/mod-ruby/files/20_mod_ruby.conf
new file mode 100644
index 000000000000..e480b3e6ae48
--- /dev/null
+++ b/dev-ruby/mod-ruby/files/20_mod_ruby.conf
@@ -0,0 +1,55 @@
+<IfDefine RUBY>
+  <IfModule !mod_ruby.c>
+    LoadModule ruby_module    extramodules/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.0.1 b/dev-ruby/mod-ruby/files/digest-mod-ruby-1.0.1
new file mode 100644
index 000000000000..b14069283e7d
--- /dev/null
+++ b/dev-ruby/mod-ruby/files/digest-mod-ruby-1.0.1
@@ -0,0 +1 @@
+MD5 2ebbf6881ef7d5d9f9dace5d9ea99051 mod_ruby-1.0.1.tar.gz 56323
diff --git a/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild b/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild
index 59dd1bd0c7e8..2ac235326970 100644
--- a/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild
+++ b/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild,v 1.4 2002/10/04 05:28:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild,v 1.5 2002/11/29 11:28:02 woodchip Exp $
 
 S=${WORKDIR}/mod_ruby-${PV}
 DESCRIPTION="A Ruby Module for Apache"
@@ -10,9 +10,7 @@ LICENSE="GPL-2/LGPL-2.1"
 KEYWORDS="x86"
 SLOT="0"
 
-DEPEND="virtual/glibc
-	>=net-www/apache-1.3
-	>=dev-lang/ruby-1.6.1"
+DEPEND="=net-www/apache-1* >=dev-lang/ruby-1.6.1"
 
 src_compile() {
 	ruby ./configure.rb --with-apxs=/usr/sbin/apxs || die	
diff --git a/dev-ruby/mod-ruby/mod-ruby-1.0.1.ebuild b/dev-ruby/mod-ruby/mod-ruby-1.0.1.ebuild
new file mode 100644
index 000000000000..0c1f8a515681
--- /dev/null
+++ b/dev-ruby/mod-ruby/mod-ruby-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/mod-ruby-1.0.1.ebuild,v 1.1 2002/11/29 11:28:02 woodchip Exp $
+
+DESCRIPTION="An Apache2 DSO providing an embedded Tcl interpreter"
+HOMEPAGE="http://www.modruby.net/"
+
+S=${WORKDIR}/mod_ruby-${PV}
+SRC_URI="http://www.modruby.net/archive/mod_ruby-${PV}.tar.gz"
+DEPEND="dev-lang/ruby =net-www/apache-2*"
+LICENSE="BSD"
+KEYWORDS="~x86"
+IUSE=""
+SLOT="0"
+
+src_compile() {
+	./configure.rb --with-apxs=/usr/sbin/apxs2 || die
+	emake || die
+}
+
+src_install() {
+	cp Makefile 1
+	sed -e 's|usr/lib/apache2|usr/lib/apache2-extramodules|' 1 > Makefile
+	make DESTDIR=${D} install || die
+	insinto /etc/apache2/conf/modules.d
+	doins ${FILESDIR}/20_mod_ruby.conf
+	dodoc ${FILESDIR}/20_mod_ruby.conf
+	dodoc ChangeLog COPYING README*
+}