Create stable candidate for security bug 553298.

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

4 files changed, 136 insertions, 8 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index 4f8ada6a6429..420eae065a15 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.266 2015/06/28 08:09:39 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.267 2015/06/28 08:10:54 graaff Exp $
+
+*rubygems-2.2.5-r1 (28 Jun 2015)
+
+  28 Jun 2015; Hans de Graaff <graaff@gentoo.org> rubygems-2.2.5.ebuild,
+  +rubygems-2.2.5-r1.ebuild:
+  Create stable candidate for security bug 553298.
 
   28 Jun 2015; Hans de Graaff <graaff@gentoo.org> -rubygems-2.2.4.ebuild,
   -rubygems-2.4.7.ebuild:
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 025513480d5a..236fd358deca 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -12,15 +12,16 @@ DIST rubygems-2.2.5.tgz 416772 SHA256 0f015d63ee3f48be2cc440332d992a33f6df113ced
 DIST rubygems-2.4.6.tgz 447588 SHA256 76d3f3b10aa824d23a511f098ab777c6473b98ffa733f7be4222408897b68db9 SHA512 2cf5447e0de8e8f85916e91774eba1f2113397d3ed7147671b74443696574ba0478d8f2aec789d024eabcd5afc1c4910dbe71f389b30045fa50bde14d2bb1cb1 WHIRLPOOL e901f4354c706666b8f85cd0d345c8ad04eecb88914927e9b213bd7a83fd9be42c3d1082da87cafce0cc05deafa70436250a2fee92b62f91e6e113fbfa66c1b0
 DIST rubygems-2.4.8.tgz 447712 SHA256 5a4335fef5904ceb76d912a9d4a2464fbbb172df3b2abcb0c67003e77764845e SHA512 1cc2e9e19d665268f475ce90547377d41a4ea5ce9a9afab4979de0247a0dd82b04529c087c899d9ced5564fa9051e1d2fe23ddb764ba411915bab2ce344ac419 WHIRLPOOL e9fa65b3ff24a05082fd6ded221706c45e8d7c6677ccc31e6971991320800d47fef99651fb338c797e20ab4ab7775c7192e09f4575fc815640c4f2a8d5ea273b
 EBUILD rubygems-2.2.2.ebuild 4466 SHA256 a19f0996d6b25737e0ebfba5bc5afbe5e6903a5ce0505bbe94edad2de477ee9e SHA512 158e021ef5504d086ec8ca88c5eafbf9d8bac60496fd7ee06083d4d177259701a09b55c1a0865432859747d9952c440ad5da72d69b7cb8ed7921b3bcd91cdf3b WHIRLPOOL bce0fc79b35ef9473a4c127dde66454aee484b46c17987a0b8cb33e07a75ab8aaa28069ecc88e4ca55a056f6560c43497a15da869700eb3556abce7543f59978
-EBUILD rubygems-2.2.5.ebuild 4481 SHA256 01533851ccebf69d50bdeaef3f9a7431346d768a09757d148dc459d1a4b7e541 SHA512 f251169541f11f363b02ac1dad42eca0296bd263429aac6e64f53554525deac0339950a0e532cb17a96054c778305302d70fa44bf85d1a15d1300717801f6a4f WHIRLPOOL 82b2f907e18a8af9c7df3c45987f2926a444b4a41f4d23bd32e07885b6c3cdef18a9554911ea73f9fbe8af5dc3edbe4d9379defa218beafbf0bcbdeff2dd3e24
+EBUILD rubygems-2.2.5-r1.ebuild 4484 SHA256 c9352d1b05411197b70bccf214529b0c006b2bc77fe7a9e3f3aad2ea29dad49a SHA512 0327c531ca52e0a1ed62071ec819f6ec25a148d1201319517749e85c119584a90a76690b74bcff10409dd1b90b6758b75064883a56ddeced0c3434411ca7ad3a WHIRLPOOL 9261a8fb7a9300355dd51a213bc42c31d3a9a6ca40e7e8bce805621f376b4ce1e70db861e3dd979d1dd775fc0b001cc2404bdbafdaba225ed297bc0b2f6922c1
+EBUILD rubygems-2.2.5.ebuild 4474 SHA256 512d28617d54d9b395c49aa4e40e0d16b81d024006f568039c18d15344b5e184 SHA512 9846e2a5ad90b0cf6d83738c5f81100225df298d293a5443ce21361561617c13baa9a07cf1f84a440edcfd21ddcc2402b580a77e6db92ee58094df91b8dab724 WHIRLPOOL 6e66f5cd24f56ba7de15c48c3d9f76277a9bd5c0b29002e0a18796a6537c2045b8eb6c27ac710d62571f58ff3ba133ca60ddc6d676758a1187a761a7d238593b
 EBUILD rubygems-2.4.6.ebuild 4206 SHA256 ef516a70ffba455494fdbd6b30439832b7d4ef20639af461ae64e9cbdc3dd1e3 SHA512 78e47e7df9c8f05f900a954350c0f4ed31930da3e213c8067a5f803b4f61c1eda0fdc5020b5ad888aa5af89b3a7677e577d2e977887dd63e25b49ac67423a6f2 WHIRLPOOL 985ee3bfd8a6d9778ff8947f9a25ee3db8f54e9bcacd961068877f02604dcb278057bfe2e15a524559ee320f5ea6d51d5b45e5281b9f8dc1557110c88059e823
 EBUILD rubygems-2.4.8.ebuild 4206 SHA256 cd33034a0180a57786daba23f27b2c9406c97e3b38acaa16e710b898d5848d4b SHA512 d2aae1aae94d7a28d28788c16dcdfb5ed4bc6e995188c5a4d5ee27b4e99dfa5ce19a7ed98dc4cf3fa9364c82ea5091e1f04e127adbe0f7307718a51ad86c0e1b WHIRLPOOL 1ea5129732f8f3a3d71557d8a0523d2fff6bf8ab7312e72281b44c4710640c80b49c962299b6281bb2ee1c6a03e86934e00b6c75fd95de8b2747f939bc02cec7
-MISC ChangeLog 39946 SHA256 f2c11bcab1e252ce0369a29e35fa43d2b3a04dbd90d05ccedb5279b63c452beb SHA512 95c39c12a9d681a5ee821b8b295208191ad3a9b90b31531409d77ae6e3ca4b579199303d63ca7fd895ca70b601affc7027658734498321a3b5ca6b5e9b85d4b1 WHIRLPOOL 16729925ae9d7c62387f39d5e0a5a82638e950b21b28b145ae82a9cf60e04af44b1b841563bb206ab4b56d10c3d591cf4d899bbec39cc55d775166cfd1fbcc4c
+MISC ChangeLog 40134 SHA256 6e16c0387507633aa6391add116ae6a4aca4b3fa0c4ff71650b6d904c217b3d0 SHA512 6c10fb4b699464e9ac919ac1cb4ab5d2814c7a9b6eaf7de7cbd5160cc7c39521bc3d60ce1b64a2b20c317d5c1fc80b8256842ef9ecebe19bc1c611831bdab9a9 WHIRLPOOL b93ee44f10e0e1cb6aa19e7730d646a65878ff046bd0cf2994c71ed777857acf63259cabb7b34edae5dadb79a12af3a5bac2f59069f83691b0cfe91f79a6fd57
 MISC metadata.xml 318 SHA256 6e5f2eec30e8b7f9b678daf799db43ea56cc4566ca70635677d2cf5f60ebd3dc SHA512 a8036da4d9fd5c22fd71ab1eee6de35c25737616e9cf443786f0a6d9c2ebf1e5f3791f19ebe7693635eeb0bc793931e935ed0f7011fd37b764f7b26c59fde8a4 WHIRLPOOL 4aa04bfa68b9ac28debd59f64629806e100583b05a80edab02f917e9bb7f3b5afd7f0b35b05731580f895a531dcabf8dedf6ce21c43dd1cf44df66a21be6ae26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWPq8QACgkQiIP6VqMIqNeTrgD+K7GJ1EigUZl+BHhrYNneaiw6
-AYSmZju+quNutZpYE+UBAIXfDzhAIaCRlcE03B3OxYpEIxTD0JCxCwD4CrDZyRWf
-=tHUH
+iF4EAREIAAYFAlWPrA8ACgkQiIP6VqMIqNe5RgD/XvmftTHlzIE99WGiyt0C7ht4
+mCsInt+heO3qXUkCi2sA/A5mhIUFOQY6zdJ9ndRJzdR0iBy+GZfy9QXyTJOSynEs
+=jptF
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild b/dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild
new file mode 100644
index 000000000000..fd440d19ecf8
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild,v 1.1 2015/06/28 08:10:54 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="http://rubyforge.org/projects/rubygems/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="http://production.cf.rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+
+PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/minitest-4:0
+		dev-ruby/rdoc
+	)"
+
+all_ruby_prepare() {
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_check_executable_overwrite_default_bin_dir/,/^  end/ s:^:#:' test/rubygems/test_gem_installer.rb || die
+
+	# Remove a test that fails when yard is installed.
+	sed -i -e '/test_self_attribute_names/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+
+	# Skip tests for default gems that all fail
+	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
+	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
+	sed -i -e '/test_execute_default_details/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
+	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
+	sed -i -e '/test_load_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
+	sed -i -e '/test_alien_default/,/^  end/ s:^:#:' test/rubygems/test_gem_validator.rb || die
+
+	# Avoid tests playing tricks with ruby engine that don't seem to
+	# work for us.
+	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
+
+	# Avoid test requiring network access
+	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
+			-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
+}
+
+all_ruby_install() {
+	dodoc History.txt README.rdoc
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(19|20|...)"
+	ewarn
+}
+
+pkg_postrm() {
+	ewarn "If you have uninstalled dev-ruby/rubygems, Ruby applications are unlikely"
+	ewarn "to run in current shells because of missing auto_gem."
+	ewarn "Please run \"unset RUBYOPT\" in your shells before using ruby"
+	ewarn "or start new shells"
+	ewarn
+	ewarn "If you have not uninstalled dev-ruby/rubygems, please do not unset "
+	ewarn "RUBYOPT"
+}
diff --git a/dev-ruby/rubygems/rubygems-2.2.5.ebuild b/dev-ruby/rubygems/rubygems-2.2.5.ebuild
index 00098ff046a8..1a7782175f84 100644
--- a/dev-ruby/rubygems/rubygems-2.2.5.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.2.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.2.5.ebuild,v 1.1 2015/06/11 05:37:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.2.5.ebuild,v 1.2 2015/06/28 08:10:54 graaff Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20"
 
 inherit ruby-ng prefix