Revision bump to also unbundle the gems that get installed as gems, fixing bug 539700.

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

3 files changed, 28 insertions, 23 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 289503655234..f47ca3284a4f 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.699 2015/01/28 19:26:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.700 2015/02/15 09:57:00 graaff Exp $
+
+*ruby-2.2.0-r1 (15 Feb 2015)
+
+  15 Feb 2015; Hans de Graaff <graaff@gentoo.org> -ruby-2.2.0.ebuild,
+  +ruby-2.2.0-r1.ebuild:
+  Revision bump to also unbundle the gems that get installed as gems, fixing
+  bug 539700.
 
   28 Jan 2015; Michał Górny <mgorny@gentoo.org> ruby-2.0.0_p598.ebuild,
   ruby-2.1.5.ebuild:
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 4f4016145cfa..5f7933844363 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -8,30 +8,18 @@ DIST ruby-2.2.0.tar.xz 10304244 SHA256 848714e280fc5fb44dbac3b060b206e56c1947006
 DIST ruby-patches-1.9.3_p551.tar.bz2 2154 SHA256 c1c40f2b1f186a05774fd15c3566d722a5ab1af5b93a7c73f2d3c247d604fd73 SHA512 fdb07393439dfcc97e5d4ecd12059ef69983b23588079e1292cec1c93544524a67265e4f61f75d20ac540ee9f9ace730a584462f94bea4919124a3264e6f0ae1 WHIRLPOOL 422b7bfcbdb564fd89ae9536c15d78442ad5597c7728f84f2523a751a862807a92a77779cfdd42fcdd20569726f401e391e33c1666b0455432ddff228ea674fc
 DIST ruby-patches-2.0.0_p598.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512 423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
 DIST ruby-patches-2.1.5.tar.bz2 2310 SHA256 1743dc0cec0adc1a0b5d90b0ed7908f888b8251b7a414049a57e6e32e01e4ad6 SHA512 b695621d210a7afc6704dd480bf3e7fc559174ebf240d2287338d60537ba45e5bf0f5defac6b254064d4b28077e2b97ef23b7eadc1bfa1a6bf2c616e828f937c WHIRLPOOL e9fde062fc04e4e22aec2dc55250f9007c64b07c7d03875b4073c19af9cfb0ae735d6dcb2b65bd1465a457cf0ff0602866600b5af1d520df3efc8a418763ab5b
-DIST ruby-patches-2.2.0.tar.bz2 2310 SHA256 1743dc0cec0adc1a0b5d90b0ed7908f888b8251b7a414049a57e6e32e01e4ad6 SHA512 b695621d210a7afc6704dd480bf3e7fc559174ebf240d2287338d60537ba45e5bf0f5defac6b254064d4b28077e2b97ef23b7eadc1bfa1a6bf2c616e828f937c WHIRLPOOL e9fde062fc04e4e22aec2dc55250f9007c64b07c7d03875b4073c19af9cfb0ae735d6dcb2b65bd1465a457cf0ff0602866600b5af1d520df3efc8a418763ab5b
+DIST ruby-patches-2.2.0-r1.tar.bz2 2195 SHA256 c7acb19428dd1d5b59bff37e7705549e6e369504a99c171acc4d78b156ef1632 SHA512 ee438dd791a44778bb3da4afe96bac11cacb408cd859dcf057d12e3cc6d5e989b3b5f9c8662ede5229cc8d477126bfe46e1a02048a10e62b67abe22c0ecf4ab4 WHIRLPOOL 8e40576f1087ecc7a41ee9414857eac58e163895ffad3f4c4bb629bda38c8063b3eec608117251812fd8353b44dc58766e12f893cb37a6da7b277979b4da12db
 EBUILD ruby-1.9.3_p551.ebuild 6174 SHA256 59d120ad59634d7b30160cd8f6c50d06f767d6250fefddf7bc24c5749a388327 SHA512 ebcbc9a738ddf15ee25e9ead6d0582802e149b07cac5c9e8560525a388aa34fa23f362a26b04bace5c47b0b92a66b060a8f76bad57eb06091f91065ad8196b77 WHIRLPOOL 7065873cd0c935a7cde4170adcd2b521958aab44a994f9e90d7b504dc3117923eecc0c2bce89fd67a12718898ac2072494b33ee48da71225abb0392882f939f0
 EBUILD ruby-2.0.0_p598.ebuild 6515 SHA256 8757f1a5bfc2d71f3a91b5dbc36f8a4944f18fc65d4f131cd5ba883c84b62bc8 SHA512 80b540600cba0245ccf67544243ce44e0980f82a88f5443d611f25f6f9debfcf1ecbf4376fd227d1b827f1f8b75a3f2198353124ad43fb8cabad23de6de41a71 WHIRLPOOL 7122d74e5ea58810a27691d25f0c7f79d6c7f9804610a7e20f30538d5ee7357a3469fc1d82a29c9b4ede9db5edb04f65d4bf759ec87ba0c608b3ff703cc85973
 EBUILD ruby-2.1.5.ebuild 6567 SHA256 8007fde9e07aadc9b7908eef8b76503531d694a665832fc4885506b03a6a19ac SHA512 4ea916b7a9e9042acecba9ea4f82c242caba4f3e34b623402ea5c3254e291e960e6b97cf3dcbba9773f14ed18030c3827757bf3494d31a632f18c8f6d5626533 WHIRLPOOL c55e9ecf2f059fdbd6293e8c3c35cb52f02eb22cdc6638355c4a46527e88cadf956ab3ee2cac872476fab7740b4c5e52ee3a179c8f0df04079e3e944601b9d0d
-EBUILD ruby-2.2.0.ebuild 6484 SHA256 60adf5a6c713b85e0fd29989b3bbbf181def7990d84e3427e899efddece78940 SHA512 5f894a267a0a616a5e716aefd06aceea9d39f444bc6a3a6562ba48a9a03a6f8f57c7589a51d8646164ac8f697039b571802f5bd66211b961dc6f114fcf929a71 WHIRLPOOL 9c15b68ea7caffc6213c6380483662809cadf5a89c2edad98ed6713f7673e270af2f1d56c80f9b1d7c4e70747fc380d0c4bec4121d808834be5eceb2aad2ded2
-MISC ChangeLog 921 SHA256 bc791c01e98a6332bb807f37d85c5ffc0be0e97c43019baa3b19be35e53fd0a3 SHA512 c5a0b5a344d04076f9859c3f81ea1ee3995c81f1c6007e055509ec84dc6919fa15f3d7d69d72e93afc0c120ed2c8ea8d668de948c16ae073df58dea29558a22c WHIRLPOOL 4651a18716de1a519e74f10914199370c3bc25891add60ae3725578aabee62ebca6573190d81224249ef0e60f5b3f89af5e46be0dc325e834fec3fd8aab3eaaa
+EBUILD ruby-2.2.0-r1.ebuild 6844 SHA256 c7290ae801f062871e558351d89ae3ef9d79a3c728372f32df2c8195bd9fa237 SHA512 a5865bde9348a660cbedefb29f2d700a7fd5847f173c939ff06e124718055f04ca8a5f7fd3d83ff49a1c1d3d51db061c556746db3cd6cd7e89ab21147c07c6a9 WHIRLPOOL 3af93df7810dcbc90d189dd19da84ef9ac8981bc24caaeddb44fbc56d662048588a9c938efa870fa0e80a8bd2ce6c945e9a3e6fcea8ebb5e1373e42d67f80b6d
+MISC ChangeLog 1138 SHA256 2213e0ef98369a7a8ece6e0b42f43cc2bcf3325c255985d068921089f5d5b807 SHA512 c26a3ed411dd946cc90aeaa12762d79155febb2b37215cdb890c15862ee585ddb6e630f9fa6ad899f3ea55656791aeb953e51c27e60e5e501ed63d2e7604f915 WHIRLPOOL cadf338971df945723978aef5aadefb11dd235f87a7905b62634cf653e25d95c160e97ccc7672b2fb8416c15eca1ae2a15757284d323119e84f872f30a008fad
 MISC ChangeLog-2014 104250 SHA256 6587f8f101dc832a9f0c01b77a9d448b6a7b1c3c7befd1368e297bbe3dc41f1c SHA512 89ffec2164a619bbb418ecf43ecb0893a3f6a4846ff1ac403980e68d85efa7d502fa2f7338c80f8fcf12b56a1ed791c7d6d1bfc607f80fa88c1a88c3c6f93a85 WHIRLPOOL 47ced91b8df722e42d33773a243f89e57ca49f8942418d19321a1ed041fd9dabad747ff640fbb1f0de73220c23cd37778eedc44a14b8883b8220ee512089a823
 MISC metadata.xml 1084 SHA256 77b5afe4fc85576b9f4758b1cc1e9ad7021e40bdc341ca8a7932f54dba63a77b SHA512 3341c4c2bac3f5088827470ffaa842196c190d8732425fc0876cace29878602f62b4e0857e1eb52e8a2370df283735ed54da8d72802f8d09c9a513fe97e3e6ba WHIRLPOOL 481ca1b6f1bed13b2cdafe644f5478af62d29aa66374b5f2be55f5474a044d15894708dc1226f612c748d165cd1a26be5b0d307f290b74bca6a3c564a12e162a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUyTfyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO4j4QAIDzAz+3zaEdUBCFE9Vhlc4a
-zg6p//1/5rOvZyLO3c3KF/H6J2nH4Pv+DF3GQxSSKzmXYsi7NjGyFW9ABSq5vs2A
-O4hp8bR6zSfccbEAYzREcrjNu9eXfYKpmFuMp9ne4GgxuZ93b23WqBZF5tsvKBSW
-n3m7tAKUDynRAYTn5KS0xjXW7NsgdFQQt4Ew8KghzO1dvoTsg7YwhJA+ZKmEdx4F
-s02DRfUaSnmWlP7cXTYgZ4BUVkxVKAHL07R4u0Y23pKYCf/8K7S5TVpfgehN6WmK
-s5glZOkpsWT23dMWZj7IU+0+dvv19u4WScLz08vGyXtmuTf5jQrSl8DpFld+lmZ7
-7SkllCium68ZCJhfk0Gy/aZF9Qkg7TgxO7GOqPh11j78aOvK/4sI6292WFhR/0o7
-Q5sC0uF/UsqJN4t0hm+fAniILdFOOzhL0RItrx1bUT626TYN+yZxQNcUStx5wQ2G
-npLNQ+Ncyxr8o8gIiHg7sjsiDIE+tT4Wlhu77O1lfv5ftaYuQd3GGyVpyBYj+fm/
-DgiGdDNvHXQ9DMDgXV9jSm9RqBmr1sepwTSrMMMwdh43Dxw8U1eG5zU18cofNrVt
-gFSDvXToSH2TUSQK8yZCLYl53LIyCmg7h/5zwxlZdoRBGhSJWmgx1D+ggPnPOado
-y1PvgjkmjXwZk/xgbeum
-=nhRS
+iF4EAREIAAYFAlTgbW0ACgkQiIP6VqMIqNfVEQEAl2Bm3AdGrgNNIyHgtg/UoYNX
+gmDS9HU/jt8XYDwNn48A/iQIxXs8OyMgRuqbOTzUifTR6eeacpOCX7vjKEm3Yh52
+=lMhN
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-2.2.0.ebuild b/dev-lang/ruby/ruby-2.2.0-r1.ebuild
index 499e768ce48f..8d2c067d0f7f 100644
--- a/dev-lang/ruby/ruby-2.2.0.ebuild
+++ b/dev-lang/ruby/ruby-2.2.0-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-lang/ruby/ruby-2.2.0.ebuild,v 1.3 2015/01/19 20:07:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.2.0-r1.ebuild,v 1.1 2015/02/15 09:57:00 graaff Exp $
 
 EAPI=5
 
@@ -50,7 +50,15 @@ RDEPEND="
 	!<dev-ruby/rubygems-1.8.10-r1"
 
 DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+	>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
+	>=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
+	>=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
+"
+
 PDEPEND="
+	${BUNDLED_GEMS}
 	virtual/rubygems[ruby_targets_ruby22]
 	>=dev-ruby/json-1.8.1[ruby_targets_ruby22]
 	>=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
@@ -58,9 +66,7 @@ PDEPEND="
 	xemacs? ( app-xemacs/ruby-modes )"
 
 src_prepare() {
-	excluded_patches="012_no_forced_sse2.patch"
-
-	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
 		epatch "${WORKDIR}/patches"
 
 	# We can no longer unbundle all of rake because rubygems now depends
@@ -71,6 +77,10 @@ src_prepare() {
 	rm -r \
 		{bin,lib}/rake lib/rake.rb man/rake.1 \
 		bin/gem || die "removal failed"
+	# Remove bundled gems that we will install via PDEPEND, bug
+	# 539700. Use explicit version numbers to ensure rm fails when they
+	# change so we can update dependencies accordingly.
+	rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
 
 	# Fix a hardcoded lib path in configure script
 	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \