Version bump: move to EAPI=4, fakegem and testrb-2.

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

4 files changed, 99 insertions, 10 deletions

diff --git a/dev-ruby/dbi/ChangeLog b/dev-ruby/dbi/ChangeLog
index 9baf4cd38ea0..d3942586233c 100644
--- a/dev-ruby/dbi/ChangeLog
+++ b/dev-ruby/dbi/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for dev-ruby/ruby-dbi
+# ChangeLog for dev-ruby/dbi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbi/ChangeLog,v 1.1 2012/09/02 08:25:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbi/ChangeLog,v 1.2 2012/09/02 13:28:06 flameeyes Exp $
+
+*dbi-0.4.5 (02 Sep 2012)
+
+  02 Sep 2012; Diego E. Pettenò <flameeyes@gentoo.org> +dbi-0.4.5.ebuild,
+  +files/dbi-0.4.5-gentoo.patch:
+  Version bump: move to EAPI=4, fakegem and testrb-2.
 
   02 Sep 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   -files/ruby-dbi-0.1.1-destdir-gentoo.diff,
diff --git a/dev-ruby/dbi/Manifest b/dev-ruby/dbi/Manifest
index d4eb06a9eb04..bb114141be5a 100644
--- a/dev-ruby/dbi/Manifest
+++ b/dev-ruby/dbi/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX dbi-0.4.5-gentoo.patch 901 SHA256 f8a1bba9afe51fd088d195664bcaa7af957a9aa1d26027c2e6005f2b24da6c4c SHA512 8ea18efc66518ffac457908cc597cf9ea5dd3c9b4aae1d068c0b82872a2108a4336c18a69310382e4a2b1b5fca30bd38f65911d377097ef5a45a1b12550ba821 WHIRLPOOL d7fd57f1b4778000e6e47996ace0a97d212bc4779ae216d25236c6bb50e54c101312a34b298b84a0b502656fc91c00721ddf1106b641ff22cd6636cbe15a5365
 AUX ruby-dbi-0.4.3-drivers-test.patch 732 SHA256 e137a0e1a79d32fb801e113d39bdd8cdccb4a5c911111a0c312dce95d00ba05d SHA512 40fdfa7667856486821df5b91655299314d4cbc747d038bdd928086b3c0427356486ea05c1ead2c08f350476aa8782087fe4dc2ff3d1a5fed6574219b0f02f87 WHIRLPOOL a43f3554ea6931fa3d46a56b7adc87dd3233c20a82032d6d6e25d9391b9d0029d63f30b2c70ec2500fe87cb9e39e5d85cfbc205eab9f40cd4be7b04ffd16a49f
 DIST dbi-0.4.3.tar.gz 81851 SHA256 5f4d0c92c43ccfc4d0075dfe17e3315a2d2d8aaeaee207a81985dd7be75f45fa SHA512 4f45eccb93e1826232f6f9260dbe81420c6239c64e24f55cd1777404a5869d27a1f4c9b8dd5b8382b0c08904565a8f3cdba60ad60198087111cdcff7635389c0 WHIRLPOOL 52e64b4dbf04e1824bda938fe3dac870ff3c5b01a2e70f25032b1e256c89268ad043ac2d92ff217ea8b535f6ecf59544874cee49fa445d18246fd5a42f9c48dd
+DIST dbi-0.4.5.gem 73728 SHA256 892b34709c872db130053b2b9238a43b28a71b8a5851193ef236a59541195916 SHA512 b7b6dfb22ab2430275868b8b4801b3a3c296c879b2a21394b161541734f4818ba51dc74a0c3906b9879fbbc1f4b4be4b43a98108cf855aae5dd7a5fdfe7632cd WHIRLPOOL 7a68dafd0242b4fcfeba8508f21d0848165c3188b96f61b20540b44a74e4ae4ce01e16c7951bc687b6977d442410f9fec9189791adb7e1ca74f83eda81066868
 EBUILD dbi-0.4.3.ebuild 1626 SHA256 506d5424c24aa848be4d15c14f5cb45498d6a6c175fa056c9508afacc4839c47 SHA512 d88d7a05a5a4763265061a05f7a24b470e9f784ef39760f0b0fdf07048e42d876c63ef87c311fd62c75377ffa2ba157ec9bc02e0754665d273333a88a3be614d WHIRLPOOL 9c137d7d7b1f75e9999cf6dd682da248cddcb092a75c4b97bd5850995e23e7f020dfe3662f4ff5a21cdccc2251caa56712a26e445835920a04419bd5ad369716
-MISC ChangeLog 7646 SHA256 49b239800a0eb7402fabdbdf4f6a60b6ae78f1b0b0a0f042b8256715af41fc52 SHA512 59a5bbf06eea5644f185276be4cb4bc5c2e6750e0af4092a94e8b850fbff9aa9343a3eb5bda3b59468f43a03b7359969ce7e6aabc2f71b0268ac137033296a6a WHIRLPOOL 1ef65f0a448cc891639caa337b727838d24b4568852ba0ba44eaea52bbe9a0f31c1c84dded82206757e0fc97f0dabb8875e185f59f1bbcf630f1b18f0c521cea
+EBUILD dbi-0.4.5.ebuild 1299 SHA256 06c6957cc59feeb2655d38f8fc94fccdc9dbebd3da5df624b8876d898ac3fa29 SHA512 c42699b51f250ecfdaedebc254ddcdc5c2506150593c7ce176d61f391ea9baee08459be632e72db06db9beeaccfb3c358da84af6a0b29712d744cee089dd35d7 WHIRLPOOL 7ff8885884ab24e8cc325c27b5b7ec4af12f5c6f263f4351d6fa2aba034a3770d34a243494973f434157afacff00808d488d51bf75067e00f61e7e2314a83bbc
+MISC ChangeLog 7830 SHA256 93aef2a2d670fcb8a89b9ae358122522b9bd311dc11f126bf6d7b462af43f3b8 SHA512 98e5234a6e2ffdb030cfd69f7e08f6e176ae6b878ebe66dd56001dc2fe8db60a3c69e94f0645035723217a98b2c13b0fec6036d12c77645e16a83987bf59b830 WHIRLPOOL db8e86c492522d27af2fcd0aef4e35839dc688b87d6412393a598ebc5cfdaf65e1aa16416a4ef0f626b148d2b73f15a11384f5e1b9df4a13830819e81faea15a
 MISC metadata.xml 234 SHA256 826011185c3a1a849ae7974c6c7ddc366fa72662e94daad39611d78763c83273 SHA512 66854b761f8c7a3d758159ebb722311825f027b45e6ab7828b9477347419258e4899365e0ee910c7827760b20b7edec5851e9efa92fd78502e87e423cf215298 WHIRLPOOL deead190c8c568a215e33a068c40100ae16f65ea89233c80b652c3b84f022dbef155bbd1bfc00720432cf6eed9a637bd3ffed90b4edbcaa5cf43956e4973d19a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQQxg5AAoJEBzRPIrUMBNCTZQH/jQD9X/FrE5cKWB/+QGvhQwH
-u5osDgs4w2WeW3SuZ/WCADwtH6Tox2F0cG0zg3wiFBxVN5ipp2Nmj8w7HwpffXVx
-/IjNiphM76mt7qWZzdlEYzY1H73fN7GTHuZM8ALtmswU8bohZNHIPz53PFz8pcK6
-MyvheQIdT675OAYgcIE5nKvkdc8Xx7dsyXwxrOtDuGsjoXoKjcnI0wJUECFP2dcH
-ANFfHulncOFcMDIfME1O6JjnSNVTTYbYFVDGUyegBe8M5Da3cSVRwiN2WdbpKNNo
-EGTV3Df3SYWYzpTibP8zf1GM4RD8P6tdip4P8W8B71+IFWfY9dGeG+rbDQLs/CU=
-=G8qH
+iQEcBAEBCAAGBQJQQ170AAoJEBzRPIrUMBNCmtoH/1WmIv9hZyIviGgyTV3G5K0I
+byfO40IW4F2nnEGcIa6aPdb+aqlchVCuyfzzaKf+CN3xpx7v+nWoevbG/Jy+hUnX
+RzO9irWONdzjM9UZVe7Az2m5zvw+aInLxYw6vFc6Z5uscvb23avm0EexthU89QJG
+K4AKKWaQJWjhp2RYiaQZt5arc9qonR97YbSYXTYBStLBv30Gs6VB1UM9u58ZQYsU
+KrxU+IahoOenXHX5DRv3qgVX2DP5uk8zZMsKajM2/KYdFMXYwHS6eaGpo3nEeRJa
+zS/tvxcp2lpzaBd+3IXTxb8/WiQjab993uQZ8nWOyiy1WGG0E6H6sYbNLeQPJbU=
+=dTLM
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/dbi/dbi-0.4.5.ebuild b/dev-ruby/dbi/dbi-0.4.5.ebuild
new file mode 100644
index 000000000000..051034db55d6
--- /dev/null
+++ b/dev-ruby/dbi/dbi-0.4.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbi/dbi-0.4.5.ebuild,v 1.1 2012/09/02 13:28:06 flameeyes Exp $
+
+EAPI=4
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Database independent interface for accessing databases"
+HOMEPAGE="http://ruby-dbi.rubyforge.org/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="odbc postgres mysql sqlite sqlite3 test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+ruby_add_rdepend "dev-ruby/deprecated:2"
+
+PDEPEND="
+	mysql?    ( dev-ruby/dbd-mysql )
+	postgres? ( dev-ruby/dbd-pg )
+	odbc?     ( dev-ruby/dbd-odbc )
+	sqlite?   ( dev-ruby/dbd-sqlite )
+	sqlite3?  ( dev-ruby/dbd-sqlite3 )"
+
+RUBY_PATCHES=( ${P}-gentoo.patch )
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/ts_dbi.rb
+}
+
+pkg_postinst() {
+	if ! (use mysql || use postgres || use odbc || use sqlite || use sqlite3)
+	then
+		elog "${P} now comes with external database drivers."
+		elog "Be sure to set the right USE flags for ${PN} or emerge the drivers manually:"
+		elog "They are called dev-ruby/dbd-{mysql,odbc,pg,sqlite,sqlite3}"
+	fi
+}
diff --git a/dev-ruby/dbi/files/dbi-0.4.5-gentoo.patch b/dev-ruby/dbi/files/dbi-0.4.5-gentoo.patch
new file mode 100644
index 000000000000..f97cffe65d3e
--- /dev/null
+++ b/dev-ruby/dbi/files/dbi-0.4.5-gentoo.patch
@@ -0,0 +1,32 @@
+Index: dbi-0.4.5/lib/dbi/columninfo.rb
+===================================================================
+--- dbi-0.4.5.orig/lib/dbi/columninfo.rb
++++ dbi-0.4.5/lib/dbi/columninfo.rb
+@@ -2,7 +2,7 @@ require 'delegate'
+ 
+ begin
+     require 'rubygems'
+-    gem 'deprecated', "= 2.0.1"
++    gem 'deprecated', "~> 2.0.1"
+ rescue LoadError => e
+ end
+ 
+Index: dbi-0.4.5/test/dbi/tc_dbi.rb
+===================================================================
+--- dbi-0.4.5.orig/test/dbi/tc_dbi.rb
++++ dbi-0.4.5/test/dbi/tc_dbi.rb
+@@ -141,14 +141,6 @@ class TC_DBI < Test::Unit::TestCase
+ 
+    def test_available_drivers
+        assert_respond_to(DBI, :available_drivers)
+-       assert_equal(
+-       [
+-            "dbi:Mysql:",
+-            "dbi:ODBC:",
+-            "dbi:Pg:",
+-            "dbi:SQLite3:",
+-            "dbi:SQLite:"
+-       ], DBI.available_drivers.sort)
+    end
+ 
+    # PRIVATE METHODS