Move header file back into the ruby hdrdir because this actually works with ruby-gtk2. Bump straight to stable since this only changes the location of a header file.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 98 insertions, 5 deletions

diff --git a/dev-ruby/rcairo/ChangeLog b/dev-ruby/rcairo/ChangeLog
index 0bca783e3009..f1689fed4a14 100644
--- a/dev-ruby/rcairo/ChangeLog
+++ b/dev-ruby/rcairo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/rcairo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rcairo/ChangeLog,v 1.60 2011/05/02 18:25:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rcairo/ChangeLog,v 1.61 2011/05/02 19:07:57 graaff Exp $
+
+*rcairo-1.10.0-r3 (02 May 2011)
+
+  02 May 2011; Hans de Graaff <graaff@gentoo.org> +rcairo-1.10.0-r3.ebuild:
+  Move header file back into the ruby hdrdir because this actually works with
+  ruby-gtk2. Bump straight to stable since this only changes the location of a
+  header file.
 
   02 May 2011; Hans de Graaff <graaff@gentoo.org> -rcairo-1.8.1.ebuild:
   Remove old version.
diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 71781fa8c417..7c307f91b44e 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -3,12 +3,13 @@ Hash: SHA256
 
 DIST cairo-1.10.0.gem 85504 RMD160 7242a2e82402382e3d8334e9730e63ef4b73e6c5 SHA1 e682d188e6dcc2d2f68445156b8beb4b6b7dface SHA256 3a6e648b75f43aa1a0efb4f70c03e576c865c1257847ac509fca2aee8991a404
 EBUILD rcairo-1.10.0-r2.ebuild 2124 RMD160 5ad75c583ff4e47eedee322d607b7ae8901200d5 SHA1 5c729f84450773cee71430e76389dc71cd4d9ffe SHA256 a31645686193ff822c03c8ed038c34dd9a759f72c95ddc7454239e0d33fc07b5
-MISC ChangeLog 8364 RMD160 0b9cbc974b4665894d536bc2238f3207658d33cf SHA1 cdf815491f167ff9bdb9a7d9f59cc73fa28a9e8d SHA256 ce6c68110b577b31d2bfbab669cf0efd13dccb31b868a07ab40d3622328814c2
+EBUILD rcairo-1.10.0-r3.ebuild 2176 RMD160 fe7960ba928373c9f875c514ef3188d1545b37ae SHA1 14acf05d0bb5978f20b871ead36828a7e3067446 SHA256 2db64534420802a635ffcc01014dbc48e41f9c956217d5f43922b5d8cbfaa14b
+MISC ChangeLog 8646 RMD160 22c86d4a3a74049ff7f7397ca933c7f2601a41e6 SHA1 1700bda43b414608c44fa3272f516443b400a099 SHA256 af2b8d2548e2e71eb6d5006e79947cffe9372f693ce4758594022d94838e1ee5
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2+9zoACgkQrnu0mw69Jkp2RAD/WlKEOrbNI9kBObytb18jEuhR
-nv0ogrIPrA0GAhSf/+gA/iuctQx/ZRI5Lpm1+21fbM9C8/wwKdEaW6jzWqOOeQKJ
-=doF8
+iF4EAREIAAYFAk2/ARIACgkQrnu0mw69JkqVjAD/XxZHSOzqWIAtvFLDF3FhOfxc
+JSZEr0Bh0gxgdmeLBhkA/2VPljMS4I+0Db/bmWhS07C859dQMCMXI6QOhcKA2wMq
+=gA4H
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rcairo/rcairo-1.10.0-r3.ebuild b/dev-ruby/rcairo/rcairo-1.10.0-r3.ebuild
new file mode 100644
index 000000000000..8213da64ba6c
--- /dev/null
+++ b/dev-ruby/rcairo/rcairo-1.10.0-r3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rcairo/rcairo-1.10.0-r3.ebuild,v 1.1 2011/05/02 19:07:57 graaff Exp $
+
+EAPI=2
+
+# ruby19 → fails, and even crashes Ruby
+# jruby → cannot work, it's a compiled extension
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_NAME="cairo"
+
+# Documentation depends on files that are not distributed.
+RUBY_FAKEGEM_TASK_DOC=""
+
+# Depends on test-unit-2 which is currently masked.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby bindings for cairo"
+HOMEPAGE="http://cairographics.org/rcairo/"
+
+IUSE=""
+
+SLOT="0"
+LICENSE="|| ( Ruby GPL-2 )"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+
+RDEPEND="${RDEPEND}
+	>=x11-libs/cairo-1.2.0[svg]"
+DEPEND="${DEPEND}
+	>=x11-libs/cairo-1.2.0[svg]
+	dev-util/pkgconfig"
+
+ruby_add_bdepend "
+	dev-ruby/ruby-glib2
+	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 )"
+
+all_ruby_prepare() {
+	# Remove a failing test for the new recording surface. It's not
+	# clear if this is a test failure or not, but we need to move on
+	# with cairo 1.10.
+	rm test/test_recording_surface.rb || die
+
+	# We don't need pkg-config since we compile directly so remove
+	# metadata because otherwise rubygems or bundler may get confused.
+	rm ../metadata || die
+}
+
+each_ruby_configure() {
+	${RUBY} extconf.rb || die "extconf failed"
+}
+
+each_ruby_compile() {
+	emake || die "make failed"
+
+	# again, try to make it more standard, to install it more easily.
+	cp ext/cairo/cairo$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	# don't rely on the Rakefile because it's a mess to load with
+	# their hierarchy, do it manually.
+	${RUBY} -Ilib -r ./test/cairo-test-utils.rb \
+		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	insinto $(ruby_get_hdrdir)
+	doins ext/cairo/rb_cairo.h || die "Cannot install header file."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}/samples
+	doins -r samples/* || die "Cannot install sample files."
+}