summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2007-04-14 01:55:44 +0000
committerJeroen Roovers <jer@gentoo.org>2007-04-14 01:55:44 +0000
commitea8a7bc1a92696797c3bd3f376b09e3a07c30775 (patch)
treedf46b391200dc6b73ac5df883f26364520dddadf /dev-ruby
parentrequire media-video/mjpegtools to be built with png support. mark latest vers... (diff)
downloadgentoo-2-ea8a7bc1a92696797c3bd3f376b09e3a07c30775.tar.gz
gentoo-2-ea8a7bc1a92696797c3bd3f376b09e3a07c30775.tar.bz2
gentoo-2-ea8a7bc1a92696797c3bd3f376b09e3a07c30775.zip
Added patch for test.rb by rbrown@g.o and marked stable for HPPA (bug #171907).
(Portage version: 2.1.2.3)
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/mysql-ruby/ChangeLog6
-rw-r--r--dev-ruby/mysql-ruby/files/mysql-ruby-2.7.3-test.patch64
-rw-r--r--dev-ruby/mysql-ruby/mysql-ruby-2.7.3.ebuild6
3 files changed, 73 insertions, 3 deletions
diff --git a/dev-ruby/mysql-ruby/ChangeLog b/dev-ruby/mysql-ruby/ChangeLog
index 932023679d0b..f449de94d10e 100644
--- a/dev-ruby/mysql-ruby/ChangeLog
+++ b/dev-ruby/mysql-ruby/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/mysql-ruby
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/ChangeLog,v 1.36 2007/03/24 11:43:06 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/ChangeLog,v 1.37 2007/04/14 01:55:44 jer Exp $
+
+ 14 Apr 2007; Jeroen Roovers <jer@gentoo.org>
+ +files/mysql-ruby-2.7.3-test.patch, mysql-ruby-2.7.3.ebuild:
+ Added patch for test.rb by rbrown@g.o and marked stable for HPPA (bug #171907).
24 Mar 2007; Markus Rothe <corsair@gentoo.org> mysql-ruby-2.7.3.ebuild:
Stable on ppc64; bug #171907
diff --git a/dev-ruby/mysql-ruby/files/mysql-ruby-2.7.3-test.patch b/dev-ruby/mysql-ruby/files/mysql-ruby-2.7.3-test.patch
new file mode 100644
index 000000000000..fd8a7fa47098
--- /dev/null
+++ b/dev-ruby/mysql-ruby/files/mysql-ruby-2.7.3-test.patch
@@ -0,0 +1,64 @@
+diff -u mysql-ruby-2.7.3/test.rb mysql-ruby-2.7.3.new/test.rb
+--- mysql-ruby-2.7.3/test.rb 2006-12-20 05:31:52.000000000 +0000
++++ mysql-ruby-2.7.3.new/test.rb 2007-04-13 20:55:40.000000000 +0100
+@@ -1,16 +1,22 @@
+-#!/usr/local/bin/ruby
++#!/usr/bin/env ruby
+ # $Id: test.rb,v 1.23 2006-12-20 05:31:52 tommy Exp $
+
+ require "test/unit"
+ require "./mysql.o"
+
++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/mysql-ruby-2.7.3.ebuild b/dev-ruby/mysql-ruby/mysql-ruby-2.7.3.ebuild
index 0d900f839721..c502874629a1 100644
--- a/dev-ruby/mysql-ruby/mysql-ruby-2.7.3.ebuild
+++ b/dev-ruby/mysql-ruby/mysql-ruby-2.7.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.7.3.ebuild,v 1.4 2007/03/24 11:43:06 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/mysql-ruby-2.7.3.ebuild,v 1.5 2007/04/14 01:55:44 jer Exp $
inherit ruby
@@ -10,7 +10,7 @@ SRC_URI="http://www.tmtm.org/downloads/mysql/ruby/${P}.tar.gz"
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86"
IUSE=""
USE_RUBY="ruby18 ruby19"
@@ -22,6 +22,8 @@ src_unpack() {
if use hppa; then
sed -e 's/LONG_LONG/long long/' -i "${S}"/mysql.c.in
fi
+
+ epatch ${FILESDIR}/${P}-test.patch
}
src_compile() {