summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-01-25 17:17:48 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-01-25 17:17:48 +0000
commit3613fadf132f76817ccd53ad0bfa3e4322adb9fc (patch)
treef92681c08336d433000cfd17d230241fdb1605f9 /www-servers
parentFix non-master master breakage with deleting own branch. (diff)
downloadhistorical-3613fadf132f76817ccd53ad0bfa3e4322adb9fc.tar.gz
historical-3613fadf132f76817ccd53ad0bfa3e4322adb9fc.tar.bz2
historical-3613fadf132f76817ccd53ad0bfa3e4322adb9fc.zip
Fix deps, remove spec task when not running tests (to avoid depending on rspec unconditionally).
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/thin/ChangeLog7
-rw-r--r--www-servers/thin/Manifest10
-rw-r--r--www-servers/thin/thin-1.2.5-r1.ebuild8
3 files changed, 18 insertions, 7 deletions
diff --git a/www-servers/thin/ChangeLog b/www-servers/thin/ChangeLog
index a9c4338f2aae..bff9efe27c46 100644
--- a/www-servers/thin/ChangeLog
+++ b/www-servers/thin/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-servers/thin
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/ChangeLog,v 1.10 2010/01/25 17:17:48 flameeyes Exp $
+
+ 25 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+ thin-1.2.5-r1.ebuild:
+ Fix deps, remove spec task when not running tests (to avoid depending on
+ rspec unconditionally).
*thin-1.2.5-r1 (21 Jan 2010)
diff --git a/www-servers/thin/Manifest b/www-servers/thin/Manifest
index 6dd934dcdb96..e51582a79a8d 100644
--- a/www-servers/thin/Manifest
+++ b/www-servers/thin/Manifest
@@ -5,14 +5,14 @@ AUX thin-1.2.5-tests.patch 957 RMD160 49ca87c338bddeec4488c76d1a43ad8f969ea52e S
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-r1.ebuild 1389 RMD160 d739128b2f25551fa68baea2eb099c1054770a11 SHA1 f4984a2dce7b071f191e1aa31faf314a6de70e74 SHA256 216101284ada3d053a27e3286107a277496a8c56efea85dd37665006e0c0aea7
EBUILD thin-1.2.5.ebuild 561 RMD160 2bf010e4d69f1e8bc9265b610595f8c0a946dc17 SHA1 788684abbfb8a60f3071c50b6f19f8f21339d3be SHA256 e5f8453dac272b663771dd5382b4f341b872f78b7da85432b1b112af6401ad0c
-MISC ChangeLog 1455 RMD160 a85a9821932412e4383983275478cf813872c136 SHA1 46a7bc465a589a79e1fa9d0517584eb35a90d9ed SHA256 a2943439c4b8acd1cbb2547a0eb46ce5a5a668be2869ac8c2ad554ca9590944f
+MISC ChangeLog 1638 RMD160 979bc3b3aaa110a96def08ffa5a7ce7095075f21 SHA1 6344fbcb2cbe432544b015aea12c7d64978b415c SHA256 d1ef8d1a579a2357dd0fa159b7029740ba601250d55d3d3a3f4ef7a4c065f7ae
MISC metadata.xml 429 RMD160 46c4e3070d56cb7a11d6d2edbea18f7ca893abb4 SHA1 d666e240bdbab618edf666813ee8336dcce1d5a8 SHA256 f96f9c85284589d524a5b3f2ae0ffc9f370d729da95dc0c3e7beb6f32c7eb3cc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAktYMh8ACgkQAiZjviIA2XhBmACg3qQD6Cj/GR0zqvxLzhykFBTw
-TLgAn3YpQuxMDWcJ5kaq4KVjUACqH3Na
-=Qe+Y
+iEYEARECAAYFAktd0h0ACgkQAiZjviIA2XiGjQCgynpcYO6uA/pxwmTjtezqR+4q
+v/0AnRXesqugGQb7ybGDNTJy4abvgzeZ
+=bFzS
-----END PGP SIGNATURE-----
diff --git a/www-servers/thin/thin-1.2.5-r1.ebuild b/www-servers/thin/thin-1.2.5-r1.ebuild
index 6b4fafc934c3..990883b5017a 100644
--- a/www-servers/thin/thin-1.2.5-r1.ebuild
+++ b/www-servers/thin/thin-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thin/thin-1.2.5-r1.ebuild,v 1.2 2010/01/25 17:17:48 flameeyes Exp $
EAPI=2
@@ -24,6 +24,9 @@ RDEPEND=""
ruby_add_rdepend ">=dev-ruby/daemons-1.0.9
>=dev-ruby/rack-1.0.0
>=dev-ruby/eventmachine-0.12.6"
+ruby_add_bdepend dev-ruby/rake-compiler
+
+ruby_add_bdepend test dev-ruby/rspec
all_ruby_prepare() {
# Fix Ragel-based parser generation (uses a *very* old syntax that
@@ -41,6 +44,9 @@ all_ruby_prepare() {
spec/daemonizing_spec.rb || die
epatch "${FILESDIR}"/${P}-tests.patch
+
+ # nasty but too complex to fix up for now :(
+ use test || rm tasks/spec.rake
}
each_ruby_compile() {