Remove old versions including those relying on deprecated ant-tasks. Closes bug #187604.

(Portage version: 2.1.3_rc9)

13 files changed, 9 insertions, 1163 deletions

diff --git a/dev-lang/tuprolog/ChangeLog b/dev-lang/tuprolog/ChangeLog
index dd31e8cafb2b..4239c08ccad9 100644
--- a/dev-lang/tuprolog/ChangeLog
+++ b/dev-lang/tuprolog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/tuprolog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.21 2007/07/25 07:19:18 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.22 2007/08/04 01:44:53 keri Exp $
+
+  04 Aug 2007; keri <keri@gentoo.org> -files/tuprolog-1.3.0-java1.4.patch,
+  -files/tuprolog-1.3.0-javadocs.patch, -files/tuprolog-2.0.1-java1.4.patch,
+  -files/tuprolog-2.0-java1.4.patch, -files/tuprolog-2.0.1-javadocs.patch,
+  -files/tuprolog-2.0-javadocs.patch, -tuprolog-1.3.0-r1.ebuild,
+  -tuprolog-2.0.ebuild, -tuprolog-2.0.1.ebuild:
+  Remove old versions. tuprolog-2.0.1 used deprecated ant-tasks; closes bug
+  #187604.
 
   25 Jul 2007; Christian Faulhammer <opfer@gentoo.org> tuprolog-2.1.ebuild:
   stable x86, bug 186260
diff --git a/dev-lang/tuprolog/files/digest-tuprolog-1.3.0-r1 b/dev-lang/tuprolog/files/digest-tuprolog-1.3.0-r1
deleted file mode 100644
index 98ee13cc1c8a..000000000000
--- a/dev-lang/tuprolog/files/digest-tuprolog-1.3.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b9b7bcf89ca69c7231fbf07e32718f16 2p-1.3.0.zip 2917856
-RMD160 17c28db76873c4855df06992ffcc41e08d2d08c1 2p-1.3.0.zip 2917856
-SHA256 c6fc6b1fadef7d22d24a7e454ebed4e67851e3960524a8730bbcbdea5216ceec 2p-1.3.0.zip 2917856
diff --git a/dev-lang/tuprolog/files/digest-tuprolog-2.0 b/dev-lang/tuprolog/files/digest-tuprolog-2.0
deleted file mode 100644
index 7442f60e0ca8..000000000000
--- a/dev-lang/tuprolog/files/digest-tuprolog-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aecd5146064cdd3a648501801fb6b6d7 2p-2.0.zip 1784854
-RMD160 7961cf8ec8cca45b4807fa1a8c95c80f73209707 2p-2.0.zip 1784854
-SHA256 14d93c6b22defc6a1e1a285f0f019e45550b982fbd873bf62d37d50b04beaa72 2p-2.0.zip 1784854
diff --git a/dev-lang/tuprolog/files/digest-tuprolog-2.0.1 b/dev-lang/tuprolog/files/digest-tuprolog-2.0.1
deleted file mode 100644
index 381c0c0ed3c7..000000000000
--- a/dev-lang/tuprolog/files/digest-tuprolog-2.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5323b23542077234eec3c3e55306b4bb 2p-2.0.1.zip 1815589
-RMD160 569f2ccef98dd4fcf22923b1cd60c257ad94b5e6 2p-2.0.1.zip 1815589
-SHA256 3f9310f3c304c5196410a1ccd18a1fdd9d481fcf02ee46c04c74f38252428154 2p-2.0.1.zip 1815589
diff --git a/dev-lang/tuprolog/files/tuprolog-1.3.0-java1.4.patch b/dev-lang/tuprolog/files/tuprolog-1.3.0-java1.4.patch
deleted file mode 100644
index a9d3bd3664cf..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-1.3.0-java1.4.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -ur tuprolog-1.3.0.orig/src/alice/tuprologx/ide/AWTFrameLauncher.java tuprolog-1.3.0/src/alice/tuprologx/ide/AWTFrameLauncher.java
---- tuprolog-1.3.0.orig/src/alice/tuprologx/ide/AWTFrameLauncher.java	2005-06-08 09:05:34.000000000 +1200
-+++ tuprolog-1.3.0/src/alice/tuprologx/ide/AWTFrameLauncher.java	2006-10-07 13:43:24.000000000 +1300
-@@ -88,7 +88,7 @@
-                 height = Math.min(height, screenSize.height);

-                 setBounds((screenSize.width - width) / 2, (screenSize.height - height) / 2, width, height);

-             }

--            show();

-+            setVisible(true);

-         }

- 

-         public void update(Graphics g) {

-diff -ur tuprolog-1.3.0.orig/src/alice/tuprologx/ide/Applet.java tuprolog-1.3.0/src/alice/tuprologx/ide/Applet.java
---- tuprolog-1.3.0.orig/src/alice/tuprologx/ide/Applet.java	2005-06-08 09:05:32.000000000 +1200
-+++ tuprolog-1.3.0/src/alice/tuprologx/ide/Applet.java	2006-10-07 13:44:04.000000000 +1300
-@@ -41,7 +41,7 @@
- 			ide.removeWindowListener(listeners[i]);

- 

-     	ide.pack();

--        ide.show();

-+        ide.setVisible(true);

-     }

- 

- } // end Applet class
-\ No newline at end of file
-diff -ur tuprolog-1.3.0.orig/src/alice/tuprologx/ide/DotNetIOManager.java tuprolog-1.3.0/src/alice/tuprologx/ide/DotNetIOManager.java
---- tuprolog-1.3.0.orig/src/alice/tuprologx/ide/DotNetIOManager.java	2005-06-08 09:05:38.000000000 +1200
-+++ tuprolog-1.3.0/src/alice/tuprologx/ide/DotNetIOManager.java	2006-10-07 13:49:09.000000000 +1300
-@@ -46,7 +46,7 @@
-         FileDialog dialog = new FileDialog(parent, "Load Theory", FileDialog.LOAD);

-         dialog.setDirectory(currentLoadDirectory);

-         dialog.setFile("*.pro");

--        dialog.show();

-+        dialog.setVisible(true);

-         String directory = dialog.getDirectory();

-         currentLoadDirectory = directory;

-         String fileName = dialog.getFile();

-@@ -61,7 +61,7 @@
-     public String saveTheoryAs(Prolog engine) throws Exception {

-         FileDialog dialog = new FileDialog(parent, "Save Theory As...", FileDialog.SAVE);

-         dialog.setDirectory(currentSaveDirectory);

--        dialog.show();

-+        dialog.setVisible(true);

-         String directory = dialog.getDirectory();

-         currentSaveDirectory = directory;

-         String fileName = dialog.getFile();

-diff -ur tuprolog-1.3.0.orig/src/alice/tuprologx/ide/GUILauncher.java tuprolog-1.3.0/src/alice/tuprologx/ide/GUILauncher.java
---- tuprolog-1.3.0.orig/src/alice/tuprologx/ide/GUILauncher.java	2005-06-08 09:05:36.000000000 +1200
-+++ tuprolog-1.3.0/src/alice/tuprologx/ide/GUILauncher.java	2006-10-07 13:49:37.000000000 +1300
-@@ -74,7 +74,7 @@
-     private void launchDotNetGUI() {

-         DotNetIDE ide = new DotNetIDE();

-         ide.pack();

--        ide.show();

-+        ide.setVisible(true);

-     }

- 

-     /**

-diff -ur tuprolog-1.3.0.orig/src/alice/util/thinlet/Thinlet.java tuprolog-1.3.0/src/alice/util/thinlet/Thinlet.java
---- tuprolog-1.3.0.orig/src/alice/util/thinlet/Thinlet.java	2005-06-08 09:05:34.000000000 +1200
-+++ tuprolog-1.3.0/src/alice/util/thinlet/Thinlet.java	2006-10-07 13:48:00.000000000 +1300
-@@ -1,4 +1,4 @@
--/* áÁÕôÛûÍí

-+/* ����

- 	Thinlet GUI toolkit - www.thinlet.com

- 	Copyright (C) 2002 Robert Bajzat (robert.bajzat@thinlet.com)

- 	

-@@ -2157,7 +2157,7 @@
- 	 *

- 	 * @return true as focus-transverable component, overwrites the default false value

- 	 */

--	public boolean isFocusTraversable() {

-+	public boolean isFocusable() {

- 		return true;

- 	}

- 

diff --git a/dev-lang/tuprolog/files/tuprolog-1.3.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-1.3.0-javadocs.patch
deleted file mode 100644
index 3f537e8873a4..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-1.3.0-javadocs.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -ur tuprolog-1.3.0.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-1.3.0/src/alice/tuprolog/lib/JavaLibrary.java
---- tuprolog-1.3.0.orig/src/alice/tuprolog/lib/JavaLibrary.java	2006-02-05 13:30:36.000000000 +1300
-+++ tuprolog-1.3.0/src/alice/tuprolog/lib/JavaLibrary.java	2006-02-05 13:54:20.000000000 +1300
-@@ -1210,7 +1210,7 @@
- 
-     /**
-      * Generates a fresh numeric identifier
--     * @return
-+     * @return fresh numeric identifier
-      */
-     protected Struct generateFreshId() {
-     		return new Struct("$obj_" + id++);        
-diff -ur tuprolog-1.3.0.orig/src/alice/tuprolog/Prolog.java tuprolog-1.3.0/src/alice/tuprolog/Prolog.java

---- tuprolog-1.3.0.orig/src/alice/tuprolog/Prolog.java	2006-02-05 13:30:36.000000000 +1300

-+++ tuprolog-1.3.0/src/alice/tuprolog/Prolog.java	2006-02-05 13:34:04.000000000 +1300

-@@ -1337,7 +1337,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

-      */

-     protected void identify(Term term, boolean forceArgumentIdentification) {

-         //System.out.println("IDENTIFYING "+term);

-diff -ur tuprolog-1.3.0.orig/src/alice/util/jedit/InputHandler.java tuprolog-1.3.0/src/alice/util/jedit/InputHandler.java
---- tuprolog-1.3.0.orig/src/alice/util/jedit/InputHandler.java	2006-02-05 13:30:36.000000000 +1300
-+++ tuprolog-1.3.0/src/alice/util/jedit/InputHandler.java	2006-02-05 13:51:12.000000000 +1300
-@@ -24,7 +24,7 @@

-  *
-  * @author Slava Pestov
-  * @version $Id: tuprolog-1.3.0-javadocs.patch,v 1.2 2006/10/06 22:15:59 keri 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-1.3.0.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-1.3.0/src/alice/util/jedit/JEditTextArea.java
---- tuprolog-1.3.0.orig/src/alice/util/jedit/JEditTextArea.java	2006-02-05 13:30:36.000000000 +1300
-+++ tuprolog-1.3.0/src/alice/util/jedit/JEditTextArea.java	2006-02-05 13:43:25.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 tuprolog-1.3.0.orig/src/alice/util/jedit/KeywordMap.java tuprolog-1.3.0/src/alice/util/jedit/KeywordMap.java
---- tuprolog-1.3.0.orig/src/alice/util/jedit/KeywordMap.java	2006-02-05 13:30:36.000000000 +1300
-+++ tuprolog-1.3.0/src/alice/util/jedit/KeywordMap.java	2006-02-05 13:39:39.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 tuprolog-1.3.0.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-1.3.0/src/alice/util/jedit/TextAreaPainter.java
---- tuprolog-1.3.0.orig/src/alice/util/jedit/TextAreaPainter.java	2006-02-05 13:30:36.000000000 +1300
-+++ tuprolog-1.3.0/src/alice/util/jedit/TextAreaPainter.java	2006-02-05 13:50:49.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 tuprolog-1.3.0.orig/src/alice/util/jedit/TokenMarker.java tuprolog-1.3.0/src/alice/util/jedit/TokenMarker.java
---- tuprolog-1.3.0.orig/src/alice/util/jedit/TokenMarker.java	2006-02-05 13:30:36.000000000 +1300
-+++ tuprolog-1.3.0/src/alice/util/jedit/TokenMarker.java	2006-02-05 13:48:41.000000000 +1300
-@@ -24,7 +24,7 @@
-  * @author Slava Pestov
-  * @version $Id: tuprolog-1.3.0-javadocs.patch,v 1.2 2006/10/06 22:15:59 keri 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.0-java1.4.patch b/dev-lang/tuprolog/files/tuprolog-2.0-java1.4.patch
deleted file mode 100644
index 8bfb717e89bd..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.0-java1.4.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -ur src.orig/alice/tuprologx/ide/AWTFrameLauncher.java src/alice/tuprologx/ide/AWTFrameLauncher.java
---- src.orig/alice/tuprologx/ide/AWTFrameLauncher.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/tuprologx/ide/AWTFrameLauncher.java	2007-01-22 09:53:52.000000000 +1300
-@@ -88,7 +88,7 @@
-                 height = Math.min(height, screenSize.height);

-                 setBounds((screenSize.width - width) / 2, (screenSize.height - height) / 2, width, height);

-             }

--            show();

-+            setVisible(true);

-         }

- 

-         public void update(Graphics g) {

-diff -ur src.orig/alice/tuprologx/ide/Applet.java src/alice/tuprologx/ide/Applet.java
---- src.orig/alice/tuprologx/ide/Applet.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/tuprologx/ide/Applet.java	2007-01-22 09:53:52.000000000 +1300
-@@ -41,7 +41,7 @@
- 			ide.removeWindowListener(listeners[i]);

- 

-     	ide.pack();

--        ide.show();

-+        ide.setVisible(true);

-     }

- 

- } // end Applet class
-\ No newline at end of file
-diff -ur src.orig/alice/tuprologx/ide/DotNetIOManager.java src/alice/tuprologx/ide/DotNetIOManager.java
---- src.orig/alice/tuprologx/ide/DotNetIOManager.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/tuprologx/ide/DotNetIOManager.java	2007-01-22 09:53:52.000000000 +1300
-@@ -46,7 +46,7 @@
-         FileDialog dialog = new FileDialog(parent, "Load Theory", FileDialog.LOAD);

-         dialog.setDirectory(currentLoadDirectory);

-         dialog.setFile("*.pro");

--        dialog.show();

-+        dialog.setVisible(true);

-         String directory = dialog.getDirectory();

-         currentLoadDirectory = directory;

-         String fileName = dialog.getFile();

-@@ -61,7 +61,7 @@
-     public String saveTheoryAs(String theory) throws Exception {

-         FileDialog dialog = new FileDialog(parent, "Save Theory As...", FileDialog.SAVE);

-         dialog.setDirectory(currentSaveDirectory);

--        dialog.show();

-+        dialog.setVisible(true);

-         String directory = dialog.getDirectory();

-         currentSaveDirectory = directory;

-         String fileName = dialog.getFile();

-diff -ur src.orig/alice/tuprologx/ide/GUILauncher.java src/alice/tuprologx/ide/GUILauncher.java
---- src.orig/alice/tuprologx/ide/GUILauncher.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/tuprologx/ide/GUILauncher.java	2007-01-22 09:53:52.000000000 +1300
-@@ -74,7 +74,7 @@
-     private void launchDotNetGUI() {

-         DotNetIDE ide = new DotNetIDE();

-         ide.pack();

--        ide.show();

-+        ide.setVisible(true);

-     }

- 

-     /**

-diff -ur src.orig/alice/util/jedit/JEditTextArea.java src/alice/util/jedit/JEditTextArea.java
---- src.orig/alice/util/jedit/JEditTextArea.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/util/jedit/JEditTextArea.java	2007-01-22 10:59:07.000000000 +1300
-@@ -115,10 +115,10 @@
- 	 * Returns if this component can be traversed by pressing
- 	 * the Tab key. This returns false.
- 	 */
--	public final boolean isManagingFocus()
-+	/*public final boolean isManagingFocus()
- 	{
- 		return true;
--	}
-+	}*/
- 
- 	/**
- 	 * Returns the object responsible for painting this text area.
-@@ -507,7 +507,7 @@
- 				if(id == Token.NULL)
- 					fm = painter.getFontMetrics();
- 				else
--					fm = styles[id].getFontMetrics(defaultFont);
-+					fm = styles[id].getFontMetrics(painter, defaultFont);
- 
- 				int length = tokens.length;
- 
-@@ -604,7 +604,7 @@
- 				if(id == Token.NULL)
- 					fm = painter.getFontMetrics();
- 				else
--					fm = styles[id].getFontMetrics(defaultFont);
-+					fm = styles[id].getFontMetrics(painter, defaultFont);
- 
- 				int length = tokens.length;
- 
-diff -ur src.orig/alice/util/jedit/SyntaxStyle.java src/alice/util/jedit/SyntaxStyle.java
---- src.orig/alice/util/jedit/SyntaxStyle.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/util/jedit/SyntaxStyle.java	2007-01-22 11:03:42.000000000 +1300
-@@ -9,6 +9,7 @@
- package alice.util.jedit;
- 
- import java.awt.*;
-+import javax.swing.*;
- import java.util.StringTokenizer;
- 
- /**
-@@ -86,7 +87,7 @@
- 	/**
- 	 * Returns the font metrics for the styled font.
- 	 */
--	public FontMetrics getFontMetrics(Font font)
-+	public FontMetrics getFontMetrics(JComponent component, Font font)
- 	{
- 		if(font == null)
- 			throw new NullPointerException("font param must not"
-@@ -98,7 +99,7 @@
- 			(bold ? Font.BOLD : 0)
- 			| (italic ? Font.ITALIC : 0),
- 			font.getSize());
--		fontMetrics = Toolkit.getDefaultToolkit().getFontMetrics(
-+		fontMetrics = component.getFontMetrics(
- 			lastStyledFont);
- 		return fontMetrics;
- 	}
-diff -ur src.orig/alice/util/jedit/TextAreaPainter.java src/alice/util/jedit/TextAreaPainter.java
---- src.orig/alice/util/jedit/TextAreaPainter.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/util/jedit/TextAreaPainter.java	2007-01-22 10:42:10.000000000 +1300
-@@ -67,10 +67,10 @@
- 	 * Returns if this component can be traversed by pressing the
- 	 * Tab key. This returns false.
- 	 */
--	public final boolean isManagingFocus()
-+	/*public final boolean isManagingFocus()
- 	{
- 		return false;
--	}
-+	}*/
- 
- 	/**
- 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i>
-@@ -350,7 +350,7 @@
- 	public void setFont(Font font)
- 	{
- 		super.setFont(font);
--		fm = Toolkit.getDefaultToolkit().getFontMetrics(font);
-+		fm = getFontMetrics(font);
- 		textArea.recalculateVisibleLines();
- 	}
- 
-diff -ur src.orig/alice/util/thinlet/Thinlet.java src/alice/util/thinlet/Thinlet.java
---- src.orig/alice/util/thinlet/Thinlet.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/util/thinlet/Thinlet.java	2007-01-22 09:55:25.000000000 +1300
-@@ -1,4 +1,4 @@
--/* áÁÕôÛûÍí

-+/* ����

- 	Thinlet GUI toolkit - www.thinlet.com

- 	Copyright (C) 2002 Robert Bajzat (robert.bajzat@thinlet.com)

- 	

-@@ -2157,7 +2157,7 @@
- 	 *

- 	 * @return true as focus-transverable component, overwrites the default false value

- 	 */

--	public boolean isFocusTraversable() {

-+	public boolean isFocusable() {

- 		return true;

- 	}

- 

diff --git a/dev-lang/tuprolog/files/tuprolog-2.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.0-javadocs.patch
deleted file mode 100644
index e89692feaaac..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.0-javadocs.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-diff -ur src.orig/alice/tuprolog/BuiltIn.java src/alice/tuprolog/BuiltIn.java
---- src.orig/alice/tuprolog/BuiltIn.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/tuprolog/BuiltIn.java	2007-01-22 11:07:57.000000000 +1300
-@@ -88,7 +88,6 @@
- 	
- 	/**
- 	 * usata per la retract in basicLibrary
--	 * @return
- 	 */
- 	public boolean $restore_db_0() {
- 		theoryManager.transRestore(engineManager.restoreLastTheoryStatus());
-diff -ur src.orig/alice/tuprolog/ChoicePointStore.java src/alice/tuprolog/ChoicePointStore.java
---- src.orig/alice/tuprolog/ChoicePointStore.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/tuprolog/ChoicePointStore.java	2007-01-22 11:07:58.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 src.orig/alice/tuprolog/ClauseStore.java src/alice/tuprolog/ClauseStore.java
---- src.orig/alice/tuprolog/ClauseStore.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/tuprolog/ClauseStore.java	2007-01-22 11:07:58.000000000 +1300
-@@ -58,8 +58,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 src.orig/alice/tuprolog/EngineManager.java src/alice/tuprolog/EngineManager.java
---- src.orig/alice/tuprolog/EngineManager.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/tuprolog/EngineManager.java	2007-01-22 11:07:58.000000000 +1300
-@@ -81,7 +81,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 src.orig/alice/tuprolog/PrimitiveManager.java src/alice/tuprolog/PrimitiveManager.java
---- src.orig/alice/tuprolog/PrimitiveManager.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/tuprolog/PrimitiveManager.java	2007-01-22 11:07:58.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
- 	 */
- 	public void identifyDirective(Term term) {
- 		identify(term,PrimitiveInfo.DIRECTIVE);
-diff -ur src.orig/alice/tuprolog/lib/BasicLibrary.java src/alice/tuprolog/lib/BasicLibrary.java
---- src.orig/alice/tuprolog/lib/BasicLibrary.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/tuprolog/lib/BasicLibrary.java	2007-01-22 11:11:44.000000000 +1300
-@@ -96,7 +96,7 @@
- 	/**

- 	 * Loads a library constructed from a theory.

- 	 * 

--	 * @param theory theory text

-+	 * @param th theory text

- 	 * @param libName name of the library

- 	 * @return true if the library has been succesfully loaded.

- 	 */

-@@ -173,16 +173,16 @@
- 		return true;

- 	}

- 	

--	public boolean warning_0() {
--		getEngine().setWarning(true);
--		return true;
--	}
--	
--	public boolean nowarning_0() {
--		getEngine().setWarning(false);
--		return true;
--	}
--	
-+	public boolean warning_0() {

-+		getEngine().setWarning(true);

-+		return true;

-+	}

-+	

-+	public boolean nowarning_0() {

-+		getEngine().setWarning(false);

-+		return true;

-+	}

-+	

- 	//

- 	// term type inspection

- 	//

-diff -ur src.orig/alice/tuprolog/lib/JavaLibrary.java src/alice/tuprolog/lib/JavaLibrary.java
---- src.orig/alice/tuprolog/lib/JavaLibrary.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/tuprolog/lib/JavaLibrary.java	2007-01-22 11:07:58.000000000 +1300
-@@ -1227,7 +1227,6 @@
- 	
- 	/**
- 	 * Generates a fresh numeric identifier
--	 * @return
- 	 */
- 	protected Struct generateFreshId() {
- 		return new Struct("$obj_" + id++);        
-diff -ur src.orig/alice/util/jedit/InputHandler.java src/alice/util/jedit/InputHandler.java
---- src.orig/alice/util/jedit/InputHandler.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/util/jedit/InputHandler.java	2007-01-22 11:13:33.000000000 +1300
-@@ -24,7 +24,7 @@
-  *
-  * @author Slava Pestov
-  * @version $Id: tuprolog-2.0-javadocs.patch,v 1.1 2007/01/21 22:31:51 keri 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 src.orig/alice/util/jedit/JEditTextArea.java src/alice/util/jedit/JEditTextArea.java
---- src.orig/alice/util/jedit/JEditTextArea.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/util/jedit/JEditTextArea.java	2007-01-22 11:14:18.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 src.orig/alice/util/jedit/KeywordMap.java src/alice/util/jedit/KeywordMap.java
---- src.orig/alice/util/jedit/KeywordMap.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/util/jedit/KeywordMap.java	2007-01-22 11:14:52.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 src.orig/alice/util/jedit/TextAreaPainter.java src/alice/util/jedit/TextAreaPainter.java
---- src.orig/alice/util/jedit/TextAreaPainter.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/util/jedit/TextAreaPainter.java	2007-01-22 11:17:22.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 src.orig/alice/util/jedit/TokenMarker.java src/alice/util/jedit/TokenMarker.java
---- src.orig/alice/util/jedit/TokenMarker.java	2006-10-30 12:45:16.000000000 +1300
-+++ src/alice/util/jedit/TokenMarker.java	2007-01-22 11:17:55.000000000 +1300
-@@ -24,7 +24,7 @@
-  * @author Slava Pestov
-  * @version $Id: tuprolog-2.0-javadocs.patch,v 1.1 2007/01/21 22:31:51 keri 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.0.1-java1.4.patch b/dev-lang/tuprolog/files/tuprolog-2.0.1-java1.4.patch
deleted file mode 100644
index 644a08a52a1e..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.0.1-java1.4.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -ur src.orig/alice/tuprologx/ide/AWTFrameLauncher.java src/alice/tuprologx/ide/AWTFrameLauncher.java
---- src.orig/alice/tuprologx/ide/AWTFrameLauncher.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/tuprologx/ide/AWTFrameLauncher.java	2007-01-31 19:39:21.000000000 +1300
-@@ -88,7 +88,7 @@
-                 height = Math.min(height, screenSize.height);

-                 setBounds((screenSize.width - width) / 2, (screenSize.height - height) / 2, width, height);

-             }

--            show();

-+            setVisible(true);

-         }

- 

-         public void update(Graphics g) {

-diff -ur src.orig/alice/tuprologx/ide/Applet.java src/alice/tuprologx/ide/Applet.java
---- src.orig/alice/tuprologx/ide/Applet.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/tuprologx/ide/Applet.java	2007-01-31 19:39:21.000000000 +1300
-@@ -41,7 +41,7 @@
- 			ide.removeWindowListener(listeners[i]);

- 

-     	ide.pack();

--        ide.show();

-+        ide.setVisible(true);

-     }

- 

- } // end Applet class
-\ No newline at end of file
-diff -ur src.orig/alice/tuprologx/ide/DotNetIOManager.java src/alice/tuprologx/ide/DotNetIOManager.java
---- src.orig/alice/tuprologx/ide/DotNetIOManager.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/tuprologx/ide/DotNetIOManager.java	2007-01-31 19:39:21.000000000 +1300
-@@ -46,7 +46,7 @@
-         FileDialog dialog = new FileDialog(parent, "Load Theory", FileDialog.LOAD);

-         dialog.setDirectory(currentLoadDirectory);

-         dialog.setFile("*.pro");

--        dialog.show();

-+        dialog.setVisible(true);

-         String directory = dialog.getDirectory();

-         currentLoadDirectory = directory;

-         String fileName = dialog.getFile();

-@@ -61,7 +61,7 @@
-     public String saveTheoryAs(String theory) throws Exception {

-         FileDialog dialog = new FileDialog(parent, "Save Theory As...", FileDialog.SAVE);

-         dialog.setDirectory(currentSaveDirectory);

--        dialog.show();

-+        dialog.setVisible(true);

-         String directory = dialog.getDirectory();

-         currentSaveDirectory = directory;

-         String fileName = dialog.getFile();

-diff -ur src.orig/alice/tuprologx/ide/GUILauncher.java src/alice/tuprologx/ide/GUILauncher.java
---- src.orig/alice/tuprologx/ide/GUILauncher.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/tuprologx/ide/GUILauncher.java	2007-01-31 19:39:21.000000000 +1300
-@@ -74,7 +74,7 @@
-     private void launchDotNetGUI() {

-         DotNetIDE ide = new DotNetIDE();

-         ide.pack();

--        ide.show();

-+        ide.setVisible(true);

-     }

- 

-     /**

-diff -ur src.orig/alice/util/jedit/JEditTextArea.java src/alice/util/jedit/JEditTextArea.java
---- src.orig/alice/util/jedit/JEditTextArea.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/util/jedit/JEditTextArea.java	2007-01-31 19:39:21.000000000 +1300
-@@ -115,10 +115,10 @@
- 	 * Returns if this component can be traversed by pressing
- 	 * the Tab key. This returns false.
- 	 */
--	public final boolean isManagingFocus()
-+	/*public final boolean isManagingFocus()
- 	{
- 		return true;
--	}
-+	}*/
- 
- 	/**
- 	 * Returns the object responsible for painting this text area.
-@@ -507,7 +507,7 @@
- 				if(id == Token.NULL)
- 					fm = painter.getFontMetrics();
- 				else
--					fm = styles[id].getFontMetrics(defaultFont);
-+					fm = styles[id].getFontMetrics(painter, defaultFont);
- 
- 				int length = tokens.length;
- 
-@@ -604,7 +604,7 @@
- 				if(id == Token.NULL)
- 					fm = painter.getFontMetrics();
- 				else
--					fm = styles[id].getFontMetrics(defaultFont);
-+					fm = styles[id].getFontMetrics(painter, defaultFont);
- 
- 				int length = tokens.length;
- 
-diff -ur src.orig/alice/util/jedit/SyntaxStyle.java src/alice/util/jedit/SyntaxStyle.java
---- src.orig/alice/util/jedit/SyntaxStyle.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/util/jedit/SyntaxStyle.java	2007-01-31 19:39:21.000000000 +1300
-@@ -9,6 +9,7 @@
- package alice.util.jedit;
- 
- import java.awt.*;
-+import javax.swing.*;
- import java.util.StringTokenizer;
- 
- /**
-@@ -86,7 +87,7 @@
- 	/**
- 	 * Returns the font metrics for the styled font.
- 	 */
--	public FontMetrics getFontMetrics(Font font)
-+	public FontMetrics getFontMetrics(JComponent component, Font font)
- 	{
- 		if(font == null)
- 			throw new NullPointerException("font param must not"
-@@ -98,7 +99,7 @@
- 			(bold ? Font.BOLD : 0)
- 			| (italic ? Font.ITALIC : 0),
- 			font.getSize());
--		fontMetrics = Toolkit.getDefaultToolkit().getFontMetrics(
-+		fontMetrics = component.getFontMetrics(
- 			lastStyledFont);
- 		return fontMetrics;
- 	}
-diff -ur src.orig/alice/util/jedit/TextAreaPainter.java src/alice/util/jedit/TextAreaPainter.java
---- src.orig/alice/util/jedit/TextAreaPainter.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/util/jedit/TextAreaPainter.java	2007-01-31 19:39:21.000000000 +1300
-@@ -67,10 +67,10 @@
- 	 * Returns if this component can be traversed by pressing the
- 	 * Tab key. This returns false.
- 	 */
--	public final boolean isManagingFocus()
-+	/*public final boolean isManagingFocus()
- 	{
- 		return false;
--	}
-+	}*/
- 
- 	/**
- 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i>
-@@ -350,7 +350,7 @@
- 	public void setFont(Font font)
- 	{
- 		super.setFont(font);
--		fm = Toolkit.getDefaultToolkit().getFontMetrics(font);
-+		fm = getFontMetrics(font);
- 		textArea.recalculateVisibleLines();
- 	}
- 
-diff -ur src.orig/alice/util/thinlet/Thinlet.java src/alice/util/thinlet/Thinlet.java
---- src.orig/alice/util/thinlet/Thinlet.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/util/thinlet/Thinlet.java	2007-01-31 19:39:21.000000000 +1300
-@@ -1,4 +1,4 @@
--/* áÁÕôÛûÍí

-+/* ����

- 	Thinlet GUI toolkit - www.thinlet.com

- 	Copyright (C) 2002 Robert Bajzat (robert.bajzat@thinlet.com)

- 	

-@@ -2157,7 +2157,7 @@
- 	 *

- 	 * @return true as focus-transverable component, overwrites the default false value

- 	 */

--	public boolean isFocusTraversable() {

-+	public boolean isFocusable() {

- 		return true;

- 	}

- 

diff --git a/dev-lang/tuprolog/files/tuprolog-2.0.1-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.0.1-javadocs.patch
deleted file mode 100644
index 9fdb55126c5a..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.0.1-javadocs.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-diff -ur src.orig/alice/tuprolog/BuiltIn.java src/alice/tuprolog/BuiltIn.java
---- src.orig/alice/tuprolog/BuiltIn.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/tuprolog/BuiltIn.java	2007-01-31 19:41:26.000000000 +1300
-@@ -88,7 +88,6 @@
- 	
- 	/**
- 	 * usata per la retract in basicLibrary
--	 * @return
- 	 */
- 	public boolean $restore_db_0() {
- 		theoryManager.transRestore();
-Only in src/alice/tuprolog: BuiltIn.java.orig
-diff -ur src.orig/alice/tuprolog/ChoicePointStore.java src/alice/tuprolog/ChoicePointStore.java
---- src.orig/alice/tuprolog/ChoicePointStore.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/tuprolog/ChoicePointStore.java	2007-01-31 19:41:26.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 src.orig/alice/tuprolog/ClauseStore.java src/alice/tuprolog/ClauseStore.java
---- src.orig/alice/tuprolog/ClauseStore.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/tuprolog/ClauseStore.java	2007-01-31 19:41:26.000000000 +1300
-@@ -58,8 +58,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 src.orig/alice/tuprolog/EngineManager.java src/alice/tuprolog/EngineManager.java
---- src.orig/alice/tuprolog/EngineManager.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/tuprolog/EngineManager.java	2007-01-31 19:41:26.000000000 +1300
-@@ -81,7 +81,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 src.orig/alice/tuprolog/PrimitiveManager.java src/alice/tuprolog/PrimitiveManager.java
---- src.orig/alice/tuprolog/PrimitiveManager.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/tuprolog/PrimitiveManager.java	2007-01-31 19:41:26.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
- 	 */
- 	public void identifyDirective(Term term) {
- 		identify(term,PrimitiveInfo.DIRECTIVE);
-diff -ur src.orig/alice/tuprolog/lib/BasicLibrary.java src/alice/tuprolog/lib/BasicLibrary.java
---- src.orig/alice/tuprolog/lib/BasicLibrary.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/tuprolog/lib/BasicLibrary.java	2007-01-31 19:43:17.000000000 +1300
-@@ -96,7 +96,7 @@
- 	/**
- 	 * Loads a library constructed from a theory.
- 	 * 
--	 * @param theory theory text
-+	 * @param th theory text
- 	 * @param libName name of the library
- 	 * @return true if the library has been succesfully loaded.
- 	 */
-@@ -342,13 +342,13 @@
- 		Term val0 = evalExpression(arg1);
- 		if (val0!=null && val0.isNumber()) {
- 			alice.tuprolog.Number val0n = (alice.tuprolog.Number) val0;
--			if (val0n.isInt()) {

-+			if (val0n.isInt()) {
- 				return new Int(val0n.intValue() * -1);
--			} else if (val0n.isDouble()) {

-+			} else if (val0n.isDouble()) {
- 				return new alice.tuprolog.Double(val0n.doubleValue() * -1);
--			} else if (val0n.isLong()) {

-+			} else if (val0n.isLong()) {
- 				return new alice.tuprolog.Long(val0n.longValue() * -1);
--			} else if (val0n.isFloat()) {

-+			} else if (val0n.isFloat()) {
- 				return new alice.tuprolog.Float(val0n.floatValue() * -1);
- 			} else {
- 				return null;
-@@ -367,24 +367,24 @@
- 		}
- 	}
- 	
--	alice.tuprolog.Number getIntegerNumber(long num) {

--		if (num > Integer.MIN_VALUE && num < Integer.MAX_VALUE)

--			return new Int((int) num);

--		else

--			return new alice.tuprolog.Long(num);

--	}

--	

-+	alice.tuprolog.Number getIntegerNumber(long num) {
-+		if (num > Integer.MIN_VALUE && num < Integer.MAX_VALUE)
-+			return new Int((int) num);
-+		else
-+			return new alice.tuprolog.Long(num);
-+	}
-+	
- 	public Term expression_plus_2(Term arg0,Term arg1) {
- 		Term val0 = evalExpression(arg0);
- 		Term val1 = evalExpression(arg1);
- 		if (val0!=null && val1!=null && val0.isNumber() && (val1.isNumber())) {
- 			alice.tuprolog.Number val0n = (alice.tuprolog.Number) val0;
- 			alice.tuprolog.Number val1n = (alice.tuprolog.Number) val1;
--			if (val0n.isInteger() && (val1n.isInteger()))

--				return getIntegerNumber(val0n.longValue() + val1n.longValue());

--			else

-+			if (val0n.isInteger() && (val1n.isInteger()))
-+				return getIntegerNumber(val0n.longValue() + val1n.longValue());
-+			else
- 				return new alice.tuprolog.Double(val0n.doubleValue() + val1n.doubleValue());
--		} else

-+		} else
- 			return null;
- 		}
- 	
-@@ -394,11 +394,11 @@
- 		if (val0!=null && val1!=null && val0.isNumber() && (val1.isNumber())) {
- 			alice.tuprolog.Number val0n = (alice.tuprolog.Number) val0;
- 			alice.tuprolog.Number val1n = (alice.tuprolog.Number) val1;
--			if (val0n.isInteger() && (val1n.isInteger()))

--				return getIntegerNumber(val0n.longValue() - val1n.longValue());

--			else

-+			if (val0n.isInteger() && (val1n.isInteger()))
-+				return getIntegerNumber(val0n.longValue() - val1n.longValue());
-+			else
- 				return new alice.tuprolog.Double(val0n.doubleValue() - val1n.doubleValue());
--		} else

-+		} else
- 			return null;
- 		}
- 	
-@@ -408,11 +408,11 @@
- 		if (val0!=null && val1!=null && val0.isNumber() && (val1.isNumber())) {
- 			alice.tuprolog.Number val0n = (alice.tuprolog.Number) val0;
- 			alice.tuprolog.Number val1n = (alice.tuprolog.Number) val1;
--			if (val0n.isInteger() && (val1n.isInteger()))

--				return getIntegerNumber(val0n.longValue() * val1n.longValue());

--			else

-+			if (val0n.isInteger() && (val1n.isInteger()))
-+				return getIntegerNumber(val0n.longValue() * val1n.longValue());
-+			else
- 				return new alice.tuprolog.Double(val0n.doubleValue() * val1n.doubleValue());
--		} else

-+		} else
- 			return null;
- 		}
- 	
-@@ -424,7 +424,7 @@
- 			Number val1n = (Number) val1;
- 			alice.tuprolog.Double result = new alice.tuprolog.Double(val0n.doubleValue()/val1n.doubleValue());
- 			if (val0n.isInteger() && val1n.isInteger())
--				return getIntegerNumber(result.longValue());

-+				return getIntegerNumber(result.longValue());
- 			else
- 				return result;
- 		} else
-@@ -437,7 +437,7 @@
- 		if (val0!=null && val1!=null && val0.isNumber() && (val1.isNumber())) {
- 			alice.tuprolog.Number val0n = (alice.tuprolog.Number) val0;
- 			alice.tuprolog.Number val1n = (alice.tuprolog.Number) val1;
--			return getIntegerNumber(val0n.longValue() / val1n.longValue());

-+			return getIntegerNumber(val0n.longValue() / val1n.longValue());
- 		} else {
- 			return null;
- 		}
-Only in src/alice/tuprolog/lib: BasicLibrary.java.orig
-Only in src/alice/tuprolog/lib: BasicLibrary.java.rej
-diff -ur src.orig/alice/tuprolog/lib/JavaLibrary.java src/alice/tuprolog/lib/JavaLibrary.java
---- src.orig/alice/tuprolog/lib/JavaLibrary.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/tuprolog/lib/JavaLibrary.java	2007-01-31 19:41:26.000000000 +1300
-@@ -1227,7 +1227,6 @@
- 	
- 	/**
- 	 * Generates a fresh numeric identifier
--	 * @return
- 	 */
- 	protected Struct generateFreshId() {
- 		return new Struct("$obj_" + id++);        
-diff -ur src.orig/alice/util/jedit/InputHandler.java src/alice/util/jedit/InputHandler.java
---- src.orig/alice/util/jedit/InputHandler.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/util/jedit/InputHandler.java	2007-01-31 19:41:26.000000000 +1300
-@@ -24,7 +24,7 @@
-  *
-  * @author Slava Pestov
-  * @version $Id: tuprolog-2.0.1-javadocs.patch,v 1.3 2007/06/07 08:25:21 keri 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 src.orig/alice/util/jedit/JEditTextArea.java src/alice/util/jedit/JEditTextArea.java
---- src.orig/alice/util/jedit/JEditTextArea.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/util/jedit/JEditTextArea.java	2007-01-31 19:41:26.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 src.orig/alice/util/jedit/KeywordMap.java src/alice/util/jedit/KeywordMap.java
---- src.orig/alice/util/jedit/KeywordMap.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/util/jedit/KeywordMap.java	2007-01-31 19:41:26.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 src.orig/alice/util/jedit/TextAreaPainter.java src/alice/util/jedit/TextAreaPainter.java
---- src.orig/alice/util/jedit/TextAreaPainter.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/util/jedit/TextAreaPainter.java	2007-01-31 19:41:26.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 src.orig/alice/util/jedit/TokenMarker.java src/alice/util/jedit/TokenMarker.java
---- src.orig/alice/util/jedit/TokenMarker.java	2007-01-30 15:12:42.000000000 +1300
-+++ src/alice/util/jedit/TokenMarker.java	2007-01-31 19:41:26.000000000 +1300
-@@ -24,7 +24,7 @@
-  * @author Slava Pestov
-  * @version $Id: tuprolog-2.0.1-javadocs.patch,v 1.3 2007/06/07 08:25:21 keri Exp $
-  *
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
-  */
- public abstract class TokenMarker
- {
diff --git a/dev-lang/tuprolog/tuprolog-1.3.0-r1.ebuild b/dev-lang/tuprolog/tuprolog-1.3.0-r1.ebuild
deleted file mode 100644
index 09f5586eb31d..000000000000
--- a/dev-lang/tuprolog/tuprolog-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-1.3.0-r1.ebuild,v 1.2 2006/10/07 00:59:50 keri Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_P="2p-${PV}"
-MY_SRC_P="src-J2SE-${PV}"
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://www.alice.unibo.it:8080/tuProlog/"
-SRC_URI="http://www.alice.unibo.it/download/tuprolog/files/core/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="doc"
-
-DEPEND=">=virtual/jdk-1.3
-	app-arch/unzip
-	dev-java/ant-core"
-RDEPEND=">=virtual/jdk-1.3"
-
-S="${WORKDIR}"/${P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}"/build.xml "${S}"
-
-	cd "${S}"/src
-	unpack ./${MY_SRC_P}.zip
-
-	epatch "${FILESDIR}"/${P}-java1.4.patch
-	epatch "${FILESDIR}"/${P}-javadocs.patch
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/*
-		dodoc doc/*.pdf
-	fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-2.0.1.ebuild b/dev-lang/tuprolog/tuprolog-2.0.1.ebuild
deleted file mode 100644
index 04344047f5fe..000000000000
--- a/dev-lang/tuprolog/tuprolog-2.0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.0.1.ebuild,v 1.4 2007/02/18 08:38:02 keri Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_P="2p-${PV}"
-MY_SRC_P="src-J2SE-${PV}"
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://www.alice.unibo.it:8080/tuProlog/"
-SRC_URI="http://www.alice.unibo.it/download/tuprolog/files/core/2p-2.0.1.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	dev-java/ant-core
-	test? ( dev-java/ant-tasks
-		dev-java/junit )"
-RDEPEND=">=virtual/jdk-1.4"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-java1.4.patch
-	epatch "${FILESDIR}"/${P}-javadocs.patch
-
-	cd "${S}"
-	cp "${FILESDIR}"/build.xml "${S}"
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_test() {
-	cd "${S}"/dist
-	java-pkg_jar-from junit
-	cd "${S}"
-	eant test || die "eant test failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/*
-		dodoc doc/*.pdf
-	fi
-
-	dodoc CHANGELOG
-}
diff --git a/dev-lang/tuprolog/tuprolog-2.0.ebuild b/dev-lang/tuprolog/tuprolog-2.0.ebuild
deleted file mode 100644
index ba5c534aa53d..000000000000
--- a/dev-lang/tuprolog/tuprolog-2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.0.ebuild,v 1.2 2007/01/21 22:31:51 keri Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_P="2p-${PV}"
-MY_SRC_P="src-J2SE-${PV}"
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://www.alice.unibo.it:8080/tuProlog/"
-SRC_URI="http://www.alice.unibo.it/download/tuprolog/files/core/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="doc"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	dev-java/ant-core"
-RDEPEND=">=virtual/jdk-1.4"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-java1.4.patch
-	epatch "${FILESDIR}"/${P}-javadocs.patch
-
-	cd "${S}"
-	cp "${FILESDIR}"/build.xml "${S}"
-}
-
-src_compile() {
-	eant jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r docs/*
-		dodoc doc/*.pdf
-	fi
-}