gentoo resync : 13.10.2019

3 files changed, 13 insertions, 8 deletions

diff --git a/dev-ruby/rails-html-sanitizer/Manifest b/dev-ruby/rails-html-sanitizer/Manifest
index cfecbf75fb22..881a06ef343d 100644
--- a/dev-ruby/rails-html-sanitizer/Manifest
+++ b/dev-ruby/rails-html-sanitizer/Manifest
@@ -1,5 +1,5 @@
-DIST rails-html-sanitizer-1.0.4.gem 15872 BLAKE2B 4408a494f75bedb4e4286e053536abf62f094873d9e0a8c21f9de6f42b2826f187c9919fb86c84380c1eff241c62f077d48cc21912c93fe85ac2b6039089a84d SHA512 f608f2b642869606fc2c3986298a8ae3e36c676a7eda5e3cce419700961bfed011f8d4a2dcb59e5d32a41f556815ca5f214ec19f8940ce71d1217ba84686b8e1
 DIST rails-html-sanitizer-1.2.0.gem 16384 BLAKE2B f5a5ededf15c199b59dfcd7b2da234f766cd46cf46834b458940d7b68fe27dd97602a6a673d8c0f700cf9c593a8375c97e74da0ac0db355af93bf951540ac368 SHA512 efe006ad2857a21d466375f630fe269cceb78aa467d91cdf193ec5eab8fdb0d58443696989b920840f6aafcb9ddfa6a72972f0e09456b2aa57018d86791cc38f
-EBUILD rails-html-sanitizer-1.0.4.ebuild 675 BLAKE2B 3967b0ca781cbfc191e968da05029acbcb7081430dc97a08580356f98b40603e16097505d2d2bef04fbb47c559496c85b10b52835f31d4494e91f120494c7f48 SHA512 00226658f48b339b4fa94ff5c4bd1941fafd63793f05a670be4c54cec893b758278c0189985446a4d6f99a3fd099e3fdcdd79880666f839e1398d2016fbae11a
-EBUILD rails-html-sanitizer-1.2.0.ebuild 866 BLAKE2B 61fab0bdb46f2cf9976dcb7d2f55ccf9798c06ea8a28e3d318ca49005c00b5b197688fa42badba9623619dd92860eacc6337702ed367bee626d1c5c1e4946db7 SHA512 30f4daef95453c93b30e06c4ad353f1ed523da0c8cd648897d02f2c3dbc14d96c94f8e10e0919ebc812e4bd95f3a72bc5f5c92f71708d5b0fa68ed02a587d90a
+DIST rails-html-sanitizer-1.3.0.gem 16384 BLAKE2B ae0b9acfd4ffc53b84b92cb42c149022312112f90d64866de916be2b91b680ecfbbdc94d278626c992cc90b0061705c11c9a604f6d9e91092e1117e40e003e6d SHA512 01d67f750ffc6ac857e4dc47b77d66e02acc4488f353af97e2fc367590fe85107b631aaf8b32f61f9e1f375c93e1b24fbf966f738e35483f5174880a0ffe5ddb
+EBUILD rails-html-sanitizer-1.2.0.ebuild 865 BLAKE2B 2477b5130ed28b474b8744367a486978ed7accf37f79cadaa35fced9884d1bb538c94b145a633ddbbf046ceafec23ca70d4aea1fc6668d967c2ad3a0bff3cd59 SHA512 d4e61578e156fbb01699a1512cb13ca922f7db0f1597853b74be2ca96dc84be19e01e7b44ff946db34bdf1a645b2fd4dafd058c704961bc79d592d742e8659bf
+EBUILD rails-html-sanitizer-1.3.0.ebuild 864 BLAKE2B 830d8d376baa7b55a6009ea791f0f9bf43151f665c65faea542d68f5873f7332bdbc73419a55df10b12fe83fc8cf585dd9e790fb384b2422638daf172ef32979 SHA512 f8169dfd5744cf370c1ab1e2ce831b15f5bff4c5279a396897642e25b0e68ea8e2e1d3e9a3b0d65e8f1038b40c5a1bb880401234c4b5ae362e69898bdf207618
 MISC metadata.xml 359 BLAKE2B f227b45aa66e29d5ad9fe902cbd05ff8d41b6ad06ea0acbf812595b936897db899436a788fb0af5143303f0ebe6f18de1f2d265c337e57d616bdbfc7b1fdfcd5 SHA512 a7b934bec0d958559083b417dac76c3ffee71d9efa912b6bab2c2c01e6aa9acf39a46d71fff54a9b750afe6f59a8eb4b12c10b5cbee62fc5f32dab29911f4bd5
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.2.0.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.2.0.ebuild
index aed8ae6608b6..c95b7dcb82f1 100644
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.2.0.ebuild
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.2.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/loofah-2.2.2:0"
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.4.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0.ebuild
index 5c500c2ef61f..3b19aa92c2a1 100644
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.4.ebuild
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.3.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -14,13 +14,18 @@ HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/loofah-2.2.2:0"
+ruby_add_rdepend ">=dev-ruby/loofah-2.3:0"
 
 ruby_add_bdepend "test? ( dev-ruby/rails-dom-testing )"
 
+all_ruby_prepare() {
+	# Avoid tests that depend on nokogiri patches to libxml2.
+	sed -i -e '/\(name_action\|attr\)_in_a_tag_in_safe_list_sanitizer/askip "libxml2"' test/sanitizer_test.rb || die
+}
+
 each_ruby_test() {
 	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
 }