From d26f120aa0334681abf9f5ebf2943e1fa75d2817 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gentoo.org>
Date: Mon, 12 Feb 2007 17:13:23 +0000
Subject: [PATCH] Fix quoting, fix local declaration of myconf, add a pkg_setup
 error if media-libs/gd is not compiled with png useflag enabled, rather than
 get the configure step failing. Package-Manager: portage-2.1.2-r9

---
 dev-ruby/ruby-gd/ChangeLog            |  9 +++++++--
 dev-ruby/ruby-gd/Manifest             | 26 ++++++++++++++++++--------
 dev-ruby/ruby-gd/ruby-gd-0.7.4.ebuild | 19 ++++++++++++++-----
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/dev-ruby/ruby-gd/ChangeLog b/dev-ruby/ruby-gd/ChangeLog
index cbba62fa3e6b..43834629c6c2 100644
--- a/dev-ruby/ruby-gd/ChangeLog
+++ b/dev-ruby/ruby-gd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/ruby-gd
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gd/ChangeLog,v 1.10 2006/10/20 21:25:46 agriffis Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gd/ChangeLog,v 1.11 2007/02/12 17:13:23 flameeyes Exp $
+
+  12 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ruby-gd-0.7.4.ebuild:
+  Fix quoting, fix local declaration of myconf, add a pkg_setup error if
+  media-libs/gd is not compiled with png useflag enabled, rather than get the
+  configure step failing.
 
   20 Oct 2006; Aron Griffis <agriffis@gentoo.org> ruby-gd-0.7.4.ebuild:
   Mark 0.7.4 stable on ia64
diff --git a/dev-ruby/ruby-gd/Manifest b/dev-ruby/ruby-gd/Manifest
index 40720b663008..d99e4a1e1d7f 100644
--- a/dev-ruby/ruby-gd/Manifest
+++ b/dev-ruby/ruby-gd/Manifest
@@ -1,12 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ruby-GD-0.7.4-1.tar.gz 38725 RMD160 a1d941cc44c22f25cff0ee964c8dcb6eb00f9749 SHA1 87ad45f8b224ab2abb87d289112a245f58b16218 SHA256 df08e3d3b34d9cfc68b01f11bd6f685b121ed27f41c1ab5663713cb3e0cdb84a
-EBUILD ruby-gd-0.7.4.ebuild 1223 RMD160 727fdf2d633a21c96af6b0b77111b369c5060b0e SHA1 f6c61a5281438df96e237f13078ca5e01193ad2c SHA256 f186c7398aedf8d2ad3f815c6aa91096bc419c6aafde863f3ea7187f7ce8ecfc
-MD5 0bec8e336293084fe584db101dc61f3d ruby-gd-0.7.4.ebuild 1223
-RMD160 727fdf2d633a21c96af6b0b77111b369c5060b0e ruby-gd-0.7.4.ebuild 1223
-SHA256 f186c7398aedf8d2ad3f815c6aa91096bc419c6aafde863f3ea7187f7ce8ecfc ruby-gd-0.7.4.ebuild 1223
-MISC ChangeLog 1340 RMD160 8f364196f20c1e87ec4afb22bb61f1966d76b804 SHA1 255aabdb3f50a9a32e11fca7d016e28a004e5919 SHA256 80504a63e0d531399f67389791c6e2fd0b388fe5e237820f2eca06db2ef1fd54
-MD5 5258109247636e18f099076a7dcea1c9 ChangeLog 1340
-RMD160 8f364196f20c1e87ec4afb22bb61f1966d76b804 ChangeLog 1340
-SHA256 80504a63e0d531399f67389791c6e2fd0b388fe5e237820f2eca06db2ef1fd54 ChangeLog 1340
+EBUILD ruby-gd-0.7.4.ebuild 1558 RMD160 ed5b1a8f8d0227369c405967e332c0313c2fba6b SHA1 94ba353767ab2273413b0737eb27ce7252eccc39 SHA256 f388552aa569a4f09f51dca9e7f56015a252b366b86029b7fb405c197a46b1e2
+MD5 989e79d66227f3e436a00e5595ad5d50 ruby-gd-0.7.4.ebuild 1558
+RMD160 ed5b1a8f8d0227369c405967e332c0313c2fba6b ruby-gd-0.7.4.ebuild 1558
+SHA256 f388552aa569a4f09f51dca9e7f56015a252b366b86029b7fb405c197a46b1e2 ruby-gd-0.7.4.ebuild 1558
+MISC ChangeLog 1594 RMD160 5a7aa2509012ecf2cbdceeaf3004574eafc61fc2 SHA1 6ccf9fce10a67da1d37a29301ae885175a70b0cb SHA256 8f5000a198c69133e93d1f8ffe5386baf169d4dc4c4a26430c6142d21134c660
+MD5 1323b8e6d2fdb6b0c72420a640de74c7 ChangeLog 1594
+RMD160 5a7aa2509012ecf2cbdceeaf3004574eafc61fc2 ChangeLog 1594
+SHA256 8f5000a198c69133e93d1f8ffe5386baf169d4dc4c4a26430c6142d21134c660 ChangeLog 1594
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -14,3 +17,10 @@ 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF0KA6AiZjviIA2XgRAguJAJsGKFvI/TV/PfY/H8ruYnT+3SZ/JgCdFQRW
+nuuoT6UaBfeHmaXNI2o7JXU=
+=wLoq
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-gd/ruby-gd-0.7.4.ebuild b/dev-ruby/ruby-gd/ruby-gd-0.7.4.ebuild
index 7566707f7bec..cd7957de7435 100644
--- a/dev-ruby/ruby-gd/ruby-gd-0.7.4.ebuild
+++ b/dev-ruby/ruby-gd/ruby-gd-0.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.ebuild,v 1.11 2006/10/20 21:25:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gd/ruby-gd-0.7.4.ebuild,v 1.12 2007/02/12 17:13:23 flameeyes Exp $
 
 inherit ruby
 USE_RUBY="ruby16 ruby18 ruby19"
@@ -23,9 +23,18 @@ DEPEND="virtual/ruby
 	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="${myconf} --enable-gd2_0 --with-xpm"
+	local myconf="${myconf} --enable-gd2_0 --with-xpm"
 
 	if use X; then
 		myconf="${myconf} --with-xpm"
@@ -44,7 +53,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodoc Changes TODO readme.* doc/manual.rd doc/INSTALL.*
 	dohtml doc/manual.html doc/manual_index.html
-- 
2.26.2