From dd762ff83c330186ee2ede002e08b2f780cddd51 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 14 Jul 2019 11:04:34 +0100
Subject: gentoo resync : 14.07.2019

---
 dev-ruby/gruff/Manifest              |  4 +--
 dev-ruby/gruff/gruff-0.7.0-r1.ebuild |  2 +-
 dev-ruby/gruff/gruff-0.7.0-r2.ebuild | 51 ++++++++++++++++++++++++++++++++++++
 dev-ruby/gruff/gruff-0.7.0.ebuild    | 45 -------------------------------
 4 files changed, 54 insertions(+), 48 deletions(-)
 create mode 100644 dev-ruby/gruff/gruff-0.7.0-r2.ebuild
 delete mode 100644 dev-ruby/gruff/gruff-0.7.0.ebuild

(limited to 'dev-ruby/gruff')

diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index 48e4698f42e3..6cefec510d6b 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,4 +1,4 @@
 DIST gruff-0.7.0.gem 318464 BLAKE2B bcc51f524089f53b89778143b444c70d4e168983edda247cdb4c9c84c288450154ce6e5234bbf7a0a8ae7251df611333c8bb411a8fd3765ccc5fe9650c3efc38 SHA512 b9842213ab3da7b4eccf8bd06e18d62aea14a6a15d7c45ebe7e51a76acd456ce140f094a9419d4c0bd1774e7d203bea49f9c39aca36c75d744f2732bcde9f688
-EBUILD gruff-0.7.0-r1.ebuild 1423 BLAKE2B 9ce52c434c8368d613b9bc0f24fe0213cb153b61540c29acfb307c7b77dc83e8aace205011011ae0e8e8f001dffde8186aa0e0d924510a6fadcf79904e2dbd5d SHA512 b53167a6c792d8462e517534bcca40adc58fae1bf26319a734f91eafba6be41fddd239b78e7a1abde94b06e9a457bba963b2b8287bad252ce254ba39d9c49de8
-EBUILD gruff-0.7.0.ebuild 1265 BLAKE2B 773dd5a2592f321ec392c6755086812f94619f6bb6fcac7b50cdc876bbe026410062dd672e8d48cb251934d3b7d53cc79edd2e648462618ddc3d039a8d3c831a SHA512 674da064ce3353d84722881163424035c6fdf929acb5c56733d10cd34e5feab0ad05f929b65baa6ac4a9e14c9331e40e13cc03ada2ac03e0b89b64a48b689236
+EBUILD gruff-0.7.0-r1.ebuild 1421 BLAKE2B 5ebebe97288363c2462c6ec2b45334d7626928e1e0707c5185571eccdcff69005e0540c4e16a3f2a334b0bc9ffb885d734ce83d06c1ccf34ff758b715cacd0d9 SHA512 45136832736659bcf52d7f6b1a776c2fba91142f34e164d28bbb0a904d17495798a238a35fc4ce56841273999e96f346e8feca6ff9a6d0e5dc9cc8e07029a9c6
+EBUILD gruff-0.7.0-r2.ebuild 1461 BLAKE2B 3d50beb230323218dee6807f3bae3dee8801201ba8f2d80b1b0b82580df129468bfb1a96be6a6802a38221fb29a1f6792b2e4cf24c37c5121cfabbe7b473b0d3 SHA512 f3b883295ab2db989ef6fcc4bcba28065f276dafb5b1f3280dc0b8a335f46e32b65f9870c2b14535fc4b5f172f0df3d0b2969cb2dbcc2af0ba82fe1c6fa54074
 MISC metadata.xml 340 BLAKE2B e3adfc25e09939c98ba4a4323afd0babccd4b0c11ea712e93a454ea4d3074f12a895d674735f8209598336a1d62ea61d6d00c8956a47cccd583857c36f261ab7 SHA512 1136e2805ed73f18bba2c981e2788fa635face71a9b1b384e3dc20680afd4fb354f33ac099077568f7fa1f3510e1c46771f663341153ae64ef961508243c16d6
diff --git a/dev-ruby/gruff/gruff-0.7.0-r1.ebuild b/dev-ruby/gruff/gruff-0.7.0-r1.ebuild
index 43e016e7b8d5..ba43d17e00f2 100644
--- a/dev-ruby/gruff/gruff-0.7.0-r1.ebuild
+++ b/dev-ruby/gruff/gruff-0.7.0-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/topfunky/gruff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
+KEYWORDS="amd64 x86 ~x86-macos"
 IUSE=""
 
 # imagemagick is an indirect dependency through rmagick. However, for
diff --git a/dev-ruby/gruff/gruff-0.7.0-r2.ebuild b/dev-ruby/gruff/gruff-0.7.0-r2.ebuild
new file mode 100644
index 000000000000..cb2568ce735e
--- /dev/null
+++ b/dev-ruby/gruff/gruff-0.7.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.md RELEASE.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
+
+RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful graphs for one or multiple datasets"
+HOMEPAGE="https://github.com/topfunky/gruff"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE=""
+
+# imagemagick is an indirect dependency through rmagick. However, for
+# gruff to work properly imagemagick needs to be compiled with truetype
+# support and this cannot be expressed in the rmagick dependency. Tests
+# also require imagemagick to have jpeg and png support.
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
+RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
+
+ruby_add_rdepend ">=dev-ruby/rmagick-2.13.4:*"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/reporters/I s:^:#:' test/gruff_test_case.rb || die
+	sed -i -e '2irequire "date"' test/test_scatter.rb || die
+
+	# Relax rmagick dependency since 3.x is API compatible
+	sed -e "/rmagick/ s/'~> 2.13',//" \
+		-e 's/git ls-files/find . -print/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/gruff/gruff-0.7.0.ebuild b/dev-ruby/gruff/gruff-0.7.0.ebuild
deleted file mode 100644
index 8256a45dd1d7..000000000000
--- a/dev-ruby/gruff/gruff-0.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful graphs for one or multiple datasets"
-HOMEPAGE="https://github.com/topfunky/gruff"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-macos"
-IUSE=""
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_rdepend ">=dev-ruby/rmagick-2.13.4"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/hoe
-		dev-ruby/test-unit
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/reporters/I s:^:#:' test/gruff_test_case.rb || die
-	sed -i -e '2irequire "date"' test/test_scatter.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
-- 
cgit v1.2.3