Version bump

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

4 files changed, 403 insertions, 14 deletions

diff --git a/dev-lang/tuprolog/ChangeLog b/dev-lang/tuprolog/ChangeLog
index 5731aff0f37a..edd3cd5240dc 100644
--- a/dev-lang/tuprolog/ChangeLog
+++ b/dev-lang/tuprolog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/tuprolog
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.43 2012/07/01 14:01:34 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.44 2012/08/04 11:27:31 keri Exp $
+
+*tuprolog-2.5.0 (03 Aug 2012)
+
+  03 Aug 2012; <keri@gentoo.org> +tuprolog-2.5.0.ebuild,
+  +files/tuprolog-2.5.0-javadocs.patch:
+  Version bump
 
   01 Jul 2012; <keri@gentoo.org> tuprolog-2.4.0_rc5.ebuild:
   Depend on ant-junit for tuprolog unit tests
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 8449fd864098..5f49f1932fb4 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,17 +1,30 @@
-AUX build.xml 2413 SHA256 b0db72e40147db8b9c021bdbb693fadd6cdf508dcd5702f862abef6939308189 SHA512 929429f13d26f8c652008db8249055a06c21118585d27404eccda283e8a992e5e541dff0df1222a421c781f7a67d4c64dbcb58b89d54636741e1ef810b2f424d WHIRLPOOL 34edd22911973f95aae0225444b44ab7bb69c76384c3151cc75743f3327645adb732b897f0b96e28712df647143339e4b5b5ed4d6be2fd744374830fe736f95f
-AUX tuprolog-2.1.1-java1.4.patch 6318 SHA256 35bb62c71b645289242b2bb610879a455f408eddb8f65b6ead7ac71ebdfe12bc SHA512 7cf1fb6f9f0311592a43eafc24f6a97b9997a8493f2913275978ab673a52d1bd06da3f986e8782fcce9d9c679c47423033f2e1c37216bc054065941ae5e8624d WHIRLPOOL fa9627a475e44b99bcef91fddaf50a20875dc91f22bf250c20f9e193f30842df995f0f3921829507a7e1415ded306464f2901773264c8ec14199bef22f357224
-AUX tuprolog-2.1.1-javadocs.patch 6573 SHA256 12bc23f7f9300cc6e6d3ca0d3ebac163acec01bc490ad08135127bcded883bef SHA512 7915c530b3076d36962b7baaa2cf4cf7aff1b509ad5cc997f23ba8981d4505ffe43bc27110ee2ae56dba823c2bde14c26ff99610f53c2c1cce5add7d08982729 WHIRLPOOL 748bfcc900a38731dca0d99d2e986e2a6aa2d71ea1c76de7fa3b34ad85994cf0664c1a1d68d4ec1c1e37f9728cc9980d1483001ab109d554530736593e3d499e
-AUX tuprolog-2.3.0_alpha-generics.patch 682 SHA256 22b7425a3dbd857084a141fd5068239ba79882f781bd0b3c9f6496f3b26e4193 SHA512 71ada2ce4998d415fe9a06bc193f55f2407f1e87c7e917444c5017034f25361838217d55d0338c7a9c5d1e87395e788f54a96033768cb8fb60810cccdb993183 WHIRLPOOL 6f141f807c82647d0b5307dfb0055d8219dffc486deb59a744f18722929a4e645204f959d3c438112dd20a23fdee151c3ab91f949bc506ca0b766d23ee62cb97
-AUX tuprolog-2.3.0_alpha-javadocs.patch 9013 SHA256 906bf26e74ce0b15af63917f2a95d5f7287f77ee0bf84eeebe1923101e4fd4a6 SHA512 5a2be027654548ff16f2c4c8267de3fbcfc23c4b663e29ee3b50bb5331c83c7f6907f003c3f1e3d06a56b70e786fb921e5ddd74be30d72e337603762f1840d6e WHIRLPOOL 3801c49c00997778faada20022e32dfdac1181ebd68e7362c7d537c2ae1977bd465d1ffc7b96beed57edcf8cb6de4d3e3750cd8c2522e3386c28dfbf8952a8b5
-AUX tuprolog-2.3.1_beta-javadocs.patch 9848 SHA256 1fe5fdc8e5ed4af7051e724d84795986cf57309402eeb748d56283f36c806cc5 SHA512 ac91902fffa1cbcb03e5faa39a92850cf025ef18f67475c410c15ec773f9123f31f76d6fd2226c0865b6c80bb6400d177add05efbd24956f3ac8d2eb30921bf4 WHIRLPOOL d4135d2cc3697814aa3ff8c636aca9fd971980044c573080c851889157cdffcd9eaef9648a0ca524533f8b0253ef937823eed0751b45b63f741c1cbe5c4755a3
-AUX tuprolog-2.4.0_rc5-javadocs.patch 12383 SHA256 68eba3d741371af2246fc1869c06a5c75b2d477d330066487465976f720efcf0 SHA512 80e433039f2aa3861ab621a779fd8c379bc5598dd15359d901de673c2d7e129b5c407bec37d940e597023ab966f3f557923a2b3860b14a7b2dadecae83ca949f WHIRLPOOL 95cbeed01ef56adac101fba01b75c6aa27dee146aa780039455f463ee306616a07f226c76571468466ff85485011f3c6387a1422ec96a914fa8755f0e105e88e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX build.xml 2413 RMD160 4828c9b5fcad09f256992fe2925b4749ead44a93 SHA1 662a474aca02e76981f84f8d842bce87f53c0fe6 SHA256 b0db72e40147db8b9c021bdbb693fadd6cdf508dcd5702f862abef6939308189
+AUX tuprolog-2.1.1-java1.4.patch 6318 RMD160 621aec83d6f77585f15d4d0109b085c380d6e001 SHA1 4b0a471bd4103270274c5cd7e417140c45f06e15 SHA256 35bb62c71b645289242b2bb610879a455f408eddb8f65b6ead7ac71ebdfe12bc
+AUX tuprolog-2.1.1-javadocs.patch 6573 RMD160 0cc1f044ada95113ae638a9cd48c920fa3903a31 SHA1 64206767a27e7fceea9b04f9e65d2846bcd56b9d SHA256 12bc23f7f9300cc6e6d3ca0d3ebac163acec01bc490ad08135127bcded883bef
+AUX tuprolog-2.3.0_alpha-generics.patch 682 RMD160 de3a8f7c9654937b61d15cd6345c87f057a61db1 SHA1 0ee58b501c8c591ccf744bd876f8fb10fa35d99b SHA256 22b7425a3dbd857084a141fd5068239ba79882f781bd0b3c9f6496f3b26e4193
+AUX tuprolog-2.3.0_alpha-javadocs.patch 9013 RMD160 23422b8594bc5961d51d66ef4beb968e467fda94 SHA1 486339da7d60b60e8c059c58f679a58ba3bb76dd SHA256 906bf26e74ce0b15af63917f2a95d5f7287f77ee0bf84eeebe1923101e4fd4a6
+AUX tuprolog-2.3.1_beta-javadocs.patch 9848 RMD160 ac32a2d74cfbdbaaaf38b949e8f238547ebec207 SHA1 d0b946e29d0c989210406f32ebd099cd6f8482cf SHA256 1fe5fdc8e5ed4af7051e724d84795986cf57309402eeb748d56283f36c806cc5
+AUX tuprolog-2.4.0_rc5-javadocs.patch 12383 RMD160 1d5fbee3616f4f2f1ff8e33d0582a5be60a5d3d0 SHA1 94d569a787e6413b7b68f3c8afa657239f452c74 SHA256 68eba3d741371af2246fc1869c06a5c75b2d477d330066487465976f720efcf0
+AUX tuprolog-2.5.0-javadocs.patch 12533 RMD160 a0c55520b6883e656cb6f348b7629f6ad1d77814 SHA1 c7b9955a579ecfdade6edda85e85735d0ef7e6ec SHA256 9934a3986b4a436dab05a33ef8dd62bda5aae2efa1424bdf1a1e6d5eb4e62734
 DIST 2p-2.1.1.zip 1879216 SHA256 fe49fbee0c22c3bb6799895f4e1694ead184a689ab753ebf56031c2891dab7b5 SHA512 6b37366f5c592cc99a1516dda33a3dc32e68c635ed35f89d30ae672b02094c8d9ee42990fd5b0f245d4622f68589fcbfdef2d9bf36e5109bf0fafacec95582ef WHIRLPOOL dd5dd522cdaa548a23e2e9e944d098dbe7b43616f78e624b6f269cd38448eea7df39b28e4632af7000cc5332ed7703fe082f1b96766b6856441f7d4209537df4
 DIST 2p-2.3.0alpha.zip 2757862 SHA256 f8c1da73d0a5ca04267aec46e0636754dad747f4354069fad40e054aaacbfed2 SHA512 464bd6755e2336bdf1edbf4e2fb415797a1194ae0f530990644a56ea7b9f228a5043ac151b6167350a4623b21128e58fc35013e4b1d88f7965052769a89791b3 WHIRLPOOL 85d017d1dcac71da4fa717a3d33b532627eb8cdb237b6f7582f4f3d782396520b66d7ce6f82bb5e010f4cadb6dff8ed088121c6e585a188232b24f711f96a00a
 DIST 2p-2.3.1.zip 2534203 SHA256 7f56638d0401805008155749fb4fa367e4d21eb0a1d9be7c2e7fbc77514864c4 SHA512 7b403828ad5c9cde2932a94a9dd314f9a03b42bdf3b9f1678e583e85fe9dc64bb15fcb92196861faa0c0a915a6c19e257f4fd9b4d374a8be1e8a5e1989537bbc WHIRLPOOL 3e92f62c3f6a9302c8e9d28eaaab0c6dd2c857346126f51c4a8fa08e2bea448339838db4dcdfafb574954e8f3cd89f19c55efbdaa9028340f12a1fd419136095
 DIST 2p-2.4.0.zip 2421675 SHA256 f674b282bd7bc60e92ea417f8766e635979366d84d48634dd622e60ad1aa78c6 SHA512 20c86f736efe526dfffe603b19648394aaeaadf326034bba4f5717a193d7f76a99c6f3cb7bb93e2f1b608abd4e4af30341a2727f61e60e60289c2a964da782e9 WHIRLPOOL 7a353f5c6df2dba877d6880fc91ff0356639900767eb346a2eba97773303e125d0d2ffeead35e83cb61ffd013b49d4a05498861207de228e208a3f690a65ec4b
-EBUILD tuprolog-2.1.1.ebuild 1158 SHA256 11a8bbcc8a7602ad1c5532c5bf3e82ea7d2d7c907f73dd68a0ab6230d909bb4d SHA512 6324abeeee9ee9de2a87d94934d6250f97c775ef25ffb2d32dde1d8df831ae94a5a7645ad67264f658e8d4cd5ad6e3a1fcba1feae81447470dae1f208fcb2b9f WHIRLPOOL 74e45ece861eabd4825897edc137d29aaaa29ca5bf60c9219fa45fad9f6d398dc62603a2d96fcb20b0a8abe16a411ba46601d48be5c58af99d906449d303bee6
-EBUILD tuprolog-2.3.0_alpha.ebuild 1065 SHA256 3b7c141c04d56221b9372c08c3647c9dbb68d6d43319f2bacd3c261d7ead1398 SHA512 4fb93bba9c5b10837ed2226c7b31f1cc229e909cefad455689063ae5baf18b9e1da5860d9a61d2761f9526f92e4a293fc9cad9f75b8a78c01ae8e6cb85eafe9b WHIRLPOOL 34ce0056fbecababf09bc5a8ea62b3c95ba5d0197224b9585efec005831ed48f0b9a08c7cfb04d32a39e2c25c4ffe567ddda31293fefb42c2b2a1eabb998daa6
-EBUILD tuprolog-2.3.1_beta.ebuild 1247 SHA256 963f2c44635417cbecb2513913d9f5c9463f58ce5073e30eda1c60f41ef50095 SHA512 f5b87496a1b59964e53c6de7b6bb429eba396b08e23ce1de27a273c032df1db06711f39cd283f3495052d30c5a8490e9feff952df67daa02ccb452680f22630f WHIRLPOOL 8251b7d43b33569e2e45f47ddc204d7ee2f18df103bdf0f885e4848bbf43ed8c1dc25f00fb3ad064091b442c5359cc4d44af1406768280c33f0d40c3c57b9f3c
-EBUILD tuprolog-2.4.0_rc5.ebuild 1225 SHA256 ae8083dd952d595643c9c4b8919ae80caec1d86549f93cb6d4059a761a72f237 SHA512 70cfe6c7210f5ddce6614cf327c12261a599ab943466accddfe6a0a62898dfcae3247332849f370d95c9b9e84d8f7c97d1ed31961f71b7d6c2d9cb16f99b44d5 WHIRLPOOL 49fc24ad7b07c32c6f46e6bbafd6d4cfe4e9e9ab1dc299f9e72c4b1b2209c3418138b1f277feab643cfee7cb8a4876b2a2f72f697de0a0951fe4cb509a5f5a9c
-MISC ChangeLog 5924 SHA256 52277b80dcb0657a90d1024b15c03554a3e264ed14f9e74eab368330a1292d35 SHA512 e44ad045f3d12dd540acd52716e4c86041146b4dbd19df921c7010c90e272e25bb771fdf1b4bcd24a403343d37a9bb9c39e4eadfdc44408a36e9e483def63bdf WHIRLPOOL 82fe6268ebaf5499f1d172fe528d2c9aa17e668d6bae1fd729410cebf1f6f887fb5c626828e25cbba64920d049a38b0ac4715fa92b5d3134df299256f14c4074
-MISC metadata.xml 159 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba SHA512 532979c6de159980035c56482b05558c2b59c97dc99d83903988d8a535512e209110273f7123fcb0b1ce8aeed34b368fc7a309e68f3a6b510296d547b0134137 WHIRLPOOL 24bf1d6894c0450424190af0e967c7f947cfa9a3a4b6cbe29c0a54ea4f857e252fb6ee5d14b3503b52f066dca47b4b7add3b7a57c5391de468ea49d589a2fe37
+DIST tuprolog-2.5.0.zip 4847183 RMD160 e152b253f0ade646dd0227fc941f1d0970c928ff SHA1 f384821d700182196ab36c2ed56405d9e54bfd50 SHA256 227714576fb1815a3fcc017211758bfb2d5a0b6a07ce3a3a24f8cd93db2e5e04
+EBUILD tuprolog-2.1.1.ebuild 1158 RMD160 67d6af25e461d64096a82432bc5b5206d6566281 SHA1 fe843f7462451d1217bde223d68b518592ced492 SHA256 11a8bbcc8a7602ad1c5532c5bf3e82ea7d2d7c907f73dd68a0ab6230d909bb4d
+EBUILD tuprolog-2.3.0_alpha.ebuild 1065 RMD160 9c63c8c1a332fdfb55334faeddbae29bed9158ab SHA1 5b86e09ef811a7da7685d5f282e0a49251d54e3d SHA256 3b7c141c04d56221b9372c08c3647c9dbb68d6d43319f2bacd3c261d7ead1398
+EBUILD tuprolog-2.3.1_beta.ebuild 1247 RMD160 759a6561bc7f3fb9fa27ffc7bc9b810ef63aeef6 SHA1 fcfb56723462b4047e89a72d5b9c3a0ed2d4a436 SHA256 963f2c44635417cbecb2513913d9f5c9463f58ce5073e30eda1c60f41ef50095
+EBUILD tuprolog-2.4.0_rc5.ebuild 1225 RMD160 f9a2bc18676d3b2a41a43ec6ed06daa2730b70d7 SHA1 f9852df5536a92e0041ba2c33c129b381264e255 SHA256 ae8083dd952d595643c9c4b8919ae80caec1d86549f93cb6d4059a761a72f237
+EBUILD tuprolog-2.5.0.ebuild 1172 RMD160 979102e488fa68b082c0363f52682e2665a8afc9 SHA1 0a70769a5cc96c6899ef6b4923bfd20e80e4ddf8 SHA256 1e1be70850ad3bec284380d68b567d40e315e983008ceb7a64140ce0a09ef822
+MISC ChangeLog 6068 RMD160 f6eef479aa92d17f5ef21d56317650f9cdb40b04 SHA1 2466026065a98a8186bc0a5fbb3959ad873980bc SHA256 d60aa575647fac7080f18741a081457ed2a23024b4cbc531da24b418ee42652c
+MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAlAbMREACgkQrwS/tqE49e3ljQCfUVxII923unBVdeNf7ZxwwUUX
+hBQAoIvjUCXdeTaekNpyuklzKMHqee1c
+=rVgW
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch
new file mode 100644
index 000000000000..256710934666
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.5.0-javadocs.patch
@@ -0,0 +1,315 @@
+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/tuprolog-2.5.0.ebuild b/dev-lang/tuprolog/tuprolog-2.5.0.ebuild
new file mode 100644
index 000000000000..d149d1f25335
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-2.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.5.0.ebuild,v 1.1 2012/08/04 11:27:31 keri Exp $
+
+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 ~ppc ~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
+}