4 files changed, 67 insertions, 24 deletions
diff --git a/dev-ruby/ruby-gd2/ChangeLog b/dev-ruby/ruby-gd2/ChangeLog
index 256e220ee..9d5056625 100644
--- a/dev-ruby/ruby-gd2/ChangeLog
+++ b/dev-ruby/ruby-gd2/ChangeLog
@@ -1,7 +1,16 @@
 # ChangeLog for dev-ruby/ruby-gd2
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ruby-gd2-1.1.1-r1 (11 Oct 2010)
+
+  11 Oct 2010; Nathan Phillip Brink (ohnobinki)
+  <ohnobinki@ohnopublishing.net> -ruby-gd2-1.1.1.ebuild,
+  +ruby-gd2-1.1.1-r1.ebuild, +files/ruby-gd2-1.1.1-raketasks.patch:
+  Migrate to ruby-fakegem eclass. Clean up *DEPEND and misc. things. Support
+  tests and rdoc through a patch to Rakefile. Version bump because
+  ruby-fakegem installs a different set of files than the gems eclass.
+
   06 Dec 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   ruby-gd2-1.1.1.ebuild:
   Use mirror://
diff --git a/dev-ruby/ruby-gd2/files/ruby-gd2-1.1.1-raketasks.patch b/dev-ruby/ruby-gd2/files/ruby-gd2-1.1.1-raketasks.patch
new file mode 100644
index 000000000..89b41c1e2
--- /dev/null
+++ b/dev-ruby/ruby-gd2/files/ruby-gd2-1.1.1-raketasks.patch
@@ -0,0 +1,29 @@
+diff -c /var/tmp/portage/dev-ruby/ruby-gd2-1.1.1-r1/work/all/ruby-gd2-1.1.1/Rakefile /tmp/buffer-content-4693TOf
+--- a/Rakefile	Sun Oct 10 23:56:33 2010
++++ b/RakefileMon Oct 11 00:05:56 2010
+@@ -2,6 +2,8 @@
+ 
+ require 'rubygems'
+ require 'rake/gempackagetask'
++require 'rake/rdoctask'
++require 'rake/testtask'
+ 
+ $:.push 'lib'
+ require 'gd2'
+@@ -30,3 +30,14 @@
+ Rake::GemPackageTask.new(spec) do |pkg|
+   pkg.need_tar = true
+ end
++
++Rake::RDocTask.new do |rd|
++  rd.main = 'README'
++  rd.rdoc_files.include('README', 'COPYING', 'lib/**/*.rb')
++  rd.options << '--all'
++end
++
++Rake::TestTask.new do |t|
++  t.test_files = FileList['test/image.rb']
++  t.verbose = true
++end
+
+Diff finished.  Mon Oct 11 00:05:56 2010
diff --git a/dev-ruby/ruby-gd2/ruby-gd2-1.1.1-r1.ebuild b/dev-ruby/ruby-gd2/ruby-gd2-1.1.1-r1.ebuild
new file mode 100644
index 000000000..09a931e9f
--- /dev/null
+++ b/dev-ruby/ruby-gd2/ruby-gd2-1.1.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_NAME="gd2"
+USE_RUBY="ruby18"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="Ruby bindings for the GD 2.x graphics library"
+HOMEPAGE="http://gd2.rubyforge.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( media-libs/gd[truetype] )"
+RDEPEND="media-libs/gd[truetype]"
+
+ruby_add_bdepend "doc? ( virtual/ruby-rdoc )"
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}-raketasks.patch
+}
diff --git a/dev-ruby/ruby-gd2/ruby-gd2-1.1.1.ebuild b/dev-ruby/ruby-gd2/ruby-gd2-1.1.1.ebuild
deleted file mode 100644
index e5ff4e88c..000000000
--- a/dev-ruby/ruby-gd2/ruby-gd2-1.1.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit ruby gems eutils
-
-USE_RUBY="ruby18"
-MY_P="gd2-${PV}"
-
-DESCRIPTION="Ruby bindings for the GD 2.x graphics library."
-HOMEPAGE="http://gd2.rubyforge.org/"
-SRC_URI="mirror://rubygems/${MY_P}.gem"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/ruby-1.8.4"
-RDEPEND="${DEPEND}
-	>=media-libs/gd-2.0.0[truetype]"