Version bump and fixes

5 files changed, 124 insertions, 4 deletions

diff --git a/dev-ruby/mod-ruby/ChangeLog b/dev-ruby/mod-ruby/ChangeLog
index 222167833942..8cc2d3b8f083 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/ChangeLog,v 1.4 2003/02/12 06:35:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/ChangeLog,v 1.5 2003/05/10 13:17:52 twp Exp $
+
+*mod-ruby-1.1.1 (10 May 2003)
+
+  10 May 2003; Tom Payne <twp@gentoo.org> mod-ruby-1.1.1.ebuild :
+
+  Version bump. Ebuild tidy. Experimental apache-1.3 support. Bugs # 16539 and 18916.
 
 *mod-ruby-1.0.1 (29 Nov 2002)
 
diff --git a/dev-ruby/mod-ruby/Manifest b/dev-ruby/mod-ruby/Manifest
index 9ec66aa13b17..02854b5dd03f 100644
--- a/dev-ruby/mod-ruby/Manifest
+++ b/dev-ruby/mod-ruby/Manifest
@@ -1,8 +1,8 @@
-MD5 4e9c48522d267ed8599c76419acc1547 ChangeLog 719
+MD5 8c81740180710e396aaade11778f5ed4 ChangeLog 901
 MD5 c0aaf70c5cb5b09f9dab0bb0622d5add mod-ruby-0.9.7.ebuild 1593
 MD5 ebf0500e9e59d69305f62a1d6e090a9f mod-ruby-1.0.1.ebuild 879
-MD5 d38e8000597a5a555067f8b04bbf5ec1 mod-ruby-1.1.1.ebuild 764
-MD5 855612b38320a23c4a69db7c6910957f .mod-ruby-1.1.1.ebuild.swp 16384
+MD5 5b7de534ea2fa74ccaf73f8c48f8baed mod-ruby-1.1.1.ebuild 1869
+MD5 77b4dff16b861be3dbb9c6bc3c9e66b6 files/mod_ruby.conf 859
 MD5 9212f9bc81514ddee76f6c4251ca71c3 files/20_mod_ruby.conf 1286
 MD5 fc27ee361a3840e30d4e4d025d08559f files/digest-mod-ruby-0.9.7 65
 MD5 4b96c0ca2a3a6b8360a1e619d4c64e04 files/digest-mod-ruby-1.0.1 65
diff --git a/dev-ruby/mod-ruby/files/digest-mod-ruby-1.1.1 b/dev-ruby/mod-ruby/files/digest-mod-ruby-1.1.1
new file mode 100644
index 000000000000..1cad513b26f3
--- /dev/null
+++ b/dev-ruby/mod-ruby/files/digest-mod-ruby-1.1.1
@@ -0,0 +1 @@
+MD5 ea1ab677de5f129cb3ba21d55a57a1b3 mod_ruby-1.1.1.tar.gz 62191
diff --git a/dev-ruby/mod-ruby/files/mod_ruby.conf b/dev-ruby/mod-ruby/files/mod_ruby.conf
new file mode 100644
index 000000000000..7d681b42aef2
--- /dev/null
+++ b/dev-ruby/mod-ruby/files/mod_ruby.conf
@@ -0,0 +1,39 @@
+# REQUIRED
+LoadModule ruby_module /usr/local/apache/libexec/mod_ruby.so
+
+<IfModule mod_ruby.c>
+  # for Apache::RubyRun
+  RubyRequire apache/ruby-run
+  # for Apache::ERubyRun
+  RubyRequire apache/eruby-run
+  # for development
+  # RubyRequire auto-reload
+
+  # OPTIONAL
+  # exec files under /ruby as ruby scripts.
+  <Location /ruby>
+  SetHandler ruby-object
+  RubyHandler Apache::RubyRun.instance
+  </Location>
+
+  # OPTIONAL
+  # exec *.rbx as ruby scripts.
+  <Files *.rbx>
+  SetHandler ruby-object
+  RubyHandler Apache::RubyRun.instance
+  </Files>
+
+  # OPTIONAL
+  # handle *.rhtml as eruby files.
+  <Files *.rhtml>
+  SetHandler ruby-object
+  RubyHandler Apache::ERubyRun.instance
+  </Files>
+
+  # OPTIONAL
+  # handle files under /eruby as eruby files.
+  <Location /eruby>
+  SetHandler ruby-object
+  RubyHandler Apache::ERubyRun.instance
+  </Location>
+</IfModule>
diff --git a/dev-ruby/mod-ruby/mod-ruby-1.1.1.ebuild b/dev-ruby/mod-ruby/mod-ruby-1.1.1.ebuild
new file mode 100644
index 000000000000..781934d5d1ff
--- /dev/null
+++ b/dev-ruby/mod-ruby/mod-ruby-1.1.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2003 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.1.1.ebuild,v 1.1 2003/05/10 13:17:52 twp Exp $
+
+MY_P=mod_ruby-${PV}
+DESCRIPTION="Embeds the Ruby interpreter into Apache"
+HOMEPAGE="http://modruby.net/"
+SRC_URI="http://modruby.net/archive/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="apache2"
+DEPEND=">=net-www/apache-1.3.3 >=dev-lang/ruby-1.6.4"
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+
+	if [ "`use apache2`" ]; then
+		:;
+	else
+		ewarn "apache support is UNTESTED"
+	fi
+
+	local two
+	[ "`use apache2`" ] && two="2" || two=""
+
+	./configure.rb --with-apxs=/usr/sbin/apxs${two}
+	
+	cp Makefile Makefile.orig
+	sed -e "s:\(^APACHE_LIBEXECDIR = \$(DESTDIR)/usr/lib/apache${two}\):\1-extramodules:" \
+		Makefile.orig > Makefile
+
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	if [ "`use apache2`" ]; then
+		insinto /etc/apache2/conf/modules.d
+		doins ${FILESDIR}/20_mod_ruby.conf
+	else
+		insinto /etc/apache/conf/addon-modules
+		doins ${FILESDIR}/mod_ruby.conf
+	fi
+
+	dodoc ChangeLog COPYING README.* 
+
+}
+
+pkg_postinst() {
+	if [ "`use apache2`" ]; then
+		einfo "To enable mod_ruby, edit /etc/conf.d/apache2 and add \"-D RUBY\""
+		einfo "You may also wish to edit /etc/conf.d/apache2/modules.d/20_mod_ruby.conf"
+	else
+		einfo "To enable mod_ruby:"
+		einfo "1. Run \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+		einfo "2. Edit /etc/conf.d/apache and add \"-D RUBY\""
+	fi
+	einfo "You must restart apache for changes to take effect"
+}
+
+pkg_config() {
+	if [ "`use apache2`" ]; then
+		:;
+	else
+		${ROOT}/usr/sbin/apacheaddmod \
+			${ROOT}/etc/apacheconf/conf/apache.conf \
+			extramodules/mod_ruby.so mod_ruby.c ruby_module \
+			before=perl define=RUBY addconf=conf/addon-modules/mod_ruby.conf
+	fi
+}