Deps should be on ruby packages and not directly on the databases. Also, mark x86 stable and remove ruby16

(Portage version: 2.1_pre3-r1)

4 files changed, 64 insertions, 5 deletions

diff --git a/dev-ruby/ruby-dbi/ChangeLog b/dev-ruby/ruby-dbi/ChangeLog
index e9501b3f46f5..18dc48dd795f 100644
--- a/dev-ruby/ruby-dbi/ChangeLog
+++ b/dev-ruby/ruby-dbi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/ruby-dbi
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ChangeLog,v 1.13 2005/04/30 19:08:27 fmccor Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ChangeLog,v 1.14 2006/01/12 12:49:17 caleb Exp $
+
+*ruby-dbi-0.0.21-r2 (12 Jan 2006)
+
+  12 Jan 2006; Caleb Tennis <caleb@gentoo.org> +ruby-dbi-0.0.21-r2.ebuild:
+  Deps should be on ruby packages and not directly on the databases. Also,
+  mark x86 stable and remove ruby16
 
   30 Apr 2005; Ferris McCormick <fmccor@gentoo.org>
   ruby-dbi-0.0.21-r1.ebuild:
diff --git a/dev-ruby/ruby-dbi/Manifest b/dev-ruby/ruby-dbi/Manifest
index 12fda5ff832d..31d192d7a61c 100644
--- a/dev-ruby/ruby-dbi/Manifest
+++ b/dev-ruby/ruby-dbi/Manifest
@@ -1,7 +1,9 @@
 MD5 5c1ba98bec5d0f32391e803a894f7ce9 ChangeLog 2264
-MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 ba9e1cfcc3d6f89394beb5c852b51333 ruby-dbi-0.0.21-r1.ebuild 1382
-MD5 6b00ee137fd711be2e6c16e01fd680c8 ruby-dbi-0.0.21.ebuild 1290
 MD5 ae274a016a943bc8c69c8eb3fdc73e4d files/digest-ruby-dbi-0.0.21 71
 MD5 ae274a016a943bc8c69c8eb3fdc73e4d files/digest-ruby-dbi-0.0.21-r1 71
+MD5 ae274a016a943bc8c69c8eb3fdc73e4d files/digest-ruby-dbi-0.0.21-r2 71
 MD5 e50f5f0d7156002d8707cd043b077431 files/ruby-dbi-destdir-gentoo.diff 273
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 ba9e1cfcc3d6f89394beb5c852b51333 ruby-dbi-0.0.21-r1.ebuild 1382
+MD5 e8ec89676365cf9cfe7fba088dd4b846 ruby-dbi-0.0.21-r2.ebuild 1373
+MD5 6b00ee137fd711be2e6c16e01fd680c8 ruby-dbi-0.0.21.ebuild 1290
diff --git a/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.21-r2 b/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.21-r2
new file mode 100644
index 000000000000..4cc92789f1f5
--- /dev/null
+++ b/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.21-r2
@@ -0,0 +1 @@
+MD5 e71784353b914ecdd02c9bdc5a21e65e ruby-dbi-all-0.0.21.tar.gz 131968
diff --git a/dev-ruby/ruby-dbi/ruby-dbi-0.0.21-r2.ebuild b/dev-ruby/ruby-dbi/ruby-dbi-0.0.21-r2.ebuild
new file mode 100644
index 000000000000..2c6e5ccd82ee
--- /dev/null
+++ b/dev-ruby/ruby-dbi/ruby-dbi-0.0.21-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# 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-r2.ebuild,v 1.1 2006/01/12 12:49:17 caleb Exp $
+
+inherit ruby eutils
+
+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 ~ppc ~sparc"
+USE_RUBY="ruby18 ruby19"
+IUSE="firebird odbc postgres mysql sqlite"
+
+DEPEND="virtual/ruby
+	mysql? ( dev-ruby/mysql-ruby )
+	postgres? ( dev-ruby/ruby-postgres )
+	firebird? ( >=dev-db/firebird-1.0-r1 )
+	odbc? ( >=dev-db/unixODBC-2.0.6 )
+	sqlite? ( =dev-db/sqlite-2* )"
+
+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"
+	use sqlite && myconf="${myconf},dbd_sqlite"
+
+	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
+}