Disable java-grade in install_libgrades

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

5 files changed, 182 insertions, 7 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/Manifest b/dev-lang/mercury-extras/Manifest
index 2833f94c9b8a..3fb9c176965f 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -10,15 +10,16 @@ AUX mercury-extras-0.13.1-posix.patch 354 RMD160 3d8b68c5efabda81ad117c6282f09b2
 AUX mercury-extras-10.04_beta1-curs.patch 10243 RMD160 0b1ece400baa1b754b0ad5b2669170b89f7da975 SHA1 9a90d957f27bbc0b0329859663ffdb919db9d2db SHA256 3aa05184dd72ae534bfb6fca6cbf60ff18f8da253dcb280c59ebc9b9ff844645
 AUX mercury-extras-10.04_beta1-dynamic-linking.patch 389 RMD160 a46c4805390c5d9914a952d96a0cb4867ba51378 SHA1 54a2c32f01372db644d756ddd47b1ff4c790c4ea SHA256 b4b170c62547ad91420f850c6307a3f594231be8893112915b17f016c636087c
 AUX mercury-extras-10.04_beta1-iodbc.patch 2417 RMD160 f33db752ff83805fc0f178f0b408d15b9c2aac0d SHA1 2b0cc49d3abc83e4e2c849d25f5cdbb2770b67a7 SHA256 6f0123261d319b651fef1d579c8795c585bebdf343a37f302052e84239b0f51d
-AUX mercury-extras-10.04_beta1-lex.patch 707 RMD160 cb83e70aaafc5a10bd34fdecd9d177256fee4a0d SHA1 a9d2e63e37186c2546b84e2a04aec0f0592f65cf SHA256 6912f8ebfb971dc38de6042d92c72911e9b616f0338082004778197e35ada01c
+AUX mercury-extras-10.04_beta1-lex.patch 727 RMD160 dca26bbb761ef47d32cff53974d423070843c88b SHA1 b6b257bb2b7567b4f7962f69962f7b97f408a35f SHA256 8696df633d10bbad085295de4046ff8a017eb63010308411b968a12cd1edfede
 AUX mercury-extras-10.04_beta1-mercury_glut.patch 766 RMD160 69452dd9f6a8d7753ef9ed5fe1e57c977e40e953 SHA1 e58972ddf1cefcef7bb853ecae6577be95856f5e SHA256 8daea7fd94f9794ce21d6fcbfce4a21344547df5e2b2493f29ae5d84c654ca4d
 AUX mercury-extras-10.04_beta1-mercury_opengl.patch 948 RMD160 892c2628ee455b5a4b8e575ae5aa9df0be12bf74 SHA1 cada8b1a5545ebce7d94a19f7e74fa9a10ae5944 SHA256 080334b5b7836ac718b35e81c47b1f036fc892a5a5a3f464aa4e045323aaf820
 AUX mercury-extras-10.04_beta1-mercury_tcltk.patch 1284 RMD160 c57463a3c95ced89dba5f87d68763ac794cc55c3 SHA1 e0bbecab38bdc4ab2e6ecec8b2c278dcc0eb05d5 SHA256 230c87edba9e6257abeec27abdf08beab4d88e53e41a3e2e2d303ad9aba0223f
+AUX mercury-extras-10.04_beta1-no-java-grade.patch 7158 RMD160 bb0d379884085ecc32efe60868255d4752f07937 SHA1 1b8b4168f1e2ae29606fa2682a6192792b9d407b SHA256 1d404490984bdd56aad366388c042bc9327b650b8343b70ebf21c486a3809b35
 AUX mercury-extras-10.04_beta1-odbc.patch 2107 RMD160 856ce0c442a77dcdbcca7f5cb833c8630da4e613 SHA1 e802d2b5e2fb67806a3d79ec8c00acda89e6ded3 SHA256 f6bb1b9e9ba799ebc68e278324af42108befd2285734d5f373022b2398ce3e15
 AUX mercury-extras-10.04_beta1-posix.patch 477 RMD160 dbe0a1f1d117a2a90a4aa588f9dea92e7a915fd1 SHA1 8fea62228a711694e869924fb20eae69b5177f70 SHA256 4ea5d325f6d36fee58ec87f1b2ea6d57959eb8dcc5693ab935a0486e12d47173
 DIST mercury-extras-0.13.1.tar.gz 688974 RMD160 d14aeeefe29a2bc6ae59d174043a18808e2a6875 SHA1 3871d523400e0c0ac0396918b6ba74a378269b15 SHA256 33580108aed30359facde24645b23d5ca559fe0c9c50f448199d3d7b751b7c4c
 DIST mercury-extras-10.04-beta.tar.gz 713626 RMD160 d4a4e04e6fef80af430006ad3d20e94d3fc82e61 SHA1 a9efcc59ffc0104d6ceb821daa1dfca08fb83e1a SHA256 34040ca9eb85acee4409a15d3e11d5a6b2ad12f9ef8cb41776754aaf49a8abcd
 EBUILD mercury-extras-0.13.1-r1.ebuild 3342 RMD160 9d7e9b6d40140fc59f5c7dfa25ebc091f7193ca8 SHA1 81ece0b057f2b72ae90c4f158d7ee19c3d6141c4 SHA256 d7088f207671007417e25319d31860883331b0243041d159a5da44fbc62c028b
-EBUILD mercury-extras-10.04_beta1.ebuild 3517 RMD160 55777452743fb978693481b447bee58f7de98068 SHA1 56cafbb89d709a9e2a1c9f83706b5a0e5c033c5e SHA256 f435b6853f808a8e3d003c4976f1ee17e68ef36f3d81901abdb30edf6dd2a055
-MISC ChangeLog 19061 RMD160 a773b04820452342673221712af84d0f973527ca SHA1 1548142fd529b8a968b6797e0b06291937cefa6d SHA256 387773d4e249563316baa98dc5d9b72d6339290eddd303190aa7da9bd03960c5
+EBUILD mercury-extras-10.04_beta1.ebuild 3564 RMD160 52cad5cc67e98fbbd7f4fba943f70598d816467a SHA1 019089411cbc73fa5ebc14fbb2975e18752806c9 SHA256 dda1b4340cf873f160c50b9b979bf9f5ba4dee138e23eb921d6445b9bfa1e861
+MISC ChangeLog 19275 RMD160 0e4daf255c74448d59552440f2876666f6edb834 SHA1 587a3d29eef0b86f3ae6835078d3f211b293f9ea SHA256 0f1927884daf00faa523e7ce25e9ae27cfe6cf2c8cc1935dec66c433dedbf900
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
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