Version bump with fix for large ids. Apply fix from jer for bug 348788 by using proper mysqlconfig. Fix bug 350805 by requesting a mysql version with dynamic libraries.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

4 files changed, 138 insertions, 6 deletions

diff --git a/dev-ruby/mysql-ruby/ChangeLog b/dev-ruby/mysql-ruby/ChangeLog
index 8de7f5a9f3dd..9965c0c4517f 100644
--- a/dev-ruby/mysql-ruby/ChangeLog
+++ b/dev-ruby/mysql-ruby/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-ruby/mysql-ruby
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/ChangeLog,v 1.87 2011/01/07 09:40:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/ChangeLog,v 1.88 2011/01/07 10:06:14 graaff Exp $
+
+*mysql-ruby-2.8.2 (07 Jan 2011)
+
+  07 Jan 2011; Hans de Graaff <graaff@gentoo.org>
+  mysql-ruby-2.8.1-r2.ebuild, +mysql-ruby-2.8.2.ebuild,
+  +files/mysql-ruby-2.8.2-test.patch:
+  Version bump with fix for large ids. Apply fix from jer for bug 348788 by
+  using proper mysqlconfig. Fix bug 350805 by requesting a mysql version
+  with dynamic libraries.
 
   07 Jan 2011; Hans de Graaff <graaff@gentoo.org> -mysql-ruby-2.8.1.ebuild:
   Remove old version.
diff --git a/dev-ruby/mysql-ruby/files/mysql-ruby-2.8.2-test.patch b/dev-ruby/mysql-ruby/files/mysql-ruby-2.8.2-test.patch
new file mode 100644
index 000000000000..d34bc3be4f05
--- /dev/null
+++ b/dev-ruby/mysql-ruby/files/mysql-ruby-2.8.2-test.patch
@@ -0,0 +1,59 @@
+--- mysql-ruby-2.8.1/test.rb.0	2008-06-17 07:36:44.000000000 +0200
++++ mysql-ruby-2.8.1/test.rb	2008-09-11 20:42:19.000000000 +0200
+@@ -1,12 +1,17 @@
+-#!/usr/local/bin/ruby
++#!/usr/bin/env ruby
+ # $Id: mysql-ruby-2.8.2-test.patch,v 1.1 2011/01/07 10:06:14 graaff 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
+@@ -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-r2.ebuild b/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r2.ebuild
index cd15b024638d..9bafa4835cc1 100644
--- a/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r2.ebuild
+++ b/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.2 2010/10/11 12:14:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mysql-ruby/mysql-ruby-2.8.1-r2.ebuild,v 1.3 2011/01/07 10:06:15 graaff Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18 ruby19"
@@ -26,9 +26,9 @@ RDEPEND="${DEPEND}"
 
 TEST_DIR="/usr/share/${PN}/test/"
 
-all_ruby_prepare() {
-	epatch "${FILESDIR}/${P}-test.patch"
-}
+#all_ruby_prepare() {
+#	epatch "${FILESDIR}/${P}-test.patch"
+#}
 
 each_ruby_configure() {
 	${RUBY} extconf.rb || die
diff --git a/dev-ruby/mysql-ruby/mysql-ruby-2.8.2.ebuild b/dev-ruby/mysql-ruby/mysql-ruby-2.8.2.ebuild
new file mode 100644
index 000000000000..2776470ab964
--- /dev/null
+++ b/dev-ruby/mysql-ruby/mysql-ruby-2.8.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 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.2.ebuild,v 1.1 2011/01/07 10:06:15 graaff Exp $
+
+EAPI="3"
+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[-static]"
+RDEPEND="${DEPEND}"
+
+TEST_DIR="/usr/share/${PN}/test/"
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}/${P}-test.patch"
+}
+
+each_ruby_configure() {
+	${RUBY} extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || 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
+}