fix bug 27047 and bump the version

6 files changed, 62 insertions, 19 deletions

diff --git a/dev-ruby/rdtool/ChangeLog b/dev-ruby/rdtool/ChangeLog
index 753b10010e54..4b893166c8ef 100644
--- a/dev-ruby/rdtool/ChangeLog
+++ b/dev-ruby/rdtool/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-ruby/rdtool
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/ChangeLog,v 1.7 2003/08/24 20:38:22 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/ChangeLog,v 1.8 2003/09/07 03:11:16 agriffis Exp $
+
+*rdtool-0.6.14 (06 Sep 2003)
+
+  06 Sep 2003; Aron Griffis <agriffis@gentoo.org> rdtool-0.6.11-r1.ebuild,
+  rdtool-0.6.11.ebuild, rdtool-0.6.14.ebuild:
+  Version bump to 0.6.14; still requires ruby-1.8.0 though
+
+  06 Sep 2003; Aron Griffis <agriffis@gentoo.org> rdtool-0.6.11-r1.ebuild,
+  rdtool-0.6.11.ebuild:
+  Restrict this ebuild to ruby 1.8.0 and mark ~arch until ruby 1.8.0 is marked
+  stable. This fixes bug 27047
 
 *rdtool-0.6.11-r1 (11 Jun 2003)
 
diff --git a/dev-ruby/rdtool/Manifest b/dev-ruby/rdtool/Manifest
index 929ebae398e8..2843d5a622bc 100644
--- a/dev-ruby/rdtool/Manifest
+++ b/dev-ruby/rdtool/Manifest
@@ -1,7 +1,7 @@
-MD5 d896c10eeb57ee26f74a11463bc07292 rdtool-0.6.11.ebuild 807
-MD5 10e46ddb7232427fa58cbb71555a2b8c rdtool-0.6.11-r1.ebuild 957
-MD5 55b6cb6673783bbb927ea5dd63692523 rdtool-0.6.14.ebuild 960
-MD5 2e1b9512ef445c5c56ee3cdf63e195db ChangeLog 1466
+MD5 63c5295bebd331bfc3c99fd5aa7767fa rdtool-0.6.11.ebuild 809
+MD5 6a749792ec96af2e4d6323da7ee97474 rdtool-0.6.11-r1.ebuild 962
+MD5 12f6d75e0abfb009e2949545064c5a9f rdtool-0.6.14.ebuild 763
+MD5 b5cd0bd65db2bcc9b205486ffabf1723 ChangeLog 1682
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 e4ac155f69c7403d52b2a491e8888147 files/digest-rdtool-0.6.11 64
 MD5 41064cf5f81f7c2640dd70e4792df30b files/digest-rdtool-0.6.14 64
diff --git a/dev-ruby/rdtool/files/digest-rdtool-0.6.14 b/dev-ruby/rdtool/files/digest-rdtool-0.6.14
new file mode 100644
index 000000000000..3ab99459e4f7
--- /dev/null
+++ b/dev-ruby/rdtool/files/digest-rdtool-0.6.14
@@ -0,0 +1 @@
+MD5 908e750737c628e060dfb1468ac8ae62 rdtool-0.6.14.tar.gz 58750
diff --git a/dev-ruby/rdtool/rdtool-0.6.11-r1.ebuild b/dev-ruby/rdtool/rdtool-0.6.11-r1.ebuild
index 0d624e0603d3..3156cf426085 100644
--- a/dev-ruby/rdtool/rdtool-0.6.11-r1.ebuild
+++ b/dev-ruby/rdtool/rdtool-0.6.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.11-r1.ebuild,v 1.2 2003/08/24 20:38:22 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.11-r1.ebuild,v 1.3 2003/09/07 03:11:16 agriffis Exp $
 
 DESCRIPTION="A multipurpose documentation format for Ruby"
 HOMEPAGE="http://www2.pos.to/~tosh/ruby/rdtool/en/index.html"
@@ -9,11 +9,12 @@ LICENSE="Ruby GPL-1"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-DEPEND=">=dev-lang/ruby-1.6.4
-	dev-ruby/amstd
-	dev-ruby/optparse
+DEPEND=">=dev-lang/ruby-1.8.0
 	>=dev-ruby/racc-1.3
-	dev-ruby/strscan"
+	dev-ruby/amstd"
+	# These are part of ruby as of 1.8.0 (06 Sep 2003 agriffis)
+	# dev-ruby/optparse
+	# dev-ruby/strscan
 
 src_compile() {
 	ruby rdtoolconf.rb || die
diff --git a/dev-ruby/rdtool/rdtool-0.6.11.ebuild b/dev-ruby/rdtool/rdtool-0.6.11.ebuild
index 64032d694b8e..c0dd74e779bc 100644
--- a/dev-ruby/rdtool/rdtool-0.6.11.ebuild
+++ b/dev-ruby/rdtool/rdtool-0.6.11.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.11.ebuild,v 1.3 2003/02/13 11:41:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.11.ebuild,v 1.4 2003/09/07 03:11:16 agriffis Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Fast string scanning library for Ruby"
+DESCRIPTION="A multipurpose documentation format for Ruby"
 SRC_URI="http://www2.pos.to/~tosh/ruby/rdtool/archive/${P}.tar.gz"
 HOMEPAGE="http://www2.pos.to/~tosh/ruby/rdtool/en/index.html"
 LICENSE="Ruby"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 SLOT="0"
 
-DEPEND=">=dev-lang/ruby-1.6.1
-        >=dev-ruby/racc-1.3
-        >=dev-ruby/strscan-0.5.8
-        >=dev-ruby/optparse-0.7.5"
+DEPEND=">=dev-lang/ruby-1.8.0
+	>=dev-ruby/racc-1.3"
+	# These are part of ruby as of 1.8.0 (06 Sep 2003 agriffis)
+	# >=dev-ruby/optparse-0.7.5
+	# >=dev-ruby/strscan-0.5.8
 
 src_compile() {
 	ruby rdtoolconf.rb || die
@@ -25,6 +25,6 @@ src_install () {
 	dobin rd2
 
 	cd ${S}/rd
-	insinto /usr/lib/ruby/site_ruby/1.6/rd
+	insinto /usr/lib/ruby/site_ruby/1.8/rd
 	doins dot.rd2rc *.rb
 }
diff --git a/dev-ruby/rdtool/rdtool-0.6.14.ebuild b/dev-ruby/rdtool/rdtool-0.6.14.ebuild
new file mode 100644
index 000000000000..74c8baa8103c
--- /dev/null
+++ b/dev-ruby/rdtool/rdtool-0.6.14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.14.ebuild,v 1.1 2003/09/07 03:11:16 agriffis Exp $
+
+IUSE=""
+
+inherit ruby
+
+DESCRIPTION="A multipurpose documentation format for Ruby"
+HOMEPAGE="http://www2.pos.to/~tosh/ruby/rdtool/en/index.html"
+SRC_URI="http://www2.pos.to/~tosh/ruby/rdtool/archive/${P}.tar.gz"
+LICENSE="Ruby GPL-1"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND=">=dev-lang/ruby-1.8.0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's:^BIN_DIR = :&$(DESTDIR):' \
+	       -e 's:^SITE_RUBY = :&$(DESTDIR):' rdtoolconf.rb \
+		|| die "sed failed"
+	mv rdtoolconf.rb extconf.rb
+}
+
+src_install() {
+	dodir /usr/bin
+	ruby_src_install
+}