Fix the converted package (build and install the C extension); run tests (manually), and add support for JRuby.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 82 insertions, 32 deletions

diff --git a/www-servers/mongrel/ChangeLog b/www-servers/mongrel/ChangeLog
index c0b17aa88b61..7bd20035c986 100644
--- a/www-servers/mongrel/ChangeLog
+++ b/www-servers/mongrel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/mongrel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mongrel/ChangeLog,v 1.34 2010/01/23 14:13:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/mongrel/ChangeLog,v 1.35 2010/01/23 23:42:33 flameeyes Exp $
+
+*mongrel-1.1.5-r2 (23 Jan 2010)
+
+  23 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -mongrel-1.1.5-r1.ebuild, +mongrel-1.1.5-r2.ebuild:
+  Fix the converted package (build and install the C extension); run tests
+  (manually), and add support for JRuby.
 
 *mongrel-1.1.5-r1 (23 Jan 2010)
 
diff --git a/www-servers/mongrel/Manifest b/www-servers/mongrel/Manifest
index 8cf82739f2e0..1115a88f8a74 100644
--- a/www-servers/mongrel/Manifest
+++ b/www-servers/mongrel/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST mongrel-1.1.5.gem 105472 RMD160 d678d5a07e4ae61c28d0174f1c591a261a335056 SHA1 ce2393a56d49c5fcf726c744917b9a37b6daa743 SHA256 3e1e96fa04bb7e52d8677c43798e917ff2ed8b12fef12678c46eb07871af260e
-EBUILD mongrel-1.1.5-r1.ebuild 779 RMD160 c538cfb3dcedc15522039329b86e39f57486d994 SHA1 fb6911bb8cf9d30ebe7b7a751ada94dad167bf85 SHA256 632775f2032a413d55803050cdfb49062090519e55dbbf113bed3f2d60656738
+EBUILD mongrel-1.1.5-r2.ebuild 2085 RMD160 6710bb63b368fc972bf60e9b9bed486edb72c908 SHA1 cc43e8c0e4a85b765ae593cbc1f0b2219630bb5b SHA256 d191accb3876836d0317d0dc4ae4eb201a96ae50002e87edc4a3418d3090a988
 EBUILD mongrel-1.1.5.ebuild 688 RMD160 31411f4683d34aefadbc629a5b1a9e30f38cf625 SHA1 0bb903a6abea5b080df0475a209941cbc2592661 SHA256 8b35c6342a08077127ed06ba88355e4dfe0e956b76359f1c70fcef67d84a3bb0
-MISC ChangeLog 4141 RMD160 dfeb319df9b81063fedff31d4cdafbc22fab719d SHA1 483e1229a3d3116bd335a3976830c5088bd7bb60 SHA256 bb424cdf8248e97d96bbc7b3171c820a340fef1dc62033e4209183a351cd1266
+MISC ChangeLog 4404 RMD160 c938e50d814914e7a2e29a59183ee648158aafdc SHA1 379d09428c0bf3899a802eed5207b01bc4bae807 SHA256 4a069bd0d13e5748241615fe548fc0cb5bd2d978319bc7be1efa5d860d6e41b9
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktbBCoACgkQeM7EJeUH71MjsQCdHkdT5PS5OV+7lZRCwzVdWuIv
-Ct8AnRa/WrFiY/x44v5gesAUQvyZqa92
-=uM/h
+iEYEARECAAYFAktbiV8ACgkQAiZjviIA2XgsVwCcD+30PIX4R2ZfUBnX1SASFxDN
+YUQAoKuMbpNrDdIlDN89IxhkcfiqBhyj
+=Pz0m
 -----END PGP SIGNATURE-----
diff --git a/www-servers/mongrel/mongrel-1.1.5-r1.ebuild b/www-servers/mongrel/mongrel-1.1.5-r1.ebuild
deleted file mode 100644
index cb2eccd42855..000000000000
--- a/www-servers/mongrel/mongrel-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/mongrel/mongrel-1.1.5-r1.ebuild,v 1.1 2010/01/23 14:13:57 graaff Exp $
-
-EAPI="2"
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README TODO"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A small fast HTTP library and server that runs Rails, Camping, and Nitro apps"
-HOMEPAGE="http://mongrel.rubyforge.org/"
-
-LICENSE="|| ( mongrel GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/daemons-1.0.3
-	>=dev-ruby/gem_plugin-0.2.3
-	>=dev-ruby/fastthread-1.0.1"
diff --git a/www-servers/mongrel/mongrel-1.1.5-r2.ebuild b/www-servers/mongrel/mongrel-1.1.5-r2.ebuild
new file mode 100644
index 000000000000..65dcee752279
--- /dev/null
+++ b/www-servers/mongrel/mongrel-1.1.5-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/mongrel/mongrel-1.1.5-r2.ebuild,v 1.1 2010/01/23 23:42:33 flameeyes Exp $
+
+EAPI="2"
+
+# ruby19 → extension does not build, so there is no way to get this to
+# work for now
+USE_RUBY="ruby18 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README TODO"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A small fast HTTP library and server that runs Rails, Camping, and Nitro apps"
+HOMEPAGE="http://mongrel.rubyforge.org/"
+
+LICENSE="|| ( mongrel GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="ruby_targets_jruby? ( >=virtual/jdk-1.5 )"
+
+ruby_add_rdepend ">=dev-ruby/daemons-1.0.3
+	>=dev-ruby/gem_plugin-0.2.3"
+
+# Only useful with Ruby 1.8 as it's not used/useful with Ruby 1.9 or JRuby
+USE_RUBY=ruby18 ruby_add_rdepend ">=dev-ruby/fastthread-1.0.1"
+
+ruby_add_bdepend test virtual/ruby-test-unit
+
+each_ruby_compile() {
+	case ${RUBY} in
+		*jruby)
+			# There is no script to build the JRuby extension so we're
+			# going to do it manually :(
+			pushd ext/http11_java &>/dev/null
+			find . -name '*.java' | xargs javac -source 1.5 -target 1.5 -cp $(java-config -d -p jruby) \
+				|| die "failed to build java source"
+			find . -name '*.class' | xargs jar cf http11.jar \
+				|| die "failed to create http11.jar"
+			popd &>/dev/null
+
+			# Move it here to avoid special-casing the test and
+			# install phases.
+			cp ext/http11_java/http11.jar lib/ || die "unable to copy http11.so"
+			;;
+		*)
+			pushd ext/http11 &>/dev/null
+			${RUBY} extconf.rb || die "extconf failed"
+			emake || die "emake failed"
+			popd &>/dev/null
+
+			# Move it here to avoid special-casing the test and
+			# install phases.
+			cp ext/http11/http11.so lib/ || die "unable to copy http11.so"
+			;;
+	esac
+}
+
+each_ruby_test() {
+	${RUBY} -S testrb -I lib:ext/http11_java -a test -x test_command || die "tests failed"
+}