Create stable candidate.

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

4 files changed, 77 insertions, 7 deletions

diff --git a/dev-ruby/fakeweb/ChangeLog b/dev-ruby/fakeweb/ChangeLog
index 5b3e93f6b113..f284b5a57958 100644
--- a/dev-ruby/fakeweb/ChangeLog
+++ b/dev-ruby/fakeweb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/fakeweb
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/ChangeLog,v 1.22 2014/11/25 11:32:48 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/ChangeLog,v 1.23 2015/03/29 07:14:31 graaff Exp $
+
+*fakeweb-1.3.0-r2 (29 Mar 2015)
+
+  29 Mar 2015; Hans de Graaff <graaff@gentoo.org> fakeweb-1.3.0-r1.ebuild,
+  +fakeweb-1.3.0-r2.ebuild:
+  Create stable candidate.
 
   25 Nov 2014; Manuel Rüger <mrueg@gentoo.org> fakeweb-1.3.0-r1.ebuild:
   Drop jruby target.
diff --git a/dev-ruby/fakeweb/Manifest b/dev-ruby/fakeweb/Manifest
index 1b9fdcc180bc..8f29eca3caab 100644
--- a/dev-ruby/fakeweb/Manifest
+++ b/dev-ruby/fakeweb/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST fakeweb-1.3.0.gem 58368 SHA256 1ec996be13020a00b3464560c09180b424477c698f59f82edf2b99b16cfa09a8 SHA512 5785bf8e17f9b9b73a9fd2b581c6c5dcf466a5d68c2dbea593bca7cd5d385b5b1315ca777c39bce2a8077ccab6d5df7f031435c9227931c3d2a84512da9cb423 WHIRLPOOL 976e48b1e66e951a22fa28970356c3e85927027fd7262242a50ecac55771fc2ed7c1830d4dcc0566f479fa5c844a0d59b2b268ebd26ba87988f543b982e51214
-EBUILD fakeweb-1.3.0-r1.ebuild 1484 SHA256 30604d68f71cfe2bc148efb09d726eba0fd555bf40b7cf696e78c84bfb082164 SHA512 d4169578e73d91394800f22459572c93e8282eeb0af1b2e61e80543622f74fbc306170da43cb1e2dcebf659f5b8a8e64e04003c67714b4b848fe4913a4767ee9 WHIRLPOOL f0612ec8d462baa0343378afe57ace18d68553ac6d8e1c0de8e77094f2b7a7fa295c6e63c1b72138c9ca72da9e3582a4fde42c71cd49d61d33cb2e05a542b9fb
-MISC ChangeLog 2836 SHA256 094e65d96a0140b9de9aafd54714521e7ebee788f3fc9114bd1ff686c1667dac SHA512 e48fb4824c1c00078e95943d25458495cb2c9b59be96fc421bb6dd09083e03b83c95798ac7e7d2703db06625acd4305e36293f0011b4ba9134bcc4b6f41a7bbc WHIRLPOOL 6a2fd722f7c6c5d98efe4b09f7e2d6c745f9a0d8a0c1b54c4b23682a0922ade6936af98615bec3bd0a2f70739b292a66a7b83225623290f806c6f8a3cc4940ba
+EBUILD fakeweb-1.3.0-r1.ebuild 1478 SHA256 1f57b7f5740f6a7c3b5bf36c0880c255a09b2cb354c00e78f9f8dddb0e9b477a SHA512 67e48fd1a2a21400ec54c3c65e4c082368f63fb412d4aa03efcda328b5ca3864930f422f86c1ce6ea30a86e251dcfe1c8f8f2b497dd5e426a6f65ce6138af00b WHIRLPOOL 258917d4e9c4d3a192f397dac2d4aff524d76e389c3be01c29da1ccadc76cbce59b8cc9f41561b68ecc87b2cb848b1fb3ca2f49ceb2749cf0ab68d754c3f2ace
+EBUILD fakeweb-1.3.0-r2.ebuild 1485 SHA256 06fcf0d527938d3cc0ea2162100b0b1c6c946c8b8d4565b61e68d40d228a7093 SHA512 d5e0781c758abe4060c6b40024f91e14f48a3b4df552d7c25ecf2521f88d44e4981d05f629d3fede09d6a357ff19dbeae50a2ecceec2e962eb2fd789e1214628 WHIRLPOOL 62a1838388fa8c81000f3114da1391c0aa8318ca92ae13581ca50d5875df97fc0a1beed7a7b5375a1107df726c329e14fa7c764aaad209aac64116d6efd6969c
+MISC ChangeLog 3001 SHA256 f66408b4ba49ac30a3c8462e682f9ef4c1ede3b827ca26c212ca13f730ee6377 SHA512 b4ea2987602860a8f5aac668ee738b2fa776c957b8bc2e3b80434d2babb7dd6b371d80c3705baab8f1952586cf104c15267739d41fb84353913df4f82d1c52c7 WHIRLPOOL 9d2ac06fa237cc0602fe0475e3d467b16f6c75aa2036f1413bdb6c07d4c407407a1820d75bb3031e826a3fa5d8bb02c00af58324eb9b9fabddb47b9c0b8c9f41
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlUXplgACgkQiIP6VqMIqNcuAAD+IRuPyPGMqsNEj1Nf0A7XU90m
+ASiJ32KM2EvjeIJGdCMBAIvOAdX739JYQxashxXFQV55/BiDgqtF4w/RYHUn/Yz+
+=3yhL
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/fakeweb/fakeweb-1.3.0-r1.ebuild b/dev-ruby/fakeweb/fakeweb-1.3.0-r1.ebuild
index 2d0f0d999679..f4497b8e96b3 100644
--- a/dev-ruby/fakeweb/fakeweb-1.3.0-r1.ebuild
+++ b/dev-ruby/fakeweb/fakeweb-1.3.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/fakeweb-1.3.0-r1.ebuild,v 1.4 2014/11/25 11:32:48 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/fakeweb-1.3.0-r1.ebuild,v 1.5 2015/03/29 07:14:31 graaff Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_DOCDIR="html"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
diff --git a/dev-ruby/fakeweb/fakeweb-1.3.0-r2.ebuild b/dev-ruby/fakeweb/fakeweb-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..7fe79243dbbb
--- /dev/null
+++ b/dev-ruby/fakeweb/fakeweb-1.3.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fakeweb/fakeweb-1.3.0-r2.ebuild,v 1.1 2015/03/29 07:14:31 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Helper for faking web requests in Ruby"
+HOMEPAGE="http://github.com/chrisk/fakeweb"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha:0.13
+		dev-ruby/test-unit
+		dev-ruby/samuel
+		dev-ruby/right_http_connection
+	)"
+
+all_ruby_prepare() {
+	# The package bundles samuel and right_http_connection, remove
+	# them and use the packages instead.
+	rm -r test/vendor || die "failed to remove bundled gems"
+
+	# We don't package sdoc and we don't have the direct template.
+	sed -i -e 's/sdoc/rdoc/' -e '/template/d' Rakefile || die
+
+	# Require an old enough version of mocha
+	sed -i -e '1igem "mocha", "~> 0.13.0"' test/test_helper.rb || die
+
+	# Use the test-unit gem to make jruby compatible with newer mocha.
+	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby2[01])
+			# Tests fail on mocking of TCPSocket, but fakeweb itself
+			# actually works as evidenced by the thor test suite.
+			rm test/test_fake_web_open_uri.rb test/test_allow_net_connect.rb test/test_fake_web.rb || die
+			;;
+	esac
+}