Add dependency over diff-lcs (bug #329495, bug #330207); fix the $HOME permissions (bug #299367).

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

3 files changed, 20 insertions, 12 deletions

diff --git a/dev-ruby/rspec/ChangeLog b/dev-ruby/rspec/ChangeLog
index 27f616d312bf..0b983a5bf36c 100644
--- a/dev-ruby/rspec/ChangeLog
+++ b/dev-ruby/rspec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rspec
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.72 2010/07/21 12:50:18 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/ChangeLog,v 1.73 2010/07/29 00:06:52 flameeyes Exp $
+
+  29 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org> rspec-1.3.0.ebuild:
+  Add dependency over diff-lcs (bug #329495, bug #330207); fix the $HOME
+  permissions (bug #299367).
 
   21 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
   rspec-1.2.9-r1.ebuild:
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 5257ae976244..dbffad647428 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -8,13 +8,13 @@ DIST rspec-1.3.0.gem 214016 RMD160 6682683dc7d812a5939c18a2e242e19461c23b75 SHA1
 EBUILD rspec-1.2.8.ebuild 438 RMD160 8fc1b32c1e4f93e42ae75f7c8bc8d8f469db3757 SHA1 7561f9f7855d30ffc434a66f6a8c50a0ef6e2c45 SHA256 bb0153955b3d023ef8f435ea949837009cf6174297daf75e35cd6654151bff3b
 EBUILD rspec-1.2.9-r1.ebuild 785 RMD160 0e783c23f37582ba03d841ebf4a49d881f885ef2 SHA1 6eb91af95aa3868f892de4ca4b434a9a91f943fa SHA256 a23a995402d1d26084537fdbc369c86e99a0247ed69a18b948f5b53f9211dd9a
 EBUILD rspec-1.2.9.ebuild 436 RMD160 3896c369abee85e89102b558d42ced12b7183f2b SHA1 8129fa7e75414a9092e366cb137b3da96796e483 SHA256 40df9ac4377c1f8021b194040eb46516a0c3381c045a98f42fb2f211c165d2c0
-EBUILD rspec-1.3.0.ebuild 1864 RMD160 a3346fc91144c626ec4d369b70260d77139f4fb6 SHA1 86455703174c098a08d0bdd494ccefd2494eb060 SHA256 95e0a2e3a6729e5445fccab11089ac4146e373a46a6e709df76b794aa1ae94e8
-MISC ChangeLog 9692 RMD160 da62ddd281b231e89ed9369850d09c361f435be0 SHA1 851403c14792f564e12848c4dd6ff2704766c302 SHA256 fa96f07dd7343bf4d2f429a96d0965ace0c0256ef935239f55b3d720c09ef63e
+EBUILD rspec-1.3.0.ebuild 2037 RMD160 4b49e97bbaa45053ffeef53cbe00b8e794d28a5d SHA1 f86b3718d4a1cc055d2dc55efc1e5245a2e31d92 SHA256 dd04c42248c4fd57b0563a84e32c33e8575581d0615eb974d9ddf8fead9f00da
+MISC ChangeLog 9875 RMD160 192836a4da6b2c60245cacb53ead28dfd3625839 SHA1 1117025eab1dd22c8220bbba656e495b1cf1f729 SHA256 918226a17d47f7ab9217cd14d289b3bbfd20eb628e49cf1599ab11c6f30abff4
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxG7ZQACgkQNQqtfCuFneMWMgCfa8q+nrSeb6J5TSSyNhwsAR6c
-bewAn15MzDYpRNZbMC3SKxiQkqBn5JmV
-=y5/h
+iEYEARECAAYFAkxQxi8ACgkQAiZjviIA2Xjo9QCgkinY4uwVT2BirD5REmTkncGd
+sFkAn2I41CejoUVnbo5vJ+lI47VYa/Ct
+=IvxT
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rspec/rspec-1.3.0.ebuild b/dev-ruby/rspec/rspec-1.3.0.ebuild
index 89f2a0c82f9b..a58e949740ea 100644
--- a/dev-ruby/rspec/rspec-1.3.0.ebuild
+++ b/dev-ruby/rspec/rspec-1.3.0.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/dev-ruby/rspec/rspec-1.3.0.ebuild,v 1.9 2010/05/22 23:18:57 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-1.3.0.ebuild,v 1.10 2010/07/29 00:06:52 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -21,7 +21,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
-ruby_add_bdepend doc dev-ruby/hoe
+# it's actually optional, but tests fail if it's not installed and
+# some other package might fail tests, so require it anyway.
+ruby_add_rdepend dev-ruby/diff-lcs
+
+ruby_add_bdepend "doc? ( dev-ruby/hoe )"
 
 RDEPEND="!<dev-ruby/rspec-rails-${PV}"
 
@@ -32,11 +36,11 @@ RDEPEND="!<dev-ruby/rspec-rails-${PV}"
 # possible, but since it's yet unported to 1.9 and the nokogiri-due
 # tests fail for sure, we'll be waiting on it.
 USE_RUBY="ruby18 ree18 ruby19" \
-	ruby_add_bdepend test "dev-ruby/hoe dev-ruby/zentest dev-ruby/fakefs"
+	ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/zentest dev-ruby/fakefs )"
 
 # the testsuite skips over heckle for Ruby 1.9 so we only request it for 1.8
 USE_RUBY="ruby18 ree18" \
-	ruby_add_bdepend test "dev-ruby/heckle"
+	ruby_add_bdepend "test? ( dev-ruby/heckle )"
 
 all_ruby_prepare() {
 	# Replace reference to /tmp to our temporary directory to avoid
@@ -47,7 +51,7 @@ all_ruby_prepare() {
 }
 
 src_test() {
-	chmod 0755 ${WORKDIR/work/homedir} || die "Failed to fix permissions on home"
+	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
 	ruby-ng_src_test
 }