From dbdb741f7f0604d0e1bc3a8fb0d66e1ba288d906 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Sat, 14 Apr 2007 01:55:44 +0000 Subject: [PATCH] Added patch for test.rb by rbrown@g.o and marked stable for HPPA (bug #171907). Package-Manager: portage-2.1.2.3 --- dev-ruby/mysql-ruby/ChangeLog | 6 +- dev-ruby/mysql-ruby/Manifest | 20 +++--- .../files/mysql-ruby-2.7.3-test.patch | 64 +++++++++++++++++++ dev-ruby/mysql-ruby/mysql-ruby-2.7.3.ebuild | 6 +- 4 files changed, 85 insertions(+), 11 deletions(-) create mode 100644 dev-ruby/mysql-ruby/files/mysql-ruby-2.7.3-test.patch 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 + +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 mysql-ruby-2.7.3.ebuild: Stable on ppc64; bug #171907 diff --git a/dev-ruby/mysql-ruby/Manifest b/dev-ruby/mysql-ruby/Manifest index dcb3a1118a70..af38439de31c 100644 --- a/dev-ruby/mysql-ruby/Manifest +++ b/dev-ruby/mysql-ruby/Manifest @@ -1,3 +1,7 @@ +AUX mysql-ruby-2.7.3-test.patch 1897 RMD160 01aad9fb0012eb9fc7b9b2c765f91718bfaf9f6d SHA1 37a3d07a750122f5883c02725c7050057bba1d41 SHA256 fabdb3c99875f8bcd67a47cf1177454191a10d435736fe54f2c588e4340decb6 +MD5 bd383343282d47e66f4ec8d4d0f7fa89 files/mysql-ruby-2.7.3-test.patch 1897 +RMD160 01aad9fb0012eb9fc7b9b2c765f91718bfaf9f6d files/mysql-ruby-2.7.3-test.patch 1897 +SHA256 fabdb3c99875f8bcd67a47cf1177454191a10d435736fe54f2c588e4340decb6 files/mysql-ruby-2.7.3-test.patch 1897 DIST mysql-ruby-2.4.5.tar.gz 16420 RMD160 7c86103027341fad43655b3e72ff715de22febda SHA1 30a4c4cd33531998cccfb26e336b15efdd7d87eb SHA256 d087ff50238f91da1df9e448e81f79b67702f5de72a7e6abfab051ed8aa53e89 DIST mysql-ruby-2.7.2.tar.gz 30298 RMD160 f985a150880df4a9bfb8450ca7bc299221ff5094 SHA1 5a642b504b799dec8edf7ca80ea3875e524b92a8 SHA256 2afde7f7ad2adcc287ae6184c2665e9bcff5504bfa10ca37a87dc4c9d9e895d6 DIST mysql-ruby-2.7.3.tar.gz 30383 RMD160 8b676f44a1cb14b643dcad6d57660ddbd236d9ea SHA1 ca083c5a1749899af45e9ca5fc4d71281ba6f9f7 SHA256 abf16d48a6ece40bd5f7a08eb72538e2dcc90ccabbba43a4b4e3ffc178886851 @@ -10,18 +14,18 @@ EBUILD mysql-ruby-2.7.2.ebuild 1037 RMD160 938e53e9e4c50f602958cf73b732d2e4b3863 MD5 5c3126c0e7e5d346a374e33e2b897c36 mysql-ruby-2.7.2.ebuild 1037 RMD160 938e53e9e4c50f602958cf73b732d2e4b3863584 mysql-ruby-2.7.2.ebuild 1037 SHA256 6d4e725c56f04e5e945af6deab80cfcf287418ff6d35f9914f9018c3a64420ea mysql-ruby-2.7.2.ebuild 1037 -EBUILD mysql-ruby-2.7.3.ebuild 1044 RMD160 e720ae62294b363952c585b346915fdf7adb321c SHA1 b7c1bb5f1baf421e506763f07fb99f3c4d5874c3 SHA256 de964228ebfd3cbb491df17760ef5af1c8a9a59a9519e7373117a1917442ec78 -MD5 fc028653f4fcec03f8ce18085590e114 mysql-ruby-2.7.3.ebuild 1044 -RMD160 e720ae62294b363952c585b346915fdf7adb321c mysql-ruby-2.7.3.ebuild 1044 -SHA256 de964228ebfd3cbb491df17760ef5af1c8a9a59a9519e7373117a1917442ec78 mysql-ruby-2.7.3.ebuild 1044 +EBUILD mysql-ruby-2.7.3.ebuild 1076 RMD160 6599bc4820798c84597ca1ceb6885c8a290df378 SHA1 0594fa962a43ca522582bc5a58d7d08396c90d30 SHA256 47e9062fedaea3375969ecd876176d3254004edd182625bd63eccc555abd2585 +MD5 139ef9a57f7f7d6f057593b1ecc7372b mysql-ruby-2.7.3.ebuild 1076 +RMD160 6599bc4820798c84597ca1ceb6885c8a290df378 mysql-ruby-2.7.3.ebuild 1076 +SHA256 47e9062fedaea3375969ecd876176d3254004edd182625bd63eccc555abd2585 mysql-ruby-2.7.3.ebuild 1076 EBUILD mysql-ruby-2.7.ebuild 930 RMD160 ac38c64c8eb3d537e26d2b75961f211a9096ccac SHA1 8fd7231aecd03d6c2e3a6f6f8d449e0cbd6ab9ce SHA256 2387885553eebba23197eef651a7dd702fb4e7de3bd58f2d71b20c9cf195672f MD5 bbbce693b5ad019059507d28683503ba mysql-ruby-2.7.ebuild 930 RMD160 ac38c64c8eb3d537e26d2b75961f211a9096ccac mysql-ruby-2.7.ebuild 930 SHA256 2387885553eebba23197eef651a7dd702fb4e7de3bd58f2d71b20c9cf195672f mysql-ruby-2.7.ebuild 930 -MISC ChangeLog 3958 RMD160 60adcf2cc4ef315337f53ca8f268ef4e32820ccb SHA1 45670b23890de79d2829aaea48f5f780dffc0f38 SHA256 8d6805491571a08ec8b4a240db5e025f7484da941dd0e44cc49fe637dd8413b4 -MD5 4ad65de50d4c02cd868c5dded538ffb3 ChangeLog 3958 -RMD160 60adcf2cc4ef315337f53ca8f268ef4e32820ccb ChangeLog 3958 -SHA256 8d6805491571a08ec8b4a240db5e025f7484da941dd0e44cc49fe637dd8413b4 ChangeLog 3958 +MISC ChangeLog 4147 RMD160 6a2405b2f64168c414140251549d030d9261cdf9 SHA1 445237ac7d784bd8c47d279bb56b69a08342ce60 SHA256 91849efc979e220d2f4d97e8505a87f2c4ed12bd7da775dc31c8a8160042d552 +MD5 f85567e71ee56320aa46598979fe47e8 ChangeLog 4147 +RMD160 6a2405b2f64168c414140251549d030d9261cdf9 ChangeLog 4147 +SHA256 91849efc979e220d2f4d97e8505a87f2c4ed12bd7da775dc31c8a8160042d552 ChangeLog 4147 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157 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() { -- 2.26.2