Add a patch to make it work with ruby19, from bug #127041

Package-Manager: portage-2.1_pre6-r5

5 files changed, 113 insertions, 13 deletions

diff --git a/dev-ruby/ruby-termios/ChangeLog b/dev-ruby/ruby-termios/ChangeLog
index 8a27e33452c0..2fe92968cb9a 100644
--- a/dev-ruby/ruby-termios/ChangeLog
+++ b/dev-ruby/ruby-termios/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby-termios
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ChangeLog,v 1.12 2006/03/20 12:23:05 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ChangeLog,v 1.13 2006/03/21 12:52:54 caleb Exp $
+
+  21 Mar 2006; Caleb Tennis <caleb@gentoo.org>
+  +files/ruby-termios-ruby19.patch, ruby-termios-0.9.4.ebuild:
+  Add a patch to make it work with ruby19, from bug #127041
 
   20 Mar 2006; Caleb Tennis <caleb@gentoo.org> ruby-termios-0.9.4.ebuild:
   change einstall to make DESTDIR=D install
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index cb6c6eb85936..016a4bf8dab2 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,12 +1,15 @@
-MD5 fa00d9a89c564269f87a719bf5441740 ChangeLog 1323
-RMD160 70a3945b5ab7962efbe908881ca8349c89d59c0f ChangeLog 1323
-SHA256 00f88f6d80b6f3fa4bf45c16a92f2da4ec8d02ce8a8626b4c6721dfcd8adbbc3 ChangeLog 1323
-MD5 b835ae2ddc7047ecf533402e3818351c files/digest-ruby-termios-0.9.4 250
-RMD160 23936c176e3769916658aa8362b25fd324c086b8 files/digest-ruby-termios-0.9.4 250
-SHA256 81d2603f14375080a1475b778b1d1c99a08a44a6c62dfbbda49f20de0bf91253 files/digest-ruby-termios-0.9.4 250
+MD5 e675be637e5e26af31fa983eccdc1c8c ChangeLog 1494
+RMD160 0ade45998844f40193cbd33dd68c8d8a4519c5a3 ChangeLog 1494
+SHA256 5e10587756a5d906f5089e0ecda37ed2d120eb2d084d9868899a2b84d5603bc0 ChangeLog 1494
+MD5 5b57ffd084a557e28da73416b8783d80 files/digest-ruby-termios-0.9.4 250
+RMD160 b1e70e9c260a473da6760a4849ccf424ee82eaa9 files/digest-ruby-termios-0.9.4 250
+SHA256 a2772723560e2958633978820286745946af1231e2037b7ef3959b40956283f8 files/digest-ruby-termios-0.9.4 250
+MD5 1e644390ce9a028076430bc7308800cb files/ruby-termios-ruby19.patch 2621
+RMD160 3fd5836ef56e8bffa1b28c00e01560a8eb1441eb files/ruby-termios-ruby19.patch 2621
+SHA256 58b8ba8c125e736cd9c1edc26070348d54b937b1f6dd961465a5dd941eee39f9 files/ruby-termios-ruby19.patch 2621
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata.xml 157
-MD5 0e20729aab1270e1c672cc0d771424ab ruby-termios-0.9.4.ebuild 724
-RMD160 a5b5780010cee905c3ad52e5bfc55fcc5e6880ee ruby-termios-0.9.4.ebuild 724
-SHA256 bcfe99729da1c360ad618800398256cac61464b08a680b27cc315cfff6e69f80 ruby-termios-0.9.4.ebuild 724
+MD5 54797d95a4d5c026c5e8300031b7687c ruby-termios-0.9.4.ebuild 808
+RMD160 77101908e24fff637f291c0d93ef2fe66c629963 ruby-termios-0.9.4.ebuild 808
+SHA256 54faab9ce7a55237f9c2e0b34954273016f79c4d8558a040532cb1d9dae9a6e1 ruby-termios-0.9.4.ebuild 808
diff --git a/dev-ruby/ruby-termios/files/digest-ruby-termios-0.9.4 b/dev-ruby/ruby-termios/files/digest-ruby-termios-0.9.4
index c6680338200b..5399f3cf209d 100644
--- a/dev-ruby/ruby-termios/files/digest-ruby-termios-0.9.4
+++ b/dev-ruby/ruby-termios/files/digest-ruby-termios-0.9.4
@@ -1,3 +1,3 @@
-MD5 41db1c72b11d1ac2a950b062922f2fde ruby-termios-0.9.4.tar.gz 8402
 RMD160 f9e48c0ed4bcd6b9a9a917b41efefcd2ae49e99c ruby-termios-0.9.4.tar.gz 8402
 SHA256 7348c8fa21d0c38e302047c7f69059b8a27c35c8a788f18626bfc96059ae978c ruby-termios-0.9.4.tar.gz 8402
+MD5 41db1c72b11d1ac2a950b062922f2fde ruby-termios-0.9.4.tar.gz 8402
diff --git a/dev-ruby/ruby-termios/files/ruby-termios-ruby19.patch b/dev-ruby/ruby-termios/files/ruby-termios-ruby19.patch
new file mode 100644
index 000000000000..97c631a986a6
--- /dev/null
+++ b/dev-ruby/ruby-termios/files/ruby-termios-ruby19.patch
@@ -0,0 +1,87 @@
+--- ruby-termios-0.9.4-/termios.c	2002-10-13 00:15:03.000000000 +0900
++++ ruby-termios-0.9.4/termios.c	2005-05-27 16:53:32.000000000 +0900
+@@ -12,6 +12,12 @@
+ #include <unistd.h>
+ #include <string.h>
+ 
++#ifdef GetReadFile
++#define GetFD(fptr) fileno(GetReadFile(fptr))
++#else
++#define GetFD(fptr) (fptr->fd)
++#endif
++
+ static VALUE mTermios;
+ static VALUE cTermios;
+ static VALUE tcsetattr_opt, tcflush_qs, tcflow_act;
+@@ -201,7 +207,7 @@
+ 
+     Check_Type(io, T_FILE);
+     GetOpenFile(io, fptr);
+-    if (tcgetattr(fileno(fptr->f), &t) < 0) {
++    if (tcgetattr(GetFD(fptr), &t) < 0) {
+ 	rb_raise(rb_eRuntimeError, 
+ 		 "can't get terminal parameters (%s)", strerror(errno));
+     }
+@@ -243,7 +249,7 @@
+     old = termios_tcgetattr(io);
+     GetOpenFile(io, fptr);
+     Termios_to_termios(param, &t);
+-    if (tcsetattr(fileno(fptr->f), tcsetattr_option, &t) < 0) {
++    if (tcsetattr(GetFD(fptr), tcsetattr_option, &t) < 0) {
+ 	rb_raise(rb_eRuntimeError,
+ 		 "can't set terminal parameters (%s)", strerror(errno));
+     }
+@@ -268,7 +274,7 @@
+     Check_Type(duration, T_FIXNUM);
+ 
+     GetOpenFile(io, fptr);
+-    if (tcsendbreak(fileno(fptr->f), FIX2INT(duration)) < 0) {
++    if (tcsendbreak(GetFD(fptr), FIX2INT(duration)) < 0) {
+ 	rb_raise(rb_eRuntimeError, 
+ 		 "can't transmits break (%s)", strerror(errno));
+     }
+@@ -292,7 +298,7 @@
+     Check_Type(io, T_FILE);
+ 
+     GetOpenFile(io, fptr);
+-    if (tcdrain(fileno(fptr->f)) < 0) {
++    if (tcdrain(GetFD(fptr)) < 0) {
+ 	rb_raise(rb_eRuntimeError, "can't drain (%s)", strerror(errno));
+     }
+ 
+@@ -322,7 +328,7 @@
+     }
+ 
+     GetOpenFile(io, fptr);
+-    if (tcflush(fileno(fptr->f), queue_selector) < 0) {
++    if (tcflush(GetFD(fptr), queue_selector) < 0) {
+ 	rb_raise(rb_eRuntimeError, "can't flush (%s)", strerror(errno));
+     }
+ 
+@@ -352,7 +358,7 @@
+     }
+ 
+     GetOpenFile(io, fptr);
+-    if (tcflow(fileno(fptr->f), action) < 0) {
++    if (tcflow(GetFD(fptr), action) < 0) {
+ 	rb_raise(rb_eRuntimeError, 
+ 		 "can't control transmitting data flow (%s)", strerror(errno));
+     }
+@@ -376,7 +382,7 @@
+ 
+     Check_Type(io,  T_FILE);
+     GetOpenFile(io, fptr);
+-    if ((pid = tcgetpgrp(fileno(fptr->f))) < 0) {
++    if ((pid = tcgetpgrp(GetFD(fptr))) < 0) {
+ 	rb_raise(rb_eRuntimeError, 
+ 		 "can't get process group id (%s)", strerror(errno));
+     }
+@@ -401,7 +407,7 @@
+     Check_Type(pgrpid, T_FIXNUM);
+ 
+     GetOpenFile(io, fptr);
+-    if (tcsetpgrp(fileno(fptr->f), FIX2INT(pgrpid)) < 0) {
++    if (tcsetpgrp(GetFD(fptr), FIX2INT(pgrpid)) < 0) {
+ 	rb_raise(rb_eRuntimeError, 
+ 		 "can't set process group id (%s)", strerror(errno));
+     }
diff --git a/dev-ruby/ruby-termios/ruby-termios-0.9.4.ebuild b/dev-ruby/ruby-termios/ruby-termios-0.9.4.ebuild
index 4e01c015e0d6..352f78d240fe 100644
--- a/dev-ruby/ruby-termios/ruby-termios-0.9.4.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-0.9.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ruby-termios-0.9.4.ebuild,v 1.13 2006/03/20 12:23:05 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ruby-termios-0.9.4.ebuild,v 1.14 2006/03/21 12:52:54 caleb Exp $
 
-inherit ruby
+inherit ruby eutils
 
 DESCRIPTION="A Ruby interface to termios"
 HOMEPAGE="http://arika.org/ruby/termios"	# trailing / isn't needed
@@ -14,6 +14,12 @@ IUSE=""
 USE_RUBY="ruby16 ruby18 ruby19"
 DEPEND="virtual/ruby"
 
+src_unpack()
+{
+	unpack ${A}
+	epatch ${FILESDIR}/ruby-termios-ruby19.patch
+}
+
 src_compile() {
 	ruby extconf.rb || die
 	emake || die