Remove old version

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

8 files changed, 10 insertions, 449 deletions

diff --git a/dev-lang/tuprolog/ChangeLog b/dev-lang/tuprolog/ChangeLog
index a8f3cc0174b8..5674b1236612 100644
--- a/dev-lang/tuprolog/ChangeLog
+++ b/dev-lang/tuprolog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/tuprolog
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.28 2009/02/15 12:23:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.29 2009/02/28 21:41:14 keri Exp $
+
+  28 Feb 2009; <keri@gentoo.org> -files/tuprolog-2.1-DCGLibrary.patch,
+  -files/tuprolog-2.1-java1.4.patch, -files/tuprolog-2.1-javadocs.patch,
+  -files/tuprolog-2.1-junit.patch, -tuprolog-2.1.ebuild:
+  Remove old version
 
   15 Feb 2009; Markus Meier <maekke@gentoo.org> tuprolog-2.1.1.ebuild:
   amd64/x86 stable, bug #258681
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 9114293ca024..c3a677265670 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,23 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX build.xml 2282 RMD160 f02843d5762be2497b64ae9acbf090c1bc8acf4a SHA1 8ddb9b2e23d85fded8c2fa117716d319896d2f95 SHA256 c9528b5ecd3eaa06a3e3cec75007990dcdf2d7a41c441521f00dc9973a107e1a
-AUX tuprolog-2.1-DCGLibrary.patch 501 RMD160 6dd92bd96ba394fc3e10df9a6c18575c983239e8 SHA1 1417795a3aba67772a43e6e28b58182ddf66e71d SHA256 1f94427694d82845c490c7e7668495046fa1628c80c5df0a1cf4b0efeefe4a77
-AUX tuprolog-2.1-java1.4.patch 6318 RMD160 621aec83d6f77585f15d4d0109b085c380d6e001 SHA1 4b0a471bd4103270274c5cd7e417140c45f06e15 SHA256 35bb62c71b645289242b2bb610879a455f408eddb8f65b6ead7ac71ebdfe12bc
-AUX tuprolog-2.1-javadocs.patch 6573 RMD160 0cc1f044ada95113ae638a9cd48c920fa3903a31 SHA1 64206767a27e7fceea9b04f9e65d2846bcd56b9d SHA256 12bc23f7f9300cc6e6d3ca0d3ebac163acec01bc490ad08135127bcded883bef
-AUX tuprolog-2.1-junit.patch 608 RMD160 326fbd3d38a614426d68915d5896896884c7cc2b SHA1 52462a9b873b8711985c33780cedac5555754315 SHA256 29108796895b234c9995ceff291618984a7f7de787a08bc2bc72578c9e732930
 AUX tuprolog-2.1.1-java1.4.patch 6318 RMD160 621aec83d6f77585f15d4d0109b085c380d6e001 SHA1 4b0a471bd4103270274c5cd7e417140c45f06e15 SHA256 35bb62c71b645289242b2bb610879a455f408eddb8f65b6ead7ac71ebdfe12bc
 AUX tuprolog-2.1.1-javadocs.patch 6573 RMD160 0cc1f044ada95113ae638a9cd48c920fa3903a31 SHA1 64206767a27e7fceea9b04f9e65d2846bcd56b9d SHA256 12bc23f7f9300cc6e6d3ca0d3ebac163acec01bc490ad08135127bcded883bef
 DIST 2p-2.1.1.zip 1879216 RMD160 4cb3c1505c78ac0c432a0369ca117244cf4a7bba SHA1 3477a5432a74e5d58fb9cdf1e227288025300be0 SHA256 fe49fbee0c22c3bb6799895f4e1694ead184a689ab753ebf56031c2891dab7b5
-DIST 2p-2.1.zip 1833108 RMD160 5065324deae2c59712e8054dd47902a418501a93 SHA1 9a0050d11854b674d13abf74a37602a8ff8d2b17 SHA256 e0ff06ba2b453f82fc896d7163b09694636b23153673385f154af2d8059d629d
 EBUILD tuprolog-2.1.1.ebuild 1158 RMD160 67d6af25e461d64096a82432bc5b5206d6566281 SHA1 fe843f7462451d1217bde223d68b518592ced492 SHA256 11a8bbcc8a7602ad1c5532c5bf3e82ea7d2d7c907f73dd68a0ab6230d909bb4d
-EBUILD tuprolog-2.1.ebuild 1247 RMD160 a74c9ccf4d108b0023a6a8735191e58d4dc3c62f SHA1 354032c843622775c613682df054a436eacea2e9 SHA256 c78fff376df95301d9e10c4f124eabb054b849e197f9fb652692e0dab7511764
-MISC ChangeLog 3798 RMD160 6ea29e66485ac6e6d24116112d5d534f608c5feb SHA1 3141c344cacc547f138095716726ea1ea474cca0 SHA256 85970766a9579f885821c23fe0712b767b5ed9dd84231aa2728d7300b344fa50
+MISC ChangeLog 4019 RMD160 5213b874a75067592105157c12532fc7d138dbe0 SHA1 bffe249696fc7a4d60b5723163190583848c9e8b SHA256 ca9d7cac12b6477942f5f8389753ce6de40c209693b111deeb64ac07b773cdbd
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmYCWwACgkQkKaRLQcq0GImNQCeMYfO0uDpdCixQyq+aMibqo0L
-Z+UAnR1lomZh0mBkxNiDYlzXdejH1Zu8
-=uNEQ
------END PGP SIGNATURE-----
diff --git a/dev-lang/tuprolog/files/tuprolog-2.1-DCGLibrary.patch b/dev-lang/tuprolog/files/tuprolog-2.1-DCGLibrary.patch
deleted file mode 100644
index 740d2471b456..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.1-DCGLibrary.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src.orig/alice/tuprolog/lib/DCGLibrary.java	2007-11-10 07:00:33.000000000 +1300
-+++ src/alice/tuprolog/lib/DCGLibrary.java	2007-11-10 07:03:21.000000000 +1300
-@@ -36,7 +36,8 @@
- 		//

- 		// operators defined by the BasicLibrary theory

- 		//

--		":- op( 1200, xfx,  '-->'). \n"+

-+		":- op(1200, xfx, '-->'). \n" +

-+		":- op(200, xfx, '\\'). \n" +

- 		"dcg_nonterminal(X) :- list(X),!,fail.  \n"+

- 		"dcg_nonterminal(_).                    \n"+

- 		"dcg_terminals(Xs) :- list(Xs).         \n"+

diff --git a/dev-lang/tuprolog/files/tuprolog-2.1-java1.4.patch b/dev-lang/tuprolog/files/tuprolog-2.1-java1.4.patch
deleted file mode 100644
index 89324fcb7103..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.1-java1.4.patch
+++ /dev/null
@@ -1,180 +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-04-23 10:10:38.000000000 +1200
-+++ src/alice/tuprologx/ide/AWTFrameLauncher.java	2007-06-08 19:43:27.000000000 +1200
-@@ -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) {

-@@ -117,4 +117,4 @@
- 

-     } // end AWTFrame class

- 

--} // end AWTFrameLauncher class
-\ No newline at end of file
-+} // end AWTFrameLauncher class
-diff -ur src.orig/alice/tuprologx/ide/Applet.java src/alice/tuprologx/ide/Applet.java
---- src.orig/alice/tuprologx/ide/Applet.java	2007-04-23 10:10:38.000000000 +1200
-+++ src/alice/tuprologx/ide/Applet.java	2007-06-08 19:47:00.000000000 +1200
-@@ -41,7 +41,7 @@
- 			ide.removeWindowListener(listeners[i]);

- 

-     	ide.pack();

--        ide.show();

-+        ide.setVisible(true);

-     }

- 

--} // end Applet class
-\ No newline at end of file
-+} // end Applet class
-diff -ur src.orig/alice/tuprologx/ide/DotNetIOManager.java src/alice/tuprologx/ide/DotNetIOManager.java
---- src.orig/alice/tuprologx/ide/DotNetIOManager.java	2007-04-23 10:10:38.000000000 +1200
-+++ src/alice/tuprologx/ide/DotNetIOManager.java	2007-06-08 19:46:43.000000000 +1200
-@@ -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();

-@@ -72,4 +72,4 @@
-             return "";

-     }

- 

--} // end DotNetIOManager class
-\ No newline at end of file
-+} // end DotNetIOManager class
-diff -ur src.orig/alice/tuprologx/ide/GUILauncher.java src/alice/tuprologx/ide/GUILauncher.java
---- src.orig/alice/tuprologx/ide/GUILauncher.java	2007-04-23 10:10:38.000000000 +1200
-+++ src/alice/tuprologx/ide/GUILauncher.java	2007-06-08 19:48:08.000000000 +1200
-@@ -74,7 +74,7 @@
-     private void launchDotNetGUI() {

-         DotNetIDE ide = new DotNetIDE();

-         ide.pack();

--        ide.show();

-+        ide.setVisible(true);

-     }

- 

-     /**

-@@ -99,4 +99,4 @@
-             launcher.launchJavaGUI();

-     }

- 

--} // end GUILauncher class
-\ No newline at end of file
-+} // end GUILauncher class
-diff -ur src.orig/alice/util/jedit/JEditTextArea.java src/alice/util/jedit/JEditTextArea.java
---- src.orig/alice/util/jedit/JEditTextArea.java	2007-04-23 10:10:38.000000000 +1200
-+++ src/alice/util/jedit/JEditTextArea.java	2007-06-08 19:41:59.000000000 +1200
-@@ -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-04-23 10:10:40.000000000 +1200
-+++ src/alice/util/jedit/SyntaxStyle.java	2007-06-08 19:32:46.000000000 +1200
-@@ -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-04-23 10:10:38.000000000 +1200
-+++ src/alice/util/jedit/TextAreaPainter.java	2007-06-08 19:38:19.000000000 +1200
-@@ -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-04-23 10:10:40.000000000 +1200
-+++ src/alice/util/thinlet/Thinlet.java	2007-06-08 19:49:17.000000000 +1200
-@@ -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.1-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.1-javadocs.patch
deleted file mode 100644
index 65bd7fc48500..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.1-javadocs.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-diff -ur src.orig/alice/tuprolog/ChoicePointStore.java src/alice/tuprolog/ChoicePointStore.java
---- src.orig/alice/tuprolog/ChoicePointStore.java	2007-04-23 10:10:38.000000000 +1200
-+++ src/alice/tuprolog/ChoicePointStore.java	2007-06-08 07:46:21.000000000 +1200
-@@ -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-04-23 10:10:38.000000000 +1200
-+++ src/alice/tuprolog/ClauseStore.java	2007-06-08 07:45:36.000000000 +1200
-@@ -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-04-23 10:10:40.000000000 +1200
-+++ src/alice/tuprolog/EngineManager.java	2007-06-08 07:44:50.000000000 +1200
-@@ -85,7 +85,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-04-23 10:10:38.000000000 +1200
-+++ src/alice/tuprolog/PrimitiveManager.java	2007-06-08 07:44:07.000000000 +1200
-@@ -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 src.orig/alice/tuprolog/lib/BasicLibrary.java src/alice/tuprolog/lib/BasicLibrary.java
---- src.orig/alice/tuprolog/lib/BasicLibrary.java	2007-04-23 10:10:40.000000000 +1200
-+++ src/alice/tuprolog/lib/BasicLibrary.java	2007-06-08 07:42:23.000000000 +1200
-@@ -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.

- 	 */

-diff -ur src.orig/alice/tuprolog/lib/JavaLibrary.java src/alice/tuprolog/lib/JavaLibrary.java
---- src.orig/alice/tuprolog/lib/JavaLibrary.java	2007-04-23 10:10:38.000000000 +1200
-+++ src/alice/tuprolog/lib/JavaLibrary.java	2007-06-08 07:43:33.000000000 +1200
-@@ -1226,7 +1226,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-04-23 10:10:38.000000000 +1200
-+++ src/alice/util/jedit/InputHandler.java	2007-06-07 21:20:15.000000000 +1200
-@@ -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 src.orig/alice/util/jedit/JEditTextArea.java src/alice/util/jedit/JEditTextArea.java
---- src.orig/alice/util/jedit/JEditTextArea.java	2007-04-23 10:10:38.000000000 +1200
-+++ src/alice/util/jedit/JEditTextArea.java	2007-06-07 21:19:06.000000000 +1200
-@@ -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-04-23 10:10:38.000000000 +1200
-+++ src/alice/util/jedit/KeywordMap.java	2007-06-07 21:17:18.000000000 +1200
-@@ -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-04-23 10:10:38.000000000 +1200
-+++ src/alice/util/jedit/TextAreaPainter.java	2007-06-07 21:18:00.000000000 +1200
-@@ -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-04-23 10:10:40.000000000 +1200
-+++ src/alice/util/jedit/TokenMarker.java	2007-06-07 21:15:17.000000000 +1200
-@@ -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.1-junit.patch b/dev-lang/tuprolog/files/tuprolog-2.1-junit.patch
deleted file mode 100644
index b8650114b725..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.1-junit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- test.orig/unit/alice/tuprolog/ParserTestCase.java	2007-04-23 10:11:04.000000000 +1200
-+++ test/unit/alice/tuprolog/ParserTestCase.java	2007-07-22 14:23:06.000000000 +1200
-@@ -45,8 +45,8 @@
- 	}

- 	

- 	public void testListWithTail() throws InvalidTermException {

--		Parser p = new Parser("[p|Y]");

--		Struct result = new Struct(new Struct("p"), new Var("Y"));

-+		Parser p = new Parser("[p|[q,r,s]]");

-+		Struct result = new Struct(new Struct("p"), new Struct(new Term[] {new Struct("q"), new Struct("r"), new Struct("s")}));

- 		result.resolveTerm();

- 		assertEquals(result, p.nextTerm(false));

- 	}

diff --git a/dev-lang/tuprolog/tuprolog-2.1.ebuild b/dev-lang/tuprolog/tuprolog-2.1.ebuild
deleted file mode 100644
index 58a4abe81341..000000000000
--- a/dev-lang/tuprolog/tuprolog-2.1.ebuild
+++ /dev/null
@@ -1,58 +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.1.ebuild,v 1.8 2007/11/09 18:25:20 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/tuProlog/"
-SRC_URI="mirror://sourceforge/tuprolog/2p-2.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-junit )"
-RDEPEND=">=virtual/jdk-1.4"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-java1.4.patch
-	epatch "${FILESDIR}"/${P}-javadocs.patch
-	epatch "${FILESDIR}"/${P}-junit.patch
-	epatch "${FILESDIR}"/${P}-DCGLibrary.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}"
-	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/*
-		dodoc doc/*.pdf
-	fi
-
-	dodoc CHANGELOG
-}
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index ca305340ae5a..924414cfd4e9 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -18,7 +18,7 @@ AUX xsb-3.0.1-xsb-script.patch 1544 RMD160 4edc54d803e07cfff9d6fc70270e12dcfbb67
 DIST XSB-unix.tar.gz 5773347 RMD160 78e31e7b26bf5f219c3f6b01a0c65b7de86c7e83 SHA1 97ff6361725cb26f25c0a72465af87583992910e SHA256 b584a19dff06d8834795d8f26c1a97c5adfdcc678c3f7b2978591495f8a14051
 DIST xsb-3.0.1-src.tar.gz 4523327 RMD160 6f71401ad3cc9031ec0ced16df7d9dfd594b3fb2 SHA1 8cbef419913731617ec8811dd69799406119b9ff SHA256 05e2a76befe6303ff624c8a22543444604a75815eae276e065e462a1d21ae801
 DIST xsb-3.1-gentoo-patchset-0.tar.gz 21394 RMD160 6a58fe5c11fce6620e6e453962c786d9e0b720d5 SHA1 df45cabc3deb6e27b4c4558109a5a9dc74d6e232 SHA256 a9435b13478e88763d659e75ce96f7ccebbcfe72fc78abcbe13bf2d2d9c92cf0
-EBUILD xsb-3.0.1.ebuild 4600 RMD160 6cf87f6d9fe139d4e1bbbf7ecd93709f38f66350 SHA1 326dc170ba37742a640f3704313836bcc302c20e SHA256 0a62d94e4ec069e32f6e04d04ef6f7a6eb6e28f11705c08c5cf6cfde69814224
-EBUILD xsb-3.1.ebuild 4114 RMD160 01c5275e4b6c035e33962bff31329ff0aa95e9fc SHA1 1cc1da30caeb90d4058df37dee5a6ecbf8bf4fc3 SHA256 6ada99b258efde49abc8110d2facab3cac863c0d46d7ac7880f7385bb85b0678
-MISC ChangeLog 3489 RMD160 15366926eab7d43797a86eda51f0a675cab11889 SHA1 5df541e7d89418b23f91e7f71eb6e0ef78793fae SHA256 9b5e1ce4ba2afc0369cdcecb8476f77504736eef7deb20664d2390227c42e6ec
+EBUILD xsb-3.0.1.ebuild 4622 RMD160 db8406a82cbbb5368d177a077df18e51cb7f56b2 SHA1 dc41686c5b1b53b9b9c96878ddcc3a9148a8411c SHA256 5c571e7b92811901c05a4dcffce94496116b40eeab68403299edf463a8cba695
+EBUILD xsb-3.1.ebuild 4136 RMD160 f6fdda4ded403f234f1a6338dbfaec43f664e938 SHA1 ba3c85a1a57b3afc301ff0b690e76f9909c699e8 SHA256 e794a19724b24a699f21174d970a62de1d2bb1921c26aab145892c06a6dddc3c
+MISC ChangeLog 3571 RMD160 d52471eaee3a911ff3edc02e5eabbbd2cf8f045b SHA1 29331f717b2ab2e172bb1db71c486713628eb9fe SHA256 9ac1e510366663459c7947b573297ca060faf33ac5eddc56dced1077863f0bc4
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba