Revision bump to fix bugs #396541, #396279, #396277.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

3 files changed, 81 insertions, 6 deletions

diff --git a/dev-ruby/fxruby/ChangeLog b/dev-ruby/fxruby/ChangeLog
index 4dc65d39b9ae..54930c358552 100644
--- a/dev-ruby/fxruby/ChangeLog
+++ b/dev-ruby/fxruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/fxruby
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fxruby/ChangeLog,v 1.87 2011/01/15 12:12:45 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fxruby/ChangeLog,v 1.88 2011/12/31 16:40:32 graaff Exp $
+
+*fxruby-1.6.20-r1 (31 Dec 2011)
+
+  31 Dec 2011; Hans de Graaff <graaff@gentoo.org> +fxruby-1.6.20-r1.ebuild:
+  Revision bump to fix bugs #396541, #396279, #396277.
 
   15 Jan 2011; Hans de Graaff <graaff@gentoo.org> -fxruby-1.6.19.ebuild:
   Remove old version.
diff --git a/dev-ruby/fxruby/Manifest b/dev-ruby/fxruby/Manifest
index d0f0d900a600..a42fb743db96 100644
--- a/dev-ruby/fxruby/Manifest
+++ b/dev-ruby/fxruby/Manifest
@@ -4,13 +4,14 @@ Hash: SHA256
 DIST FXRuby-1.6.18.tar.gz 1812327 RMD160 c77d3d53362f2d17c2b169bc81a37e73fae5f02f SHA1 1bc3085ebf09104b237a231671fc69be9af74086 SHA256 984736943ab8886f9194c8fc172050d82ed04cee69b76ab74a912528b7397e18
 DIST fxruby-1.6.20.gem 1392640 RMD160 d26b835641cd4f60b4daebcf33f5fa32bca0d39c SHA1 c99594de7868a8770258450b37aba48a5a4744d6 SHA256 ab64ec2495881574c098896b10a6db4c4f90e6f37312ddd9390be469df7a6726
 EBUILD fxruby-1.6.18-r1.ebuild 1830 RMD160 ee89290ccf7c85ebe0090a261690c969334a7b88 SHA1 00a1a5b4bd95eac63e02b7d2226cdd1e3cbb659c SHA256 fe3e262b13a00bfb9eba193dec8be2a3dc2976cab86b331a265ae09f4ded141f
+EBUILD fxruby-1.6.20-r1.ebuild 1816 RMD160 bf54d042e2890b3b6e9770fa30c211db5cdf709a SHA1 915941b7bc70445fd0b2d3199a9f64f38c7a7ce9 SHA256 a278b0d5e69696b5ceb20b19a7b6a56c76405e5b89d6b88d49097fa9447e29ff
 EBUILD fxruby-1.6.20.ebuild 1653 RMD160 f018614909d2e1b879e6cfd91362946956541a23 SHA1 1ec3fb7cc374762a611a2078fb4bd01b91f64653 SHA256 8dbf5be3ef75e8a6cb3e11d5817c88ffb269e748f4da933484c971dacbe3ecae
-MISC ChangeLog 4480 RMD160 6c116e3e585bee370ff13189fd30867fc4fd02c6 SHA1 2d0e33fb8d4a2404d264c02674d3ce13a98d5b74 SHA256 124df5627cca393bb7c48d7b56d64877f194998a08ed518c741515be4727361d
+MISC ChangeLog 4645 RMD160 d8d1e50593d32071592d6454f15ad2fdb686018b SHA1 c6fa78a72b555de42caf00907847f354935c137c SHA256 47b7db57246fe65d0d603f82a54606ae64fa44a5b6be9146d48536b08b92d198
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk0xj0IACgkQrnu0mw69Jkr8eAD+N/5G1sIPhmvncyZg8qf+fatI
-AgjZtmuLruYPl1YPiNwA/RhMI64NrK3wcvG6U/CrKNPxXtpD7HmmqSDMxtB/0uSE
-=efTq
+iF4EAREIAAYFAk7/OwsACgkQiIP6VqMIqNfjaAEAgjwoRqH9mG+aBJs0ONYPa8CU
+Xml5oyNvc8zOqJRsyLMA/1xBekjOf21bv2m4u0bMPKtYo39bHW+lMi518LHfFVKp
+=1Nbs
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/fxruby/fxruby-1.6.20-r1.ebuild b/dev-ruby/fxruby/fxruby-1.6.20-r1.ebuild
new file mode 100644
index 000000000000..49b0ab1c44a0
--- /dev/null
+++ b/dev-ruby/fxruby/fxruby-1.6.20-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fxruby/fxruby-1.6.20-r1.ebuild,v 1.1 2011/12/31 16:40:32 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_NAME="fxruby"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt index.html README README.txt TODO"
+
+inherit multilib ruby-fakegem toolchain-funcs
+
+DESCRIPTION="Ruby language binding to the FOX GUI toolkit"
+HOMEPAGE="http://www.fxruby.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="1.6"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples doc"
+
+DEPEND="x11-libs/fox:1.6
+	>=x11-libs/fxscintilla-1.62-r1"
+RDEPEND="${RDEPEND}"
+
+# Tests fail with a memory corruption error. Restrict the tests for
+# now. We did not run tests with older versions so we assume this is
+# not a regression for now.
+RESTRICT="test"
+#ruby_add_bdepend "test? ( dev-ruby/ruby-opengl )"
+
+ruby_add_bdepend "dev-ruby/hoe"
+
+all_ruby_prepare() {
+	sed -i -e '/\[:compile\]/d' Rakefile || die
+	sed -i -e 's:libs, "fxscintilla":libs, "fxscintilla-1.6":g' \
+		 ext/fox16/extconf.rb || die "sed error"
+	einfo "Avoid -O0 builds"
+	sed -i -e 's:-O0 -I:-I:' \
+		ext/fox16/extconf.rb || die "Can't fix forced -O0"
+
+	# Use our own metadata since the distributed version doesn't work
+	# with recent rubygems, bug 396541
+	rm ../metadata || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/fox16 extconf.rb || die
+}
+
+each_ruby_compile() {
+	CXX=$(tc-getCXX) emake -Cext/fox16 || die
+	cp ext/fox16/fox16$(get_modname) lib/ || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		for dir in sample samples example examples; do
+			if [ -d ${dir} ] ; then
+				dodir /usr/share/doc/${PF}
+				cp -pPR ${dir} "${D}"/usr/share/doc/${PF} || die "cp failed"
+			fi
+		done
+	fi
+}