gentoo resync : 13.06.2020

3 files changed, 66 insertions, 3 deletions

diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index 94ccba1b3562..2ca997fb6f3b 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -1,7 +1,9 @@
 DIST httparty-0.17.1.tar.gz 97249 BLAKE2B 044a074c0a11c02d5fd929585b1dd6853871bdbfcf9be0f16b92999ac5e9ad7b0fb60a403a24d4e3ae3901f8fdb119f51e3decfc61e9ddf61419fa50581c1970 SHA512 2e92573e164575c462afceec26234731e8eb4472f127374503ee1361d8399116c78f900f88485629ca7ddb51a6383c963a5b1e21d9d5b0acbcc8544ce3f37465
 DIST httparty-0.17.3.tar.gz 97444 BLAKE2B 773e40fc35ca44cd3b14a30e7a7ea5783c0c158cdb8488b34ffa36af5a572d5f6eef697cab147c5be1448906c35071284947ba598409be35af54a20846f4d98c SHA512 c06aa4456c692e2a32f8e44b2316d46f664c4e2c8efb370607796f6801d96e989a54e61bdf125cff679b8c5f5abb1557b87aef48d8f3a392c1942ac4821db84d
 DIST httparty-0.18.0.tar.gz 97667 BLAKE2B 8c4086c3186152944a7ae9a57b679bba6ed803067ec849d9fac8323cdef41a45a44f2454ca83a6aecff7fc1e9795793a2fb035f1bf46c5c998703fc5d7425a44 SHA512 a208bfd411de6fc080221410d5730f37db074fca25ff0f71b796e4a73ac3a595ca57dde1f415327f710ed23ebed6bbf0f671d0e5940ce60073e6727ac8963580
+DIST httparty-0.18.1.tar.gz 97813 BLAKE2B 3192ad5f1e8c292456710529f4e1595ea5b70ae4ad61695d6d0b036872d40b2afbc0c958ffb25b0c1222ba8004593d20c4d3954c530d6c836e915b87150d954a SHA512 fca9de534199fbf6a058c39c3ebe28587c34df2bffee313a0e05204258fb6b6b6643bd0a28deca9d0b42de21c90c54dab058124349e4774489578fb23e8bacf5
 EBUILD httparty-0.17.1.ebuild 1652 BLAKE2B a4bbcdeb4b6821f75af53681ca1c34e00ad97f94f68ffa428814d57642b99fd51bb0cc21caa40e98a635dd7beb500176d1f30c99db6e3fd0cbfa94f245c64a5f SHA512 87a0be0640780330c30356a04dbef967da06a8e59b427df3a026a4a6f653910e21b34d9cf76714a50c365a98503c8dafc24e45b6369eacd7b6f09cee35c8beb5
-EBUILD httparty-0.17.3.ebuild 1653 BLAKE2B cf33084b46b1db77765fabc928d8f697926c3256365ad7979bdea0f84c555d203339726a9b82e5347bb962e24ec63a907cfdd093c3826ecdca0587435aaed037 SHA512 c9c915672a907e28fe709fa78d940c741edf692d074fe493ddeac6d9d57637f44e76055b027636d502d7479e00f02ab1ec645cfdc0275907663653e75437a5d2
+EBUILD httparty-0.17.3.ebuild 1652 BLAKE2B f22b76a26c3f2239daa9f7e9fc83ea04bb38bb2585b32136e3838883af771e01f8b3cce075883e3f361d0596a1b3a12aee5d99eec92cbd5a641f85acad34f33d SHA512 cdd87ab32eb7ddd4ee31671b18278b7d686d9375e666b10e71f5c036d1bddc9b36b55341937c1ade07098663f5ce64d705d4e67faec39c8c18d3a349485a609b
 EBUILD httparty-0.18.0.ebuild 1675 BLAKE2B 115233e5f3d88cc0993753925a4ee64bb97dbf6fc202f291eafb82ce382256538f339177a4fed982de28097ec16693788eb2bb4cc3e353977935445256391851 SHA512 772d42983dadfc3390bbb074bc243304e17d3aea015f5e7c6f661f920a4e9dd47f85fb11a01f925c772ae3ed0ef32f06e84c1b68856b195b34c347fd027b1525
+EBUILD httparty-0.18.1.ebuild 1844 BLAKE2B 3ed7dc85bf0663f919367d91327b968f9e9c08eaed030f86901a7e25ca950dbcfcba2d2878bd012ea7a30d6deea5a011271a8971057911134e17e2f900f1a6ad SHA512 f253e04f27a4853c6ddc197423267cb7699b7254e2f798803d041cdc848595d96ae440091e4bf21976d4d196a3773346bbe44defdeea5715f476c5c05eaf8b9f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/httparty/httparty-0.17.3.ebuild b/dev-ruby/httparty/httparty-0.17.3.ebuild
index 418e319afe65..568d1d507061 100644
--- a/dev-ruby/httparty/httparty-0.17.3.ebuild
+++ b/dev-ruby/httparty/httparty-0.17.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/jnunemaker/httparty/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 ruby_add_rdepend 'dev-ruby/mime-types:3 >=dev-ruby/multi_xml-0.5.2'
diff --git a/dev-ruby/httparty/httparty-0.18.1.ebuild b/dev-ruby/httparty/httparty-0.18.1.ebuild
new file mode 100644
index 000000000000..c7782d5184c8
--- /dev/null
+++ b/dev-ruby/httparty/httparty-0.18.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="httparty.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy"
+HOMEPAGE="https://jnunemaker.github.com/httparty"
+SRC_URI="https://github.com/jnunemaker/httparty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend 'dev-ruby/mime-types:3 >=dev-ruby/multi_xml-0.5.2'
+
+ruby_add_bdepend 'test? ( dev-ruby/webmock )'
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files \?-\?-\?/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove bundler
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
+
+	# Avoid test dependency on cucumber. We can't run the features since
+	# they depend on mongrel which is no longer packaged.
+	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
+
+	# Avoid test dependency on simplecov
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '1i require "cgi"; require "delegate"' spec/spec_helper.rb || die
+
+	# Avoid test that works standalone but fails in the suite
+	#sed -i -e '/calls block given to perform with each redirect/,/^        end/ s:^:#:' spec/httparty/request_spec.rb
+
+	# Avoid test that is not fully compatible with newer multi_xml
+	sed -i -e '/should be able parse response type xml automatically/askip "multi_xml"' spec/httparty_spec.rb || die
+
+	# Avoid test that fails due to unicode normalization differences
+	sed -i -e '/handles international domains/askip "unicode differences"' spec/httparty_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}