Revision bump adds patch to fix signals in ruby20 spotted by Stefano Crocco <stefano.crocco@alice.it>, bug #532120.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

5 files changed, 126 insertions, 6 deletions

diff --git a/kde-base/qtruby/ChangeLog b/kde-base/qtruby/ChangeLog
index 85700743ec9c..044870820502 100644
--- a/kde-base/qtruby/ChangeLog
+++ b/kde-base/qtruby/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/qtruby
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/ChangeLog,v 1.227 2014/12/11 15:45:08 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/ChangeLog,v 1.228 2015/01/18 20:55:04 johu Exp $
+
+*qtruby-4.14.3-r2 (18 Jan 2015)
+
+  18 Jan 2015; Johannes Huber <johu@gentoo.org>
+  +files/qtruby-4.14.3-ruby20.patch, +qtruby-4.14.3-r2.ebuild,
+  qtruby-4.14.3.ebuild:
+  Revision bump adds patch to fix signals in ruby20 spotted by Stefano Crocco
+  <stefano.crocco@alice.it>, bug #532120.
 
   11 Dec 2014; Manuel Rüger <mrueg@gentoo.org> -qtruby-4.14.2.ebuild:
   Remove KDE SC 4.14.2
diff --git a/kde-base/qtruby/Manifest b/kde-base/qtruby/Manifest
index b551866b6d26..010a50d8f2da 100644
--- a/kde-base/qtruby/Manifest
+++ b/kde-base/qtruby/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX qtruby-4.14.3-ruby20.patch 646 SHA256 22b8acb1e6435ae9cfc8e7f8ed9ddd813189b9017a7c83b8cbe80b0427c76810 SHA512 a227da5be2a6dbaabb2c9ab8991067483662c01993a4ce14c0fdc681d06660b179d6727f02fe9042f556cf488182841357de97e0e904ee7ff9fcd88350bc5cdf WHIRLPOOL fbb7c42283d95c91aeea74e13d1c658a14e02b4ddc361d4db30e1333cd7eaea6dda4f3e333021c6c1a73a646c4a22ca0e4bd9663956c50bed196f50d3f4bf62a
 DIST qtruby-4.12.5.tar.xz 529572 SHA256 07e97cc5ba717a71d59a38cbbb80802c9ad9efeddcd9b8d16724ba81f9a4ae2c SHA512 8e4aaa57807748ecb764e3d6576e9ad3cc54d5108864748e7d5c0512036a74bab772c042b1b6b660877b2097e58b086f5bb22eddd337f525414466bce2866d61 WHIRLPOOL 6373327382564f998385495c8f2fb0e38f1113ff4a06adc8d3cdf3e29bdc6cc2b20bfbaf8f7c44bc548a1d92af6be4edcc3607b617aaca031e0da9e2cd14f310
 DIST qtruby-4.14.3.tar.xz 529568 SHA256 2050e79b5e116eefef97d9b2dc96b3be635621bcbf856a8009b56dc40f953c9d SHA512 fbca49e91703233c4caab994d98e5244bd27328af76a227745e453aeb554f6a47e55cab6fb994d48d24c063d1d3a9f3c0c35486edb2604df5d090031bf3146de WHIRLPOOL c6c5676b3f3848e540afe7659598522a0bda69b100ce6ba225b5bea72f622fb33ad7be1350e6399fc5f110af6b1bf49956f505c0236baedfcf5b54b628873921
 EBUILD qtruby-4.12.5.ebuild 1756 SHA256 4e8a7d015f4060217bea36f31df621d9c3cacb12ee258efaf64fec93f09f8ccb SHA512 afc33063154e579c9e53f415fad7058310c6277c389e92457c587cb7ea614a9a9be891174fbfc588fcce55a7ae89f36bcb47bc3b4a350157c65999dd68656c40 WHIRLPOOL 5f380b18b337e0ece79984cac17b4aefec03753b0d0f54c0998b8e1612b2dcace5be65e5411e005f2b64047933941b0274cb81e72f0eeb5ed7f5ae35a4a1cff4
 EBUILD qtruby-4.14.3-r1.ebuild 1771 SHA256 05c367120a46cf559bd4c16eabe30dd9961189c74b402004b3e3f5c9d92b3a6d SHA512 cfcd99709fe40da718efc9116a5b006179b155e1773d498cc0a9c7fb0718324279d200dcf1aac5054e401d1003ba7dc7c11555d95423fba3d81833833ae976a8 WHIRLPOOL af8524ca3521f681fec49eacd77354e5dc7e26227b908314828a58a06fa2bab2de032e728102a23aa271c4ac98fd189becded8a79dcbf1af3ddcbe2ac78a77ef
-EBUILD qtruby-4.14.3.ebuild 1769 SHA256 ad9850f2d75b2def039e8bb7f6d1598971b9353f4103a31293301a108a4c395d SHA512 910791111e6c928c7f3303e28ec670b686d6a89120ece5e965fc9dd5543c4c1807f633376f8297d0019bb16be03ccb45c7174b8ea2baea363762fd47b793aa8d WHIRLPOOL 99011bbda806833e97da69cc6a0d15d2f4d9a39da6ff1d3ebdab1f32f318affef5790a332c2523aae18dd77a7ed1ab694e563452531d2c449374225fd8b7cb5b
-MISC ChangeLog 16058 SHA256 76290a5d620b1e920438a0468dbf50339c62e176a3793236f737b68d1edd2221 SHA512 e5cb2e1a55bccbd84f3efc8e93cfa109ec16b0ae91d79067923f2de2a866f9709c4ad4e03fbd35766ef83d5d189496d0238f18f88301994550bba6e780aed32c WHIRLPOOL 2649337c8f0828efc9cbcf2e05d1f42140d6f9968946c966cac0a6455b93c23f4f8493b15bd7736021ab03085e87b404d2ad8187ad04fddf15b11a63b2b48ad2
+EBUILD qtruby-4.14.3-r2.ebuild 1814 SHA256 a31992fd2d19957d2377873857fb705798e99367c2bf8d6736fff4fd8eab1932 SHA512 4676597db54d815ff35c5ad3f8c5ce886425fffb79b5988092d05934c9a959fcc5f2d3304a58a5dc9048dc1bb0f910b8a979dba597bc7d4c03f3085b62d0dd31 WHIRLPOOL 9610f0663c596f492318d901469ebc71d0923b29b7238e2a642805edf80697b709b591116aa6077680692028b60d691e790b3ae959635b13c63ad162ff16950d
+EBUILD qtruby-4.14.3.ebuild 1766 SHA256 da5b3f6264b0b7d63b9a941660b768e332a6a31a49bcff44902b8b1ce2ac4e63 SHA512 45032dcfd569902028ec6b5abc885849bff122de0312cd5494dac12e636c65e5e24fc7bcc2e1f556f8315ec55f8876fbac3f2517e34cc04db9943d9618adf9ad WHIRLPOOL 0d2feb7a17a6c4af0702ac57c76bd26b1780cac2181231d1909f0a233697b17fbbc5b4a79db36ad3832ef665292e16449d538dd253ed9818c7e668d32d9bc54e
+MISC ChangeLog 16346 SHA256 e92f0b79e15740f82d050a2bc6410ec0202f64953eab0b900398ebe0ecaf7458 SHA512 c6a964395c63ab0db58b65f86a24761ff24fa9048adcf8d1637dfd074d82089aa5614aaae8a4ff95d2d1bb06e9b3eb54e163abbff7006ba61adbfe9f273c4a2a WHIRLPOOL 84a32e68da094296743dd980bac25ec1fed195b39cdb62dfc2051b519dbd6cc19c19823d72d8837e7ab8cd38b3d79843d2d5268bd9df1659c95432311c8ae315
 MISC metadata.xml 546 SHA256 c8cdec1fa85109bb1ab97224b2ee9f7ea880009a1ef303bb1494de78f07d135e SHA512 5159a1cd03dd2fa5c83d740ade6f26b6a525081078d895b6fe4fb324d51944b4d33e822fb82fa11281c537823d898d06e685c45473394b70fe5159d516ada4aa WHIRLPOOL fe7a9e9c78ea13f4af24958f38d287139903a3bd192338166a271f0ae4462517aad237571c80f08da65e7178bcc1797801af876797742a4e631acd17e5a678f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUvB2tAAoJEGVpnaTzz9K9Cc4QAKckJ9dLkTr+OuGaLZKmIVFM
+r3jlsfzqQTP4C5Ha8B406oMV6reN4bygjsjbs+4uLmzp/LgXdk+DMMiQ0P4iWAXX
+INEFBykyOWfKsCVrylIt9PlL05n64IL+7OW+8+Vyj6sQ/1PD/VkTXg53NQSMAyes
+fbbZCpxKgkbsi/BxUkb2dQrlIc1QS3EH9ighYuePB9ZZdvMRI6hcsWGoXcmWlrcr
+KvUvkGhTxxQmuDF38uHsIuB80vlhyFijOXTmpn8V50EoUWQOlevKlg+n/gNMVBEf
+CjeH05u9uMDs03BlVrm1bshzfIKnE7q/wWmy1EG05JQFm67QWqOTSSchS3zN8r69
+6tiDRXuuQBSF1LtR5r8IZcTerd638wITVADcxerd8ng9a83mI0EBtasHBdTXfDHo
+lIpNUw5+Qhl2D0gKfWG9Cl9S2dbLyi4LZKmJ7aUpzit8VuD9+cks4yldm64TSX/w
+pa9iJdvzQXOD7fD7dXR4qnrh8KikBn/mEvIAc5pzt+rgkiCEVti7pU3nSGtgBp7V
+0KVQuM32pfYiIwbBZMZ/Rf/E50lFmrfUqZP5aFv4ubGUzWskGFoqZoSmvPpqkncb
+oAl5ermhvyf5d+dHCZc4eP4KVBoSar/9HTSVd5GgC44EOxvPrQ5IkmWoXBHrRBIz
+w5rSNaXh249JOFtgdS+t
+=XaTP
+-----END PGP SIGNATURE-----
diff --git a/kde-base/qtruby/files/qtruby-4.14.3-ruby20.patch b/kde-base/qtruby/files/qtruby-4.14.3-ruby20.patch
new file mode 100644
index 000000000000..abc41438e2b9
--- /dev/null
+++ b/kde-base/qtruby/files/qtruby-4.14.3-ruby20.patch
@@ -0,0 +1,18 @@
+--- qtruby-4.11.4.orig/src/qtruby.cpp	2013-06-28 19:16:12.057325696 +0200
++++ qtruby-4.11.4/src/qtruby.cpp	2014-01-07 19:22:11.000000000 +0100
+@@ -1398,11 +1391,14 @@
+ 		return Qfalse;
+ 	}
+ 
+-#if RUBY_VERSION >= 0x10900
++#if RUBY_VERSION >= 0x20000
++	QLatin1String signalname(rb_id2name(rb_frame_this_func()));
++#elif RUBY_VERSION >= 0x10900
+ 	QLatin1String signalname(rb_id2name(rb_frame_callee()));
+ #else
+ 	QLatin1String signalname(rb_id2name(rb_frame_last_func()));
+ #endif
++
+ 	VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 2, Qnil, self);
+ 
+ 	smokeruby_object *ometa = value_obj_info(metaObject_value);
diff --git a/kde-base/qtruby/qtruby-4.14.3-r2.ebuild b/kde-base/qtruby/qtruby-4.14.3-r2.ebuild
new file mode 100644
index 000000000000..b11c5676086c
--- /dev/null
+++ b/kde-base/qtruby/qtruby-4.14.3-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-4.14.3-r2.ebuild,v 1.1 2015/01/18 20:55:04 johu Exp $
+
+EAPI=5
+
+OPENGL_REQUIRED="always"
+DECLARATIVE_REQUIRED="optional"
+KDE_REQUIRED="never"
+USE_RUBY="ruby20"
+# Only one ruby version is supported:
+# 1) cmake bails when configuring twice or more - solved with CMAKE_IN_SOURCE_BUILD=1
+# 2) the ebuild can only be installed for one ruby variant, otherwise the compiled
+#    files with identical path+name will overwrite each other - difficult :(
+
+inherit kde4-base ruby-ng
+
+DESCRIPTION="Qt Ruby bindings"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug phonon qscintilla qwt webkit"
+HOMEPAGE="http://techbase.kde.org/Development/Languages/Ruby"
+
+DEPEND="
+	$(add_kdebase_dep smokeqt 'declarative?,opengl,phonon?,qscintilla?,qwt?,webkit?')
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-ruby20.patch" )
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+	kde4-base_pkg_setup
+}
+
+src_unpack() {
+	local S="${WORKDIR}/${P}"
+	kde4-base_src_unpack
+
+	cd "${WORKDIR}"
+	mkdir all
+	mv ${P} all/ || die "Could not move sources"
+}
+
+all_ruby_prepare() {
+	kde4-base_src_prepare
+}
+
+each_ruby_configure() {
+	local CMAKE_USE_DIR=${S}
+	local mycmakeargs=(
+		-DRUBY_LIBRARY=$(ruby_get_libruby)
+		-DRUBY_INCLUDE_PATH=$(ruby_get_hdrdir)
+		-DRUBY_EXECUTABLE=${RUBY}
+		$(cmake-utils_use_disable declarative QtDeclarative)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with qscintilla QScintilla)
+		$(cmake-utils_use_with qwt Qwt5)
+		$(cmake-utils_use_disable webkit QtWebKit)
+	)
+	kde4-base_src_configure
+}
+
+each_ruby_compile() {
+	local CMAKE_USE_DIR=${S}
+	kde4-base_src_compile
+}
+
+each_ruby_install() {
+	local CMAKE_USE_DIR=${S}
+	kde4-base_src_install
+}
diff --git a/kde-base/qtruby/qtruby-4.14.3.ebuild b/kde-base/qtruby/qtruby-4.14.3.ebuild
index 6849c017ece3..b2bb0fab48a5 100644
--- a/kde-base/qtruby/qtruby-4.14.3.ebuild
+++ b/kde-base/qtruby/qtruby-4.14.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-4.14.3.ebuild,v 1.2 2014/12/11 13:05:54 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-4.14.3.ebuild,v 1.3 2015/01/18 20:55:04 johu Exp $
 
 EAPI=5