Remove unused file. Remove examples USE flag, always install them (uncompressed), and die on tests' failure.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 19 insertions, 100 deletions

diff --git a/dev-ruby/ruby-termios/ChangeLog b/dev-ruby/ruby-termios/ChangeLog
index 149744e796df..928a9dd40939 100644
--- a/dev-ruby/ruby-termios/ChangeLog
+++ b/dev-ruby/ruby-termios/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/ruby-termios
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ChangeLog,v 1.24 2010/07/05 19:00:11 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ChangeLog,v 1.25 2010/08/21 20:53:22 flameeyes Exp $
+
+  21 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/ruby-termios-ruby19.patch, ruby-termios-0.9.6-r1.ebuild:
+  Remove unused file. Remove examples USE flag, always install them
+  (uncompressed), and die on tests' failure.
 
 *ruby-termios-0.9.6-r1 (05 Jul 2010)
 
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index 6f5d49a04d67..4e9cf1e04ffe 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX ruby-termios-ruby19.patch 2621 RMD160 3fd5836ef56e8bffa1b28c00e01560a8eb1441eb SHA1 13f7aaa683943c6c847a6c21f1f99256f4e4a7a3 SHA256 58b8ba8c125e736cd9c1edc26070348d54b937b1f6dd961465a5dd941eee39f9
 DIST ruby-termios-0.9.6.tar.gz 14077 RMD160 98f87c59532e158a03ebe6df73a35ecb39df567b SHA1 9c6289bcd3c85477969c635c326839f6525ca4f8 SHA256 c838419d4265ce78be0efdfda6d525d81c231450805ec61c861394929f90181c
-EBUILD ruby-termios-0.9.6-r1.ebuild 918 RMD160 b9f3692b274cff24f832893beadf2d4597220b82 SHA1 4e9246f76c6a53140f1ecd6c3aa1a28fd92080f4 SHA256 a9cc8ff6e51ec221e0c0dabf62c8038c1c8fd86552ab7206b0925ea1dab7bc61
+EBUILD ruby-termios-0.9.6-r1.ebuild 946 RMD160 2dc05fa4f31f4fcb2af9797ebf173e91bb4625c2 SHA1 3d02c32a3d3966ca2d3557296c3936aa01ce4627 SHA256 3e186c78e53c05f5136a522115ec86040eb3feda348118721ae77a87e5a7ce20
 EBUILD ruby-termios-0.9.6.ebuild 809 RMD160 603d3c3f8ffe89e5adf1cb059eee37097f622fdc SHA1 451bf65f841dce8d6233a9c2531f36352bbb6360 SHA256 2fdaa38bf2a76a878951589f64d53f5d56b8baf305f99c723c06ae6e457db484
-MISC ChangeLog 2815 RMD160 b99754a0e46ebcbb8663900bdcedd78210a24b76 SHA1 0bf408d9253b70d89c734d8bd813f5b5853e16c2 SHA256 9bc151662e5237ff810dc563f017580945732e0437626bd70fa0919c322ae0a5
+MISC ChangeLog 3054 RMD160 64003de9776de9a75f31efa05d7980fd22842e4c SHA1 bbc3ede72da43d8265d433f3b1663e2f2a81f0b4 SHA256 d8bb183eb5a66bed9abd3511470d36f987c01626a861f8f1c527aca5aeb41724
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkwyK8EACgkQZihJkut28Sv0+AEAt78mMUmtvXi3hcrpseW0KVGi
-jwmhYlPclIHl37eHDqwA/RVD4umg4hbgketBvQUVvE5MDddU3qP+iZtCT7L/3M6x
-=sL0P
+iEYEARECAAYFAkxwPNYACgkQAiZjviIA2Xi8qgCfY97T2f2x/pa8hvj+YxhEr++d
+xD8AnjO5wIviNZSEmx9+/JZ9yaIb8hHF
+=R4ur
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ruby-termios/files/ruby-termios-ruby19.patch b/dev-ruby/ruby-termios/files/ruby-termios-ruby19.patch
deleted file mode 100644
index 97c631a986a6..000000000000
--- a/dev-ruby/ruby-termios/files/ruby-termios-ruby19.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- 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.6-r1.ebuild b/dev-ruby/ruby-termios/ruby-termios-0.9.6-r1.ebuild
index 7d6a53ed1ee9..d59b33736e88 100644
--- a/dev-ruby/ruby-termios/ruby-termios-0.9.6-r1.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-0.9.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.6-r1.ebuild,v 1.1 2010/07/05 19:00:11 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-termios/ruby-termios-0.9.6-r1.ebuild,v 1.2 2010/08/21 20:53:22 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18"
@@ -13,7 +13,7 @@ SRC_URI="http://github.com/arika/ruby-termios/tarball/version_0_9_6 -> ${P}.tar.
 LICENSE="Ruby"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="examples"
+IUSE=""
 
 S="${WORKDIR}/arika-${PN}-94fd9ac"
 
@@ -26,7 +26,7 @@ each_ruby_compile() {
 }
 
 each_ruby_test() {
-	${RUBY} test/test0.rb
+	${RUBY} test/test0.rb || die "tests failed"
 }
 
 each_ruby_install() {
@@ -35,5 +35,7 @@ each_ruby_install() {
 
 all_ruby_install() {
 	dodoc ChangeLog README termios.rd
-	use examples && docinto examples && dodoc examples/*
+
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/* || die
 }