* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/, dev-lang/tuprolog/files/
@ 2016-10-09 9:11 Keri Harris
0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris @ 2016-10-09 9:11 UTC (permalink / raw
To: gentoo-commits
commit: 25ab8e7f1784fc0d140802a04bcca4e6fd507798
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 09:10:53 2016 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 09:10:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ab8e7f
dev-lang/tuprolog: clean up cruft during install
Package-Manager: portage-2.3.0
dev-lang/tuprolog/files/build-2.9.2.xml | 2 ++
dev-lang/tuprolog/tuprolog-2.9.2.ebuild | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/tuprolog/files/build-2.9.2.xml b/dev-lang/tuprolog/files/build-2.9.2.xml
index 0e585bd..823c237 100644
--- a/dev-lang/tuprolog/files/build-2.9.2.xml
+++ b/dev-lang/tuprolog/files/build-2.9.2.xml
@@ -48,7 +48,9 @@
<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>
diff --git a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
index 0021725..baeea57 100644
--- a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
+++ b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
@@ -52,8 +52,6 @@ src_test() {
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/, dev-lang/tuprolog/files/
@ 2017-01-22 14:10 Manuel Rüger
0 siblings, 0 replies; 6+ messages in thread
From: Manuel Rüger @ 2017-01-22 14:10 UTC (permalink / raw
To: gentoo-commits
commit: 2b28fbb27e1dec410a4a6ea0711df851d3d07086
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 14:09:05 2017 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 14:10:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b28fbb2
dev-lang/tuprolog: Remove old
Package-Manager: portage-2.3.3
dev-lang/tuprolog/Manifest | 3 -
dev-lang/tuprolog/files/build.xml | 99 -----
.../files/tuprolog-2.4.0_rc5-javadocs.patch | 315 --------------
.../tuprolog/files/tuprolog-2.7.2-javadocs.patch | 479 ---------------------
.../tuprolog/files/tuprolog-2.7.2-no-ikvm.patch | 105 -----
.../tuprolog/files/tuprolog-2.9.0-no-ikvm.patch | 116 -----
dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild | 57 ---
dev-lang/tuprolog/tuprolog-2.7.2.ebuild | 60 ---
dev-lang/tuprolog/tuprolog-2.9.0.ebuild | 60 ---
9 files changed, 1294 deletions(-)
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 782017b..d771fa5 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,5 +1,2 @@
-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
DIST tuprolog-3.0.0.tar.gz 6275327 SHA256 1c7a423cbd3faa626f8398a48ec6396c2d17431a77b1f22179d713cc76aeeb09 SHA512 7998dadb04b1314d096a33c54d11977534565accb3811b93a22f606fd838d2f9b0a6defe882992977a093832e1565283d3951dcc791809620deb61d3511c02d3 WHIRLPOOL 915a21632a2c86f33de25cc05ec75f3e40b33a0ba80f73219cfab6d06f69af07bc9d143a3d1cd80fbfd27fdeba9d4259f389f1a33704bfac2151403b26424e12
diff --git a/dev-lang/tuprolog/files/build.xml b/dev-lang/tuprolog/files/build.xml
deleted file mode 100644
index f5b946f..00000000
--- a/dev-lang/tuprolog/files/build.xml
+++ /dev/null
@@ -1,99 +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"/>
-
- <!-- init -->
- <target name="init">
- <tstamp/>
- <mkdir dir="${dist.dir}"/>
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${docs.dir}"/>
- <mkdir dir="${test.build.dir}"/>
- </target>
-
- <!-- compile everything -->
- <target depends="init" name="compile">
- <javac classpath="${gentoo.classpath}"
- deprecation="off"
- destdir="${build.dir}"
- encoding="ISO-8859-1"
- source="1.5"
- srcdir="${src.dir}"
- target="1.5"/>
- <copy todir="${build.dir}">
- <fileset dir="${src.dir}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- </target>
-
- <!-- build the jar file -->
- <target depends="compile" name="jar">
- <jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
- <jar basedir="${build.dir}" jarfile="${dist.dir}/2p.jar">
- <manifest>
- <attribute name="Main-Class" value="alice.tuprologx.ide.GUILauncher"/>
- </manifest>
- </jar>
- </target>
-
- <!-- generate javadocs -->
- <target depends="init" name="javadoc">
- <javadoc classpath="${gentoo.classpath}"
- author="false"
- destdir="${docs.dir}"
- encoding="ISO-8859-1"
- packagenames="alice.*"
- source="1.5"
- sourcepath="${src.dir}"
- use="true"
- version="true"
- windowtitle="${ant.project.name}
- API"/>
- </target>
-
- <!-- clean up -->
- <target name="clean">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- <delete dir="${docs.dir}"/>
- <delete dir="${test.build.dir}"/>
- </target>
-
- <!-- run testsuite -->
- <target name="test">
- <path id="dist.classpath">
- <fileset dir="${dist.dir}">
- <include name="*.jar"/>
- </fileset>
- </path>
- <javac classpathref="dist.classpath"
- deprecation="off"
- destdir="${test.build.dir}"
- encoding="ISO-8859-1"
- source="1.5"
- srcdir="${test.dir}"
- target="1.5"
- excludes="**/fixtures/**"/>
- <junit haltonfailure="on" showoutput="no" printsummary="yes">
- <classpath>
- <path refid="dist.classpath"/>
- <pathelement path="${test.build.dir}"/>
- </classpath>
- <formatter type="xml"/>
- <batchtest todir="${test.build.dir}">
- <fileset dir="${test.build.dir}">
- <include name="**/*TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-</project>
diff --git a/dev-lang/tuprolog/files/tuprolog-2.4.0_rc5-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.4.0_rc5-javadocs.patch
deleted file mode 100644
index 618ead1..00000000
--- a/dev-lang/tuprolog/files/tuprolog-2.4.0_rc5-javadocs.patch
+++ /dev/null
@@ -1,315 +0,0 @@
-diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/ChoicePointStore.java 2p-2.4.0-RC5/src/alice/tuprolog/ChoicePointStore.java
---- 2p-2.4.0-RC5.orig/src/alice/tuprolog/ChoicePointStore.java 2011-07-18 18:49:42.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/tuprolog/ChoicePointStore.java 2012-01-15 10:02:51.000000000 +1300
-@@ -36,7 +36,6 @@
-
- /**
- * Return the actual choice-point store
-- * @return
- */
- public ChoicePointContext getPointer() {
- return pointer;
-@@ -45,7 +44,6 @@
- /**
- * Check if a choice point exists in the store.
- * As a side effect, removes choice points which have been already used and are now empty.
-- * @return
- */
- protected boolean existChoicePoint() {
- if (pointer == null) return false;
-@@ -93,4 +91,4 @@
- return l;
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/ClauseStore.java 2p-2.4.0-RC5/src/alice/tuprolog/ClauseStore.java
---- 2p-2.4.0-RC5.orig/src/alice/tuprolog/ClauseStore.java 2011-07-21 15:19:52.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/tuprolog/ClauseStore.java 2012-01-15 10:03:27.000000000 +1300
-@@ -62,8 +62,6 @@
-
- /**
- * Verify if there is a term in compatibleGoals compatible with goal.
-- * @param goal
-- * @param compGoals
- * @return true if compatible or false otherwise.
- */
- protected boolean existCompatibleClause() {
-@@ -160,4 +158,4 @@
- }
-
-
--}
-\ No newline at end of file
-+}
-diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/EngineManager.java 2p-2.4.0-RC5/src/alice/tuprolog/EngineManager.java
---- 2p-2.4.0-RC5.orig/src/alice/tuprolog/EngineManager.java 2011-07-21 15:21:30.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/tuprolog/EngineManager.java 2012-01-15 10:03:54.000000000 +1300
-@@ -96,7 +96,7 @@
- /**
- * Solves a query
- *
-- * @param g the term representing the goal to be demonstrated
-+ * @param query the term representing the goal to be demonstrated
- * @return the result of the demonstration
- * @see SolveInfo
- **/
-@@ -243,4 +243,4 @@
- }
-
-
--}
-\ No newline at end of file
-+}
-diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/PrimitiveManager.java 2p-2.4.0-RC5/src/alice/tuprolog/PrimitiveManager.java
---- 2p-2.4.0-RC5.orig/src/alice/tuprolog/PrimitiveManager.java 2011-07-21 15:35:50.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/tuprolog/PrimitiveManager.java 2012-01-15 10:04:20.000000000 +1300
-@@ -89,7 +89,7 @@
- * This involves identifying structs representing builtin
- * predicates and functors, and setting up related structures and links
- *
-- * @parm term the term to be identified
-+ * @param term the term to be identified
- * @return term with the identified built-in directive
- */
- public Term identifyDirective(Term term) {
-@@ -192,4 +192,4 @@
- return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
- }
- /**/
--}
-\ No newline at end of file
-+}
-diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/event/SpyEvent.java 2p-2.4.0-RC5/src/alice/tuprolog/event/SpyEvent.java
---- 2p-2.4.0-RC5.orig/src/alice/tuprolog/event/SpyEvent.java 2011-07-21 15:47:18.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/tuprolog/event/SpyEvent.java 2012-01-15 10:21:13.000000000 +1300
-@@ -33,10 +33,6 @@
- * event description
- */
- private String msg;
-- /**
-- * @uml.property name="env"
-- * @uml.associationEnd
-- */
- private Engine env;
-
- public SpyEvent(Object source, String msg_) {
-@@ -63,4 +59,4 @@
- return msg + ((env == null) ? "" : env.toString());
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/lib/BasicLibrary.java 2p-2.4.0-RC5/src/alice/tuprolog/lib/BasicLibrary.java
---- 2p-2.4.0-RC5.orig/src/alice/tuprolog/lib/BasicLibrary.java 2011-09-16 18:00:58.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/tuprolog/lib/BasicLibrary.java 2012-01-15 10:04:49.000000000 +1300
-@@ -114,7 +114,7 @@
- /**
- * Loads a library constructed from a theory.
- *
-- * @param theory
-+ * @param th
- * theory text
- * @param libName
- * name of the library
-@@ -1264,4 +1264,4 @@
- { "\\", "expression_bitwise_not", "functor" } };
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/lib/IOLibrary.java 2p-2.4.0-RC5/src/alice/tuprolog/lib/IOLibrary.java
---- 2p-2.4.0-RC5.orig/src/alice/tuprolog/lib/IOLibrary.java 2011-07-21 15:50:40.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/tuprolog/lib/IOLibrary.java 2012-01-15 10:06:27.000000000 +1300
-@@ -375,7 +375,7 @@
- /**
- * Sets an arbitrary seed for the Random object.
- *
-- * @param seed Seed to use
-+ * @param t Seed to use
- * @return true if seed Term has a valid long value, false otherwise
- */
- public boolean set_seed_1(Term t) throws PrologError {
-@@ -470,4 +470,4 @@
- }
- return true;
- }
--}
-\ No newline at end of file
-+}
-diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprolog/lib/JavaLibrary.java 2p-2.4.0-RC5/src/alice/tuprolog/lib/JavaLibrary.java
---- 2p-2.4.0-RC5.orig/src/alice/tuprolog/lib/JavaLibrary.java 2011-07-21 15:50:42.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/tuprolog/lib/JavaLibrary.java 2012-01-15 10:10:02.000000000 +1300
-@@ -1393,8 +1393,6 @@
-
- /**
- * Generates a fresh numeric identifier
-- *
-- * @return
- */
- protected Struct generateFreshId() {
- return new Struct("$obj_" + id++);
-diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprologx/ide/Console.java 2p-2.4.0-RC5/src/alice/tuprologx/ide/Console.java
---- 2p-2.4.0-RC5.orig/src/alice/tuprologx/ide/Console.java 2011-06-29 17:00:06.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/tuprologx/ide/Console.java 2012-01-15 10:10:45.000000000 +1300
-@@ -10,8 +10,5 @@
- public void getNextSolution();
- public void acceptSolution();
- public void stopEngine();
-- /**
-- * @uml.property name="goal"
-- */
- public String getGoal();
--}
-\ No newline at end of file
-+}
-diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2p-2.4.0-RC5/src/alice/tuprologx/ide/LibraryDialogFrame.java
---- 2p-2.4.0-RC5.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2011-07-21 16:02:44.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/tuprologx/ide/LibraryDialogFrame.java 2012-01-15 10:11:41.000000000 +1300
-@@ -325,7 +325,6 @@
- displayLibraryManagerStatus();
- }
-
-- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
- public void closeLibraryDialog()
- {
- onClose();
-diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprologx/ide/ToolBar.java 2p-2.4.0-RC5/src/alice/tuprologx/ide/ToolBar.java
---- 2p-2.4.0-RC5.orig/src/alice/tuprologx/ide/ToolBar.java 2011-07-21 16:10:16.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/tuprologx/ide/ToolBar.java 2012-01-15 10:12:21.000000000 +1300
-@@ -242,8 +242,6 @@
-
- /**
- * Set the tuProlog config frame
-- *
-- * @param libraryManager a libraryManager to associate to the libraryDialog
- */
- public void setPrologConfig(PrologConfigFrame configFrame)
- {
-diff -ur 2p-2.4.0-RC5.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2p-2.4.0-RC5/src/alice/tuprologx/pj/lib/PJLibrary.java
---- 2p-2.4.0-RC5.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2011-07-21 16:18:14.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/tuprologx/pj/lib/PJLibrary.java 2012-01-15 10:13:01.000000000 +1300
-@@ -1252,7 +1252,6 @@
-
- /**
- * Generates a fresh numeric identifier
-- * @return
- */
- protected Struct generateFreshId() {
- return new Struct("$obj_" + id++);
-diff -ur 2p-2.4.0-RC5.orig/src/alice/util/ReadOnlyLinkedList.java 2p-2.4.0-RC5/src/alice/util/ReadOnlyLinkedList.java
---- 2p-2.4.0-RC5.orig/src/alice/util/ReadOnlyLinkedList.java 2011-07-21 16:27:00.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/util/ReadOnlyLinkedList.java 2012-01-15 10:01:28.000000000 +1300
-@@ -12,10 +12,10 @@
- import java.util.ListIterator;
-
- /**
-- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
-+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
- * and ensures that the given list is navigated only.
- *
-- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
-+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
- * support modifiers methods, and throws {@link UnsupportedOperationException}
- * if invoked.
- *
-diff -ur 2p-2.4.0-RC5.orig/src/alice/util/jedit/InputHandler.java 2p-2.4.0-RC5/src/alice/util/jedit/InputHandler.java
---- 2p-2.4.0-RC5.orig/src/alice/util/jedit/InputHandler.java 2011-07-21 16:33:22.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/util/jedit/InputHandler.java 2012-01-15 10:19:53.000000000 +1300
-@@ -24,7 +24,7 @@
- *
- * @author Slava Pestov
- * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
-- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
-+ * @see alice.util.jedit.DefaultInputHandler
- */
- public abstract class InputHandler extends KeyAdapter
- {
-@@ -187,7 +187,7 @@
- /**
- * Grabs the next key typed event and invokes the specified
- * action with the key as a the action command.
-- * @param action The action
-+ * @param listener The action
- */
- public void grabNextKeyStroke(ActionListener listener)
- {
-diff -ur 2p-2.4.0-RC5.orig/src/alice/util/jedit/JEditTextArea.java 2p-2.4.0-RC5/src/alice/util/jedit/JEditTextArea.java
---- 2p-2.4.0-RC5.orig/src/alice/util/jedit/JEditTextArea.java 2011-09-28 12:26:10.000000000 +1300
-+++ 2p-2.4.0-RC5/src/alice/util/jedit/JEditTextArea.java 2012-01-15 10:16:47.000000000 +1300
-@@ -1392,7 +1392,7 @@
-
- /**
- * Sets if the selection should be rectangular.
-- * @param overwrite True if the selection should be rectangular,
-+ * @param rectSelect True if the selection should be rectangular,
- * false otherwise.
- */
- public final void setSelectionRectangular(boolean rectSelect)
-diff -ur 2p-2.4.0-RC5.orig/src/alice/util/jedit/KeywordMap.java 2p-2.4.0-RC5/src/alice/util/jedit/KeywordMap.java
---- 2p-2.4.0-RC5.orig/src/alice/util/jedit/KeywordMap.java 2011-07-21 16:34:58.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/util/jedit/KeywordMap.java 2012-01-15 10:17:35.000000000 +1300
-@@ -75,7 +75,7 @@
- /**
- * Adds a key-value mapping.
- * @param keyword The key
-- * @Param id The value
-+ * @param id The value
- */
- public void add(String keyword, byte id)
- {
-@@ -102,9 +102,6 @@
- }
-
- // protected members
-- /**
-- * @uml.property name="mapLength"
-- */
- protected int mapLength;
-
- protected int getStringMapKey(String s)
-diff -ur 2p-2.4.0-RC5.orig/src/alice/util/jedit/TextAreaPainter.java 2p-2.4.0-RC5/src/alice/util/jedit/TextAreaPainter.java
---- 2p-2.4.0-RC5.orig/src/alice/util/jedit/TextAreaPainter.java 2011-07-21 16:39:24.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/util/jedit/TextAreaPainter.java 2012-01-15 10:20:32.000000000 +1300
-@@ -75,7 +75,7 @@
-
- /**
- * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public final SyntaxStyle[] getStyles()
- {
-@@ -85,7 +85,7 @@
- /**
- * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
- * @param styles The syntax styles
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public final void setStyles(SyntaxStyle[] styles)
- {
-@@ -356,7 +356,7 @@
-
- /**
- * Repaints the text.
-- * @param g The graphics context
-+ * @param gfx The graphics context
- */
- public void paint(Graphics gfx)
- {
-diff -ur 2p-2.4.0-RC5.orig/src/alice/util/jedit/TokenMarker.java 2p-2.4.0-RC5/src/alice/util/jedit/TokenMarker.java
---- 2p-2.4.0-RC5.orig/src/alice/util/jedit/TokenMarker.java 2011-07-21 16:39:24.000000000 +1200
-+++ 2p-2.4.0-RC5/src/alice/util/jedit/TokenMarker.java 2012-01-15 10:20:47.000000000 +1300
-@@ -23,7 +23,7 @@
- * @author Slava Pestov
- * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
- *
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public abstract class TokenMarker
- {
diff --git a/dev-lang/tuprolog/files/tuprolog-2.7.2-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.7.2-javadocs.patch
deleted file mode 100644
index 9a42cb8..00000000
--- a/dev-lang/tuprolog/files/tuprolog-2.7.2-javadocs.patch
+++ /dev/null
@@ -1,479 +0,0 @@
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/ChoicePointStore.java tuprolog-2.7.2/src/alice/tuprolog/ChoicePointStore.java
---- tuprolog-2.7.2.orig/src/alice/tuprolog/ChoicePointStore.java 2013-07-15 13:38:23.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprolog/ChoicePointStore.java 2013-07-15 13:46:01.000000000 +0200
-@@ -36,7 +36,6 @@
-
- /**
- * Return the actual choice-point store
-- * @return
- */
- public ChoicePointContext getPointer() {
- return pointer;
-@@ -45,7 +44,6 @@
- /**
- * Check if a choice point exists in the store.
- * As a side effect, removes choice points which have been already used and are now empty.
-- * @return
- */
- protected boolean existChoicePoint() {
- if (pointer == null) return false;
-@@ -93,4 +91,4 @@
- return l;
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/ClauseStore.java tuprolog-2.7.2/src/alice/tuprolog/ClauseStore.java
---- tuprolog-2.7.2.orig/src/alice/tuprolog/ClauseStore.java 2013-07-15 13:38:22.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprolog/ClauseStore.java 2013-07-15 13:46:01.000000000 +0200
-@@ -62,8 +62,6 @@
-
- /**
- * Verify if there is a term in compatibleGoals compatible with goal.
-- * @param goal
-- * @param compGoals
- * @return true if compatible or false otherwise.
- */
- protected boolean existCompatibleClause() {
-@@ -160,4 +158,4 @@
- }
-
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/event/SpyEvent.java tuprolog-2.7.2/src/alice/tuprolog/event/SpyEvent.java
---- tuprolog-2.7.2.orig/src/alice/tuprolog/event/SpyEvent.java 2013-07-15 13:38:22.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprolog/event/SpyEvent.java 2013-07-15 13:46:01.000000000 +0200
-@@ -33,10 +33,6 @@
- * event description
- */
- private String msg;
-- /**
-- * @uml.property name="env"
-- * @uml.associationEnd
-- */
- private Engine env;
-
- public SpyEvent(Object source, String msg_) {
-@@ -63,4 +59,4 @@
- return msg + ((env == null) ? "" : env.toString());
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/lib/BasicLibrary.java tuprolog-2.7.2/src/alice/tuprolog/lib/BasicLibrary.java
---- tuprolog-2.7.2.orig/src/alice/tuprolog/lib/BasicLibrary.java 2013-07-15 13:38:22.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprolog/lib/BasicLibrary.java 2013-07-15 13:46:01.000000000 +0200
-@@ -116,7 +116,7 @@
- /**
- * Loads a library constructed from a theory.
- *
-- * @param theory
-+ * @param th
- * theory text
- * @param libName
- * name of the library
-@@ -1358,4 +1358,4 @@
- { "\\", "expression_bitwise_not", "functor" } };
- }
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/lib/IOLibrary.java tuprolog-2.7.2/src/alice/tuprolog/lib/IOLibrary.java
---- tuprolog-2.7.2.orig/src/alice/tuprolog/lib/IOLibrary.java 2013-07-15 13:38:22.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprolog/lib/IOLibrary.java 2013-07-15 13:46:01.000000000 +0200
-@@ -379,7 +379,7 @@
- /**
- * Sets an arbitrary seed for the Random object.
- *
-- * @param seed Seed to use
-+ * @param t Seed to use
- * @return true if seed Term has a valid long value, false otherwise
- */
- public boolean set_seed_1(Term t) throws PrologError {
-@@ -474,4 +474,4 @@
- }
- return true;
- }
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/lib/JavaLibrary.java tuprolog-2.7.2/src/alice/tuprolog/lib/JavaLibrary.java
---- tuprolog-2.7.2.orig/src/alice/tuprolog/lib/JavaLibrary.java 2013-07-15 13:38:22.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprolog/lib/JavaLibrary.java 2013-07-15 13:46:01.000000000 +0200
-@@ -265,7 +265,7 @@
- * @author Michele Mannino
- * Creates of a java object - not backtrackable case
- * @param className The name of the class
-- * @oaram path The list of the paths where the class may be contained
-+ * @param paths The list of the paths where the class may be contained
- * @param argl The list of the arguments used by the constructor
- * @param id The name of the prolog term
- * @throws JavaException
-@@ -1745,8 +1745,6 @@
-
- /**
- * Generates a fresh numeric identifier
-- *
-- * @return
- */
- protected Struct generateFreshId() {
- return new Struct("$obj_" + id++);
-@@ -2099,4 +2097,4 @@
- this.eventFullClass = eventClass;
- listenerInterfaceName = n;
- }
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.7.2/src/alice/tuprolog/LibraryManager.java
---- tuprolog-2.7.2.orig/src/alice/tuprolog/LibraryManager.java 2013-07-15 13:38:22.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprolog/LibraryManager.java 2013-07-15 13:46:01.000000000 +0200
-@@ -49,7 +49,7 @@
- * If a library with the same name is already present,
- * a warning event is notified and the request is ignored.
- *
-- * @param the name of the Java class containing the library to be loaded
-+ * @param className the name of the Java class containing the library to be loaded
- * @return the reference to the Library just loaded
- * @throws InvalidLibraryException if name is not a valid library
- */
-@@ -83,8 +83,8 @@
- * If a library with the same name is already present,
- * a warning event is notified and the request is ignored.
- *
-- * @param the name of the Java class containing the library to be loaded
-- * @param the list of the paths where the library may be contained
-+ * @param className the name of the Java class containing the library to be loaded
-+ * @param paths the list of the paths where the library may be contained
- * @return the reference to the Library just loaded
- * @throws InvalidLibraryException if name is not a valid library
- */
-@@ -314,4 +314,4 @@
-
-
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/PrimitiveManager.java tuprolog-2.7.2/src/alice/tuprolog/PrimitiveManager.java
---- tuprolog-2.7.2.orig/src/alice/tuprolog/PrimitiveManager.java 2013-07-15 13:38:22.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprolog/PrimitiveManager.java 2013-07-15 13:46:01.000000000 +0200
-@@ -89,7 +89,7 @@
- * This involves identifying structs representing builtin
- * predicates and functors, and setting up related structures and links
- *
-- * @parm term the term to be identified
-+ * @param term the term to be identified
- * @return term with the identified built-in directive
- */
- public Term identifyDirective(Term term) {
-@@ -192,4 +192,4 @@
- return (functorHashMap.containsKey(name + "/" + nArgs) || predicateHashMap.containsKey(name + "/" + nArgs));
- }
- /**/
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprolog/Struct.java tuprolog-2.7.2/src/alice/tuprolog/Struct.java
---- tuprolog-2.7.2.orig/src/alice/tuprolog/Struct.java 2013-07-15 13:38:23.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprolog/Struct.java 2013-07-15 13:46:01.000000000 +0200
-@@ -201,7 +201,7 @@
- }
-
- /**
-- * @return
-+ * @return predicateIndicator
- */
- String getPredicateIndicator() {
- return predicateIndicator;
-@@ -894,4 +894,4 @@
- }
- /**/
-
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/ide/Console.java tuprolog-2.7.2/src/alice/tuprologx/ide/Console.java
---- tuprolog-2.7.2.orig/src/alice/tuprologx/ide/Console.java 2013-07-15 13:38:21.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprologx/ide/Console.java 2013-07-15 13:46:01.000000000 +0200
-@@ -10,8 +10,5 @@
- public void getNextSolution();
- public void acceptSolution();
- public void stopEngine();
-- /**
-- * @uml.property name="goal"
-- */
- public String getGoal();
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryDialogFrame.java
---- tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-07-15 13:38:21.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryDialogFrame.java 2013-07-15 13:46:01.000000000 +0200
-@@ -370,7 +370,7 @@
- * Add a library from file chooser path.
- *
- * @param libraryClassname The name of the .class of the library to be added.
-- * @param path from file chooser.
-+ * @param file from file chooser.
- */
- public void addLibrary(String libraryClassname, File file)
- {
-@@ -500,7 +500,6 @@
- displayLibraryManagerStatus();
- }
-
-- /** @see alice.tuprologx.ide.SwingFrame#onClose()*/
- public void closeLibraryDialog()
- {
- onClose();
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryManager.java 2013-07-15 13:38:21.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryManager.java 2013-07-15 13:46:01.000000000 +0200
-@@ -131,7 +131,7 @@
- * Add a library to the manager.
- *
- * @param libraryClassname The name of the .class of the library to be added.
-- * @param path The path where is contained the library.
-+ * @param file The path where is contained the library.
- * @throws ClassNotFoundException if the library class cannot be found.
- * @throws InvalidLibraryException if the library is not a valid tuProlog library.
- */
-@@ -236,7 +236,7 @@
- * Load a library from the Library Manager into the engine.
- *
- * @param library The library to be loaded into the engine.
-- * @param path The library path where is contained the library.
-+ * @param file The library path where is contained the library.
- * @throws InvalidLibraryException
- */
- public void loadLibrary(String library, File file) throws InvalidLibraryException {
-@@ -291,4 +291,4 @@
- klass.getName().replace('.', '/') + ".class");
- }
-
--} // end LibraryManager class
-\ No newline at end of file
-+} // end LibraryManager class
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/ide/ToolBar.java tuprolog-2.7.2/src/alice/tuprologx/ide/ToolBar.java
---- tuprolog-2.7.2.orig/src/alice/tuprologx/ide/ToolBar.java 2013-07-15 13:38:21.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprologx/ide/ToolBar.java 2013-07-15 13:46:01.000000000 +0200
-@@ -269,8 +269,6 @@
-
- /**
- * Set the tuProlog config frame
-- *
-- * @param libraryManager a libraryManager to associate to the libraryDialog
- */
- public void setPrologConfig(PrologConfigFrame configFrame)
- {
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/pj/lib/PJLibrary.java tuprolog-2.7.2/src/alice/tuprologx/pj/lib/PJLibrary.java
---- tuprolog-2.7.2.orig/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-07-15 13:38:21.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprologx/pj/lib/PJLibrary.java 2013-07-15 13:46:01.000000000 +0200
-@@ -1252,7 +1252,6 @@
-
- /**
- * Generates a fresh numeric identifier
-- * @return
- */
- protected Struct generateFreshId() {
- return new Struct("$obj_" + id++);
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/spyframe/SpyFrame.java tuprolog-2.7.2/src/alice/tuprologx/spyframe/SpyFrame.java
---- tuprolog-2.7.2.orig/src/alice/tuprologx/spyframe/SpyFrame.java 2013-07-15 13:38:21.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprologx/spyframe/SpyFrame.java 2013-07-15 13:51:08.000000000 +0200
-@@ -199,7 +199,7 @@
-
- /**Display the spied information in form of a tree. This method reacts only
- * on prolog-Calls and skips even those if the number of steps set in
-- * {@link actionPerformed} is bigger than 1. In this case the number is
-+ * actionPerformed is bigger than 1. In this case the number is
- * decremented to skip these steps. After display the prolog process is
- * suspended until the user presses enter.
- *
-@@ -229,4 +229,4 @@
- SpyFrame tf=new SpyFrame(theory, goal);
- tf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- }
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.2.orig/src/alice/tuprologx/spyframe/Tree.java tuprolog-2.7.2/src/alice/tuprologx/spyframe/Tree.java
---- tuprolog-2.7.2.orig/src/alice/tuprologx/spyframe/Tree.java 2013-07-15 13:38:21.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprologx/spyframe/Tree.java 2013-07-15 13:50:25.000000000 +0200
-@@ -47,12 +47,12 @@
- private Line2D.Float line=new Line2D.Float();
-
- /**Creates a component to display a tree.
-- * @param totree to consult for constructing the tree.
-+ * @param treemaker to consult for constructing the tree.
- */
- public Tree(ToTree<T> treemaker){this.totree=treemaker;}
-
- /**Creates a component to display a tree.
-- * @param totree to consult for constructing the tree.
-+ * @param treemaker to consult for constructing the tree.
- * @param str the structure to be displayed as a tree.
- */
- public Tree(ToTree<T> treemaker, T str){
-@@ -184,4 +184,4 @@
- g2.setColor(node.textcolor);
- g2.drawString(node.text, node.x+border, node.y+border+asc);
- }
--}
-\ No newline at end of file
-+}
-diff -ur tuprolog-2.7.2.orig/src/alice/util/DynamicURLClassLoader.java tuprolog-2.7.2/src/alice/util/DynamicURLClassLoader.java
---- tuprolog-2.7.2.orig/src/alice/util/DynamicURLClassLoader.java 2013-07-15 13:38:23.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/util/DynamicURLClassLoader.java 2013-07-15 13:46:01.000000000 +0200
-@@ -35,7 +35,7 @@
-
- /**
- * Constructor that specifies the URLs array.
-- * @param URL[] urls - Used to load a directory a URL ends with "/" or "\"
-+ * @param urls - Used to load a directory a URL ends with "/" or "\"
- * otherwise it loads a class contained into a .jar
- */
-
-@@ -148,7 +148,7 @@
-
- /**
- * Remove array URLs method.
-- * @param urls - URL to be removed.
-+ * @param url - URL to be removed.
- */
-
- public void removeURL(URL url) throws IllegalArgumentException
-diff -ur tuprolog-2.7.2.orig/src/alice/util/InspectionUtils.java tuprolog-2.7.2/src/alice/util/InspectionUtils.java
---- tuprolog-2.7.2.orig/src/alice/util/InspectionUtils.java 2013-07-15 13:38:23.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/util/InspectionUtils.java 2013-07-15 13:46:01.000000000 +0200
-@@ -14,9 +14,9 @@
- /**
- * @author Michele Mannino
- *
-- * @param type: class to be inspected
-- * @param methodName: name of method
-- * @param parms: array of params
-+ * @param type class to be inspected
-+ * @param methodName name of method
-+ * @param parms array of params
- */
- public static Method searchForMethod(Class<?> type, String methodName, Class<?>[] parms) {
- Method[] methods = type.getMethods();
-diff -ur tuprolog-2.7.2.orig/src/alice/util/jedit/InputHandler.java tuprolog-2.7.2/src/alice/util/jedit/InputHandler.java
---- tuprolog-2.7.2.orig/src/alice/util/jedit/InputHandler.java 2013-07-15 13:38:23.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/util/jedit/InputHandler.java 2013-07-15 13:46:01.000000000 +0200
-@@ -24,7 +24,7 @@
- *
- * @author Slava Pestov
- * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
-- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
-+ * @see alice.util.jedit.DefaultInputHandler
- */
- public abstract class InputHandler extends KeyAdapter
- {
-@@ -187,7 +187,7 @@
- /**
- * Grabs the next key typed event and invokes the specified
- * action with the key as a the action command.
-- * @param action The action
-+ * @param listener The action
- */
- public void grabNextKeyStroke(ActionListener listener)
- {
-diff -ur tuprolog-2.7.2.orig/src/alice/util/jedit/JEditTextArea.java tuprolog-2.7.2/src/alice/util/jedit/JEditTextArea.java
---- tuprolog-2.7.2.orig/src/alice/util/jedit/JEditTextArea.java 2013-07-15 13:38:23.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/util/jedit/JEditTextArea.java 2013-07-15 13:46:01.000000000 +0200
-@@ -1401,7 +1401,7 @@
-
- /**
- * Sets if the selection should be rectangular.
-- * @param overwrite True if the selection should be rectangular,
-+ * @param rectSelect True if the selection should be rectangular,
- * false otherwise.
- */
- public final void setSelectionRectangular(boolean rectSelect)
-diff -ur tuprolog-2.7.2.orig/src/alice/util/jedit/KeywordMap.java tuprolog-2.7.2/src/alice/util/jedit/KeywordMap.java
---- tuprolog-2.7.2.orig/src/alice/util/jedit/KeywordMap.java 2013-07-15 13:38:23.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/util/jedit/KeywordMap.java 2013-07-15 13:46:01.000000000 +0200
-@@ -75,7 +75,7 @@
- /**
- * Adds a key-value mapping.
- * @param keyword The key
-- * @Param id The value
-+ * @param id The value
- */
- public void add(String keyword, byte id)
- {
-@@ -102,9 +102,6 @@
- }
-
- // protected members
-- /**
-- * @uml.property name="mapLength"
-- */
- protected int mapLength;
-
- protected int getStringMapKey(String s)
-diff -ur tuprolog-2.7.2.orig/src/alice/util/jedit/TextAreaPainter.java tuprolog-2.7.2/src/alice/util/jedit/TextAreaPainter.java
---- tuprolog-2.7.2.orig/src/alice/util/jedit/TextAreaPainter.java 2013-07-15 13:38:23.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/util/jedit/TextAreaPainter.java 2013-07-15 13:46:01.000000000 +0200
-@@ -75,7 +75,7 @@
-
- /**
- * Returns the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public final SyntaxStyle[] getStyles()
- {
-@@ -85,7 +85,7 @@
- /**
- * Sets the syntax styles used to paint colorized text. Entry <i>n</i> will be used to paint tokens with id = <i>n</i>.
- * @param styles The syntax styles
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public final void setStyles(SyntaxStyle[] styles)
- {
-@@ -356,7 +356,7 @@
-
- /**
- * Repaints the text.
-- * @param g The graphics context
-+ * @param gfx The graphics context
- */
- public void paint(Graphics gfx)
- {
-diff -ur tuprolog-2.7.2.orig/src/alice/util/jedit/TokenMarker.java tuprolog-2.7.2/src/alice/util/jedit/TokenMarker.java
---- tuprolog-2.7.2.orig/src/alice/util/jedit/TokenMarker.java 2013-07-15 13:38:23.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/util/jedit/TokenMarker.java 2013-07-15 13:46:01.000000000 +0200
-@@ -23,7 +23,7 @@
- * @author Slava Pestov
- * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
- *
-- * @see org.gjt.sp.jedit.syntax.Token
-+ * @see alice.util.jedit.Token
- */
- public abstract class TokenMarker
- {
-diff -ur tuprolog-2.7.2.orig/src/alice/util/ReadOnlyLinkedList.java tuprolog-2.7.2/src/alice/util/ReadOnlyLinkedList.java
---- tuprolog-2.7.2.orig/src/alice/util/ReadOnlyLinkedList.java 2013-07-15 13:38:23.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/util/ReadOnlyLinkedList.java 2013-07-15 13:46:01.000000000 +0200
-@@ -12,10 +12,10 @@
- import java.util.ListIterator;
-
- /**
-- * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList<E>}
-+ * ReadOnlyLinkedList<E> encapsulate a {@link LinkedList}
- * and ensures that the given list is navigated only.
- *
-- * Even if ReadOnlyLinkedList<E> implements {@link List<E>} it doesn't
-+ * Even if ReadOnlyLinkedList<E> implements {@link List} it doesn't
- * support modifiers methods, and throws {@link UnsupportedOperationException}
- * if invoked.
- *
diff --git a/dev-lang/tuprolog/files/tuprolog-2.7.2-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-2.7.2-no-ikvm.patch
deleted file mode 100644
index 539aea3..00000000
--- a/dev-lang/tuprolog/files/tuprolog-2.7.2-no-ikvm.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -urN tuprolog-2.7.2.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.7.2/src/alice/tuprolog/LibraryManager.java
---- tuprolog-2.7.2.orig/src/alice/tuprolog/LibraryManager.java 2013-07-15 13:38:22.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprolog/LibraryManager.java 2014-11-09 18:24:47.000000000 +0100
-@@ -8,11 +8,11 @@
- import java.net.URL;
- import java.net.URLClassLoader;
- import java.util.*;
--import cli.System.Reflection.Assembly;
-+//import cli.System.Reflection.Assembly;
-
- import alice.tuprolog.event.LibraryEvent;
- import alice.tuprolog.event.WarningEvent;
--import alice.util.AssemblyCustomClassLoader;
-+//import alice.util.AssemblyCustomClassLoader;
-
-
- /**
-@@ -112,27 +112,7 @@
- }
- else // .NET
- {
-- Assembly asm = null;
-- boolean classFound = false;
-- className = "cli." + className.substring(0, className.indexOf(",")).trim();
-- for(int i = 0; i < paths.length; i++)
-- {
-- try {
-- asm = Assembly.LoadFrom(paths[i]);
-- loader = new AssemblyCustomClassLoader(asm, urls);
-- lib = (Library) Class.forName(className, true, loader).newInstance();
-- if(lib != null)
-- {
-- classFound = true;
-- break;
-- }
-- } catch (Exception e) {
-- e.printStackTrace();
-- continue;
-- }
-- }
-- if(!classFound)
-- throw new InvalidLibraryException(className, -1, -1);
-+ throw new InvalidLibraryException(className, -1, -1);
- }
- String name = lib.getName();
- Library alib = getLibrary(name);
-diff -urN tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-2.7.2.orig/src/alice/tuprologx/ide/LibraryManager.java 2013-07-15 13:38:21.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/tuprologx/ide/LibraryManager.java 2014-11-09 18:25:45.000000000 +0100
-@@ -18,7 +18,7 @@
- package alice.tuprologx.ide;
-
- import alice.tuprolog.*;
--import alice.util.AssemblyCustomClassLoader;
-+//import alice.util.AssemblyCustomClassLoader;
-
- import java.io.File;
- import java.net.URL;
-@@ -26,7 +26,7 @@
- import java.util.ArrayList;
- import java.util.Hashtable;
- import java.util.StringTokenizer;
--import cli.System.Reflection.Assembly;
-+//import cli.System.Reflection.Assembly;
-
- /**
- * A dynamic manager for tuProlog libraries.
-@@ -156,10 +156,7 @@
- // .NET
- if(System.getProperty("java.vm.name").equals("IKVM.NET"))
- {
-- Assembly asm = Assembly.LoadFrom(file.getPath());
-- loader = new AssemblyCustomClassLoader(asm, new URL[]{url});
-- libraryClassname = "cli." + libraryClassname.substring(0,
-- libraryClassname.indexOf(",")).trim();
-+ throw new InvalidLibraryException(libraryClassname,-1,-1);
- }
- // JVM
- else
-diff -urN tuprolog-2.7.2.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-2.7.2/src/alice/util/AssemblyCustomClassLoader.java
---- tuprolog-2.7.2.orig/src/alice/util/AssemblyCustomClassLoader.java 2013-07-15 13:38:23.000000000 +0200
-+++ tuprolog-2.7.2/src/alice/util/AssemblyCustomClassLoader.java 1970-01-01 01:00:00.000000000 +0100
-@@ -1,21 +0,0 @@
--package alice.util;
--
--import java.net.URL;
--
--public class AssemblyCustomClassLoader extends java.net.URLClassLoader
--{
-- public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls)
-- {
-- super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm));
-- // explicitly calling addURL() is safer than passing it to the super constructor,
-- // because this class loader instance may be used during the URL construction.
-- for (URL url : urls) {
-- addURL(url);
-- }
-- }
--
-- public void addUrl(URL url)
-- {
-- addURL(url);
-- }
--}
-\ No newline at end of file
diff --git a/dev-lang/tuprolog/files/tuprolog-2.9.0-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-2.9.0-no-ikvm.patch
deleted file mode 100644
index d94dc66..00000000
--- a/dev-lang/tuprolog/files/tuprolog-2.9.0-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/tuprolog-2.4.0_rc5.ebuild b/dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild
deleted file mode 100644
index de1ef4e..00000000
--- a/dev-lang/tuprolog/tuprolog-2.4.0_rc5.ebuild
+++ /dev/null
@@ -1,57 +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
-
-MY_P="2p-${PV/_rc5/}"
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://www.alice.unibo.it/tuProlog/"
-SRC_URI="mirror://sourceforge/tuprolog/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RDEPEND=">=virtual/jdk-1.5
- >=dev-java/javassist-3"
-
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-java/ant-core
- test? ( dev-java/ant-junit )"
-
-S="${WORKDIR}"/${MY_P}-RC5
-
-EANT_GENTOO_CLASSPATH="javassist-3"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-javadocs.patch
-
- cp "${FILESDIR}"/build.xml "${S}" || die
- sed -i -e "s|test/unit|test|" "${S}"/build.xml \
- || die "sed build.xml failed"
-}
-
-src_compile() {
- eant jar $(use_doc)
-}
-
-src_test() {
- cd "${S}"/dist
- java-pkg_jar-from junit
- cd "${S}"
- ANT_TASKS="ant-junit" eant test || die "eant test failed"
-}
-
-src_install() {
- java-pkg_dojar dist/${PN}.jar
-
- if use doc ; then
- java-pkg_dohtml -r docs/* || die
- fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-2.7.2.ebuild b/dev-lang/tuprolog/tuprolog-2.7.2.ebuild
deleted file mode 100644
index bce34ee..00000000
--- a/dev-lang/tuprolog/tuprolog-2.7.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://tuprolog.unibo.it/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=virtual/jdk-1.7
- >=dev-java/javassist-3"
-
-DEPEND="${RDEPEND}
- dev-java/ant-core
- test? (
- dev-java/ant-junit4
- dev-java/hamcrest-core
- )"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist-3"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-javadocs.patch
- epatch "${FILESDIR}"/${P}-no-ikvm.patch
-
- cp "${FILESDIR}"/build.xml "${S}" || die
- sed -i -e "s|test/unit|test|" "${S}"/build.xml \
- || die "sed build.xml failed"
-}
-
-src_compile() {
- eant jar $(use_doc)
-}
-
-src_test() {
- cd "${S}"/dist
- java-pkg_jar-from junit-4
- java-pkg_jar-from hamcrest-core
- cd "${S}"
- ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
- || die "eant test failed"
-}
-
-src_install() {
- java-pkg_dojar dist/${PN}.jar
-
- if use doc ; then
- java-pkg_dohtml -r docs/* || die
- fi
-}
diff --git a/dev-lang/tuprolog/tuprolog-2.9.0.ebuild b/dev-lang/tuprolog/tuprolog-2.9.0.ebuild
deleted file mode 100644
index 99ffc98..00000000
--- a/dev-lang/tuprolog/tuprolog-2.9.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
-HOMEPAGE="http://tuprolog.unibo.it/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=virtual/jdk-1.7
- >=dev-java/javassist-3"
-
-DEPEND="${RDEPEND}
- dev-java/ant-core
- test? (
- dev-java/ant-junit4
- dev-java/hamcrest-core
- )"
-
-S="${WORKDIR}"/${P}
-
-EANT_GENTOO_CLASSPATH="javassist-3"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-ikvm.patch
-
- cp "${FILESDIR}"/build.xml "${S}" || die
- sed -i -e "s|test/unit|test|" "${S}"/build.xml \
- || die "sed build.xml failed"
-}
-
-src_compile() {
- eant jar $(use_doc)
-}
-
-src_test() {
- cd "${S}"/dist
- java-pkg_jar-from junit-4
- java-pkg_jar-from hamcrest-core
- cd "${S}"
- ANT_TASKS="ant-junit4" eant -Djunit.jar=junit.jar test \
- || die "eant test failed"
-}
-
-src_install() {
- java-pkg_dojar dist/${PN}.jar
- java-pkg_dojar dist/2p.jar
-
- if use doc ; then
- java-pkg_dohtml -r docs/* || die
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/, dev-lang/tuprolog/files/
@ 2020-07-18 14:22 Keri Harris
0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris @ 2020-07-18 14:22 UTC (permalink / raw
To: gentoo-commits
commit: 3b65263e25aa805226d0ca71f104072577a3aee5
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 14:21:12 2020 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 14:21:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b65263e
dev-lang/tuprolog: EAPI bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>
.../tuprolog/files/tuprolog-3.1.0-test-suite.patch | 13 +++++
dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild | 67 ++++++++++++++++++++++
2 files changed, 80 insertions(+)
diff --git a/dev-lang/tuprolog/files/tuprolog-3.1.0-test-suite.patch b/dev-lang/tuprolog/files/tuprolog-3.1.0-test-suite.patch
new file mode 100644
index 00000000000..5be70460b6d
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-3.1.0-test-suite.patch
@@ -0,0 +1,13 @@
+--- tuprolog-3.1.0.orig/test/unit/alice/tuprolog/TuPrologTestSuite.java 2020-07-18 15:41:48.236891336 +0200
++++ tuprolog-3.1.0/test/unit/alice/tuprolog/TuPrologTestSuite.java 2020-07-18 15:42:11.458890364 +0200
+@@ -22,10 +22,8 @@
+ ParserTestCase.class,
+ SpyEventTestCase.class,
+ VarTestCase.class,
+- TestVarIsEqual.class,
+ JavaDynamicClassLoaderTestCase.class,
+ ISOIOLibraryTestCase.class,
+- SocketLibTestCase.class,
+ ThreadLibraryTestCase.class
+ })
+ public class TuPrologTestSuite {}
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild b/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
new file mode 100644
index 00000000000..c6c38fcd1e6
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="https://dev.gentoo.org/~keri/distfiles/tuprolog/${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() {
+ eapply "${FILESDIR}"/${P}-no-ikvm.patch
+ eapply "${FILESDIR}"/${P}-test-suite.patch
+ eapply_user
+
+ 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
+ docinto examples
+ dodoc doc/examples/*.pl
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/, dev-lang/tuprolog/files/
@ 2020-07-19 13:05 Keri Harris
0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris @ 2020-07-19 13:05 UTC (permalink / raw
To: gentoo-commits
commit: 63dc178975d3be478eee845bfa2c8f69c0c6e0ba
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 13:04:07 2020 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 13:04:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63dc1789
dev-lang/tuprolog: version bump
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>
dev-lang/tuprolog/Manifest | 2 +
dev-lang/tuprolog/files/build-3.x.xml | 110 ++++++++++++++++++++++++++++++++
dev-lang/tuprolog/tuprolog-3.2.0.ebuild | 71 +++++++++++++++++++++
3 files changed, 183 insertions(+)
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 38fcfb70bd6..4b2ae8c599e 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,3 +1,5 @@
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-3.x.xml b/dev-lang/tuprolog/files/build-3.x.xml
new file mode 100644
index 00000000000..3b6f5818eaa
--- /dev/null
+++ b/dev-lang/tuprolog/files/build-3.x.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}"
+ source="1.8"
+ target="1.8">
+ <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"
+ source="1.8"
+ target="1.8"/>
+ <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/tuprolog-3.2.0.ebuild b/dev-lang/tuprolog/tuprolog-3.2.0.ebuild
new file mode 100644
index 00000000000..0dcda3ed7c6
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-3.2.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils java-pkg-2 java-ant-2
+
+PATCHSET_VER="0"
+
+DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
+HOMEPAGE="http://tuprolog.unibo.it/"
+SRC_URI="https://dev.gentoo.org/~keri/distfiles/tuprolog/${P}.tar.gz
+ https://dev.gentoo.org/~keri/distfiles/tuprolog/${P}-gentoo-patchset-${PATCHSET_VER}.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
+ dev-java/gson:2.6"
+
+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,gson:2.6"
+
+PATCHES=( "${WORKDIR}/${PV}" )
+
+src_prepare() {
+ default
+
+ 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
+ docinto examples
+ dodoc doc/examples/*.pl
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/, dev-lang/tuprolog/files/
@ 2020-07-19 13:10 Keri Harris
0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris @ 2020-07-19 13:10 UTC (permalink / raw
To: gentoo-commits
commit: b53a3d844a9f3b061334a287b2ab77f8bcd6aae6
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 13:09:51 2020 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 13:09:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b53a3d84
dev-lang/tuprolog: consolidate build.xml instructions
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Keri Harris <keri <AT> gentoo.org>
dev-lang/tuprolog/files/build-3.0.1.xml | 110 -----------------------------
dev-lang/tuprolog/files/build-3.1.0.xml | 110 -----------------------------
dev-lang/tuprolog/tuprolog-3.0.1.ebuild | 4 +-
dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild | 2 +-
dev-lang/tuprolog/tuprolog-3.1.0.ebuild | 4 +-
5 files changed, 5 insertions(+), 225 deletions(-)
diff --git a/dev-lang/tuprolog/files/build-3.0.1.xml b/dev-lang/tuprolog/files/build-3.0.1.xml
deleted file mode 100644
index 3b6f5818eaa..00000000000
--- a/dev-lang/tuprolog/files/build-3.0.1.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}"
- source="1.8"
- target="1.8">
- <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"
- source="1.8"
- target="1.8"/>
- <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/build-3.1.0.xml b/dev-lang/tuprolog/files/build-3.1.0.xml
deleted file mode 100644
index 3b6f5818eaa..00000000000
--- a/dev-lang/tuprolog/files/build-3.1.0.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}"
- source="1.8"
- target="1.8">
- <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"
- source="1.8"
- target="1.8"/>
- <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/tuprolog-3.0.1.ebuild b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
index 8ca8d7d6bb7..411a1f875b0 100644
--- a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
+++ b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -35,7 +35,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-no-ikvm.patch
epatch "${FILESDIR}"/${P}-oolibrary-unit-test.patch
- cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+ cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
}
src_compile() {
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild b/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
index c6c38fcd1e6..4f6dd3c988e 100644
--- a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
+++ b/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
eapply "${FILESDIR}"/${P}-test-suite.patch
eapply_user
- cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+ cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
}
src_compile() {
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild b/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
index d04f8f0fad1..d22edc7d11f 100644
--- a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
+++ b/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -34,7 +34,7 @@ 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
+ cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
}
src_compile() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/, dev-lang/tuprolog/files/
@ 2022-01-23 15:10 Keri Harris
0 siblings, 0 replies; 6+ messages in thread
From: Keri Harris @ 2022-01-23 15:10 UTC (permalink / raw
To: gentoo-commits
commit: cfc88be2700a4430f4fa5eedbbd863ad263ad679
Author: Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 15:10:37 2022 +0000
Commit: Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 15:10:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc88be2
dev-lang/tuprolog: remove old version
Package-Manager: Portage-3.0.28, Repoman-3.0.2
Signed-off-by: Keri Harris <keri <AT> gentoo.org>
dev-lang/tuprolog/Manifest | 1 -
.../tuprolog/files/tuprolog-3.1.0-no-ikvm.patch | 137 ---------------------
.../tuprolog/files/tuprolog-3.1.0-test-suite.patch | 13 --
dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild | 67 ----------
4 files changed, 218 deletions(-)
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 3153148ca024..de0037b24b81 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,3 +1,2 @@
-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/tuprolog-3.1.0-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-3.1.0-no-ikvm.patch
deleted file mode 100644
index eb20dacd4430..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-3.1.0-no-ikvm.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-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/files/tuprolog-3.1.0-test-suite.patch b/dev-lang/tuprolog/files/tuprolog-3.1.0-test-suite.patch
deleted file mode 100644
index 5be70460b6d2..000000000000
--- a/dev-lang/tuprolog/files/tuprolog-3.1.0-test-suite.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- tuprolog-3.1.0.orig/test/unit/alice/tuprolog/TuPrologTestSuite.java 2020-07-18 15:41:48.236891336 +0200
-+++ tuprolog-3.1.0/test/unit/alice/tuprolog/TuPrologTestSuite.java 2020-07-18 15:42:11.458890364 +0200
-@@ -22,10 +22,8 @@
- ParserTestCase.class,
- SpyEventTestCase.class,
- VarTestCase.class,
-- TestVarIsEqual.class,
- JavaDynamicClassLoaderTestCase.class,
- ISOIOLibraryTestCase.class,
-- SocketLibTestCase.class,
- ThreadLibraryTestCase.class
- })
- public class TuPrologTestSuite {}
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild b/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
deleted file mode 100644
index b8f444cac75e..000000000000
--- a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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="https://dev.gentoo.org/~keri/distfiles/tuprolog/${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.6"
-
-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.6"
-
-src_prepare() {
- eapply "${FILESDIR}"/${P}-no-ikvm.patch
- eapply "${FILESDIR}"/${P}-test-suite.patch
- eapply_user
-
- 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
- docinto examples
- dodoc doc/examples/*.pl
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-01-23 15:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-18 14:22 [gentoo-commits] repo/gentoo:master commit in: dev-lang/tuprolog/, dev-lang/tuprolog/files/ Keri Harris
-- strict thread matches above, loose matches on Subject: below --
2022-01-23 15:10 Keri Harris
2020-07-19 13:10 Keri Harris
2020-07-19 13:05 Keri Harris
2017-01-22 14:10 Manuel Rüger
2016-10-09 9:11 Keri Harris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox