Port to fakegem, add a patch to fix partly-broken tests.

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

4 files changed, 90 insertions, 7 deletions

diff --git a/www-servers/thin/ChangeLog b/www-servers/thin/ChangeLog
index 6a19462f48e4..a9c4338f2aae 100644
--- a/www-servers/thin/ChangeLog
+++ b/www-servers/thin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/thin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/ChangeLog,v 1.8 2009/11/28 09:57:38 a3li Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/ChangeLog,v 1.9 2010/01/21 10:55:23 flameeyes Exp $
+
+*thin-1.2.5-r1 (21 Jan 2010)
+
+  21 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  +thin-1.2.5-r1.ebuild, +files/thin-1.2.5-tests.patch:
+  Port to fakegem, add a patch to fix partly-broken tests.
 
 *thin-1.2.5 (28 Nov 2009)
 
diff --git a/www-servers/thin/Manifest b/www-servers/thin/Manifest
index 6bec1415c9de..6dd934dcdb96 100644
--- a/www-servers/thin/Manifest
+++ b/www-servers/thin/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX thin-1.2.5-tests.patch 957 RMD160 49ca87c338bddeec4488c76d1a43ad8f969ea52e SHA1 a9968abefaa3d8da0dcbbc458f1a3f4e3627c288 SHA256 44230c552082f06ef4db1d978c5fd71199cec17b47ef8ab701b4eabde3a7e44f
 DIST thin-1.2.4.gem 138240 RMD160 33efd2a4e9e27b7aeb25cecaa835b6f123dd07f0 SHA1 65303d8ac18c264f68820b42cbeaa804c6a6a8f5 SHA256 2fbcb14fd683b875617ba9208d4a8ad15ae40b44a9c5e90f5698f352f2687602
 DIST thin-1.2.5.gem 152064 RMD160 4f11929bf72d15f38aa9ac05fe458deb4115a90b SHA1 a6ac3d0911a82acc39aa8df235c3a6d78be8f582 SHA256 8a5f1d5d91039f854374a9221c15066d757649090b883d11bbd4af3372be4400
 EBUILD thin-1.2.4.ebuild 563 RMD160 98ccbbff1689161975185e6cdb1a596a2395907a SHA1 411e5fe5605f7ceb6adb888a87d2ce1199e67327 SHA256 9bb32385218ff148880baf545d451a3e40b9102a97fdfb45ab7ff7bc0ede94b5
+EBUILD thin-1.2.5-r1.ebuild 1232 RMD160 895a5e37c9f7e46a183d040d4661e79ea22ee15b SHA1 20ab6b1fb59b8026d91feab1e284358889b1b4d5 SHA256 962d704e3aa309bf4023946eed1c6f8626409938b8e8a50a4bbd0ea830b39160
 EBUILD thin-1.2.5.ebuild 561 RMD160 2bf010e4d69f1e8bc9265b610595f8c0a946dc17 SHA1 788684abbfb8a60f3071c50b6f19f8f21339d3be SHA256 e5f8453dac272b663771dd5382b4f341b872f78b7da85432b1b112af6401ad0c
-MISC ChangeLog 1248 RMD160 347542db8cfff0aea041488143309566b6741e39 SHA1 1246be9a2ec136a165928ca069a204b742ab990c SHA256 8c4876ad7a2e26db29df9b321507271d521a8846505bfbbf37404a55350faf84
+MISC ChangeLog 1455 RMD160 a85a9821932412e4383983275478cf813872c136 SHA1 46a7bc465a589a79e1fa9d0517584eb35a90d9ed SHA256 a2943439c4b8acd1cbb2547a0eb46ce5a5a668be2869ac8c2ad554ca9590944f
 MISC metadata.xml 429 RMD160 46c4e3070d56cb7a11d6d2edbea18f7ca893abb4 SHA1 d666e240bdbab618edf666813ee8336dcce1d5a8 SHA256 f96f9c85284589d524a5b3f2ae0ffc9f370d729da95dc0c3e7beb6f32c7eb3cc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksQ9BoACgkQaGsKqSU7eCTgTQCfT6R5rOd1sni36Aqq0FY4IxET
-U9UAn1g31iQTRmoDzuYGYDunTOw8DwUk
-=MIVR
+iEYEARECAAYFAktYMh8ACgkQAiZjviIA2XhBmACg3qQD6Cj/GR0zqvxLzhykFBTw
+TLgAn3YpQuxMDWcJ5kaq4KVjUACqH3Na
+=Qe+Y
 -----END PGP SIGNATURE-----
diff --git a/www-servers/thin/files/thin-1.2.5-tests.patch b/www-servers/thin/files/thin-1.2.5-tests.patch
new file mode 100644
index 000000000000..ae65539d8aaf
--- /dev/null
+++ b/www-servers/thin/files/thin-1.2.5-tests.patch
@@ -0,0 +1,27 @@
+unchanged:
+--- a/spec/request/processing_spec.rb
++++ b/spec/request/processing_spec.rb
+@@ -44,6 +44,7 @@ describe Request, 'processing' do
+   end
+   
+   it "should set body external encoding to ASCII_8BIT" do
++    pending("Ruby 1.9 compatible implementations only") unless StringIO.instance_methods.include? :external_encoding
+     Request.new.body.external_encoding.should == Encoding::ASCII_8BIT
+   end
+ end
+\ No newline at end of file
+only in patch2:
+unchanged:
+--- a/spec/server_spec.rb
++++ b/spec/server_spec.rb
+@@ -12,6 +12,10 @@ describe Server do
+   end
+ 
+   it "should set lower maximum_connections size when too large" do
++    # root users under Linux will not have a limitation on maximum
++    # connections, so we cannot really run this test under that
++    # condition.
++    pending("only for non-root users") if Process.euid == 0
+     @server.maximum_connections = 100_000
+     @server.config
+     @server.maximum_connections.should < 100_000
diff --git a/www-servers/thin/thin-1.2.5-r1.ebuild b/www-servers/thin/thin-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..6b4fafc934c3
--- /dev/null
+++ b/www-servers/thin/thin-1.2.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/thin-1.2.5-r1.ebuild,v 1.1 2010/01/21 10:55:23 flameeyes Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast and very simple Ruby web server"
+HOMEPAGE="http://code.macournoyer.com/thin/"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/ragel"
+RDEPEND=""
+
+ruby_add_rdepend ">=dev-ruby/daemons-1.0.9
+					>=dev-ruby/rack-1.0.0
+					>=dev-ruby/eventmachine-0.12.6"
+
+all_ruby_prepare() {
+	# Fix Ragel-based parser generation (uses a *very* old syntax that
+	# is not supported in Gentoo)
+	sed -i -e 's: | rlgen-cd::' Rakefile || die
+
+	# Fix specs' dependencies so that the extension is not rebuilt
+	# when running tests
+	sed -i -e '/:spec =>/s:^:#:' tasks/spec.rake || die
+
+	# Disable a test that is known for freezing the testsuite,
+	# reported upstream.
+	sed -i \
+		-e '/should force kill process in pid file/,/^  end/ s:^:#:' \
+		spec/daemonizing_spec.rb || die
+
+	epatch "${FILESDIR}"/${P}-tests.patch
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake compile || die "rake compile failed"
+}