Stable on x86. Removed old ebuilds.

7 files changed, 10 insertions, 128 deletions

diff --git a/dev-ruby/mod-ruby/ChangeLog b/dev-ruby/mod-ruby/ChangeLog
index 5a6bc28f690d..e6588f01f168 100644
--- a/dev-ruby/mod-ruby/ChangeLog
+++ b/dev-ruby/mod-ruby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/mod-ruby
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/ChangeLog,v 1.11 2004/04/16 16:50:35 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/ChangeLog,v 1.12 2004/04/30 16:20:36 usata Exp $
+
+  01 May 2004; Mamoru KOMACHI <usata@gentoo.org> mod-ruby-1.0.1.ebuild,
+  mod-ruby-1.0.7.ebuild, mod-ruby-1.1.3.ebuild:
+  Stable on x86. Removed old ebuilds.
 
 *mod-ruby-1.1.3-r1 (17 Apr 2004)
 
@@ -12,6 +16,7 @@
   11 Apr 2004; David Holm <dholm@gentoo.org> mod-ruby-1.1.3.ebuild:
   Added to ~ppc.
 
+*mod-ruby-1.1.3 (10 Apr 2004)
 *mod-ruby-1.0.7 (10 Apr 2004)
 
   10 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> mod-ruby-0.9.7.ebuild,
diff --git a/dev-ruby/mod-ruby/Manifest b/dev-ruby/mod-ruby/Manifest
index 14722afe7fb9..5d2a25bc9996 100644
--- a/dev-ruby/mod-ruby/Manifest
+++ b/dev-ruby/mod-ruby/Manifest
@@ -1,14 +1,10 @@
-MD5 8c26f311f362706330f3ce6fec5bb6e2 mod-ruby-1.0.1.ebuild 869
 MD5 63e6626d4af9973d35e7d40a38e2f2cc mod-ruby-1.1.1-r2.ebuild 2063
-MD5 d1ed05c4d193703bad9680f8890fd188 ChangeLog 2118
+MD5 abff2bd089999573c2578338bd5be754 ChangeLog 2307
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 a90d9307d00c333246966c53a13777a0 mod-ruby-1.0.7.ebuild 870
+MD5 d44581544d0c1bac85f9318df86c3ebd mod-ruby-1.0.7.ebuild 869
 MD5 fcd736e2d7eb532744e9a5ee566ab0a1 mod-ruby-1.1.3-r1.ebuild 2068
-MD5 5c173bbfedcee4a0bd876c1529cd248a mod-ruby-1.1.3.ebuild 2136
 MD5 fa5123111f5278201525d49f658b4a3b files/digest-mod-ruby-1.0.7 65
-MD5 4b96c0ca2a3a6b8360a1e619d4c64e04 files/digest-mod-ruby-1.0.1 65
 MD5 70674a49abbe9321ac65cf4932c0ad23 files/mod_ruby.conf 846
 MD5 a6dbaa099dac1d5325700347616ea724 files/digest-mod-ruby-1.1.1-r2 65
 MD5 9212f9bc81514ddee76f6c4251ca71c3 files/20_mod_ruby.conf 1286
-MD5 808f10c468d40bfb56996efe8f5eafb9 files/digest-mod-ruby-1.1.3 65
 MD5 808f10c468d40bfb56996efe8f5eafb9 files/digest-mod-ruby-1.1.3-r1 65
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
deleted file mode 100644
index b14069283e7d..000000000000
--- a/dev-ruby/mod-ruby/files/digest-mod-ruby-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ebbf6881ef7d5d9f9dace5d9ea99051 mod_ruby-1.0.1.tar.gz 56323
diff --git a/dev-ruby/mod-ruby/files/digest-mod-ruby-1.1.3 b/dev-ruby/mod-ruby/files/digest-mod-ruby-1.1.3
deleted file mode 100644
index 1d0ee8d962c0..000000000000
--- a/dev-ruby/mod-ruby/files/digest-mod-ruby-1.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e5b9158ab8884c75f1729900741bb322 mod_ruby-1.1.3.tar.gz 90888
diff --git a/dev-ruby/mod-ruby/mod-ruby-1.0.1.ebuild b/dev-ruby/mod-ruby/mod-ruby-1.0.1.ebuild
deleted file mode 100644
index 293d0c8938cd..000000000000
--- a/dev-ruby/mod-ruby/mod-ruby-1.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 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.3 2004/04/10 12:19:52 usata 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="virtual/ruby
-	=net-www/apache-2*"
-LICENSE="BSD"
-KEYWORDS="x86"
-IUSE=""
-SLOT="0"
-
-src_compile() {
-	./configure.rb --with-apxs=/usr/sbin/apxs2 || die
-	sed -i -e 's|usr/lib/apache2/modules|usr/lib/apache2-extramodules|' Makefile
-	emake || die
-}
-
-src_install() {
-	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*
-}
diff --git a/dev-ruby/mod-ruby/mod-ruby-1.0.7.ebuild b/dev-ruby/mod-ruby/mod-ruby-1.0.7.ebuild
index ef92b6034dd4..42fb256800b4 100644
--- a/dev-ruby/mod-ruby/mod-ruby-1.0.7.ebuild
+++ b/dev-ruby/mod-ruby/mod-ruby-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.7.ebuild,v 1.1 2004/04/10 12:19:52 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/mod-ruby-1.0.7.ebuild,v 1.2 2004/04/30 16:20:36 usata Exp $
 
 DESCRIPTION="An Apache2 DSO providing an embedded Tcl interpreter"
 HOMEPAGE="http://www.modruby.net/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.modruby.net/archive/mod_ruby-${PV}.tar.gz"
 DEPEND="virtual/ruby
 	=net-www/apache-2*"
 LICENSE="BSD"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 SLOT="0"
 
diff --git a/dev-ruby/mod-ruby/mod-ruby-1.1.3.ebuild b/dev-ruby/mod-ruby/mod-ruby-1.1.3.ebuild
deleted file mode 100644
index dab4f7edb2f9..000000000000
--- a/dev-ruby/mod-ruby/mod-ruby-1.1.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2004 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.3.ebuild,v 1.2 2004/04/10 23:30:00 dholm 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"
-# 1.0.X -> stable branch; 1.1.Y -> development branch
-KEYWORDS="~alpha ~sparc ~x86 ~ppc"
-IUSE="apache2 doc"
-DEPEND=">=net-www/apache-1.3.3
-	virtual/ruby
-	doc? ( dev-ruby/rdtool )"
-S=${WORKDIR}/${MY_P}
-
-apache2-detect() {
-	if [ "`has_version '=net-www/apache-1*'`" != 1 -o "`use apache2`" ]; then
-		true
-	else
-		false
-	fi
-}
-
-src_compile() {
-
-	local two
-	if apache2-detect ; then
-		two="2"
-	else	# apache1
-		ewarn "apache 1.3.x support is UNTESTED"
-		two=""
-	fi
-
-	./configure.rb --with-apxs=/usr/sbin/apxs${two}
-
-	sed -i -e "s:\(^APACHE_LIBEXECDIR = \$(DESTDIR)/usr/lib/apache${two}\)/modules:\1-extramodules:" Makefile
-
-	emake || die
-
-	if [ "`use doc`" ]; then
-		cd doc
-		emake
-	fi
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	if apache2-detect ; then
-		insinto /etc/apache2/conf/modules.d
-		doins ${FILESDIR}/20_mod_ruby.conf
-	else	# apache1
-		insinto /etc/apache/conf/addon-modules
-		doins ${FILESDIR}/mod_ruby.conf
-	fi
-
-	dodoc ChangeLog COPYING README.*
-
-	if [ "`use doc`" ]; then
-		dohtml doc/*.css doc/*.html
-	fi
-
-}
-
-pkg_postinst() {
-	if apache2-detect ; 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	# apache1
-		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 ! apache2-detect ; then
-		${ROOT}/usr/sbin/apacheaddmod \
-			${ROOT}/etc/apache/conf/apache.conf \
-			extramodules/mod_ruby.so mod_ruby.c ruby_module \
-			before=perl define=RUBY addconf=conf/addon-modules/mod_ruby.conf
-	fi
-}