Make X dep options - bug #109289

Package-Manager: portage-2.0.53_rc7

diff --git a/dev-ruby/ruby-gd/ChangeLog b/dev-ruby/ruby-gd/ChangeLog
index 8cffc1c2546998b0b2d8d3243fc80e5b764e6545..2002ed771b4324b1b5cc5d361eeb71dab7840cd0 100644 (file)
--- a/dev-ruby/ruby-gd/ChangeLog
+++ b/dev-ruby/ruby-gd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/ruby-gd
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gd/ChangeLog,v 1.4 2004/12/18 09:47:24 corsair Exp $
+# 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 $
+
+  01 Nov 2005; Caleb Tennis <caleb@gentoo.org> ruby-gd-0.7.4.ebuild:
+  Making X dep optional - bug #109289
 
   16 Dec 2004; Markus Rothe <corsair@gentoo.org> ruby-gd-0.7.4.ebuild:
   Stable on ppc64

diff --git a/dev-ruby/ruby-gd/Manifest b/dev-ruby/ruby-gd/Manifest
index d0f85c0f64a5a8ae4ae4ae7ff66fb5488b243e87..2a542b196ea5c8449f74b0506b9b8bd6c67e4acd 100644 (file)
--- a/dev-ruby/ruby-gd/Manifest
+++ b/dev-ruby/ruby-gd/Manifest
@@ -1,4 +1,4 @@
-MD5 456caa9a818366f5f8fe213a7f1903bc ChangeLog 605
-MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 a686203b6e7d0fe38ba401d1b868c9a1 ruby-gd-0.7.4.ebuild 1106
+MD5 8ef4e3b0c5acec22e6280464b34b9df8 ChangeLog 711
 MD5 68c7b3e0c3a057b71588d7c820ec0985 files/digest-ruby-gd-0.7.4 66
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 5bc2f6e9372c18bfe6311af6c84be70e ruby-gd-0.7.4.ebuild 1166

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 77c93c8709a30523a8d9b7efa321443c38e76a1a..15a9cb5de8c7c78fea305a4a8682c5a8abd5fdae 100644 (file)
--- 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-2004 Gentoo Foundation
+# Copyright 1999-2005 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.5 2004/12/18 09:47:24 corsair Exp $
+# $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 $
 
 inherit ruby
 USE_RUBY="ruby16 ruby18 ruby19"
@@ -15,18 +15,22 @@ SRC_URI="http://tam.0xfa.com/ruby-gd/${MY_P}-1.tar.gz"
 LICENSE="Ruby"
 SLOT="0"
 KEYWORDS="~x86 ppc64"
-IUSE="jpeg truetype"
+IUSE="jpeg truetype X"
 
 DEPEND="virtual/ruby
-       virtual/x11
        >=media-libs/gd-2.0
        jpeg? ( media-libs/jpeg )
-       truetype? ( media-libs/freetype )"
+       truetype? ( media-libs/freetype )
+       X? ( virtual/x11 )"
 
 src_compile() {
        local myconf=""
        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