Remove unused file. Cleanup fakegem ebuild to actually work.

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

4 files changed, 12 insertions, 56 deletions

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() {