Add a patch to make QtRuby work with Ruby >= 1.8.4

(Portage version: 2.0.53)

7 files changed, 101 insertions, 13 deletions

diff --git a/kde-base/qtruby/ChangeLog b/kde-base/qtruby/ChangeLog
index b8d560ecd8f7..f4dde99eb85a 100644
--- a/kde-base/qtruby/ChangeLog
+++ b/kde-base/qtruby/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/qtruby
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/ChangeLog,v 1.23 2005/11/26 14:35:21 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/ChangeLog,v 1.24 2005/12/06 14:45:13 caleb Exp $
+
+*qtruby-3.5.0-r1 (06 Dec 2005)
+*qtruby-3.4.3-r1 (06 Dec 2005)
+
+  06 Dec 2005; Caleb Tennis <caleb@gentoo.org>
+  +files/qtruby-3-makeitwork.patch, +qtruby-3.4.3-r1.ebuild,
+  +qtruby-3.5.0-r1.ebuild:
+  Add a patch to make QtRuby work with Ruby >= 1.8.4
 
   25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> qtruby-3.4.3.ebuild:
   Stable on amd64, bug 112842.
diff --git a/kde-base/qtruby/Manifest b/kde-base/qtruby/Manifest
index 4f67d5150081..ca7cc3669760 100644
--- a/kde-base/qtruby/Manifest
+++ b/kde-base/qtruby/Manifest
@@ -1,16 +1,21 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 eecff78ef52887dc284d2e9317853e8f qtruby-3.4.1-r1.ebuild 968
-MD5 c28ece053df537180d8583889f3b11c1 qtruby-3.5.0.ebuild 919
-MD5 ef77385ae6fe6889038523a0288355a2 qtruby-3.4.2.ebuild 932
-MD5 4c8e03cb84200235b05bb5ce990bb968 ChangeLog 3605
-MD5 232364c209ee2e956686a5a606c56438 qtruby-3.4.3.ebuild 928
-MD5 baacbf2d0922839852335524bb6aeea0 qtruby-3.4.1.ebuild 926
-MD5 f779f6e536cce7bf41cb1d9c9299dc75 qtruby-3.3.2-r1.ebuild 964
-MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-qtruby-3.5.0 71
-MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 1466fa11c637924a69f2d7a63fbc1f65 ChangeLog 3803
 MD5 c4bcc944c1ceb822f4ecd9b288d77bef files/digest-qtruby-3.3.2-r1 71
 MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-qtruby-3.4.1 221
-MD5 f6bd746271de83bcbcacc04a445d590f files/digest-qtruby-3.4.3 71
-MD5 d859fab9468c7c54cc414ab700d5a16c files/qtruby-3.4.1-handlers.diff 379
 MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-qtruby-3.4.1-r1 221
 MD5 8b94700e5ddd1504207b279995e101c7 files/digest-qtruby-3.4.2 300
+MD5 f6bd746271de83bcbcacc04a445d590f files/digest-qtruby-3.4.3 71
+MD5 f6bd746271de83bcbcacc04a445d590f files/digest-qtruby-3.4.3-r1 71
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-qtruby-3.5.0 71
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-qtruby-3.5.0-r1 71
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 85134961f6a1013180317979668dcf06 files/qtruby-3-makeitwork.patch 392
+MD5 d859fab9468c7c54cc414ab700d5a16c files/qtruby-3.4.1-handlers.diff 379
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 f779f6e536cce7bf41cb1d9c9299dc75 qtruby-3.3.2-r1.ebuild 964
+MD5 eecff78ef52887dc284d2e9317853e8f qtruby-3.4.1-r1.ebuild 968
+MD5 baacbf2d0922839852335524bb6aeea0 qtruby-3.4.1.ebuild 926
+MD5 ef77385ae6fe6889038523a0288355a2 qtruby-3.4.2.ebuild 932
+MD5 47cbdb7c16eebd3ef287eeff72eb2277 qtruby-3.4.3-r1.ebuild 964
+MD5 232364c209ee2e956686a5a606c56438 qtruby-3.4.3.ebuild 928
+MD5 e0304012f45c0beadb5f759ba777f724 qtruby-3.5.0-r1.ebuild 955
+MD5 c28ece053df537180d8583889f3b11c1 qtruby-3.5.0.ebuild 919
diff --git a/kde-base/qtruby/files/digest-qtruby-3.4.3-r1 b/kde-base/qtruby/files/digest-qtruby-3.4.3-r1
new file mode 100644
index 000000000000..9c261e1b4588
--- /dev/null
+++ b/kde-base/qtruby/files/digest-qtruby-3.4.3-r1
@@ -0,0 +1 @@
+MD5 0fb123df324b4d007351c89051532dee kdebindings-3.4.3.tar.bz2 7184410
diff --git a/kde-base/qtruby/files/digest-qtruby-3.5.0-r1 b/kde-base/qtruby/files/digest-qtruby-3.5.0-r1
new file mode 100644
index 000000000000..c43095c4d375
--- /dev/null
+++ b/kde-base/qtruby/files/digest-qtruby-3.5.0-r1
@@ -0,0 +1 @@
+MD5 137924318ff5fc49cee3c82ee0ce5cf5 kdebindings-3.5.0.tar.bz2 5387839
diff --git a/kde-base/qtruby/files/qtruby-3-makeitwork.patch b/kde-base/qtruby/files/qtruby-3-makeitwork.patch
new file mode 100644
index 000000000000..4039671d88c8
--- /dev/null
+++ b/kde-base/qtruby/files/qtruby-3-makeitwork.patch
@@ -0,0 +1,13 @@
+--- qtruby/rubylib/qtruby/Qt.cpp	(revision 486006)
++++ qtruby/rubylib/qtruby/Qt.cpp	(revision 486016)
+@@ -1563,10 +1563,7 @@
+     }
+ 
+     VALUE result = rb_funcall2(qt_internal_module, rb_intern("try_initialize"), argc+1, temp_stack);
+-
+-    if (rb_respond_to(result, rb_intern("initialize")) != 0) {
+ 	rb_obj_call_init(result, argc, argv);
+-    }
+ 	
+ 	free(temp_stack);
+     return result;
diff --git a/kde-base/qtruby/qtruby-3.4.3-r1.ebuild b/kde-base/qtruby/qtruby-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..c285b180ef45
--- /dev/null
+++ b/kde-base/qtruby/qtruby-3.4.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-3.4.3-r1.ebuild,v 1.1 2005/12/06 14:45:13 caleb Exp $
+
+KMNAME=kdebindings
+KMCOPYLIB="libsmokeqt smoke/qt"
+KM_MAKEFILESREV=1
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta
+
+DESCRIPTION="Ruby bindings for QT"
+HOMEPAGE="http://developer.kde.org/language-bindings/ruby/"
+
+KEYWORDS="amd64 ~ppc sparc ~x86"
+IUSE=""
+DEPEND=" >=virtual/ruby-1.8
+$(deprange 3.4.2 $MAXKDEVER kde-base/smoke)"
+
+PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/qtruby-3-makeitwork.patch"
+
+# Because this installs into /usr/lib/ruby/..., it doesn't have SLOT=X.Y like the rest of KDE,
+# and it installs into /usr entirely.
+# Note that it still depends on a specific range of (slotted) smoke versions.
+SLOT="0"
+src_compile() {
+	kde_src_compile myconf
+	myconf="$myconf --prefix=/usr"
+	kde_src_compile configure make
+}
diff --git a/kde-base/qtruby/qtruby-3.5.0-r1.ebuild b/kde-base/qtruby/qtruby-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..db73e8022079
--- /dev/null
+++ b/kde-base/qtruby/qtruby-3.5.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-3.5.0-r1.ebuild,v 1.1 2005/12/06 14:45:13 caleb Exp $
+
+KMNAME=kdebindings
+KMCOPYLIB="libsmokeqt smoke/qt"
+KM_MAKEFILESREV=1
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta
+
+DESCRIPTION="Ruby bindings for QT"
+HOMEPAGE="http://developer.kde.org/language-bindings/ruby/"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=" >=virtual/ruby-1.8
+$(deprange $PV $MAXKDEVER kde-base/smoke)"
+
+PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/qtruby-3-makeitwork.patch"
+
+# Because this installs into /usr/lib/ruby/..., it doesn't have SLOT=X.Y like the rest of KDE,
+# and it installs into /usr entirely.
+# Note that it still depends on a specific range of (slotted) smoke versions.
+SLOT="0"
+src_compile() {
+	kde_src_compile myconf
+	myconf="$myconf --prefix=/usr"
+	kde_src_compile configure make
+}