proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

17 files changed, 2909 insertions, 0 deletions

diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
new file mode 100644
index 000000000000..dd8fb1d0516f
--- /dev/null
+++ b/dev-lang/tuprolog/Manifest
@@ -0,0 +1,6 @@
+DIST 2p-2.4.0.zip 2421675 SHA256 f674b282bd7bc60e92ea417f8766e635979366d84d48634dd622e60ad1aa78c6 SHA512 20c86f736efe526dfffe603b19648394aaeaadf326034bba4f5717a193d7f76a99c6f3cb7bb93e2f1b608abd4e4af30341a2727f61e60e60289c2a964da782e9 WHIRLPOOL 7a353f5c6df2dba877d6880fc91ff0356639900767eb346a2eba97773303e125d0d2ffeead35e83cb61ffd013b49d4a05498861207de228e208a3f690a65ec4b
+DIST tuprolog-2.5.0.zip 4847183 SHA256 227714576fb1815a3fcc017211758bfb2d5a0b6a07ce3a3a24f8cd93db2e5e04
+DIST tuprolog-2.6.0.tar.gz 8366655 SHA256 5c9416c72ddde806720c1bce122a8bb12cab04a9af35a42b88067e1b145bf0c5 SHA512 5253f0d65787e9f090a8b4da8df007da269492098686fa5847e8d624a6656d1820b36c5b096e51d6f40480fea02a64793797c23161627942f076fc5eae414b82 WHIRLPOOL 81de4453dd6b62558260f31ab2e3af1f2a256934cc8a24a9e18723bd95ef646b206941169a3d69994f26f20c65c00b14022392f35ccb8573d8a7cbc7af16b353
+DIST tuprolog-2.7.0.tar.gz 9005490 SHA256 93cec171d48e40a695baafcce419b75fc3d7b6e5ef06b0e787b4823e09f571a7 SHA512 88a9edb5c26317ea82e114a7e82d933d99f85ca89f1244d92de66e7eae11c8c61ed771c104a70ec210c1a65dca2b3ca2c3aba077d3afab4b250b62d14e83c7e4 WHIRLPOOL 3f4c76bea53b899d7be6fa93a9b24c5aaab84bd5ba4c65ca2a988e3a8acaeb1f2d0205c3a60720fbbf02a54d52bb6e7c39b5504ae9777d80d8f238b7c3c7050a
+DIST tuprolog-2.7.2.tar.gz 9104934 SHA256 8b0c653d3c9d701197f13d8dec6e45548565cddfd052a5bec9578f4e6a50f21e SHA512 c327893e0fcf777b6ad8951b3baf88bc9527bf88e9d06ac54af04e777e6c0fc255b15f492c2cf483859d3a1966897d5969e1496370b88287b96e83d92babc722 WHIRLPOOL cf5082d0ca07f8bc59e678c27b1fb8aaa8879f6b15dc887949cb61760dfd721ba4a6fd5b05fb979ea94e6ab607dfcff5707be47d5ac657623556426e734ca395
+DIST tuprolog-2.9.0.tar.gz 4841110 SHA256 e789c7f1777a4f57698ac4756d03574f8fd5be4cebb1d5226722c35df75e163f SHA512 be15c99c40f750f3d1d4b70ae7ced9fe3792e8747876b6190ec1a01dd287e0fa34f88671f99f9e3fd7249e6fd44da7c4dadce0cd111b44b24e0e43d31c85165e WHIRLPOOL ada10ff775dc5e55d5c55c4dc920f5a4e7f8654891a10cf815734649e384fe6351921b807c54f6a6e8503fcbd0cbd9ee7f1569140bb5eba7e77e4da85f907203
diff --git a/dev-lang/tuprolog/files/build.xml b/dev-lang/tuprolog/files/build.xml
new file mode 100644
index 000000000000..f5b946fd56d6
--- /dev/null
+++ b/dev-lang/tuprolog/files/build.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" ?><project default="jar" name="tuprolog">
+
+	<!-- some properties -->
+	<property name="src.dir" value="src"/>
+	<property name="build.dir" value="build"/>
+	<property name="docs.dir" value="docs"/>
+	<property name="dist.dir" value="dist"/>
+	<property name="test.dir" value="test"/>
+	<property name="test.build.dir" value="test.build"/>
+	<property name="jarfile" value="${ant.project.name}.jar"/>
+	<property file="build.properties"/>
+
+	<!-- init -->
+	<target name="init">
+		<tstamp/>
+		<mkdir dir="${dist.dir}"/>
+		<mkdir dir="${build.dir}"/>
+		<mkdir dir="${docs.dir}"/>
+		<mkdir dir="${test.build.dir}"/>
+	</target>	
+
+	<!-- compile everything -->
+	<target depends="init" name="compile">
+		<javac classpath="${gentoo.classpath}"
+			deprecation="off"
+			destdir="${build.dir}"
+			encoding="ISO-8859-1"
+			source="1.5"
+			srcdir="${src.dir}"
+			target="1.5"/>
+		<copy todir="${build.dir}">
+			<fileset dir="${src.dir}">
+				<exclude name="**/*.java"/>
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- build the jar file -->
+	<target depends="compile" name="jar">
+		<jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
+		<jar basedir="${build.dir}" jarfile="${dist.dir}/2p.jar">
+			<manifest>
+				<attribute name="Main-Class" value="alice.tuprologx.ide.GUILauncher"/>
+			</manifest>
+		</jar>
+	</target>
+
+	<!-- generate javadocs -->
+	<target depends="init" name="javadoc">
+		<javadoc classpath="${gentoo.classpath}"
+			author="false"
+			destdir="${docs.dir}"
+			encoding="ISO-8859-1"
+			packagenames="alice.*"
+			source="1.5"
+			sourcepath="${src.dir}"
+			use="true"
+			version="true"
+			windowtitle="${ant.project.name}
+		API"/>
+	</target>
+
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}"/>
+		<delete dir="${dist.dir}"/>
+		<delete dir="${docs.dir}"/>
+		<delete dir="${test.build.dir}"/>
+	</target>
+
+	<!-- run testsuite -->
+	<target name="test">
+		<path id="dist.classpath">
+			<fileset dir="${dist.dir}">
+				<include name="*.jar"/>
+			</fileset>
+		</path>
+		<javac classpathref="dist.classpath"
+			deprecation="off"
+			destdir="${test.build.dir}"
+			encoding="ISO-8859-1"
+			source="1.5"
+			srcdir="${test.dir}"
+			target="1.5"
+			excludes="**/fixtures/**"/>
+		<junit haltonfailure="on" showoutput="no" printsummary="yes">
+			<classpath>
+				<path refid="dist.classpath"/>
+				<pathelement path="${test.build.dir}"/>
+			</classpath>
+			<formatter type="xml"/>
+			<batchtest todir="${test.build.dir}">
+				<fileset dir="${test.build.dir}">
+					<include name="**/*TestCase.class"/>
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
+</project>
diff --git a/dev-lang/tuprolog/files/tuprolog-2.3.1_beta-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.3.1_beta-javadocs.patch
new file mode 100644
index 000000000000..aa1f3dcbab2f
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.3.1_beta-javadocs.patch
@@ -0,0 +1,228 @@
+diff -ur 2p-deploy.orig/src/alice/tuprolog/ChoicePointStore.java 2p-deploy/src/alice/tuprolog/ChoicePointStore.java
+--- 2p-deploy.orig/src/alice/tuprolog/ChoicePointStore.java	2010-01-21 21:29:24.000000000 +1300
++++ 2p-deploy/src/alice/tuprolog/ChoicePointStore.java	2012-01-15 09:20:48.000000000 +1300
+@@ -35,7 +35,6 @@
+ 	

+ 	/**

+ 	 * Return the actual choice-point store

+-	 * @return

+ 	 */

+ 	public ChoicePointContext getPointer() {

+ 		return pointer;

+@@ -44,7 +43,6 @@
+ 	/**

+ 	 * Check if a choice point exists in the store.

+ 	 * As a side effect, removes choice points which have been already used and are now empty. 

+-	 * @return

+ 	 */

+ 	protected boolean existChoicePoint() {

+ 		if (pointer == null) return false;

+diff -ur 2p-deploy.orig/src/alice/tuprolog/ClauseStore.java 2p-deploy/src/alice/tuprolog/ClauseStore.java
+--- 2p-deploy.orig/src/alice/tuprolog/ClauseStore.java	2010-11-04 11:55:42.000000000 +1300
++++ 2p-deploy/src/alice/tuprolog/ClauseStore.java	2012-01-15 09:20:48.000000000 +1300
+@@ -62,8 +62,6 @@
+ 	
+ 	/**
+ 	 * Verify if there is a term in compatibleGoals compatible with goal. 
+-	 * @param goal
+-	 * @param compGoals
+ 	 * @return true if compatible or false otherwise.
+ 	 */
+ 	protected boolean existCompatibleClause() {
+diff -ur 2p-deploy.orig/src/alice/tuprolog/EngineManager.java 2p-deploy/src/alice/tuprolog/EngineManager.java
+--- 2p-deploy.orig/src/alice/tuprolog/EngineManager.java	2010-01-21 21:29:24.000000000 +1300
++++ 2p-deploy/src/alice/tuprolog/EngineManager.java	2012-01-15 09:20:48.000000000 +1300
+@@ -87,7 +87,7 @@
+ 	/**

+ 	 *  Solves a query

+ 	 *

+-	 * @param g the term representing the goal to be demonstrated

++	 * @param query the term representing the goal to be demonstrated

+ 	 * @return the result of the demonstration

+ 	 * @see SolveInfo

+ 	 **/

+diff -ur 2p-deploy.orig/src/alice/tuprolog/PrimitiveManager.java 2p-deploy/src/alice/tuprolog/PrimitiveManager.java
+--- 2p-deploy.orig/src/alice/tuprolog/PrimitiveManager.java	2010-01-21 21:29:24.000000000 +1300
++++ 2p-deploy/src/alice/tuprolog/PrimitiveManager.java	2012-01-15 09:20:48.000000000 +1300
+@@ -87,7 +87,7 @@
+ 	 * This involves identifying structs representing builtin
+ 	 * predicates and functors, and setting up related structures and links
+ 	 *
+-	 * @parm term the term to be identified
++	 * @param term the term to be identified
+ 	 * @return term with the identified built-in directive
+ 	 */
+ 	public Term identifyDirective(Term term) {
+diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/BasicLibrary.java 2p-deploy/src/alice/tuprolog/lib/BasicLibrary.java
+--- 2p-deploy.orig/src/alice/tuprolog/lib/BasicLibrary.java	2011-01-28 16:31:44.000000000 +1300
++++ 2p-deploy/src/alice/tuprolog/lib/BasicLibrary.java	2012-01-15 09:20:48.000000000 +1300
+@@ -109,7 +109,7 @@
+ 	/**

+ 	 * Loads a library constructed from a theory.

+ 	 * 

+-	 * @param theory

++	 * @param th

+ 	 *            theory text

+ 	 * @param libName

+ 	 *            name of the library

+diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/IOLibrary.java 2p-deploy/src/alice/tuprolog/lib/IOLibrary.java
+--- 2p-deploy.orig/src/alice/tuprolog/lib/IOLibrary.java	2011-01-19 16:34:24.000000000 +1300
++++ 2p-deploy/src/alice/tuprolog/lib/IOLibrary.java	2012-01-15 09:20:48.000000000 +1300
+@@ -372,7 +372,7 @@
+ 	/**

+ 	 * Sets an arbitrary seed for the Random object.

+ 	 * 

+-	 * @param seed Seed to use

++	 * @param t Seed to use

+ 	 * @return true if seed Term has a valid long value, false otherwise

+ 	 */

+ 	public boolean set_seed_1(Term t) throws PrologError {

+diff -ur 2p-deploy.orig/src/alice/tuprolog/lib/JavaLibrary.java 2p-deploy/src/alice/tuprolog/lib/JavaLibrary.java
+--- 2p-deploy.orig/src/alice/tuprolog/lib/JavaLibrary.java	2010-01-21 21:29:24.000000000 +1300
++++ 2p-deploy/src/alice/tuprolog/lib/JavaLibrary.java	2012-01-15 09:20:48.000000000 +1300
+@@ -1390,8 +1390,6 @@
+ 
+ 	/**
+ 	 * Generates a fresh numeric identifier
+-	 * 
+-	 * @return
+ 	 */
+ 	protected Struct generateFreshId() {
+ 		return new Struct("$obj_" + id++);
+diff -ur 2p-deploy.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2p-deploy/src/alice/tuprologx/ide/LibraryDialogFrame.java
+--- 2p-deploy.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java	2010-01-21 21:29:22.000000000 +1300
++++ 2p-deploy/src/alice/tuprologx/ide/LibraryDialogFrame.java	2012-01-15 09:20:48.000000000 +1300
+@@ -317,7 +317,6 @@
+         displayLibraryManagerStatus();

+     }

+ 

+-    /** @see alice.tuprologx.ide.SwingFrame#onClose()*/

+     public void closeLibraryDialog()

+     {

+     	onClose();

+diff -ur 2p-deploy.orig/src/alice/tuprologx/ide/ToolBar.java 2p-deploy/src/alice/tuprologx/ide/ToolBar.java
+--- 2p-deploy.orig/src/alice/tuprologx/ide/ToolBar.java	2010-01-21 21:29:22.000000000 +1300
++++ 2p-deploy/src/alice/tuprologx/ide/ToolBar.java	2012-01-15 09:20:48.000000000 +1300
+@@ -232,8 +232,6 @@
+ 

+     /**

+      * Set the tuProlog config frame

+-     *

+-     * @param libraryManager a libraryManager to associate to the libraryDialog 

+      */

+ 	public void setPrologConfig(PrologConfigFrame configFrame)

+ 	{

+diff -ur 2p-deploy.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2p-deploy/src/alice/tuprologx/pj/lib/PJLibrary.java
+--- 2p-deploy.orig/src/alice/tuprologx/pj/lib/PJLibrary.java	2010-01-21 21:29:48.000000000 +1300
++++ 2p-deploy/src/alice/tuprologx/pj/lib/PJLibrary.java	2012-01-15 09:20:48.000000000 +1300
+@@ -1252,7 +1252,6 @@
+ 	
+ 	/**
+ 	 * Generates a fresh numeric identifier
+-	 * @return
+ 	 */
+ 	protected Struct generateFreshId() {
+ 		return new Struct("$obj_" + id++);        
+diff -ur 2p-deploy.orig/src/alice/util/ReadOnlyLinkedList.java 2p-deploy/src/alice/util/ReadOnlyLinkedList.java
+--- 2p-deploy.orig/src/alice/util/ReadOnlyLinkedList.java	2010-03-17 18:14:10.000000000 +1300
++++ 2p-deploy/src/alice/util/ReadOnlyLinkedList.java	2012-01-15 09:32:03.000000000 +1300
+@@ -12,10 +12,10 @@
+ import java.util.ListIterator;
+ 
+ /**
+- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
++ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
+  * and ensures that the given list is navigated only.
+  *
+- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
++ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
+  * support modifiers methods, and throws {@link UnsupportedOperationException}
+  * if invoked.
+  *
+diff -ur 2p-deploy.orig/src/alice/util/jedit/InputHandler.java 2p-deploy/src/alice/util/jedit/InputHandler.java
+--- 2p-deploy.orig/src/alice/util/jedit/InputHandler.java	2010-01-21 21:29:24.000000000 +1300
++++ 2p-deploy/src/alice/util/jedit/InputHandler.java	2012-01-15 09:20:48.000000000 +1300
+@@ -24,7 +24,7 @@
+  *
+  * @author Slava Pestov
+  * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
+- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
++ * @see alice.util.jedit.DefaultInputHandler
+  */
+ public abstract class InputHandler extends KeyAdapter
+ {
+@@ -187,7 +187,7 @@
+ 	/**
+ 	 * Grabs the next key typed event and invokes the specified
+ 	 * action with the key as a the action command.
+-	 * @param action The action
++	 * @param listener The action
+ 	 */
+ 	public void grabNextKeyStroke(ActionListener listener)
+ 	{
+diff -ur 2p-deploy.orig/src/alice/util/jedit/JEditTextArea.java 2p-deploy/src/alice/util/jedit/JEditTextArea.java
+--- 2p-deploy.orig/src/alice/util/jedit/JEditTextArea.java	2010-01-21 21:29:24.000000000 +1300
++++ 2p-deploy/src/alice/util/jedit/JEditTextArea.java	2012-01-15 09:20:48.000000000 +1300
+@@ -1389,7 +1389,7 @@
+ 
+ 	/**
+ 	 * Sets if the selection should be rectangular.
+-	 * @param overwrite True if the selection should be rectangular,
++	 * @param rectSelect True if the selection should be rectangular,
+ 	 * false otherwise.
+ 	 */
+ 	public final void setSelectionRectangular(boolean rectSelect)
+diff -ur 2p-deploy.orig/src/alice/util/jedit/KeywordMap.java 2p-deploy/src/alice/util/jedit/KeywordMap.java
+--- 2p-deploy.orig/src/alice/util/jedit/KeywordMap.java	2010-01-21 21:29:22.000000000 +1300
++++ 2p-deploy/src/alice/util/jedit/KeywordMap.java	2012-01-15 09:20:48.000000000 +1300
+@@ -75,7 +75,7 @@
+ 	/**
+ 	 * Adds a key-value mapping.
+ 	 * @param keyword The key
+-	 * @Param id The value
++	 * @param id The value
+ 	 */
+ 	public void add(String keyword, byte id)
+ 	{
+diff -ur 2p-deploy.orig/src/alice/util/jedit/TextAreaPainter.java 2p-deploy/src/alice/util/jedit/TextAreaPainter.java
+--- 2p-deploy.orig/src/alice/util/jedit/TextAreaPainter.java	2010-01-21 21:29:24.000000000 +1300
++++ 2p-deploy/src/alice/util/jedit/TextAreaPainter.java	2012-01-15 09:20:48.000000000 +1300
+@@ -75,7 +75,7 @@
+ 	/**
+ 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i>
+ 	 * will be used to paint tokens with id = <i>n</i>.
+-	 * @see org.gjt.sp.jedit.syntax.Token
++	 * @see alice.util.jedit.Token
+ 	 */
+ 	public final SyntaxStyle[] getStyles()
+ 	{
+@@ -86,7 +86,7 @@
+ 	 * Sets the syntax styles used to paint colorized text. Entry <i>n</i>
+ 	 * will be used to paint tokens with id = <i>n</i>.
+ 	 * @param styles The syntax styles
+-	 * @see org.gjt.sp.jedit.syntax.Token
++	 * @see alice.util.jedit.Token
+ 	 */
+ 	public final void setStyles(SyntaxStyle[] styles)
+ 	{
+@@ -356,7 +356,7 @@
+ 
+ 	/**
+ 	 * Repaints the text.
+-	 * @param g The graphics context
++	 * @param gfx The graphics context
+ 	 */
+ 	public void paint(Graphics gfx)
+ 	{
+diff -ur 2p-deploy.orig/src/alice/util/jedit/TokenMarker.java 2p-deploy/src/alice/util/jedit/TokenMarker.java
+--- 2p-deploy.orig/src/alice/util/jedit/TokenMarker.java	2010-01-21 21:29:22.000000000 +1300
++++ 2p-deploy/src/alice/util/jedit/TokenMarker.java	2012-01-15 09:20:48.000000000 +1300
+@@ -24,7 +24,7 @@
+  * @author Slava Pestov
+  * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
+  *
+- * @see org.gjt.sp.jedit.syntax.Token
++ * @see alice.util.jedit.Token
+  */
+ public abstract class TokenMarker
+ {
diff --git a/dev-lang/tuprolog/files/tuprolog-2.4.0_rc5-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.4.0_rc5-javadocs.patch
new file mode 100644
index 000000000000..618ead12da81
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.4.0_rc5-javadocs.patch
@@ -0,0 +1,315 @@
+diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/ChoicePointStore.java 2p-2.4.0-RC5/src/alice/tuprolog/ChoicePointStore.java
+--- 2p-2.4.0-RC5.orig/src/alice/tuprolog/ChoicePointStore.java	2011-07-18 18:49:42.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/tuprolog/ChoicePointStore.java	2012-01-15 10:02:51.000000000 +1300
+@@ -36,7 +36,6 @@
+     

+     /**

+ 	 * Return the actual choice-point store

+-	 * @return

+ 	 */

+     public ChoicePointContext getPointer() {

+         return pointer;

+@@ -45,7 +44,6 @@
+     /**

+      * Check if a choice point exists in the store.

+      * As a side effect, removes choice points which have been already used and are now empty. 

+-     * @return

+      */

+     protected boolean existChoicePoint() {

+         if (pointer == null) return false;

+@@ -93,4 +91,4 @@
+         return l;

+     }

+     

+-}
+\ No newline at end of file
++}

+diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/ClauseStore.java 2p-2.4.0-RC5/src/alice/tuprolog/ClauseStore.java
+--- 2p-2.4.0-RC5.orig/src/alice/tuprolog/ClauseStore.java	2011-07-21 15:19:52.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/tuprolog/ClauseStore.java	2012-01-15 10:03:27.000000000 +1300
+@@ -62,8 +62,6 @@
+     
+     /**
+      * Verify if there is a term in compatibleGoals compatible with goal. 
+-     * @param goal
+-     * @param compGoals
+      * @return true if compatible or false otherwise.
+      */
+     protected boolean existCompatibleClause() {
+@@ -160,4 +158,4 @@
+     }
+     
+     
+-}
+\ No newline at end of file
++}
+diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/EngineManager.java 2p-2.4.0-RC5/src/alice/tuprolog/EngineManager.java
+--- 2p-2.4.0-RC5.orig/src/alice/tuprolog/EngineManager.java	2011-07-21 15:21:30.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/tuprolog/EngineManager.java	2012-01-15 10:03:54.000000000 +1300
+@@ -96,7 +96,7 @@
+     /**

+      *  Solves a query

+      *

+-     * @param g the term representing the goal to be demonstrated

++     * @param query the term representing the goal to be demonstrated

+      * @return the result of the demonstration

+      * @see SolveInfo

+      **/

+@@ -243,4 +243,4 @@
+     }

+     

+     

+-}
+\ No newline at end of file
++}

+diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/PrimitiveManager.java 2p-2.4.0-RC5/src/alice/tuprolog/PrimitiveManager.java
+--- 2p-2.4.0-RC5.orig/src/alice/tuprolog/PrimitiveManager.java	2011-07-21 15:35:50.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/tuprolog/PrimitiveManager.java	2012-01-15 10:04:20.000000000 +1300
+@@ -89,7 +89,7 @@
+      * This involves identifying structs representing builtin
+      * predicates and functors, and setting up related structures and links
+      *
+-     * @parm term the term to be identified
++     * @param term the term to be identified
+      * @return term with the identified built-in directive
+      */
+     public Term identifyDirective(Term term) {
+@@ -192,4 +192,4 @@
+ 		return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
+ 	}
+     /**/
+-}
+\ No newline at end of file
++}
+diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/event/SpyEvent.java 2p-2.4.0-RC5/src/alice/tuprolog/event/SpyEvent.java
+--- 2p-2.4.0-RC5.orig/src/alice/tuprolog/event/SpyEvent.java	2011-07-21 15:47:18.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/tuprolog/event/SpyEvent.java	2012-01-15 10:21:13.000000000 +1300
+@@ -33,10 +33,6 @@
+ 	 * event description

+ 	 */

+     private String msg;

+-    /**

+-	 * @uml.property  name="env"

+-	 * @uml.associationEnd  

+-	 */

+     private Engine env;

+ 

+     public SpyEvent(Object source, String msg_) {

+@@ -63,4 +59,4 @@
+         return msg + ((env == null) ? "" : env.toString());

+     }

+ 

+-}
+\ No newline at end of file
++}

+diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/lib/BasicLibrary.java 2p-2.4.0-RC5/src/alice/tuprolog/lib/BasicLibrary.java
+--- 2p-2.4.0-RC5.orig/src/alice/tuprolog/lib/BasicLibrary.java	2011-09-16 18:00:58.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/tuprolog/lib/BasicLibrary.java	2012-01-15 10:04:49.000000000 +1300
+@@ -114,7 +114,7 @@
+     /**

+      * Loads a library constructed from a theory.

+      * 

+-     * @param theory

++     * @param th

+      *            theory text

+      * @param libName

+      *            name of the library

+@@ -1264,4 +1264,4 @@
+                 { "\\", "expression_bitwise_not", "functor" } };

+     }

+ 

+-}
+\ No newline at end of file
++}

+diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/lib/IOLibrary.java 2p-2.4.0-RC5/src/alice/tuprolog/lib/IOLibrary.java
+--- 2p-2.4.0-RC5.orig/src/alice/tuprolog/lib/IOLibrary.java	2011-07-21 15:50:40.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/tuprolog/lib/IOLibrary.java	2012-01-15 10:06:27.000000000 +1300
+@@ -375,7 +375,7 @@
+     /**

+      * Sets an arbitrary seed for the Random object.

+      * 

+-     * @param seed Seed to use

++     * @param t Seed to use

+      * @return true if seed Term has a valid long value, false otherwise

+      */

+     public boolean set_seed_1(Term t) throws PrologError {

+@@ -470,4 +470,4 @@
+         }

+         return true;

+     }

+-}
+\ No newline at end of file
++}

+diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/lib/JavaLibrary.java 2p-2.4.0-RC5/src/alice/tuprolog/lib/JavaLibrary.java
+--- 2p-2.4.0-RC5.orig/src/alice/tuprolog/lib/JavaLibrary.java	2011-07-21 15:50:42.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/tuprolog/lib/JavaLibrary.java	2012-01-15 10:10:02.000000000 +1300
+@@ -1393,8 +1393,6 @@
+ 
+     /**
+      * Generates a fresh numeric identifier
+-     * 
+-     * @return
+      */
+     protected Struct generateFreshId() {
+         return new Struct("$obj_" + id++);
+diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprologx/ide/Console.java 2p-2.4.0-RC5/src/alice/tuprologx/ide/Console.java
+--- 2p-2.4.0-RC5.orig/src/alice/tuprologx/ide/Console.java	2011-06-29 17:00:06.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/tuprologx/ide/Console.java	2012-01-15 10:10:45.000000000 +1300
+@@ -10,8 +10,5 @@
+     public void getNextSolution();

+     public void acceptSolution();

+     public void stopEngine();

+-    /**

+-	 * @uml.property  name="goal"

+-	 */

+     public String getGoal();

+-}
+\ No newline at end of file
++}

+diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2p-2.4.0-RC5/src/alice/tuprologx/ide/LibraryDialogFrame.java
+--- 2p-2.4.0-RC5.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java	2011-07-21 16:02:44.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/tuprologx/ide/LibraryDialogFrame.java	2012-01-15 10:11:41.000000000 +1300
+@@ -325,7 +325,6 @@
+         displayLibraryManagerStatus();

+     }

+ 

+-    /** @see alice.tuprologx.ide.SwingFrame#onClose()*/

+     public void closeLibraryDialog()

+     {

+         onClose();

+diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprologx/ide/ToolBar.java 2p-2.4.0-RC5/src/alice/tuprologx/ide/ToolBar.java
+--- 2p-2.4.0-RC5.orig/src/alice/tuprologx/ide/ToolBar.java	2011-07-21 16:10:16.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/tuprologx/ide/ToolBar.java	2012-01-15 10:12:21.000000000 +1300
+@@ -242,8 +242,6 @@
+ 

+     /**

+      * Set the tuProlog config frame

+-     *

+-     * @param libraryManager a libraryManager to associate to the libraryDialog 

+      */

+     public void setPrologConfig(PrologConfigFrame configFrame)

+     {

+diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2p-2.4.0-RC5/src/alice/tuprologx/pj/lib/PJLibrary.java
+--- 2p-2.4.0-RC5.orig/src/alice/tuprologx/pj/lib/PJLibrary.java	2011-07-21 16:18:14.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/tuprologx/pj/lib/PJLibrary.java	2012-01-15 10:13:01.000000000 +1300
+@@ -1252,7 +1252,6 @@
+ 	
+ 	/**
+ 	 * Generates a fresh numeric identifier
+-	 * @return
+ 	 */
+ 	protected Struct generateFreshId() {
+ 		return new Struct("$obj_" + id++);        
+diff -ur 2p-2.4.0-RC5.orig/src/alice/util/ReadOnlyLinkedList.java 2p-2.4.0-RC5/src/alice/util/ReadOnlyLinkedList.java
+--- 2p-2.4.0-RC5.orig/src/alice/util/ReadOnlyLinkedList.java	2011-07-21 16:27:00.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/util/ReadOnlyLinkedList.java	2012-01-15 10:01:28.000000000 +1300
+@@ -12,10 +12,10 @@
+ import java.util.ListIterator;
+ 
+ /**
+- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
++ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
+  * and ensures that the given list is navigated only.
+  *
+- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
++ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
+  * support modifiers methods, and throws {@link UnsupportedOperationException}
+  * if invoked.
+  *
+diff -ur 2p-2.4.0-RC5.orig/src/alice/util/jedit/InputHandler.java 2p-2.4.0-RC5/src/alice/util/jedit/InputHandler.java
+--- 2p-2.4.0-RC5.orig/src/alice/util/jedit/InputHandler.java	2011-07-21 16:33:22.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/util/jedit/InputHandler.java	2012-01-15 10:19:53.000000000 +1300
+@@ -24,7 +24,7 @@
+  *
+  * @author Slava Pestov
+  * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
+- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
++ * @see alice.util.jedit.DefaultInputHandler
+  */
+ public abstract class InputHandler extends KeyAdapter
+ {
+@@ -187,7 +187,7 @@
+     /**
+      * Grabs the next key typed event and invokes the specified
+      * action with the key as a the action command.
+-     * @param action The action
++     * @param listener The action
+      */
+     public void grabNextKeyStroke(ActionListener listener)
+     {
+diff -ur 2p-2.4.0-RC5.orig/src/alice/util/jedit/JEditTextArea.java 2p-2.4.0-RC5/src/alice/util/jedit/JEditTextArea.java
+--- 2p-2.4.0-RC5.orig/src/alice/util/jedit/JEditTextArea.java	2011-09-28 12:26:10.000000000 +1300
++++ 2p-2.4.0-RC5/src/alice/util/jedit/JEditTextArea.java	2012-01-15 10:16:47.000000000 +1300
+@@ -1392,7 +1392,7 @@
+ 
+     /**
+      * Sets if the selection should be rectangular.
+-     * @param overwrite True if the selection should be rectangular,
++     * @param rectSelect True if the selection should be rectangular,
+      * false otherwise.
+      */
+     public final void setSelectionRectangular(boolean rectSelect)
+diff -ur 2p-2.4.0-RC5.orig/src/alice/util/jedit/KeywordMap.java 2p-2.4.0-RC5/src/alice/util/jedit/KeywordMap.java
+--- 2p-2.4.0-RC5.orig/src/alice/util/jedit/KeywordMap.java	2011-07-21 16:34:58.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/util/jedit/KeywordMap.java	2012-01-15 10:17:35.000000000 +1300
+@@ -75,7 +75,7 @@
+     /**
+      * Adds a key-value mapping.
+      * @param keyword The key
+-     * @Param id The value
++     * @param id The value
+      */
+     public void add(String keyword, byte id)
+     {
+@@ -102,9 +102,6 @@
+     }
+ 
+     // protected members
+-    /**
+-	 * @uml.property  name="mapLength"
+-	 */
+     protected int mapLength;
+ 
+     protected int getStringMapKey(String s)
+diff -ur 2p-2.4.0-RC5.orig/src/alice/util/jedit/TextAreaPainter.java 2p-2.4.0-RC5/src/alice/util/jedit/TextAreaPainter.java
+--- 2p-2.4.0-RC5.orig/src/alice/util/jedit/TextAreaPainter.java	2011-07-21 16:39:24.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/util/jedit/TextAreaPainter.java	2012-01-15 10:20:32.000000000 +1300
+@@ -75,7 +75,7 @@
+ 
+     /**
+ 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
+-	 * @see  org.gjt.sp.jedit.syntax.Token
++	 * @see  alice.util.jedit.Token
+ 	 */
+     public final SyntaxStyle[] getStyles()
+     {
+@@ -85,7 +85,7 @@
+     /**
+ 	 * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
+ 	 * @param styles  The syntax styles
+-	 * @see  org.gjt.sp.jedit.syntax.Token
++	 * @see  alice.util.jedit.Token
+ 	 */
+     public final void setStyles(SyntaxStyle[] styles)
+     {
+@@ -356,7 +356,7 @@
+ 
+     /**
+      * Repaints the text.
+-     * @param g The graphics context
++     * @param gfx The graphics context
+      */
+     public void paint(Graphics gfx)
+     {
+diff -ur 2p-2.4.0-RC5.orig/src/alice/util/jedit/TokenMarker.java 2p-2.4.0-RC5/src/alice/util/jedit/TokenMarker.java
+--- 2p-2.4.0-RC5.orig/src/alice/util/jedit/TokenMarker.java	2011-07-21 16:39:24.000000000 +1200
++++ 2p-2.4.0-RC5/src/alice/util/jedit/TokenMarker.java	2012-01-15 10:20:47.000000000 +1300
+@@ -23,7 +23,7 @@
+  * @author Slava Pestov
+  * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
+  *
+- * @see org.gjt.sp.jedit.syntax.Token
++ * @see alice.util.jedit.Token
+  */
+ public abstract class TokenMarker
+ {
diff --git a/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch
new file mode 100644
index 000000000000..256710934666
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch
@@ -0,0 +1,315 @@
+diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.5.0/src/alice/tuprolog/ChoicePointStore.java
+--- tuprolog-2.5.0.orig/src/alice/tuprolog/ChoicePointStore.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/tuprolog/ChoicePointStore.java	2012-08-03 03:45:45.000000000 +0200
+@@ -36,7 +36,6 @@
+     

+     /**

+ 	 * Return the actual choice-point store

+-	 * @return

+ 	 */

+     public ChoicePointContext getPointer() {

+         return pointer;

+@@ -45,7 +44,6 @@
+     /**

+      * Check if a choice point exists in the store.

+      * As a side effect, removes choice points which have been already used and are now empty. 

+-     * @return

+      */

+     protected boolean existChoicePoint() {

+         if (pointer == null) return false;

+@@ -93,4 +91,4 @@
+         return l;

+     }

+     

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.5.0/src/alice/tuprolog/ClauseStore.java
+--- tuprolog-2.5.0.orig/src/alice/tuprolog/ClauseStore.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/tuprolog/ClauseStore.java	2012-08-03 03:45:45.000000000 +0200
+@@ -62,8 +62,6 @@
+     
+     /**
+      * Verify if there is a term in compatibleGoals compatible with goal. 
+-     * @param goal
+-     * @param compGoals
+      * @return true if compatible or false otherwise.
+      */
+     protected boolean existCompatibleClause() {
+@@ -160,4 +158,4 @@
+     }
+     
+     
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/EngineManager.java tuprolog-2.5.0/src/alice/tuprolog/EngineManager.java
+--- tuprolog-2.5.0.orig/src/alice/tuprolog/EngineManager.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/tuprolog/EngineManager.java	2012-08-03 03:45:45.000000000 +0200
+@@ -96,7 +96,7 @@
+     /**

+      *  Solves a query

+      *

+-     * @param g the term representing the goal to be demonstrated

++     * @param query the term representing the goal to be demonstrated

+      * @return the result of the demonstration

+      * @see SolveInfo

+      **/

+@@ -243,4 +243,4 @@
+     }

+     

+     

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.5.0/src/alice/tuprolog/event/SpyEvent.java
+--- tuprolog-2.5.0.orig/src/alice/tuprolog/event/SpyEvent.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/tuprolog/event/SpyEvent.java	2012-08-03 03:45:45.000000000 +0200
+@@ -33,10 +33,6 @@
+ 	 * event description

+ 	 */

+     private String msg;

+-    /**

+-	 * @uml.property  name="env"

+-	 * @uml.associationEnd  

+-	 */

+     private Engine env;

+ 

+     public SpyEvent(Object source, String msg_) {

+@@ -63,4 +59,4 @@
+         return msg + ((env == null) ? "" : env.toString());

+     }

+ 

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/BasicLibrary.java
+--- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/BasicLibrary.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/tuprolog/lib/BasicLibrary.java	2012-08-03 03:45:45.000000000 +0200
+@@ -114,7 +114,7 @@
+     /**

+      * Loads a library constructed from a theory.

+      * 

+-     * @param theory

++     * @param th

+      *            theory text

+      * @param libName

+      *            name of the library

+@@ -1356,4 +1356,4 @@
+                 { "\\", "expression_bitwise_not", "functor" } };

+     }

+ 

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/IOLibrary.java
+--- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/IOLibrary.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/tuprolog/lib/IOLibrary.java	2012-08-03 03:45:45.000000000 +0200
+@@ -375,7 +375,7 @@
+     /**

+      * Sets an arbitrary seed for the Random object.

+      * 

+-     * @param seed Seed to use

++     * @param t Seed to use

+      * @return true if seed Term has a valid long value, false otherwise

+      */

+     public boolean set_seed_1(Term t) throws PrologError {

+@@ -470,4 +470,4 @@
+         }

+         return true;

+     }

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.5.0/src/alice/tuprolog/lib/JavaLibrary.java
+--- tuprolog-2.5.0.orig/src/alice/tuprolog/lib/JavaLibrary.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/tuprolog/lib/JavaLibrary.java	2012-08-03 03:45:45.000000000 +0200
+@@ -1393,8 +1393,6 @@
+ 
+     /**
+      * Generates a fresh numeric identifier
+-     * 
+-     * @return
+      */
+     protected Struct generateFreshId() {
+         return new Struct("$obj_" + id++);
+diff -ur tuprolog-2.5.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.5.0/src/alice/tuprolog/PrimitiveManager.java
+--- tuprolog-2.5.0.orig/src/alice/tuprolog/PrimitiveManager.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/tuprolog/PrimitiveManager.java	2012-08-03 03:45:45.000000000 +0200
+@@ -89,7 +89,7 @@
+      * This involves identifying structs representing builtin
+      * predicates and functors, and setting up related structures and links
+      *
+-     * @parm term the term to be identified
++     * @param term the term to be identified
+      * @return term with the identified built-in directive
+      */
+     public Term identifyDirective(Term term) {
+@@ -192,4 +192,4 @@
+ 		return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
+ 	}
+     /**/
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.5.0/src/alice/tuprologx/ide/Console.java
+--- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/Console.java	2012-08-03 02:38:20.000000000 +0200
++++ tuprolog-2.5.0/src/alice/tuprologx/ide/Console.java	2012-08-03 03:45:45.000000000 +0200
+@@ -10,8 +10,5 @@
+     public void getNextSolution();

+     public void acceptSolution();

+     public void stopEngine();

+-    /**

+-	 * @uml.property  name="goal"

+-	 */

+     public String getGoal();

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.5.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
+--- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java	2012-08-03 02:38:20.000000000 +0200
++++ tuprolog-2.5.0/src/alice/tuprologx/ide/LibraryDialogFrame.java	2012-08-03 03:45:45.000000000 +0200
+@@ -325,7 +325,6 @@
+         displayLibraryManagerStatus();

+     }

+ 

+-    /** @see alice.tuprologx.ide.SwingFrame#onClose()*/

+     public void closeLibraryDialog()

+     {

+         onClose();

+diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.5.0/src/alice/tuprologx/ide/ToolBar.java
+--- tuprolog-2.5.0.orig/src/alice/tuprologx/ide/ToolBar.java	2012-08-03 02:38:20.000000000 +0200
++++ tuprolog-2.5.0/src/alice/tuprologx/ide/ToolBar.java	2012-08-03 03:45:45.000000000 +0200
+@@ -242,8 +242,6 @@
+ 

+     /**

+      * Set the tuProlog config frame

+-     *

+-     * @param libraryManager a libraryManager to associate to the libraryDialog 

+      */

+     public void setPrologConfig(PrologConfigFrame configFrame)

+     {

+diff -ur tuprolog-2.5.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.5.0/src/alice/tuprologx/pj/lib/PJLibrary.java
+--- tuprolog-2.5.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java	2012-08-03 02:38:20.000000000 +0200
++++ tuprolog-2.5.0/src/alice/tuprologx/pj/lib/PJLibrary.java	2012-08-03 03:45:45.000000000 +0200
+@@ -1252,7 +1252,6 @@
+ 	
+ 	/**
+ 	 * Generates a fresh numeric identifier
+-	 * @return
+ 	 */
+ 	protected Struct generateFreshId() {
+ 		return new Struct("$obj_" + id++);        
+diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.5.0/src/alice/util/jedit/InputHandler.java
+--- tuprolog-2.5.0.orig/src/alice/util/jedit/InputHandler.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/util/jedit/InputHandler.java	2012-08-03 03:45:45.000000000 +0200
+@@ -24,7 +24,7 @@
+  *
+  * @author Slava Pestov
+  * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
+- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
++ * @see alice.util.jedit.DefaultInputHandler
+  */
+ public abstract class InputHandler extends KeyAdapter
+ {
+@@ -187,7 +187,7 @@
+     /**
+      * Grabs the next key typed event and invokes the specified
+      * action with the key as a the action command.
+-     * @param action The action
++     * @param listener The action
+      */
+     public void grabNextKeyStroke(ActionListener listener)
+     {
+diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.5.0/src/alice/util/jedit/JEditTextArea.java
+--- tuprolog-2.5.0.orig/src/alice/util/jedit/JEditTextArea.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/util/jedit/JEditTextArea.java	2012-08-03 03:48:07.000000000 +0200
+@@ -1401,7 +1401,7 @@
+ 
+ 	/**
+ 	 * Sets if the selection should be rectangular.
+-	 * @param overwrite True if the selection should be rectangular,
++	 * @param rectSelect True if the selection should be rectangular,
+ 	 * false otherwise.
+ 	 */
+ 	public final void setSelectionRectangular(boolean rectSelect)
+diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.5.0/src/alice/util/jedit/KeywordMap.java
+--- tuprolog-2.5.0.orig/src/alice/util/jedit/KeywordMap.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/util/jedit/KeywordMap.java	2012-08-03 03:45:45.000000000 +0200
+@@ -75,7 +75,7 @@
+     /**
+      * Adds a key-value mapping.
+      * @param keyword The key
+-     * @Param id The value
++     * @param id The value
+      */
+     public void add(String keyword, byte id)
+     {
+@@ -102,9 +102,6 @@
+     }
+ 
+     // protected members
+-    /**
+-	 * @uml.property  name="mapLength"
+-	 */
+     protected int mapLength;
+ 
+     protected int getStringMapKey(String s)
+diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.5.0/src/alice/util/jedit/TextAreaPainter.java
+--- tuprolog-2.5.0.orig/src/alice/util/jedit/TextAreaPainter.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/util/jedit/TextAreaPainter.java	2012-08-03 03:45:45.000000000 +0200
+@@ -75,7 +75,7 @@
+ 
+     /**
+ 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
+-	 * @see  org.gjt.sp.jedit.syntax.Token
++	 * @see  alice.util.jedit.Token
+ 	 */
+     public final SyntaxStyle[] getStyles()
+     {
+@@ -85,7 +85,7 @@
+     /**
+ 	 * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
+ 	 * @param styles  The syntax styles
+-	 * @see  org.gjt.sp.jedit.syntax.Token
++	 * @see  alice.util.jedit.Token
+ 	 */
+     public final void setStyles(SyntaxStyle[] styles)
+     {
+@@ -356,7 +356,7 @@
+ 
+     /**
+      * Repaints the text.
+-     * @param g The graphics context
++     * @param gfx The graphics context
+      */
+     public void paint(Graphics gfx)
+     {
+diff -ur tuprolog-2.5.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.5.0/src/alice/util/jedit/TokenMarker.java
+--- tuprolog-2.5.0.orig/src/alice/util/jedit/TokenMarker.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/util/jedit/TokenMarker.java	2012-08-03 03:45:45.000000000 +0200
+@@ -23,7 +23,7 @@
+  * @author Slava Pestov
+  * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
+  *
+- * @see org.gjt.sp.jedit.syntax.Token
++ * @see alice.util.jedit.Token
+  */
+ public abstract class TokenMarker
+ {
+diff -ur tuprolog-2.5.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.5.0/src/alice/util/ReadOnlyLinkedList.java
+--- tuprolog-2.5.0.orig/src/alice/util/ReadOnlyLinkedList.java	2012-08-03 02:38:21.000000000 +0200
++++ tuprolog-2.5.0/src/alice/util/ReadOnlyLinkedList.java	2012-08-03 03:45:45.000000000 +0200
+@@ -12,10 +12,10 @@
+ import java.util.ListIterator;
+ 
+ /**
+- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
++ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
+  * and ensures that the given list is navigated only.
+  *
+- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
++ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
+  * support modifiers methods, and throws {@link UnsupportedOperationException}
+  * if invoked.
+  *
diff --git a/dev-lang/tuprolog/files/tuprolog-2.6.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.6.0-javadocs.patch
new file mode 100644
index 000000000000..7eba988d5ba3
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.6.0-javadocs.patch
@@ -0,0 +1,454 @@
+diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.6.0/src/alice/tuprolog/ChoicePointStore.java
+--- tuprolog-2.6.0.orig/src/alice/tuprolog/ChoicePointStore.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprolog/ChoicePointStore.java	2013-02-14 12:01:56.000000000 +0100
+@@ -36,7 +36,6 @@
+     

+     /**

+ 	 * Return the actual choice-point store

+-	 * @return

+ 	 */

+     public ChoicePointContext getPointer() {

+         return pointer;

+@@ -45,7 +44,6 @@
+     /**

+      * Check if a choice point exists in the store.

+      * As a side effect, removes choice points which have been already used and are now empty. 

+-     * @return

+      */

+     protected boolean existChoicePoint() {

+         if (pointer == null) return false;

+@@ -93,4 +91,4 @@
+         return l;

+     }

+     

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.6.0/src/alice/tuprolog/ClauseStore.java
+--- tuprolog-2.6.0.orig/src/alice/tuprolog/ClauseStore.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprolog/ClauseStore.java	2013-02-14 12:01:56.000000000 +0100
+@@ -62,8 +62,6 @@
+     
+     /**
+      * Verify if there is a term in compatibleGoals compatible with goal. 
+-     * @param goal
+-     * @param compGoals
+      * @return true if compatible or false otherwise.
+      */
+     protected boolean existCompatibleClause() {
+@@ -160,4 +158,4 @@
+     }
+     
+     
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/EngineManager.java tuprolog-2.6.0/src/alice/tuprolog/EngineManager.java
+--- tuprolog-2.6.0.orig/src/alice/tuprolog/EngineManager.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprolog/EngineManager.java	2013-02-14 12:01:56.000000000 +0100
+@@ -96,7 +96,7 @@
+     /**

+      *  Solves a query

+      *

+-     * @param g the term representing the goal to be demonstrated

++     * @param query the term representing the goal to be demonstrated

+      * @return the result of the demonstration

+      * @see SolveInfo

+      **/

+@@ -243,4 +243,4 @@
+     }

+     

+     

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.6.0/src/alice/tuprolog/event/SpyEvent.java
+--- tuprolog-2.6.0.orig/src/alice/tuprolog/event/SpyEvent.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprolog/event/SpyEvent.java	2013-02-14 12:01:56.000000000 +0100
+@@ -33,10 +33,6 @@
+ 	 * event description

+ 	 */

+     private String msg;

+-    /**

+-	 * @uml.property  name="env"

+-	 * @uml.associationEnd  

+-	 */

+     private Engine env;

+ 

+     public SpyEvent(Object source, String msg_) {

+@@ -63,4 +59,4 @@
+         return msg + ((env == null) ? "" : env.toString());

+     }

+ 

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/BasicLibrary.java
+--- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/BasicLibrary.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprolog/lib/BasicLibrary.java	2013-02-14 12:01:56.000000000 +0100
+@@ -116,7 +116,7 @@
+     /**

+      * Loads a library constructed from a theory.

+      * 

+-     * @param theory

++     * @param th

+      *            theory text

+      * @param libName

+      *            name of the library

+@@ -1358,4 +1358,4 @@
+                 { "\\", "expression_bitwise_not", "functor" } };

+     }

+ 

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/IOLibrary.java
+--- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/IOLibrary.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprolog/lib/IOLibrary.java	2013-02-14 12:01:56.000000000 +0100
+@@ -375,7 +375,7 @@
+     /**

+      * Sets an arbitrary seed for the Random object.

+      * 

+-     * @param seed Seed to use

++     * @param t Seed to use

+      * @return true if seed Term has a valid long value, false otherwise

+      */

+     public boolean set_seed_1(Term t) throws PrologError {

+@@ -470,4 +470,4 @@
+         }

+         return true;

+     }

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.6.0/src/alice/tuprolog/lib/JavaLibrary.java
+--- tuprolog-2.6.0.orig/src/alice/tuprolog/lib/JavaLibrary.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprolog/lib/JavaLibrary.java	2013-02-14 12:12:49.000000000 +0100
+@@ -265,7 +265,7 @@
+      * @author Michele Mannino
+      * Creates of a java object - not backtrackable case
+      * @param className The name of the class 
+-     * @oaram path The list of the paths where the class may be contained
++     * @param paths The list of the paths where the class may be contained
+      * @param argl The list of the arguments used by the constructor
+      * @param id The name of the prolog term
+      * @throws JavaException
+@@ -1745,8 +1745,6 @@
+ 
+     /**
+      * Generates a fresh numeric identifier
+-     * 
+-     * @return
+      */
+     protected Struct generateFreshId() {
+         return new Struct("$obj_" + id++);
+@@ -2099,4 +2097,4 @@
+         this.eventFullClass = eventClass;
+         listenerInterfaceName = n;
+     }
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.6.0/src/alice/tuprolog/LibraryManager.java
+--- tuprolog-2.6.0.orig/src/alice/tuprolog/LibraryManager.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprolog/LibraryManager.java	2013-02-14 12:05:56.000000000 +0100
+@@ -49,7 +49,7 @@
+ 	 * If a library with the same name is already present,
+ 	 * a warning event is notified and the request is ignored.
+ 	 *
+-	 * @param the name of the Java class containing the library to be loaded
++	 * @param className the name of the Java class containing the library to be loaded
+ 	 * @return the reference to the Library just loaded
+ 	 * @throws InvalidLibraryException if name is not a valid library
+ 	 */
+@@ -81,8 +81,8 @@
+ 	 * If a library with the same name is already present,
+ 	 * a warning event is notified and the request is ignored.
+ 	 *
+-	 * @param the name of the Java class containing the library to be loaded
+-	 * @param the list of the paths where the library may be contained
++	 * @param className the name of the Java class containing the library to be loaded
++	 * @param paths the list of the paths where the library may be contained
+ 	 * @return the reference to the Library just loaded
+ 	 * @throws InvalidLibraryException if name is not a valid library
+ 	 */
+@@ -305,4 +305,4 @@
+ 	
+ 	
+ 
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.6.0/src/alice/tuprolog/PrimitiveManager.java
+--- tuprolog-2.6.0.orig/src/alice/tuprolog/PrimitiveManager.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprolog/PrimitiveManager.java	2013-02-14 12:01:56.000000000 +0100
+@@ -89,7 +89,7 @@
+      * This involves identifying structs representing builtin
+      * predicates and functors, and setting up related structures and links
+      *
+-     * @parm term the term to be identified
++     * @param term the term to be identified
+      * @return term with the identified built-in directive
+      */
+     public Term identifyDirective(Term term) {
+@@ -192,4 +192,4 @@
+ 		return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
+ 	}
+     /**/
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.6.0.orig/src/alice/tuprolog/Struct.java tuprolog-2.6.0/src/alice/tuprolog/Struct.java
+--- tuprolog-2.6.0.orig/src/alice/tuprolog/Struct.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprolog/Struct.java	2013-02-14 12:06:46.000000000 +0100
+@@ -201,7 +201,7 @@
+     }
+     
+     /**
+-	 * @return
++	 * @return predicateIndicator
+ 	 */
+     String getPredicateIndicator() {
+         return predicateIndicator;
+@@ -894,4 +894,4 @@
+ 	}
+     /**/
+     
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.6.0/src/alice/tuprologx/ide/Console.java
+--- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/Console.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprologx/ide/Console.java	2013-02-14 12:01:56.000000000 +0100
+@@ -10,8 +10,5 @@
+     public void getNextSolution();

+     public void acceptSolution();

+     public void stopEngine();

+-    /**

+-	 * @uml.property  name="goal"

+-	 */

+     public String getGoal();

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
+--- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryDialogFrame.java	2013-02-14 12:12:14.000000000 +0100
+@@ -370,7 +370,7 @@
+      * Add a library from file chooser path.

+      *

+      * @param libraryClassname The name of the .class of the library to be added.

+-     * @param path from file chooser.

++     * @param file from file chooser.

+      */

+     public void addLibrary(String libraryClassname, File file)

+     {

+@@ -498,7 +498,6 @@
+         displayLibraryManagerStatus();

+     }

+ 

+-    /** @see alice.tuprologx.ide.SwingFrame#onClose()*/

+     public void closeLibraryDialog()

+     {

+         onClose();

+diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryManager.java
+--- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/LibraryManager.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprologx/ide/LibraryManager.java	2013-02-14 12:11:42.000000000 +0100
+@@ -131,7 +131,7 @@
+ 	     * Add a library to the manager.

+ 	     *

+ 	     * @param libraryClassname The name of the .class of the library to be added.

+-	     * @param path The path where is contained the library.

++	     * @param file The path where is contained the library.

+ 	     * @throws ClassNotFoundException if the library class cannot be found.

+ 	     * @throws InvalidLibraryException if the library is not a valid tuProlog library.

+ 	     */

+@@ -235,7 +235,7 @@
+      * Load a library from the Library Manager into the engine.

+      *

+      * @param library The library to be loaded into the engine.

+-     * @param path The library path where is contained the library.

++     * @param file The library path where is contained the library.

+      * @throws InvalidLibraryException

+      */

+     public void loadLibrary(String library, File file) throws InvalidLibraryException {

+@@ -290,4 +290,4 @@
+ 				klass.getName().replace('.', '/') + ".class");

+ 	}

+ 

+-} // end LibraryManager class
+\ No newline at end of file
++} // end LibraryManager class

+diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.6.0/src/alice/tuprologx/ide/ToolBar.java
+--- tuprolog-2.6.0.orig/src/alice/tuprologx/ide/ToolBar.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprologx/ide/ToolBar.java	2013-02-14 12:01:56.000000000 +0100
+@@ -242,8 +242,6 @@
+ 

+     /**

+      * Set the tuProlog config frame

+-     *

+-     * @param libraryManager a libraryManager to associate to the libraryDialog 

+      */

+     public void setPrologConfig(PrologConfigFrame configFrame)

+     {

+diff -ur tuprolog-2.6.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.6.0/src/alice/tuprologx/pj/lib/PJLibrary.java
+--- tuprolog-2.6.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/tuprologx/pj/lib/PJLibrary.java	2013-02-14 12:01:56.000000000 +0100
+@@ -1252,7 +1252,6 @@
+ 	
+ 	/**
+ 	 * Generates a fresh numeric identifier
+-	 * @return
+ 	 */
+ 	protected Struct generateFreshId() {
+ 		return new Struct("$obj_" + id++);        
+diff -ur tuprolog-2.6.0.orig/src/alice/util/DynamicURLClassLoader.java tuprolog-2.6.0/src/alice/util/DynamicURLClassLoader.java
+--- tuprolog-2.6.0.orig/src/alice/util/DynamicURLClassLoader.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/util/DynamicURLClassLoader.java	2013-02-14 12:10:02.000000000 +0100
+@@ -35,7 +35,7 @@
+ 	

+     /**

+      * Constructor that specifies the URLs array.

+-	 * @param URL[] urls - Used to load a directory a URL ends with "/" or "\"

++	 * @param urls - Used to load a directory a URL ends with "/" or "\"

+ 	 * otherwise it loads a class contained into a .jar

+ 	 */

+ 

+@@ -148,7 +148,7 @@
+ 	

+ 	/**

+ 	 * Remove array URLs method.

+-	 * @param urls - URL to be removed.

++	 * @param url - URL to be removed.

+ 	 */

+ 

+ 	public void removeURL(URL url) throws IllegalArgumentException

+diff -ur tuprolog-2.6.0.orig/src/alice/util/InspectionUtils.java tuprolog-2.6.0/src/alice/util/InspectionUtils.java
+--- tuprolog-2.6.0.orig/src/alice/util/InspectionUtils.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/util/InspectionUtils.java	2013-02-14 12:09:22.000000000 +0100
+@@ -14,9 +14,9 @@
+ 	/**
+ 	 * @author Michele Mannino
+ 	 * 
+-	 * @param type: class to be inspected
+-	 * @param methodName: name of method
+-	 * @param parms: array of params
++	 * @param type class to be inspected
++	 * @param methodName name of method
++	 * @param parms array of params
+ 	 */
+ 	public static Method searchForMethod(Class<?> type, String methodName, Class<?>[] parms) {
+ 	    Method[] methods = type.getMethods();
+diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.6.0/src/alice/util/jedit/InputHandler.java
+--- tuprolog-2.6.0.orig/src/alice/util/jedit/InputHandler.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/util/jedit/InputHandler.java	2013-02-14 12:01:56.000000000 +0100
+@@ -24,7 +24,7 @@
+  *
+  * @author Slava Pestov
+  * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
+- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
++ * @see alice.util.jedit.DefaultInputHandler
+  */
+ public abstract class InputHandler extends KeyAdapter
+ {
+@@ -187,7 +187,7 @@
+     /**
+      * Grabs the next key typed event and invokes the specified
+      * action with the key as a the action command.
+-     * @param action The action
++     * @param listener The action
+      */
+     public void grabNextKeyStroke(ActionListener listener)
+     {
+diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.6.0/src/alice/util/jedit/JEditTextArea.java
+--- tuprolog-2.6.0.orig/src/alice/util/jedit/JEditTextArea.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/util/jedit/JEditTextArea.java	2013-02-14 12:01:56.000000000 +0100
+@@ -1401,7 +1401,7 @@
+ 
+ 	/**
+ 	 * Sets if the selection should be rectangular.
+-	 * @param overwrite True if the selection should be rectangular,
++	 * @param rectSelect True if the selection should be rectangular,
+ 	 * false otherwise.
+ 	 */
+ 	public final void setSelectionRectangular(boolean rectSelect)
+diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.6.0/src/alice/util/jedit/KeywordMap.java
+--- tuprolog-2.6.0.orig/src/alice/util/jedit/KeywordMap.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/util/jedit/KeywordMap.java	2013-02-14 12:01:56.000000000 +0100
+@@ -75,7 +75,7 @@
+     /**
+      * Adds a key-value mapping.
+      * @param keyword The key
+-     * @Param id The value
++     * @param id The value
+      */
+     public void add(String keyword, byte id)
+     {
+@@ -102,9 +102,6 @@
+     }
+ 
+     // protected members
+-    /**
+-	 * @uml.property  name="mapLength"
+-	 */
+     protected int mapLength;
+ 
+     protected int getStringMapKey(String s)
+diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.6.0/src/alice/util/jedit/TextAreaPainter.java
+--- tuprolog-2.6.0.orig/src/alice/util/jedit/TextAreaPainter.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/util/jedit/TextAreaPainter.java	2013-02-14 12:01:56.000000000 +0100
+@@ -75,7 +75,7 @@
+ 
+     /**
+ 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
+-	 * @see  org.gjt.sp.jedit.syntax.Token
++	 * @see  alice.util.jedit.Token
+ 	 */
+     public final SyntaxStyle[] getStyles()
+     {
+@@ -85,7 +85,7 @@
+     /**
+ 	 * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
+ 	 * @param styles  The syntax styles
+-	 * @see  org.gjt.sp.jedit.syntax.Token
++	 * @see  alice.util.jedit.Token
+ 	 */
+     public final void setStyles(SyntaxStyle[] styles)
+     {
+@@ -356,7 +356,7 @@
+ 
+     /**
+      * Repaints the text.
+-     * @param g The graphics context
++     * @param gfx The graphics context
+      */
+     public void paint(Graphics gfx)
+     {
+diff -ur tuprolog-2.6.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.6.0/src/alice/util/jedit/TokenMarker.java
+--- tuprolog-2.6.0.orig/src/alice/util/jedit/TokenMarker.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/util/jedit/TokenMarker.java	2013-02-14 12:01:56.000000000 +0100
+@@ -23,7 +23,7 @@
+  * @author Slava Pestov
+  * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
+  *
+- * @see org.gjt.sp.jedit.syntax.Token
++ * @see alice.util.jedit.Token
+  */
+ public abstract class TokenMarker
+ {
+diff -ur tuprolog-2.6.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.6.0/src/alice/util/ReadOnlyLinkedList.java
+--- tuprolog-2.6.0.orig/src/alice/util/ReadOnlyLinkedList.java	2013-02-14 12:01:32.000000000 +0100
++++ tuprolog-2.6.0/src/alice/util/ReadOnlyLinkedList.java	2013-02-14 12:01:56.000000000 +0100
+@@ -12,10 +12,10 @@
+ import java.util.ListIterator;
+ 
+ /**
+- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
++ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
+  * and ensures that the given list is navigated only.
+  *
+- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
++ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
+  * support modifiers methods, and throws {@link UnsupportedOperationException}
+  * if invoked.
+  *
diff --git a/dev-lang/tuprolog/files/tuprolog-2.7.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.7.0-javadocs.patch
new file mode 100644
index 000000000000..cd67ac58daf5
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.7.0-javadocs.patch
@@ -0,0 +1,437 @@
+diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.7.0/src/alice/tuprolog/ChoicePointStore.java
+--- tuprolog-2.7.0.orig/src/alice/tuprolog/ChoicePointStore.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprolog/ChoicePointStore.java	2013-05-16 13:56:42.000000000 +0200
+@@ -36,7 +36,6 @@
+     

+     /**

+ 	 * Return the actual choice-point store

+-	 * @return

+ 	 */

+     public ChoicePointContext getPointer() {

+         return pointer;

+@@ -45,7 +44,6 @@
+     /**

+      * Check if a choice point exists in the store.

+      * As a side effect, removes choice points which have been already used and are now empty. 

+-     * @return

+      */

+     protected boolean existChoicePoint() {

+         if (pointer == null) return false;

+@@ -93,4 +91,4 @@
+         return l;

+     }

+     

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.7.0/src/alice/tuprolog/ClauseStore.java
+--- tuprolog-2.7.0.orig/src/alice/tuprolog/ClauseStore.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprolog/ClauseStore.java	2013-05-16 13:56:42.000000000 +0200
+@@ -62,8 +62,6 @@
+     
+     /**
+      * Verify if there is a term in compatibleGoals compatible with goal. 
+-     * @param goal
+-     * @param compGoals
+      * @return true if compatible or false otherwise.
+      */
+     protected boolean existCompatibleClause() {
+@@ -160,4 +158,4 @@
+     }
+     
+     
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.7.0/src/alice/tuprolog/event/SpyEvent.java
+--- tuprolog-2.7.0.orig/src/alice/tuprolog/event/SpyEvent.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprolog/event/SpyEvent.java	2013-05-16 13:56:42.000000000 +0200
+@@ -33,10 +33,6 @@
+ 	 * event description

+ 	 */

+     private String msg;

+-    /**

+-	 * @uml.property  name="env"

+-	 * @uml.associationEnd  

+-	 */

+     private Engine env;

+ 

+     public SpyEvent(Object source, String msg_) {

+@@ -63,4 +59,4 @@
+         return msg + ((env == null) ? "" : env.toString());

+     }

+ 

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/BasicLibrary.java
+--- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/BasicLibrary.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprolog/lib/BasicLibrary.java	2013-05-16 13:56:42.000000000 +0200
+@@ -116,7 +116,7 @@
+     /**

+      * Loads a library constructed from a theory.

+      * 

+-     * @param theory

++     * @param th

+      *            theory text

+      * @param libName

+      *            name of the library

+@@ -1358,4 +1358,4 @@
+                 { "\\", "expression_bitwise_not", "functor" } };

+     }

+ 

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/IOLibrary.java
+--- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/IOLibrary.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprolog/lib/IOLibrary.java	2013-05-16 13:56:42.000000000 +0200
+@@ -379,7 +379,7 @@
+     /**

+      * Sets an arbitrary seed for the Random object.

+      * 

+-     * @param seed Seed to use

++     * @param t Seed to use

+      * @return true if seed Term has a valid long value, false otherwise

+      */

+     public boolean set_seed_1(Term t) throws PrologError {

+@@ -474,4 +474,4 @@
+         }

+         return true;

+     }

+-}
+\ No newline at end of file
++}

+Only in tuprolog-2.7.0/src/alice/tuprolog/lib: IOLibrary.java.orig
+diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.7.0/src/alice/tuprolog/lib/JavaLibrary.java
+--- tuprolog-2.7.0.orig/src/alice/tuprolog/lib/JavaLibrary.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprolog/lib/JavaLibrary.java	2013-05-16 13:56:42.000000000 +0200
+@@ -265,7 +265,7 @@
+      * @author Michele Mannino
+      * Creates of a java object - not backtrackable case
+      * @param className The name of the class 
+-     * @oaram path The list of the paths where the class may be contained
++     * @param paths The list of the paths where the class may be contained
+      * @param argl The list of the arguments used by the constructor
+      * @param id The name of the prolog term
+      * @throws JavaException
+@@ -1745,8 +1745,6 @@
+ 
+     /**
+      * Generates a fresh numeric identifier
+-     * 
+-     * @return
+      */
+     protected Struct generateFreshId() {
+         return new Struct("$obj_" + id++);
+@@ -2099,4 +2097,4 @@
+         this.eventFullClass = eventClass;
+         listenerInterfaceName = n;
+     }
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.7.0/src/alice/tuprolog/LibraryManager.java
+--- tuprolog-2.7.0.orig/src/alice/tuprolog/LibraryManager.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprolog/LibraryManager.java	2013-05-16 13:56:42.000000000 +0200
+@@ -49,7 +49,7 @@
+ 	 * If a library with the same name is already present,
+ 	 * a warning event is notified and the request is ignored.
+ 	 *
+-	 * @param the name of the Java class containing the library to be loaded
++	 * @param className the name of the Java class containing the library to be loaded
+ 	 * @return the reference to the Library just loaded
+ 	 * @throws InvalidLibraryException if name is not a valid library
+ 	 */
+@@ -83,8 +83,8 @@
+ 	 * If a library with the same name is already present,
+ 	 * a warning event is notified and the request is ignored.
+ 	 *
+-	 * @param the name of the Java class containing the library to be loaded
+-	 * @param the list of the paths where the library may be contained
++	 * @param className the name of the Java class containing the library to be loaded
++	 * @param paths the list of the paths where the library may be contained
+ 	 * @return the reference to the Library just loaded
+ 	 * @throws InvalidLibraryException if name is not a valid library
+ 	 */
+@@ -314,4 +314,4 @@
+ 	
+ 	
+ 
+-}
+\ No newline at end of file
++}
+Only in tuprolog-2.7.0/src/alice/tuprolog: LibraryManager.java.orig
+diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.7.0/src/alice/tuprolog/PrimitiveManager.java
+--- tuprolog-2.7.0.orig/src/alice/tuprolog/PrimitiveManager.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprolog/PrimitiveManager.java	2013-05-16 13:56:42.000000000 +0200
+@@ -89,7 +89,7 @@
+      * This involves identifying structs representing builtin
+      * predicates and functors, and setting up related structures and links
+      *
+-     * @parm term the term to be identified
++     * @param term the term to be identified
+      * @return term with the identified built-in directive
+      */
+     public Term identifyDirective(Term term) {
+@@ -192,4 +192,4 @@
+ 		return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
+ 	}
+     /**/
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.7.0.orig/src/alice/tuprolog/Struct.java tuprolog-2.7.0/src/alice/tuprolog/Struct.java
+--- tuprolog-2.7.0.orig/src/alice/tuprolog/Struct.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprolog/Struct.java	2013-05-16 13:56:42.000000000 +0200
+@@ -201,7 +201,7 @@
+     }
+     
+     /**
+-	 * @return
++	 * @return predicateIndicator
+ 	 */
+     String getPredicateIndicator() {
+         return predicateIndicator;
+@@ -894,4 +894,4 @@
+ 	}
+     /**/
+     
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.7.0/src/alice/tuprologx/ide/Console.java
+--- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/Console.java	2013-05-16 13:50:41.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprologx/ide/Console.java	2013-05-16 13:56:42.000000000 +0200
+@@ -10,8 +10,5 @@
+     public void getNextSolution();

+     public void acceptSolution();

+     public void stopEngine();

+-    /**

+-	 * @uml.property  name="goal"

+-	 */

+     public String getGoal();

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryDialogFrame.java
+--- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java	2013-05-16 13:50:41.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryDialogFrame.java	2013-05-16 13:56:42.000000000 +0200
+@@ -370,7 +370,7 @@
+      * Add a library from file chooser path.

+      *

+      * @param libraryClassname The name of the .class of the library to be added.

+-     * @param path from file chooser.

++     * @param file from file chooser.

+      */

+     public void addLibrary(String libraryClassname, File file)

+     {

+@@ -498,7 +498,6 @@
+         displayLibraryManagerStatus();

+     }

+ 

+-    /** @see alice.tuprologx.ide.SwingFrame#onClose()*/

+     public void closeLibraryDialog()

+     {

+         onClose();

+diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryManager.java
+--- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/LibraryManager.java	2013-05-16 13:50:41.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprologx/ide/LibraryManager.java	2013-05-16 13:56:42.000000000 +0200
+@@ -131,7 +131,7 @@
+ 	     * Add a library to the manager.

+ 	     *

+ 	     * @param libraryClassname The name of the .class of the library to be added.

+-	     * @param path The path where is contained the library.

++	     * @param file The path where is contained the library.

+ 	     * @throws ClassNotFoundException if the library class cannot be found.

+ 	     * @throws InvalidLibraryException if the library is not a valid tuProlog library.

+ 	     */

+@@ -235,7 +235,7 @@
+      * Load a library from the Library Manager into the engine.

+      *

+      * @param library The library to be loaded into the engine.

+-     * @param path The library path where is contained the library.

++     * @param file The library path where is contained the library.

+      * @throws InvalidLibraryException

+      */

+     public void loadLibrary(String library, File file) throws InvalidLibraryException {

+@@ -290,4 +290,4 @@
+ 				klass.getName().replace('.', '/') + ".class");

+ 	}

+ 

+-} // end LibraryManager class
+\ No newline at end of file
++} // end LibraryManager class

+diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.7.0/src/alice/tuprologx/ide/ToolBar.java
+--- tuprolog-2.7.0.orig/src/alice/tuprologx/ide/ToolBar.java	2013-05-16 13:50:41.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprologx/ide/ToolBar.java	2013-05-16 13:56:42.000000000 +0200
+@@ -242,8 +242,6 @@
+ 

+     /**

+      * Set the tuProlog config frame

+-     *

+-     * @param libraryManager a libraryManager to associate to the libraryDialog 

+      */

+     public void setPrologConfig(PrologConfigFrame configFrame)

+     {

+diff -ur tuprolog-2.7.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.7.0/src/alice/tuprologx/pj/lib/PJLibrary.java
+--- tuprolog-2.7.0.orig/src/alice/tuprologx/pj/lib/PJLibrary.java	2013-05-16 13:50:41.000000000 +0200
++++ tuprolog-2.7.0/src/alice/tuprologx/pj/lib/PJLibrary.java	2013-05-16 13:56:42.000000000 +0200
+@@ -1252,7 +1252,6 @@
+ 	
+ 	/**
+ 	 * Generates a fresh numeric identifier
+-	 * @return
+ 	 */
+ 	protected Struct generateFreshId() {
+ 		return new Struct("$obj_" + id++);        
+diff -ur tuprolog-2.7.0.orig/src/alice/util/DynamicURLClassLoader.java tuprolog-2.7.0/src/alice/util/DynamicURLClassLoader.java
+--- tuprolog-2.7.0.orig/src/alice/util/DynamicURLClassLoader.java	2013-05-16 13:50:43.000000000 +0200
++++ tuprolog-2.7.0/src/alice/util/DynamicURLClassLoader.java	2013-05-16 13:56:42.000000000 +0200
+@@ -35,7 +35,7 @@
+ 	

+     /**

+      * Constructor that specifies the URLs array.

+-	 * @param URL[] urls - Used to load a directory a URL ends with "/" or "\"

++	 * @param urls - Used to load a directory a URL ends with "/" or "\"

+ 	 * otherwise it loads a class contained into a .jar

+ 	 */

+ 

+@@ -148,7 +148,7 @@
+ 	

+ 	/**

+ 	 * Remove array URLs method.

+-	 * @param urls - URL to be removed.

++	 * @param url - URL to be removed.

+ 	 */

+ 

+ 	public void removeURL(URL url) throws IllegalArgumentException

+diff -ur tuprolog-2.7.0.orig/src/alice/util/InspectionUtils.java tuprolog-2.7.0/src/alice/util/InspectionUtils.java
+--- tuprolog-2.7.0.orig/src/alice/util/InspectionUtils.java	2013-05-16 13:50:43.000000000 +0200
++++ tuprolog-2.7.0/src/alice/util/InspectionUtils.java	2013-05-16 13:56:42.000000000 +0200
+@@ -14,9 +14,9 @@
+ 	/**
+ 	 * @author Michele Mannino
+ 	 * 
+-	 * @param type: class to be inspected
+-	 * @param methodName: name of method
+-	 * @param parms: array of params
++	 * @param type class to be inspected
++	 * @param methodName name of method
++	 * @param parms array of params
+ 	 */
+ 	public static Method searchForMethod(Class<?> type, String methodName, Class<?>[] parms) {
+ 	    Method[] methods = type.getMethods();
+diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.7.0/src/alice/util/jedit/InputHandler.java
+--- tuprolog-2.7.0.orig/src/alice/util/jedit/InputHandler.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/util/jedit/InputHandler.java	2013-05-16 13:56:42.000000000 +0200
+@@ -24,7 +24,7 @@
+  *
+  * @author Slava Pestov
+  * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
+- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
++ * @see alice.util.jedit.DefaultInputHandler
+  */
+ public abstract class InputHandler extends KeyAdapter
+ {
+@@ -187,7 +187,7 @@
+     /**
+      * Grabs the next key typed event and invokes the specified
+      * action with the key as a the action command.
+-     * @param action The action
++     * @param listener The action
+      */
+     public void grabNextKeyStroke(ActionListener listener)
+     {
+diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.7.0/src/alice/util/jedit/JEditTextArea.java
+--- tuprolog-2.7.0.orig/src/alice/util/jedit/JEditTextArea.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/util/jedit/JEditTextArea.java	2013-05-16 13:56:42.000000000 +0200
+@@ -1401,7 +1401,7 @@
+ 
+ 	/**
+ 	 * Sets if the selection should be rectangular.
+-	 * @param overwrite True if the selection should be rectangular,
++	 * @param rectSelect True if the selection should be rectangular,
+ 	 * false otherwise.
+ 	 */
+ 	public final void setSelectionRectangular(boolean rectSelect)
+diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.7.0/src/alice/util/jedit/KeywordMap.java
+--- tuprolog-2.7.0.orig/src/alice/util/jedit/KeywordMap.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/util/jedit/KeywordMap.java	2013-05-16 13:56:42.000000000 +0200
+@@ -75,7 +75,7 @@
+     /**
+      * Adds a key-value mapping.
+      * @param keyword The key
+-     * @Param id The value
++     * @param id The value
+      */
+     public void add(String keyword, byte id)
+     {
+@@ -102,9 +102,6 @@
+     }
+ 
+     // protected members
+-    /**
+-	 * @uml.property  name="mapLength"
+-	 */
+     protected int mapLength;
+ 
+     protected int getStringMapKey(String s)
+diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.7.0/src/alice/util/jedit/TextAreaPainter.java
+--- tuprolog-2.7.0.orig/src/alice/util/jedit/TextAreaPainter.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/util/jedit/TextAreaPainter.java	2013-05-16 13:56:42.000000000 +0200
+@@ -75,7 +75,7 @@
+ 
+     /**
+ 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
+-	 * @see  org.gjt.sp.jedit.syntax.Token
++	 * @see  alice.util.jedit.Token
+ 	 */
+     public final SyntaxStyle[] getStyles()
+     {
+@@ -85,7 +85,7 @@
+     /**
+ 	 * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
+ 	 * @param styles  The syntax styles
+-	 * @see  org.gjt.sp.jedit.syntax.Token
++	 * @see  alice.util.jedit.Token
+ 	 */
+     public final void setStyles(SyntaxStyle[] styles)
+     {
+@@ -356,7 +356,7 @@
+ 
+     /**
+      * Repaints the text.
+-     * @param g The graphics context
++     * @param gfx The graphics context
+      */
+     public void paint(Graphics gfx)
+     {
+diff -ur tuprolog-2.7.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.7.0/src/alice/util/jedit/TokenMarker.java
+--- tuprolog-2.7.0.orig/src/alice/util/jedit/TokenMarker.java	2013-05-16 13:50:42.000000000 +0200
++++ tuprolog-2.7.0/src/alice/util/jedit/TokenMarker.java	2013-05-16 13:56:42.000000000 +0200
+@@ -23,7 +23,7 @@
+  * @author Slava Pestov
+  * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
+  *
+- * @see org.gjt.sp.jedit.syntax.Token
++ * @see alice.util.jedit.Token
+  */
+ public abstract class TokenMarker
+ {
+diff -ur tuprolog-2.7.0.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.7.0/src/alice/util/ReadOnlyLinkedList.java
+--- tuprolog-2.7.0.orig/src/alice/util/ReadOnlyLinkedList.java	2013-05-16 13:50:43.000000000 +0200
++++ tuprolog-2.7.0/src/alice/util/ReadOnlyLinkedList.java	2013-05-16 13:56:42.000000000 +0200
+@@ -12,10 +12,10 @@
+ import java.util.ListIterator;
+ 
+ /**
+- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
++ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
+  * and ensures that the given list is navigated only.
+  *
+- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
++ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
+  * support modifiers methods, and throws {@link UnsupportedOperationException}
+  * if invoked.
+  *
diff --git a/dev-lang/tuprolog/files/tuprolog-2.7.2-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.7.2-javadocs.patch
new file mode 100644
index 000000000000..9a42cb898510
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.7.2-javadocs.patch
@@ -0,0 +1,479 @@
+diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.7.2/src/alice/tuprolog/ChoicePointStore.java
+--- tuprolog-2.7.2.orig/src/alice/tuprolog/ChoicePointStore.java	2013-07-15 13:38:23.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprolog/ChoicePointStore.java	2013-07-15 13:46:01.000000000 +0200
+@@ -36,7 +36,6 @@
+     

+     /**

+ 	 * Return the actual choice-point store

+-	 * @return

+ 	 */

+     public ChoicePointContext getPointer() {

+         return pointer;

+@@ -45,7 +44,6 @@
+     /**

+      * Check if a choice point exists in the store.

+      * As a side effect, removes choice points which have been already used and are now empty. 

+-     * @return

+      */

+     protected boolean existChoicePoint() {

+         if (pointer == null) return false;

+@@ -93,4 +91,4 @@
+         return l;

+     }

+     

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.7.2/src/alice/tuprolog/ClauseStore.java
+--- tuprolog-2.7.2.orig/src/alice/tuprolog/ClauseStore.java	2013-07-15 13:38:22.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprolog/ClauseStore.java	2013-07-15 13:46:01.000000000 +0200
+@@ -62,8 +62,6 @@
+     
+     /**
+      * Verify if there is a term in compatibleGoals compatible with goal. 
+-     * @param goal
+-     * @param compGoals
+      * @return true if compatible or false otherwise.
+      */
+     protected boolean existCompatibleClause() {
+@@ -160,4 +158,4 @@
+     }
+     
+     
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.7.2/src/alice/tuprolog/event/SpyEvent.java
+--- tuprolog-2.7.2.orig/src/alice/tuprolog/event/SpyEvent.java	2013-07-15 13:38:22.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprolog/event/SpyEvent.java	2013-07-15 13:46:01.000000000 +0200
+@@ -33,10 +33,6 @@
+ 	 * event description

+ 	 */

+     private String msg;

+-    /**

+-	 * @uml.property  name="env"

+-	 * @uml.associationEnd  

+-	 */

+     private Engine env;

+ 

+     public SpyEvent(Object source, String msg_) {

+@@ -63,4 +59,4 @@
+         return msg + ((env == null) ? "" : env.toString());

+     }

+ 

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.7.2/src/alice/tuprolog/lib/BasicLibrary.java
+--- tuprolog-2.7.2.orig/src/alice/tuprolog/lib/BasicLibrary.java	2013-07-15 13:38:22.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprolog/lib/BasicLibrary.java	2013-07-15 13:46:01.000000000 +0200
+@@ -116,7 +116,7 @@
+     /**

+      * Loads a library constructed from a theory.

+      * 

+-     * @param theory

++     * @param th

+      *            theory text

+      * @param libName

+      *            name of the library

+@@ -1358,4 +1358,4 @@
+                 { "\\", "expression_bitwise_not", "functor" } };

+     }

+ 

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.7.2/src/alice/tuprolog/lib/IOLibrary.java
+--- tuprolog-2.7.2.orig/src/alice/tuprolog/lib/IOLibrary.java	2013-07-15 13:38:22.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprolog/lib/IOLibrary.java	2013-07-15 13:46:01.000000000 +0200
+@@ -379,7 +379,7 @@
+     /**

+      * Sets an arbitrary seed for the Random object.

+      * 

+-     * @param seed Seed to use

++     * @param t Seed to use

+      * @return true if seed Term has a valid long value, false otherwise

+      */

+     public boolean set_seed_1(Term t) throws PrologError {

+@@ -474,4 +474,4 @@
+         }

+         return true;

+     }

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.7.2/src/alice/tuprolog/lib/JavaLibrary.java
+--- tuprolog-2.7.2.orig/src/alice/tuprolog/lib/JavaLibrary.java	2013-07-15 13:38:22.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprolog/lib/JavaLibrary.java	2013-07-15 13:46:01.000000000 +0200
+@@ -265,7 +265,7 @@
+      * @author Michele Mannino
+      * Creates of a java object - not backtrackable case
+      * @param className The name of the class 
+-     * @oaram path The list of the paths where the class may be contained
++     * @param paths The list of the paths where the class may be contained
+      * @param argl The list of the arguments used by the constructor
+      * @param id The name of the prolog term
+      * @throws JavaException
+@@ -1745,8 +1745,6 @@
+ 
+     /**
+      * Generates a fresh numeric identifier
+-     * 
+-     * @return
+      */
+     protected Struct generateFreshId() {
+         return new Struct("$obj_" + id++);
+@@ -2099,4 +2097,4 @@
+         this.eventFullClass = eventClass;
+         listenerInterfaceName = n;
+     }
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.7.2/src/alice/tuprolog/LibraryManager.java
+--- tuprolog-2.7.2.orig/src/alice/tuprolog/LibraryManager.java	2013-07-15 13:38:22.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprolog/LibraryManager.java	2013-07-15 13:46:01.000000000 +0200
+@@ -49,7 +49,7 @@
+ 	 * If a library with the same name is already present,
+ 	 * a warning event is notified and the request is ignored.
+ 	 *
+-	 * @param the name of the Java class containing the library to be loaded
++	 * @param className the name of the Java class containing the library to be loaded
+ 	 * @return the reference to the Library just loaded
+ 	 * @throws InvalidLibraryException if name is not a valid library
+ 	 */
+@@ -83,8 +83,8 @@
+ 	 * If a library with the same name is already present,
+ 	 * a warning event is notified and the request is ignored.
+ 	 *
+-	 * @param the name of the Java class containing the library to be loaded
+-	 * @param the list of the paths where the library may be contained
++	 * @param className the name of the Java class containing the library to be loaded
++	 * @param paths the list of the paths where the library may be contained
+ 	 * @return the reference to the Library just loaded
+ 	 * @throws InvalidLibraryException if name is not a valid library
+ 	 */
+@@ -314,4 +314,4 @@
+ 	
+ 	
+ 
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.7.2/src/alice/tuprolog/PrimitiveManager.java
+--- tuprolog-2.7.2.orig/src/alice/tuprolog/PrimitiveManager.java	2013-07-15 13:38:22.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprolog/PrimitiveManager.java	2013-07-15 13:46:01.000000000 +0200
+@@ -89,7 +89,7 @@
+      * This involves identifying structs representing builtin
+      * predicates and functors, and setting up related structures and links
+      *
+-     * @parm term the term to be identified
++     * @param term the term to be identified
+      * @return term with the identified built-in directive
+      */
+     public Term identifyDirective(Term term) {
+@@ -192,4 +192,4 @@
+ 		return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
+ 	}
+     /**/
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/Struct.java tuprolog-2.7.2/src/alice/tuprolog/Struct.java
+--- tuprolog-2.7.2.orig/src/alice/tuprolog/Struct.java	2013-07-15 13:38:23.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprolog/Struct.java	2013-07-15 13:46:01.000000000 +0200
+@@ -201,7 +201,7 @@
+     }
+     
+     /**
+-	 * @return
++	 * @return predicateIndicator
+ 	 */
+     String getPredicateIndicator() {
+         return predicateIndicator;
+@@ -894,4 +894,4 @@
+ 	}
+     /**/
+     
+-}
+\ No newline at end of file
++}
+diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.7.2/src/alice/tuprologx/ide/Console.java
+--- tuprolog-2.7.2.orig/src/alice/tuprologx/ide/Console.java	2013-07-15 13:38:21.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprologx/ide/Console.java	2013-07-15 13:46:01.000000000 +0200
+@@ -10,8 +10,5 @@
+     public void getNextSolution();

+     public void acceptSolution();

+     public void stopEngine();

+-    /**

+-	 * @uml.property  name="goal"

+-	 */

+     public String getGoal();

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryDialogFrame.java
+--- tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java	2013-07-15 13:38:21.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryDialogFrame.java	2013-07-15 13:46:01.000000000 +0200
+@@ -370,7 +370,7 @@
+      * Add a library from file chooser path.

+      *

+      * @param libraryClassname The name of the .class of the library to be added.

+-     * @param path from file chooser.

++     * @param file from file chooser.

+      */

+     public void addLibrary(String libraryClassname, File file)

+     {

+@@ -500,7 +500,6 @@
+         displayLibraryManagerStatus();

+     }

+ 

+-    /** @see alice.tuprologx.ide.SwingFrame#onClose()*/

+     public void closeLibraryDialog()

+     {

+         onClose();

+diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryManager.java
+--- tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryManager.java	2013-07-15 13:38:21.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryManager.java	2013-07-15 13:46:01.000000000 +0200
+@@ -131,7 +131,7 @@
+ 	     * Add a library to the manager.

+ 	     *

+ 	     * @param libraryClassname The name of the .class of the library to be added.

+-	     * @param path The path where is contained the library.

++	     * @param file The path where is contained the library.

+ 	     * @throws ClassNotFoundException if the library class cannot be found.

+ 	     * @throws InvalidLibraryException if the library is not a valid tuProlog library.

+ 	     */

+@@ -236,7 +236,7 @@
+      * Load a library from the Library Manager into the engine.

+      *

+      * @param library The library to be loaded into the engine.

+-     * @param path The library path where is contained the library.

++     * @param file The library path where is contained the library.

+      * @throws InvalidLibraryException

+      */

+     public void loadLibrary(String library, File file) throws InvalidLibraryException {

+@@ -291,4 +291,4 @@
+ 				klass.getName().replace('.', '/') + ".class");

+ 	}

+ 

+-} // end LibraryManager class
+\ No newline at end of file
++} // end LibraryManager class

+diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.7.2/src/alice/tuprologx/ide/ToolBar.java
+--- tuprolog-2.7.2.orig/src/alice/tuprologx/ide/ToolBar.java	2013-07-15 13:38:21.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprologx/ide/ToolBar.java	2013-07-15 13:46:01.000000000 +0200
+@@ -269,8 +269,6 @@
+ 

+     /**

+      * Set the tuProlog config frame

+-     *

+-     * @param libraryManager a libraryManager to associate to the libraryDialog 

+      */

+     public void setPrologConfig(PrologConfigFrame configFrame)

+     {

+diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.7.2/src/alice/tuprologx/pj/lib/PJLibrary.java
+--- tuprolog-2.7.2.orig/src/alice/tuprologx/pj/lib/PJLibrary.java	2013-07-15 13:38:21.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprologx/pj/lib/PJLibrary.java	2013-07-15 13:46:01.000000000 +0200
+@@ -1252,7 +1252,6 @@
+ 	
+ 	/**
+ 	 * Generates a fresh numeric identifier
+-	 * @return
+ 	 */
+ 	protected Struct generateFreshId() {
+ 		return new Struct("$obj_" + id++);        
+diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/spyframe/SpyFrame.java tuprolog-2.7.2/src/alice/tuprologx/spyframe/SpyFrame.java
+--- tuprolog-2.7.2.orig/src/alice/tuprologx/spyframe/SpyFrame.java	2013-07-15 13:38:21.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprologx/spyframe/SpyFrame.java	2013-07-15 13:51:08.000000000 +0200
+@@ -199,7 +199,7 @@
+ 

+   /**Display the spied information in form of a tree. This method reacts only

+    * on prolog-Calls and skips even those if the number of steps set in

+-   * {@link actionPerformed} is bigger than 1. In this case the number is

++   * actionPerformed is bigger than 1. In this case the number is

+    * decremented to skip these steps. After display the prolog process is

+    * suspended until the user presses enter.

+    * 

+@@ -229,4 +229,4 @@
+     SpyFrame tf=new SpyFrame(theory, goal);

+     tf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

+   }

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/spyframe/Tree.java tuprolog-2.7.2/src/alice/tuprologx/spyframe/Tree.java
+--- tuprolog-2.7.2.orig/src/alice/tuprologx/spyframe/Tree.java	2013-07-15 13:38:21.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprologx/spyframe/Tree.java	2013-07-15 13:50:25.000000000 +0200
+@@ -47,12 +47,12 @@
+   private Line2D.Float line=new Line2D.Float();

+ 

+   /**Creates a component to display a tree.

+-   * @param totree to consult for constructing the tree.

++   * @param treemaker to consult for constructing the tree.

+    */

+   public Tree(ToTree<T> treemaker){this.totree=treemaker;}

+ 

+   /**Creates a component to display a tree.

+-   * @param totree to consult for constructing the tree.

++   * @param treemaker to consult for constructing the tree.

+    * @param str the structure to be displayed as a tree.

+    */

+   public Tree(ToTree<T> treemaker, T str){

+@@ -184,4 +184,4 @@
+     g2.setColor(node.textcolor);

+     g2.drawString(node.text, node.x+border, node.y+border+asc);

+   }

+-}
+\ No newline at end of file
++}

+diff -ur tuprolog-2.7.2.orig/src/alice/util/DynamicURLClassLoader.java tuprolog-2.7.2/src/alice/util/DynamicURLClassLoader.java
+--- tuprolog-2.7.2.orig/src/alice/util/DynamicURLClassLoader.java	2013-07-15 13:38:23.000000000 +0200
++++ tuprolog-2.7.2/src/alice/util/DynamicURLClassLoader.java	2013-07-15 13:46:01.000000000 +0200
+@@ -35,7 +35,7 @@
+ 	

+     /**

+      * Constructor that specifies the URLs array.

+-	 * @param URL[] urls - Used to load a directory a URL ends with "/" or "\"

++	 * @param urls - Used to load a directory a URL ends with "/" or "\"

+ 	 * otherwise it loads a class contained into a .jar

+ 	 */

+ 

+@@ -148,7 +148,7 @@
+ 	

+ 	/**

+ 	 * Remove array URLs method.

+-	 * @param urls - URL to be removed.

++	 * @param url - URL to be removed.

+ 	 */

+ 

+ 	public void removeURL(URL url) throws IllegalArgumentException

+diff -ur tuprolog-2.7.2.orig/src/alice/util/InspectionUtils.java tuprolog-2.7.2/src/alice/util/InspectionUtils.java
+--- tuprolog-2.7.2.orig/src/alice/util/InspectionUtils.java	2013-07-15 13:38:23.000000000 +0200
++++ tuprolog-2.7.2/src/alice/util/InspectionUtils.java	2013-07-15 13:46:01.000000000 +0200
+@@ -14,9 +14,9 @@
+ 	/**
+ 	 * @author Michele Mannino
+ 	 * 
+-	 * @param type: class to be inspected
+-	 * @param methodName: name of method
+-	 * @param parms: array of params
++	 * @param type class to be inspected
++	 * @param methodName name of method
++	 * @param parms array of params
+ 	 */
+ 	public static Method searchForMethod(Class<?> type, String methodName, Class<?>[] parms) {
+ 	    Method[] methods = type.getMethods();
+diff -ur tuprolog-2.7.2.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.7.2/src/alice/util/jedit/InputHandler.java
+--- tuprolog-2.7.2.orig/src/alice/util/jedit/InputHandler.java	2013-07-15 13:38:23.000000000 +0200
++++ tuprolog-2.7.2/src/alice/util/jedit/InputHandler.java	2013-07-15 13:46:01.000000000 +0200
+@@ -24,7 +24,7 @@
+  *
+  * @author Slava Pestov
+  * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
+- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
++ * @see alice.util.jedit.DefaultInputHandler
+  */
+ public abstract class InputHandler extends KeyAdapter
+ {
+@@ -187,7 +187,7 @@
+     /**
+      * Grabs the next key typed event and invokes the specified
+      * action with the key as a the action command.
+-     * @param action The action
++     * @param listener The action
+      */
+     public void grabNextKeyStroke(ActionListener listener)
+     {
+diff -ur tuprolog-2.7.2.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.7.2/src/alice/util/jedit/JEditTextArea.java
+--- tuprolog-2.7.2.orig/src/alice/util/jedit/JEditTextArea.java	2013-07-15 13:38:23.000000000 +0200
++++ tuprolog-2.7.2/src/alice/util/jedit/JEditTextArea.java	2013-07-15 13:46:01.000000000 +0200
+@@ -1401,7 +1401,7 @@
+ 
+ 	/**
+ 	 * Sets if the selection should be rectangular.
+-	 * @param overwrite True if the selection should be rectangular,
++	 * @param rectSelect True if the selection should be rectangular,
+ 	 * false otherwise.
+ 	 */
+ 	public final void setSelectionRectangular(boolean rectSelect)
+diff -ur tuprolog-2.7.2.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.7.2/src/alice/util/jedit/KeywordMap.java
+--- tuprolog-2.7.2.orig/src/alice/util/jedit/KeywordMap.java	2013-07-15 13:38:23.000000000 +0200
++++ tuprolog-2.7.2/src/alice/util/jedit/KeywordMap.java	2013-07-15 13:46:01.000000000 +0200
+@@ -75,7 +75,7 @@
+     /**
+      * Adds a key-value mapping.
+      * @param keyword The key
+-     * @Param id The value
++     * @param id The value
+      */
+     public void add(String keyword, byte id)
+     {
+@@ -102,9 +102,6 @@
+     }
+ 
+     // protected members
+-    /**
+-	 * @uml.property  name="mapLength"
+-	 */
+     protected int mapLength;
+ 
+     protected int getStringMapKey(String s)
+diff -ur tuprolog-2.7.2.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.7.2/src/alice/util/jedit/TextAreaPainter.java
+--- tuprolog-2.7.2.orig/src/alice/util/jedit/TextAreaPainter.java	2013-07-15 13:38:23.000000000 +0200
++++ tuprolog-2.7.2/src/alice/util/jedit/TextAreaPainter.java	2013-07-15 13:46:01.000000000 +0200
+@@ -75,7 +75,7 @@
+ 
+     /**
+ 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
+-	 * @see  org.gjt.sp.jedit.syntax.Token
++	 * @see  alice.util.jedit.Token
+ 	 */
+     public final SyntaxStyle[] getStyles()
+     {
+@@ -85,7 +85,7 @@
+     /**
+ 	 * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
+ 	 * @param styles  The syntax styles
+-	 * @see  org.gjt.sp.jedit.syntax.Token
++	 * @see  alice.util.jedit.Token
+ 	 */
+     public final void setStyles(SyntaxStyle[] styles)
+     {
+@@ -356,7 +356,7 @@
+ 
+     /**
+      * Repaints the text.
+-     * @param g The graphics context
++     * @param gfx The graphics context
+      */
+     public void paint(Graphics gfx)
+     {
+diff -ur tuprolog-2.7.2.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.7.2/src/alice/util/jedit/TokenMarker.java
+--- tuprolog-2.7.2.orig/src/alice/util/jedit/TokenMarker.java	2013-07-15 13:38:23.000000000 +0200
++++ tuprolog-2.7.2/src/alice/util/jedit/TokenMarker.java	2013-07-15 13:46:01.000000000 +0200
+@@ -23,7 +23,7 @@
+  * @author Slava Pestov
+  * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
+  *
+- * @see org.gjt.sp.jedit.syntax.Token
++ * @see alice.util.jedit.Token
+  */
+ public abstract class TokenMarker
+ {
+diff -ur tuprolog-2.7.2.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.7.2/src/alice/util/ReadOnlyLinkedList.java
+--- tuprolog-2.7.2.orig/src/alice/util/ReadOnlyLinkedList.java	2013-07-15 13:38:23.000000000 +0200
++++ tuprolog-2.7.2/src/alice/util/ReadOnlyLinkedList.java	2013-07-15 13:46:01.000000000 +0200
+@@ -12,10 +12,10 @@
+ import java.util.ListIterator;
+ 
+ /**
+- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
++ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
+  * and ensures that the given list is navigated only.
+  *
+- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
++ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
+  * support modifiers methods, and throws {@link UnsupportedOperationException}
+  * if invoked.
+  *
diff --git a/dev-lang/tuprolog/files/tuprolog-2.7.2-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-2.7.2-no-ikvm.patch
new file mode 100644
index 000000000000..539aea342de2
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.7.2-no-ikvm.patch
@@ -0,0 +1,105 @@
+diff -urN tuprolog-2.7.2.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.7.2/src/alice/tuprolog/LibraryManager.java
+--- tuprolog-2.7.2.orig/src/alice/tuprolog/LibraryManager.java	2013-07-15 13:38:22.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprolog/LibraryManager.java	2014-11-09 18:24:47.000000000 +0100
+@@ -8,11 +8,11 @@
+ import java.net.URL;
+ import java.net.URLClassLoader;
+ import java.util.*;
+-import cli.System.Reflection.Assembly;
++//import cli.System.Reflection.Assembly;
+ 
+ import alice.tuprolog.event.LibraryEvent;
+ import alice.tuprolog.event.WarningEvent;
+-import alice.util.AssemblyCustomClassLoader;
++//import alice.util.AssemblyCustomClassLoader;
+ 
+ 
+ /**
+@@ -112,27 +112,7 @@
+ 			}
+ 			else // .NET
+ 			{
+-				Assembly asm = null;
+-				boolean classFound = false;
+-				className = "cli." + className.substring(0, className.indexOf(",")).trim();
+-				for(int i = 0; i < paths.length; i++)
+-				{
+-					try {
+-						asm = Assembly.LoadFrom(paths[i]); 
+-						loader = new AssemblyCustomClassLoader(asm, urls);
+-						lib = (Library) Class.forName(className, true, loader).newInstance();
+-						if(lib != null)
+-						{
+-							classFound = true;
+-							break;
+-						}							
+-					} catch (Exception e) {
+-						e.printStackTrace();
+-						continue;
+-					}
+-				}
+-				if(!classFound)
+-					throw new InvalidLibraryException(className, -1, -1);
++				throw new InvalidLibraryException(className, -1, -1);
+ 			}
+ 			String name = lib.getName();
+ 			Library alib = getLibrary(name);
+diff -urN tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryManager.java
+--- tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryManager.java	2013-07-15 13:38:21.000000000 +0200
++++ tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryManager.java	2014-11-09 18:25:45.000000000 +0100
+@@ -18,7 +18,7 @@
+ package alice.tuprologx.ide;

+ 

+ import alice.tuprolog.*;

+-import alice.util.AssemblyCustomClassLoader;

++//import alice.util.AssemblyCustomClassLoader;

+ 

+ import java.io.File;

+ import java.net.URL;

+@@ -26,7 +26,7 @@
+ import java.util.ArrayList;

+ import java.util.Hashtable;

+ import java.util.StringTokenizer;

+-import cli.System.Reflection.Assembly;

++//import cli.System.Reflection.Assembly;

+ 

+ /**

+  * A dynamic manager for tuProlog libraries.

+@@ -156,10 +156,7 @@
+ 	        	// .NET

+ 	        	if(System.getProperty("java.vm.name").equals("IKVM.NET"))

+ 	        	{

+-	        		Assembly asm = Assembly.LoadFrom(file.getPath());

+-	        		loader = new AssemblyCustomClassLoader(asm, new URL[]{url});

+-	        		libraryClassname = "cli." + libraryClassname.substring(0, 

+-	        				libraryClassname.indexOf(",")).trim();

++	        		throw new InvalidLibraryException(libraryClassname,-1,-1);

+ 	        	}

+ 	        	// JVM

+ 	        	else

+diff -urN tuprolog-2.7.2.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-2.7.2/src/alice/util/AssemblyCustomClassLoader.java
+--- tuprolog-2.7.2.orig/src/alice/util/AssemblyCustomClassLoader.java	2013-07-15 13:38:23.000000000 +0200
++++ tuprolog-2.7.2/src/alice/util/AssemblyCustomClassLoader.java	1970-01-01 01:00:00.000000000 +0100
+@@ -1,21 +0,0 @@
+-package alice.util;

+-

+-import java.net.URL;

+-

+-public class AssemblyCustomClassLoader extends java.net.URLClassLoader

+-{

+-  public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls)

+-  {

+-    super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm));

+-    // explicitly calling addURL() is safer than passing it to the super constructor,

+-    // because this class loader instance may be used during the URL construction.

+-    for (URL url : urls) {

+-    	addURL(url);

+-	}    

+-  }

+-  

+-  public void addUrl(URL url)

+-  {

+-	  addURL(url);

+-  }

+-}
+\ No newline at end of file
diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.0-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-2.9.0-no-ikvm.patch
new file mode 100644
index 000000000000..d94dc66bbac5
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.9.0-no-ikvm.patch
@@ -0,0 +1,116 @@
+diff -urN tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java
+--- tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java	2014-09-29 18:14:21.000000000 +0200
++++ tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java	2015-01-11 14:48:57.000000000 +0100
+@@ -9,11 +9,11 @@
+ import java.net.URL;
+ import java.net.URLClassLoader;
+ import java.util.*;
+-import cli.System.Reflection.Assembly;
++//import cli.System.Reflection.Assembly;
+ 
+ import alice.tuprolog.event.LibraryEvent;
+ import alice.tuprolog.event.WarningEvent;
+-import alice.util.AssemblyCustomClassLoader;
++//import alice.util.AssemblyCustomClassLoader;
+ 
+ /**
+  * @author Alex Benini
+@@ -179,31 +179,7 @@
+ 				} else
+ 				// .NET
+ 				{
+-					Assembly asm = null;
+-					boolean classFound = false;
+-					className = "cli."
+-							+ className.substring(0, className.indexOf(","))
+-									.trim();
+-					for (int i = 0; i < paths.length; i++)
+-					{
+-						try
+-						{
+-							asm = Assembly.LoadFrom(paths[i]);
+-							loader = new AssemblyCustomClassLoader(asm, urls);
+-							lib = (Library) Class.forName(className, true, loader).newInstance();
+-							if (lib != null)
+-							{
+-								classFound = true;
+-								break;
+-							}
+-						} catch (Exception e)
+-						{
+-							e.printStackTrace();
+-							continue;
+-						}
+-					}
+-					if (!classFound)
+-						throw new InvalidLibraryException(className, -1, -1);
++					throw new InvalidLibraryException(className, -1, -1);
+ 				}
+ 			}
+ 
+@@ -462,4 +438,4 @@
+ 		return optimizedDirectory;
+ 	}
+ 
+-}
+\ No newline at end of file
++}
+diff -urN tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java
+--- tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java	2014-09-29 18:14:21.000000000 +0200
++++ tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java	2015-01-11 14:46:23.000000000 +0100
+@@ -18,7 +18,7 @@
+ package alice.tuprologx.ide;

+ 

+ import alice.tuprolog.*;

+-import alice.util.AssemblyCustomClassLoader;

++//import alice.util.AssemblyCustomClassLoader;

+ 

+ import java.io.File;

+ import java.net.URL;

+@@ -26,7 +26,7 @@
+ import java.util.ArrayList;

+ import java.util.Hashtable;

+ import java.util.StringTokenizer;

+-import cli.System.Reflection.Assembly;

++//import cli.System.Reflection.Assembly;

+ 

+ /**

+  * A dynamic manager for tuProlog libraries.

+@@ -155,10 +155,7 @@
+ 	        	// .NET

+ 	        	if(System.getProperty("java.vm.name").equals("IKVM.NET"))

+ 	        	{

+-	        		Assembly asm = Assembly.LoadFrom(file.getPath());

+-	        		loader = new AssemblyCustomClassLoader(asm, new URL[]{url});

+-	        		libraryClassname = "cli." + libraryClassname.substring(0, 

+-	        				libraryClassname.indexOf(",")).trim();

++	        		throw new InvalidLibraryException(libraryClassname,-1,-1);

+ 	        	}

+ 	        	// JVM

+ 	        	else

+diff -urN tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java
+--- tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java	2014-09-29 18:14:21.000000000 +0200
++++ tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java	1970-01-01 01:00:00.000000000 +0100
+@@ -1,21 +0,0 @@
+-package alice.util;

+-

+-import java.net.URL;

+-

+-public class AssemblyCustomClassLoader extends java.net.URLClassLoader

+-{

+-  public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls)

+-  {

+-    super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm));

+-    // explicitly calling addURL() is safer than passing it to the super constructor,

+-    // because this class loader instance may be used during the URL construction.

+-    for (URL url : urls) {

+-    	addURL(url);

+-	}    

+-  }

+-  

+-  public void addUrl(URL url)

+-  {

+-	  addURL(url);

+-  }

+-}
+\ No newline at end of file
diff --git a/dev-lang/tuprolog/metadata.xml b/dev-lang/tuprolog/metadata.xml
new file mode 100644
index 000000000000..1990bb86aace
--- /dev/null
+++ b/dev-lang/tuprolog/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>prolog</herd>
+</pkgmetadata>
diff --git a/dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild b/dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild
new file mode 100644
index 000000000000..1b64ec6dfe1a
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="2p-${PV/_rc5/}"
+
+DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
+HOMEPAGE="http://www.alice.unibo.it/tuProlog/"
+SRC_URI="mirror://sourceforge/tuprolog/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="doc test"
+
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/javassist-3"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	test? ( dev-java/ant-junit )"
+
+S="${WORKDIR}"/${MY_P}-RC5
+
+EANT_GENTOO_CLASSPATH="javassist-3"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-javadocs.patch
+
+	cp "${FILESDIR}"/build.xml "${S}" || die
+	sed -i -e "s|test/unit|test|" "${S}"/build.xml \
+		|| die "sed build.xml failed"
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_test() {
+	cd "${S}"/dist
+	java-pkg_jar-from junit
+	cd "${S}"
+	ANT_TASKS="ant-junit" eant test || die "eant test failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r docs/* || die
+	fi
+}
diff --git a/dev-lang/tuprolog/tuprolog-2.5.0.ebuild b/dev-lang/tuprolog/tuprolog-2.5.0.ebuild
new file mode 100644
index 000000000000..2d96f8135f70
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-2.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
+HOMEPAGE="http://www.alice.unibo.it/tuProlog/"
+SRC_URI="mirror://gentoo/${P}.zip"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc test"
+
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/javassist-3"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	test? ( dev-java/ant-junit )"
+
+S="${WORKDIR}"/${P}
+
+EANT_GENTOO_CLASSPATH="javassist-3"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-javadocs.patch
+
+	cp "${FILESDIR}"/build.xml "${S}" || die
+	sed -i -e "s|test/unit|test|" "${S}"/build.xml \
+		|| die "sed build.xml failed"
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_test() {
+	cd "${S}"/dist
+	java-pkg_jar-from junit
+	cd "${S}"
+	ANT_TASKS="ant-junit" eant test || die "eant test failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r docs/* || die
+	fi
+}
diff --git a/dev-lang/tuprolog/tuprolog-2.6.0.ebuild b/dev-lang/tuprolog/tuprolog-2.6.0.ebuild
new file mode 100644
index 000000000000..74294621632a
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-2.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
+HOMEPAGE="http://www.alice.unibo.it/tuProlog/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=virtual/jdk-1.7
+	>=dev-java/javassist-3"
+
+DEPEND="${RDEPEND}
+	dev-java/ant-core
+	test? (
+		dev-java/ant-junit4
+		dev-java/hamcrest-core
+	)"
+
+S="${WORKDIR}"/${P}
+
+EANT_GENTOO_CLASSPATH="javassist-3"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-javadocs.patch
+
+	cp "${FILESDIR}"/build.xml "${S}" || die
+	sed -i -e "s|test/unit|test|" "${S}"/build.xml \
+		|| die "sed build.xml failed"
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_test() {
+	cd "${S}"/dist
+	java-pkg_jar-from junit-4
+	java-pkg_jar-from hamcrest-core
+	cd "${S}"
+	ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
+		|| die "eant test failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r docs/* || die
+	fi
+}
diff --git a/dev-lang/tuprolog/tuprolog-2.7.0.ebuild b/dev-lang/tuprolog/tuprolog-2.7.0.ebuild
new file mode 100644
index 000000000000..106d49674129
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-2.7.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
+HOMEPAGE="http://tuprolog.unibo.it/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=virtual/jdk-1.7
+	>=dev-java/javassist-3"
+
+DEPEND="${RDEPEND}
+	dev-java/ant-core
+	test? (
+		dev-java/ant-junit4
+		dev-java/hamcrest-core
+	)"
+
+S="${WORKDIR}"/${P}
+
+EANT_GENTOO_CLASSPATH="javassist-3"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-javadocs.patch
+
+	cp "${FILESDIR}"/build.xml "${S}" || die
+	sed -i -e "s|test/unit|test|" "${S}"/build.xml \
+		|| die "sed build.xml failed"
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_test() {
+	cd "${S}"/dist
+	java-pkg_jar-from junit-4
+	java-pkg_jar-from hamcrest-core
+	cd "${S}"
+	ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
+		|| die "eant test failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r docs/* || die
+	fi
+}
diff --git a/dev-lang/tuprolog/tuprolog-2.7.2.ebuild b/dev-lang/tuprolog/tuprolog-2.7.2.ebuild
new file mode 100644
index 000000000000..bce34ee8b0f1
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-2.7.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
+HOMEPAGE="http://tuprolog.unibo.it/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=virtual/jdk-1.7
+	>=dev-java/javassist-3"
+
+DEPEND="${RDEPEND}
+	dev-java/ant-core
+	test? (
+		dev-java/ant-junit4
+		dev-java/hamcrest-core
+	)"
+
+S="${WORKDIR}"/${P}
+
+EANT_GENTOO_CLASSPATH="javassist-3"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-javadocs.patch
+	epatch "${FILESDIR}"/${P}-no-ikvm.patch
+
+	cp "${FILESDIR}"/build.xml "${S}" || die
+	sed -i -e "s|test/unit|test|" "${S}"/build.xml \
+		|| die "sed build.xml failed"
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_test() {
+	cd "${S}"/dist
+	java-pkg_jar-from junit-4
+	java-pkg_jar-from hamcrest-core
+	cd "${S}"
+	ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
+		|| die "eant test failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r docs/* || die
+	fi
+}
diff --git a/dev-lang/tuprolog/tuprolog-2.9.0.ebuild b/dev-lang/tuprolog/tuprolog-2.9.0.ebuild
new file mode 100644
index 000000000000..99ffc9844559
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-2.9.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
+HOMEPAGE="http://tuprolog.unibo.it/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=virtual/jdk-1.7
+	>=dev-java/javassist-3"
+
+DEPEND="${RDEPEND}
+	dev-java/ant-core
+	test? (
+		dev-java/ant-junit4
+		dev-java/hamcrest-core
+	)"
+
+S="${WORKDIR}"/${P}
+
+EANT_GENTOO_CLASSPATH="javassist-3"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-ikvm.patch
+
+	cp "${FILESDIR}"/build.xml "${S}" || die
+	sed -i -e "s|test/unit|test|" "${S}"/build.xml \
+		|| die "sed build.xml failed"
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_test() {
+	cd "${S}"/dist
+	java-pkg_jar-from junit-4
+	java-pkg_jar-from hamcrest-core
+	cd "${S}"
+	ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
+		|| die "eant test failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dojar dist/2p.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r docs/* || die
+	fi
+}