Fix bug 166527

(Portage version: 2.1.2.2)

4 files changed, 83 insertions, 1 deletions

diff --git a/dev-ruby/ruby-gd/ChangeLog b/dev-ruby/ruby-gd/ChangeLog
index c80a4e251d48..be79a77ca198 100644
--- a/dev-ruby/ruby-gd/ChangeLog
+++ b/dev-ruby/ruby-gd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/ruby-gd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gd/ChangeLog,v 1.12 2007/03/26 13:54:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gd/ChangeLog,v 1.13 2007/04/20 05:50:48 graaff Exp $
+
+*ruby-gd-0.7.4-r1 (20 Apr 2007)
+
+  20 Apr 2007; Hans de Graaff <graaff@gentoo.org>
+  +files/ruby-gd-0.7.4-fix-interlace.patch, +ruby-gd-0.7.4-r1.ebuild:
+  Fix segmentation fault for 64-bit arches, bug 166527.
 
   26 Mar 2007; Raúl Porcel <armin76@gentoo.org> ruby-gd-0.7.4.ebuild:
   Marking -ia64 wrt bug 166527
diff --git a/dev-ruby/ruby-gd/files/digest-ruby-gd-0.7.4-r1 b/dev-ruby/ruby-gd/files/digest-ruby-gd-0.7.4-r1
new file mode 100644
index 000000000000..cf40eafc85dd
--- /dev/null
+++ b/dev-ruby/ruby-gd/files/digest-ruby-gd-0.7.4-r1
@@ -0,0 +1,3 @@
+MD5 57d4da0a98ee47445e5fa1aa7252640a ruby-GD-0.7.4-1.tar.gz 38725
+RMD160 a1d941cc44c22f25cff0ee964c8dcb6eb00f9749 ruby-GD-0.7.4-1.tar.gz 38725
+SHA256 df08e3d3b34d9cfc68b01f11bd6f685b121ed27f41c1ab5663713cb3e0cdb84a ruby-GD-0.7.4-1.tar.gz 38725
diff --git a/dev-ruby/ruby-gd/files/ruby-gd-0.7.4-fix-interlace.patch b/dev-ruby/ruby-gd/files/ruby-gd-0.7.4-fix-interlace.patch
new file mode 100644
index 000000000000..16e5754021b5
--- /dev/null
+++ b/dev-ruby/ruby-gd/files/ruby-gd-0.7.4-fix-interlace.patch
@@ -0,0 +1,10 @@
+--- /home/graaff/playground/ruby-GD-0.7.4/GD.c	2001-05-30 16:14:17.000000000 +0200
++++ GD.c	2007-04-19 08:53:47.000000000 +0200
+@@ -1374,6 +1374,7 @@
+ 
+ static VALUE
+ img_set_interlace(img, val)
++    VALUE img, val;
+ {
+     gdImagePtr im;
+ 
diff --git a/dev-ruby/ruby-gd/ruby-gd-0.7.4-r1.ebuild b/dev-ruby/ruby-gd/ruby-gd-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..b9fbe1d94951
--- /dev/null
+++ b/dev-ruby/ruby-gd/ruby-gd-0.7.4-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gd/ruby-gd-0.7.4-r1.ebuild,v 1.1 2007/04/20 05:50:48 graaff Exp $
+
+inherit ruby
+USE_RUBY="ruby16 ruby18 ruby19"
+
+MY_P="${P/gd/GD}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="ruby-gd: an interface to Boutell GD library"
+HOMEPAGE="http://tam.0xfa.com/ruby-gd/"
+SRC_URI="http://tam.0xfa.com/ruby-gd/${MY_P}-1.tar.gz"
+PATCHES="${FILESDIR}/ruby-gd-0.7.4-fix-interlace.patch"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="jpeg truetype X"
+
+DEPEND="virtual/ruby
+	>=media-libs/gd-2.0
+	jpeg? ( media-libs/jpeg )
+	truetype? ( media-libs/freetype )
+	X? ( || ( x11-libs/libX11 <virtual/x11-7 ) )"
+
+pkg_setup() {
+	if ! built_with_use media-libs/gd png; then
+		eerror "dev-ruby/ruby-gd requires media-libs/gd compiled with the"
+		eerror "'png' USE flag enabled, or it won't build."
+		eerror "Please emerge media-libs/gd again with the 'png' USE flag"
+		eerror "enabled and then try again."
+		die "Missing png useflag on media-libs/gd."
+	fi
+}
+
+src_compile() {
+	local myconf="${myconf} --enable-gd2_0 --with-xpm"
+
+	if use X; then
+		myconf="${myconf} --with-xpm"
+	fi
+
+	if use jpeg; then
+		myconf="${myconf} --with-jpeg"
+	fi
+
+	if use truetype; then
+		myconf="${myconf} --with-ttf --with-freetype"
+	fi
+
+	ruby extconf.rb ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc Changes TODO readme.* doc/manual.rd doc/INSTALL.*
+	dohtml doc/manual.html doc/manual_index.html
+	insinto /usr/share/doc/${PF}/sample
+	doins sample/*
+}