Version bumped. Fixed hardcoded rubydir, closing bug #46237

9 files changed, 108 insertions, 32 deletions

diff --git a/dev-ruby/ruby-dbi/ChangeLog b/dev-ruby/ruby-dbi/ChangeLog
index 24aac076546b..c85e475148e2 100644
--- a/dev-ruby/ruby-dbi/ChangeLog
+++ b/dev-ruby/ruby-dbi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-ruby/ruby-dbi
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ChangeLog,v 1.6 2003/02/12 06:36:11 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ChangeLog,v 1.7 2004/03/31 19:02:42 usata Exp $
+
+*ruby-dbi-0.0.21 (01 Apr 2004)
+*ruby-dbi-0.0.18-r1 (01 Apr 2004)
+*ruby-dbi-0.0.16-r1 (01 Apr 2004)
+
+  01 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-dbi-0.0.16-r1.ebuild,
+  ruby-dbi-0.0.16.ebuild, ruby-dbi-0.0.18-r1.ebuild, ruby-dbi-0.0.18.ebuild,
+  ruby-dbi-0.0.21.ebuild, files/ruby-dbi-destdir-gentoo.diff:
+  Version bumped. Fixed hardcoded rubydir, closing bug #46237
 
 *ruby-dbi-0.0.18 (27 Jul 2002)
 
diff --git a/dev-ruby/ruby-dbi/Manifest b/dev-ruby/ruby-dbi/Manifest
index cd9c09b43320..d096058bbd3e 100644
--- a/dev-ruby/ruby-dbi/Manifest
+++ b/dev-ruby/ruby-dbi/Manifest
@@ -1,6 +1,9 @@
-MD5 6f95011d1ffc8b94b231a33160463afd ChangeLog 1107
-MD5 1ee825ec7f546d8120b32d3aca99f78a ruby-dbi-0.0.18.ebuild 1363
+MD5 4e2a36205a74e0dc1fc945b680cd030a ChangeLog 1484
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 ffd528791e631819fd4cd25ae2e42605 ruby-dbi-0.0.16.ebuild 1363
-MD5 231a11bc0b4c618867f8493e1332fd6c files/digest-ruby-dbi-0.0.16 70
-MD5 46b758e2be33354043eeafc93d60cd52 files/digest-ruby-dbi-0.0.18 71
+MD5 68dbcff40210c8da294b716f7104b9da ruby-dbi-0.0.21.ebuild 1286
+MD5 f8842a67477cd42ca44689d15059c817 ruby-dbi-0.0.16-r1.ebuild 1287
+MD5 9583175b3404444f002d2c13c52ced80 ruby-dbi-0.0.18-r1.ebuild 1293
+MD5 ae274a016a943bc8c69c8eb3fdc73e4d files/digest-ruby-dbi-0.0.21 71
+MD5 e50f5f0d7156002d8707cd043b077431 files/ruby-dbi-destdir-gentoo.diff 273
+MD5 231a11bc0b4c618867f8493e1332fd6c files/digest-ruby-dbi-0.0.16-r1 70
+MD5 46b758e2be33354043eeafc93d60cd52 files/digest-ruby-dbi-0.0.18-r1 71
diff --git a/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.16 b/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.16-r1
index 4184de322ecc..4184de322ecc 100644
--- a/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.16
+++ b/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.16-r1
diff --git a/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.18 b/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.18-r1
index ef6039d588ba..ef6039d588ba 100644
--- a/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.18
+++ b/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.18-r1
diff --git a/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.21 b/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.21
new file mode 100644
index 000000000000..4cc92789f1f5
--- /dev/null
+++ b/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.21
@@ -0,0 +1 @@
+MD5 e71784353b914ecdd02c9bdc5a21e65e ruby-dbi-all-0.0.21.tar.gz 131968
diff --git a/dev-ruby/ruby-dbi/files/ruby-dbi-destdir-gentoo.diff b/dev-ruby/ruby-dbi/files/ruby-dbi-destdir-gentoo.diff
new file mode 100644
index 000000000000..375adb27047b
--- /dev/null
+++ b/dev-ruby/ruby-dbi/files/ruby-dbi-destdir-gentoo.diff
@@ -0,0 +1,13 @@
+--- setup.rb.orig	2002-10-03 02:53:40.000000000 +0900
++++ setup.rb	2004-04-01 02:24:24.449195368 +0900
+@@ -627,8 +627,8 @@
+   end
+ 
+   def isdir( dn )
+-    mkpath dn
+-    dn
++    mkpath "#{ENV["DESTDIR"]}" + dn
++    "#{ENV["DESTDIR"]}" + dn
+   end
+ 
+   def mkpath( dname )
diff --git a/dev-ruby/ruby-dbi/ruby-dbi-0.0.18.ebuild b/dev-ruby/ruby-dbi/ruby-dbi-0.0.16-r1.ebuild
index a234600a191d..0198c92168c4 100644
--- a/dev-ruby/ruby-dbi/ruby-dbi-0.0.18.ebuild
+++ b/dev-ruby/ruby-dbi/ruby-dbi-0.0.16-r1.ebuild
@@ -1,6 +1,8 @@
-# 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/ruby-dbi/ruby-dbi-0.0.18.ebuild,v 1.4 2003/09/04 05:10:40 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ruby-dbi-0.0.16-r1.ebuild,v 1.1 2004/03/31 19:02:42 usata Exp $
+
+inherit ruby
 
 DESCRIPTION="Ruby/DBI - a database independent interface for accessing databases - similar to Perl's DBI"
 HOMEPAGE="http://ruby-dbi.sourceforge.net/"
@@ -8,10 +10,11 @@ SRC_URI="mirror://sourceforge/ruby-dbi/ruby-dbi-all-${PV}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
+USE_RUBY="ruby16 ruby18 ruby19"
 KEYWORDS="x86"
 IUSE="firebird odbc postgres mysql"
 
-DEPEND="=dev-lang/ruby-1.6*
+DEPEND="dev-lang/ruby
 	mysql? ( >=dev-db/mysql-3.23.49 )
 	postgres? ( >=dev-db/postgresql-7.1.3-r4 )
 	firebird? ( >=dev-db/firebird-1.0-r1 )
@@ -19,6 +22,12 @@ DEPEND="=dev-lang/ruby-1.6*
 
 S=${WORKDIR}/ruby-dbi-all
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-destdir-gentoo.diff
+}
+
 src_compile() {
 	myconf="dbi,dbd_proxy,dbd_sqlrelay"
 	use mysql && myconf="${myconf},dbd_mysql"
@@ -27,20 +36,12 @@ src_compile() {
 	use odbc && myconf="${myconf},dbd_odbc"
 
 	ruby setup.rb config \
-		--with=${myconf} \
-		--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/i686-linux-gnu" || die
-
+		--with=${myconf} --ruby-path=/usr/bin/ruby || die
 	ruby setup.rb setup || die
 }
 
 src_install() {
-	dodir /usr/bin
-	dodir /usr/lib/ruby/site_ruby/1.6
-	dodir /usr/lib/ruby/site_ruby/1.6/i686-linux-gnu
-
-	ruby setup.rb install || die
+	DESTDIR=${D} ruby setup.rb install || die
 
 	dodoc LICENSE README
 }
diff --git a/dev-ruby/ruby-dbi/ruby-dbi-0.0.16.ebuild b/dev-ruby/ruby-dbi/ruby-dbi-0.0.18-r1.ebuild
index 6ab2c20358d6..51295ecb42bc 100644
--- a/dev-ruby/ruby-dbi/ruby-dbi-0.0.16.ebuild
+++ b/dev-ruby/ruby-dbi/ruby-dbi-0.0.18-r1.ebuild
@@ -1,6 +1,8 @@
-# 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/ruby-dbi/ruby-dbi-0.0.16.ebuild,v 1.8 2003/09/04 05:10:40 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ruby-dbi-0.0.18-r1.ebuild,v 1.1 2004/03/31 19:02:42 usata Exp $
+
+inherit ruby
 
 DESCRIPTION="Ruby/DBI - a database independent interface for accessing databases - similar to Perl's DBI"
 HOMEPAGE="http://ruby-dbi.sourceforge.net/"
@@ -9,6 +11,7 @@ SRC_URI="mirror://sourceforge/ruby-dbi/ruby-dbi-all-${PV}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86"
+USE_RUBY="ruby16 ruby18 ruby19"
 IUSE="firebird odbc postgres mysql"
 
 DEPEND="=dev-lang/ruby-1.6*
@@ -19,6 +22,12 @@ DEPEND="=dev-lang/ruby-1.6*
 
 S=${WORKDIR}/ruby-dbi-all
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-destdir-gentoo.diff
+}
+
 src_compile() {
 	myconf="dbi,dbd_proxy,dbd_sqlrelay"
 	use mysql && myconf="${myconf},dbd_mysql"
@@ -27,20 +36,12 @@ src_compile() {
 	use odbc && myconf="${myconf},dbd_odbc"
 
 	ruby setup.rb config \
-		--with=${myconf} \
-		--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/i686-linux-gnu" || die
-
+		--with=${myconf} --ruby-path=/usr/bin/ruby || die
 	ruby setup.rb setup || die
 }
 
 src_install() {
-	dodir /usr/bin
-	dodir /usr/lib/ruby/site_ruby/1.6
-	dodir /usr/lib/ruby/site_ruby/1.6/i686-linux-gnu
-
-	ruby setup.rb install || die
+	DESTDIR=${D} ruby setup.rb install || die
 
 	dodoc LICENSE README
 }
diff --git a/dev-ruby/ruby-dbi/ruby-dbi-0.0.21.ebuild b/dev-ruby/ruby-dbi/ruby-dbi-0.0.21.ebuild
new file mode 100644
index 000000000000..860795582950
--- /dev/null
+++ b/dev-ruby/ruby-dbi/ruby-dbi-0.0.21.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ruby-dbi-0.0.21.ebuild,v 1.1 2004/03/31 19:02:42 usata Exp $
+
+inherit ruby
+
+DESCRIPTION="Ruby/DBI - a database independent interface for accessing databases - similar to Perl's DBI"
+HOMEPAGE="http://ruby-dbi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ruby-dbi/ruby-dbi-all-${PV}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86"
+USE_RUBY="ruby16 ruby18 ruby19"
+IUSE="firebird odbc postgres mysql"
+
+DEPEND="dev-lang/ruby
+	mysql? ( >=dev-db/mysql-3.23.49 )
+	postgres? ( >=dev-db/postgresql-7.1.3-r4 )
+	firebird? ( >=dev-db/firebird-1.0-r1 )
+	odbc? ( >=dev-db/unixODBC-2.0.6 )"
+
+S=${WORKDIR}/ruby-dbi-all
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-destdir-gentoo.diff
+}
+
+src_compile() {
+	myconf="dbi,dbd_proxy,dbd_sqlrelay"
+	use mysql && myconf="${myconf},dbd_mysql"
+	use postgres && myconf="${myconf},dbd_pg"
+	use firebird && myconf="${myconf},dbd_interbase"
+	use odbc && myconf="${myconf},dbd_odbc"
+
+	ruby setup.rb config \
+		--with=${myconf} --ruby-path=/usr/bin/ruby || die
+	ruby setup.rb setup || die
+}
+
+src_install() {
+
+	DESTDIR=${D} ruby setup.rb install || die
+
+	dodoc LICENSE README
+}