gentoo resync : 27.03.2021

5 files changed, 42 insertions, 47 deletions

diff --git a/dev-ruby/mimemagic/Manifest b/dev-ruby/mimemagic/Manifest
index cae3af8f4035..b0582da8963a 100644
--- a/dev-ruby/mimemagic/Manifest
+++ b/dev-ruby/mimemagic/Manifest
@@ -1,5 +1,4 @@
-DIST mimemagic-0.3.4.gem 410112 BLAKE2B 42838f488bce370f3ea4bf7519f94b64b4e444f04a8758ac19ea1688e003158b000de22274c53451fd471c22de9773b9024f7823ea842e59fe0321301570f0dc SHA512 40b97e523fe96bba28bcc80da02d824c5a3d3be55b0bb1ae1e4eed0337ae8d8e625325adcbfcacd19a2b1ccefbd77b6c3a20af1cf00e03722959ba98659d4281
-DIST mimemagic-0.3.5.gem 410112 BLAKE2B 19b68c246a3a5eb06a56e44c128f8321488c2d81a2d678bce5a31adb4389aca36844f16e8ff842dce9f8552a164c2e2e4547c34d8dd4835d57edd3a9afcff090 SHA512 3140946b3bc3dc33fcd15836c8ee69ca5471e02a063a473ea32993f633883969fec4be4382711aad950cc7e7c5031e9bfb5e0f5fda61c4cd7b4b94546490004e
-EBUILD mimemagic-0.3.4.ebuild 428 BLAKE2B b5200db5c2640da65d5ba138d382e38752419953c57a6c74c44c706a8ecb69a352adaf496641935dee2b84c8b8ded756823b6b5df1cb91e9b062df355e6a9d4e SHA512 19d888e1aaf23906ce452a666ae9fd3f0aa836f280fb83c76a89ad50347112aab86719dfee08ee043d976f9fd2b95ba5bec667b74fd72c87d4fd9f46737e9ad6
-EBUILD mimemagic-0.3.5.ebuild 552 BLAKE2B 95a04edc7fbb15652cc237a87cbddf0a7fc56a73ba0828a85278c21b7deff0199f704a267e1b22b0c078fb446f0d53550129b40f2006415f9d5554b3c299d63e SHA512 3a07db6a230651713629e3f15686dd7b63a72599cf76e303668ed09d806db56aec879165c5ed181e810dcc61bee1e9922e5cea9a5a351cfe42a93bbf08f9990e
+AUX mimemagic-0.3.9-path.rb 107 BLAKE2B 98fd43545719eaecb359c00b89a12c7d08de12df1994288cc47a1c0c6e740752738d14e4118b11a9a58ce8079e9c962887fb95a98e577b8e7fbf55ea4b3ea7c9 SHA512 1036c2e01b9614d05f2a706e18514a0d383821f61814c674ff6ef35f61fbb0cb9c1c7c8fb97d894dc8dda6d8bb1916d12a9dcbb7b5b8705f0ea11a2329416599
+DIST mimemagic-0.3.9.tar.gz 56322 BLAKE2B 41904211bfd0912ef3a161a26c3568dd1cc39ba0a4170969fec7285dbb38302bc94b6bc088f96a1d68e1367deccc9c5616d047cd1946be96dd9e44a892d28f0c SHA512 139ccb23418c476425cd850d2268139b7f1657713ea706c95bf116535fde2ffb4b7902c62f057992d3fa02fee7520a31433c97cce084b7abb5682cffa12b82ce
+EBUILD mimemagic-0.3.9.ebuild 857 BLAKE2B fdde6b989f3db49cf5ffa1eb940206e44ff7fe31ddef49214235e65e014755b8400916fec6933e375f6c5a3cf0705951d2d038710c8b301b553f7d5286f644a8 SHA512 21d6cc2d61533cad4656450405be18dcc6f15641c241fc3092fa942a98134d075faf1805cf670f492202eed74ecf32b0e19bce5fc4814d76f6f47c482bed4573
 MISC metadata.xml 341 BLAKE2B 6d21edf9da7e6ae6913d3101cb96b5e82376e080baed3c07b9d4a9259eb0c097522b35807a89e4b9b32fbc6a6288dba17be7912bef5654dbdf32c9b34da567db SHA512 601856326d3da975f418b59996f89c68b33d089d662b684b9db13ea79481f34706fd4726a531f7f2fee55f25e2c7b3d1ecc69cedab1ff627109c80effa7bc406
diff --git a/dev-ruby/mimemagic/files/mimemagic-0.3.9-path.rb b/dev-ruby/mimemagic/files/mimemagic-0.3.9-path.rb
new file mode 100644
index 000000000000..33e13fca2495
--- /dev/null
+++ b/dev-ruby/mimemagic/files/mimemagic-0.3.9-path.rb
@@ -0,0 +1,3 @@
+class MimeMagic
+  DATABASE_PATH="@GENTOO_PORTAGE_EPREFIX@/usr/share/mime/packages/freedesktop.org.xml"
+end
diff --git a/dev-ruby/mimemagic/mimemagic-0.3.4.ebuild b/dev-ruby/mimemagic/mimemagic-0.3.4.ebuild
deleted file mode 100644
index 9bcb3ae1df07..000000000000
--- a/dev-ruby/mimemagic/mimemagic-0.3.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast mime detection by extension or content"
-HOMEPAGE="https://github.com/minad/mimemagic"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/mimemagic/mimemagic-0.3.5.ebuild b/dev-ruby/mimemagic/mimemagic-0.3.5.ebuild
deleted file mode 100644
index 013a57de4140..000000000000
--- a/dev-ruby/mimemagic/mimemagic-0.3.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast mime detection by extension or content"
-HOMEPAGE="https://github.com/minad/mimemagic"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# Fix broken test, already fixed upstream
-	sed -i -e 's/htm html/html htm/' test/mimemagic_test.rb || die
-}
diff --git a/dev-ruby/mimemagic/mimemagic-0.3.9.ebuild b/dev-ruby/mimemagic/mimemagic-0.3.9.ebuild
new file mode 100644
index 000000000000..43690277205f
--- /dev/null
+++ b/dev-ruby/mimemagic/mimemagic-0.3.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC=mimemagic.gemspec
+
+inherit prefix ruby-fakegem
+
+DESCRIPTION="Fast mime detection by extension or content"
+HOMEPAGE="https://github.com/mimemagicrb/mimemagic"
+SRC_URI="https://github.com/mimemagicrb/mimemagic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND+=" x11-misc/shared-mime-info"
+
+ruby_add_rdepend "
+	dev-ruby/nokogiri
+	dev-ruby/rake
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	cp "${FILESDIR}/${P}-path.rb" lib/mimemagic/path.rb || die
+	eprefixify lib/mimemagic/path.rb
+
+	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}