From: Caleb Tennis <caleb@gentoo.org>
Date: Wed, 15 Mar 2006 13:41:58 +0000 (+0000)
Subject: change einstall to make DESTDIR=D and fix X modular dep
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be195d596ee70289691d62aed6ec76edd7503dc2;p=gentoo.git

change einstall to make DESTDIR=D and fix X modular dep
Package-Manager: portage-2.1_pre6-r3
---

diff --git a/dev-ruby/ruby-gd/ChangeLog b/dev-ruby/ruby-gd/ChangeLog
index 2002ed771b43..3b1959b82e00 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gd/ChangeLog,v 1.5 2005/11/01 14:35:45 caleb Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gd/ChangeLog,v 1.6 2006/03/15 13:41:58 caleb Exp $
+
+  15 Mar 2006; Caleb Tennis <caleb@gentoo.org> ruby-gd-0.7.4.ebuild:
+  Fix X to modular dep
+
+  15 Mar 2006; Caleb Tennis <caleb@gentoo.org> ruby-gd-0.7.4.ebuild:
+  Change einstall to make DESTDIR=D install
 
   01 Nov 2005; Caleb Tennis <caleb@gentoo.org> ruby-gd-0.7.4.ebuild:
   Making X dep optional - bug #109289
diff --git a/dev-ruby/ruby-gd/Manifest b/dev-ruby/ruby-gd/Manifest
index 2a542b196ea5..3541fe114369 100644
--- a/dev-ruby/ruby-gd/Manifest
+++ b/dev-ruby/ruby-gd/Manifest
@@ -1,4 +1,12 @@
-MD5 8ef4e3b0c5acec22e6280464b34b9df8 ChangeLog 711
+MD5 ee340f8974027399ccf2a74edc5a5316 ChangeLog 918
+RMD160 592a1b68176698b58faabde1af36f8d839201992 ChangeLog 918
+SHA256 c475bb6abe38e0f945ec73ea9f7ad6e9a452e0859805a46968506a891af87b2f ChangeLog 918
 MD5 68c7b3e0c3a057b71588d7c820ec0985 files/digest-ruby-gd-0.7.4 66
+RMD160 41ef822f73695f50c921ee43c3131ff8dcf3b547 files/digest-ruby-gd-0.7.4 66
+SHA256 2a0b36a20e1fcbfcdb08a919ad8cf55cab05341a758d30a3d713ea3355bf84a3 files/digest-ruby-gd-0.7.4 66
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 5bc2f6e9372c18bfe6311af6c84be70e ruby-gd-0.7.4.ebuild 1166
+RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
+SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata.xml 157
+MD5 c4f4f90c038b07ff88401b86f04152fe ruby-gd-0.7.4.ebuild 1206
+RMD160 f9d8aa483fe349483e1d459f74f71caa25af9e4c ruby-gd-0.7.4.ebuild 1206
+SHA256 1adbd3494b46771d50752dfab453b4df12091e02d0a43015abb82467eca7cb98 ruby-gd-0.7.4.ebuild 1206
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 15a9cb5de8c7..29a0b64ad337 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-2005 Gentoo Foundation
+# Copyright 1999-2006 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.6 2005/11/01 14:35:45 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gd/ruby-gd-0.7.4.ebuild,v 1.7 2006/03/15 13:41:58 caleb Exp $
 
 inherit ruby
 USE_RUBY="ruby16 ruby18 ruby19"
@@ -21,7 +21,7 @@ DEPEND="virtual/ruby
 	>=media-libs/gd-2.0
 	jpeg? ( media-libs/jpeg )
 	truetype? ( media-libs/freetype )
-	X? ( virtual/x11 )"
+	X? ( || ( x11-libs/libX11 virtual/x11 ) )"
 
 src_compile() {
 	local myconf=""
@@ -44,7 +44,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die
+	make DESTDIR=${D} install || die
 
 	dodoc Changes TODO readme.* doc/manual.rd doc/INSTALL.*
 	dohtml doc/manual.html doc/manual_index.html