Remove unused file. Cleanup fakegem ebuild to actually work.

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

8 files changed, 29 insertions, 97 deletions

diff --git a/dev-ruby/gherkin/ChangeLog b/dev-ruby/gherkin/ChangeLog
index 239f07605a29..9f410af7a008 100644
--- a/dev-ruby/gherkin/ChangeLog
+++ b/dev-ruby/gherkin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/gherkin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.9 2010/07/21 08:00:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/ChangeLog,v 1.10 2010/08/21 21:56:36 flameeyes Exp $
+
+  21 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/gherkin-1.0.24-fix-specs.patch, gherkin-1.0.30.ebuild:
+  Remove unused file. Cleanup fakegem ebuild to actually work.
 
   21 Jul 2010; Hans de Graaff <graaff@gentoo.org> gherkin-1.0.30.ebuild:
   Add missing dependency on rake-compiler and fix rspec dependency according
diff --git a/dev-ruby/gherkin/files/gherkin-1.0.24-fix-specs.patch b/dev-ruby/gherkin/files/gherkin-1.0.24-fix-specs.patch
deleted file mode 100644
index 6c6cc65e9557..000000000000
--- a/dev-ruby/gherkin/files/gherkin-1.0.24-fix-specs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 20941d84343e6bf0c036fb2ae65a121e143ff334
-Author: aslakhellesoy <aslak.hellesoy@gmail.com>
-Date:   Sun May 9 00:36:59 2010 +0200
-
-    Remove require of removed file. (I never saw the error because the file was found in an old gherkin gem I had installed) Closes #59
-
-diff --git a/History.txt b/History.txt
-index 7bf86c9..3755af6 100644
---- a/History.txt
-+++ b/History.txt
-@@ -1,3 +1,8 @@
-+== 1.0.25 (2010-05-02)
-+
-+=== Bugfixes
-+* Can't run specs in gherkin 1.0.24 (#59 Aslak Hellesøy)
-+
- == 1.0.24 (2010-05-02)
- 
- === Bugfixes
-diff --git a/ragel/lexer.rb.rl.erb b/ragel/lexer.rb.rl.erb
-index e600b7a..a2d26cc 100644
---- a/ragel/lexer.rb.rl.erb
-+++ b/ragel/lexer.rb.rl.erb
-@@ -1,5 +1,3 @@
--require 'gherkin/core_ext/array'
--
- module Gherkin
-   module RbLexer
-     class <%= @i18n.underscored_iso_code.capitalize %> #:nodoc:
diff --git a/dev-ruby/gherkin/gherkin-1.0.30.ebuild b/dev-ruby/gherkin/gherkin-1.0.30.ebuild
index 26a44c83f307..c9c316c9c119 100644
--- a/dev-ruby/gherkin/gherkin-1.0.30.ebuild
+++ b/dev-ruby/gherkin/gherkin-1.0.30.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/gherkin/gherkin-1.0.30.ebuild,v 1.2 2010/07/21 08:00:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-1.0.30.ebuild,v 1.3 2010/08/21 21:56:36 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18"
@@ -23,13 +23,15 @@ IUSE=""
 
 DEPEND="${DEPEND} dev-util/ragel"
 
-ruby_add_bdepend ">=dev-ruby/rspec-1.3.0 >=dev-ruby/rake-compiler-0.7.0"
-ruby_add_bdepend "test? ( >=dev-util/cucumber-0.7.0 )"
+ruby_add_bdepend "
+	>=dev-ruby/rspec-1.3.0
+	>=dev-ruby/rake-compiler-0.7.0
+	test? ( >=dev-util/cucumber-0.7.0 )"
 
 ruby_add_rdepend ">=dev-ruby/trollop-1.16.2"
 
 each_ruby_compile() {
-	${RUBY} -I lib -S rake compile
+	${RUBY} -I lib -S rake compile || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/ruby-opengl/ChangeLog b/dev-ruby/ruby-opengl/ChangeLog
index 767d0ad0d7af..cfbb374ced5a 100644
--- a/dev-ruby/ruby-opengl/ChangeLog
+++ b/dev-ruby/ruby-opengl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/ruby-opengl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-opengl/ChangeLog,v 1.41 2010/08/01 09:59:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-opengl/ChangeLog,v 1.42 2010/08/21 21:52:42 flameeyes Exp $
+
+  21 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/ruby-opengl-0.32c-extconf-gentoo.diff,
+  -files/ruby-opengl-0.32c-font-gentoo.diff, ruby-opengl-0.60.1-r1.ebuild:
+  Remove unused file. Cleanup fakegem ebuild to actually work.
 
   01 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
   ruby-opengl-0.60.1-r1.ebuild:
diff --git a/dev-ruby/ruby-opengl/files/ruby-opengl-0.32c-extconf-gentoo.diff b/dev-ruby/ruby-opengl/files/ruby-opengl-0.32c-extconf-gentoo.diff
deleted file mode 100644
index ab8bf168b1f5..000000000000
--- a/dev-ruby/ruby-opengl/files/ruby-opengl-0.32c-extconf-gentoo.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- extconf.rb.orig	2003-08-17 12:04:32.000000000 +0900
-+++ extconf.rb	2004-01-31 18:22:35.000000000 +0900
-@@ -52,7 +52,7 @@
- 
- $objs = ["glu.o", "ogl.o", "rbogl.o"]
- #have_library("pthread", "pthread_create")
--if have_ogl_library(gl_libname) && have_ogl_library(glu_libname)
-+if have_ogl_library(gl_libname, "glBegin") && have_ogl_library(glu_libname, "gluLookAt")
-     create_makefile("opengl")
-     File.rename("Makefile", "Makefile.ogl")
-     modules = modules + "opengl.#{CONFIG['DLEXT']}" 
-@@ -63,7 +63,7 @@
- end
- 
- $objs = ["glut.o"]
--if have_library(glut_libname)
-+if have_library(glut_libname, "glutInit")
-     create_makefile("glut")
-     File.rename("Makefile", "Makefile.glut")
-     modules = "glut.#{CONFIG['DLEXT']} " + modules
diff --git a/dev-ruby/ruby-opengl/files/ruby-opengl-0.32c-font-gentoo.diff b/dev-ruby/ruby-opengl/files/ruby-opengl-0.32c-font-gentoo.diff
deleted file mode 100644
index b84af221ad17..000000000000
--- a/dev-ruby/ruby-opengl/files/ruby-opengl-0.32c-font-gentoo.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- glut.c	2000-01-06 17:37:43.000000000 +0100
-+++ glut.c	2003-06-29 19:45:40.000000000 +0200
-@@ -1457,6 +1457,28 @@
-     rb_define_const(mGLUT, "CURSOR_NONE", INT2NUM(GLUT_CURSOR_NONE));
-     rb_define_const(mGLUT, "CURSOR_FULL_CROSSHAIR", INT2NUM(GLUT_CURSOR_FULL_CROSSHAIR));
- 
-+#ifdef WIN32
-+    rb_define_const(mGLUT, "BITMAP_8_BY_13", INT2NUM(2));
-+    rb_define_const(mGLUT, "BITMAP_9_BY_15", INT2NUM(3));
-+    rb_define_const(mGLUT, "BITMAP_TIMES_ROMAN_10", INT2NUM(4));
-+    rb_define_const(mGLUT, "BITMAP_TIMES_ROMAN_24", INT2NUM(5));
-+#if (GLUT_API_VERSION >= 3)
-+    rb_define_const(mGLUT, "BITMAP_HELVETICA_10", INT2NUM(6));
-+    rb_define_const(mGLUT, "BITMAP_HELVETICA_12", INT2NUM(7));
-+    rb_define_const(mGLUT, "BITMAP_HELVETICA_18", INT2NUM(8));
-+#endif
-+#else /* non win32 */
-+    rb_define_const(mGLUT, "BITMAP_8_BY_13", INT2NUM((unsigned int)&glutBitmap8By13));
-+    rb_define_const(mGLUT, "BITMAP_9_BY_15", INT2NUM((unsigned int)&glutBitmap9By15));
-+    rb_define_const(mGLUT, "BITMAP_TIMES_ROMAN_10", INT2NUM((unsigned int)&glutBitmapTimesRoman10));
-+    rb_define_const(mGLUT, "BITMAP_TIMES_ROMAN_24", INT2NUM((unsigned int)&glutBitmapTimesRoman24));
-+#if (GLUT_API_VERSION >= 3)
-+    rb_define_const(mGLUT, "BITMAP_HELVETICA_10", INT2NUM((unsigned int)&glutBitmapHelvetica10));
-+    rb_define_const(mGLUT, "BITMAP_HELVETICA_12", INT2NUM((unsigned int)&glutBitmapHelvetica12));
-+    rb_define_const(mGLUT, "BITMAP_HELVETICA_18", INT2NUM((unsigned int)&glutBitmapHelvetica18));
-+#endif
-+#endif /* fonts */
-+    
-     callId = rb_intern("call");
- 
-     WINDOW_CALLBACK_DEFINE(DisplayFunc);
diff --git a/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r1.ebuild b/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r1.ebuild
index d9cd99a26693..c959aeec5456 100644
--- a/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r1.ebuild
+++ b/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-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-opengl/ruby-opengl-0.60.1-r1.ebuild,v 1.3 2010/08/01 09:59:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-opengl/ruby-opengl-0.60.1-r1.ebuild,v 1.4 2010/08/21 21:52:42 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ruby19"
@@ -21,15 +21,17 @@ KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86"
 
 IUSE=""
 
-DEPEND="
+DEPEND="${DEPEND}
+	virtual/opengl
+	virtual/glut"
+RDEPEND="${RDEPEND}
 	virtual/opengl
 	virtual/glut"
-RDEPEND="${DEPEND}"
 
 ruby_add_rdepend ">=dev-ruby/mkrf-0.2.3  >=dev-ruby/rake-0.7.3"
 
 each_ruby_compile() {
-	${RUBY} /usr/bin/rake
+	${RUBY} -S rake || die "rake failed"
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/ruby-sdl/Manifest b/dev-ruby/ruby-sdl/Manifest
index f26e2460515b..37311be9ce9f 100644
--- a/dev-ruby/ruby-sdl/Manifest
+++ b/dev-ruby/ruby-sdl/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX ruby-sdl-1.1.0-sdl-mixer.patch 284 RMD160 bc4422589a1ea672a6faa693b7388eb216dfb4ee SHA1 31cf65e2dec4f465d920dcc16c7074f8f827cd83 SHA256 d5e320617888e2fbdb8683be04631c8c3a1cddab79cc0991979c072ce811c04a
 DIST rubysdl-2.0.1b.tar.gz 420188 RMD160 dc03443782c90e78a063233a4cb4f174b189da66 SHA1 05eda50db56941f17a6714e969eaf82b95228a06 SHA256 8ee91675c8afb7270f6a268d9f4a4c445eedbcf84cbd3f3c7d2f02f56137c007
 DIST rubysdl-2.1.1.1.tar.gz 392850 RMD160 aa8ad842f5778a6674b09f046ab84ce89bbc6471 SHA1 50ac9eabaa3248461b8baf3894b911bd88c618d9 SHA256 93885c42bbbeb5e814f6fe0d18ca3471b3e654a65928c612f6abd6d164fccc00
 EBUILD ruby-sdl-2.0.1b.ebuild 1890 RMD160 318c63032f7f69bf0f9215b78b7ab99cc7754055 SHA1 429d19028b228b0e7315963d8d47121c578d25fe SHA256 62a15cdee3e42937ad94064c909b9b2e2cca19afa5baf78ecf1d33945a133f75
 EBUILD ruby-sdl-2.1.1.1.ebuild 2010 RMD160 35a1c5f7355514c5d8cab731065df95190611d4c SHA1 3baf3a8502c71a0054aedb6e948922a2be90d976 SHA256 8358af08323c6cee87054765819e17b93e77f28ad0162b78b7cdbeb76d64a8a4
-MISC ChangeLog 3727 RMD160 4897867880562ef0b5b7361644075e43c84753e2 SHA1 3c9aa2f26161387b95dc98280c23d4aec31a71e2 SHA256 c0f6eabff9477ff63a74457a32c23465ecee3fc772e33d195666b69453b80739
+MISC ChangeLog 3850 RMD160 19e6f0875fae976708ddf16be9d08b317ff022d1 SHA1 f7778a85d3300427cba5e270583ddd13ae135e59 SHA256 7ba44c543efb6351bcc794fe3c695275fefe07347b12aee8f74366f24ee66220
 MISC metadata.xml 381 RMD160 84121e456a7b20203d70979408e18c9fb6a7792e SHA1 8d4f02b2a7e01e2d419fa564678247936e768406 SHA256 0788b473577d08e11c117cc02290027628f93aee0c429b37c1f08ea02470f1ed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkw5g38ACgkQZihJkut28Sux+AD/QGeJqRac0pecAWU+xr21EFTX
-wQsekRxwUNTrCTtXbxMBAM3XTRI3N0B/Bbdwe7KA/TpVKEnGf5XRKoggl2xQcXJK
-=Gj8o
+iEYEARECAAYFAkxwTGAACgkQAiZjviIA2Xia6ACfV/3tNbHwic26oTLiK+9Yt7rW
+m5oAn2HyytvATUkdYQwMllmvk9SMttPE
+=Rcab
 -----END PGP SIGNATURE-----