From 26289c03cc7190b77b3415bcf16f671df4cfde59 Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Tue, 15 Jun 2010 18:04:03 +0000 Subject: [PATCH] Version bump. Convert to ruby-ng. Make sure tests run. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- dev-ruby/dbd-mysql/Manifest | 14 +++-- dev-ruby/ruby-dbi/ChangeLog | 8 ++- dev-ruby/ruby-dbi/Manifest | 13 ++-- .../files/ruby-dbi-0.4.3-drivers-test.patch | 23 +++++++ dev-ruby/ruby-dbi/ruby-dbi-0.4.3.ebuild | 63 +++++++++++++++++++ 5 files changed, 109 insertions(+), 12 deletions(-) create mode 100644 dev-ruby/ruby-dbi/files/ruby-dbi-0.4.3-drivers-test.patch create mode 100644 dev-ruby/ruby-dbi/ruby-dbi-0.4.3.ebuild diff --git a/dev-ruby/dbd-mysql/Manifest b/dev-ruby/dbd-mysql/Manifest index 0418414800c1..753f4c854885 100644 --- a/dev-ruby/dbd-mysql/Manifest +++ b/dev-ruby/dbd-mysql/Manifest @@ -1,14 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 DIST dbd-mysql-0.4.3.tar.gz 56407 RMD160 d8279c69ee69c49a759115547e46983014c626c5 SHA1 bab5325108f0449b01ab956ff823ddf4b0e1086e SHA256 105f4b7f666e410f789cbe816e7ee606ace5cd9b916933c47159d915ef5b0b6c +DIST dbd-mysql-0.4.4.tar.gz 56674 RMD160 91b3043b928714d015c6b89af7c1915b8edc8bbc SHA1 f67867918d0f57a0e107365decaef0aa2f594fdf SHA256 51d7f3171b55468b9293fd96fcf97167ed5d37a5ac32cb474f692e7c7cea7c88 EBUILD dbd-mysql-0.4.3.ebuild 986 RMD160 7498b83e52b1f60098541cb8717d4f94d9b085d9 SHA1 9650ed58f11c38c4bf17658fe169b9d2b12daa85 SHA256 945151c50a2ee7aaee46768a78dfb63843aa317c944077e70b0b5390871acce8 -MISC ChangeLog 699 RMD160 cae9575dfd99dbd782e868cd0c7f958d09ce27d7 SHA1 62d51586af977a3355b77cbaa10bfddac10ddcc5 SHA256 242a31e5b236cd9c11c6e4bb2cc98634467832595e27c48943194683e9dddbef +EBUILD dbd-mysql-0.4.4.ebuild 1139 RMD160 3a3927e4db259507ec1611ee3ad79c458bb240be SHA1 d0371360d523ca4510614581b25f06e993ddcc08 SHA256 8001e0870e8a44eb8636f3a0cab63c272485e97763ccc63cc6e13fd566989c10 +MISC ChangeLog 843 RMD160 75ae7f569de0042c507e14d127a69f9038921da8 SHA1 bf5ad7ffb954068a67786745863848c52e77b621 SHA256 8ae4688655e2cb2ab66373320a4074c7acb68b596a3871ad36096c86ab938668 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAksuEukACgkQeM7EJeUH71M3JwCdFNRrNSkoi/yUQfHEpRuyxNVs -OSYAni1uWniLwEtxtxE+SB/d7oPplHpz -=5pG7 +iF4EAREIAAYFAkwXwWoACgkQZihJkut28StpbQEAs6jQNyMxe2yAqjqufNOTa9rM +1BoIMxNS3e/8NJFsgP4A/RuwZdV9ApvaCGEcvL108thzHa35itnfKqHIc4b5B1W1 +=4Lf9 -----END PGP SIGNATURE----- diff --git a/dev-ruby/ruby-dbi/ChangeLog b/dev-ruby/ruby-dbi/ChangeLog index d27c749dcd1c..13083171a459 100644 --- a/dev-ruby/ruby-dbi/ChangeLog +++ b/dev-ruby/ruby-dbi/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/ruby-dbi # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ChangeLog,v 1.44 2010/05/22 15:44:09 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-dbi/ChangeLog,v 1.45 2010/06/15 18:04:03 graaff Exp $ + +*ruby-dbi-0.4.3 (15 Jun 2010) + + 15 Jun 2010; Hans de Graaff +ruby-dbi-0.4.3.ebuild, + +files/ruby-dbi-0.4.3-drivers-test.patch: + Version bump. Convert to ruby-ng. Make sure tests run. 22 May 2010; Diego E. Pettenò ruby-dbi-0.4.2.ebuild: diff --git a/dev-ruby/ruby-dbi/Manifest b/dev-ruby/ruby-dbi/Manifest index 1b8740f1d704..c7e1049c4b19 100644 --- a/dev-ruby/ruby-dbi/Manifest +++ b/dev-ruby/ruby-dbi/Manifest @@ -1,18 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX ruby-dbi-0.1.1-destdir-gentoo.diff 759 RMD160 3bc32a3cf3effc608db7c325855a076e9715a766 SHA1 52033c8477fb4d98a688b230bb95557f29e68876 SHA256 e38fe6006c9ef6612c3aae0b252687a5924eba5d82007d9fec729bb50409f9b1 +AUX ruby-dbi-0.4.3-drivers-test.patch 732 RMD160 b201b65caab4df0451f71436869fcf4fd79bc9fc SHA1 05f5d32e4d493addbcca30e4ee36b40bca663568 SHA256 e137a0e1a79d32fb801e113d39bdd8cdccb4a5c911111a0c312dce95d00ba05d AUX ruby-dbi-destdir-gentoo.diff 273 RMD160 f2791a246d6a29854468f34c16da801d60642d4b SHA1 136d5e2d525765ecd03288ef127925462ca251ac SHA256 a6c45268928fba70fbe67bf704f8d285f1c3ab97e63f5345524740ec1c4b7c04 DIST dbi-0.2.0.tar.gz 100090 RMD160 a6fce82920f5953222c0069156784738dd71d505 SHA1 d21994329b48a63ac9f63be6f4504955610170a8 SHA256 2db880fb0abb87aac5da76d6ba92c614111b4606e5b6d87e56c70d5b1170b636 DIST dbi-0.4.2.tar.gz 81477 RMD160 77d580d8edb89a14fc0a16d7935a698b1aa5e561 SHA1 9985536191d4fa640f6e7872dd195f993db0cd59 SHA256 1e027d981899bf280f62868beb136604f680d5f2e3a4d2a181bfe6f66df382d1 +DIST dbi-0.4.3.tar.gz 81851 RMD160 77d90ef34a6fa21ac7124a23bb239983255fe29a SHA1 0567fc2fd09733c98e9dda426ef141fc245366a5 SHA256 5f4d0c92c43ccfc4d0075dfe17e3315a2d2d8aaeaee207a81985dd7be75f45fa EBUILD ruby-dbi-0.2.0-r1.ebuild 1625 RMD160 b858de0ddf5d38168e5c6b5ce0dcef39a4f98473 SHA1 d14463ce7d46fbde693e7abdf5d437b75204176b SHA256 8a601b6bb2f6fa38a7e67d8b1f3f1cc4302dafa206a1725ac3563310a8e433c9 EBUILD ruby-dbi-0.4.2.ebuild 1586 RMD160 81c39cc436fe941406f3d8e8cc594743f871bd37 SHA1 7ad266c8aa3ab2377c9420a4df0f9f93693ba545 SHA256 8a7c0027bc78c00bdb06e525d70bdaa80a6645a18d9478f60c5354cd3f10dcd8 -MISC ChangeLog 6341 RMD160 e10a085462e4c65275708b3298239df6f2b108ee SHA1 4990883d76b8eb24194518d56e9bc036bfef9194 SHA256 5c7099603608c9bcbf5373d30326d0d2ee97d5b490f9fbc17de393a5659a196c +EBUILD ruby-dbi-0.4.3.ebuild 1651 RMD160 0ebc0b775211f22a73b8d801a1c46cd8f02986b7 SHA1 667b3847a2dd9f5ea3ae71b0aea9d04d2bbff1fb SHA256 476f2c72b814b47486de39d05f28d41ab43bba8b3da6cac37a462d4e48bf9a14 +MISC ChangeLog 6545 RMD160 b52477dfa6a1dc7e7804e58d39b927db365186c1 SHA1 c33f296958fdb00980c6174e4eece39cb95dd0a4 SHA256 a6d85b2795ac75b19e01168af911dff6d144adcc38abf5e9a4f45d9721652689 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkv3+5oACgkQAiZjviIA2XhtKQCgz34y/NPglZfc6Q2ASyAQn0ZB -tWYAnR/Uwt4WGn6PyDlh4pTN187Lzvpz -=cDSM +iF4EAREIAAYFAkwXwJ4ACgkQZihJkut28SvUKAD/W91IISjP+kS04qGaVUs8oJyh +yaAKDUaIsIs9sj5Jsy0BALb/kYirqf50CYB6x8K9SBG1GERryMFTg366A/Rz1ec8 +=iDE3 -----END PGP SIGNATURE----- diff --git a/dev-ruby/ruby-dbi/files/ruby-dbi-0.4.3-drivers-test.patch b/dev-ruby/ruby-dbi/files/ruby-dbi-0.4.3-drivers-test.patch new file mode 100644 index 000000000000..52d2ac04b249 --- /dev/null +++ b/dev-ruby/ruby-dbi/files/ruby-dbi-0.4.3-drivers-test.patch @@ -0,0 +1,23 @@ +Remove a test that will fail because we cannot garantuee that +these drivers are installed, especially on first installation. +--- test/dbi/tc_dbi.rb.orig 2010-06-15 19:58:58.732811127 +0200 ++++ test/dbi/tc_dbi.rb 2010-06-15 19:59:10.004808935 +0200 +@@ -139,18 +139,6 @@ + assert_respond_to(DBI, :connect) + end + +- 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 + def test_parse_url + assert_nothing_raised{ DBI.send(:parse_url, "dbi:foo:bar") } diff --git a/dev-ruby/ruby-dbi/ruby-dbi-0.4.3.ebuild b/dev-ruby/ruby-dbi/ruby-dbi-0.4.3.ebuild new file mode 100644 index 000000000000..96a148e1b16c --- /dev/null +++ b/dev-ruby/ruby-dbi/ruby-dbi-0.4.3.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2010 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.4.3.ebuild,v 1.1 2010/06/15 18:04:03 graaff Exp $ + +EAPI=2 +USE_RUBY="ruby18" + +inherit ruby-ng + +MY_P=${P##ruby-} + +DESCRIPTION="Ruby/DBI - a database independent interface for accessing databases - similar to Perl's DBI" +HOMEPAGE="http://ruby-dbi.rubyforge.org" +SRC_URI="mirror://rubyforge/ruby-dbi/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86" +IUSE="examples odbc postgres mysql sqlite sqlite3 test" + +ruby_add_bdepend "test? ( virtual/ruby-test-unit )" +ruby_add_rdepend "dev-ruby/deprecated" + +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 )" + +S="${WORKDIR}/${MY_P}" + +RUBY_PATCHES=( "${P}-drivers-test.patch" ) + +each_ruby_configure() { + ${RUBY} setup.rb config --prefix=/usr +} + +each_ruby_test() { + ${RUBY} test/ts_dbi.rb || die "Tests failed." +} + +each_ruby_install() { + ${RUBY} setup.rb install \ + --prefix="${D}" || die "setup.rb install failed" +} + +all_ruby_install() { + dodoc ChangeLog README + + if use examples ; then + cp -pPR examples "${D}/usr/share/doc/${PF}" || die "cp examples failed" + fi +} + +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 +} -- 2.26.2