Fix bug 166527

Package-Manager: portage-2.1.2.2

diff --git a/dev-ruby/ruby-gd/ChangeLog b/dev-ruby/ruby-gd/ChangeLog
index c80a4e251d4848c76c2618667d10885269ee84d2..be79a77ca198170fea6c22522c1554ae92bbbf3a 100644 (file)
--- 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/Manifest b/dev-ruby/ruby-gd/Manifest
index b7a524e3b6e9d550ff01dd24ecc416e61d53a3ce..efcbe3b21657dd5194457dc147b6ce27b532460f 100644 (file)
--- a/dev-ruby/ruby-gd/Manifest
+++ b/dev-ruby/ruby-gd/Manifest
@@ -1,12 +1,20 @@
+AUX ruby-gd-0.7.4-fix-interlace.patch 241 RMD160 96a623f82d2e17753fd6438c861c2bb228ab0d2d SHA1 6631ae773f9c6c0b06ef5fefbea63e4d410a03b8 SHA256 805c9d5e36446f0ee0d0eea4d003814b76b582b77350172a28303768fe855610
+MD5 d325940977d20cb2131c1826ede0fffc files/ruby-gd-0.7.4-fix-interlace.patch 241
+RMD160 96a623f82d2e17753fd6438c861c2bb228ab0d2d files/ruby-gd-0.7.4-fix-interlace.patch 241
+SHA256 805c9d5e36446f0ee0d0eea4d003814b76b582b77350172a28303768fe855610 files/ruby-gd-0.7.4-fix-interlace.patch 241
 DIST ruby-GD-0.7.4-1.tar.gz 38725 RMD160 a1d941cc44c22f25cff0ee964c8dcb6eb00f9749 SHA1 87ad45f8b224ab2abb87d289112a245f58b16218 SHA256 df08e3d3b34d9cfc68b01f11bd6f685b121ed27f41c1ab5663713cb3e0cdb84a
+EBUILD ruby-gd-0.7.4-r1.ebuild 1622 RMD160 d9c836368f05cb221dda43edefc8edad00ad3432 SHA1 1a92b7b6a3b0b977b2896bf36e8c68b60db81e43 SHA256 5b4b3c1f8433a60eeb98f1a4ed1b5caae46fea663866f0c4da2acb8f51429a8f
+MD5 2a8c8f5c5d7c0f6a79e5e20293add298 ruby-gd-0.7.4-r1.ebuild 1622
+RMD160 d9c836368f05cb221dda43edefc8edad00ad3432 ruby-gd-0.7.4-r1.ebuild 1622
+SHA256 5b4b3c1f8433a60eeb98f1a4ed1b5caae46fea663866f0c4da2acb8f51429a8f ruby-gd-0.7.4-r1.ebuild 1622
 EBUILD ruby-gd-0.7.4.ebuild 1557 RMD160 af33c44f5f1ac9bc1f26f464427355c20b270fa2 SHA1 32ee891850d5d1ac59b31e74189bcfb0014e9ac5 SHA256 c6db533e712f5df398ce4b2ef7e454773080a04de3c44b9b34e3c40a3d0a7a1c
 MD5 a365387166207446fce2b718217a99dd ruby-gd-0.7.4.ebuild 1557
 RMD160 af33c44f5f1ac9bc1f26f464427355c20b270fa2 ruby-gd-0.7.4.ebuild 1557
 SHA256 c6db533e712f5df398ce4b2ef7e454773080a04de3c44b9b34e3c40a3d0a7a1c ruby-gd-0.7.4.ebuild 1557
-MISC ChangeLog 1695 RMD160 3961893ed2492771779f3a3b5138f2cf70f88206 SHA1 5b346a5c5e716f0ab21090025563f72a7a0e824c SHA256 541542cc1da3ba9306c1f557c92294f7e7772491bfe783769506b573e3fe925f
-MD5 ccd0835514f99183dec3eaacf7f9774b ChangeLog 1695
-RMD160 3961893ed2492771779f3a3b5138f2cf70f88206 ChangeLog 1695
-SHA256 541542cc1da3ba9306c1f557c92294f7e7772491bfe783769506b573e3fe925f ChangeLog 1695
+MISC ChangeLog 1904 RMD160 8bc8242db84abc604840619cbe4b840b59e21c44 SHA1 ba7b3ac149fbabe9a209402c510e01e0dfd55b55 SHA256 1ff7b30f76eaba2de554efb8a5bc60d551cb6709cd0db7ad238c9bd40e410f8e
+MD5 e44f9bd8663f9d55a98b056ccb554607 ChangeLog 1904
+RMD160 8bc8242db84abc604840619cbe4b840b59e21c44 ChangeLog 1904
+SHA256 1ff7b30f76eaba2de554efb8a5bc60d551cb6709cd0db7ad238c9bd40e410f8e ChangeLog 1904
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -14,3 +22,6 @@ SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata
 MD5 49e9ee194bdb3b0f74eca3375e52fdc4 files/digest-ruby-gd-0.7.4 244
 RMD160 bfe0495e93f4c70c14f86696d99151b4454eeebc files/digest-ruby-gd-0.7.4 244
 SHA256 8878430f95881b5a453c453e50627fbfe136097777afaddec09f383aa5ea72ad files/digest-ruby-gd-0.7.4 244
+MD5 49e9ee194bdb3b0f74eca3375e52fdc4 files/digest-ruby-gd-0.7.4-r1 244
+RMD160 bfe0495e93f4c70c14f86696d99151b4454eeebc files/digest-ruby-gd-0.7.4-r1 244
+SHA256 8878430f95881b5a453c453e50627fbfe136097777afaddec09f383aa5ea72ad files/digest-ruby-gd-0.7.4-r1 244

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 (file)
index 0000000..cf40eaf
--- /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 (file)
index 0000000..16e5754
--- /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 (file)
index 0000000..b9fbe1d
--- /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/*
+}