* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/files/, dev-lang/tuprolog/
@ 2016-02-15 18:28 Keri Harris
0 siblings, 0 replies; 7+ messages in thread
From: Keri Harris @ 2016-02-15 18:28 UTC (permalink / raw
To: gentoo-commits
commit: 4ba71d49b7cebb9cc141849c1676de53770fff8d
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 18:27:03 2016 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 18:27:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba71d49
dev-lang/tuprolog: remove old versions
Package-Manager: portage-2.2.26
dev-lang/tuprolog/Manifest | 3 -
.../files/tuprolog-2.3.1_beta-javadocs.patch | 228 -----------
.../tuprolog/files/tuprolog-2.5.0-javadocs.patch | 315 --------------
.../tuprolog/files/tuprolog-2.6.0-javadocs.patch | 454 ---------------------
.../tuprolog/files/tuprolog-2.7.0-javadocs.patch | 437 --------------------
dev-lang/tuprolog/tuprolog-2.5.0.ebuild | 55 ---
dev-lang/tuprolog/tuprolog-2.6.0.ebuild | 59 ---
dev-lang/tuprolog/tuprolog-2.7.0.ebuild | 59 ---
8 files changed, 1610 deletions(-)
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index f95f847..5e5accb 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,6 +1,3 @@
DIST 2p-2.4.0.zip 2421675 SHA256 f674b282bd7bc60e92ea417f8766e635979366d84d48634dd622e60ad1aa78c6 SHA512 20c86f736efe526dfffe603b19648394aaeaadf326034bba4f5717a193d7f76a99c6f3cb7bb93e2f1b608abd4e4af30341a2727f61e60e60289c2a964da782e9 WHIRLPOOL 7a353f5c6df2dba877d6880fc91ff0356639900767eb346a2eba97773303e125d0d2ffeead35e83cb61ffd013b49d4a05498861207de228e208a3f690a65ec4b
-DIST tuprolog-2.5.0.zip 4847183 SHA256 227714576fb1815a3fcc017211758bfb2d5a0b6a07ce3a3a24f8cd93db2e5e04 SHA512 cf026d2171537fe3ca04a4cf572497fb1ce32ff2d0c206268fd62cf7b8216f61da73150def1ee884b367451a5da57a354e1f7ba75deb28e34ed3d390cb5ee35b WHIRLPOOL fb11d691262ac5fc16a7258ab73cde32623068402645ffcecbd4701b499ab674f2da8a3c7bbb0ca750651803f6e134085b89730667fd6b01faaa36ff15ec115e
-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/tuprolog-2.3.1_beta-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.3.1_beta-javadocs.patch
deleted file mode 100644
index aa1f3dc..0000000
--- a/dev-lang/tuprolog/files/tuprolog-2.3.1_beta-javadocs.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-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.5.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch
deleted file mode 100644
index 2567109..0000000
--- a/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch
+++ /dev/null
@@ -1,315 +0,0 @@
-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
deleted file mode 100644
index 7eba988..0000000
--- a/dev-lang/tuprolog/files/tuprolog-2.6.0-javadocs.patch
+++ /dev/null
@@ -1,454 +0,0 @@
-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
deleted file mode 100644
index cd67ac5..0000000
--- a/dev-lang/tuprolog/files/tuprolog-2.7.0-javadocs.patch
+++ /dev/null
@@ -1,437 +0,0 @@
-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/tuprolog-2.5.0.ebuild b/dev-lang/tuprolog/tuprolog-2.5.0.ebuild
deleted file mode 100644
index 011c8f5..0000000
--- a/dev-lang/tuprolog/tuprolog-2.5.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 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 ~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
deleted file mode 100644
index 7429462..0000000
--- a/dev-lang/tuprolog/tuprolog-2.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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
deleted file mode 100644
index 106d496..0000000
--- a/dev-lang/tuprolog/tuprolog-2.7.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/files/, dev-lang/tuprolog/
@ 2016-02-17 14:42 Keri Harris
0 siblings, 0 replies; 7+ messages in thread
From: Keri Harris @ 2016-02-17 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 1783cde98b4ce290b6c2aaf5f474fe56af354177
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 14:39:24 2016 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 14:41:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1783cde9
dev-lang/tuprolog: version bump
Package-Manager: portage-2.2.26
dev-lang/tuprolog/Manifest | 1 +
dev-lang/tuprolog/files/build-2.9.2.xml | 108 +++++++++++++++++++
.../tuprolog-2.9.2-no-dynamic-object-test.patch | 20 ++++
.../tuprolog/files/tuprolog-2.9.2-no-ikvm.patch | 116 +++++++++++++++++++++
dev-lang/tuprolog/tuprolog-2.9.2.ebuild | 67 ++++++++++++
5 files changed, 312 insertions(+)
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 5e5accb..99ab786 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,3 +1,4 @@
DIST 2p-2.4.0.zip 2421675 SHA256 f674b282bd7bc60e92ea417f8766e635979366d84d48634dd622e60ad1aa78c6 SHA512 20c86f736efe526dfffe603b19648394aaeaadf326034bba4f5717a193d7f76a99c6f3cb7bb93e2f1b608abd4e4af30341a2727f61e60e60289c2a964da782e9 WHIRLPOOL 7a353f5c6df2dba877d6880fc91ff0356639900767eb346a2eba97773303e125d0d2ffeead35e83cb61ffd013b49d4a05498861207de228e208a3f690a65ec4b
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
+DIST tuprolog-2.9.2.tar.gz 6262268 SHA256 4205dff584b492e10f214c71ce7bc0e81297a915156ca1e10cfac8b34c8c0a6e SHA512 831c7390fe33fc57cb01d4b1d61485ac5df1aa8ebf386d5aae5c5d32f7677d46aa5aa6cc0eb1d3bb79989a54f8484ad8b97754b7f75fc21af6116ae170a28316 WHIRLPOOL 18dceea5e95be3e60b10fa8692970e61d9b16b2f518ac342de271ac7c6cb8313e8e9ca359fb93753d43a2c09780e47f212776ce560f9c2fefdb21d44f3316c77
diff --git a/dev-lang/tuprolog/files/build-2.9.2.xml b/dev-lang/tuprolog/files/build-2.9.2.xml
new file mode 100644
index 0000000..0e585bd
--- /dev/null
+++ b/dev-lang/tuprolog/files/build-2.9.2.xml
@@ -0,0 +1,108 @@
+<?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"/>
+
+ <path id="compile.classpath">
+ <fileset dir="lib" includes="*.jar"/>
+ <pathelement path="${gentoo.classpath}"/>
+ </path>
+
+ <!-- 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 deprecation="off"
+ destdir="${build.dir}"
+ encoding="ISO-8859-1"
+ srcdir="${src.dir}"
+ target="1.7">
+ <classpath>
+ <path refid="compile.classpath"/>
+ </classpath>
+ </javac>
+ <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
+ author="false"
+ destdir="${docs.dir}"
+ encoding="ISO-8859-1"
+ breakiterator="yes"
+ packagenames="alice.*"
+ sourcepath="${src.dir}"
+ use="true"
+ version="true"
+ verbose="no"
+ windowtitle="${ant.project.name} API">
+ <classpath>
+ <path refid="compile.classpath"/>
+ </classpath>
+ </javadoc>
+ </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"
+ srcdir="${test.dir}/unit"
+ target="1.7"/>
+ <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.9.2-no-dynamic-object-test.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch
new file mode 100644
index 0000000..0416258
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch
@@ -0,0 +1,20 @@
+--- tuprolog-2.9.2.orig/test/unit/alice/tuprolog/JavaLibraryTestCase.java 2015-02-27 14:02:49.000000000 +0100
++++ tuprolog-2.9.2/test/unit/alice/tuprolog/JavaLibraryTestCase.java 2016-02-17 15:24:47.000000000 +0100
+@@ -39,7 +39,7 @@
+ SolveInfo goal = engine.solve(new Struct("demo", t));
+ assertFalse(goal.isSuccess());
+ }
+-
++/*
+ public void testDynamicObjectsRetrival() throws PrologException {
+ Prolog engine = new Prolog();
+ JavaLibrary lib = (JavaLibrary) engine.getLibrary("alice.tuprolog.lib.JavaLibrary");
+@@ -53,7 +53,7 @@
+ TestCounter counter = (TestCounter) lib.getRegisteredDynamicObject(id);
+ assertEquals(2, counter.getValue());
+ }
+-
++*/
+
+ public void test_java_object() throws PrologException, IOException
+ {
diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch
new file mode 100644
index 0000000..d94dc66
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.9.2-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/tuprolog-2.9.2.ebuild b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
new file mode 100644
index 0000000..c562b3f
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 examples 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
+ epatch "${FILESDIR}"/${P}-no-dynamic-object-test.patch
+
+ cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+}
+
+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
+ java-pkg_dojar lib/autocomplete.jar
+ java-pkg_dojar lib/rsyntaxtextarea.jar
+
+ if use doc ; then
+ java-pkg_dohtml -r docs/* || die
+ dodoc doc/tuprolog-guide.pdf
+ fi
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}/examples
+ doins doc/examples/*.pl
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/files/, dev-lang/tuprolog/
@ 2016-10-09 9:27 Keri Harris
0 siblings, 0 replies; 7+ messages in thread
From: Keri Harris @ 2016-10-09 9:27 UTC (permalink / raw
To: gentoo-commits
commit: 96441722e1253618b7739713cb19f6425e0c919a
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 09:27:14 2016 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 09:27:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96441722
dev-lang/tuprolog: version bump
Package-Manager: portage-2.3.0
dev-lang/tuprolog/Manifest | 1 +
dev-lang/tuprolog/files/build-3.0.0.xml | 110 +++++++++++++++++
.../tuprolog-3.0.0-no-dynamic-object-test.patch | 20 +++
.../tuprolog/files/tuprolog-3.0.0-no-ikvm.patch | 137 +++++++++++++++++++++
.../files/tuprolog-3.0.0-oolibrary-unit-test.patch | 11 ++
dev-lang/tuprolog/tuprolog-3.0.0.ebuild | 67 ++++++++++
6 files changed, 346 insertions(+)
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 99ab786..782017b 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -2,3 +2,4 @@ DIST 2p-2.4.0.zip 2421675 SHA256 f674b282bd7bc60e92ea417f8766e635979366d84d48634
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
DIST tuprolog-2.9.2.tar.gz 6262268 SHA256 4205dff584b492e10f214c71ce7bc0e81297a915156ca1e10cfac8b34c8c0a6e SHA512 831c7390fe33fc57cb01d4b1d61485ac5df1aa8ebf386d5aae5c5d32f7677d46aa5aa6cc0eb1d3bb79989a54f8484ad8b97754b7f75fc21af6116ae170a28316 WHIRLPOOL 18dceea5e95be3e60b10fa8692970e61d9b16b2f518ac342de271ac7c6cb8313e8e9ca359fb93753d43a2c09780e47f212776ce560f9c2fefdb21d44f3316c77
+DIST tuprolog-3.0.0.tar.gz 6275327 SHA256 1c7a423cbd3faa626f8398a48ec6396c2d17431a77b1f22179d713cc76aeeb09 SHA512 7998dadb04b1314d096a33c54d11977534565accb3811b93a22f606fd838d2f9b0a6defe882992977a093832e1565283d3951dcc791809620deb61d3511c02d3 WHIRLPOOL 915a21632a2c86f33de25cc05ec75f3e40b33a0ba80f73219cfab6d06f69af07bc9d143a3d1cd80fbfd27fdeba9d4259f389f1a33704bfac2151403b26424e12
diff --git a/dev-lang/tuprolog/files/build-3.0.0.xml b/dev-lang/tuprolog/files/build-3.0.0.xml
new file mode 100644
index 00000000..823c237
--- /dev/null
+++ b/dev-lang/tuprolog/files/build-3.0.0.xml
@@ -0,0 +1,110 @@
+<?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"/>
+
+ <path id="compile.classpath">
+ <fileset dir="lib" includes="*.jar"/>
+ <pathelement path="${gentoo.classpath}"/>
+ </path>
+
+ <!-- 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 deprecation="off"
+ destdir="${build.dir}"
+ encoding="ISO-8859-1"
+ srcdir="${src.dir}"
+ target="1.7">
+ <classpath>
+ <path refid="compile.classpath"/>
+ </classpath>
+ </javac>
+ <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"/>
+ <attribute name="Class-Path" value="."/>
+ </manifest>
+ <zipgroupfileset dir="lib" includes="*.jar"/>
+ </jar>
+ </target>
+
+ <!-- generate javadocs -->
+ <target depends="init" name="javadoc">
+ <javadoc
+ author="false"
+ destdir="${docs.dir}"
+ encoding="ISO-8859-1"
+ breakiterator="yes"
+ packagenames="alice.*"
+ sourcepath="${src.dir}"
+ use="true"
+ version="true"
+ verbose="no"
+ windowtitle="${ant.project.name} API">
+ <classpath>
+ <path refid="compile.classpath"/>
+ </classpath>
+ </javadoc>
+ </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"
+ srcdir="${test.dir}/unit"
+ target="1.7"/>
+ <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-3.0.0-no-dynamic-object-test.patch b/dev-lang/tuprolog/files/tuprolog-3.0.0-no-dynamic-object-test.patch
new file mode 100644
index 00000000..36e683f
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-3.0.0-no-dynamic-object-test.patch
@@ -0,0 +1,20 @@
+--- tuprolog-3.0.0.orig/test/unit/alice/tuprolog/JavaLibraryTestCase.java 2016-10-08 14:34:12.000000000 +0200
++++ tuprolog-3.0.0/test/unit/alice/tuprolog/JavaLibraryTestCase.java 2016-10-08 17:30:18.525111794 +0200
+@@ -39,7 +39,7 @@
+ SolveInfo goal = engine.solve(new Struct("demo", t));
+ assertFalse(goal.isSuccess());
+ }
+-
++/*
+ public void testDynamicObjectsRetrival() throws PrologException {
+ Prolog engine = new Prolog();
+ OOLibrary lib = (OOLibrary) engine.getLibrary("alice.tuprolog.lib.OOLibrary");
+@@ -53,7 +53,7 @@
+ TestCounter counter = (TestCounter) lib.getRegisteredDynamicObject(id);
+ assertEquals(2, counter.getValue());
+ }
+-
++*/
+
+ public void test_java_object() throws PrologException, IOException
+ {
diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.0-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-3.0.0-no-ikvm.patch
new file mode 100644
index 00000000..e0ee85c
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-3.0.0-no-ikvm.patch
@@ -0,0 +1,137 @@
+diff -urN tuprolog-3.0.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-3.0.0/src/alice/tuprolog/LibraryManager.java
+--- tuprolog-3.0.0.orig/src/alice/tuprolog/LibraryManager.java 2016-10-08 14:33:19.000000000 +0200
++++ tuprolog-3.0.0/src/alice/tuprolog/LibraryManager.java 2016-10-08 16:49:12.005214951 +0200
+@@ -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-3.0.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-3.0.0/src/alice/tuprologx/ide/LibraryManager.java
+--- tuprolog-3.0.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2016-10-08 14:33:19.000000000 +0200
++++ tuprolog-3.0.0/src/alice/tuprologx/ide/LibraryManager.java 2016-10-08 16:49:12.006214951 +0200
+@@ -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-3.0.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-3.0.0/src/alice/util/AssemblyCustomClassLoader.java
+--- tuprolog-3.0.0.orig/src/alice/util/AssemblyCustomClassLoader.java 2016-10-08 14:33:19.000000000 +0200
++++ tuprolog-3.0.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 -urN tuprolog-3.0.0.orig/src/alice/util/proxyGenerator/Generator.java tuprolog-3.0.0/src/alice/util/proxyGenerator/Generator.java
+--- tuprolog-3.0.0.orig/src/alice/util/proxyGenerator/Generator.java 2016-10-08 14:33:19.000000000 +0200
++++ tuprolog-3.0.0/src/alice/util/proxyGenerator/Generator.java 2016-10-08 17:03:17.816179576 +0200
+@@ -1,7 +1,7 @@
+ package alice.util.proxyGenerator;
+ import javax.tools.*;
+
+-import cli.System.Reflection.Assembly;
++//import cli.System.Reflection.Assembly;
+
+ import java.lang.reflect.*;
+ import java.util.*;
+@@ -29,7 +29,7 @@
+ }
+
+ if(System.getProperty("java.vm.name").equals("IKVM.NET"))
+- ikvm.runtime.Startup.addBootClassPathAssemby(Assembly.Load("IKVM.OpenJDK.Tools"));
++ throw new UnsupportedOperationException("IKVM.NET not supported!");
+
+ jc = ToolProvider.getSystemJavaCompiler();
+ if (jc == null) {
diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.0-oolibrary-unit-test.patch b/dev-lang/tuprolog/files/tuprolog-3.0.0-oolibrary-unit-test.patch
new file mode 100644
index 00000000..f9c13ae
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-3.0.0-oolibrary-unit-test.patch
@@ -0,0 +1,11 @@
+--- tuprolog-3.0.0.orig/test/unit/alice/tuprolog/PrologTestCase.java 2016-10-08 14:34:12.000000000 +0200
++++ tuprolog-3.0.0/test/unit/alice/tuprolog/PrologTestCase.java 2016-10-08 17:43:28.339078761 +0200
+@@ -32,7 +32,7 @@
+ assertNotNull(engine.getLibrary("alice.tuprolog.StringLibrary"));
+ Library javaLibrary = new alice.tuprolog.lib.OOLibrary();
+ engine.loadLibrary(javaLibrary);
+- assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.JavaLibrary"));
++ assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.OOLibrary"));
+ }
+
+ public void testGetLibraryWithName() throws InvalidLibraryException {
diff --git a/dev-lang/tuprolog/tuprolog-3.0.0.ebuild b/dev-lang/tuprolog/tuprolog-3.0.0.ebuild
new file mode 100644
index 00000000..c910851
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-3.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=virtual/jdk-1.7:=
+ dev-java/javassist:3
+ dev-java/commons-lang:3.1"
+
+DEPEND="${RDEPEND}
+ dev-java/ant-core
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/junit:4
+ dev-java/hamcrest-core:1.3
+ )"
+
+S="${WORKDIR}"/${P}
+
+EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-no-ikvm.patch
+ epatch "${FILESDIR}"/${P}-no-dynamic-object-test.patch
+ epatch "${FILESDIR}"/${P}-oolibrary-unit-test.patch
+
+ cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+}
+
+src_compile() {
+ eant jar $(use_doc)
+}
+
+src_test() {
+ cd "${S}"/dist
+ java-pkg_jar-from junit:4
+ java-pkg_jar-from hamcrest-core:1.3
+ cd "${S}"
+ ANT_TASKS="ant-junit4" eant 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
+ dodoc doc/tuprolog-guide.pdf
+ fi
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}/examples
+ doins doc/examples/*.pl
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/files/, dev-lang/tuprolog/
@ 2017-09-27 17:40 Keri Harris
0 siblings, 0 replies; 7+ messages in thread
From: Keri Harris @ 2017-09-27 17:40 UTC (permalink / raw
To: gentoo-commits
commit: 4e0c207dd17da4bad4938f6320b2dce8c92b22c2
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 17:39:32 2017 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 17:39:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e0c207d
dev-lang/tuprolog: version bump
Package-Manager: Portage-2.3.8, Repoman-2.3.1
dev-lang/tuprolog/Manifest | 1 +
dev-lang/tuprolog/files/build-3.0.1.xml | 108 ++++++++++++++++
.../tuprolog/files/tuprolog-3.0.1-no-ikvm.patch | 137 +++++++++++++++++++++
.../files/tuprolog-3.0.1-oolibrary-unit-test.patch | 12 ++
dev-lang/tuprolog/tuprolog-3.0.1.ebuild | 65 ++++++++++
5 files changed, 323 insertions(+)
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index d771fa540f0..8751d389cc9 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,2 +1,3 @@
DIST tuprolog-2.9.2.tar.gz 6262268 SHA256 4205dff584b492e10f214c71ce7bc0e81297a915156ca1e10cfac8b34c8c0a6e SHA512 831c7390fe33fc57cb01d4b1d61485ac5df1aa8ebf386d5aae5c5d32f7677d46aa5aa6cc0eb1d3bb79989a54f8484ad8b97754b7f75fc21af6116ae170a28316 WHIRLPOOL 18dceea5e95be3e60b10fa8692970e61d9b16b2f518ac342de271ac7c6cb8313e8e9ca359fb93753d43a2c09780e47f212776ce560f9c2fefdb21d44f3316c77
DIST tuprolog-3.0.0.tar.gz 6275327 SHA256 1c7a423cbd3faa626f8398a48ec6396c2d17431a77b1f22179d713cc76aeeb09 SHA512 7998dadb04b1314d096a33c54d11977534565accb3811b93a22f606fd838d2f9b0a6defe882992977a093832e1565283d3951dcc791809620deb61d3511c02d3 WHIRLPOOL 915a21632a2c86f33de25cc05ec75f3e40b33a0ba80f73219cfab6d06f69af07bc9d143a3d1cd80fbfd27fdeba9d4259f389f1a33704bfac2151403b26424e12
+DIST tuprolog-3.0.1.tar.gz 6326591 SHA256 e4ed2689dd5496175cddcfe299b442d92d580d778a0fd9a4c7beededa20dfbb7 SHA512 56fa96f717b5c8e56fd2979f2953744964d844e5abf215456e31309d3d92bde142f9bff55e6442b6de55f219c7f143a275ccf89359ff2f2944459bbc94770afa WHIRLPOOL 81d8421242ce8308418b7c40b7db6554cdbd92a4966aef4d73c414b675fca9148f5fce52ec2ef2a0c62025eda1c790013fb1b6bd20ac53a16f7be3fc61149004
diff --git a/dev-lang/tuprolog/files/build-3.0.1.xml b/dev-lang/tuprolog/files/build-3.0.1.xml
new file mode 100644
index 00000000000..5815bc0d17c
--- /dev/null
+++ b/dev-lang/tuprolog/files/build-3.0.1.xml
@@ -0,0 +1,108 @@
+<?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"/>
+
+ <path id="compile.classpath">
+ <fileset dir="lib" includes="*.jar"/>
+ <pathelement path="${gentoo.classpath}"/>
+ </path>
+
+ <!-- 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 deprecation="off"
+ destdir="${build.dir}"
+ encoding="ISO-8859-1"
+ srcdir="${src.dir}"
+ target="1.7">
+ <classpath>
+ <path refid="compile.classpath"/>
+ </classpath>
+ </javac>
+ <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"/>
+ <attribute name="Class-Path" value="."/>
+ </manifest>
+ <zipgroupfileset dir="lib" includes="*.jar"/>
+ </jar>
+ </target>
+
+ <!-- generate javadocs -->
+ <target depends="init" name="javadoc">
+ <javadoc
+ author="false"
+ destdir="${docs.dir}"
+ encoding="ISO-8859-1"
+ breakiterator="yes"
+ packagenames="alice.*"
+ sourcepath="${src.dir}"
+ use="true"
+ version="true"
+ verbose="no"
+ windowtitle="${ant.project.name} API">
+ <classpath>
+ <path refid="compile.classpath"/>
+ </classpath>
+ </javadoc>
+ </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"
+ srcdir="${test.dir}/unit"
+ target="1.7"/>
+ <junit fork="yes" failureproperty="test.failed" printsummary="yes">
+ <classpath>
+ <path refid="dist.classpath"/>
+ <pathelement path="${test.build.dir}"/>
+ </classpath>
+ <formatter type="xml"/>
+ <test name="alice.tuprolog.TuPrologTestSuite" todir="${test.build.dir}"/>
+ <test name="alice.tuprolog.ExceptionsTestSuite" todir="${test.build.dir}"/>
+ </junit>
+ <fail message="Test failure(s) detected" if="test.failed" />
+ </target>
+</project>
diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch
new file mode 100644
index 00000000000..660b22c7934
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch
@@ -0,0 +1,137 @@
+diff -urN tuprolog-3.0.1.orig/src/alice/tuprolog/LibraryManager.java tuprolog-3.0.1/src/alice/tuprolog/LibraryManager.java
+--- tuprolog-3.0.1.orig/src/alice/tuprolog/LibraryManager.java 2017-09-27 12:31:06.689334505 +0200
++++ tuprolog-3.0.1/src/alice/tuprolog/LibraryManager.java 2017-09-27 12:50:04.193286931 +0200
+@@ -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;
+ }
+
+-}
+\ Manca newline alla fine del file
++}
+diff -urN tuprolog-3.0.1.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-3.0.1/src/alice/tuprologx/ide/LibraryManager.java
+--- tuprolog-3.0.1.orig/src/alice/tuprologx/ide/LibraryManager.java 2017-09-27 12:31:06.696334504 +0200
++++ tuprolog-3.0.1/src/alice/tuprologx/ide/LibraryManager.java 2017-09-27 12:50:04.194286931 +0200
+@@ -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-3.0.1.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-3.0.1/src/alice/util/AssemblyCustomClassLoader.java
+--- tuprolog-3.0.1.orig/src/alice/util/AssemblyCustomClassLoader.java 2017-09-27 12:31:06.699334504 +0200
++++ tuprolog-3.0.1/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);
+- }
+-}
+\ Manca newline alla fine del file
+diff -urN tuprolog-3.0.1.orig/src/alice/util/proxyGenerator/Generator.java tuprolog-3.0.1/src/alice/util/proxyGenerator/Generator.java
+--- tuprolog-3.0.1.orig/src/alice/util/proxyGenerator/Generator.java 2017-09-27 12:31:06.700334504 +0200
++++ tuprolog-3.0.1/src/alice/util/proxyGenerator/Generator.java 2017-09-27 12:50:04.195286931 +0200
+@@ -1,7 +1,7 @@
+ package alice.util.proxyGenerator;
+ import javax.tools.*;
+
+-import cli.System.Reflection.Assembly;
++//import cli.System.Reflection.Assembly;
+
+ import java.lang.reflect.*;
+ import java.util.*;
+@@ -29,7 +29,7 @@
+ }
+
+ if(System.getProperty("java.vm.name").equals("IKVM.NET"))
+- ikvm.runtime.Startup.addBootClassPathAssemby(Assembly.Load("IKVM.OpenJDK.Tools"));
++ throw new UnsupportedOperationException("IKVM.NET not supported!");
+
+ jc = ToolProvider.getSystemJavaCompiler();
+ if (jc == null) {
diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch b/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch
new file mode 100644
index 00000000000..9d09ff202b0
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch
@@ -0,0 +1,12 @@
+diff -ur tuprolog-3.0.1.orig/test/unit/alice/tuprolog/PrologTestCase.java tuprolog-3.0.1/test/unit/alice/tuprolog/PrologTestCase.java
+--- tuprolog-3.0.1.orig/test/unit/alice/tuprolog/PrologTestCase.java 2017-09-27 12:31:12.908334244 +0200
++++ tuprolog-3.0.1/test/unit/alice/tuprolog/PrologTestCase.java 2017-09-27 19:30:31.813282027 +0200
+@@ -32,7 +32,7 @@
+ assertNotNull(engine.getLibrary("alice.tuprolog.StringLibrary"));
+ Library javaLibrary = new alice.tuprolog.lib.OOLibrary();
+ engine.loadLibrary(javaLibrary);
+- assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.JavaLibrary"));
++ assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.OOLibrary"));
+ }
+
+ public void testGetLibraryWithName() throws InvalidLibraryException {
diff --git a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
new file mode 100644
index 00000000000..e0e56ba0161
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=virtual/jdk-1.7:=
+ dev-java/javassist:3
+ dev-java/commons-lang:3.1"
+
+DEPEND="${RDEPEND}
+ dev-java/ant-core
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/junit:4
+ dev-java/hamcrest-core:1.3
+ )"
+
+S="${WORKDIR}"/${P}
+
+EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-no-ikvm.patch
+ epatch "${FILESDIR}"/${P}-oolibrary-unit-test.patch
+
+ cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+}
+
+src_compile() {
+ eant jar $(use_doc)
+}
+
+src_test() {
+ cd "${S}"/dist
+ java-pkg_jar-from junit:4
+ java-pkg_jar-from hamcrest-core:1.3
+ cd "${S}"
+ ANT_TASKS="ant-junit4" eant 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
+ dodoc doc/tuprolog-guide.pdf
+ fi
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}/examples
+ doins doc/examples/*.pl
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/files/, dev-lang/tuprolog/
@ 2017-09-28 8:57 Keri Harris
0 siblings, 0 replies; 7+ messages in thread
From: Keri Harris @ 2017-09-28 8:57 UTC (permalink / raw
To: gentoo-commits
commit: 74c863fa64f4c2528ddef19bd467b26cec79a5a6
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 28 08:56:58 2017 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 08:57:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c863fa
dev-lang/tuprolog: correctly specify JDK dependency
Package-Manager: Portage-2.3.8, Repoman-2.3.1
dev-lang/tuprolog/files/build-3.0.1.xml | 6 ++++--
dev-lang/tuprolog/tuprolog-3.0.1.ebuild | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dev-lang/tuprolog/files/build-3.0.1.xml b/dev-lang/tuprolog/files/build-3.0.1.xml
index 5815bc0d17c..3b6f5818eaa 100644
--- a/dev-lang/tuprolog/files/build-3.0.1.xml
+++ b/dev-lang/tuprolog/files/build-3.0.1.xml
@@ -30,7 +30,8 @@
destdir="${build.dir}"
encoding="ISO-8859-1"
srcdir="${src.dir}"
- target="1.7">
+ source="1.8"
+ target="1.8">
<classpath>
<path refid="compile.classpath"/>
</classpath>
@@ -93,7 +94,8 @@
destdir="${test.build.dir}"
encoding="ISO-8859-1"
srcdir="${test.dir}/unit"
- target="1.7"/>
+ source="1.8"
+ target="1.8"/>
<junit fork="yes" failureproperty="test.failed" printsummary="yes">
<classpath>
<path refid="dist.classpath"/>
diff --git a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
index e0e56ba0161..e33e5e5b714 100644
--- a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
+++ b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc examples test"
-RDEPEND=">=virtual/jdk-1.7:=
+RDEPEND=">=virtual/jdk-1.8:=
dev-java/javassist:3
dev-java/commons-lang:3.1"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/files/, dev-lang/tuprolog/
@ 2017-10-08 16:18 Keri Harris
0 siblings, 0 replies; 7+ messages in thread
From: Keri Harris @ 2017-10-08 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 4a5ca9e29e15e0e6c141fe6ce9522426c74f2280
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 8 16:17:55 2017 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 16:18:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a5ca9e2
dev-lang/tuprolog: version bump
Package-Manager: Portage-2.3.8, Repoman-2.3.1
dev-lang/tuprolog/Manifest | 1 +
.../tuprolog/files/tuprolog-3.1.0-no-ikvm.patch | 137 +++++++++++++++++++++
dev-lang/tuprolog/tuprolog-3.1.0.ebuild | 64 ++++++++++
3 files changed, 202 insertions(+)
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 8751d389cc9..1f022adf12c 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,3 +1,4 @@
DIST tuprolog-2.9.2.tar.gz 6262268 SHA256 4205dff584b492e10f214c71ce7bc0e81297a915156ca1e10cfac8b34c8c0a6e SHA512 831c7390fe33fc57cb01d4b1d61485ac5df1aa8ebf386d5aae5c5d32f7677d46aa5aa6cc0eb1d3bb79989a54f8484ad8b97754b7f75fc21af6116ae170a28316 WHIRLPOOL 18dceea5e95be3e60b10fa8692970e61d9b16b2f518ac342de271ac7c6cb8313e8e9ca359fb93753d43a2c09780e47f212776ce560f9c2fefdb21d44f3316c77
DIST tuprolog-3.0.0.tar.gz 6275327 SHA256 1c7a423cbd3faa626f8398a48ec6396c2d17431a77b1f22179d713cc76aeeb09 SHA512 7998dadb04b1314d096a33c54d11977534565accb3811b93a22f606fd838d2f9b0a6defe882992977a093832e1565283d3951dcc791809620deb61d3511c02d3 WHIRLPOOL 915a21632a2c86f33de25cc05ec75f3e40b33a0ba80f73219cfab6d06f69af07bc9d143a3d1cd80fbfd27fdeba9d4259f389f1a33704bfac2151403b26424e12
DIST tuprolog-3.0.1.tar.gz 6326591 SHA256 e4ed2689dd5496175cddcfe299b442d92d580d778a0fd9a4c7beededa20dfbb7 SHA512 56fa96f717b5c8e56fd2979f2953744964d844e5abf215456e31309d3d92bde142f9bff55e6442b6de55f219c7f143a275ccf89359ff2f2944459bbc94770afa WHIRLPOOL 81d8421242ce8308418b7c40b7db6554cdbd92a4966aef4d73c414b675fca9148f5fce52ec2ef2a0c62025eda1c790013fb1b6bd20ac53a16f7be3fc61149004
+DIST tuprolog-3.1.0.tar.gz 7201383 SHA256 be2ecf38acb74e35cd19e507cb15e698fe5a9bd6373487a668fccbe38628bba2 SHA512 1093e29a79964cb3991326da14f020cdc8ff64f2444c84dbb6b22aa5c4ecbf48f74dbc26af0af949ccc31020573ce5908684af794db4654fb475efa697a82cbf WHIRLPOOL 6aac4962fa499efbc95d6e86b654b6a0f5cfbec8cd569f6525006fd0255a08e0bcd7f3826b5c3070fe524e3d752f7aaa6434a1851d61d140597d604ae8e65a07
diff --git a/dev-lang/tuprolog/files/tuprolog-3.1.0-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-3.1.0-no-ikvm.patch
new file mode 100644
index 00000000000..eb20dacd443
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-3.1.0-no-ikvm.patch
@@ -0,0 +1,137 @@
+diff -urN tuprolog-3.1.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-3.1.0/src/alice/tuprolog/LibraryManager.java
+--- tuprolog-3.1.0.orig/src/alice/tuprolog/LibraryManager.java 2017-10-08 17:06:55.710627376 +0200
++++ tuprolog-3.1.0/src/alice/tuprolog/LibraryManager.java 2017-10-08 17:18:20.817598723 +0200
+@@ -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;
+ }
+
+-}
+\ Manca newline alla fine del file
++}
+diff -urN tuprolog-3.1.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-3.1.0/src/alice/tuprologx/ide/LibraryManager.java
+--- tuprolog-3.1.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2017-10-08 17:06:55.796627373 +0200
++++ tuprolog-3.1.0/src/alice/tuprologx/ide/LibraryManager.java 2017-10-08 17:20:18.378593806 +0200
+@@ -19,7 +19,7 @@
+
+ import alice.tuprolog.*;
+ import alice.tuprolog.InvalidLibraryException;
+-import alice.util.AssemblyCustomClassLoader;
++//import alice.util.AssemblyCustomClassLoader;
+
+ import java.io.File;
+ import java.net.URL;
+@@ -27,7 +27,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-3.1.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-3.1.0/src/alice/util/AssemblyCustomClassLoader.java
+--- tuprolog-3.1.0.orig/src/alice/util/AssemblyCustomClassLoader.java 2017-10-08 17:06:55.863627370 +0200
++++ tuprolog-3.1.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);
+- }
+-}
+\ Manca newline alla fine del file
+diff -urN tuprolog-3.1.0.orig/src/alice/util/proxyGenerator/Generator.java tuprolog-3.1.0/src/alice/util/proxyGenerator/Generator.java
+--- tuprolog-3.1.0.orig/src/alice/util/proxyGenerator/Generator.java 2017-10-08 17:06:55.877627369 +0200
++++ tuprolog-3.1.0/src/alice/util/proxyGenerator/Generator.java 2017-10-08 17:18:20.819598723 +0200
+@@ -1,7 +1,7 @@
+ package alice.util.proxyGenerator;
+ import javax.tools.*;
+
+-import cli.System.Reflection.Assembly;
++//import cli.System.Reflection.Assembly;
+
+ import java.lang.reflect.*;
+ import java.util.*;
+@@ -29,7 +29,7 @@
+ }
+
+ if(System.getProperty("java.vm.name").equals("IKVM.NET"))
+- ikvm.runtime.Startup.addBootClassPathAssemby(Assembly.Load("IKVM.OpenJDK.Tools"));
++ throw new UnsupportedOperationException("IKVM.NET not supported!");
+
+ jc = ToolProvider.getSystemJavaCompiler();
+ if (jc == null) {
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild b/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
new file mode 100644
index 00000000000..3da80e1506c
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=">=virtual/jdk-1.8:=
+ dev-java/javassist:3
+ dev-java/commons-lang:3.1"
+
+DEPEND="${RDEPEND}
+ dev-java/ant-core
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/junit:4
+ dev-java/hamcrest-core:1.3
+ )"
+
+S="${WORKDIR}"/${P}
+
+EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-no-ikvm.patch
+
+ cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+}
+
+src_compile() {
+ eant jar $(use_doc)
+}
+
+src_test() {
+ cd "${S}"/dist
+ java-pkg_jar-from junit:4
+ java-pkg_jar-from hamcrest-core:1.3
+ cd "${S}"
+ ANT_TASKS="ant-junit4" eant 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
+ dodoc doc/tuprolog-guide.pdf
+ fi
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}/examples
+ doins doc/examples/*.pl
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/files/, dev-lang/tuprolog/
@ 2020-09-26 9:34 Keri Harris
0 siblings, 0 replies; 7+ messages in thread
From: Keri Harris @ 2020-09-26 9:34 UTC (permalink / raw
To: gentoo-commits
commit: c94f6a6616b2e0883b7c82c1edab3cd9138f5376
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 09:33:45 2020 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 09:33:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c94f6a66
dev-lang/tuprolog: remove old versions
Package-Manager: Portage-3.0.4, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>
dev-lang/tuprolog/Manifest | 2 -
dev-lang/tuprolog/files/build-2.9.2.xml | 110 -----------------
.../tuprolog-2.9.2-no-dynamic-object-test.patch | 20 ---
.../tuprolog/files/tuprolog-2.9.2-no-ikvm.patch | 116 -----------------
.../tuprolog/files/tuprolog-3.0.1-no-ikvm.patch | 137 ---------------------
.../files/tuprolog-3.0.1-oolibrary-unit-test.patch | 12 --
dev-lang/tuprolog/tuprolog-2.9.2.ebuild | 65 ----------
dev-lang/tuprolog/tuprolog-3.0.1.ebuild | 66 ----------
dev-lang/tuprolog/tuprolog-3.1.0.ebuild | 65 ----------
9 files changed, 593 deletions(-)
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 4b2ae8c599e..3153148ca02 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,5 +1,3 @@
-DIST tuprolog-2.9.2.tar.gz 6262268 BLAKE2B 39bbc4dcb2336a713f47252ff6f7d00f15aa0072c4864c2d3e453ec43b2c646f9cdc7a69444e21d9cc20ba283ddee5fd980855811f8f80ba4afe7c37cdd47317 SHA512 831c7390fe33fc57cb01d4b1d61485ac5df1aa8ebf386d5aae5c5d32f7677d46aa5aa6cc0eb1d3bb79989a54f8484ad8b97754b7f75fc21af6116ae170a28316
-DIST tuprolog-3.0.1.tar.gz 6326591 BLAKE2B a051eb3f22c01e1c269b167fa7d1daec6e4818229e2035c1140401c38094c53451ea720638adaa6d6fda0ea70daf6f5f1bc9ea84f1e4ba9de9f00ca83529697c SHA512 56fa96f717b5c8e56fd2979f2953744964d844e5abf215456e31309d3d92bde142f9bff55e6442b6de55f219c7f143a275ccf89359ff2f2944459bbc94770afa
DIST tuprolog-3.1.0.tar.gz 7201383 BLAKE2B 9d8b610240611cd5b3d0dae104a44c72bb5e7c0512e4dbf3e178204d9d36e461219cd869ca1e16e3054ca3e1ee34d3b2c6fa5c659df16f54e3266c7c826af8d6 SHA512 1093e29a79964cb3991326da14f020cdc8ff64f2444c84dbb6b22aa5c4ecbf48f74dbc26af0af949ccc31020573ce5908684af794db4654fb475efa697a82cbf
DIST tuprolog-3.2.0-gentoo-patchset-0.tar.gz 1813 BLAKE2B 4ed7ffbb752a821a2b2842cfdbc1f4ec92d14b35a1c5a722207b45ec9dbdc44588acc010fb6386e8ed2e7d30d3bc8d425f0f74e8cc953cb7afad8305904e1499 SHA512 454757fc01f3f697510426e7a2a41b57350c1e3f980e381e197616e10eaf88339155226096f1d417397b9bc6f4964a45b3d547c6794ad23a4a014b06212b08f0
DIST tuprolog-3.2.0.tar.gz 6242286 BLAKE2B 77a3d3f886673aca72fffd9bb60657efcbe7ea5bb0f84eea7a72df513295d572c8116472f8d544240fac676ac9a6a0fcecfc3166e6426ef7d8af80eac4ba8d85 SHA512 e27bd989d66bae26c646cb69670fb75232ebdd18d1dbb9d600f9847921ecd56d17221736b3ec15c087857509272ce89af8bc44924130430db3860870a06bb499
diff --git a/dev-lang/tuprolog/files/build-2.9.2.xml b/dev-lang/tuprolog/files/build-2.9.2.xml
deleted file mode 100644
index 823c2371d1f..00000000000
--- a/dev-lang/tuprolog/files/build-2.9.2.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?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"/>
-
- <path id="compile.classpath">
- <fileset dir="lib" includes="*.jar"/>
- <pathelement path="${gentoo.classpath}"/>
- </path>
-
- <!-- 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 deprecation="off"
- destdir="${build.dir}"
- encoding="ISO-8859-1"
- srcdir="${src.dir}"
- target="1.7">
- <classpath>
- <path refid="compile.classpath"/>
- </classpath>
- </javac>
- <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"/>
- <attribute name="Class-Path" value="."/>
- </manifest>
- <zipgroupfileset dir="lib" includes="*.jar"/>
- </jar>
- </target>
-
- <!-- generate javadocs -->
- <target depends="init" name="javadoc">
- <javadoc
- author="false"
- destdir="${docs.dir}"
- encoding="ISO-8859-1"
- breakiterator="yes"
- packagenames="alice.*"
- sourcepath="${src.dir}"
- use="true"
- version="true"
- verbose="no"
- windowtitle="${ant.project.name} API">
- <classpath>
- <path refid="compile.classpath"/>
- </classpath>
- </javadoc>
- </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"
- srcdir="${test.dir}/unit"
- target="1.7"/>
- <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.9.2-no-dynamic-object-test.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch
deleted file mode 100644
index 0416258e9e1..00000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-dynamic-object-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tuprolog-2.9.2.orig/test/unit/alice/tuprolog/JavaLibraryTestCase.java 2015-02-27 14:02:49.000000000 +0100
-+++ tuprolog-2.9.2/test/unit/alice/tuprolog/JavaLibraryTestCase.java 2016-02-17 15:24:47.000000000 +0100
-@@ -39,7 +39,7 @@
- SolveInfo goal = engine.solve(new Struct("demo", t));
- assertFalse(goal.isSuccess());
- }
--
-+/*
- public void testDynamicObjectsRetrival() throws PrologException {
- Prolog engine = new Prolog();
- JavaLibrary lib = (JavaLibrary) engine.getLibrary("alice.tuprolog.lib.JavaLibrary");
-@@ -53,7 +53,7 @@
- TestCounter counter = (TestCounter) lib.getRegisteredDynamicObject(id);
- assertEquals(2, counter.getValue());
- }
--
-+*/
-
- public void test_java_object() throws PrologException, IOException
- {
diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch
deleted file mode 100644
index d94dc66bbac..00000000000
--- a/dev-lang/tuprolog/files/tuprolog-2.9.2-no-ikvm.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-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/files/tuprolog-3.0.1-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch
deleted file mode 100644
index 660b22c7934..00000000000
--- a/dev-lang/tuprolog/files/tuprolog-3.0.1-no-ikvm.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -urN tuprolog-3.0.1.orig/src/alice/tuprolog/LibraryManager.java tuprolog-3.0.1/src/alice/tuprolog/LibraryManager.java
---- tuprolog-3.0.1.orig/src/alice/tuprolog/LibraryManager.java 2017-09-27 12:31:06.689334505 +0200
-+++ tuprolog-3.0.1/src/alice/tuprolog/LibraryManager.java 2017-09-27 12:50:04.193286931 +0200
-@@ -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;
- }
-
--}
-\ Manca newline alla fine del file
-+}
-diff -urN tuprolog-3.0.1.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-3.0.1/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-3.0.1.orig/src/alice/tuprologx/ide/LibraryManager.java 2017-09-27 12:31:06.696334504 +0200
-+++ tuprolog-3.0.1/src/alice/tuprologx/ide/LibraryManager.java 2017-09-27 12:50:04.194286931 +0200
-@@ -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-3.0.1.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-3.0.1/src/alice/util/AssemblyCustomClassLoader.java
---- tuprolog-3.0.1.orig/src/alice/util/AssemblyCustomClassLoader.java 2017-09-27 12:31:06.699334504 +0200
-+++ tuprolog-3.0.1/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);
-- }
--}
-\ Manca newline alla fine del file
-diff -urN tuprolog-3.0.1.orig/src/alice/util/proxyGenerator/Generator.java tuprolog-3.0.1/src/alice/util/proxyGenerator/Generator.java
---- tuprolog-3.0.1.orig/src/alice/util/proxyGenerator/Generator.java 2017-09-27 12:31:06.700334504 +0200
-+++ tuprolog-3.0.1/src/alice/util/proxyGenerator/Generator.java 2017-09-27 12:50:04.195286931 +0200
-@@ -1,7 +1,7 @@
- package alice.util.proxyGenerator;
- import javax.tools.*;
-
--import cli.System.Reflection.Assembly;
-+//import cli.System.Reflection.Assembly;
-
- import java.lang.reflect.*;
- import java.util.*;
-@@ -29,7 +29,7 @@
- }
-
- if(System.getProperty("java.vm.name").equals("IKVM.NET"))
-- ikvm.runtime.Startup.addBootClassPathAssemby(Assembly.Load("IKVM.OpenJDK.Tools"));
-+ throw new UnsupportedOperationException("IKVM.NET not supported!");
-
- jc = ToolProvider.getSystemJavaCompiler();
- if (jc == null) {
diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch b/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch
deleted file mode 100644
index 9d09ff202b0..00000000000
--- a/dev-lang/tuprolog/files/tuprolog-3.0.1-oolibrary-unit-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur tuprolog-3.0.1.orig/test/unit/alice/tuprolog/PrologTestCase.java tuprolog-3.0.1/test/unit/alice/tuprolog/PrologTestCase.java
---- tuprolog-3.0.1.orig/test/unit/alice/tuprolog/PrologTestCase.java 2017-09-27 12:31:12.908334244 +0200
-+++ tuprolog-3.0.1/test/unit/alice/tuprolog/PrologTestCase.java 2017-09-27 19:30:31.813282027 +0200
-@@ -32,7 +32,7 @@
- assertNotNull(engine.getLibrary("alice.tuprolog.StringLibrary"));
- Library javaLibrary = new alice.tuprolog.lib.OOLibrary();
- engine.loadLibrary(javaLibrary);
-- assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.JavaLibrary"));
-+ assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.OOLibrary"));
- }
-
- public void testGetLibraryWithName() throws InvalidLibraryException {
diff --git a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
deleted file mode 100644
index ee49fbe50a3..00000000000
--- a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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 examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jdk-1.7:=
- dev-java/javassist:3"
-
-DEPEND="${RDEPEND}
- dev-java/ant-core
- test? (
- dev-java/ant-junit4:0
- dev-java/junit:4
- dev-java/hamcrest-core:1.3
- )"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist:3"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-ikvm.patch
- epatch "${FILESDIR}"/${P}-no-dynamic-object-test.patch
-
- cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
-}
-
-src_compile() {
- eant jar $(use_doc)
-}
-
-src_test() {
- cd "${S}"/dist
- java-pkg_jar-from junit:4
- java-pkg_jar-from hamcrest-core:1.3
- cd "${S}"
- ANT_TASKS="ant-junit4" eant 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
- dodoc doc/tuprolog-guide.pdf
- fi
-
- if use examples ; then
- insinto /usr/share/doc/${PF}/examples
- doins doc/examples/*.pl
- fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
deleted file mode 100644
index 411a1f875b0..00000000000
--- a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jdk-1.8:=
- dev-java/javassist:3
- dev-java/commons-lang:3.1"
-
-DEPEND="${RDEPEND}
- dev-java/ant-core
- test? (
- dev-java/ant-junit4:0
- dev-java/junit:4
- dev-java/hamcrest-core:1.3
- )"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-ikvm.patch
- epatch "${FILESDIR}"/${P}-oolibrary-unit-test.patch
-
- cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
-}
-
-src_compile() {
- eant jar $(use_doc)
-}
-
-src_test() {
- cd "${S}"/dist
- java-pkg_jar-from junit:4
- java-pkg_jar-from hamcrest-core:1.3
- cd "${S}"
- ANT_TASKS="ant-junit4" eant 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
- dodoc doc/tuprolog-guide.pdf
- fi
-
- if use examples ; then
- insinto /usr/share/doc/${PF}/examples
- doins doc/examples/*.pl
- fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild b/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
deleted file mode 100644
index d22edc7d11f..00000000000
--- a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jdk-1.8:=
- dev-java/javassist:3
- dev-java/commons-lang:3.1"
-
-DEPEND="${RDEPEND}
- dev-java/ant-core
- test? (
- dev-java/ant-junit4:0
- dev-java/junit:4
- dev-java/hamcrest-core:1.3
- )"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-ikvm.patch
-
- cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
-}
-
-src_compile() {
- eant jar $(use_doc)
-}
-
-src_test() {
- cd "${S}"/dist
- java-pkg_jar-from junit:4
- java-pkg_jar-from hamcrest-core:1.3
- cd "${S}"
- ANT_TASKS="ant-junit4" eant 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
- dodoc doc/tuprolog-guide.pdf
- fi
-
- if use examples ; then
- insinto /usr/share/doc/${PF}/examples
- doins doc/examples/*.pl
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-09-26 9:34 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-26 9:34 [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/files/, dev-lang/tuprolog/ Keri Harris
-- strict thread matches above, loose matches on Subject: below --
2017-10-08 16:18 Keri Harris
2017-09-28 8:57 Keri Harris
2017-09-27 17:40 Keri Harris
2016-10-09 9:27 Keri Harris
2016-02-17 14:42 Keri Harris
2016-02-15 18:28 Keri Harris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox