Fix compilation when ncurses is compiled with USE=trace, fixing report in bug 344243.

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

4 files changed, 70 insertions, 6 deletions

diff --git a/dev-ruby/ncurses-ruby/ChangeLog b/dev-ruby/ncurses-ruby/ChangeLog
index 4c8836c30a2b..740c9813e9f0 100644
--- a/dev-ruby/ncurses-ruby/ChangeLog
+++ b/dev-ruby/ncurses-ruby/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/ncurses-ruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ncurses-ruby/ChangeLog,v 1.48 2010/11/05 14:04:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ncurses-ruby/ChangeLog,v 1.49 2010/11/08 21:06:04 graaff Exp $
+
+*ncurses-ruby-1.2.4-r2 (08 Nov 2010)
+
+  08 Nov 2010; Hans de Graaff <graaff@gentoo.org>
+  +ncurses-ruby-1.2.4-r2.ebuild, +files/ncurses-ruby-1.2.4-fix-trace.patch:
+  Fix compilation when ncurses is compiled with USE=trace, fixing report in
+  bug 344243.
+
 
   05 Nov 2010; Markos Chandras <hwoarang@gentoo.org>
   ncurses-ruby-1.2.4-r1.ebuild:
diff --git a/dev-ruby/ncurses-ruby/Manifest b/dev-ruby/ncurses-ruby/Manifest
index 510d40b6bbb0..e11b2772f358 100644
--- a/dev-ruby/ncurses-ruby/Manifest
+++ b/dev-ruby/ncurses-ruby/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX ncurses-ruby-1.2.4-fix-trace.patch 395 RMD160 5612c79ff5d36c04e4f6585de0b1e1323ba1915d SHA1 619a4b9cebbef86d2508b7c3b6d9dd9ab62371ba SHA256 50b1af1e0cb6c210c34db7100ca65ee99868b740d89cea8201d2b4110fa8bd72
 DIST ncurses-ruby-1.2.3.tar.bz2 50950 RMD160 daad8a5044238755c1e79fc2c327e7dfe219733e SHA1 156e6e663fc3ecae9b48da8e1227427e583c489a SHA256 a950623298bf83eaf0db72e6f4840bccd7ba7c4c0ff6d494950bc45d49cab3ea
 DIST ncurses-ruby-1.2.4.tar.bz2 50858 RMD160 8f08b6c919abdcd6c86fc9d08e293ca3e79ec010 SHA1 b34ff1cf1147ab551855a5b2c63d2a034119fee2 SHA256 9a60b523be8df0a2efba5381f8d21566043beb0b1530d6c7d53883ed6bc19058
 EBUILD ncurses-ruby-1.2.3.ebuild 548 RMD160 82b24e67f5fd451894f65c407d8e6a1af65c2712 SHA1 c78e4d151c5c1752fe9a400c9c48939df7bf8bd6 SHA256 105816762283ae1932997c424a37e5a27f4e45514158585a4a315171d523719c
 EBUILD ncurses-ruby-1.2.4-r1.ebuild 969 RMD160 7e489f058faecfbc048079d53a4b6a58bccf3e98 SHA1 75221e2b5cde08df8e266182ef5173e16b045868 SHA256 af74b0b9091e5053e48fd01994f6013038f3eeabc6cdd0370ce35054dff93de4
-MISC ChangeLog 6183 RMD160 8c4fea02160cd6435531cfb81b1a9b674dcd274c SHA1 3c7eb03d48c7544b71bdb52890984d34435ce236 SHA256 70dba9160efa9d8232bb99f4047378a7228adc9ba6725405da597444b4f329bc
+EBUILD ncurses-ruby-1.2.4-r2.ebuild 1022 RMD160 8a5cd5166509a1bebe78aed9ca1c01a6a0ed928e SHA1 79a874ef8833656c2c1d7e985ff395f0af47f176 SHA256 f02d882fe15e5415b972eddd30a95407db1c61a2ea8bd324f9caba96d166cb01
+MISC ChangeLog 6437 RMD160 25292a5932cecb892af5cb2b93bb0924787ee4d1 SHA1 a04c9e01f9823f2ba5bee951c0cd647c3d65c41a SHA256 48f572dc236d93659ed1b02414922857bd6a9353053963faac351e08ccd39a7d
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzUDvwACgkQ9/cejkQaxBAA7gCfeBIeALuGQTm6acWwnoRBSXNR
-luYAn3rUTN42ETfm/AKf2m5VZyGRp1lr
-=zwc0
+iF4EAREIAAYFAkzYZkEACgkQZihJkut28Ss+5QEAiyLMdjE3dPNHXct3eBzOZs7e
+iw2jwELKfN9wuYzbgfcBAKaGIPPgjEQyJ8ZOmo/G1chwd+JE/qGibrml87Elae5T
+=mXBE
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ncurses-ruby/files/ncurses-ruby-1.2.4-fix-trace.patch b/dev-ruby/ncurses-ruby/files/ncurses-ruby-1.2.4-fix-trace.patch
new file mode 100644
index 000000000000..630ddf5677a0
--- /dev/null
+++ b/dev-ruby/ncurses-ruby/files/ncurses-ruby-1.2.4-fix-trace.patch
@@ -0,0 +1,11 @@
+--- ncurses_wrap.c.~1~	2009-07-31 12:52:36.000000000 +0200
++++ ncurses_wrap.c	2010-11-08 21:56:35.600939119 +0100
+@@ -2394,7 +2394,7 @@
+         return Qnil;
+     }
+     _tracef("%s",
+-            STR2CSTR(funcall3(rb_mKernel, rb_intern("sprintf"), argc, argv)));
++            STR2CSTR(rb_funcall3(rb_mKernel, rb_intern("sprintf"), argc, argv)));
+     return Qnil;
+ }
+ #endif /* HAVE__TRACEF */
diff --git a/dev-ruby/ncurses-ruby/ncurses-ruby-1.2.4-r2.ebuild b/dev-ruby/ncurses-ruby/ncurses-ruby-1.2.4-r2.ebuild
new file mode 100644
index 000000000000..71226809df60
--- /dev/null
+++ b/dev-ruby/ncurses-ruby/ncurses-ruby-1.2.4-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ncurses-ruby/ncurses-ruby-1.2.4-r2.ebuild,v 1.1 2010/11/08 21:06:04 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changes README THANKS TODO"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby wrappers of ncurses and PDCurses libs"
+HOMEPAGE="http://ncurses-ruby.berlios.de/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+DEPEND=">=sys-libs/ncurses-5.3"
+RDEPEND="${DEPEND}"
+
+RUBY_PATCHES=( "${FILESDIR}"/${P}-fix-trace.patch )
+
+each_ruby_configure() {
+	${RUBY} extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake || die
+	mv ncurses_bin$(get_modname) lib/ || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die
+	fi
+}