Version bumped (stable and development branch). Removed old ebuild and marked 1.0.1-r2 stable. virtual/ruby fix

10 files changed, 162 insertions, 93 deletions

diff --git a/dev-ruby/mod-ruby/ChangeLog b/dev-ruby/mod-ruby/ChangeLog
index 752793104105..45a59c4295c8 100644
--- a/dev-ruby/mod-ruby/ChangeLog
+++ b/dev-ruby/mod-ruby/ChangeLog
@@ -1,6 +1,14 @@
 # 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.8 2004/02/20 18:15:13 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/ChangeLog,v 1.9 2004/04/10 12:19:52 usata Exp $
+
+*mod-ruby-1.0.7 (10 Apr 2004)
+
+  10 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> mod-ruby-0.9.7.ebuild,
+  mod-ruby-1.0.1.ebuild, mod-ruby-1.0.7.ebuild, mod-ruby-1.1.1-r2.ebuild,
+  mod-ruby-1.1.3.ebuild:
+  Version bumped (stable and development branch). Removed old ebuild and
+  marked 1.0.1 stable. virtual/ruby fix
 
 *mod-ruby-1.1.1-r2 (21 Feb 2004)
 
diff --git a/dev-ruby/mod-ruby/Manifest b/dev-ruby/mod-ruby/Manifest
index 1f114091ab0b..3c0239c4300e 100644
--- a/dev-ruby/mod-ruby/Manifest
+++ b/dev-ruby/mod-ruby/Manifest
@@ -1,10 +1,12 @@
-MD5 ebf0500e9e59d69305f62a1d6e090a9f mod-ruby-1.0.1.ebuild 879
-MD5 0180ae6fd56ad8e1f4c905f0cee96cfb mod-ruby-1.1.1-r2.ebuild 2142
-MD5 0c477184c36b7e6b5f3b24f1c885f984 ChangeLog 1436
+MD5 8c26f311f362706330f3ce6fec5bb6e2 mod-ruby-1.0.1.ebuild 869
+MD5 6e88c22a53a143107cf9508c1d404d66 mod-ruby-1.1.1-r2.ebuild 2134
+MD5 36d28c183bda9757b2a1bc9ef6e49248 ChangeLog 1752
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 395409f8e76d1865da4252b930cf6628 mod-ruby-0.9.7.ebuild 1555
-MD5 fc27ee361a3840e30d4e4d025d08559f files/digest-mod-ruby-0.9.7 65
+MD5 a90d9307d00c333246966c53a13777a0 mod-ruby-1.0.7.ebuild 870
+MD5 a86a3b3a963e03b4d026757cfbb9f354 mod-ruby-1.1.3.ebuild 2131
+MD5 fa5123111f5278201525d49f658b4a3b files/digest-mod-ruby-1.0.7 65
 MD5 4b96c0ca2a3a6b8360a1e619d4c64e04 files/digest-mod-ruby-1.0.1 65
 MD5 77b4dff16b861be3dbb9c6bc3c9e66b6 files/mod_ruby.conf 859
 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
diff --git a/dev-ruby/mod-ruby/files/digest-mod-ruby-0.9.7 b/dev-ruby/mod-ruby/files/digest-mod-ruby-0.9.7
deleted file mode 100644
index 4b64c8c192d5..000000000000
--- a/dev-ruby/mod-ruby/files/digest-mod-ruby-0.9.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 542ddd4bee5d5414cb7bb7beb36591a9 mod_ruby-0.9.7.tar.gz 41442
diff --git a/dev-ruby/mod-ruby/files/digest-mod-ruby-1.0.7 b/dev-ruby/mod-ruby/files/digest-mod-ruby-1.0.7
new file mode 100644
index 000000000000..8fe913b4be29
--- /dev/null
+++ b/dev-ruby/mod-ruby/files/digest-mod-ruby-1.0.7
@@ -0,0 +1 @@
+MD5 b03bb4e2fe58f6f3251a8aa168364221 mod_ruby-1.0.7.tar.gz 69035
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
new file mode 100644
index 000000000000..1d0ee8d962c0
--- /dev/null
+++ b/dev-ruby/mod-ruby/files/digest-mod-ruby-1.1.3
@@ -0,0 +1 @@
+MD5 e5b9158ab8884c75f1729900741bb322 mod_ruby-1.1.3.tar.gz 90888
diff --git a/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild b/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild
deleted file mode 100644
index e8d8a3d580b4..000000000000
--- a/dev-ruby/mod-ruby/mod-ruby-0.9.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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-0.9.7.ebuild,v 1.9 2003/09/08 02:23:08 msterret Exp $
-
-S=${WORKDIR}/mod_ruby-${PV}
-DESCRIPTION="A Ruby Module for Apache"
-SRC_URI="http://www.modruby.net/archive/mod_ruby-${PV}.tar.gz"
-HOMEPAGE="http://www.modruby.net"
-LICENSE="GPL-2 | LGPL-2.1"
-KEYWORDS="x86"
-SLOT="0"
-
-DEPEND="=net-www/apache-1* >=dev-lang/ruby-1.6.1"
-
-src_compile() {
-	ruby ./configure.rb --with-apxs=/usr/sbin/apxs || die
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc README.en README.ja ChangeLog COPYING
-}
-
-pkg_postinst() {
-	einfo "Run ebuild ruby-${PV}.ebuild config to update httpd.conf"
-}
-
-pkg_config() {
-	if [ -f "${ROOT}/etc/httpd/httpd.conf" ] ; then
-		einfo "Activating ruby interpretation for /ruby location"
-		cp ${ROOT}/etc/httpd/httpd.conf ${ROOT}/etc/httpd/httpd.conf.orig
-		echo "
-<IfDefine RUBY>
-LoadModule ruby_module	      /usr/lib/apache/mod_ruby.so
-</IfDefine>
-
-<IfDefine RUBY>
-AddModule mod_ruby.c
-</IfDefine>
-
-<IfModule mod_ruby.c>
-RubyRequire apache/ruby-run
-
-# Excucute files under /ruby as Ruby scripts
-<Location /ruby>
-	SetHandler ruby-object
-	RubyHandler Apache::RubyRun.instance
-</Location>
-
-# Execute *.rbx files as Ruby scripts
-<Files *.rbx>
-	SetHandler ruby-object
-	RubyHandler Apache::RubyRun.instance
-</Files>
-</IfModule>" >> ${ROOT}/etc/httpd/httpd.conf
-		einfo "Add -DRUBY to HTTPD_OPTS in ${ROOT}/etc/conf.d/httpd to activate mod_ruby"
-	fi
-}
diff --git a/dev-ruby/mod-ruby/mod-ruby-1.0.1.ebuild b/dev-ruby/mod-ruby/mod-ruby-1.0.1.ebuild
index d883a3a8e389..293d0c8938cd 100644
--- a/dev-ruby/mod-ruby/mod-ruby-1.0.1.ebuild
+++ b/dev-ruby/mod-ruby/mod-ruby-1.0.1.ebuild
@@ -1,26 +1,26 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.2 2003/02/13 11:40:30 vapier Exp $
+# $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="dev-lang/ruby =net-www/apache-2*"
+DEPEND="virtual/ruby
+	=net-www/apache-2*"
 LICENSE="BSD"
-KEYWORDS="~x86"
+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() {
-	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
diff --git a/dev-ruby/mod-ruby/mod-ruby-1.0.7.ebuild b/dev-ruby/mod-ruby/mod-ruby-1.0.7.ebuild
new file mode 100644
index 000000000000..ef92b6034dd4
--- /dev/null
+++ b/dev-ruby/mod-ruby/mod-ruby-1.0.7.ebuild
@@ -0,0 +1,29 @@
+# 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 $
+
+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.1.1-r2.ebuild b/dev-ruby/mod-ruby/mod-ruby-1.1.1-r2.ebuild
index 3ce1cbf252af..08ca6e38dd92 100644
--- a/dev-ruby/mod-ruby/mod-ruby-1.1.1-r2.ebuild
+++ b/dev-ruby/mod-ruby/mod-ruby-1.1.1-r2.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.1.1-r2.ebuild,v 1.4 2004/02/20 18:15:13 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/mod-ruby-1.1.1-r2.ebuild,v 1.5 2004/04/10 12:19:52 usata Exp $
 
 MY_P=mod_ruby-${PV}
 DESCRIPTION="Embeds the Ruby interpreter into Apache"
@@ -8,50 +8,52 @@ 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"
 IUSE="apache2 doc"
 DEPEND=">=net-www/apache-1.3.3
-	>=dev-lang/ruby-1.6.4
+	virtual/ruby
 	doc? ( dev-ruby/rdtool )"
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
-
-	if [ "`use apache2`" -o "`has_version '=net-www/apache-1*'`" != 1 ]; then
-		:;
+apache2-detect() {
+	if [ "`has_version '=net-www/apache-1*'`" != 1 -o "`use apache2`" ]; then
+		true
 	else
-		ewarn "apache 1.3.x support is UNTESTED"
+		false
 	fi
+}
+
+src_compile() {
 
 	local two
-	if [ -n "`use apache2`" -o "`has_version '=net-www/apache-1*'`" != 1 ]; then
+	if apache2-detect ; then
 		two="2"
-	else
+	else	# apache1
+		ewarn "apache 1.3.x support is UNTESTED"
 		two=""
 	fi
 
 	./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
+	sed -i -e "s:\(^APACHE_LIBEXECDIR = \$(DESTDIR)/usr/lib/apache${two}\)/modules:\1-extramodules:" Makefile
 
 	emake || die
 
 	if [ "`use doc`" ]; then
-		( cd doc && emake )
+		cd doc
+		emake
 	fi
-
 }
 
 src_install() {
 
 	make DESTDIR=${D} install || die
 
-	if [ "`use apache2`" ]; then
+	if apache2-detect ; then
 		insinto /etc/apache2/conf/modules.d
 		doins ${FILESDIR}/20_mod_ruby.conf
-	else
+	else	# apache1
 		insinto /etc/apache/conf/addon-modules
 		doins ${FILESDIR}/mod_ruby.conf
 	fi
@@ -65,10 +67,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ "`use apache2`" ]; then
+	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
+	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\""
@@ -77,9 +79,7 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	if [ "`use apache2`" ]; then
-		:
-	else
+	if ! apache2-detect ; then
 		${ROOT}/usr/sbin/apacheaddmod \
 			${ROOT}/etc/apache/conf/apache.conf \
 			extramodules/mod_ruby.so mod_ruby.c ruby_module \
diff --git a/dev-ruby/mod-ruby/mod-ruby-1.1.3.ebuild b/dev-ruby/mod-ruby/mod-ruby-1.1.3.ebuild
new file mode 100644
index 000000000000..53a795606596
--- /dev/null
+++ b/dev-ruby/mod-ruby/mod-ruby-1.1.3.ebuild
@@ -0,0 +1,88 @@
+# 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.1 2004/04/10 12:19:52 usata 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"
+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
+}