Add division by zero error fix from upstream.

(Portage version: 2.1.10.65/cvs/Linux x86_64)

3 files changed, 71 insertions, 1 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/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]"