Version bump

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

9 files changed, 556 insertions, 2 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index af755ec439bc..8b86e0a3a0ec 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,14 @@
 # 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.39 2010/09/12 02:31:41 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.40 2010/09/12 06:43:40 keri Exp $
+
+*yap-6.0.6 (12 Sep 2010)
+
+  12 Sep 2010; <keri@gentoo.org> +yap-6.0.6.ebuild,
+  +files/yap-6.0.6-DESTDIR.patch, +files/yap-6.0.6-chr-sublist.patch,
+  +files/yap-6.0.6-itries.patch, +files/yap-6.0.6-ldflags.patch,
+  +files/yap-6.0.6-runpath.patch, +files/yap-6.0.6-yapsharedir.patch:
+  Version bump
 
 *yap-6.0.5-r1 (12 Sep 2010)
 
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 67a819df6ae0..2d8ea686c6d0 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -30,12 +30,19 @@ AUX yap-6.0.5-JAVALIBPATH.patch 1261 RMD160 ad4adf0ea06aec59fe7f752beb5b66823326
 AUX yap-6.0.5-chr-sublist.patch 1343 RMD160 3c10944127f1121d91b9117fa98831d68c4ed355 SHA1 3782420b45427189ae949b1788657764a695666d SHA256 ccbc8d574f9d71f3f625b244a3024dc72527858fba555ec311e4adce6a57bc5d
 AUX yap-6.0.5-ldflags.patch 10792 RMD160 53458d2995621a5d0da66f0889db32d3e9eddc81 SHA1 d3a7954dc0d9178cadc12663175a110bd60bcd0b SHA256 fca0eb619260fc0214b5672d22ba2a55cc366089a27894b908bc7a9567575f7e
 AUX yap-6.0.5-yapsharedir.patch 512 RMD160 fa77614a699b8ec7f766baf84a847393552e2159 SHA1 9cc44f3fa7a717bd263323194f541b4431c067a3 SHA256 15388a3a25bd62ec79afcb8cef0ca39f3ebe461e4358d31c9b75d7d09d39658d
+AUX yap-6.0.6-DESTDIR.patch 881 RMD160 0b2343b96ecdb896481123645575919bc07f28b2 SHA1 7ef26e6b6146da4ce0184333a2a4546822eb14c1 SHA256 29d49482abb83fe5defc64c87ed96d5c02301719804d71e4c0a822c21fb7d772
+AUX yap-6.0.6-chr-sublist.patch 1343 RMD160 3c10944127f1121d91b9117fa98831d68c4ed355 SHA1 3782420b45427189ae949b1788657764a695666d SHA256 ccbc8d574f9d71f3f625b244a3024dc72527858fba555ec311e4adce6a57bc5d
+AUX yap-6.0.6-itries.patch 412 RMD160 e6bd04129231fe2addefa0f3ae4ec9fcd7a70ea0 SHA1 774af8c06b6b1402f3e03bb06baab1526b96fcd9 SHA256 09192672bcd65ef56db430b41c6a287b49ad13111c8f6e1d6176392fd27191c2
+AUX yap-6.0.6-ldflags.patch 12983 RMD160 ce8de8e9e92452cd69f2f20f259d7afbb1ffd2f0 SHA1 8cd0014110301126b4461b422ff58a519ffc3862 SHA256 fe44792b9acf4b90f5550ea99e24a5f5ec41462e5d5c30d7876b4e0df2d85127
+AUX yap-6.0.6-runpath.patch 1366 RMD160 edd0076d1838d0d0986d09208a46804af36b86e9 SHA1 854474b7f0daf91e9368838c7f1d36eb968f5af7 SHA256 35f18f7f5cdf287f25332e722c3463eb75c8081711cd0ab61c4dd3f98838c216
+AUX yap-6.0.6-yapsharedir.patch 512 RMD160 fa77614a699b8ec7f766baf84a847393552e2159 SHA1 9cc44f3fa7a717bd263323194f541b4431c067a3 SHA256 15388a3a25bd62ec79afcb8cef0ca39f3ebe461e4358d31c9b75d7d09d39658d
 DIST Yap-5.1.3.tar.gz 3266063 RMD160 b2e1153c7a6853a4814a672992d2b8b3834796bc SHA1 76c84b32ad8fbe8324a1db370f8440be11398c34 SHA256 61a5827452f21a7077e2b51b530a7f1b91bfcef06b28d62df53c29d986032aa9
 DIST yap-6.0.1.tar.gz 3816766 RMD160 cf113bbe1b8658530b464d40759b0a6320719142 SHA1 97eedc5ce82e87c48ae7c04d7c3364503528fa3d SHA256 91c95702ccb08ce13d9e34aa7d95eacafedb9c628482e91a4f003475036845b9
 DIST yap-6.0.2.tar.gz 3818019 RMD160 31df9a3377f4c9aa43b930ad912b397bf67e0d6c SHA1 0f1f5470466f7e32e25019941e394efaee746814 SHA256 5e05d4b7b9bb5d10943b7df46a4da619855cfb9a5e2bf9c771902a87f1129c58
 DIST yap-6.0.3.tar.gz 3890926 RMD160 f24a386ff57589796c7d912f336ca79872967b03 SHA1 85b2be539657da3b5ea2f41ae9df80c7f9604a5e SHA256 f3445b9343ebfcc58175738d69e54029b13b89eef31ac94dc6a23e923e4394a5
 DIST yap-6.0.4.tar.gz 3783868 RMD160 dbda49255d85abc1a3495e073fa2734e582b9de3 SHA1 4910061d282695e1c2175542648f0075d8c09497 SHA256 c45ddc9201b1284cd371b509c9eff1637b686c65b887737f755a2938bee31836
 DIST yap-6.0.5.tar.gz 3744819 RMD160 b35264a7911c73d095426fb3790a104d41d44157 SHA1 1084b1630b48a430d60d6aee8e31914ecc6d5369 SHA256 3c6f40b9c265a891430defd35b82534decc22413e6b2b2dc7e9b6fd601c9cc93
+DIST yap-6.0.6.tar.gz 5099543 RMD160 9e3538933967257c59a441d10ddda0d6935a9d2e SHA1 8fa25cd70fde024c6fa0bc455b0e7b1aa117b6f3 SHA256 c546574609fee09231d4d37a4ef88a8d5fcf6026e507c725cd212577c2558f1f
 EBUILD yap-5.1.3-r2.ebuild 2484 RMD160 bf366226c2bb9443d67a6a75e8103ff4677b2d1a SHA1 25f4113498ae52c7ba7bbbdceed58f4b0f73f5e3 SHA256 2fc47953ca86da7ae4a0459df2356be3a2eb45b9efcb59a6686fdfea68c388a3
 EBUILD yap-6.0.1.ebuild 2437 RMD160 5ebc3452fb389cd963686ec8bf2183c3213ac7f5 SHA1 79f8a10f95a3253d48b67952faba87e00f9cc11e SHA256 66468e95ab2c7d6cacd97bc08a7a005eb4e75ff56227dac7c40138bb3012a12b
 EBUILD yap-6.0.2.ebuild 2419 RMD160 9814f93f6acd6431642bb84387dd317400370100 SHA1 49b8dc7f65bc037968a36484fea96ba5426eeadf SHA256 d8a0e9959e6921c11dd5b8f505d2521384bafe461dcf6750ec58ca62289eab3d
@@ -43,5 +50,6 @@ EBUILD yap-6.0.3.ebuild 2245 RMD160 797d6be7ec2451a20be613f17249914174d80531 SHA
 EBUILD yap-6.0.4.ebuild 2282 RMD160 35eb1455778246bca7ded06d51768ca3fa654855 SHA1 c519d907246aff3e7b67fe806c4bb33b14afee78 SHA256 bd9f2c07540dae18b7b1047d588ef3e2cf0c13c62af59e62a43dc255a779d236
 EBUILD yap-6.0.5-r1.ebuild 2331 RMD160 48b9cda0634b56e4cbf3f9d3f467d5ed06b7c3d1 SHA1 b7cad92f8540ab827240e5c127cac28298876042 SHA256 1eab4cd6e5273a8ffce60bf816840d85df163719cb29a45d472cded395260e2c
 EBUILD yap-6.0.5.ebuild 2287 RMD160 f4ce34ff3ab33544df90e6d68dc892f0e477b0ee SHA1 cf74f88eda55b569c4d5bc7a5746572013b5cd3d SHA256 bb70ba1c75a56ae607f7d17a108db0c70b79b6bc9245a984228a52812af6c01d
-MISC ChangeLog 7426 RMD160 4a9489b11eee12935473b2a032bfc28131e0f80b SHA1 a2bf7ee2c14dee12742cf0660dee0159af4baf16 SHA256 0a68022734f8806911c8b29ed9eef4c7da86bb61270f5d55cd1d3948061daf8f
+EBUILD yap-6.0.6.ebuild 2416 RMD160 22ea3b1c433dfd6f30ad1a3531cf82d0f9e68821 SHA1 2550d92d5403e5ad22cce00b66bb38baec0df9c8 SHA256 8a4917829e7f79113bd713828e97e3ee708f0d46e0b95de7031558fbf179dfb8
+MISC ChangeLog 7725 RMD160 194934e263d1c2129eb5bbde76b49b5742e2c871 SHA1 38837493dfb307afbb7ab7809579f78c412dac55 SHA256 ff3eca0cf66329325c82742db75f4358fb1fa5648a3af8eeaf8d470edbc1c148
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/yap/files/yap-6.0.6-DESTDIR.patch b/dev-lang/yap/files/yap-6.0.6-DESTDIR.patch
new file mode 100644
index 000000000000..5460c7727a30
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.6-DESTDIR.patch
@@ -0,0 +1,22 @@
+--- yap-6.orig/packages/http/Makefile.in	2010-08-05 05:36:28.000000000 +1200
++++ yap-6/packages/http/Makefile.in	2010-08-08 10:00:13.000000000 +1200
+@@ -110,7 +110,7 @@
+ 		$(INSTALL_PROGRAM) $(SOLIBS) $(BINTARGET)
+ 		mkdir -p $(PLTARGET)
+ 		mkdir -p $(PLTARGET)/web/icons
+-		mkdir -p $(LIBDIR)/web/css
++		mkdir -p $(DESTDIR)$(LIBDIR)/web/css
+ 		$(INSTALL_DATA) $(LIBPL) $(PLTARGET)
+ 		$(INSTALL_DATA) $(srcdir)/README $(PLTARGET)
+ 		$(INSTALL_DATA) $(srcdir)/web/icons/*.png $(PLTARGET)/web/icons
+--- yap-6.orig/packages/zlib/Makefile.in	2010-08-05 05:36:28.000000000 +1200
++++ yap-6/packages/zlib/Makefile.in	2010-08-08 10:06:17.000000000 +1200
+@@ -107,7 +107,7 @@
+ 		$(LD) $(LDFLAGS) -o $@ $(ZOBJ) $(LIBS)
+ 
+ install:	$(TARGETS) $(LIBPL)
+-		mkdir -p $(DESTDIR)$(BINTARGET)
++		mkdir -p $(BINTARGET)
+ 		for f in $(TARGETS); do \
+ 		  $(INSTALL_PROGRAM) $$f $(BINTARGET); \
+ 		done
diff --git a/dev-lang/yap/files/yap-6.0.6-chr-sublist.patch b/dev-lang/yap/files/yap-6.0.6-chr-sublist.patch
new file mode 100644
index 000000000000..5ff93ccdd3c6
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.6-chr-sublist.patch
@@ -0,0 +1,48 @@
+--- yap-6.orig/library/dialect/hprolog.yap	2010-05-12 01:53:25.000000000 +1200
++++ yap-6/library/dialect/hprolog.yap	2010-05-16 09:25:26.000000000 +1200
+@@ -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.0.6-itries.patch b/dev-lang/yap/files/yap-6.0.6-itries.patch
new file mode 100644
index 000000000000..023e11209250
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.6-itries.patch
@@ -0,0 +1,11 @@
+--- yap-6.orig/library/tries/itries.c	2010-08-05 05:36:28.000000000 +1200
++++ yap-6/library/tries/itries.c	2010-09-12 17:20:09.000000000 +1200
+@@ -620,7 +620,7 @@
+   /* check args */
+   if (!YAP_IsVarTerm(arg_itrie)) 
+     return FALSE;
+-  if (!(file = (FILE*) Yap_FileDescriptorFromStream(arg_stream)))
++  if (!(file = (FILE*) YAP_FileDescriptorFromStream(arg_stream)))
+     return FALSE;
+ 
+   /* load itrie */
diff --git a/dev-lang/yap/files/yap-6.0.6-ldflags.patch b/dev-lang/yap/files/yap-6.0.6-ldflags.patch
new file mode 100644
index 000000000000..4e70af50a3e7
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.6-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-08-05 05:36:28.000000000 +1200
++++ yap-6/library/matrix/Makefile.in	2010-09-12 17:50:42.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/library/random/Makefile.in	2010-09-12 18:02:50.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/library/regex/Makefile.in	2010-09-12 18:02:16.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/library/rltree/Makefile.in	2010-09-12 18:01:14.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/library/system/Makefile.in	2010-09-12 17:51:44.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/library/tries/Makefile.in	2010-09-12 17:50:07.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/packages/PLStream/Makefile.in	2010-09-12 18:07:41.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/packages/clib/Makefile.in	2010-09-12 17:57:39.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/packages/http/Makefile.in	2010-09-12 18:04:08.000000000 +1200
+@@ -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-08-05 05:36:46.000000000 +1200
++++ yap-6/packages/jpl/Makefile.in	2010-09-12 17:54:10.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/packages/semweb/Makefile.in	2010-09-12 18:07:04.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/packages/sgml/Makefile.in	2010-09-12 17:53:23.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/packages/swi-minisat2/C/Makefile.in	2010-09-12 18:10:07.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/packages/tai/Makefile.in	2010-09-12 17:52:34.000000000 +1200
+@@ -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-08-05 05:36:28.000000000 +1200
++++ yap-6/packages/zlib/Makefile.in	2010-09-12 18:06:07.000000000 +1200
+@@ -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.0.6-runpath.patch b/dev-lang/yap/files/yap-6.0.6-runpath.patch
new file mode 100644
index 000000000000..6201dc01cd94
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.6-runpath.patch
@@ -0,0 +1,23 @@
+--- yap-6.orig/configure	2010-08-05 05:36:28.000000000 +1200
++++ yap-6/configure	2010-09-12 18:26:08.000000000 +1200
+@@ -6820,17 +6820,17 @@
+ 	 then
+ 	 LIBS="$LIBS -lnsl"
+         fi
+-	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
++	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
+         DYNYAPLIB=libYap."$SO"
+         if test "$dynamic_loading" = "yes"
+         then
+            YAPLIB_LD="\$(CC) -shared"
+-           EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
++           EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
+            INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+            PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
+         else
+            YAPLIB_LD="\$(CC)"
+-           EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
++           EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
+            INSTALL_ENV="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
+            PRE_INSTALL_ENV=""
+         fi
diff --git a/dev-lang/yap/files/yap-6.0.6-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.6-yapsharedir.patch
new file mode 100644
index 000000000000..487a939962e6
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.6-yapsharedir.patch
@@ -0,0 +1,14 @@
+--- yap-6.orig/pl/consult.yap	2010-05-12 01:53:25.000000000 +1200
++++ yap-6/pl/consult.yap	2010-05-16 09:26:41.000000000 +1200
+@@ -872,9 +872,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.0.6.ebuild b/dev-lang/yap/yap-6.0.6.ebuild
new file mode 100644
index 000000000000..da113caacc5f
--- /dev/null
+++ b/dev-lang/yap/yap-6.0.6.ebuild
@@ -0,0 +1,104 @@
+# 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.0.6.ebuild,v 1.1 2010/09/12 06:43:40 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}-runpath.patch
+	epatch "${FILESDIR}"/${P}-chr-sublist.patch
+	epatch "${FILESDIR}"/${P}-itries.patch
+	epatch "${FILESDIR}"/${P}-DESTDIR.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
+}