Version bump

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 487 insertions, 1 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index 8b86e0a3a0ec..aa22b1f9c6fe 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/yap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.40 2010/09/12 06:43:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.41 2010/10/19 06:50:34 keri Exp $
+
+*yap-6.2.0 (19 Oct 2010)
+
+  19 Oct 2010; <keri@gentoo.org> +yap-6.2.0.ebuild,
+  +files/yap-6.2.0-chr-sublist.patch, +files/yap-6.2.0-ldflags.patch,
+  +files/yap-6.2.0-yapsharedir.patch:
+  Version bump
 
 *yap-6.0.6 (12 Sep 2010)
 
diff --git a/dev-lang/yap/files/yap-6.2.0-chr-sublist.patch b/dev-lang/yap/files/yap-6.2.0-chr-sublist.patch
new file mode 100644
index 000000000000..06582131ad28
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.2.0-chr-sublist.patch
@@ -0,0 +1,48 @@
+--- yap-6.orig/library/dialect/hprolog.yap	2010-10-18 21:48:20.000000000 +1300
++++ yap-6/library/dialect/hprolog.yap	2010-10-19 19:38:17.000000000 +1300
+@@ -38,7 +38,7 @@
+ 	    split_at/4,			% +N, +List, -FirstElements, -LastElements
+ 	    max_go_list/2,		% +List, -Max
+ 	    or_list/2,			% +ListOfInts, -BitwiseOr
+-	    sublist/2,			% ?Sublist, +List
++	    chr_sublist/2,			% ?Sublist, +List
+ 	    bounded_sublist/3,		% ?Sublist, +List, +Bound
+ 	    chr_delete/3,
+ 	    init_store/2,
+@@ -55,9 +55,9 @@
+ %	    lookup_ht1/4
+ 	  ]).
+ 
+-:- reexport('../lists',[sublist/2]).
++%:- reexport('../lists',[sublist/2]).
+ 
+-%:- use_module(library(lists)).
++:- use_module(library(lists)).
+ :- use_module(library(assoc)).
+ 
+ /** <module> hProlog compatibility library
+@@ -213,15 +213,15 @@
+ %
+ %	True if all elements of Sub appear in List in the same order.
+ 
+-%sublist(L, L).
+-%sublist(Sub, [H|T]) :-
+-%	'$sublist1'(T, H, Sub).
+-
+-%'$sublist1'(Sub, _, Sub).
+-%'$sublist1'([H|T], _, Sub) :-
+-%	'$sublist1'(T, H, Sub).
+-%'$sublist1'([H|T], X, [X|Sub]) :-
+-%	'$sublist1'(T, H, Sub).
++chr_sublist(L, L).
++chr_sublist(Sub, [H|T]) :-
++	'$sublist1'(T, H, Sub).
++
++'$sublist1'(Sub, _, Sub).
++'$sublist1'([H|T], _, Sub) :-
++	'$sublist1'(T, H, Sub).
++'$sublist1'([H|T], X, [X|Sub]) :-
++	'$sublist1'(T, H, Sub).
+ 
+ %%	bounded_sublist(?Sub, +List, +Bound:integer)
+ %
diff --git a/dev-lang/yap/files/yap-6.2.0-ldflags.patch b/dev-lang/yap/files/yap-6.2.0-ldflags.patch
new file mode 100644
index 000000000000..942e174d2d7b
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.2.0-ldflags.patch
@@ -0,0 +1,316 @@
+diff -ur yap-6.orig/library/matrix/Makefile.in yap-6/library/matrix/Makefile.in
+--- yap-6.orig/library/matrix/Makefile.in	2010-10-18 21:48:20.000000000 +1300
++++ yap-6/library/matrix/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -20,6 +20,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -47,10 +48,10 @@
+ 	$(CC) -c $(CFLAGS) $(srcdir)/matrix.c -o matrix.o
+ 
+ @DO_SECOND_LD@%.@SO@: %.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
+ 
+ @DO_SECOND_LD@matrix.@SO@: matrix.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o matrix.@SO@ matrix.o  @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o matrix.@SO@ matrix.o  @EXTRA_LIBS_FOR_DLLS@
+ 
+ install: all
+ 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
+diff -ur yap-6.orig/library/random/Makefile.in yap-6/library/random/Makefile.in
+--- yap-6.orig/library/random/Makefile.in	2010-10-18 21:48:20.000000000 +1300
++++ yap-6/library/random/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -20,6 +20,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -47,10 +48,10 @@
+ 	$(CC) -c $(CFLAGS) $(srcdir)/yap_random.c -o yap_random.o
+ 
+ @DO_SECOND_LD@%.@SO@: %.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+ 
+ @DO_SECOND_LD@yap_random.@SO@: yap_random.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@
+ 
+ install: all
+ 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
+diff -ur yap-6.orig/library/regex/Makefile.in yap-6/library/regex/Makefile.in
+--- yap-6.orig/library/regex/Makefile.in	2010-10-18 21:48:20.000000000 +1300
++++ yap-6/library/regex/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -20,6 +20,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -59,22 +60,22 @@
+ 	$(CC) -c $(CFLAGS) $(srcdir)/regexec.c -o regexec.o
+ 
+ @DO_SECOND_LD@%.@SO@: %.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
+ 
+ @DO_SECOND_LD@regexp.@SO@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o regexp.@SO@ regexp.o  @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o 
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regexp.@SO@ regexp.o  @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o 
+ 
+ @DO_SECOND_LD@regcomp.@SO@: regcomp.o @MERGE_DLL_OBJS@ regfree.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@
+ 
+ @DO_SECOND_LD@regerror.@SO@: regerror.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@
+ 
+ @DO_SECOND_LD@regfree.@SO@: regfree.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@
+ 
+ @DO_SECOND_LD@regexec.@SO@: regexec.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@
+ 
+ install: all
+ 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
+diff -ur yap-6.orig/library/rltree/Makefile.in yap-6/library/rltree/Makefile.in
+--- yap-6.orig/library/rltree/Makefile.in	2010-10-18 21:48:20.000000000 +1300
++++ yap-6/library/rltree/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -25,6 +25,7 @@
+ CC=@CC@
+ MPI_CC=mpicc
+ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -52,10 +53,10 @@
+ 	$(CC) -c $(CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o
+ 
+ @DO_SECOND_LD@%.@SO@: %.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+ 
+ @DO_SECOND_LD@yap_rl.@SO@: $(OBJS)
+-@DO_SECOND_LD@	@SHLIB_LD@  -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
+ 
+ install: all
+ 	@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi
+diff -ur yap-6.orig/library/system/Makefile.in yap-6/library/system/Makefile.in
+--- yap-6.orig/library/system/Makefile.in	2010-10-18 21:48:20.000000000 +1300
++++ yap-6/library/system/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -20,6 +20,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -47,10 +48,10 @@
+ 	$(CC) -c $(CFLAGS) $(srcdir)/sys.c -o sys.o
+ 
+ @DO_SECOND_LD@@DO_SECOND_LD@%.@SO@: %.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
+ 
+ @DO_SECOND_LD@sys.@SO@: sys.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@
+ 
+ install: all
+ 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
+diff -ur yap-6.orig/library/tries/Makefile.in yap-6/library/tries/Makefile.in
+--- yap-6.orig/library/tries/Makefile.in	2010-10-18 21:48:20.000000000 +1300
++++ yap-6/library/tries/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -20,6 +20,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -60,13 +61,13 @@
+ 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/itries.c -o itries.o
+ 
+ @DO_SECOND_LD@%.@SO@: %.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+ 
+ @DO_SECOND_LD@tries.@SO@: core_tries.o base_tries.o tries.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@
+ 
+ @DO_SECOND_LD@itries.@SO@: core_tries.o base_itries.o itries.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
+ 
+ install: all
+ 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
+diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in
+--- yap-6.orig/packages/PLStream/Makefile.in	2010-10-18 21:48:20.000000000 +1300
++++ yap-6/packages/PLStream/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -21,6 +21,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include  @CPPFLAGS@
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -77,10 +78,10 @@
+ 	$(CC) -c $(CFLAGS) $< -o $@
+ 
+ @DO_SECOND_LD@%.@SO@: %.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
+ 
+ @DO_SECOND_LD@libplstream.@SO@: $(OBJS)
+-@DO_SECOND_LD@	@SHLIB_LD@ -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
+ 
+ install: all
+ 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
+diff -ur yap-6.orig/packages/clib/Makefile.in yap-6/packages/clib/Makefile.in
+--- yap-6.orig/packages/clib/Makefile.in	2010-10-18 21:48:20.000000000 +1300
++++ yap-6/packages/clib/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -37,7 +37,7 @@
+ CRYPTLIBS=@CLIB_CRYPTLIBS@
+ 
+ LD=@DO_SECOND_LD@	@SHLIB_LD@
+-LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
++LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
+ 
+ BINTARGET=$(DESTDIR)$(YAPLIBDIR)
+ PLTARGET=$(DESTDIR)$(SHAREDIR)
+diff -ur yap-6.orig/packages/http/Makefile.in yap-6/packages/http/Makefile.in
+--- yap-6.orig/packages/http/Makefile.in	2010-10-18 21:48:21.000000000 +1300
++++ yap-6/packages/http/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -38,7 +38,7 @@
+ #
+ 
+ LD=@DO_SECOND_LD@	@SHLIB_LD@
+-LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
++LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
+ 
+ BINTARGET=$(DESTDIR)$(YAPLIBDIR)
+ PLTARGET=$(DESTDIR)$(SHAREDIR)/http
+diff -ur yap-6.orig/packages/jpl/Makefile.in yap-6/packages/jpl/Makefile.in
+--- yap-6.orig/packages/jpl/Makefile.in	2010-10-18 21:48:36.000000000 +1300
++++ yap-6/packages/jpl/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -34,6 +34,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@  @JAVAINCPATH@
++LDFLAGS=@LDFLAGS@
+ MKINDEX=true
+ BINTARGET=$(DESTDIR)$(YAPLIBDIR)
+ PLTARGET=$(DESTDIR)$(SHAREDIR)
+@@ -96,7 +97,7 @@
+ 
+ 
+ @DO_SECOND_LD@%.@SO@: %.o
+-		@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@
++		@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@
+ 		if [ -r libjpl.dylib ]; then \
+ 		  rm -f libjpl.jnilib && ln -s libjpl.dylib libjpl.jnilib ; \
+ 		fi
+diff -ur yap-6.orig/packages/semweb/Makefile.in yap-6/packages/semweb/Makefile.in
+--- yap-6.orig/packages/semweb/Makefile.in	2010-10-18 21:48:21.000000000 +1300
++++ yap-6/packages/semweb/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -47,7 +47,7 @@
+ #
+ 
+ LD=@DO_SECOND_LD@	@SHLIB_LD@
+-LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
++LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
+ 
+ BINTARGET=$(DESTDIR)$(YAPLIBDIR)
+ PLTARGET=$(DESTDIR)$(SHAREDIR)/semweb
+diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in
+--- yap-6.orig/packages/sgml/Makefile.in	2010-10-18 21:48:21.000000000 +1300
++++ yap-6/packages/sgml/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -30,6 +30,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
++LDFLAGS=@LDFLAGS@
+ MKINDEX=true
+ 
+ LD=$(CC)
+@@ -116,7 +117,7 @@
+ 	$(CC) $(CFLAGS)  -o $@ -c $<
+ 
+ @DO_SECOND_LD@sgml2pl.@SO@: $(PLOBJ)
+-@DO_SECOND_LD@	@SHLIB_LD@ -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
+ 
+ all:		$(TARGETS) $(PROGRAMS)
+ 
+diff -ur yap-6.orig/packages/swi-minisat2/C/Makefile.in yap-6/packages/swi-minisat2/C/Makefile.in
+--- yap-6.orig/packages/swi-minisat2/C/Makefile.in	2010-10-18 21:48:21.000000000 +1300
++++ yap-6/packages/swi-minisat2/C/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -22,6 +22,7 @@
+ CC=@CC@
+ CXX=@CXX@
+ CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include  @CPPFLAGS@
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -69,7 +70,7 @@
+ 	$(CXX) -c $(CXXFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o
+ 
+ @DO_SECOND_LD@pl-minisat.@SO@: $(OBJS)
+-@DO_SECOND_LD@	@SHLIB_CXX_LD@ -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@
++@DO_SECOND_LD@	@SHLIB_CXX_LD@ $(LDFLAGS) -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@
+ 
+ install: all
+ 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
+diff -ur yap-6.orig/packages/tai/Makefile.in yap-6/packages/tai/Makefile.in
+--- yap-6.orig/packages/tai/Makefile.in	2010-10-18 21:48:21.000000000 +1300
++++ yap-6/packages/tai/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -20,6 +20,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @SHLIB_CFLAGS@ -D_YAP_NOT_INSTALLED_=1 $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/../PLStream
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -48,7 +49,7 @@
+ 	$(CC) -c $(CFLAGS) $(srcdir)/pl-tai.c -o pl-tai.o
+ 
+ @DO_SECOND_LD@pl-tai.@SO@: pl-tai.o
+-@DO_SECOND_LD@	@SHLIB_LD@ -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@
++@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@
+ 
+ install: all
+ 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
+diff -ur yap-6.orig/packages/zlib/Makefile.in yap-6/packages/zlib/Makefile.in
+--- yap-6.orig/packages/zlib/Makefile.in	2010-10-18 21:48:21.000000000 +1300
++++ yap-6/packages/zlib/Makefile.in	2010-10-19 19:44:05.000000000 +1300
+@@ -45,7 +45,7 @@
+ #
+ 
+ LD=@DO_SECOND_LD@	@SHLIB_LD@
+-LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
++LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
+ 
+ BINTARGET=$(DESTDIR)$(YAPLIBDIR)
+ PLTARGET=$(DESTDIR)$(SHAREDIR)
diff --git a/dev-lang/yap/files/yap-6.2.0-yapsharedir.patch b/dev-lang/yap/files/yap-6.2.0-yapsharedir.patch
new file mode 100644
index 000000000000..59f15c54d39f
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.2.0-yapsharedir.patch
@@ -0,0 +1,14 @@
+--- yap-6.orig/pl/consult.yap	2010-10-18 21:48:21.000000000 +1300
++++ yap-6/pl/consult.yap	2010-10-19 19:40:31.000000000 +1300
+@@ -886,9 +886,9 @@
+ 	atom_concat([Path,File],PFile).
+ 
+ '$system_library_directories'(Dir) :-
+-	getenv('YAPSHAREDIR', Dir).
++	getenv('YAPSHAREDIR', Dir), !.
+ '$system_library_directories'(Dir) :-
+-	getenv('YAPCOMMONSDIR', Dir).
++	getenv('YAPCOMMONSDIR', Dir), !.
+ '$system_library_directories'(Dir) :-
+ 	get_value(system_library_directory,Dir).
+ '$system_library_directories'(Dir) :-
diff --git a/dev-lang/yap/yap-6.2.0.ebuild b/dev-lang/yap/yap-6.2.0.ebuild
new file mode 100644
index 000000000000..c0ed81d5ab18
--- /dev/null
+++ b/dev-lang/yap/yap-6.2.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0.ebuild,v 1.1 2010/10/19 06:50:34 keri Exp $
+
+inherit eutils java-pkg-opt-2
+
+DESCRIPTION="YAP is a high-performance Prolog compiler."
+HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/"
+SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz"
+
+LICENSE="Artistic LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc examples gmp java mpi mysql odbc readline static tk threads"
+
+DEPEND="sys-libs/zlib
+	gmp? ( dev-libs/gmp )
+	java? ( >=virtual/jdk-1.4 )
+	mpi? ( virtual/mpi )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	readline? ( sys-libs/readline )
+	doc? ( app-text/texi2html )"
+
+RDEPEND="${DEPEND}
+	tk? ( dev-lang/tk )"
+
+S="${WORKDIR}"/${PN}-6
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-yapsharedir.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-chr-sublist.patch
+}
+
+src_compile() {
+	local myddas_conf
+	if use mysql || use odbc; then
+		myddas_conf="--enable-myddas \
+				--enable-myddas-stats \
+				--enable-myddas-top-level"
+	else
+		myddas_conf="--disable-myddas"
+	fi
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable !static dynamic-loading) \
+		$(use_enable threads) \
+		$(use_enable threads pthread-locking) \
+		$(use_enable debug debug-yap) \
+		$(use_enable debug low-level-tracer) \
+		$(use_with gmp) \
+		$(use_with readline) \
+		$(use_with mpi) \
+		$(use_with mpi mpe) \
+		$(use_with java) \
+		${myddas_conf} \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+
+	if use doc ; then
+		emake html || die "emake html failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" -j1 install || die "make install failed."
+
+	if use tk ; then
+		exeinto /usr/bin
+		doexe misc/tkyap
+	fi
+
+	dodoc changes*.html README
+
+	if use doc ; then
+		dodoc yap.html
+	fi
+
+	if use examples ; then
+		docinto examples/chr
+		dodoc packages/chr/Examples/*.{chr,pl}
+		docinto examples/plunit
+		dodoc packages/plunit/examples/*.pl
+		if use java ; then
+			docinto examples/jpl/prolog
+			dodoc packages/jpl/examples/prolog/*.pl
+			docinto examples/jpl/java
+			dodoc packages/jpl/examples/java/*/*.java
+		fi
+		if use mpi ; then
+			docinto examples/mpi
+			dodoc library/mpi/examples/*.pl
+		fi
+	fi
+}