Remove virtual/x11 dependencies, remove broken version

(Portage version: 2.1.2.9)

4 files changed, 7 insertions, 68 deletions

diff --git a/dev-ruby/ruby-gd/ChangeLog b/dev-ruby/ruby-gd/ChangeLog
index eb0e2245efbc..258d7e6070d3 100644
--- a/dev-ruby/ruby-gd/ChangeLog
+++ b/dev-ruby/ruby-gd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2007/06/25 17:25:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gd/ChangeLog,v 1.17 2007/07/22 06:55:47 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org> -ruby-gd-0.7.4.ebuild,
+  ruby-gd-0.7.4-r1.ebuild:
+  Remove dependencies on virtual/x11, remove broken version.
 
   25 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
   ruby-gd-0.7.4-r1.ebuild:
diff --git a/dev-ruby/ruby-gd/files/digest-ruby-gd-0.7.4 b/dev-ruby/ruby-gd/files/digest-ruby-gd-0.7.4
deleted file mode 100644
index cf40eafc85dd..000000000000
--- a/dev-ruby/ruby-gd/files/digest-ruby-gd-0.7.4
+++ /dev/null
@@ -1,3 +0,0 @@
-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/ruby-gd-0.7.4-r1.ebuild b/dev-ruby/ruby-gd/ruby-gd-0.7.4-r1.ebuild
index 7ac734b8eab5..df363e875832 100644
--- a/dev-ruby/ruby-gd/ruby-gd-0.7.4-r1.ebuild
+++ b/dev-ruby/ruby-gd/ruby-gd-0.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2007/06/25 17:25:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gd/ruby-gd-0.7.4-r1.ebuild,v 1.5 2007/07/22 06:55:47 graaff Exp $
 
 inherit ruby
 USE_RUBY="ruby16 ruby18 ruby19"
@@ -22,7 +22,7 @@ DEPEND="virtual/ruby
 	>=media-libs/gd-2.0
 	jpeg? ( media-libs/jpeg )
 	truetype? ( media-libs/freetype )
-	X? ( || ( x11-libs/libX11 <virtual/x11-7 ) )"
+	X? ( x11-libs/libX11 )"
 
 pkg_setup() {
 	if ! built_with_use media-libs/gd png; then
diff --git a/dev-ruby/ruby-gd/ruby-gd-0.7.4.ebuild b/dev-ruby/ruby-gd/ruby-gd-0.7.4.ebuild
deleted file mode 100644
index b584c9949902..000000000000
--- a/dev-ruby/ruby-gd/ruby-gd-0.7.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.13 2007/03/26 13:54:07 armin76 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"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="-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/*
-}