gentoo resync : 15.12.2019

4 files changed, 20 insertions, 23 deletions

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 4a1cf25f921e..2e74da06ca2f 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -15,7 +15,7 @@ AUX 2.6/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb50
 DIST ruby-2.4.9.tar.xz 10078316 BLAKE2B ad83adf6b884a9a36e83cc754077f706afa221a9e8b81d92f6b6a1b829dc0350bdacd67b0b4e1e196a17e3f7d1c65f1e9b38e245aeddf089576eaca7d051701b SHA512 9046575315c29c789427c2d00c832f0c0970e47fd158bbe8e4f2df5cff2ea9c06c65c3493adb4656e5b32ebfdc546092911f98a8ad7f698bc001c290db5888c7
 DIST ruby-2.5.7.tar.xz 11296440 BLAKE2B 6f3590f30c7b196145a83490abed24b0059521374a03086646186b20670bfed548ea744c910c8eda0d11607d8673644d7fb23ff9091dd2f6dfcbc43080fe0f97 SHA512 63b7c75fab44cd1bd22f22ddec00c740cf379ac7240da0dfafcec54347766695faef47428ce1c433fd77fa96992e976c984697067fa526236d383b12adc9ce75
 DIST ruby-2.6.5.tar.xz 11553580 BLAKE2B 07739a92ff17467fe6d31bb4dce56ae35fd9c67bb697ebc00b4845474c75d8377c77916e6e129512cfffcf76bd60e6327e818e899b6160f3222912654d5eb118 SHA512 e8ae3b5d4d23a93d0ef6057235ad0e573665a8b4b6544e1c70b4cce9c4d2fb9094e5c8fe8a9ab7b9996efe3ada603f9b4ef1fd08fb5a83253c1ae2b5e3f202db
-EBUILD ruby-2.4.9.ebuild 6647 BLAKE2B 40be143f889c88358eff3b7e8e56b0c1b5932d49315ecb91559b8ce2b9874e5839f75a5575514456dbb343d870c2a4f169fb54773494c7f472ca4a8284d0abb9 SHA512 ff0c7406f40761e1100fb1cb4fc6ae2fbb40db83a68cf77c2516c72c80faab7e92e16024f5ff912b7dbfc6da232607e71590969665773899fb41d93fedf10acf
-EBUILD ruby-2.5.7.ebuild 6437 BLAKE2B 2b7d9223af0ae4ffe45f5356629d6fb4174bd217da576b765b129f5f0a0d58986e15eec0a748feb451fb39954dab3c85f16a6dc45eaf8920747bfc8c498b4f32 SHA512 5f235570cfc01035b478bd4c01cc5283d2d2858b5efb437a49a4b6732c0c54bc388ac6e52c1ef916652b702e4942980b39f795cc2e946177f47e46ff7fba4c8c
-EBUILD ruby-2.6.5.ebuild 6892 BLAKE2B e4059bf9b2708570202697028ee43ff1cc193d3ed9a4aa68654a049778ed02145466ae24158b02a221e3eef92cccdc2233c4db9e3a25fa2a3c33efa0f3cb2831 SHA512 aeaca4b314c7dca0538070bb3c20a44e623e74d2f83f97502f9f3ce5404519172577ec4770695a9f3f0fee24e6d329b63ab84d76799e0f1ddfb87a8a7482a813
+EBUILD ruby-2.4.9.ebuild 6537 BLAKE2B 874675626d2bbd45a816586d5df7a93d04e305a5c43f888eab9cee5f8b84d8f0f581358fd81653879865361d6adbfa9708d93628189b423c83de28c164404f95 SHA512 3f51faaf6b037f0285b43508ee28862d24fff80d2a66f01d1a68ef91fb319545918e7a3f8e127ca588fd51f00439474ab2fbd285f02a73dc0fdefb7a3367a745
+EBUILD ruby-2.5.7.ebuild 6326 BLAKE2B 6e658c61bc3da248ee4c0973fe820e5ac5d2f11540c2e36b21610bd20be182a21cb69372491c0d0a7a8ece2e2cd95437b8c011b1b73126d563798a47d51fee8b SHA512 8ed376276ef60591cf92013e64b8a5877817087cd79105edc8d7419832a272878d963e23b4141234ba14ddb8f09575cb4b32bbbf6ea2d721203cfc3fba5c45f6
+EBUILD ruby-2.6.5.ebuild 6749 BLAKE2B f4302b035fb22dbd28d6e09b9e5c5489ec0b261e05cfdec070b976a2b1c586f03dbaf71493ac7f4a4f9d9c9f25d216b778c7bea2fe2553406d6b3e19ca9acf6a SHA512 1f103835b19b0e2eaad6962ba8866d15cafdfa88ff6d6ea23774844224571fa5884d32a169bc9eb8a7549b4914b497cccd1c142f57598a2cb43df8c6de3bbf5f
 MISC metadata.xml 445 BLAKE2B c3b5fae44894da3c78d024a376522aa2ef486cd9435351ddd7fa8b7c9afdc36969251a3b043d5890a368616f0736ae80e2a65a7342b327f30eb3497c5c02d28a SHA512 3818ac938dd6f8a05e18662f83af542fb29af00a476362592afa86bc537a74ddd0abe275784340539b2cd38f97ad1fce8b8c427c65d61c05a90b2118f2d16a91
diff --git a/dev-lang/ruby/ruby-2.4.9.ebuild b/dev-lang/ruby/ruby-2.4.9.ebuild
index 855960b6f5cf..8f8e27dd860f 100644
--- a/dev-lang/ruby/ruby-2.4.9.ebuild
+++ b/dev-lang/ruby/ruby-2.4.9.ebuild
@@ -143,16 +143,15 @@ src_configure() {
 		$(use_with static-libs static-linked-ext) \
 		$(use_enable debug) \
 		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
+		--enable-option-checking=no
 }
 
 src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake V=1 EXTLDFLAGS="${LDFLAGS}"
 }
 
 src_test() {
-	emake -j1 V=1 test || die "make test failed"
+	emake -j1 V=1 test
 
 	elog "Ruby's make test has been run. Ruby also ships with a make check"
 	elog "that cannot be run until after ruby has been installed."
@@ -187,7 +186,7 @@ src_install() {
 	done
 	export LD_LIBRARY_PATH RUBYLIB
 
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
+	emake V=1 DESTDIR="${D}" install
 
 	# Remove installed rubygems and rdoc copy
 	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
@@ -204,7 +203,7 @@ src_install() {
 		doins -r sample
 	fi
 
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
+	dodoc ChangeLog NEWS doc/NEWS* README*
 
 	if use rubytests; then
 		pushd test
diff --git a/dev-lang/ruby/ruby-2.5.7.ebuild b/dev-lang/ruby/ruby-2.5.7.ebuild
index ccfb4c30760d..992d04bc501d 100644
--- a/dev-lang/ruby/ruby-2.5.7.ebuild
+++ b/dev-lang/ruby/ruby-2.5.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs"
 
 RDEPEND="
@@ -138,16 +138,15 @@ src_configure() {
 		$(use_with static-libs static-linked-ext) \
 		$(use_enable debug) \
 		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
+		--enable-option-checking=no
 }
 
 src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake V=1 EXTLDFLAGS="${LDFLAGS}"
 }
 
 src_test() {
-	emake -j1 V=1 test || die "make test failed"
+	emake -j1 V=1 test
 
 	elog "Ruby's make test has been run. Ruby also ships with a make check"
 	elog "that cannot be run until after ruby has been installed."
@@ -182,7 +181,7 @@ src_install() {
 	done
 	export LD_LIBRARY_PATH RUBYLIB
 
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
+	emake V=1 DESTDIR="${D}" install
 
 	# Remove installed rubygems and rdoc copy
 	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
@@ -199,7 +198,7 @@ src_install() {
 		doins -r sample
 	fi
 
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
+	dodoc ChangeLog NEWS doc/NEWS* README*
 
 	if use rubytests; then
 		pushd test
diff --git a/dev-lang/ruby/ruby-2.6.5.ebuild b/dev-lang/ruby/ruby-2.6.5.ebuild
index 57bd24dcd4f5..563576964c50 100644
--- a/dev-lang/ruby/ruby-2.6.5.ebuild
+++ b/dev-lang/ruby/ruby-2.6.5.ebuild
@@ -142,19 +142,18 @@ src_configure() {
 		$(use_with static-libs static-linked-ext) \
 		$(use_enable debug) \
 		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
+		--enable-option-checking=no
 
 	# Makefile is broken because it lacks -ldl
 	rm -rf ext/-test-/popen_deadlock || die
 }
 
 src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" || die "emake failed"
+	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
 }
 
 src_test() {
-	emake -j1 V=1 test || die "make test failed"
+	emake -j1 V=1 test
 
 	elog "Ruby's make test has been run. Ruby also ships with a make check"
 	elog "that cannot be run until after ruby has been installed."
@@ -194,7 +193,7 @@ src_install() {
 	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
 	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
 
-	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install || die "make install failed"
+	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
 
 	# Remove installed rubygems and rdoc copy
 	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
@@ -203,7 +202,7 @@ src_install() {
 	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
 
 	if use doc; then
-		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc || die "make install-doc failed"
+		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
 	fi
 
 	if use examples; then
@@ -211,7 +210,7 @@ src_install() {
 		doins -r sample
 	fi
 
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
+	dodoc ChangeLog NEWS doc/NEWS* README*
 
 	if use rubytests; then
 		pushd test