Added sqlite IUSE flag. Thanks to Andreas Schwarz <gentoo@andreas-s.net>, closing bug #47494. Removed old ebuilds.

8 files changed, 21 insertions, 61 deletions

diff --git a/dev-ruby/ruby-dbi/ChangeLog b/dev-ruby/ruby-dbi/ChangeLog
index 5117a412072c..6c5ea04185fd 100644
--- a/dev-ruby/ruby-dbi/ChangeLog
+++ b/dev-ruby/ruby-dbi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/ruby-dbi
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ChangeLog,v 1.9 2004/04/16 23:42:37 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ChangeLog,v 1.10 2004/05/23 14:59:58 usata Exp $
+
+*ruby-dbi-0.0.21-r1 (23 May 2004)
+
+  23 May 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-dbi-0.0.16-r1.ebuild,
+  ruby-dbi-0.0.18-r1.ebuild, ruby-dbi-0.0.21-r1.ebuild, ruby-dbi-0.0.21.ebuild:
+  Added sqlite IUSE flag. Thanks to Andreas Schwarz <gentoo@andreas-s.net>,
+  closing bug #47494. Removed old ebuilds.
 
   17 Apr 2004; David Holm <dholm@gentoo.org> ruby-dbi-0.0.21.ebuild:
   Added to ~ppc.
diff --git a/dev-ruby/ruby-dbi/Manifest b/dev-ruby/ruby-dbi/Manifest
index 3857601c5c40..f4d3fcfbebd8 100644
--- a/dev-ruby/ruby-dbi/Manifest
+++ b/dev-ruby/ruby-dbi/Manifest
@@ -1,9 +1,7 @@
+MD5 dd26a3e3d860836b8072188dec03bb65 ruby-dbi-0.0.21-r1.ebuild 1385
 MD5 c7f80c2535e53e6ac2014744e3f29e4d ChangeLog 1720
+MD5 8800954d7eaef72473b664c7e6f403b2 ruby-dbi-0.0.21.ebuild 1296
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 5287c1a2c66786668e65647caf03d24e ruby-dbi-0.0.21.ebuild 1297
-MD5 f4f2783d7308a29daaacdbc553e67c96 ruby-dbi-0.0.16-r1.ebuild 1293
-MD5 d90344d9cc2587ac5a3a0b62f4d0be16 ruby-dbi-0.0.18-r1.ebuild 1293
-MD5 46b758e2be33354043eeafc93d60cd52 files/digest-ruby-dbi-0.0.18-r1 71
-MD5 231a11bc0b4c618867f8493e1332fd6c files/digest-ruby-dbi-0.0.16-r1 70
 MD5 ae274a016a943bc8c69c8eb3fdc73e4d files/digest-ruby-dbi-0.0.21 71
 MD5 e50f5f0d7156002d8707cd043b077431 files/ruby-dbi-destdir-gentoo.diff 273
+MD5 ae274a016a943bc8c69c8eb3fdc73e4d files/digest-ruby-dbi-0.0.21-r1 71
diff --git a/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.16-r1 b/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.16-r1
deleted file mode 100644
index 4184de322ecc..000000000000
--- a/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.16-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78a3138ed35dd4e025ad024cc975b0a5 ruby-dbi-all-0.0.16.tar.gz 83029
diff --git a/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.18-r1 b/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.18-r1
deleted file mode 100644
index ef6039d588ba..000000000000
--- a/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.18-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3df7d440a2dfff7d527023e3299127de ruby-dbi-all-0.0.18.tar.gz 122521
diff --git a/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.21-r1 b/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.21-r1
new file mode 100644
index 000000000000..4cc92789f1f5
--- /dev/null
+++ b/dev-ruby/ruby-dbi/files/digest-ruby-dbi-0.0.21-r1
@@ -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.18-r1.ebuild b/dev-ruby/ruby-dbi/ruby-dbi-0.0.18-r1.ebuild
deleted file mode 100644
index c812bc66160a..000000000000
--- a/dev-ruby/ruby-dbi/ruby-dbi-0.0.18-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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-r1.ebuild,v 1.2 2004/04/10 14:06:23 usata 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"
-USE_RUBY="ruby16 ruby18 ruby19"
-IUSE="firebird odbc postgres mysql"
-
-DEPEND="virtual/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
-}
diff --git a/dev-ruby/ruby-dbi/ruby-dbi-0.0.16-r1.ebuild b/dev-ruby/ruby-dbi/ruby-dbi-0.0.21-r1.ebuild
index ff5ddb9c9233..4265e805efa7 100644
--- a/dev-ruby/ruby-dbi/ruby-dbi-0.0.16-r1.ebuild
+++ b/dev-ruby/ruby-dbi/ruby-dbi-0.0.21-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2004/04/10 14:06:23 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ruby-dbi-0.0.21-r1.ebuild,v 1.1 2004/05/23 14:59:58 usata Exp $
 
 inherit ruby eutils
 
@@ -10,15 +10,16 @@ SRC_URI="mirror://sourceforge/ruby-dbi/ruby-dbi-all-${PV}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
+KEYWORDS="~x86 ~ppc"
 USE_RUBY="ruby16 ruby18 ruby19"
-KEYWORDS="x86"
-IUSE="firebird odbc postgres mysql"
+IUSE="firebird odbc postgres mysql sqlite"
 
 DEPEND="virtual/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 )"
+	odbc? ( >=dev-db/unixODBC-2.0.6 )
+	sqlite? ( >=dev-db/sqlite-2.8.11 )"
 
 S=${WORKDIR}/ruby-dbi-all
 
@@ -34,6 +35,7 @@ src_compile() {
 	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
@@ -41,6 +43,7 @@ src_compile() {
 }
 
 src_install() {
+
 	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
index 302196f6f5a7..f9e5b283c0d1 100644
--- a/dev-ruby/ruby-dbi/ruby-dbi-0.0.21.ebuild
+++ b/dev-ruby/ruby-dbi/ruby-dbi-0.0.21.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2004/04/16 23:42:37 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ruby-dbi-0.0.21.ebuild,v 1.4 2004/05/23 14:59:58 usata Exp $
 
 inherit ruby eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ruby-dbi/ruby-dbi-all-${PV}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 USE_RUBY="ruby16 ruby18 ruby19"
 IUSE="firebird odbc postgres mysql"