Version bumped and removed old ebuilds. virtual/ruby fix

10 files changed, 43 insertions, 118 deletions

diff --git a/dev-ruby/eruby/ChangeLog b/dev-ruby/eruby/ChangeLog
index d3d35860a306..6d0523b6b378 100644
--- a/dev-ruby/eruby/ChangeLog
+++ b/dev-ruby/eruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/eruby
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/ChangeLog,v 1.7 2003/08/30 09:00:49 twp Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/ChangeLog,v 1.8 2004/04/10 08:42:58 usata Exp $
+
+*eruby-1.0.5 (10 Apr 2004)
+
+  10 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> eruby-0.9.7.ebuild,
+  eruby-1.0.3-r1.ebuild, eruby-1.0.3.ebuild, eruby-1.0.4.ebuild,
+  eruby-1.0.5.ebuild:
+  Version bumped. virtual/ruby fix
 
 *eruby-1.0.4 (30 Aug 2003)
 
diff --git a/dev-ruby/eruby/Manifest b/dev-ruby/eruby/Manifest
index 1661613a9126..58db6fc3cd5f 100644
--- a/dev-ruby/eruby/Manifest
+++ b/dev-ruby/eruby/Manifest
@@ -1,10 +1,8 @@
-MD5 759c9adc92b13d953093a9a3c0034d30 eruby-0.9.7.ebuild 1368
+MD5 f3a80f745a1356d9aad3a480404b2b54 eruby-1.0.5.ebuild 655
 MD5 96e522c34cec49fa96402e809133ca71 eruby-1.0.4.ebuild 657
-MD5 5c02073fa59087c256fff4cbcedb2f8c eruby-1.0.3.ebuild 1343
 MD5 913d207536e71b573f9db2cfb15fba92 eruby-1.0.3-r1.ebuild 660
 MD5 60c15f4924256099f80f592df2118807 ChangeLog 996
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 c01daafdce3c8c3e5f019f4dfbf475f7 files/digest-eruby-1.0.3-r1 62
-MD5 996e52e2873ab9a3c02633ef62de8227 files/digest-eruby-0.9.7 62
-MD5 5e1df18ddc8a1785676fcaef9dae68eb files/digest-eruby-1.0.3 124
+MD5 84b65bdd760237143419ca0468f15cb5 files/digest-eruby-1.0.5 62
 MD5 587f23a0f3a12e96b8838b41d5a9cff1 files/digest-eruby-1.0.4 62
diff --git a/dev-ruby/eruby/eruby-0.9.7.ebuild b/dev-ruby/eruby/eruby-0.9.7.ebuild
deleted file mode 100644
index ef8f9189c1bd..000000000000
--- a/dev-ruby/eruby/eruby-0.9.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Maintaner: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/eruby-0.9.7.ebuild,v 1.8 2003/09/08 02:19:31 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="eRuby interprets a Ruby code embedded text file."
-SRC_URI="http://www.modruby.net/archive/eruby-${PV}.tar.gz"
-HOMEPAGE="http://www.modruby.net"
-LICENSE="GPL-2 | LGPL-2.1"
-KEYWORDS="x86"
-SLOT="0"
-
-DEPEND="virtual/glibc
-	>=dev-lang/ruby-1.6.1"
-
-src_compile() {
-	ruby ./configure.rb --with-charset=iso-8859-15 || die
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc README.* 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 "
-<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
-	fi
-}
diff --git a/dev-ruby/eruby/eruby-1.0.3-r1.ebuild b/dev-ruby/eruby/eruby-1.0.3-r1.ebuild
index 9db5503d1d41..ff97e167c471 100644
--- a/dev-ruby/eruby/eruby-1.0.3-r1.ebuild
+++ b/dev-ruby/eruby/eruby-1.0.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Maintaner: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/eruby-1.0.3-r1.ebuild,v 1.3 2004/02/22 22:21:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/eruby-1.0.3-r1.ebuild,v 1.4 2004/04/10 08:42:58 usata Exp $
 
 DESCRIPTION="eRuby interprets a Ruby code embedded text file"
 HOMEPAGE="http://www.modruby.net/"
@@ -9,7 +9,7 @@ SRC_URI="http://www.modruby.net/archive/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha hppa mips sparc x86"
-DEPEND=">=dev-lang/ruby-1.6"
+DEPEND="virtual/ruby"
 
 src_compile() {
 	ruby configure.rb || die
diff --git a/dev-ruby/eruby/eruby-1.0.3.ebuild b/dev-ruby/eruby/eruby-1.0.3.ebuild
deleted file mode 100644
index 27793f8d3d60..000000000000
--- a/dev-ruby/eruby/eruby-1.0.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Maintaner: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/eruby-1.0.3.ebuild,v 1.2 2003/09/08 02:19:31 msterret Exp $
-
-DESCRIPTION="eRuby interprets a Ruby code embedded text file."
-SRC_URI="http://www.modruby.net/archive/${P}.tar.gz"
-HOMEPAGE="http://www.modruby.net"
-LICENSE="GPL-2 | LGPL-2.1"
-KEYWORDS="x86"
-SLOT="0"
-
-DEPEND="virtual/glibc
-	>=dev-lang/ruby-1.6.1"
-
-src_compile() {
-	ruby ./configure.rb --with-charset=iso-8859-15 || die
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc README.* 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 "
-<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
-	fi
-}
diff --git a/dev-ruby/eruby/eruby-1.0.4.ebuild b/dev-ruby/eruby/eruby-1.0.4.ebuild
index 35c66b454c3d..57ef37b6ab1b 100644
--- a/dev-ruby/eruby/eruby-1.0.4.ebuild
+++ b/dev-ruby/eruby/eruby-1.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Maintaner: Tools Team <tools@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/eruby-1.0.4.ebuild,v 1.3 2004/02/22 22:21:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/eruby-1.0.4.ebuild,v 1.4 2004/04/10 08:42:58 usata Exp $
 
 DESCRIPTION="eRuby interprets a Ruby code embedded text file"
 HOMEPAGE="http://www.modruby.net/"
@@ -9,7 +9,7 @@ SRC_URI="http://www.modruby.net/archive/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha hppa mips sparc x86"
-DEPEND=">=dev-lang/ruby-1.6"
+DEPEND="virtual/ruby"
 
 src_compile() {
 	ruby configure.rb || die
diff --git a/dev-ruby/eruby/eruby-1.0.5.ebuild b/dev-ruby/eruby/eruby-1.0.5.ebuild
new file mode 100644
index 000000000000..7d646dd97362
--- /dev/null
+++ b/dev-ruby/eruby/eruby-1.0.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# Maintaner: Tools Team <tools@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eruby/eruby-1.0.5.ebuild,v 1.1 2004/04/10 08:42:58 usata Exp $
+
+inherit ruby
+
+DESCRIPTION="eRuby interprets a Ruby code embedded text file"
+HOMEPAGE="http://www.modruby.net/"
+SRC_URI="http://www.modruby.net/archive/${P}.tar.gz"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~hppa ~mips ~sparc ~x86"
+DEPEND="virtual/ruby"
+USE_RUBY="ruby16 ruby18"	# doesn't build on ruby19
+
+src_compile() {
+	ruby configure.rb || die
+	make || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc ChangeLog README*
+}
diff --git a/dev-ruby/eruby/files/digest-eruby-0.9.7 b/dev-ruby/eruby/files/digest-eruby-0.9.7
deleted file mode 100644
index 7fd3cef85f93..000000000000
--- a/dev-ruby/eruby/files/digest-eruby-0.9.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e07119bc6af7ab06788cd355d962423 eruby-0.9.7.tar.gz 60589
diff --git a/dev-ruby/eruby/files/digest-eruby-1.0.3 b/dev-ruby/eruby/files/digest-eruby-1.0.3
deleted file mode 100644
index f84ad46c284b..000000000000
--- a/dev-ruby/eruby/files/digest-eruby-1.0.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 86e02fe5a39e0ddaa4f2770cc4cab218 /eruby-1.0.3.ebuild 1341
-MD5 a6ac9089cf0536e9fad01b3f5eb16287 eruby-1.0.3.tar.gz 60514
diff --git a/dev-ruby/eruby/files/digest-eruby-1.0.5 b/dev-ruby/eruby/files/digest-eruby-1.0.5
new file mode 100644
index 000000000000..ba85f70b515e
--- /dev/null
+++ b/dev-ruby/eruby/files/digest-eruby-1.0.5
@@ -0,0 +1 @@
+MD5 af294fe34dc6cf24228aec95167b3099 eruby-1.0.5.tar.gz 61187