Disable java-grade in install_libgrades

(Portage version: 2.1.7.16/cvs/Linux x86_64)

4 files changed, 178 insertions, 4 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 980e00af9743..2a93f0c7372f 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mercury-extras
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.70 2010/02/13 02:53:06 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.71 2010/02/20 08:08:23 keri Exp $
+
+  20 Feb 2010; <keri@gentoo.org> mercury-extras-10.04_beta1.ebuild,
+  files/mercury-extras-10.04_beta1-lex.patch,
+  +files/mercury-extras-10.04_beta1-no-java-grade.patch:
+  Disable java-grade in install_libgrades
 
 *mercury-extras-10.04_beta1 (13 Feb 2010)
 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-lex.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-lex.patch
index e37879fae401..1e831ab51687 100644
--- a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-lex.patch
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-lex.patch
@@ -20,6 +20,8 @@ diff -uN lex/Mmakefile lex/Mmakefile
 +
 +MAIN_TARGET = all
 +
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
 +.PHONEY: all depend install
 +
 +all: liblex libregex
@@ -27,5 +29,5 @@ diff -uN lex/Mmakefile lex/Mmakefile
 +depend: lex.depend regex.depend
 +
 +install:
-+	$(MMAKE) $(MMAKEFLAGS) liblex.install
-+	$(MMAKE) $(MMAKEFLAGS) libregex.install
++	$(MMAKE) liblex.install
++	$(MMAKE) libregex.install
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-no-java-grade.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-no-java-grade.patch
new file mode 100644
index 000000000000..c52630a51b44
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-no-java-grade.patch
@@ -0,0 +1,166 @@
+diff -ur mercury-extras-10.04-beta.orig/cgi/Mmakefile mercury-extras-10.04-beta/cgi/Mmakefile
+--- mercury-extras-10.04-beta.orig/cgi/Mmakefile	2004-07-30 19:01:07.000000000 +1200
++++ mercury-extras-10.04-beta/cgi/Mmakefile	2010-02-20 19:37:53.000000000 +1300
+@@ -12,6 +12,8 @@
+ 
+ MAIN_TARGET = $(LIBRARY)
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ MCFLAGS-mercury_www = --no-warn-nothing-exported
+ 
+ depend: mercury_www.depend
+diff -ur mercury-extras-10.04-beta.orig/complex_numbers/Mmakefile mercury-extras-10.04-beta/complex_numbers/Mmakefile
+--- mercury-extras-10.04-beta.orig/complex_numbers/Mmakefile	2003-01-16 23:44:11.000000000 +1300
++++ mercury-extras-10.04-beta/complex_numbers/Mmakefile	2010-02-20 19:41:36.000000000 +1300
+@@ -10,6 +10,8 @@
+ 
+ MAIN_TARGET = all
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ all:	libcomplex_numbers
+ 
+ depend:	complex_numbers.depend
+diff -ur mercury-extras-10.04-beta.orig/curs/Mmakefile mercury-extras-10.04-beta/curs/Mmakefile
+--- mercury-extras-10.04-beta.orig/curs/Mmakefile	2003-01-16 23:44:14.000000000 +1300
++++ mercury-extras-10.04-beta/curs/Mmakefile	2010-02-20 19:42:26.000000000 +1300
+@@ -26,7 +26,7 @@
+ # Omit this line if you want to install the default grades.
+ # Edit this line if you want to install with different grades.
+ #
+-#LIBGRADES = asm_fast.gc hlc.gc
++LIBGRADES := $(filter-out java,$(LIBGRADES))
+ 
+ # The following standard libraries must be linked against in any
+ # application using the curs library (i.e. MLLIBS must include
+diff -ur mercury-extras-10.04-beta.orig/curses/Mmakefile mercury-extras-10.04-beta/curses/Mmakefile
+--- mercury-extras-10.04-beta.orig/curses/Mmakefile	2003-01-16 23:44:15.000000000 +1300
++++ mercury-extras-10.04-beta/curses/Mmakefile	2010-02-20 19:43:04.000000000 +1300
+@@ -13,6 +13,8 @@
+ # this line to include the appropriate curses library for your OS. 
+ MLLIBS = -lncurses
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ -include ../Mmake.params
+ 
+ default_target:	libmcurses
+diff -ur mercury-extras-10.04-beta.orig/dynamic_linking/Mmakefile mercury-extras-10.04-beta/dynamic_linking/Mmakefile
+--- mercury-extras-10.04-beta.orig/dynamic_linking/Mmakefile	2005-01-25 20:49:05.000000000 +1300
++++ mercury-extras-10.04-beta/dynamic_linking/Mmakefile	2010-02-20 19:43:42.000000000 +1300
+@@ -17,6 +17,8 @@
+ CFLAGS = -g
+ MLFLAGS += --no-strip
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ -include ../Mmake.params
+ 
+ main_target: libdl
+diff -ur mercury-extras-10.04-beta.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04-beta/graphics/mercury_glut/Mmakefile
+--- mercury-extras-10.04-beta.orig/graphics/mercury_glut/Mmakefile	2006-03-30 14:52:44.000000000 +1200
++++ mercury-extras-10.04-beta/graphics/mercury_glut/Mmakefile	2010-02-20 19:44:06.000000000 +1300
+@@ -10,6 +10,8 @@
+ 
+ MAIN_TARGET = libmercury_glut
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ # The following libraries are for X on Linux (Debian) using Mesa.
+ 	
+ # Libaries required by X windows.
+diff -ur mercury-extras-10.04-beta.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04-beta/graphics/mercury_opengl/Mmakefile
+--- mercury-extras-10.04-beta.orig/graphics/mercury_opengl/Mmakefile	2007-10-11 19:21:31.000000000 +1300
++++ mercury-extras-10.04-beta/graphics/mercury_opengl/Mmakefile	2010-02-20 19:44:43.000000000 +1300
+@@ -15,6 +15,8 @@
+ 
+ MAIN_TARGET = libmercury_opengl
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ # Specify what libraries we need to link against for OpenGL on this system.
+ # (The following works on Debian with mesa as the OpenGL implementation).
+ GL_LIBS = -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXt -lICE -lXext -lSM
+diff -ur mercury-extras-10.04-beta.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04-beta/graphics/mercury_tcltk/Mmakefile
+--- mercury-extras-10.04-beta.orig/graphics/mercury_tcltk/Mmakefile	2005-08-15 16:11:42.000000000 +1200
++++ mercury-extras-10.04-beta/graphics/mercury_tcltk/Mmakefile	2010-02-20 19:44:24.000000000 +1300
+@@ -21,6 +21,8 @@
+ 
+ MAIN_TARGET = $(LIBRARY)
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ depend: mercury_tcltk.depend
+ 
+ install: libmercury_tcltk.install
+diff -ur mercury-extras-10.04-beta.orig/lazy_evaluation/Mmakefile mercury-extras-10.04-beta/lazy_evaluation/Mmakefile
+--- mercury-extras-10.04-beta.orig/lazy_evaluation/Mmakefile	2003-01-16 23:44:17.000000000 +1300
++++ mercury-extras-10.04-beta/lazy_evaluation/Mmakefile	2010-02-20 19:46:58.000000000 +1300
+@@ -4,6 +4,8 @@
+ # Public License - see the file COPYING.LIB in the Mercury distribution.
+ #-----------------------------------------------------------------------------#
+ INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ -include ../Mmake.params
+ default_target: all
+ depend: lazy_list.depend lazy_list_test.depend
+diff -ur mercury-extras-10.04-beta.orig/moose/Mmakefile mercury-extras-10.04-beta/moose/Mmakefile
+--- mercury-extras-10.04-beta.orig/moose/Mmakefile	2003-01-16 23:44:20.000000000 +1300
++++ mercury-extras-10.04-beta/moose/Mmakefile	2010-02-20 19:45:19.000000000 +1300
+@@ -6,6 +6,7 @@
+ 
+ # GRADE = asm_fast.gc.debug
+ # GRADE = asm_fast.gc.prof
++LIBGRADES := $(filter-out java,$(LIBGRADES))
+ 
+ # MCFLAGS = -O6
+ # MCFLAGS = --intermodule-optimization -O6
+diff -ur mercury-extras-10.04-beta.orig/odbc/Mmakefile mercury-extras-10.04-beta/odbc/Mmakefile
+--- mercury-extras-10.04-beta.orig/odbc/Mmakefile	2006-04-03 18:19:54.000000000 +1200
++++ mercury-extras-10.04-beta/odbc/Mmakefile	2010-02-20 19:49:20.000000000 +1300
+@@ -8,6 +8,7 @@
+ 
+ #-----------------------------------------------------------------------------#
+ # Configuration
++LIBGRADES := $(filter-out java,$(LIBGRADES))
+ 
+ # The driver manager.
+ # Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS.
+diff -ur mercury-extras-10.04-beta.orig/posix/Mmakefile mercury-extras-10.04-beta/posix/Mmakefile
+--- mercury-extras-10.04-beta.orig/posix/Mmakefile	2008-09-02 21:45:54.000000000 +1200
++++ mercury-extras-10.04-beta/posix/Mmakefile	2010-02-20 19:46:08.000000000 +1300
+@@ -8,6 +8,8 @@
+ 
+ -include ../Mmake.params
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ # The following is needed (on some systems) to enable declarations of
+ # Posix functions in standard C header files.
+ MGNUCFLAGS = --no-ansi
+diff -ur mercury-extras-10.04-beta.orig/quickcheck/Mmakefile mercury-extras-10.04-beta/quickcheck/Mmakefile
+--- mercury-extras-10.04-beta.orig/quickcheck/Mmakefile	2003-01-16 23:44:24.000000000 +1300
++++ mercury-extras-10.04-beta/quickcheck/Mmakefile	2010-02-20 19:47:12.000000000 +1300
+@@ -10,6 +10,8 @@
+ 
+ MAIN_TARGET = all
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ .PHONY: depend
+ depend:	qcheck.depend test_qcheck.depend
+ 
+diff -ur mercury-extras-10.04-beta.orig/xml/Mmakefile mercury-extras-10.04-beta/xml/Mmakefile
+--- mercury-extras-10.04-beta.orig/xml/Mmakefile	2002-03-06 23:10:31.000000000 +1300
++++ mercury-extras-10.04-beta/xml/Mmakefile	2010-02-20 19:46:26.000000000 +1300
+@@ -8,6 +8,8 @@
+ 
+ INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++
+ .PHONY: default_target
+ default_target: tryit libxml
+ 
diff --git a/dev-lang/mercury-extras/mercury-extras-10.04_beta1.ebuild b/dev-lang/mercury-extras/mercury-extras-10.04_beta1.ebuild
index 6fa52805d02b..c48431a81ba1 100644
--- a/dev-lang/mercury-extras/mercury-extras-10.04_beta1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-10.04_beta1.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-lang/mercury-extras/mercury-extras-10.04_beta1.ebuild,v 1.1 2010/02/13 02:53:06 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04_beta1.ebuild,v 1.2 2010/02/20 08:08:23 keri Exp $
 
 inherit eutils
 
@@ -41,6 +41,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-mercury_tcltk.patch
 	epatch "${FILESDIR}"/${P}-mercury_opengl.patch
 	epatch "${FILESDIR}"/${P}-posix.patch
+	epatch "${FILESDIR}"/${P}-no-java-grade.patch
 
 	if use odbc; then
 		epatch "${FILESDIR}"/${P}-odbc.patch