remove 1.2.4 wrt #203578; cleanup

Package-Manager: portage-2.1.4

5 files changed, 70 insertions, 117 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/Manifest b/www-apache/mod_ruby/Manifest
index 10548638eff7..f8bbd7d91b1e 100644
--- a/www-apache/mod_ruby/Manifest
+++ b/www-apache/mod_ruby/Manifest
@@ -1,28 +1,30 @@
-AUX 21_mod_ruby.conf 1281 RMD160 1ff18ac15c19e46fdf3107356eb6b0badca84fed SHA1 3374d500120d7a26c00a9ea1af235e9740adf19f SHA256 9795729cb0d17e525cdc8829fb36aabddb0e2a87849ebd186df814be33f97323
-MD5 d87224e9645bea207d6db5f6a2079e97 files/21_mod_ruby.conf 1281
-RMD160 1ff18ac15c19e46fdf3107356eb6b0badca84fed files/21_mod_ruby.conf 1281
-SHA256 9795729cb0d17e525cdc8829fb36aabddb0e2a87849ebd186df814be33f97323 files/21_mod_ruby.conf 1281
-DIST mod_ruby-1.2.4.tar.gz 107797 RMD160 720058d331207dcc79531fdb3bf9c4080834b2cc SHA1 758e1706944ab77a1547c88ceb0aadd69131d732 SHA256 de21cc60306100fab125ffcbc413e0128bac92133e5c1a3837d33c1cd2d6e269
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 21_mod_ruby.conf 1103 RMD160 14a462bcbdf4a251c4dcb663e1d13826caf8e882 SHA1 e71091e821c2e7345013c53c2d78aa203ba5fb96 SHA256 eb2fc5459d69044fb17b51c4e969d7bb62bc685fcc0ff5f0cc1847c0ddbbb532
+MD5 b55e543409dbd148d777534716eb33b9 files/21_mod_ruby.conf 1103
+RMD160 14a462bcbdf4a251c4dcb663e1d13826caf8e882 files/21_mod_ruby.conf 1103
+SHA256 eb2fc5459d69044fb17b51c4e969d7bb62bc685fcc0ff5f0cc1847c0ddbbb532 files/21_mod_ruby.conf 1103
 DIST mod_ruby-1.2.6.tar.gz 110886 RMD160 08a7beb415608d93b7e48b484e3969a08eec4f31 SHA1 3934fdb206a78baf9deb592334ef4d05400ea133 SHA256 d4e7385271a20309ce997f7460ea4a8805bb614ca3eb956d34f0934cce98685a
-EBUILD mod_ruby-1.2.4-r2.ebuild 995 RMD160 075b519a837cc2f6524f6f2391ac289f44a923ca SHA1 7d5fdbd91420ccc5dcb8e0f0ea145a6a1dd702d4 SHA256 be90d564a258c606f04c83bb386f26eebc68549ed70dd3c21e93b650ffad9614
-MD5 44a68e13c208bfb7f8943ab748124690 mod_ruby-1.2.4-r2.ebuild 995
-RMD160 075b519a837cc2f6524f6f2391ac289f44a923ca mod_ruby-1.2.4-r2.ebuild 995
-SHA256 be90d564a258c606f04c83bb386f26eebc68549ed70dd3c21e93b650ffad9614 mod_ruby-1.2.4-r2.ebuild 995
 EBUILD mod_ruby-1.2.6.ebuild 1044 RMD160 63a9108805a83ac570537a06e55ab608dc3fc6ba SHA1 6fcfa598c917f74e052504c835ffa26b99484263 SHA256 b382fd635fd29f8f44ca74e97aa885e7da8d0209897c2e2be93b6d8f9b10e985
 MD5 54221e52ba13f6dd4fe23a0d9da9bd17 mod_ruby-1.2.6.ebuild 1044
 RMD160 63a9108805a83ac570537a06e55ab608dc3fc6ba mod_ruby-1.2.6.ebuild 1044
 SHA256 b382fd635fd29f8f44ca74e97aa885e7da8d0209897c2e2be93b6d8f9b10e985 mod_ruby-1.2.6.ebuild 1044
-MISC ChangeLog 6840 RMD160 e78f0c7eabbfb673a754ad399c345b944ffd222a SHA1 0b97e6d19d3204b5d2c94e9141bcc807e050d94c SHA256 d5edf2a90228eaf60a60f1ce5032111cd0d01de8b884150cb705e8ff972aee2a
-MD5 ed3dc3ba4b29cc8c6649b44170b0d278 ChangeLog 6840
-RMD160 e78f0c7eabbfb673a754ad399c345b944ffd222a ChangeLog 6840
-SHA256 d5edf2a90228eaf60a60f1ce5032111cd0d01de8b884150cb705e8ff972aee2a ChangeLog 6840
+MISC ChangeLog 6982 RMD160 dd4dfe568db4743ff3b048334b4be73e319abd3c SHA1 863c6b3b63461a50e18c45ce25cab84b360df7c3 SHA256 a4ac03d86eb874b5de60b0053dc56eabfe08f36a06516979a8e17bf6b0c4ab58
+MD5 e9ee805f050a9d92c107de36cd7d7cd9 ChangeLog 6982
+RMD160 dd4dfe568db4743ff3b048334b4be73e319abd3c ChangeLog 6982
+SHA256 a4ac03d86eb874b5de60b0053dc56eabfe08f36a06516979a8e17bf6b0c4ab58 ChangeLog 6982
 MISC metadata.xml 179 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af SHA1 31e15b20d55994a9989fff90a20847c1e76db2cb SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe
 MD5 73837d39c976941977b0a4c4f68981a2 metadata.xml 179
 RMD160 046a67d39c9a5784800b120b3da44d67caa1f0af metadata.xml 179
 SHA256 d07e5a69f0aaee3b23884e0e414fad4aba70b9f4a115d2649714b8f1bd99d9fe metadata.xml 179
-MD5 75be4473dc459edc735afffc22e7286f files/digest-mod_ruby-1.2.4-r2 244
-RMD160 712cfc4c89c7e38d1395f382c8c13d8f238f5148 files/digest-mod_ruby-1.2.4-r2 244
-SHA256 57332d36af400be75bbc47ca681c829c106ea64be950486a83da38a498632272 files/digest-mod_ruby-1.2.4-r2 244
 MD5 fe074a4c5ee111013667a6bad247780f files/digest-mod_ruby-1.2.6 244
 RMD160 92303665c1be5f465db7ead5463c0dd77de6da2a files/digest-mod_ruby-1.2.6 244
 SHA256 6b44eb358d4387ed416c679db588825c6e33e30d5403b7ea923371ba20dfe73e files/digest-mod_ruby-1.2.6 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeculQACgkQmPFBzbX68WHJ9ACggjcSZjmLXiHTqMA16N3c8MVs
+qWgAn3BlRfgwztc4Ht8urLFSylVku9t1
+=JRvO
+-----END PGP SIGNATURE-----
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
-}