gentoo resync : 16.01.2021

3 files changed, 3 insertions, 50 deletions

diff --git a/dev-ruby/unf/Manifest b/dev-ruby/unf/Manifest
index 84b94e9e6d2f..8c33b8a121b4 100644
--- a/dev-ruby/unf/Manifest
+++ b/dev-ruby/unf/Manifest
@@ -1,4 +1,3 @@
 DIST unf-0.1.4.gem 120320 BLAKE2B ab339ce957a1d3251d14944ccb4f68a9c7271f0f918f20b57c70824ded730fa18abb5078312d9820e7ef056163b5f1340c1cf72974b6c255279dcf572fb3e87a SHA512 a4784afa8b852497f758d1b6cdcf095eb9e5397a36c97b1f22b53cf8077cfedbf83fdcda36f359acf59ba61f1ab8b706ddd31d097afbc98a40d2dbd0f934292b
-EBUILD unf-0.1.4-r1.ebuild 1180 BLAKE2B 6ccc44333b92d153d022499def452fab07e4887e6ca24ca8aa919625bc3ad6f1ce948f36b41091ecdcd429f9f72e5aaffbcfe16b237d7b6838e9533ad9177679 SHA512 567de5e52945f3d94b15108540bf625820c4c30dc7e9303323abc21db0639f39a9a49cb749214ff739b40760a511402425651d3fabef23d52b1ce2bb9394f993
-EBUILD unf-0.1.4.ebuild 1182 BLAKE2B 35e0a91176deae62d94dd7c51435601b860d8fb007f5f9635ad7890846c50c8ece671a2d73d7d1e42449bcb0b253b722405f94e232fade312841239215e3fa14 SHA512 2f84448bae2573fd2c942b277d63b53d38364608b9b9daa0f0e6b2e2bc89034e80dd698a876dfc68269c32766a0c018acb1d23199285a6d6c5f5ef443de1ae90
+EBUILD unf-0.1.4-r1.ebuild 1175 BLAKE2B 46698a2f7e65454efc1911f3deb02bff26056a99358f3265830a15b0aa9984fd888ed56c162d2ea9201bb302536abb8a3f3f89b83f8172aee6600a718737677d SHA512 1cc350d0ed570f13759eea51d880dd24ca516592ddd557e7bcf0abb5f68321b835f3a2f66c221aa4c53bc6c2f71f518f730eb94ee8196d518f7d5da1e428eb5f
 MISC metadata.xml 339 BLAKE2B 453389f654780d3181aabe6239d3fbfb25272b4a1cf8719614f84159bc50aff48f45d40a5b7f77ee94ab13d9c59fa87466add2f60ad31c9978d99e3e114ef0fa SHA512 68c573840acc02e64460bbf329fe532c88a0d4f501fc9f5ebb15f0eea6c5938b5a05aa50b98c3da47f4987416d6e79be9557992f42958f36276a265a56a9e46a
diff --git a/dev-ruby/unf/unf-0.1.4-r1.ebuild b/dev-ruby/unf/unf-0.1.4-r1.ebuild
index 442d4c7d5a2c..7373d57c72fb 100644
--- a/dev-ruby/unf/unf-0.1.4-r1.ebuild
+++ b/dev-ruby/unf/unf-0.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/unf_ext"
diff --git a/dev-ruby/unf/unf-0.1.4.ebuild b/dev-ruby/unf/unf-0.1.4.ebuild
deleted file mode 100644
index 674d0b034018..000000000000
--- a/dev-ruby/unf/unf-0.1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby"
-HOMEPAGE="https://github.com/knu/ruby-unf"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/unf_ext"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ d' test/helper.rb || die
-
-	# Remove development dependencies; also remove platform as we don't
-	# care about it as it is, they only use it to avoid the unf_ext dep
-	# that we tackle on our own; finally remove git ls-files usage.
-	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rcov\)/d' \
-		-e '/platform/d' \
-		-e '/git ls/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/test_*.rb
-}