gentoo resync : 23.03.2018

4 files changed, 40 insertions, 5 deletions

diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index f1ab205c0a8e..5d8270840824 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,5 +1,7 @@
 DIST loofah-2.0.3.gem 60416 BLAKE2B 04e37464ac9e2b61fcc838763b6360fe80a8aeec26cc365803e6121bb4a628f17e79bc2426d0b351935dffc18829ab9d37239786fb3192c328f5a8026365cc41 SHA512 1f08bcfa09bf075b4d84707099cce6bdaa986cd6c79f63fc60c8bee4812c5a31cee1021cd314fc2033842d7b01ffe63f5f6acbf271a0db2ee631cd326520d700
 DIST loofah-2.1.1.gem 61440 BLAKE2B adefeb040e0ad6302de3cfdd169cf33c22eb409be519f2acd610d210254295a935a8fc1223200003c27275756c8a3c604fb3c5589e3abc7c5207b457dcc6c349 SHA512 16499113ba3b435ba2cd3a583ed958db7f02604a56d87125341d5c143602ed9755272598faef9995be57f2b408c4696675f69cf5fb15d472c958e16f46c35d58
-EBUILD loofah-2.0.3.ebuild 984 BLAKE2B 77905717b5c8a8072ea9cad4c6dca80d027c7a3de519744626136e842c08fe13c0b587cd474e0690294227b62600eb36dd7d8de79c5199380e27f02b03342b92 SHA512 87531b7b36097d779e08d1fafbadf1c27d37690ff52a967a83ba1ab65c96f991ad669c2d16a9e8bfa0c6ea4b508474b80586e21e9984e40862c730f7d0055f81
-EBUILD loofah-2.1.1.ebuild 1107 BLAKE2B 58009706d88d3ac569f501bf8191a6bd94caa9d2b05ebb4b8779979483ff523d0a2878358cfd3b56499d567d29bd10b11a7eb5fd98354c52dd84189148f5c10d SHA512 f55ddc98fc45569c0c3020f11ff43187f898f6ea9498a750f71e26a1093f074ea0af8ae34266c5b1893a48711ad4b763e70f1644a44ff8c195333988905dd584
+DIST loofah-2.2.1.gem 65024 BLAKE2B dfa45264e9dc0cb4c9fd8eaff8831b5098ae9c1e7fd46d3e965362e46851d5b19102fb23dc96393091ca8e2f8bd9a12f5098ace3c2d6e25236a33fa5f2579c69 SHA512 df971a1bee08f0ee0913af2b4b7baefa6d1ad04af82de796f6f0d505fab7749d52ce79db0118343d336bdae6fcfd4190fecb315019b2c821d81ac1c08d5b8e2a
+EBUILD loofah-2.0.3.ebuild 990 BLAKE2B 9bf4e3221612c2167843ec6a4660d55ed56cbd2d677cd93b29eab5b82e8b19f5ff1f7a97212bd6e3be459052983e910ff22ad1187b3b937a02272c051149189b SHA512 3335f16bb241ec5280342fb31ebc9ef2c514ac1804d89c60e64f794fdd6a55773abc18758c912371af63db09d174d02f7a1c1b5d734397b986b13c067c629eca
+EBUILD loofah-2.1.1.ebuild 1113 BLAKE2B 0bab4595c693e0b9b473186e4fad0e7fb4e1f41f015e8ff0a76d95ab85b72df7a124d72e4a7fe3cb674dce5ad445436d754b450be0c34620943c0891bbb1d45a SHA512 ac52f9a1a55f4635fee4a9788abd473755a9c8f53991de61b9743bab4f20161d3edb454bcac2951c0558c464466864071af52ea409cf2ba2a79aec893f0239f6
+EBUILD loofah-2.2.1.ebuild 1112 BLAKE2B d5e464594913d72b623ab1dfd3453196b68b482585bd886eb5cac0207f888ea5c94b16909363209f0d27058eb240d66a95e58bdc582050291f66d5d862ba7e94 SHA512 e6e73fa645de8781eb94e910938b85c405a119b49496c107e6c8fd0170a0a7d032435f4983c10fc0cef86524514b8e3c4614f166ef75bde5dd64d07f87aa42b5
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.0.3.ebuild b/dev-ruby/loofah/loofah-2.0.3.ebuild
index 1aeea870ac75..971d0fa4976a 100644
--- a/dev-ruby/loofah/loofah-2.0.3.ebuild
+++ b/dev-ruby/loofah/loofah-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/flavorjones/loofah"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.5.9"
diff --git a/dev-ruby/loofah/loofah-2.1.1.ebuild b/dev-ruby/loofah/loofah-2.1.1.ebuild
index 01a3d0176180..5beac09e3b39 100644
--- a/dev-ruby/loofah/loofah-2.1.1.ebuild
+++ b/dev-ruby/loofah/loofah-2.1.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/flavorjones/loofah"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
diff --git a/dev-ruby/loofah/loofah-2.2.1.ebuild b/dev-ruby/loofah/loofah-2.2.1.ebuild
new file mode 100644
index 000000000000..6fe034b16a6d
--- /dev/null
+++ b/dev-ruby/loofah/loofah-2.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
+HOMEPAGE="https://github.com/flavorjones/loofah"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
+
+ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 >=dev-ruby/hoe-2.3.0 )"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/concourse/I s:^:#:' Rakefile || die
+
+	# Avoid test failing on different whitespace.
+	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
+
+	# Fix test for new libxml2 results (fixed upstream)
+	#sed -i -e '348i "xhtml": "<<script>alert(\\\"XSS\\\");//<</script>",' test/assets/testdata_sanitizer_tests1.dat || die
+}