gentoo resync : 14.04.2018

4 files changed, 2 insertions, 69 deletions

diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index 0c9eeba88cb2..72f8ca9d78f5 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,9 +1,5 @@
-DIST loofah-2.0.3.gem 60416 BLAKE2B 04e37464ac9e2b61fcc838763b6360fe80a8aeec26cc365803e6121bb4a628f17e79bc2426d0b351935dffc18829ab9d37239786fb3192c328f5a8026365cc41 SHA512 1f08bcfa09bf075b4d84707099cce6bdaa986cd6c79f63fc60c8bee4812c5a31cee1021cd314fc2033842d7b01ffe63f5f6acbf271a0db2ee631cd326520d700
-DIST loofah-2.1.1.gem 61440 BLAKE2B adefeb040e0ad6302de3cfdd169cf33c22eb409be519f2acd610d210254295a935a8fc1223200003c27275756c8a3c604fb3c5589e3abc7c5207b457dcc6c349 SHA512 16499113ba3b435ba2cd3a583ed958db7f02604a56d87125341d5c143602ed9755272598faef9995be57f2b408c4696675f69cf5fb15d472c958e16f46c35d58
 DIST loofah-2.2.1.gem 65024 BLAKE2B dfa45264e9dc0cb4c9fd8eaff8831b5098ae9c1e7fd46d3e965362e46851d5b19102fb23dc96393091ca8e2f8bd9a12f5098ace3c2d6e25236a33fa5f2579c69 SHA512 df971a1bee08f0ee0913af2b4b7baefa6d1ad04af82de796f6f0d505fab7749d52ce79db0118343d336bdae6fcfd4190fecb315019b2c821d81ac1c08d5b8e2a
 DIST loofah-2.2.2.gem 65024 BLAKE2B 4ddb20943b4258c4be621439d38b094dfc79947f092ffa2ff9af56db40538e9672f50762562ffbe5b7c5788fe12ab07ff7601383cfe7e6fc0f4209dad9edceee SHA512 3c64182f8fdb7d79a5be65969728c4c51a4535f53fdae7c8e5f4d487d43af3efac9d2f3746d8e02564d0979e94a0e63dc5974701c151e31c502cb8ff97f1295e
-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 1111 BLAKE2B fcc45fdf8a497aa038a01fab8a22e771c993bee533ddc22ead0eac920da70432f2760a71db12446ddb0e864a97143c48296a67aac1a29b39496b13282f78ab22 SHA512 0f64103eaa919ba66c76cbaa8eb144cf1bef933df1f98038d28d661831c121ae13fde36d56754912ec26aa8ffd34b75d71b4974d2fe8010a3504c5ca40b93d43
-EBUILD loofah-2.2.2.ebuild 919 BLAKE2B ee976e48aa41af1a99b2f7405a3ecb5150a7b3118c391791bbad881bbafed9f271fd70669f7adc8d801a280eeddc684aac5b326e718b27f8ec0f4d636c56e2dd SHA512 cb9af660b2d2c20c594d5ef1e3d8282323e5d2b6f79bcd04a54773d19cd1cc05f82665800b153cc045a2ff0965573c275b140fad01e3a4962fe7891a4896cc22
+EBUILD loofah-2.2.2.ebuild 924 BLAKE2B e3f6611657fc73c7933a615eafdc8fdece0c7d4e759a6e2e6061f899f2562a271ec2cd3350646781c1925b8acdddaa0e4555e1daaa2d97ff9fe86c8d413dbecb SHA512 432f58ff35e3056cd3be76a6a9f7bb64572ecc7aca4e9b9f8f149921a09a3dc20ead05a627372fc4039b01c3d3c56c7ef77bc3cd4102883f495eb4e945a2c570
 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
deleted file mode 100644
index 971d0fa4976a..000000000000
--- a/dev-ruby/loofah/loofah-2.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-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 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend ">=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 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
-}
diff --git a/dev-ruby/loofah/loofah-2.1.1.ebuild b/dev-ruby/loofah/loofah-2.1.1.ebuild
deleted file mode 100644
index 5beac09e3b39..000000000000
--- a/dev-ruby/loofah/loofah-2.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.rdoc"
-
-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
-}
diff --git a/dev-ruby/loofah/loofah-2.2.2.ebuild b/dev-ruby/loofah/loofah-2.2.2.ebuild
index aaf05c90a3f1..4f50918006c1 100644
--- a/dev-ruby/loofah/loofah-2.2.2.ebuild
+++ b/dev-ruby/loofah/loofah-2.2.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/flavorjones/loofah"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~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"