Remove unused file and prepare a new revision with Ruby 1.9 so the former one can be stabilized.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 87 insertions, 136 deletions

diff --git a/dev-ruby/mysql-ruby/ChangeLog b/dev-ruby/mysql-ruby/ChangeLog
index 845de433bf23..357193423131 100644
--- a/dev-ruby/mysql-ruby/ChangeLog
+++ b/dev-ruby/mysql-ruby/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/mysql-ruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/ChangeLog,v 1.78 2010/08/07 14:33:19 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/ChangeLog,v 1.79 2010/08/22 12:27:58 flameeyes Exp $
+
+*mysql-ruby-2.8.1-r2 (22 Aug 2010)
+
+  22 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/mysql-ruby-2.7.5-test.patch, mysql-ruby-2.8.1-r1.ebuild,
+  -files/mysql-ruby-2.8-test2.patch, +mysql-ruby-2.8.1-r2.ebuild:
+  Remove unused file and prepare a new revision with Ruby 1.9 so the former
+  one can be stabilized.
 
   07 Aug 2010; Hans de Graaff <graaff@gentoo.org> mysql-ruby-2.8.1.ebuild:
   Change virtual/ruby to dev-lang/ruby, bug 265054.
diff --git a/dev-ruby/mysql-ruby/Manifest b/dev-ruby/mysql-ruby/Manifest
index e7122de6bf6b..7da14bbbf9f2 100644
--- a/dev-ruby/mysql-ruby/Manifest
+++ b/dev-ruby/mysql-ruby/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX mysql-ruby-2.7.5-test.patch 1890 RMD160 e523a4da04e881bcacd6a22a7d89c12f8fd6a0ab SHA1 e32816ff7bc3b02dbbbb3d17f597c70b9c67d323 SHA256 04a1487a77e5a6498a5028e2604097e6ac4809ee07a7b141edd508cf0b198dcf
-AUX mysql-ruby-2.8-test2.patch 1766 RMD160 a47e6724c2f3b64b8399366a1c3ca13f80f8f408 SHA1 516fcf9ee05b88f005aeec44f9048adfb54dfcb3 SHA256 78aae7d8f0eb5731fb113b43e0a085c87300d9345b9738018dfb630e0d7c3692
 AUX mysql-ruby-2.8.1-test.patch 1770 RMD160 cfe331a8061af80bddf7d0ee021439b47a578cef SHA1 aaefbbd239d755a9fd88a9600f714c00ad9f1602 SHA256 a474215fccf87a480f37955e9998c7df8a6290e943f06889ffc19eb7c0522b33
 DIST mysql-ruby-2.8.1.tar.gz 34662 RMD160 42918666f3ed09cc4f52d2f62ce57dece05a8aed SHA1 9a5c04cc17be6d92c57756866b8abb894da7ca90 SHA256 8218329ddc169277d00983c178ab53b945d60672062bd1a5e9e5312b6d7132f0
-EBUILD mysql-ruby-2.8.1-r1.ebuild 1388 RMD160 6702910d637606cd147ea8c311783c15e8590f87 SHA1 d311c527e4f993dd694dc0b96f68607570a3e663 SHA256 498526b95fdd7ba0d2831132e71167043922a67146c55e979271a1e81c774e44
+EBUILD mysql-ruby-2.8.1-r1.ebuild 1380 RMD160 937befe9dc2e03a001df7628f9ebb34c0cea9c50 SHA1 e0b5858bf740b21abdd82b61ca7f37d1452a01bc SHA256 00fb88e8f5a44f4e7c6fc8ba0f4b1e7040f21fff316db739419b7a7914241bc6
+EBUILD mysql-ruby-2.8.1-r2.ebuild 1393 RMD160 2619b9f2e47f2fa91db6664790df5c65ade3f301 SHA1 b043a4cea2f4e3b8a47a83a3bde417fb9bc2b5b5 SHA256 ccb17f797af5c3b56d9186da6cde8eae825b9a9d81a8b858d670cfedb30d8892
 EBUILD mysql-ruby-2.8.1.ebuild 1149 RMD160 0c074c47547dd4b44daafc98c0adf5111dac733b SHA1 7aeddd16b846fb8535edf82ecb7de335069bbdb5 SHA256 89a101902231e8443f337f373c04af360a5ac751dbbe1744dc4bf72ba33eb04c
-MISC ChangeLog 9585 RMD160 dd4040b1033986f06188167ba37e80de5047109a SHA1 c3a1aef1c66cffb8874ffb926149e8cbfcdb635d SHA256 c27ac2832d4951025f108300cc2c19da116e93d7ba054b6451bf76a155426f02
+MISC ChangeLog 9914 RMD160 5a3310ef5729e80101d2ac8121533705c6247a95 SHA1 f938bd5de5827820f3bc322c2f52923f92038d61 SHA256 4b8a74ffcff3384639d79085d774b5012bc09eb2431b0bb751b4bfce5adebc68
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxdbrUACgkQZihJkut28SvR9wD/cCY+R4H2rFchouNJfWDqEau+
-8EeRNsrnUqti2sZNVeIA/2VvG0cxGD8jIZ7DxFuv4L6zmyh5KCubPlzkpS398Wfx
-=IMQS
+iEYEARECAAYFAkxxF+sACgkQAiZjviIA2XjM1QCgwYeHqPyHLCH8OBf1DAc7Ig+H
+GiMAn3UkwXrMr73FoX1WeJbuV4Bk77t0
+=ktXc
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/mysql-ruby/files/mysql-ruby-2.7.5-test.patch b/dev-ruby/mysql-ruby/files/mysql-ruby-2.7.5-test.patch
deleted file mode 100644
index 930fa5f7609b..000000000000
--- a/dev-ruby/mysql-ruby/files/mysql-ruby-2.7.5-test.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -u mysql-ruby-2.7.4/test.rb mysql-ruby-2.7.4.new/test.rb
---- mysql-ruby-2.7.5/test.rb	2006-12-20 05:31:52.000000000 +0000
-+++ mysql-ruby-2.7.5.new/test.rb	2007-04-16 11:34:43.000000000 +0100
-@@ -1,16 +1,22 @@
--#!/usr/local/bin/ruby
-+#!/usr/bin/env ruby
- # $Id: test.rb 213 2008-03-07 16:30:47Z tommy $
-
- require "test/unit"
--require "./mysql.o"
-+require "mysql"
-+
-+ARGV.each do |a|
-+    $argv ||= []
-+    $argv << a
-+end
- 
- class TC_Mysql < Test::Unit::TestCase
-   def setup()
--    @host, @user, @pass, db, port, sock, flag = ARGV
-+    @host, @user, @pass, db, port, sock, flag = $argv
-     @db = db || "test"
-     @port = port.to_i
-     @sock = sock.nil? || sock.empty? ? nil : sock
-     @flag = flag.to_i
-+
-   end
-   def teardown()
-   end
-@@ -95,7 +101,7 @@
- 
- class TC_Mysql2 < Test::Unit::TestCase
-   def setup()
--    @host, @user, @pass, db, port, sock, flag = ARGV
-+    @host, @user, @pass, db, port, sock, flag = $argv
-     @db = db || "test"
-     @port = port.to_i
-     @sock = sock.nil? || sock.empty? ? nil : sock
-@@ -203,7 +209,7 @@
- 
- class TC_MysqlRes < Test::Unit::TestCase
-   def setup()
--    @host, @user, @pass, db, port, sock, flag = ARGV
-+    @host, @user, @pass, db, port, sock, flag = $argv
-     @db = db || "test"
-     @port = port.to_i
-     @sock = sock.nil? || sock.empty? ? nil : sock
-@@ -403,7 +409,7 @@
- 
- class TC_MysqlStmt < Test::Unit::TestCase
-   def setup()
--    @host, @user, @pass, db, port, sock, flag = ARGV
-+    @host, @user, @pass, db, port, sock, flag = $argv
-     @db = db || "test"
-     @port = port.to_i
-     @sock = sock.nil? || sock.empty? ? nil : sock
-@@ -433,7 +439,7 @@
- 
- class TC_MysqlStmt2 < Test::Unit::TestCase
-   def setup()
--    @host, @user, @pass, db, port, sock, flag = ARGV
-+    @host, @user, @pass, db, port, sock, flag = $argv
-     @db = db || "test"
-     @port = port.to_i
-     @sock = sock.nil? || sock.empty? ? nil : sock
diff --git a/dev-ruby/mysql-ruby/files/mysql-ruby-2.8-test2.patch b/dev-ruby/mysql-ruby/files/mysql-ruby-2.8-test2.patch
deleted file mode 100644
index 5d9e7e07c6bf..000000000000
--- a/dev-ruby/mysql-ruby/files/mysql-ruby-2.8-test2.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- mysql-ruby-2.8/test.rb.0	2008-06-17 07:36:44.000000000 +0200
-+++ mysql-ruby-2.8/test.rb	2008-09-11 20:42:19.000000000 +0200
-@@ -1,12 +1,17 @@
--#!/usr/local/bin/ruby
-+#!/usr/bin/env ruby
- # $Id: test.rb 218 2008-06-17 05:36:44Z tommy $
- 
- require "test/unit"
--require "./mysql.o"
-+require "mysql"
-+
-+ARGV.each do |a|
-+    $argv ||= []
-+    $argv << a
-+end
- 
- class TC_Mysql < Test::Unit::TestCase
-   def setup()
--    @host, @user, @pass, db, port, sock, flag = ARGV
-+    @host, @user, @pass, db, port, sock, flag = $argv
-     @db = db || "test"
-     @port = port.to_i
-     @sock = sock.nil? || sock.empty? ? nil : sock
-@@ -95,7 +100,7 @@
- 
- class TC_Mysql2 < Test::Unit::TestCase
-   def setup()
--    @host, @user, @pass, db, port, sock, flag = ARGV
-+    @host, @user, @pass, db, port, sock, flag = $argv
-     @db = db || "test"
-     @port = port.to_i
-     @sock = sock.nil? || sock.empty? ? nil : sock
-@@ -211,7 +216,7 @@
- 
- class TC_MysqlRes < Test::Unit::TestCase
-   def setup()
--    @host, @user, @pass, db, port, sock, flag = ARGV
-+    @host, @user, @pass, db, port, sock, flag = $argv
-     @db = db || "test"
-     @port = port.to_i
-     @sock = sock.nil? || sock.empty? ? nil : sock
-@@ -411,7 +416,7 @@
- 
- class TC_MysqlStmt < Test::Unit::TestCase
-   def setup()
--    @host, @user, @pass, db, port, sock, flag = ARGV
-+    @host, @user, @pass, db, port, sock, flag = $argv
-     @db = db || "test"
-     @port = port.to_i
-     @sock = sock.nil? || sock.empty? ? nil : sock
-@@ -441,7 +446,7 @@
- 
- class TC_MysqlStmt2 < Test::Unit::TestCase
-   def setup()
--    @host, @user, @pass, db, port, sock, flag = ARGV
-+    @host, @user, @pass, db, port, sock, flag = $argv
-     @db = db || "test"
-     @port = port.to_i
-     @sock = sock.nil? || sock.empty? ? nil : sock
diff --git a/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r1.ebuild b/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r1.ebuild
index 6800a13b652c..ff89d13a3f95 100644
--- a/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r1.ebuild
+++ b/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r1.ebuild,v 1.3 2010/05/23 09:59:34 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r1.ebuild,v 1.4 2010/08/22 12:27:58 flameeyes Exp $
 
 EAPI="2"
-USE_RUBY="ruby18 ree18 ruby19"
+USE_RUBY="ruby18"
 
 RUBY_FAKEGEM_NAME="mysql"
 
diff --git a/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r2.ebuild b/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r2.ebuild
new file mode 100644
index 000000000000..90eaf86eae78
--- /dev/null
+++ b/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r2.ebuild,v 1.1 2010/08/22 12:27:58 flameeyes Exp $
+
+EAPI="2"
+USE_RUBY="ruby18 ree18 ruby19"
+
+RUBY_FAKEGEM_NAME="mysql"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby extension library to use MySQL"
+HOMEPAGE="http://www.tmtm.org/en/mysql/ruby/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="virtual/mysql"
+RDEPEND="${DEPEND}"
+
+TEST_DIR="/usr/share/${PN}/test/"
+
+all_ruby_prepare() {
+	if use hppa; then
+		sed -e 's/LONG_LONG/long long/' -i "${S}"/mysql.c.in || die
+	fi
+
+	epatch "${FILESDIR}/${P}-test.patch"
+}
+
+each_ruby_configure() {
+	${RUBY} extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake || die
+}
+
+each_ruby_install() {
+	emake DESTDIR="${D}" install || die
+	ruby_fakegem_genspec
+}
+
+all_fakegem_install() {
+	dohtml * || die
+
+	if use test ; then
+		insinto $TEST_DIR
+		doins test.rb || die
+	fi
+}
+
+src_test() {
+	elog
+	elog "To test the library you need to start MySQL first."
+	elog "Then run:"
+	elog
+	elog "	% ruby ${TEST_DIR}test.rb <hostname> <user> <password>"
+	elog
+	elog "See /usr/share/doc/${PF}/html/README.html for details."
+	elog
+}