Update syntax for the new eclass changes, add a dependency on itself or tests (bug...

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

diff --git a/dev-ruby/rubigen/ChangeLog b/dev-ruby/rubigen/ChangeLog
index 0d33c663a0806d88564e933a70c4628690efb390..6084569c434d8a5f4203aa86fd5aa22ada36f472 100644 (file)
--- a/dev-ruby/rubigen/ChangeLog
+++ b/dev-ruby/rubigen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rubigen
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubigen/ChangeLog,v 1.4 2010/02/26 07:02:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubigen/ChangeLog,v 1.5 2010/05/22 12:48:51 flameeyes Exp $
+
+  22 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  rubigen-1.5.4.ebuild:
+  Update syntax for the new eclass changes, add a dependency on itself or
+  tests (bug #320781).
 
 *rubigen-1.5.4 (26 Feb 2010)
 

diff --git a/dev-ruby/rubigen/Manifest b/dev-ruby/rubigen/Manifest
index 173f25135495a6f1d91b75459f22df762aaece19..221587b87f6f18199eb751f66300b4fa88bf74dc 100644 (file)
--- a/dev-ruby/rubigen/Manifest
+++ b/dev-ruby/rubigen/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST rubigen-1.5.2.gem 55296 RMD160 ce703fa420f2878d44cd21b70aa87e911180fdb5 SHA1 792964a711874525fe8e8b00dfb4d97636188a92 SHA256 5dcb4f545f1bfa66deb9f476991d7fcd6268380f874ee92b269d814970f0cb18
 DIST rubigen-1.5.4.gem 56320 RMD160 e6f40676a32f68f50d78794909d35d17aa17a9f4 SHA1 ecf883bf9c680bb616c0c2ce85068d54f3bc3e09 SHA256 4bb369032838625b0341ce89c294870a1d85e99811e15f09d44d895323344711
 EBUILD rubigen-1.5.2.ebuild 530 RMD160 941689333d8c695f1ee87ed5012fd89d2ffb1810 SHA1 c7bb74c8a6376f929ce465e68604de383270da07 SHA256 a6a18eddbc5053d20caffdd99a80f691c63153d87d9cb752ebd33b0e3f57689f
-EBUILD rubigen-1.5.4.ebuild 1342 RMD160 75cc65c072ef74c7eca783b954fddb033cf13872 SHA1 3ed7533388a89ec588ee0dabf0b7b7f25f22b6d7 SHA256 5c3c5a37f0eafd251244f6b2443d97584e324361eb4a1e7a914e3c4857176ff5
-MISC ChangeLog 833 RMD160 379efc048e6837a980d37f22d457062a3912de47 SHA1 c40fef0df9020980a61bebc4d67f38419a47001b SHA256 cc98d391d9510a0d23f32fe7bd7890b76cc4666b9c801594591125a2dcce2d52
+EBUILD rubigen-1.5.4.ebuild 1520 RMD160 60a0f92ce7206dee55eccef54749e1c116e56c80 SHA1 456aa666e4e2987b1928db7d3b409aa4e1a2573d SHA256 989ec3df702b42f1bf19b83d72f1242293d981b3576aaefdbfa546257e408bfb
+MISC ChangeLog 1014 RMD160 5fa0213532289b0018840f6d352ba362abf22c0c SHA1 9e0d0cbc9128130bfea7f7dae7941951807a7292 SHA256 83a8d5481860dcaafc4d78bbaff4139551d69b02259a1947d6022bac05ef73a8
 MISC metadata.xml 159 RMD160 e6b7ca92e6c0fc796353896e830687ec51efbaf5 SHA1 96f46f7af5d8526b778e417be3c3d2f8ae5be274 SHA256 5fd95e97ccf4410cb31431d51fb5d62baef04eaa59e4f0ad6d1b43c03111d8d0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuHcf4ACgkQeM7EJeUH71PknwCeM8GwSMkomDYC2vQb1kCulBaG
-l64AnAx5xYHSd4VufL3QIsXSalyr86NS
-=BNqX
+iEYEARECAAYFAkv30oYACgkQAiZjviIA2XjAcQCgwNwMqy2RmfO4FR5Fpex39lg/
+eAYAniZDmpHdMCGh4NYwmrRx4o/wGsCU
+=9p+s
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/rubigen/rubigen-1.5.4.ebuild b/dev-ruby/rubigen/rubigen-1.5.4.ebuild
index bd22b25d3af9d397f7f1d26b903b17aceb498512..9aa93dfabfeec19804b7f05ac4a0096ec451229b 100644 (file)
--- a/dev-ruby/rubigen/rubigen-1.5.4.ebuild
+++ b/dev-ruby/rubigen/rubigen-1.5.4.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/rubigen/rubigen-1.5.4.ebuild,v 1.1 2010/02/26 07:02:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubigen/rubigen-1.5.4.ebuild,v 1.2 2010/05/22 12:48:51 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -21,10 +21,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_bdepend test ">=dev-ruby/mocha-0.9.8
+# The presence of a self-dependency is needed as per bug #320781;
+# since this is a bad situation, don't close the bug, but try working
+# it around.
+ruby_add_bdepend "test? (
+       >=dev-ruby/mocha-0.9.8
        >=dev-ruby/shoulda-2.10.3
        >=dev-ruby/hoe-2.4.0
-       virtual/ruby-test-unit"
+       =${CATEGORY}/${PF}
+       virtual/ruby-test-unit
+)"
 
 ruby_add_rdepend ">=dev-ruby/activesupport-2.3.5"