gentoo resync : 07.05.2019

4 files changed, 7 insertions, 54 deletions

diff --git a/dev-ruby/marcel/Manifest b/dev-ruby/marcel/Manifest
index f57a361373a7..f3e74fcacdaf 100644
--- a/dev-ruby/marcel/Manifest
+++ b/dev-ruby/marcel/Manifest
@@ -1,6 +1,3 @@
-DIST marcel-0.3.2.gem 7839232 BLAKE2B 001e03b109617f7804e1e8f77d65eaec81544040a13e1d18ef197fed1caa5a26dfc69e1796632a3ec29c3778eef9458a6f701bbefb2f30c89d77fb22622cdb0f SHA512 0e27c5c36f219e30ad41aa87a94e559ecc0185319ab33fbff2cc54656c5ec378c9f8ebd8d8d28a644c9b64cd7106aa2b235b893c5871ddda9db3596d8b8847bb
 DIST marcel-0.3.3.tar.gz 7845456 BLAKE2B e27d851119f434144a790cd1bfb1ca21662357b1875ae9193273e00c5abc6156c217efeb961356d4967d984b4c8fb4b4047620fa5d0448cc20651aa1ce05bb69 SHA512 d9be185fd6f5185fc67f3eed931ecf3084da671840b6e464bf341f51c9dec4ab1b4650abd1916e640b7caced230d6cb90370bffb559151e0047a8b03211dc751
-EBUILD marcel-0.3.2-r1.ebuild 568 BLAKE2B 895a429a33047899c4151357f77857c48c06b34afff4b6660daa235c081dcf605a79d1919fa99d188fe58271f1177f2600ac3a8aa96c8737a2ffee3064ceec77 SHA512 43eabf53b7f06471980fcce147644f1a11612eaa385c616b01fd8cb8e906426f187f1415ee3c2065a345dab81ffab61fdd759fe1264145cdba06f13d30c185c8
-EBUILD marcel-0.3.3-r1.ebuild 688 BLAKE2B 17c6b346b25e9512f209a98ea20c9e42af3895527ab78b1f43266f3fa4efb7ed46b9cf0f4618b503e33aab2f774bc375555e5b90173084d8fd6ae2503be77671 SHA512 73c3b43daee2a90055496965dc58155c733eb4b0452cca9d5995f4433d7c8cc39ae887f5a222fe08cfa7cb9a34b7bce8cad5274fa2d28d8af8a072dcb5af8a9a
-EBUILD marcel-0.3.3.ebuild 648 BLAKE2B 13ac4ca605f00dcfb023b5df9c624438603519e0be775e2a92be3bfa55df7190dab5141abb6adf82fc67f322fb20583a4ccbd08970a20e26d01b79ca0863e3bd SHA512 7ccf6205e2a978f58f731c24024301e026c1c3d6d391d90362c49d267f1d05a6e7ab366628d6d8c0038491334c1e24fc03c1f93c6bdddfcfca0af04c9640e970
+EBUILD marcel-0.3.3-r1.ebuild 970 BLAKE2B eda6e25c38faef7a3319fc025cb17e004235a819e4626071c8a42d3c0d36f73d76f9b15e86c8db87c55c3a87aa2ed12b7d7f1bf9d7729884919feaa51b30205f SHA512 94ea6437b5d61733a5df5e554652dd0ac7882526f8f1178ac3a288c28b60881f9e793e8adb97b669a77a84747eb38b023a08f598f50441bf8f09ad4f6ff6bd35
 MISC metadata.xml 341 BLAKE2B f284cd2a1df740c004e9af77a1aaea9254ddb1672b567faff9c65be99171a69abeedbc229a05db711d2f91f5f8bca0f7e2e6c5442a81b1776ba299db47ebc281 SHA512 1c71acef93507dc8305c65be9fd3e90978f6a2a14781b019f06762aa6159539596404afc32c0d9c718b361ecf90cb4e93b0b0186e7b110d895a14216d25b3360
diff --git a/dev-ruby/marcel/marcel-0.3.2-r1.ebuild b/dev-ruby/marcel/marcel-0.3.2-r1.ebuild
deleted file mode 100644
index 30c7c7144c23..000000000000
--- a/dev-ruby/marcel/marcel-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
-HOMEPAGE="https://github.com/basecamp/marcel"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/mimemagic-0.3.2:0"
-
-all_ruby_prepare() {
-	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
-}
diff --git a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild b/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
index 74d267954bc5..40fae2ec8e91 100644
--- a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
+++ b/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -24,4 +24,9 @@ ruby_add_rdepend ">=dev-ruby/mimemagic-0.3.2:0"
 
 all_ruby_prepare() {
 	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
+
+	# Account for changes in shared-mime-info 1.10
+	mkdir test/fixtures/{magic,name}/font || die
+	mv test/fixtures/magic/application/x-font-ttf.ttf test/fixtures/magic/font/ttf.ttf || die
+	mv test/fixtures/name/application/x-font-ttf.ttf test/fixtures/name/font/ttf.ttf || die
 }
diff --git a/dev-ruby/marcel/marcel-0.3.3.ebuild b/dev-ruby/marcel/marcel-0.3.3.ebuild
deleted file mode 100644
index 8c6826313765..000000000000
--- a/dev-ruby/marcel/marcel-0.3.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
-HOMEPAGE="https://github.com/basecamp/marcel"
-SRC_URI="https://github.com/basecamp/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/mimemagic-0.3.2:0"
-
-all_ruby_prepare() {
-	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
-}