remove 1.2.4 wrt #203578; cleanup

(Portage version: 2.1.4)

4 files changed, 52 insertions, 101 deletions

diff --git a/www-apache/mod_ruby/ChangeLog b/www-apache/mod_ruby/ChangeLog
index af9698383c1a..9088120b24e0 100644
--- a/www-apache/mod_ruby/ChangeLog
+++ b/www-apache/mod_ruby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_ruby
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ruby/ChangeLog,v 1.8 2008/01/25 17:49:52 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ruby/ChangeLog,v 1.9 2008/01/27 17:07:24 hollow Exp $
+
+  27 Jan 2008; Benedikt Böhm <hollow@gentoo.org> files/21_mod_ruby.conf,
+  -mod_ruby-1.2.4-r2.ebuild:
+  remove 1.2.4 wrt #203578; cleanup
 
   25 Jan 2008; Samuli Suominen <drac@gentoo.org> mod_ruby-1.2.6.ebuild:
   amd64 stable wrt #205518
diff --git a/www-apache/mod_ruby/files/21_mod_ruby.conf b/www-apache/mod_ruby/files/21_mod_ruby.conf
index 0f8eda7f28a6..12aa8f0fa3ef 100644
--- a/www-apache/mod_ruby/files/21_mod_ruby.conf
+++ b/www-apache/mod_ruby/files/21_mod_ruby.conf
@@ -1,55 +1,52 @@
 <IfDefine RUBY>
-  <IfModule !mod_ruby.c>
-    LoadModule ruby_module    modules/mod_ruby.so
-  </IfModule>
-</IfDefine>
+LoadModule ruby_module modules/mod_ruby.so
 
 # 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>
+# 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
+</IfDefine>
 
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_ruby/files/digest-mod_ruby-1.2.4-r2 b/www-apache/mod_ruby/files/digest-mod_ruby-1.2.4-r2
deleted file mode 100644
index 13a00484ef8c..000000000000
--- a/www-apache/mod_ruby/files/digest-mod_ruby-1.2.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2b803c021297517eecb3dc6cf77b9534 mod_ruby-1.2.4.tar.gz 107797
-RMD160 720058d331207dcc79531fdb3bf9c4080834b2cc mod_ruby-1.2.4.tar.gz 107797
-SHA256 de21cc60306100fab125ffcbc413e0128bac92133e5c1a3837d33c1cd2d6e269 mod_ruby-1.2.4.tar.gz 107797
diff --git a/www-apache/mod_ruby/mod_ruby-1.2.4-r2.ebuild b/www-apache/mod_ruby/mod_ruby-1.2.4-r2.ebuild
deleted file mode 100644
index c3c9e8204307..000000000000
--- a/www-apache/mod_ruby/mod_ruby-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_ruby/mod_ruby-1.2.4-r2.ebuild,v 1.2 2007/09/08 14:55:39 hollow Exp $
-
-inherit apache-module
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
-
-DESCRIPTION="Embeds the Ruby interpreter into Apache."
-HOMEPAGE="http://modruby.net/"
-SRC_URI="http://modruby.net/archive/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="virtual/ruby"
-DEPEND="${RDEPEND}
-		doc? ( dev-ruby/rdtool )"
-
-APACHE2_MOD_CONF="21_mod_ruby"
-APACHE2_MOD_DEFINE="RUBY"
-APACHE2_MOD_FILE="${PN}.so"
-
-DOCFILES="ChangeLog COPYING README.*"
-
-need_apache2_0
-
-src_compile() {
-	./configure.rb --with-apxs=${APXS2}
-
-	emake || die "emake failed"
-
-	if use doc ; then
-		cd doc
-		emake || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc ; then
-		dohtml doc/*.css doc/*.html
-	fi
-
-	apache-module_src_install
-}