Fixed 1.4 to link against fox-1.4 fxscintilla, Version bump for 1.6

(Portage version: 2.1.3.19)

5 files changed, 81 insertions, 204 deletions

diff --git a/dev-ruby/fxruby/ChangeLog b/dev-ruby/fxruby/ChangeLog
index 21eb39b5c0b1..8a44208f7097 100644
--- a/dev-ruby/fxruby/ChangeLog
+++ b/dev-ruby/fxruby/ChangeLog
@@ -1,208 +1,11 @@
 # ChangeLog for dev-ruby/fxruby
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fxruby/ChangeLog,v 1.53 2007/11/18 18:22:51 fmccor Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fxruby/ChangeLog,v 1.54 2007/11/18 18:59:08 mabi Exp $
 
-  18 Nov 2007; Ferris McCormick <fmccor@gentoo.org> fxruby-1.6.12.ebuild:
-  Sparc stable, Bug #199571.
+*fxruby-1.6.13 (18 Nov 2007)
+*fxruby-1.4.7-r1 (18 Nov 2007)
 
-*fxruby-1.6.12 (19 Oct 2007)
+  18 Nov 2007; Matti Bickel <mabi@gentoo.org> +fxruby-1.4.7-r1.ebuild,
+  +fxruby-1.6.13.ebuild:
+  Fixed 1.4 to link against fox-1.4 fxscintilla, Version bump for 1.6
 
-  19 Oct 2007; Matti Bickel <mabi@gentoo.org> -fxruby-1.2.6.ebuild,
-  -fxruby-1.6.4.ebuild, +fxruby-1.6.12.ebuild:
-  version bump, clean fxruby-1.2
-
-  03 Jun 2007; Markus Rothe <corsair@gentoo.org> fxruby-1.6.11.ebuild:
-  Stable on ppc64; bug #165352
-
-  24 May 2007; Christian Faulhammer <opfer@gentoo.org> fxruby-1.6.11.ebuild:
-  x86/amd64 stable, bug 165352
-
-  23 May 2007; Ferris McCormick <fmccor@gentoo.org> Manifest:
-  Fix Manifest for fxruby-1.2.6.ebuild.
-
-  23 May 2007; Matti Bickel <mabi@gentoo.org> +fxruby-1.2.6.ebuild:
-  revive old until bug #177785 is solved
-
-  22 May 2007; Matti Bickel <mabi@gentoo.org> -fxruby-1.2.2.ebuild,
-  -fxruby-1.2.6.ebuild:
-  Remove old versions
-
-  21 May 2007; Jeroen Roovers <jer@gentoo.org> fxruby-1.6.11.ebuild:
-  Stable for HPPA (bug #165352).
-
-  21 May 2007; Ferris McCormick <fmccor@gentoo.org> fxruby-1.6.11.ebuild:
-  Sparc stable --- Bug #165352 --- older versions may be removed.
-
-  20 May 2007; Bryan Østergaard <kloeri@gentoo.org> fxruby-1.6.11.ebuild:
-  Stable on Alpha, bug 165352.
-
-  20 May 2007; Matti Bickel <mabi@gentoo.org> fxruby-1.6.11.ebuild:
-  ppc stable (bug #165352)
-
-  19 Apr 2007; Christian Faulhammer <opfer@gentoo.org> fxruby-1.2.6.ebuild,
-  fxruby-1.4.7.ebuild, fxruby-1.6.4.ebuild:
-  stable amd64, bug 165352
-
-*fxruby-1.6.11 (18 Apr 2007)
-
-  18 Apr 2007; Matti Bickel <mabi@gentoo.org> +fxruby-1.6.11.ebuild:
-  version bump
-
-  10 Mar 2007; Tom Gall <tgall@gentoo.org> fxruby-1.6.4.ebuild:
-  added ~ppc64
-
-  04 Mar 2007; Jeroen Roovers <jer@gentoo.org> fxruby-1.4.7.ebuild,
-  fxruby-1.6.4.ebuild:
-  Stable for HPPA.
-
-  05 Feb 2007; Jeroen Roovers <jer@gentoo.org> fxruby-1.2.6.ebuild:
-  Marked hppa (bug #165352, tested with net-irc/xdcc-fetch).
-
-  05 Feb 2007; Christian Faulhammer <opfer@gentoo.org> fxruby-1.2.6.ebuild,
-  fxruby-1.4.7.ebuild, fxruby-1.6.4.ebuild:
-  stable x86; bug #165352
-
-  05 Feb 2007; Jeroen Roovers <jer@gentoo.org> fxruby-1.2.6.ebuild,
-  fxruby-1.4.7.ebuild, fxruby-1.6.4.ebuild:
-  Marked ~hppa (bug #165352).
-
-  31 Jan 2007; Christian Marie <pingu@gentoo.org> fxruby-1.2.2.ebuild:
-  Fix depend on all fox versions, only seems to build with fox-1.2*. Bug
-  #162562.
-
-  21 Jan 2007; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org>
-  fxruby-1.2.6.ebuild, fxruby-1.4.7.ebuild, fxruby-1.6.4.ebuild:
-  Added examples use flag to ebuild, #145222
-
-*fxruby-1.6.4 (01 Jan 2007)
-*fxruby-1.4.7 (01 Jan 2007)
-
-  01 Jan 2007; Matti Bickel <mabi@gentoo.org> +fxruby-1.4.7.ebuild,
-  +fxruby-1.6.4.ebuild:
-  revision bumps (bug #88924)
-
-  29 Oct 2006; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org>
-  -fxruby-1.0.25.ebuild, -fxruby-1.0.29-r1.ebuild:
-  Removed fxruby-1.0* due to #153234
-
-  23 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>; fxruby-1.2.6.ebuild:
-  This was miskeyworded stable on x86; re-~arch it (Michael Sterrett).
-
-  13 Apr 2006; Ferris McCormick <fmccor@gentoo.org> fxruby-1.2.6.ebuild:
-  Add ~amd64 keyword.  Builds and runs well enough for testing and for use, but
-  there appear to be problems with the install if USE=doc. (Notice also that some
-  examples are not completely converted to fox12.  Notice further that this will
-  not install with FEATURES=multilib-strict; appears to be a general conflict
-  between portage requirements and general ruby conventions:  ruby installs in
-  /usr/lib/ruby/site_ruby/1.8/x86_64-linux, which portage prohibits.)
-
-  23 Sep 2005; Ferris McCormick <fmccor@gentoo.org> fxruby-1.2.2.ebuild,
-  fxruby-1.2.6.ebuild:
-  Do not force '-O0' when building fxruby.  Closes Bug #87016 at request
-  of the developer, caleb@gentoo.org.
-
-  23 Sep 2005; Caleb Tennis <caleb@gentoo.org> -fxruby-1.0.28-r1.ebuild,
-  -fxruby-1.0.29.ebuild, -fxruby-1.2.4.ebuild, -fxruby-1.2.5.ebuild:
-  Remove old versions
-
-  23 Sep 2005; Caleb Tennis <caleb@gentoo.org> fxruby-1.2.6.ebuild:
-  x86 stable
-
-  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> fxruby-1.0.25.ebuild,
-  fxruby-1.0.28-r1.ebuild, fxruby-1.0.29.ebuild, fxruby-1.2.2.ebuild,
-  fxruby-1.2.4.ebuild:
-  Don't use -d option with cp.
-
-*fxruby-1.2.6 (07 May 2005)
-
-  07 May 2005; <rphillips@gentoo.org> +fxruby-1.0.29-r1.ebuild,
-  +fxruby-1.2.5.ebuild, +fxruby-1.2.6.ebuild:
-  Added Yaakov Selkowitz's eclass based fox ebuilds for testing.
-  Fixes #88924
-
-  04 May 2005; Guy Martin <gmsoft@gentoo.org> fxruby-1.2.2.ebuild:
-  Stable on hppa.
-
-  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> fxruby-1.2.2.ebuild:
-  Stable on alpha.
-
-  26 Mar 2005; Jason Wever <weeve@gentoo.org> fxruby-1.2.2.ebuild:
-  Stable on SPARC.
-
-  12 Mar 2005; Michael Kohl <citizen428@gentoo.org> fxruby-1.2.2.ebuild:
-  Marked stable on x86.
-
-*fxruby-1.2.4 (24 Feb 2005)
-
-  24 Feb 2005; Rob Cakebread <pythonhead@gentoo.org> +fxruby-1.2.4.ebuild:
-  Version bump.
-
-  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  23 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> fxruby-1.2.2.ebuild:
-  ~alpha keyword.
-
-*fxruby-1.2.2 (22 Oct 2004)
-
-  22 Oct 2004; Michael Kohl <citizen428@gentoo.org> +fxruby-1.2.2.ebuild:
-  New version for the 1.2 branch of Fox.
-
-  23 Jul 2004; <twp@gentoo.org> fxruby-1.0.25.ebuild, fxruby-1.0.28-r1.ebuild,
-  fxruby-1.0.29.ebuild:
-  Current implementations require <x11-libs/fox-1.2.
-
-*fxruby-1.0.29 (23 Jun 2004)
-
-  23 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> +fxruby-1.0.29.ebuild:
-  Version bumped.
-
-  11 Apr 2004; David Holm <dholm@gentoo.org> fxruby-1.0.28-r1.ebuild:
-  Added to ~ppc.
-
-*fxruby-1.0.28-r1 (10 Apr 2004)
-
-  10 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> fxruby-1.0.25.ebuild,
-  fxruby-1.0.28-r1.ebuild, fxruby-1.0.28.ebuild:
-  virtual/ruby fix
-
-  13 Mar 2003; Tom Payne <twp@gentoo.org> fxruby-1.0.23.ebuild,
-  fxruby-1.0.23.ebuild :
-  Removed old versions.
-
-*fxruby-1.0.28 (13 Mar 2003)
-
-  13 Mar 2003; Tom Payne <twp@gentoo.org> fxruby-1.0.28.ebuild :
-  Version bump. Bug # 44319. Add fxscintilla dependency. Bug # 44228.
-
-*fxruby-1.0.25 (10 Aug 2003)
-
-  10 Aug 2003; Tom Payne <twp@gentoo.org> fxruby-1.0.25.ebuild :
-  Version bump.
-
-*fxruby-1.0.24 (17 Jun 2003)
-
-  17 Jun 2003; Tom Payne <twp@gentoo.org> fxruby-1.0.24.ebuild :
-  Version bump.
-
-*fxruby-1.0.23 (23 May 2003)
-
-  23 May 2003; Tom Payne <twp@gentoo.org> fxruby-1.0.23.ebuild :
-  Version bump. Added IUSE.
-
-*fxruby-1.0.22 (24 Apr 2003)
-
-  13 May 2003; Tom Payne <twp@gentoo.org> fxruby-1.0.22-r1.ebuild :
-  Mark stable on all ARCHes. Install docs properly. Ebuild tidy-up.
-
-  24 Apr 2003; Tom Payne <twp@gentoo.org> fxruby-1.0.22.ebuild :
-  Version bump. Ease dependencies.
-
-*fxruby-1.0.21 (23 Apr 2003)
-
-  23 Apr 2003; Tom Payne <twp@gentoo.org> fxruby-1.0.21.ebuild :
-  Version bump. Minor ebuild tidying. Bug # 19476.
-  
-*fxruby-1.0.17 (27 Dec 2002)
-
-  27 Dec 2002; Ryan Phillips <rphillips@gentoo.org> : Initial release. Submitted by: Holden Glova
diff --git a/dev-ruby/fxruby/files/digest-fxruby-1.4.7-r1 b/dev-ruby/fxruby/files/digest-fxruby-1.4.7-r1
new file mode 100644
index 000000000000..4f220e183286
--- /dev/null
+++ b/dev-ruby/fxruby/files/digest-fxruby-1.4.7-r1
@@ -0,0 +1,3 @@
+MD5 1265a6182beabfe0176ec5f79da1ec06 FXRuby-1.4.7.tar.gz 1733519
+RMD160 fc3a07307eac76bc7f3f392051841f01ad5e0de2 FXRuby-1.4.7.tar.gz 1733519
+SHA256 e0fb1487fdc89e8a17531823cb932f11b5ab202d458b9b2eeee4e2113777cf32 FXRuby-1.4.7.tar.gz 1733519
diff --git a/dev-ruby/fxruby/files/digest-fxruby-1.6.13 b/dev-ruby/fxruby/files/digest-fxruby-1.6.13
new file mode 100644
index 000000000000..985789b61e6f
--- /dev/null
+++ b/dev-ruby/fxruby/files/digest-fxruby-1.6.13
@@ -0,0 +1,3 @@
+MD5 34f9ff2e2bbaca7811f1f8f64ad17d8b FXRuby-1.6.13.tar.gz 1822456
+RMD160 3f22158ef694d42ad1ed486e4dfa0a329bf79277 FXRuby-1.6.13.tar.gz 1822456
+SHA256 5bb883b673a00426faa8f03d5c91423e996dc92eadaca73b75ff2d366c71318a FXRuby-1.6.13.tar.gz 1822456
diff --git a/dev-ruby/fxruby/fxruby-1.4.7-r1.ebuild b/dev-ruby/fxruby/fxruby-1.4.7-r1.ebuild
new file mode 100644
index 000000000000..c6d1320f379f
--- /dev/null
+++ b/dev-ruby/fxruby/fxruby-1.4.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fxruby/fxruby-1.4.7-r1.ebuild,v 1.1 2007/11/18 18:59:08 mabi Exp $
+
+RUBY_BUG_145222=yes
+inherit ruby
+
+MY_P="FXRuby-${PV}"
+
+DESCRIPTION="Ruby language binding to the FOX GUI toolkit"
+HOMEPAGE="http://www.fxruby.org/"
+SRC_URI="http://rubyforge.org/frs/download.php/13144/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.4"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="examples doc"
+
+DEPEND="=x11-libs/fox-1.4*
+	>=x11-libs/fxscintilla-1.62-r1"
+USE_RUBY="ruby16 ruby18 ruby19"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e 's:libs, "fxscintilla":libs, "fxscintilla-1.4":g' \
+		 ext/fox14/extconf.rb || die "sed error"
+	einfo "Avoid -O0 builds"
+	sed -i -e 's:-O0 -Iinclude:-Iinclude:g' \
+		ext/fox14/extconf.rb || die "Can't fix forced -O0"
+}
diff --git a/dev-ruby/fxruby/fxruby-1.6.13.ebuild b/dev-ruby/fxruby/fxruby-1.6.13.ebuild
new file mode 100644
index 000000000000..0ec6f3af5d9c
--- /dev/null
+++ b/dev-ruby/fxruby/fxruby-1.6.13.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fxruby/fxruby-1.6.13.ebuild,v 1.1 2007/11/18 18:59:08 mabi Exp $
+
+RUBY_BUG_145222=yes
+inherit ruby
+
+MY_P="FXRuby-${PV}"
+
+DESCRIPTION="Ruby language binding to the FOX GUI toolkit"
+HOMEPAGE="http://www.fxruby.org/"
+SRC_URI="http://rubyforge.org/frs/download.php/27718/${MY_P}.tar.gz"
+
+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"
+USE_RUBY="ruby16 ruby18 ruby19"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	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 -Iinclude:-Iinclude:g' \
+		ext/fox16/extconf.rb || die "Can't fix forced -O0"
+}