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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 79 insertions, 127 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/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
+}