Version bump.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 94 insertions, 6 deletions

diff --git a/www-servers/thin/ChangeLog b/www-servers/thin/ChangeLog
index 828c869c6536..7729608f5d72 100644
--- a/www-servers/thin/ChangeLog
+++ b/www-servers/thin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/thin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/ChangeLog,v 1.18 2011/12/25 11:41:08 graaff Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/ChangeLog,v 1.19 2012/04/27 08:53:15 graaff Exp $
+
+*thin-1.3.1 (27 Apr 2012)
+
+  27 Apr 2012; Hans de Graaff <graaff@gentoo.org> +thin-1.3.1.ebuild:
+  Version bump.
 
   25 Dec 2011; Hans de Graaff <graaff@gentoo.org> -thin-1.2.5-r1.ebuild:
   Remove old version.
diff --git a/www-servers/thin/Manifest b/www-servers/thin/Manifest
index 28e23e22816b..b012ed96c55b 100644
--- a/www-servers/thin/Manifest
+++ b/www-servers/thin/Manifest
@@ -5,13 +5,15 @@ AUX thin-1.2.5-tests.patch 957 RMD160 49ca87c338bddeec4488c76d1a43ad8f969ea52e S
 AUX thin.confd 772 RMD160 cce46ac294be31d28575d0f712708335547853d3 SHA1 782323bf5b1cafd65812339a90ff5f935d78010f SHA256 0c6d12deb82208da1acb5ee1f55ed9a5df159ea0f31db9a99b416ca3956a1772
 AUX thin.initd 1591 RMD160 d32c9f0b7fc083060305c71d753cf7580b03e9fe SHA1 915d073da08f479e17f7a32076f1f15f4f2c5d53 SHA256 09f7be62b2231a9461b3aafcfddb95fe9ffadbfba1bb5b3044f27f72efe65fea
 DIST thin-1.2.11.gem 142848 RMD160 74537595e90721bb8e013f75e0c65c12f8c156cf SHA1 defa97b88678f1358380346734acefd346a78bd9 SHA256 efdb6d80d613bc3bbd6b65896acd072825e9cfa99b185b875f4ba19fce43a861
+DIST thin-1.3.1.gem 141824 RMD160 e03d1607b1c00d7458d3fb9dc55a5b0e64c99449 SHA1 e009f5ce3ba092299cd0810652e67c080ffaef14 SHA256 283c01bf7d15d8b3cca47eae4ba03256a38c0a7b0f0c68b952400dab8a19b5f3
 EBUILD thin-1.2.11.ebuild 2159 RMD160 aea63f00422ca21d8b1747235eb51daba18a1dca SHA1 31e83a1084a364a7f6f9a79e0f9f67be8258b8a3 SHA256 b835dd02358ca34cd08f14db8aa2f831f37f57b9cbae4cfd335fb5eae915da83
-MISC ChangeLog 2689 RMD160 87524157110a1f4d18f0df4006842cef8fa62d3e SHA1 d3ae98bd216cb4f33246dc11d23e340da5eeb6e6 SHA256 444dd893e344e010626a73acc3affbe6b421c71b124c9e80f17626df11835cb8
+EBUILD thin-1.3.1.ebuild 2313 RMD160 6c3cc6b76ff528b2a02598bcddb135a3eead205d SHA1 4f3fe0fdd79846708f8169bc5ed48ae3d3e638e8 SHA256 154f63afe42f0f84bbf9c31b78a00a6c816fcee02484ce4e70285996b133986b
+MISC ChangeLog 2803 RMD160 a6bffb0ce931057ff6fa637f8635c0a415b1e1d6 SHA1 1fdf49e49d0932a1b688c2a35191e53cc7f1452e SHA256 1203e32c2d695af6fc9bca04b2657ee4b39cf3d8094eae24480d1cf816b57c97
 MISC metadata.xml 429 RMD160 46c4e3070d56cb7a11d6d2edbea18f7ca893abb4 SHA1 d666e240bdbab618edf666813ee8336dcce1d5a8 SHA256 f96f9c85284589d524a5b3f2ae0ffc9f370d729da95dc0c3e7beb6f32c7eb3cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk73C94ACgkQiIP6VqMIqNcPkgEAhcQH5YqVPzamDXw0jvgXxI2v
-jfj1H7sRnuG107vzKxsA/joIitkiQ/7b1bL4ffeVXztek29daSFt9d9qZv2LAkKN
-=Ehn9
+iF4EAREIAAYFAk+aXoYACgkQiIP6VqMIqNetuQD/SdUhlH71UR6C9iAyo2yL9KTC
+9iFkruAqs5SzPRZYo+4A/2Riy7Bss8GC/pRQEQ3c9xZbz3bTUaJOHPRtPOFVUc0e
+=mc0w
 -----END PGP SIGNATURE-----
diff --git a/www-servers/thin/thin-1.3.1.ebuild b/www-servers/thin/thin-1.3.1.ebuild
new file mode 100644
index 000000000000..486e68f4fb97
--- /dev/null
+++ b/www-servers/thin/thin-1.3.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/thin-1.3.1.ebuild,v 1.1 2012/04/27 08:53:15 graaff Exp $
+
+EAPI=2
+
+USE_RUBY="ruby18 ree18"
+
+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="${DEPEND}
+	dev-util/ragel"
+RDEPEND="${RDEPEND}"
+
+# The runtime dependencies are used at build-time as well since the
+# Rakefile loads thin!
+mydeps=">=dev-ruby/daemons-1.0.9
+	>=dev-ruby/rack-1.0.0
+	>=dev-ruby/eventmachine-0.12.6
+	virtual/ruby-ssl"
+
+ruby_add_rdepend "${mydeps}"
+ruby_add_bdepend "${mydeps}
+	dev-ruby/rake-compiler
+	test? ( dev-ruby/rspec:0 )"
+
+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
+
+	# Fix rspec version to allow newer 1.x versions
+	sed -i -e '/gem "rspec"/ s/1.2.9/1.0/' tasks/spec.rake spec/spec_helper.rb || 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
+
+	# Pipelining specs don't work. Avoid them for now since this is not
+	# a regression. https://github.com/macournoyer/thin/issues/40
+	rm spec/server/pipelining_spec.rb || die
+
+	# nasty but too complex to fix up for now :(
+	use test || rm tasks/spec.rake
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake compile || die "rake compile failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	keepdir /etc/thin
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	einfo
+	elog "Thin is now shipped with init scripts."
+	elog "The default script (/etc/init.d/thin) will start all servers that have"
+	elog "configuration files in /etc/thin/. You can symlink the init script to"
+	elog "files of the format 'thin.SERVER' to be able to start individual servers."
+	elog "See /etc/conf.d/thin for more configuration options."
+	einfo
+}