Add division by zero error fix from upstream.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 84 insertions, 2 deletions

diff --git a/dev-ruby/gruff/ChangeLog b/dev-ruby/gruff/ChangeLog
index ddef8cdaaf94..32f9f537902e 100644
--- a/dev-ruby/gruff/ChangeLog
+++ b/dev-ruby/gruff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/gruff
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gruff/ChangeLog,v 1.39 2012/05/01 18:24:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gruff/ChangeLog,v 1.40 2012/07/22 18:08:15 graaff Exp $
+
+*gruff-0.3.6-r3 (22 Jul 2012)
+
+  22 Jul 2012; Hans de Graaff <graaff@gentoo.org> +gruff-0.3.6-r3.ebuild,
+  +files/gruff-0.3.6-zero-division.patch:
+  Add division by zero error fix from upstream.
 
   01 May 2012; Raúl Porcel <armin76@gentoo.org> gruff-0.3.6-r1.ebuild,
   gruff-0.3.6-r2.ebuild:
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index c21ac4d69158..87988ea9bda4 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gruff-0.3.6-fix-tests.patch 739 SHA256 c44c3a5c9a82b42ae0f4fa2ff490ff3ddde53deb9ba4153861ecca83ba036e08 SHA512 1901455716738f15c9a6cfa06ef45c672675b88f362a096a3bc996665aa5b1056c1158fe25f4fb1fc5faaebc3a772efff7853d271c21e921408c636bce5d5332 WHIRLPOOL e4fd019b3b4fb95cc92caf5126794b06d15ddcea1f5a6293dd24df7b711edd4f778a719a188f6766610ace7667d5d1a32bf1b17b65fe7d6276e1ace36a84a150
 AUX gruff-0.3.6-sort-filenames.patch 1335 SHA256 095382ac4ca3e86165834655d6e4bc8635367f8aedc164a0dd366607a40d2f06 SHA512 1c7ad97309fd65e9c81c6a92d669e31ee2cea5417019c0e1039493a2a4c2b3e5a55b6a977ee1b7e5710cadc085ac1005fc9178e440baffbb03b977f491c8cc6e WHIRLPOOL 587534ec010c043636ee11c6c6ada92e8a1b8ca13797a56394bf7c59a14b2f6005d44cdc401f41eb6c2d20b4e5824d63cdc8a9210148f350cd53d1d5626b2912
 AUX gruff-0.3.6-spider.patch 521 SHA256 30d4474118df254429fabb1a25f5612301d9aa16c518f35e8bc6446d3c4afde9 SHA512 5424d12f7801a572ee90eb0122db3fceca84ce481153f77eba60ee783655776cdc0531ccf1a25fc4794c094facdb2815e09841886179cce7ffbb5328a467e386 WHIRLPOOL c6693be668b88559d87b2f4da64a3dc9f50b1a7482fa1ffd65ed707af5c8c9673874b85e78425aaba81d8231a65f30433ed57a97487ee33eeaa43a90444f1b53
+AUX gruff-0.3.6-zero-division.patch 734 SHA256 bcbfb5998f5e807b9b71b82f54b09d304110c6801b2d390573b0d636ea90e46d SHA512 5c76374c7b4253fe906ff512fe6cb1f61eb6755265015db288fad079565941eeecc7a36dc0a08e196b25bd78741ba33d9fdceb3a9a20cef56e5020bf2cd2a840 WHIRLPOOL b14f171dafa0832a5a1b3124c7fcd2902326ccb27d72023000f7f1a444da0dd255726a47596fdff091afbee81be4481b94667f80d6d846ca1994a3a2a7ffabef
 DIST gruff-0.3.6.tgz 297337 SHA256 e0feb37b116b9a169b7ebad81e0ac0a37dea9bd0c6abe8285cb2b4518298d49a SHA512 1f1d13477af24ba63597927f85650b651f8721952e1ca024f16ceb10a072b617d5abeb9159e5227f13471cf7bc372ed4f03dab95d5e2e6790022d2704ad85e2e WHIRLPOOL a7cc740bad6803e412965560acb37646dbdad7eef644edcaddad1d3b1d8bf18d8b36d7fbe86f75cf2a72d966cfa719c2790f247c2bc7862ba7b8bececfff8a7d
 EBUILD gruff-0.3.6-r1.ebuild 1246 SHA256 0817ed76b86266a1d822481ecefa841ef59fcd952c5e45b7d193e7394236abec SHA512 59e3487e69daee0a4bf8154129770e583477974a9652b6124ba6fadb9e22c159219d7c0ba25698aa363179d003920b11c1ed1847ac39761f479949532e3e4571 WHIRLPOOL 30f1e1ab0a17dd397557980d89feae3a348fd48b69a1ee5fa833e0378882330077dd6b4cc494de5b7e423820d8b1e193c681ea845724c700d674e8d7660abe5e
 EBUILD gruff-0.3.6-r2.ebuild 1254 SHA256 5847691827b0695f2747fc57c1e17e72365166878c2e1ba5d5a460b29197c8ad SHA512 e5d02f2e9bf56b1f238c9666e9ee9efa3c954628750b87df128552304c669b023504b9ff2d12abeba8a4ef604673335ba7253540de185170e15e9a2d2a728ae6 WHIRLPOOL 864035b3d222478f4b0406998b9a8dda1a4b56a8bf24803060aa5fdfd7101af81251f7cff8be741c9587c86cac47d04e5307f8cebb176201ea30a5e439e42044
-MISC ChangeLog 5041 SHA256 66f8fb05406490445620922bfc8884a929b384d6ea76d1390984dcea1e57df1d SHA512 2e018a286f8dd9ece926d27ffc3b2da5c9bf583a2d75246a225fa4bc53ebb887eff0918b041decea432c30353fb8d40340e74d8ef7d11bc80cffe9eb09866043 WHIRLPOOL f56667dc646f5f1b9d2bd142b6b2a7fd0ffee668e4795d68f03b7b33caa848cd895f978968ff49ff00ece95f687709bb7379225cd3d52e1c5da3e24731e7f297
+EBUILD gruff-0.3.6-r3.ebuild 1254 SHA256 c69f1ddb904b85eaddce50fad33f77706267c90527ff679320cf78eae0e83f03 SHA512 398bc0b5ece1a952e5d3fe8acb9099d2b822a21c4148b967e955cebbfbe2237508ecd4c10bcfa908ff1976031713bdd2b5266b01a2ee175643eb4bf1c0f8a0b5 WHIRLPOOL 2baccb769b2f609a6b55bd8a3a5c0582f6cff5b358152a40f5692b19335fd12ae929ff0e97397f54a3b7f60225b913f6758ea13b13dd363149045e2740f6598f
+MISC ChangeLog 5236 SHA256 0fe0f1161ff488bd85effd191fa4f5c656d9572a3a95c6ff3654280062489e57 SHA512 1b00a2180f2990467eeacf18309fd351be378e6e89e8ddd1ad7ec83b689248743418ddb18019127c670881f43ce7a0dcf07cd1db71ed92918f711390b4f64f65 WHIRLPOOL 8e87f37ac2338913f3c05bc504fd12f9e600476f6e5aa534c9d0ca4753022cda41917ef11d5f05dcc2066503bbb13ec1769945740b996c168de1079b94383aec
 MISC metadata.xml 231 SHA256 867c08589996ba5bc00a71c4dbc1e28832e8f81bbb4f7e22b108015b6c9e8a8d SHA512 4511611ad705ae2650d9ebdfc3477c7fe8a99b0343f813f0ea018c4bf9a54b8d84c1e2f088b0299e5d5aa08a516e4c5ba8e050d1236a183d3f290ad333a8482a WHIRLPOOL c832a14f9f9726f438e57368d67026573186a3cd13936c3d2ec89abb7df72633c5278ac5917fc0c0201861cd0f256016696412eab35905a038ea57ff82e5987d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlAMQZQACgkQiIP6VqMIqNfcoAD/Z21JKbur26g1mvldNOLkjbKE
+qDzdGj0OaaGFa28LAQEA/1+/FeXQ9layU/7AXF23Y4rGn3d+baDpCh8cX+bzmQYn
+=roZK
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/gruff/files/gruff-0.3.6-zero-division.patch b/dev-ruby/gruff/files/gruff-0.3.6-zero-division.patch
new file mode 100644
index 000000000000..b201a604f921
--- /dev/null
+++ b/dev-ruby/gruff/files/gruff-0.3.6-zero-division.patch
@@ -0,0 +1,19 @@
+commit f5098443aba86fc59b02eace6ecad7530d72694b
+Author: Serge Prikha <prikha@gmail.com>
+Date:   Wed Jun 6 16:22:41 2012 +0400
+
+    small fix on zero division
+
+diff --git a/lib/gruff/base.rb b/lib/gruff/base.rb
+index 590ef99..898afe0 100644
+--- a/lib/gruff/base.rb
++++ b/lib/gruff/base.rb
+@@ -1066,7 +1066,7 @@ module Gruff
+     # Return a formatted string representing a number value that should be
+     # printed as a label.
+     def label(value)
+-      label = if (@spread.to_f % @marker_count.to_f == 0) || !@y_axis_increment.nil?
++      label = if (@spread.to_f % (@marker_count.to_f==0 ? 1 : @marker_count.to_f) == 0) || !@y_axis_increment.nil?
+         value.to_i.to_s
+       elsif @spread > 10.0
+         sprintf("%0i", value)
diff --git a/dev-ruby/gruff/gruff-0.3.6-r3.ebuild b/dev-ruby/gruff/gruff-0.3.6-r3.ebuild
new file mode 100644
index 000000000000..2fecef56543d
--- /dev/null
+++ b/dev-ruby/gruff/gruff-0.3.6-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gruff/gruff-0.3.6-r3.ebuild,v 1.1 2012/07/22 18:08:15 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
+
+inherit ruby-fakegem
+
+ruby_add_rdepend '>=dev-ruby/rmagick-2'
+ruby_add_bdepend "
+	test? (
+		dev-ruby/hoe
+	)
+	doc? ( dev-ruby/hoe )"
+
+DESCRIPTION="RMagick Implementation for JRuby"
+HOMEPAGE="http://rubyforge.org/projects/gruff/"
+SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-macos"
+IUSE=""
+
+RUBY_PATCHES=(
+	${P}-sort-filenames.patch
+	${P}-fix-tests.patch
+	${P}-spider.patch
+	${P}-zero-division.patch
+)
+
+# 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. Test also require imagemagick to have jpeg support.
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,truetype] )"
+RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"