gentoo resync : 05.12.2021

3 files changed, 2 insertions, 43 deletions

diff --git a/dev-ruby/tidy-ext/Manifest b/dev-ruby/tidy-ext/Manifest
index dbafd9a0d333..05f1a1bc2af4 100644
--- a/dev-ruby/tidy-ext/Manifest
+++ b/dev-ruby/tidy-ext/Manifest
@@ -1,5 +1,4 @@
 AUX 11CVE-2015-5522.patch 1397 BLAKE2B 4e14c9f6c4d18e930b9d9324ed69717980a491e2ee217b96085d570541d5622a8120a5f47d53310cdf36b8907b610f527e1acf53918289eaf8b50b121c0ee823 SHA512 d0ff033d757ab6b1b4d4d77d4429f8e39ef7e818f35a9d6edeaf7e031c6e45d9df33d318d724a66fbc0a7cecd3303c4fe5260e5b3dcda5983e732b33aa675bd8
 DIST tidy-ext-0.1.14.gem 260608 BLAKE2B 5401ec2019f25307f4083f3a1717cd2b0419e0025875b0ad461c72e50445f9b1ffc488a723db04432d262cf2dd94fd267f5261b33eb53d829f4a03d5cd29ab30 SHA512 8a8eada3cb5e815338de49332a24c85b9b2cabba0e10f2d72fe85bd4faf76924e52d82066e7b73e62bc459631aaa9d1c42a6941988ae2a71ca0ddd4f3302ad86
-EBUILD tidy-ext-0.1.14-r3.ebuild 919 BLAKE2B 2aec8922953956c3c9687fe6756b64e79fa0a01bdc65912afbdb2a60c3e0a8ce2da1196780d22fcc8f9eaf9ce2cad6a10f0516871de02ba4f52026e23e9644a5 SHA512 bae446e891f8b7cc1d05a58f57210da7579b7d6598e5a9a39031563983b35569e19924c6d92b5c96bb878803e6d8e02c893bd3822c1aa1b9186a08da118c9733
-EBUILD tidy-ext-0.1.14-r4.ebuild 714 BLAKE2B e5e0f64393b7f7929953da6c43621e0cdd69be300ff6e66f11c8051571806529bb9831ad850169b37923300543f0f624e6c479b7c3f69f8c938a35eb83b03a5b SHA512 0e45c6f17b00a5e37afc2d59f14a45b8f7349f206329e5bd17baec71e29debf22a4b660bcb1bacaebc8afdf927bb55199816b2264e6ba13f310ee043c6cbef54
+EBUILD tidy-ext-0.1.14-r4.ebuild 709 BLAKE2B bf6a5fd735fcc8435b40d1c26a549a6b9713df45c6f461eed5b33a195cacde75981d71f3e5ff0d0088ad92bee5bcc8a472cc662df05673e312aa37f24ac4eb23 SHA512 3e791edcf31f5d8d73855c541a9a38fc98d3264410d34d20ff842cb4bc0810ac650ef7b447bd978f586a4aa54417241ee6d4a88d2b8eb623cfd7789adb959b92
 MISC metadata.xml 337 BLAKE2B a79aebb128de2c425a6a6aca3c7f5e0aa7cff2be5716ef7c53d90e8f2c0375d0a20b06b1cac6dd24dd4515149da8ca9c14b9bb0eb17a7d17c053a2ece3fb0329 SHA512 9c2e4983ae509f6b2dea3c201b320bf9d4e8ff250d6b4cc3039ae6b3b6afa7a744f92fc31c293c68b65372147d05ef070776481cb581d66272de7111e9c391f9
diff --git a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r3.ebuild b/dev-ruby/tidy-ext/tidy-ext-0.1.14-r3.ebuild
deleted file mode 100644
index f2ea49a8091e..000000000000
--- a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="W3C HTML Tidy library implemented as a Ruby extension"
-HOMEPAGE="https://github.com/carld/tidy"
-
-LICENSE="HTML-Tidy"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE=""
-
-RUBY_PATCHES=( 11CVE-2015-5522.patch )
-
-all_ruby_prepare() {
-	mkdir lib || die
-
-	# Remove reference to rspec 1
-	sed -i -e '/spec/d' spec/spec_helper.rb || die
-
-	# Avoid spec that needs network connectivity.
-	rm spec/tidy/remote_uri_spec.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/tidy extconf.rb || die "Unable to configure extension."
-}
-
-each_ruby_compile() {
-	emake -Cext/tidy V=1
-	cp ext/tidy/tidy$(get_modname) lib/ || die "Unable to copy extension."
-}
diff --git a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r4.ebuild b/dev-ruby/tidy-ext/tidy-ext-0.1.14-r4.ebuild
index c85df21f5c21..aa4500bb1c4b 100644
--- a/dev-ruby/tidy-ext/tidy-ext-0.1.14-r4.ebuild
+++ b/dev-ruby/tidy-ext/tidy-ext-0.1.14-r4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/carld/tidy"
 
 LICENSE="HTML-Tidy"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/11CVE-2015-5522.patch" )