Add the same patch added to qtruby by Caleb, as Korundum seems to build and link against its own copy of qtruby.

Package-Manager: portage-2.0.53

5 files changed, 46 insertions, 13 deletions

diff --git a/kde-base/korundum/ChangeLog b/kde-base/korundum/ChangeLog
index 0287d0202ed1..0b86d291e210 100644
--- a/kde-base/korundum/ChangeLog
+++ b/kde-base/korundum/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/korundum
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/ChangeLog,v 1.23 2005/11/26 14:35:18 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/ChangeLog,v 1.24 2005/12/07 19:02:53 flameeyes Exp $
+
+*korundum-3.5.0-r1 (07 Dec 2005)
+
+  07 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/qtruby-3-makeitwork.patch, -korundum-3.5.0.ebuild,
+  +korundum-3.5.0-r1.ebuild:
+  Add the same patch added to qtruby by Caleb, as Korundum seems to build and
+  link against its own copy of qtruby.
 
   25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> korundum-3.4.3.ebuild:
   Stable on amd64, bug 112842.
diff --git a/kde-base/korundum/Manifest b/kde-base/korundum/Manifest
index 22fc2137d2c9..5c7c70bc008c 100644
--- a/kde-base/korundum/Manifest
+++ b/kde-base/korundum/Manifest
@@ -1,13 +1,24 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 26dfb401d21daed9a758520b974a7111 ChangeLog 3942
+MD5 c4bcc944c1ceb822f4ecd9b288d77bef files/digest-korundum-3.3.2-r1 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-korundum-3.4.1 221
+MD5 8b94700e5ddd1504207b279995e101c7 files/digest-korundum-3.4.2 300
+MD5 f6bd746271de83bcbcacc04a445d590f files/digest-korundum-3.4.3 71
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-korundum-3.5.0-r1 71
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 85134961f6a1013180317979668dcf06 files/qtruby-3-makeitwork.patch 392
+MD5 eb15c0d4539fdbe6a7c7b6bd10820f7a korundum-3.3.2-r1.ebuild 1086
 MD5 3d3324748c4a3ed4495e9ad9d765a81a korundum-3.4.1.ebuild 1101
-MD5 c34e416c6b3950d65c678e9d2ffdd8c1 ChangeLog 3645
 MD5 8d4896027e14644e52a9743af9a123e4 korundum-3.4.2.ebuild 1107
-MD5 0f80055560009e66e82e814c52a84a6d korundum-3.5.0.ebuild 1094
-MD5 eb15c0d4539fdbe6a7c7b6bd10820f7a korundum-3.3.2-r1.ebuild 1086
 MD5 e67edef7145a54fbf514de48407904ec korundum-3.4.3.ebuild 1103
-MD5 8b94700e5ddd1504207b279995e101c7 files/digest-korundum-3.4.2 300
-MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
-MD5 f6bd746271de83bcbcacc04a445d590f files/digest-korundum-3.4.3 71
-MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-korundum-3.5.0 71
-MD5 c4bcc944c1ceb822f4ecd9b288d77bef files/digest-korundum-3.3.2-r1 71
-MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-korundum-3.4.1 221
+MD5 020b60ab3bf732748c2f621a6a320e81 korundum-3.5.0-r1.ebuild 1137
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDlzHyAiZjviIA2XgRAuz1AJ0fka5tyVlMw9ypuj6x7ZXgMiEWpACg8bgP
+kS/w3hMlr4/gccqL3SH77b0=
+=joYd
+-----END PGP SIGNATURE-----
diff --git a/kde-base/korundum/files/digest-korundum-3.5.0 b/kde-base/korundum/files/digest-korundum-3.5.0-r1
index c43095c4d375..c43095c4d375 100644
--- a/kde-base/korundum/files/digest-korundum-3.5.0
+++ b/kde-base/korundum/files/digest-korundum-3.5.0-r1
diff --git a/kde-base/korundum/files/qtruby-3-makeitwork.patch b/kde-base/korundum/files/qtruby-3-makeitwork.patch
new file mode 100644
index 000000000000..4039671d88c8
--- /dev/null
+++ b/kde-base/korundum/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/korundum/korundum-3.5.0.ebuild b/kde-base/korundum/korundum-3.5.0-r1.ebuild
index 1522b135984c..95e4e72f4869 100644
--- a/kde-base/korundum/korundum-3.5.0.ebuild
+++ b/kde-base/korundum/korundum-3.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-3.5.0-r1.ebuild,v 1.1 2005/12/07 19:02:53 flameeyes Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt libsmokekde smoke/kde"
@@ -20,7 +20,8 @@ DEPEND=" >=virtual/ruby-1.8
 $(deprange $PV $MAXKDEVER kde-base/qtruby)
 $(deprange $PV $MAXKDEVER kde-base/smoke)"
 
-PATCHES="$FILESDIR/no-gtk-glib-check.diff"
+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.