Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-lang
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/yap/ChangeLog8
-rw-r--r--dev-lang/yap/Manifest4
-rw-r--r--dev-lang/yap/files/yap-6.0.5-ldflags.patch273
-rw-r--r--dev-lang/yap/yap-6.0.5-r1.ebuild101
4 files changed, 384 insertions, 2 deletions
diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index c29af7e2d766..af755ec439bc 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,12 @@
# 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.38 2010/08/07 22:30:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.39 2010/09/12 02:31:41 keri Exp $
+
+*yap-6.0.5-r1 (12 Sep 2010)
+
+ 12 Sep 2010; <keri@gentoo.org> +yap-6.0.5-r1.ebuild,
+ +files/yap-6.0.5-ldflags.patch:
+ Respect LDFLAGS. Closes #334575
07 Aug 2010; <keri@gentoo.org> yap-6.0.5.ebuild:
Remove redundant configure call to enable-cut-c
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 291ca0e4c055..67a819df6ae0 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -28,6 +28,7 @@ AUX yap-6.0.4-chr-sublist.patch 1351 RMD160 8766497eede000bb55cc8f6deb74aa37ff1e
AUX yap-6.0.4-yapsharedir.patch 520 RMD160 e1442c81f3375179cdc96c5cf53403a6faa6a660 SHA1 73a8294e282377fa41b965a5d6fa9e3337cea669 SHA256 bba8b8e34f56362cdeaed778ad37489805c10a25358815e0643bc28868b91c46
AUX yap-6.0.5-JAVALIBPATH.patch 1261 RMD160 ad4adf0ea06aec59fe7f752beb5b6682332683bd SHA1 cedbe29d06f7a081de19725064d87bcf526a519d SHA256 6a3704750cc6377d222ebdf1e68c3fb3274c3dd4ea4fc55da02abd416d6fa845
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
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
@@ -40,6 +41,7 @@ EBUILD yap-6.0.1.ebuild 2437 RMD160 5ebc3452fb389cd963686ec8bf2183c3213ac7f5 SHA
EBUILD yap-6.0.2.ebuild 2419 RMD160 9814f93f6acd6431642bb84387dd317400370100 SHA1 49b8dc7f65bc037968a36484fea96ba5426eeadf SHA256 d8a0e9959e6921c11dd5b8f505d2521384bafe461dcf6750ec58ca62289eab3d
EBUILD yap-6.0.3.ebuild 2245 RMD160 797d6be7ec2451a20be613f17249914174d80531 SHA1 0112bf2a4d121a155041ea6d05bde7b005adfa0b SHA256 5bbdf1c9e6f958cd41b17c44c22eee59a743d51f98812ce37b1c59e736093a2c
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 7273 RMD160 b35c28b65011d45e58b648c7c44ef02fafbc131e SHA1 bb5631926dd8233ec00b35d12692b37a42b51b34 SHA256 895033ba492c4b210f05df96b464167ac005e11a85855d7e52ffcd9c58bfd5c7
+MISC ChangeLog 7426 RMD160 4a9489b11eee12935473b2a032bfc28131e0f80b SHA1 a2bf7ee2c14dee12742cf0660dee0159af4baf16 SHA256 0a68022734f8806911c8b29ed9eef4c7da86bb61270f5d55cd1d3948061daf8f
MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/yap/files/yap-6.0.5-ldflags.patch b/dev-lang/yap/files/yap-6.0.5-ldflags.patch
new file mode 100644
index 000000000000..d2142e6c75b5
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.5-ldflags.patch
@@ -0,0 +1,273 @@
+diff -ur yap-6.orig/library/matrix/Makefile.in yap-6/library/matrix/Makefile.in
+--- yap-6.orig/library/matrix/Makefile.in 2010-05-12 01:53:25.000000000 +1200
++++ yap-6/library/matrix/Makefile.in 2010-09-12 12:24:04.000000000 +1200
+@@ -19,6 +19,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @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) $(SHLIB_CFLAGS) $(srcdir)/matrix.c -o matrix.o
+
+ @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
++@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS)
+
+ @DO_SECOND_LD@matrix@SHLIB_SUFFIX@: matrix.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o matrix@SHLIB_SUFFIX@ matrix.o
++@DO_SECOND_LD@ @SHLIB_LD@ -o matrix@SHLIB_SUFFIX@ matrix.o $(LDFLAGS)
+
+ install: all
+ $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
+diff -ur yap-6.orig/library/random/Makefile.in yap-6/library/random/Makefile.in
+--- yap-6.orig/library/random/Makefile.in 2010-05-12 01:53:25.000000000 +1200
++++ yap-6/library/random/Makefile.in 2010-09-12 12:22:00.000000000 +1200
+@@ -19,6 +19,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @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) $(SHLIB_CFLAGS) $(srcdir)/random.c -o random.o
+
+ @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
++@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS)
+
+ @DO_SECOND_LD@random@SHLIB_SUFFIX@: random.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o random@SHLIB_SUFFIX@ random.o
++@DO_SECOND_LD@ @SHLIB_LD@ -o random@SHLIB_SUFFIX@ random.o $(LDFLAGS)
+
+ install: all
+ $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
+diff -ur yap-6.orig/library/regex/Makefile.in yap-6/library/regex/Makefile.in
+--- yap-6.orig/library/regex/Makefile.in 2010-05-12 01:53:25.000000000 +1200
++++ yap-6/library/regex/Makefile.in 2010-09-12 12:29:26.000000000 +1200
+@@ -19,6 +19,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @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) $(SHLIB_CFLAGS) $(srcdir)/regexec.c -o regexec.o
+
+ @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
++@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS)
+
+ @DO_SECOND_LD@regexp@SHLIB_SUFFIX@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o regexp@SHLIB_SUFFIX@ regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
++@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regexp@SHLIB_SUFFIX@ regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
+
+ @DO_SECOND_LD@regcomp@SHLIB_SUFFIX@: regcomp.o @MERGE_DLL_OBJS@ regfree.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o regcomp@SHLIB_SUFFIX@ regcomp.o @MERGE_DLL_OBJS@ regfree.o
++@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regcomp@SHLIB_SUFFIX@ regcomp.o @MERGE_DLL_OBJS@ regfree.o
+
+ @DO_SECOND_LD@regerror@SHLIB_SUFFIX@: regerror.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o regerror@SHLIB_SUFFIX@ regerror.o
++@DO_SECOND_LD@ @SHLIB_LD@ -o regerror@SHLIB_SUFFIX@ regerror.o $(LDFLAGS)
+
+ @DO_SECOND_LD@regfree@SHLIB_SUFFIX@: regfree.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o regfree@SHLIB_SUFFIX@ regfree.o
++@DO_SECOND_LD@ @SHLIB_LD@ -o regfree@SHLIB_SUFFIX@ regfree.o $(LDFLAGS)
+
+ @DO_SECOND_LD@regexec@SHLIB_SUFFIX@: regexec.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o regexec@SHLIB_SUFFIX@ regexec.o
++@DO_SECOND_LD@ @SHLIB_LD@ -o regexec@SHLIB_SUFFIX@ regexec.o $(LDFLAGS)
+
+ install: all
+ $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
+diff -ur yap-6.orig/library/rltree/Makefile.in yap-6/library/rltree/Makefile.in
+--- yap-6.orig/library/rltree/Makefile.in 2010-05-12 01:53:25.000000000 +1200
++++ yap-6/library/rltree/Makefile.in 2010-09-12 12:26:05.000000000 +1200
+@@ -24,6 +24,7 @@
+ CC=@CC@
+ MPI_CC=mpicc
+ CFLAGS= @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) $(SHLIB_CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o
+
+ @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
++@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS)
+
+ @DO_SECOND_LD@yap_rl@SHLIB_SUFFIX@: $(OBJS)
+-@DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl@SHLIB_SUFFIX@ $(OBJS)
++@DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl@SHLIB_SUFFIX@ $(OBJS) $(LDFLAGS)
+
+ install: all
+ @if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR); fi
+diff -ur yap-6.orig/library/system/Makefile.in yap-6/library/system/Makefile.in
+--- yap-6.orig/library/system/Makefile.in 2010-05-12 01:53:25.000000000 +1200
++++ yap-6/library/system/Makefile.in 2010-09-12 12:23:01.000000000 +1200
+@@ -19,6 +19,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @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) $(SHLIB_CFLAGS) $(srcdir)/sys.c -o sys.o
+
+ @DO_SECOND_LD@@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
++@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS)
+
+ @DO_SECOND_LD@sys@SHLIB_SUFFIX@: sys.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o sys@SHLIB_SUFFIX@ sys.o
++@DO_SECOND_LD@ @SHLIB_LD@ -o sys@SHLIB_SUFFIX@ sys.o $(LDFLAGS)
+
+ install: all
+ $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
+diff -ur yap-6.orig/library/tries/Makefile.in yap-6/library/tries/Makefile.in
+--- yap-6.orig/library/tries/Makefile.in 2010-05-12 01:53:25.000000000 +1200
++++ yap-6/library/tries/Makefile.in 2010-09-12 12:23:36.000000000 +1200
+@@ -19,6 +19,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -59,13 +60,13 @@
+ $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/itries.c -o itries.o
+
+ @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
++@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS)
+
+ @DO_SECOND_LD@tries@SHLIB_SUFFIX@: core_tries.o base_tries.o tries.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o tries@SHLIB_SUFFIX@ core_tries.o base_tries.o tries.o
++@DO_SECOND_LD@ @SHLIB_LD@ -o tries@SHLIB_SUFFIX@ core_tries.o base_tries.o tries.o $(LDFLAGS)
+
+ @DO_SECOND_LD@itries@SHLIB_SUFFIX@: core_tries.o base_itries.o itries.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o itries@SHLIB_SUFFIX@ core_tries.o base_itries.o itries.o
++@DO_SECOND_LD@ @SHLIB_LD@ -o itries@SHLIB_SUFFIX@ core_tries.o base_itries.o itries.o $(LDFLAGS)
+
+ install: all
+ $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
+diff -ur yap-6.orig/library/yap2swi/Makefile.in yap-6/library/yap2swi/Makefile.in
+--- yap-6.orig/library/yap2swi/Makefile.in 2010-05-12 01:53:25.000000000 +1200
++++ yap-6/library/yap2swi/Makefile.in 2010-09-12 12:22:37.000000000 +1200
+@@ -18,6 +18,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -48,10 +49,10 @@
+ $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/yap2swi.c -o yap2swi.o
+
+ @DO_SECOND_LD@@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
++@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS)
+
+ @DO_SECOND_LD@yap2swi@SHLIB_SUFFIX@: yap2swi.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o yap2swi@SHLIB_SUFFIX@ yap2swi.o @
++@DO_SECOND_LD@ @SHLIB_LD@ -o yap2swi@SHLIB_SUFFIX@ yap2swi.o @ $(LDFLAGS)
+
+ install:
+ $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
+diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in
+--- yap-6.orig/packages/PLStream/Makefile.in 2010-05-12 01:53:25.000000000 +1200
++++ yap-6/packages/PLStream/Makefile.in 2010-09-12 12:25:31.000000000 +1200
+@@ -20,6 +20,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -77,10 +78,10 @@
+ $(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $< -o $@
+
+ @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
+-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $<
++@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< $(LDFLAGS)
+
+ @DO_SECOND_LD@plstream@SHLIB_SUFFIX@: $(OBJS)
+-@DO_SECOND_LD@ @SHLIB_LD@ -o plstream@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
++@DO_SECOND_LD@ @SHLIB_LD@ -o plstream@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ $(LDFLAGS)
+
+ install: all
+ $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
+diff -ur yap-6.orig/packages/jpl/Makefile.in yap-6/packages/jpl/Makefile.in
+--- yap-6.orig/packages/jpl/Makefile.in 2010-05-12 01:53:40.000000000 +1200
++++ yap-6/packages/jpl/Makefile.in 2010-09-12 12:44:26.000000000 +1200
+@@ -35,6 +35,7 @@
+ #
+ CC=@CC@
+ CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @JAVAINCPATH@
++LDFLAGS=@LDFLAGS@
+ MKINDEX=true
+ BINTARGET=$(DESTDIR)$(YAPLIBDIR)
+ PLTARGET=$(DESTDIR)$(SHAREDIR)
+@@ -97,7 +98,7 @@
+
+
+ @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
+- @DO_SECOND_LD@ @SHLIB_LD@ @JAVALIBPATH@ -o $@ $< @JAVALIBS@
++ @DO_SECOND_LD@ @SHLIB_LD@ @JAVALIBPATH@ $(LDFLAGS) -o $@ $< @JAVALIBS@
+ if [ -r libjpl.dylib ]; then \
+ rm -f libjpl.jnilib && ln -s libjpl.dylib libjpl.jnilib ; \
+ fi
+diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in
+--- yap-6.orig/packages/sgml/Makefile.in 2010-05-12 01:53:25.000000000 +1200
++++ yap-6/packages/sgml/Makefile.in 2010-09-12 12:10:18.000000000 +1200
+@@ -72,7 +72,7 @@
+ CMFLAGS=@CMFLAGS@
+ CIFLAGS=-I. -I@PLINCL@
+ CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) @DEFS@
+-LDFLAGS=$(COFLAGS)
++LDFLAGS=@LDFLAGS@
+
+ LDSOFLAGS=@LDSOFLAGS@
+
+@@ -114,7 +114,7 @@
+ $(CC) $(CFLAGS) $(SHLIB_CFLAGS) -o $@ -c $<
+
+ @DO_SECOND_LD@sgml2pl@SHLIB_SUFFIX@: $(PLOBJ)
+-@DO_SECOND_LD@ @SHLIB_SWI_LD@ -o sgml2pl@SHLIB_SUFFIX@ $(PLOBJ)
++@DO_SECOND_LD@ @SHLIB_SWI_LD@ -o sgml2pl@SHLIB_SUFFIX@ $(PLOBJ) $(LDFLAGS)
+
+ 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-05-12 01:53:25.000000000 +1200
++++ yap-6/packages/swi-minisat2/C/Makefile.in 2010-09-12 12:24:57.000000000 +1200
+@@ -21,6 +21,7 @@
+ CC=@CC@
+ CXX=@CXX@
+ CXXFLAGS= @CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include
++LDFLAGS=@LDFLAGS@
+ #
+ #
+ # You shouldn't need to change what follows.
+@@ -69,7 +70,7 @@
+ $(CXX) -c $(CXXFLAGS) $(SHLIB_CFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o
+
+ @DO_SECOND_LD@pl-minisat@SHLIB_SUFFIX@: $(OBJS)
+-@DO_SECOND_LD@ @SHLIB_LOWER_CXX_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS)
++@DO_SECOND_LD@ @SHLIB_LOWER_CXX_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS) $(LDFLAGS)
+
+ install: all
+ $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
diff --git a/dev-lang/yap/yap-6.0.5-r1.ebuild b/dev-lang/yap/yap-6.0.5-r1.ebuild
new file mode 100644
index 000000000000..3a19429fac84
--- /dev/null
+++ b/dev-lang/yap/yap-6.0.5-r1.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.0.5-r1.ebuild,v 1.1 2010/09/12 02:31:41 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="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}-ldflags.patch
+ epatch "${FILESDIR}"/${P}-yapsharedir.patch
+ epatch "${FILESDIR}"/${P}-JAVALIBPATH.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 jpl) \
+ ${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
+}