Remove keyword-expanded patch

2 files changed, 2 insertions, 167 deletions

diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 968da3184d07..15c5bf534722 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -4,10 +4,10 @@ AUX tuprolog-2.1-java1.4.patch 6318 RMD160 621aec83d6f77585f15d4d0109b085c380d6e
 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 6600 RMD160 ab6b14c108181ffab01fbd8c166202f5f0c15747 SHA1 4b28d97dfb5d3f7ae7ceccee8e2bded7858cb3ce SHA256 81fc149c574f40a2a8019fe622125137916769b1978c968208fa06b71500daac
+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 1159 RMD160 a897886d8a40f6507aca6b54e664b31e89063a95 SHA1 4815c090c9dfaf4977a48fa8f6212534dacdac06 SHA256 b2d9ed59b96cfb7eec18f66cf65fe10c8b3f5b8930f2f0cbee7bb294e979aa19
 EBUILD tuprolog-2.1.ebuild 1247 RMD160 a74c9ccf4d108b0023a6a8735191e58d4dc3c62f SHA1 354032c843622775c613682df054a436eacea2e9 SHA256 c78fff376df95301d9e10c4f124eabb054b849e197f9fb652692e0dab7511764
-MISC ChangeLog 3466 RMD160 4fc7f6a2287809c0066253a18aa73d0e4ee5c35b SHA1 cc6aae45f9cd36bab2c370e8eac2fbe561da85fd SHA256 a454a357c6a50ce64b686396dcec2eaad00ecf8680951a5ef6b256b6e8bad526
+MISC ChangeLog 3605 RMD160 2061cb879c59568b9d13dd22e17fc170377fc963 SHA1 01d5ff1d4ace42aa18c1d1078d4357d691859065 SHA256 91f52c00d0a06e79e4d3779e7d20f222e226ab4673428f3586aba6a3c15a7060
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/tuprolog/files/tuprolog-2.1.1-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.1.1-javadocs.patch
deleted file mode 100644
index 65bd7fc48500..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.1.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
- {