Write dependencies in a way that will not interfere with the ruby eclasses.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 24 insertions, 10 deletions

diff --git a/dev-ruby/ruby-oci8/ChangeLog b/dev-ruby/ruby-oci8/ChangeLog
index 1d95782c20b5..305bc0e318c9 100644
--- a/dev-ruby/ruby-oci8/ChangeLog
+++ b/dev-ruby/ruby-oci8/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-oci8
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oci8/ChangeLog,v 1.32 2015/03/02 10:30:58 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oci8/ChangeLog,v 1.33 2015/03/02 18:32:51 graaff Exp $
+
+  02 Mar 2015; Hans de Graaff <graaff@gentoo.org> ruby-oci8-2.1.7.ebuild,
+  ruby-oci8-2.1.7-r1.ebuild:
+  Write dependencies in a way that will not interfere with the ruby eclasses.
 
 *ruby-oci8-2.1.7-r1 (02 Mar 2015)
 
diff --git a/dev-ruby/ruby-oci8/Manifest b/dev-ruby/ruby-oci8/Manifest
index 48a0666b38c3..933ab6da16dd 100644
--- a/dev-ruby/ruby-oci8/Manifest
+++ b/dev-ruby/ruby-oci8/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ruby-oci8-2.1.3.tar.gz 218704 SHA256 e4df1cf60ef78a2fb377f210ce4e3b16a830bc87fd470bac033a363edfc21708 SHA512 900deb57aaa4732c37914cff2af1954bfb6ad5c346c1f439e4301a01b4a5cda0ceebd02742330cda5235b5445c346058961f8ee119461d7fac06f951f7a0c286 WHIRLPOOL 75be9cfe4c1f2d58db67cac64ce552eacb97035566662f419d1c999781560c7a237c1b90d707249be97eccda86dcb34d5541f027ae3a0c03d779e2392a402872
 DIST ruby-oci8-2.1.7.gem 231424 SHA256 6970edbed87a3f62db99a73f1584e615c572eb5818a9506161fbaff4e623c8c8 SHA512 7d08cba20c6fd1537e140c92cc5a6c7b169d1feb1a6c07a66c5569a6adf456943135935d47ded6cbf0c4a783d14d7877bb827e375c17a3b92dd5db0df8433d37 WHIRLPOOL 16228efb3057aebd82825c848dddef027f91f408f51d68d6d24f904eaedb49275b4969b78f190a0755ee531f0821ae8ece0ce845ad159a6d2b842a32b0d8c11b
 EBUILD ruby-oci8-2.1.3.ebuild 1015 SHA256 f22b1355011cc9d830bf67696ee212abee51c040497d1a89a0a7fd97266af2db SHA512 5535a1ad4fa9ea2d6d2ddb503f44196bd7b37cae5d369f778ce39fcd09867666de008fad9164efd98df1c4fea0dd423c40f25c338ce089e892cca8b04f7c5b57 WHIRLPOOL c975de4ad937011e4748ffa7fe21430c9922672e413e9f7d285ce3577c8c38e6b6d9831621b0aa76265810bff385e0cb1d15ff3d33e29b2db1add802c86620df
-EBUILD ruby-oci8-2.1.7-r1.ebuild 1035 SHA256 26cb69dd7edb955ae516d88e512cbc47507f5d3da16bf839272affbb0dfb9591 SHA512 57c25c6abd1b446e4c9d9cfe77e46cd26eac951421313f7cabbd4212dde18c077945505345d305e386bfe904b04da4f6f7582d86674f8ee301b726b67f322639 WHIRLPOOL 5c903284e97f96a8e8c7580c66e1d53b96f882766a5e1ddf439b474846265b03922b887b44f1e070f00f31f9c85ce45b276420d5b6958f2c376563c4994f1ae0
-EBUILD ruby-oci8-2.1.7.ebuild 1025 SHA256 d83ace0e58f24bcaa600fc1d4bbdb1e27c5e3f29a1c37ae34e0959c51109f961 SHA512 b70c31be130a1d65456dc45822d7d1a394beefb6b89a5b9ae6a10354bc45851138786cb44bd07f4963d2b789da60c94ea8eafd1dc95bc1388642a4f607ed61b1 WHIRLPOOL 41c05d237f2ed8c54b8443688c462df0467158f4983beb05989fa33cf066f79d9aa578edb9f01fc1a5054c77de800d59d64f0809dc1b048e7e316267d9ff20b0
-MISC ChangeLog 4662 SHA256 7da509b4d1af619ae80eddfdbff60d420074824b8468c898cce0ae10ca348933 SHA512 0d7edb8d607ff6bf923c84033c55c83e2a7c3a4bb90184c3f3eb09e633ca30cfb20e94f753a91200fc34f2f0dbe10f7cb6c9343f8ddbbcc2134863acbcb3ad7a WHIRLPOOL 7494f08bd2ed3826df58c0190b01ffaef0ddcb62380b57a8b69c09304f0e39c7eb5b98b26c9d0ee0367841e19ae76f89d72e92f3f3a167ca884702130b62cc5e
+EBUILD ruby-oci8-2.1.7-r1.ebuild 1063 SHA256 94e55fd545245f868fc892147ac529341d2ad155d9831973f90c0972fce33201 SHA512 ddcf3749887d58a15166558ff33040640f08a023ee5bfe75b365005f26872f7b6a745d3fb2dc023685d9243dec4f9415c7af37372d242fdb4456273d15f547af WHIRLPOOL 82c17a9a9f666c414b22e3d4a75479bd7c59c23be69137e9afd0e09927845ef3e4ce1c10f21e7c7189d3ff96e22d1b2e7374a1e6f864c8632394d51102a2d1ce
+EBUILD ruby-oci8-2.1.7.ebuild 1053 SHA256 c9d01091dbed0923f412df5ac1e65553e3105ca865492d496656f5460de937d4 SHA512 853555718afe0a4a78e5b51fd6292180fef3bb4e82fbe7af33b91bf6b5d44fa6021e9492d69688a29e221b7161a4a9cd16b275596c5f816f47f198e71bacbe11 WHIRLPOOL dfd6f4c94904241b777dee274be2a71d5cab2265ce131e3ec2813a60aa75911fe9621d36af49ce216c791b3aa81d639d240c3a6c5c4b68afddbeeb46122903c4
+MISC ChangeLog 4845 SHA256 8bde57bb6fbd584b00707ca182e27295663867461ba1b397c0845294331fe3cc SHA512 b64a2767d2d392be702164effe00372232e5987d55c035f8131ef958d7ea9616db5b36cda0a11dabf81fff33d12252c6799d0767cf361c18ef5cdd85b04a662a WHIRLPOOL 1f151bd90de64f02d9d612af8e9d7302c2494b2eb2c5d078db392e830f14e0000d307626b21fffc0af2bb3255ee03dedaf4cb158fb2c61dc88cc9f1cc155c091
 MISC metadata.xml 460 SHA256 1725a8ff2f9b5b09ad81af1143b36d59e9aef43407b38e72993192fc49cd709e SHA512 7d4d2e5f4c0d9b797ab697ee41251ccb59053b6447d2310ab8ba8f0c08614d05fe18e354aa72bfd48add226b19a828b76fa3c15f334d6f00c215549ab25f8131 WHIRLPOOL 33c04f9ddd256f94ca96eed36d6894aad05ec3fd693c2e37d136af80e0eeab9942975efcc3056b8702100f1241f1df9c950bd92c6c6a33a68d36508b3a99344f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlT0rNgACgkQiIP6VqMIqNc+UAD/Wg/xGdHhNsQyt/RFE7femCd/
+YtC1wdmdJCqqynh9chUA+QF1R2Fodh/BHKEyWHuwWGKadWKdMHOeNP/aUv3yNebP
+=78mU
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.1.7-r1.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.1.7-r1.ebuild
index 0a8b4c6b5316..eb67a0158e43 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.1.7-r1.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.1.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oci8/ruby-oci8-2.1.7-r1.ebuild,v 1.1 2015/03/02 10:30:58 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oci8/ruby-oci8-2.1.7-r1.ebuild,v 1.2 2015/03/02 18:32:51 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -17,8 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-db/oracle-instantclient-basic"
-DEPEND="${RDEPEND}"
+RDEPEND+=" dev-db/oracle-instantclient-basic"
+DEPEND+=" dev-db/oracle-instantclient-basic"
 
 EXT_DIR="ext/oci8"
 
diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.1.7.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.1.7.ebuild
index f271fe7a521a..7ce5c6c94bfc 100644
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.1.7.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oci8/ruby-oci8-2.1.7.ebuild,v 1.2 2015/03/02 10:30:58 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oci8/ruby-oci8-2.1.7.ebuild,v 1.3 2015/03/02 18:32:51 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -17,8 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-db/oracle-instantclient-basic"
-DEPEND="${RDEPEND}"
+RDEPEND+=" dev-db/oracle-instantclient-basic"
+DEPEND+=" dev-db/oracle-instantclient-basic"
 
 EXT_DIR="ext/oci8"