Version bump

(Portage version: 2.1.2.12)

5 files changed, 97 insertions, 9 deletions

diff --git a/dev-ruby/mysql-ruby/ChangeLog b/dev-ruby/mysql-ruby/ChangeLog
index 1334b93765e5..00d2cabc606d 100644
--- a/dev-ruby/mysql-ruby/ChangeLog
+++ b/dev-ruby/mysql-ruby/ChangeLog
@@ -1,6 +1,15 @@
 # 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.42 2007/06/21 18:31:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/ChangeLog,v 1.43 2007/09/04 19:31:43 graaff Exp $
+
+*mysql-ruby-2.7.4 (04 Sep 2007)
+
+  04 Sep 2007; Hans de Graaff <graaff@gentoo.org>
+  +files/mysql-ruby-2.7.4-test.patch, -mysql-ruby-2.7.ebuild,
+  +mysql-ruby-2.7.4.ebuild:
+  Version bump, thanks to Brenden Matthews in #191201. Remove older version.
+  
+   * BUG: Mysql::Stmt#execute memory leak.
 
   21 Jun 2007; Raúl Porcel <armin76@gentoo.org> mysql-ruby-2.7.3.ebuild:
   alpha stable wrt #171907
diff --git a/dev-ruby/mysql-ruby/files/digest-mysql-ruby-2.7 b/dev-ruby/mysql-ruby/files/digest-mysql-ruby-2.7
deleted file mode 100644
index a0591dd18bd8..000000000000
--- a/dev-ruby/mysql-ruby/files/digest-mysql-ruby-2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c6668900e68f0d6a137612c818d5fd01 mysql-ruby-2.7.tar.gz 29620
-RMD160 c35cc5ff989f4675f6a16167b56dba14dd88fc47 mysql-ruby-2.7.tar.gz 29620
-SHA256 eedcfc9e473b7f8572f5c59d44eadbd4bfa7c4e5834f0dda484f30d3cea6dedd mysql-ruby-2.7.tar.gz 29620
diff --git a/dev-ruby/mysql-ruby/files/digest-mysql-ruby-2.7.4 b/dev-ruby/mysql-ruby/files/digest-mysql-ruby-2.7.4
new file mode 100644
index 000000000000..637726de6896
--- /dev/null
+++ b/dev-ruby/mysql-ruby/files/digest-mysql-ruby-2.7.4
@@ -0,0 +1,3 @@
+MD5 1a98d1b5cde1f7c6bb5ae8ce8d35a683 mysql-ruby-2.7.4.tar.gz 31487
+RMD160 ca63e1f3d45acaafbbccf727c5bc907c5eccbf49 mysql-ruby-2.7.4.tar.gz 31487
+SHA256 4f3c1c45f1c431e81423451cff8651130a8f16fca1d529acf2cf63bf4aae6c99 mysql-ruby-2.7.4.tar.gz 31487
diff --git a/dev-ruby/mysql-ruby/files/mysql-ruby-2.7.4-test.patch b/dev-ruby/mysql-ruby/files/mysql-ruby-2.7.4-test.patch
new file mode 100644
index 000000000000..eac38101bc53
--- /dev/null
+++ b/dev-ruby/mysql-ruby/files/mysql-ruby-2.7.4-test.patch
@@ -0,0 +1,65 @@
+diff -u mysql-ruby-2.7.4/test.rb mysql-ruby-2.7.4.new/test.rb
+--- mysql-ruby-2.7.4/test.rb	2006-12-20 05:31:52.000000000 +0000
++++ mysql-ruby-2.7.4.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,v 1.24 2007-08-21 23:29:37 tommy Exp $
+
+ 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/mysql-ruby-2.7.ebuild b/dev-ruby/mysql-ruby/mysql-ruby-2.7.4.ebuild
index 178450f0846b..51ca9e024823 100644
--- a/dev-ruby/mysql-ruby/mysql-ruby-2.7.ebuild
+++ b/dev-ruby/mysql-ruby/mysql-ruby-2.7.4.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.ebuild,v 1.12 2007/01/05 16:48:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/mysql-ruby-2.7.4.ebuild,v 1.1 2007/09/04 19:31:43 graaff Exp $
 
 inherit ruby
 
@@ -10,13 +10,24 @@ SRC_URI="http://www.tmtm.org/downloads/mysql/ruby/${P}.tar.gz"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
-USE_RUBY="ruby16 ruby18 ruby19"
+USE_RUBY="ruby18 ruby19"
 DEPEND="virtual/ruby
 	virtual/mysql"
 
+TEST_DIR="/usr/share/${PN}/test/"
+
+src_unpack() {
+	unpack ${A}
+	if use hppa; then
+		sed -e 's/LONG_LONG/long long/' -i "${S}"/mysql.c.in
+	fi
+
+	epatch ${FILESDIR}/${P}-test.patch
+}
+
 src_compile() {
 	ruby extconf.rb || die
 	emake || die
@@ -26,14 +37,17 @@ src_install() {
 	make DESTDIR=${D} install || die
 
 	dohtml *
+
+	insinto $TEST_DIR
+	doins test.rb
 }
 
 src_test() {
 	elog
 	elog "To test the programme you need to start mysql first."
-	elog "Then extract the tarball and run"
+	elog "Then run:"
 	elog
-	elog "	% ruby test.rb hostname user password"
+	elog "	% ruby ${TEST_DIR}test.rb hostname user password"
 	elog
 	elog "See /usr/share/doc/${PF}/html/README.html for detail."
 	elog