strscan has been included since ruby 1.8

5 files changed, 25 insertions, 41 deletions

diff --git a/dev-ruby/strscan/ChangeLog b/dev-ruby/strscan/ChangeLog
index 376a580ded05..c85b53ee8da2 100644
--- a/dev-ruby/strscan/ChangeLog
+++ b/dev-ruby/strscan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/strscan
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/strscan/ChangeLog,v 1.5 2003/05/07 17:47:41 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/strscan/ChangeLog,v 1.6 2003/12/29 14:27:23 usata Exp $
+
+  29 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> strscan-0.5.8.ebuild,
+  strscan-0.6.7.ebuild:
+  strscan has been included since ruby 1.8
 
 *strscan-0.6.7 (08 Apr 2003)
 
diff --git a/dev-ruby/strscan/Manifest b/dev-ruby/strscan/Manifest
index 808ed0113200..b692df5bc178 100644
--- a/dev-ruby/strscan/Manifest
+++ b/dev-ruby/strscan/Manifest
@@ -1,6 +1,4 @@
-MD5 d53f6c606d6b8e636d1f60621c236671 ChangeLog 1094
-MD5 45a55d5c713ec92a5bc8fe65a7b16010 strscan-0.5.8.ebuild 824
-MD5 090dbe5a2639b86647c99482e45adc05 strscan-0.6.7.ebuild 735
+MD5 89117e049a70487dc17f653aafb225ad strscan-0.6.7.ebuild 748
+MD5 72b045c8fde55d50378fce2232539a55 ChangeLog 1235
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 51fc1ffced6de8ab69d3fc5a6a5545b3 files/digest-strscan-0.5.8 64
 MD5 8cdcb857296c0f0909ae9bf8cfb60fcc files/digest-strscan-0.6.7 127
diff --git a/dev-ruby/strscan/files/digest-strscan-0.5.8 b/dev-ruby/strscan/files/digest-strscan-0.5.8
deleted file mode 100644
index 1065afc99075..000000000000
--- a/dev-ruby/strscan/files/digest-strscan-0.5.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b92dbd46a187b85c1b408215f5907762 strscan-0.5.8.tar.gz 27366
diff --git a/dev-ruby/strscan/strscan-0.5.8.ebuild b/dev-ruby/strscan/strscan-0.5.8.ebuild
deleted file mode 100644
index 9b538f914a2b..000000000000
--- a/dev-ruby/strscan/strscan-0.5.8.ebuild
+++ /dev/null
@@ -1,26 +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/strscan/strscan-0.5.8.ebuild,v 1.10 2003/09/08 02:23:08 msterret Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Fast string scanning library for Ruby"
-SRC_URI="http://www1.u-netsurf.ne.jp/~brew/mine/soft/${P}.tar.gz"
-HOMEPAGE="http://www1.u-netsurf.ne.jp/~brew/mine/en/index.html"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86"
-SLOT="0"
-
-DEPEND=">=dev-lang/ruby-1.6.1
-	>=dev-ruby/amstd-1.9.5"
-
-src_compile() {
-	ruby setup.rb config --without=amstd || die
-	ruby setup.rb setup || die
-}
-
-src_install () {
-	ruby setup.rb install --bin-dir=${D}/usr/bin 			\
-	     --rb-dir=${D}/usr/lib/ruby/site_ruby/1.6 			\
-	     --so-dir=${D}/usr/lib/ruby/site_ruby/1.6/${CHOST%%-*}-linux-gnu
-	assert
-}
diff --git a/dev-ruby/strscan/strscan-0.6.7.ebuild b/dev-ruby/strscan/strscan-0.6.7.ebuild
index 9eeddd025e82..97e38a247e0d 100644
--- a/dev-ruby/strscan/strscan-0.6.7.ebuild
+++ b/dev-ruby/strscan/strscan-0.6.7.ebuild
@@ -1,23 +1,32 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/strscan/strscan-0.6.7.ebuild,v 1.2 2003/05/07 17:47:41 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/strscan/strscan-0.6.7.ebuild,v 1.3 2003/12/29 14:27:23 usata Exp $
+
+inherit ruby
+
+IUSE=""
 
 DESCRIPTION="A library for fast scanning"
 HOMEPAGE="http://i.loveruby.net/en/strscan.html"
 SRC_URI="http://i.loveruby.net/archive/strscan/${P}.tar.gz"
+
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha arm hppa mips ppc sparc x86"
-DEPEND=">=dev-lang/ruby-1.6.8"
 
-src_compile() {
-	ruby install.rb config --prefix=/usr || die
-	ruby install.rb setup || die
-}
+USE_RUBY="ruby16"
+DEPEND="=dev-lang/ruby-1.6*"
 
 src_install() {
-	ruby install.rb config --prefix=${D}/usr || die
-	ruby install.rb install || die
-	dodoc README.en doc.en/ChangeLog
+
+	einstall || die
+
+	dodoc README*
+	docinto doc.en
+	dodoc doc.en/ChangeLog doc.en/umanual.rd
 	dohtml doc.en/umanual.html
+
+	docinto doc.ja
+	dodoc doc.ja/ChangeLog doc.ja/umanual.rd
+	dohtml doc.ja/umanual.html
 }