Do not compile solver_types java and erlang grades as there are no non-C bindings

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

3 files changed, 49 insertions, 31 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 7853fe5938b5..d2c8de847ffb 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.78 2010/10/22 23:54:39 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.79 2010/10/23 03:48:49 keri Exp $
+
+  23 Oct 2010; <keri@gentoo.org>
+  files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch:
+  Do not compile solver_types java and erlang grades as there are no non-C
+  bindings
 
 *mercury-extras-10.04.2-r1 (22 Oct 2010)
 
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 20ed1775ae25..d4fa5e818c57 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -34,7 +34,7 @@ AUX mercury-extras-10.04.2-lex.patch 748 RMD160 fae35bf63330d5c80b23beb0ee92c27b
 AUX mercury-extras-10.04.2-mercury-glut.patch 885 RMD160 7c74995bead12423fe1b04ef9749fd838db77f59 SHA1 d429cc6a5ba39d01742107e9d8849afda8d8e8cc SHA256 57510d25bf57e17bc8660e84924d9cb4a4254185d529901749eb4f5dce79c3f3
 AUX mercury-extras-10.04.2-mercury-opengl.patch 1071 RMD160 d1b731b895502ad74c4369b02f7762ac542c393f SHA1 5012b348d189e6fef872a1b81d6c8d656c8eb053 SHA256 cc9a6ebb7232fdbf06d10e6a6e53253ddde4f9e21cde0c17d2037c20975908f8
 AUX mercury-extras-10.04.2-mercury-tcltk.patch 1262 RMD160 398d17a8907649f0ae6e2691054a7581b3f9e8b3 SHA1 864f2ad1a80fa665dc0a27077a32ccb87e71ba05 SHA256 e7a8053295b42452e48607e5c6ee4f0025bc0a7f9032194269b7dca62592dd18
-AUX mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch 7676 RMD160 b3c9a08f56e59621eb9b544108000a8315cf0418 SHA1 fb3020eaa19624bbf89bf9932e5284b093af6776 SHA256 cd9da97249928ea7e37003e03fac3261a9873924aa56127f3e17ec28a59765c2
+AUX mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch 8206 RMD160 c92f19754bf898468117c97f7c8805dda74bcba7 SHA1 7103da160e1854808c868c952c0892b0072df3ea SHA256 19f8e5e67d4c4405a5aa227da2063227ad47655d04fd736e03ce6326ef12c0f7
 AUX mercury-extras-10.04.2-odbc.patch 2087 RMD160 c9b916db88e02be67ce22c36b4bd87049bd1d157 SHA1 f272162f8993ca89ee5bc2188236f06d52b4db1e SHA256 7b0ccfa970a1c7ab882e7ae263b7a145a2d2693546a579067192b8aee8d68fc3
 AUX mercury-extras-10.04.2-posix.patch 466 RMD160 3b56cff3a9152c60ebff88a9934bce390c944f7d SHA1 aafd8950fc32f6e07e6ba17e8877e993b988b490 SHA256 2bc9eac0212a51e599fd92a5ba389b9c624cac9a0d2b997cdf02da3f0a0a3202
 AUX mercury-extras-10.04_beta1-curs.patch 10243 RMD160 0b1ece400baa1b754b0ad5b2669170b89f7da975 SHA1 9a90d957f27bbc0b0329859663ffdb919db9d2db SHA256 3aa05184dd72ae534bfb6fca6cbf60ff18f8da253dcb280c59ebc9b9ff844645
@@ -59,5 +59,5 @@ EBUILD mercury-extras-10.04.2-r1.ebuild 4271 RMD160 d5a6e89773b423332973ae27996e
 EBUILD mercury-extras-10.04.2.ebuild 3634 RMD160 61c1b4d9c8f89f60e7213c92aba4decf009ce703 SHA1 6bb92238ca4a4e69d2903fd7499c2e753e489c32 SHA256 5f72df92f0a38f57a6d8b761564ef504d34ca7a1b4a650c596ca91611de69111
 EBUILD mercury-extras-10.04.ebuild 3475 RMD160 7906873f1ec69c7dea2c1a4778b3e4f9ac8ddad3 SHA1 cc3380aa62ce9ccef41b737ad501f24e455ef147 SHA256 fcaca1dfc38a744298187406cead871542497bc5b763b1224ca1aea70fa5370e
 EBUILD mercury-extras-10.04_beta1.ebuild 3576 RMD160 6d687a48da2a78941ad97f34e3288e6155631219 SHA1 25ec4f3e0bc890925f8a67cad515154da16c09c9 SHA256 21dcc45569830f642e4842d6d8dcfe1164c6c8cabefdc777feb3fe8d2aa08437
-MISC ChangeLog 21898 RMD160 8faa9ea290e8bf8d4e6c635b6fb3380b762faab9 SHA1 31497b1b84802e3852ec72a7baa3fa8e07b02799 SHA256 5be0a3280a5df4a04c7bc70c8729c29e83418222fa00bc944298e6e263b88576
+MISC ChangeLog 22086 RMD160 fb9f199ec9bbf8a80d89a4824148aeb1ecad79b6 SHA1 b64877a6b896ef9765ac3aaf3a0a306e14faee36 SHA256 02dc59b9a1a16423e40d05a51a3ced4a6f8bb72f3632e126ab1cab06ec8af6a5
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch
index 0065ceb8b043..bcae7a09b4ea 100644
--- a/dev-lang/mercury-extras/files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch
+++ b/dev-lang/mercury-extras/files/mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch
@@ -1,6 +1,6 @@
-diff -urN mercury-extras-10.04.2.orig/cgi/Mmakefile mercury-extras-10.04.1/cgi/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/cgi/Mmakefile mercury-extras-10.04.2/cgi/Mmakefile
 --- mercury-extras-10.04.2.orig/cgi/Mmakefile	2004-07-30 19:01:07.000000000 +1200
-+++ mercury-extras-10.04.2/cgi/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/cgi/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -12,6 +12,9 @@
  
  MAIN_TARGET = $(LIBRARY)
@@ -11,9 +11,9 @@ diff -urN mercury-extras-10.04.2.orig/cgi/Mmakefile mercury-extras-10.04.1/cgi/M
  MCFLAGS-mercury_www = --no-warn-nothing-exported
  
  depend: mercury_www.depend
-diff -urN mercury-extras-10.04.2.orig/complex_numbers/Mmakefile mercury-extras-10.04.1/complex_numbers/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/complex_numbers/Mmakefile mercury-extras-10.04.2/complex_numbers/Mmakefile
 --- mercury-extras-10.04.2.orig/complex_numbers/Mmakefile	2003-01-16 23:44:11.000000000 +1300
-+++ mercury-extras-10.04.2/complex_numbers/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/complex_numbers/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -10,6 +10,9 @@
  
  MAIN_TARGET = all
@@ -24,9 +24,9 @@ diff -urN mercury-extras-10.04.2.orig/complex_numbers/Mmakefile mercury-extras-1
  all:	libcomplex_numbers
  
  depend:	complex_numbers.depend
-diff -urN mercury-extras-10.04.2.orig/curs/Mmakefile mercury-extras-10.04.1/curs/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/curs/Mmakefile mercury-extras-10.04.2/curs/Mmakefile
 --- mercury-extras-10.04.2.orig/curs/Mmakefile	2003-01-16 23:44:14.000000000 +1300
-+++ mercury-extras-10.04.2/curs/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/curs/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -26,7 +26,8 @@
  # Omit this line if you want to install the default grades.
  # Edit this line if you want to install with different grades.
@@ -37,9 +37,9 @@ diff -urN mercury-extras-10.04.2.orig/curs/Mmakefile mercury-extras-10.04.1/curs
  
  # The following standard libraries must be linked against in any
  # application using the curs library (i.e. MLLIBS must include
-diff -urN mercury-extras-10.04.2.orig/curses/Mmakefile mercury-extras-10.04.1/curses/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/curses/Mmakefile mercury-extras-10.04.2/curses/Mmakefile
 --- mercury-extras-10.04.2.orig/curses/Mmakefile	2003-01-16 23:44:15.000000000 +1300
-+++ mercury-extras-10.04.2/curses/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/curses/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -13,6 +13,9 @@
  # this line to include the appropriate curses library for your OS. 
  MLLIBS = -lncurses
@@ -50,9 +50,9 @@ diff -urN mercury-extras-10.04.2.orig/curses/Mmakefile mercury-extras-10.04.1/cu
  -include ../Mmake.params
  
  default_target:	libmcurses
-diff -urN mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile mercury-extras-10.04.1/dynamic_linking/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile mercury-extras-10.04.2/dynamic_linking/Mmakefile
 --- mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile	2005-01-25 20:49:05.000000000 +1300
-+++ mercury-extras-10.04.2/dynamic_linking/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/dynamic_linking/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -17,6 +17,9 @@
  CFLAGS = -g
  MLFLAGS += --no-strip
@@ -63,9 +63,9 @@ diff -urN mercury-extras-10.04.2.orig/dynamic_linking/Mmakefile mercury-extras-1
  -include ../Mmake.params
  
  main_target: libdl
-diff -urN mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04.1/graphics/mercury_glut/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04.2/graphics/mercury_glut/Mmakefile
 --- mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile	2006-03-30 14:52:44.000000000 +1200
-+++ mercury-extras-10.04.2/graphics/mercury_glut/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/graphics/mercury_glut/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -10,6 +10,9 @@
  
  MAIN_TARGET = libmercury_glut
@@ -76,9 +76,9 @@ diff -urN mercury-extras-10.04.2.orig/graphics/mercury_glut/Mmakefile mercury-ex
  # The following libraries are for X on Linux (Debian) using Mesa.
  	
  # Libaries required by X windows.
-diff -urN mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04.1/graphics/mercury_opengl/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04.2/graphics/mercury_opengl/Mmakefile
 --- mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile	2007-10-11 19:21:31.000000000 +1300
-+++ mercury-extras-10.04.2/graphics/mercury_opengl/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/graphics/mercury_opengl/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -15,6 +15,9 @@
  
  MAIN_TARGET = libmercury_opengl
@@ -89,9 +89,9 @@ diff -urN mercury-extras-10.04.2.orig/graphics/mercury_opengl/Mmakefile mercury-
  # 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 -urN mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04.1/graphics/mercury_tcltk/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04.2/graphics/mercury_tcltk/Mmakefile
 --- mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile	2005-08-15 16:11:42.000000000 +1200
-+++ mercury-extras-10.04.2/graphics/mercury_tcltk/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/graphics/mercury_tcltk/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -21,6 +21,9 @@
  
  MAIN_TARGET = $(LIBRARY)
@@ -102,9 +102,9 @@ diff -urN mercury-extras-10.04.2.orig/graphics/mercury_tcltk/Mmakefile mercury-e
  depend: mercury_tcltk.depend
  
  install: libmercury_tcltk.install
-diff -urN mercury-extras-10.04.2.orig/lazy_evaluation/Mmakefile mercury-extras-10.04.1/lazy_evaluation/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/lazy_evaluation/Mmakefile mercury-extras-10.04.2/lazy_evaluation/Mmakefile
 --- mercury-extras-10.04.2.orig/lazy_evaluation/Mmakefile	2003-01-16 23:44:17.000000000 +1300
-+++ mercury-extras-10.04.2/lazy_evaluation/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/lazy_evaluation/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -4,6 +4,9 @@
  # Public License - see the file COPYING.LIB in the Mercury distribution.
  #-----------------------------------------------------------------------------#
@@ -115,9 +115,9 @@ diff -urN mercury-extras-10.04.2.orig/lazy_evaluation/Mmakefile mercury-extras-1
  -include ../Mmake.params
  default_target: all
  depend: lazy_list.depend lazy_list_test.depend
-diff -urN mercury-extras-10.04.2.orig/moose/Mmakefile mercury-extras-10.04.1/moose/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/moose/Mmakefile mercury-extras-10.04.2/moose/Mmakefile
 --- mercury-extras-10.04.2.orig/moose/Mmakefile	2003-01-16 23:44:20.000000000 +1300
-+++ mercury-extras-10.04.2/moose/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/moose/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -6,6 +6,8 @@
  
  # GRADE = asm_fast.gc.debug
@@ -127,9 +127,9 @@ diff -urN mercury-extras-10.04.2.orig/moose/Mmakefile mercury-extras-10.04.1/moo
  
  # MCFLAGS = -O6
  # MCFLAGS = --intermodule-optimization -O6
-diff -urN mercury-extras-10.04.2.orig/odbc/Mmakefile mercury-extras-10.04.1/odbc/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/odbc/Mmakefile mercury-extras-10.04.2/odbc/Mmakefile
 --- mercury-extras-10.04.2.orig/odbc/Mmakefile	2006-04-03 18:19:54.000000000 +1200
-+++ mercury-extras-10.04.2/odbc/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/odbc/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -8,6 +8,8 @@
  
  #-----------------------------------------------------------------------------#
@@ -139,9 +139,9 @@ diff -urN mercury-extras-10.04.2.orig/odbc/Mmakefile mercury-extras-10.04.1/odbc
  
  # The driver manager.
  # Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS.
-diff -urN mercury-extras-10.04.2.orig/posix/Mmakefile mercury-extras-10.04.1/posix/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/posix/Mmakefile mercury-extras-10.04.2/posix/Mmakefile
 --- mercury-extras-10.04.2.orig/posix/Mmakefile	2008-09-02 21:45:54.000000000 +1200
-+++ mercury-extras-10.04.2/posix/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/posix/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -8,6 +8,9 @@
  
  -include ../Mmake.params
@@ -152,9 +152,9 @@ diff -urN mercury-extras-10.04.2.orig/posix/Mmakefile mercury-extras-10.04.1/pos
  # The following is needed (on some systems) to enable declarations of
  # Posix functions in standard C header files.
  MGNUCFLAGS = --no-ansi
-diff -urN mercury-extras-10.04.2.orig/quickcheck/Mmakefile mercury-extras-10.04.1/quickcheck/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/quickcheck/Mmakefile mercury-extras-10.04.2/quickcheck/Mmakefile
 --- mercury-extras-10.04.2.orig/quickcheck/Mmakefile	2003-01-16 23:44:24.000000000 +1300
-+++ mercury-extras-10.04.2/quickcheck/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/quickcheck/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -10,6 +10,9 @@
  
  MAIN_TARGET = all
@@ -165,9 +165,22 @@ diff -urN mercury-extras-10.04.2.orig/quickcheck/Mmakefile mercury-extras-10.04.
  .PHONY: depend
  depend:	qcheck.depend test_qcheck.depend
  
-diff -urN mercury-extras-10.04.2.orig/xml/Mmakefile mercury-extras-10.04.1/xml/Mmakefile
+diff -ur mercury-extras-10.04.2.orig/solver_types/library/Mmakefile mercury-extras-10.04.2/solver_types/library/Mmakefile
+--- mercury-extras-10.04.2.orig/solver_types/library/Mmakefile	2006-09-18 13:36:36.000000000 +1200
++++ mercury-extras-10.04.2/solver_types/library/Mmakefile	2010-10-23 15:39:10.000000000 +1300
+@@ -16,6 +16,9 @@
+ 
+ install: libany.install
+ 
++LIBGRADES := $(filter-out java,$(LIBGRADES))
++LIBGRADES := $(filter-out erlang,$(LIBGRADES))
++
+ MCFLAGS-any= --no-warn-nothing-exported --no-warn-interface-imports
+ 
+ .PHONY: check
+diff -ur mercury-extras-10.04.2.orig/xml/Mmakefile mercury-extras-10.04.2/xml/Mmakefile
 --- mercury-extras-10.04.2.orig/xml/Mmakefile	2002-03-06 23:10:31.000000000 +1300
-+++ mercury-extras-10.04.2/xml/Mmakefile	2010-09-06 19:41:29.000000000 +1200
++++ mercury-extras-10.04.2/xml/Mmakefile	2010-10-23 15:38:16.000000000 +1300
 @@ -8,6 +8,9 @@
  
  INSTALL_PREFIX := $(INSTALL_PREFIX)/extras