Reduce size of configure/compile functions, die if tests fail, add ree18 support.

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

4 files changed, 14 insertions, 70 deletions

diff --git a/dev-ruby/msgpack/ChangeLog b/dev-ruby/msgpack/ChangeLog
index 5495f3a43dfe..4b29531e0123 100644
--- a/dev-ruby/msgpack/ChangeLog
+++ b/dev-ruby/msgpack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/msgpack
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/ChangeLog,v 1.4 2010/05/22 15:26:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/ChangeLog,v 1.5 2010/05/26 11:55:02 flameeyes Exp $
+
+  26 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -msgpack-0.3.3.ebuild, -msgpack-0.3.6.ebuild, msgpack-0.3.9.ebuild:
+  Reduce size of configure/compile functions, die if tests fail, add ree18
+  support.
 
   22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   msgpack-0.3.6.ebuild, msgpack-0.3.9.ebuild:
diff --git a/dev-ruby/msgpack/msgpack-0.3.3.ebuild b/dev-ruby/msgpack/msgpack-0.3.3.ebuild
deleted file mode 100644
index 5bbfa93b5c2a..000000000000
--- a/dev-ruby/msgpack/msgpack-0.3.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/msgpack-0.3.3.ebuild,v 1.1 2010/03/02 15:51:40 matsuu Exp $
-
-EAPI="2"
-inherit gems
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="http://msgpack.sourceforge.jp/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/msgpack/msgpack-0.3.6.ebuild b/dev-ruby/msgpack/msgpack-0.3.6.ebuild
deleted file mode 100644
index 2d17c9d3dd25..000000000000
--- a/dev-ruby/msgpack/msgpack-0.3.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/msgpack-0.3.6.ebuild,v 1.2 2010/05/22 15:26:59 flameeyes Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="http://msgpack.sourceforge.jp/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
-
-each_ruby_configure() {
-	pushd ext
-	${RUBY} extconf.rb || die "Configuration of extension failed."
-	popd
-}
-
-each_ruby_compile() {
-	pushd ext
-	emake || die
-	popd
-}
-
-each_ruby_test() {
-	${RUBY} test/msgpack_test.rb
-}
-
-each_ruby_install() {
-	mkdir lib || die "Unable to make lib directory."
-	cp ext/msgpack.so lib/ || die "Unable to install msgpack library."
-
-	each_fakegem_install
-}
diff --git a/dev-ruby/msgpack/msgpack-0.3.9.ebuild b/dev-ruby/msgpack/msgpack-0.3.9.ebuild
index dd056dcdd483..811fc20b602a 100644
--- a/dev-ruby/msgpack/msgpack-0.3.9.ebuild
+++ b/dev-ruby/msgpack/msgpack-0.3.9.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/msgpack-0.3.9.ebuild,v 1.2 2010/05/22 15:26:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/msgpack-0.3.9.ebuild,v 1.3 2010/05/26 11:55:02 flameeyes Exp $
 
 EAPI="2"
-USE_RUBY="ruby18"
+
+# ruby19 → tests fail
+# jruby → uses a binary extension
+USE_RUBY="ruby18 ree18"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -23,20 +26,16 @@ IUSE=""
 ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
 
 each_ruby_configure() {
-	pushd ext
-	${RUBY} extconf.rb || die "Configuration of extension failed."
-	popd
+	${RUBY} -Cext extconf.rb || die "Configuration of extension failed."
 }
 
 each_ruby_compile() {
-	pushd ext
-	emake || die
-	popd
+	emake -Cext || die
 
 	mkdir lib || die "Unable to make lib directory."
 	cp ext/msgpack.so lib/ || die "Unable to install msgpack library."
 }
 
 each_ruby_test() {
-	${RUBY} test/msgpack_test.rb
+	${RUBY} test/msgpack_test.rb || die "tests failed"
 }