Version bump.

Package-Manager: portage-2.1.2.7

5 files changed, 247 insertions, 5 deletions

diff --git a/dev-lang/tuprolog/ChangeLog b/dev-lang/tuprolog/ChangeLog
index bf2fa13c3f23..2b07d932b18d 100644
--- a/dev-lang/tuprolog/ChangeLog
+++ b/dev-lang/tuprolog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/tuprolog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.14 2007/06/07 08:25:21 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.15 2007/06/08 06:17:16 keri Exp $
+
+*tuprolog-2.1 (08 Jun 2007)
+
+  08 Jun 2007; keri <keri@gentoo.org> +files/tuprolog-2.1-javadocs.patch,
+  +tuprolog-2.1.ebuild:
+  Version bump.
 
   07 Jun 2007; keri <keri@gentoo.org> files/tuprolog-2.0.1-javadocs.patch:
   Fix javadocs patch. Closes #176413.
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index fdc3aa8b660f..ef3004ba0dd2 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -26,9 +26,14 @@ AUX tuprolog-2.0.1-javadocs.patch 10900 RMD160 5ea7be61b66550a9e450e4012710d4c01
 MD5 c39b5f2d083e03bd0e415b4e877fd7ff files/tuprolog-2.0.1-javadocs.patch 10900
 RMD160 5ea7be61b66550a9e450e4012710d4c01938b6c7 files/tuprolog-2.0.1-javadocs.patch 10900
 SHA256 1b3cf7321fbad38c7234ced17b304c8f0b5568763b837c31205e1f727ba56537 files/tuprolog-2.0.1-javadocs.patch 10900
+AUX tuprolog-2.1-javadocs.patch 6596 RMD160 3d7046508dc2eeae952ef7b0321325c88b45caeb SHA1 5ca2a9ef8192fa72b4c400725d0e79153f62b58f SHA256 58e33735509d63feef5d919d818810577728f274627a51572bb4d1b92be11be6
+MD5 2ad733eb39107c59de5dde4c795b24e7 files/tuprolog-2.1-javadocs.patch 6596
+RMD160 3d7046508dc2eeae952ef7b0321325c88b45caeb files/tuprolog-2.1-javadocs.patch 6596
+SHA256 58e33735509d63feef5d919d818810577728f274627a51572bb4d1b92be11be6 files/tuprolog-2.1-javadocs.patch 6596
 DIST 2p-1.3.0.zip 2917856 RMD160 17c28db76873c4855df06992ffcc41e08d2d08c1 SHA1 4ad1500487762367a54981484d36579ce72af768 SHA256 c6fc6b1fadef7d22d24a7e454ebed4e67851e3960524a8730bbcbdea5216ceec
 DIST 2p-2.0.1.zip 1815589 RMD160 569f2ccef98dd4fcf22923b1cd60c257ad94b5e6 SHA1 2a4dbcb67c3544c831ce7e8c3803d9c03e4b5fa6 SHA256 3f9310f3c304c5196410a1ccd18a1fdd9d481fcf02ee46c04c74f38252428154
 DIST 2p-2.0.zip 1784854 RMD160 7961cf8ec8cca45b4807fa1a8c95c80f73209707 SHA1 39010ab06024b0367de6e4e7c890bb4461cdb33d SHA256 14d93c6b22defc6a1e1a285f0f019e45550b982fbd873bf62d37d50b04beaa72
+DIST 2p-2.1.zip 1833108 RMD160 5065324deae2c59712e8054dd47902a418501a93 SHA1 9a0050d11854b674d13abf74a37602a8ff8d2b17 SHA256 e0ff06ba2b453f82fc896d7163b09694636b23153673385f154af2d8059d629d
 EBUILD tuprolog-1.3.0-r1.ebuild 1063 RMD160 c36f697a5ea4a405f4c26364a77f6592f3a7d1fb SHA1 1cdb8b9daaef9494b372811aa5ccb9f8b30b4855 SHA256 0d3796d29d430e52eb2b99ed36af63d5c0ff4dfbaf10ac26cc726ce691627a58
 MD5 867c97511274fb2aa073a1f3901b6d8b tuprolog-1.3.0-r1.ebuild 1063
 RMD160 c36f697a5ea4a405f4c26364a77f6592f3a7d1fb tuprolog-1.3.0-r1.ebuild 1063
@@ -41,10 +46,14 @@ EBUILD tuprolog-2.0.ebuild 1011 RMD160 293707a0e793f52a4c6aab7ad9c647c9adba0af4
 MD5 40f654914e4b8c3ccccf8fcca799256e tuprolog-2.0.ebuild 1011
 RMD160 293707a0e793f52a4c6aab7ad9c647c9adba0af4 tuprolog-2.0.ebuild 1011
 SHA256 cd36b7b3a0c2efd36fac741366e048d77f4d9132da38b8e5c821a4ec7c471db3 tuprolog-2.0.ebuild 1011
-MISC ChangeLog 1868 RMD160 0eb221db7c01608bfb5c158e99b8fbd5dfeb07fd SHA1 e50b343553990851d1e2524cce82c398f3bea411 SHA256 3f5d2e9d12de010ffff1191b1d841e8f10940fbfd5aacfa7407ce773019c7c6e
-MD5 05bf9e10557538373372ce4378c4b41c ChangeLog 1868
-RMD160 0eb221db7c01608bfb5c158e99b8fbd5dfeb07fd ChangeLog 1868
-SHA256 3f5d2e9d12de010ffff1191b1d841e8f10940fbfd5aacfa7407ce773019c7c6e ChangeLog 1868
+EBUILD tuprolog-2.1.ebuild 1121 RMD160 cc091584b7b0e08bf5e1665bbe098c7ffcfc5130 SHA1 2cbcbc7e85047195b0a02b7828f850be266c61ff SHA256 197b431ca89ccc10c13759f20ebf3830ffdf7196b70c6bad2935cd88be79dead
+MD5 0f7cd2db0232ba8e2c133761a7049b88 tuprolog-2.1.ebuild 1121
+RMD160 cc091584b7b0e08bf5e1665bbe098c7ffcfc5130 tuprolog-2.1.ebuild 1121
+SHA256 197b431ca89ccc10c13759f20ebf3830ffdf7196b70c6bad2935cd88be79dead tuprolog-2.1.ebuild 1121
+MISC ChangeLog 2012 RMD160 b398e89f11f300e86d180270d919d084d9881ff4 SHA1 16fccc98179f9d1c670b0623473d21a9cbd3f9a1 SHA256 5ff7de5b1a9e2bde7c150813df1d2805fd555fdb0c4c9fb443b629a7d34ffeb0
+MD5 9e23ea797be119398c94c317d4032429 ChangeLog 2012
+RMD160 b398e89f11f300e86d180270d919d084d9881ff4 ChangeLog 2012
+SHA256 5ff7de5b1a9e2bde7c150813df1d2805fd555fdb0c4c9fb443b629a7d34ffeb0 ChangeLog 2012
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
@@ -58,3 +67,6 @@ SHA256 cd2637e9a4657df33aecd56f177721b1f14161eb977f46d033d99263fd74266b files/di
 MD5 c67f927d3fa67ba0c3a334d5fa375e9b files/digest-tuprolog-2.0.1 220
 RMD160 8147c807c823cd658825760f87b4aef949cc75b3 files/digest-tuprolog-2.0.1 220
 SHA256 484da3d8662ab16333813c6edcc092701cbb9ac9130da224fc3d9de3ae579832 files/digest-tuprolog-2.0.1 220
+MD5 9229f7b5de629a0d8bd0426041922615 files/digest-tuprolog-2.1 214
+RMD160 51e02e84b2ad3f7568df4b106953252c32db8fc5 files/digest-tuprolog-2.1 214
+SHA256 0cd23bf6a4a1275a4518f397606737bd2cf5338f975f8938ac18f00823145d06 files/digest-tuprolog-2.1 214
diff --git a/dev-lang/tuprolog/files/digest-tuprolog-2.1 b/dev-lang/tuprolog/files/digest-tuprolog-2.1
new file mode 100644
index 000000000000..b93d9cddb166
--- /dev/null
+++ b/dev-lang/tuprolog/files/digest-tuprolog-2.1
@@ -0,0 +1,3 @@
+MD5 81493862beb2afed23193bef27504eb8 2p-2.1.zip 1833108
+RMD160 5065324deae2c59712e8054dd47902a418501a93 2p-2.1.zip 1833108
+SHA256 e0ff06ba2b453f82fc896d7163b09694636b23153673385f154af2d8059d629d 2p-2.1.zip 1833108
diff --git a/dev-lang/tuprolog/files/tuprolog-2.1-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.1-javadocs.patch
new file mode 100644
index 000000000000..65bd7fc48500
--- /dev/null
+++ b/dev-lang/tuprolog/files/tuprolog-2.1-javadocs.patch
@@ -0,0 +1,165 @@
+diff -ur src.orig/alice/tuprolog/ChoicePointStore.java src/alice/tuprolog/ChoicePointStore.java
+--- src.orig/alice/tuprolog/ChoicePointStore.java	2007-04-23 10:10:38.000000000 +1200
++++ src/alice/tuprolog/ChoicePointStore.java	2007-06-08 07:46:21.000000000 +1200
+@@ -35,7 +35,6 @@
+ 	

+ 	/**

+ 	 * Return the actual choice-point store

+-	 * @return

+ 	 */

+ 	public ChoicePointContext getPointer() {

+ 		return pointer;

+@@ -44,7 +43,6 @@
+ 	/**

+ 	 * Check if a choice point exists in the store.

+ 	 * As a side effect, removes choice points which have been already used and are now empty. 

+-	 * @return

+ 	 */

+ 	protected boolean existChoicePoint() {

+ 		if (pointer == null) return false;

+diff -ur src.orig/alice/tuprolog/ClauseStore.java src/alice/tuprolog/ClauseStore.java
+--- src.orig/alice/tuprolog/ClauseStore.java	2007-04-23 10:10:38.000000000 +1200
++++ src/alice/tuprolog/ClauseStore.java	2007-06-08 07:45:36.000000000 +1200
+@@ -58,8 +58,6 @@
+ 	
+ 	/**
+ 	 * Verify if there is a term in compatibleGoals compatible with goal. 
+-	 * @param goal
+-	 * @param compGoals
+ 	 * @return true if compatible or false otherwise.
+ 	 */
+ 	protected boolean existCompatibleClause() {
+diff -ur src.orig/alice/tuprolog/EngineManager.java src/alice/tuprolog/EngineManager.java
+--- src.orig/alice/tuprolog/EngineManager.java	2007-04-23 10:10:40.000000000 +1200
++++ src/alice/tuprolog/EngineManager.java	2007-06-08 07:44:50.000000000 +1200
+@@ -85,7 +85,7 @@
+ 	/**

+ 	 *  Solves a query

+ 	 *

+-	 * @param g the term representing the goal to be demonstrated

++	 * @param query the term representing the goal to be demonstrated

+ 	 * @return the result of the demonstration

+ 	 * @see SolveInfo

+ 	 **/

+diff -ur src.orig/alice/tuprolog/PrimitiveManager.java src/alice/tuprolog/PrimitiveManager.java
+--- src.orig/alice/tuprolog/PrimitiveManager.java	2007-04-23 10:10:38.000000000 +1200
++++ src/alice/tuprolog/PrimitiveManager.java	2007-06-08 07:44:07.000000000 +1200
+@@ -87,7 +87,7 @@
+ 	 * This involves identifying structs representing builtin
+ 	 * predicates and functors, and setting up related structures and links
+ 	 *
+-	 * @parm term the term to be identified
++	 * @param term the term to be identified
+ 	 * @return term with the identified built-in directive
+ 	 */
+ 	public Term identifyDirective(Term term) {
+diff -ur src.orig/alice/tuprolog/lib/BasicLibrary.java src/alice/tuprolog/lib/BasicLibrary.java
+--- src.orig/alice/tuprolog/lib/BasicLibrary.java	2007-04-23 10:10:40.000000000 +1200
++++ src/alice/tuprolog/lib/BasicLibrary.java	2007-06-08 07:42:23.000000000 +1200
+@@ -96,7 +96,7 @@
+ 	/**

+ 	 * Loads a library constructed from a theory.

+ 	 * 

+-	 * @param theory theory text

++	 * @param th theory text

+ 	 * @param libName name of the library

+ 	 * @return true if the library has been succesfully loaded.

+ 	 */

+diff -ur src.orig/alice/tuprolog/lib/JavaLibrary.java src/alice/tuprolog/lib/JavaLibrary.java
+--- src.orig/alice/tuprolog/lib/JavaLibrary.java	2007-04-23 10:10:38.000000000 +1200
++++ src/alice/tuprolog/lib/JavaLibrary.java	2007-06-08 07:43:33.000000000 +1200
+@@ -1226,7 +1226,6 @@
+ 	
+ 	/**
+ 	 * Generates a fresh numeric identifier
+-	 * @return
+ 	 */
+ 	protected Struct generateFreshId() {
+ 		return new Struct("$obj_" + id++);        
+diff -ur src.orig/alice/util/jedit/InputHandler.java src/alice/util/jedit/InputHandler.java
+--- src.orig/alice/util/jedit/InputHandler.java	2007-04-23 10:10:38.000000000 +1200
++++ src/alice/util/jedit/InputHandler.java	2007-06-07 21:20:15.000000000 +1200
+@@ -24,7 +24,7 @@
+  *
+  * @author Slava Pestov
+  * @version $Id: InputHandler.java,v 1.14 1999/12/13 03:40:30 sp Exp $
+- * @see org.gjt.sp.jedit.textarea.DefaultInputHandler
++ * @see alice.util.jedit.DefaultInputHandler
+  */
+ public abstract class InputHandler extends KeyAdapter
+ {
+@@ -187,7 +187,7 @@
+ 	/**
+ 	 * Grabs the next key typed event and invokes the specified
+ 	 * action with the key as a the action command.
+-	 * @param action The action
++	 * @param listener The action
+ 	 */
+ 	public void grabNextKeyStroke(ActionListener listener)
+ 	{
+diff -ur src.orig/alice/util/jedit/JEditTextArea.java src/alice/util/jedit/JEditTextArea.java
+--- src.orig/alice/util/jedit/JEditTextArea.java	2007-04-23 10:10:38.000000000 +1200
++++ src/alice/util/jedit/JEditTextArea.java	2007-06-07 21:19:06.000000000 +1200
+@@ -1389,7 +1389,7 @@
+ 
+ 	/**
+ 	 * Sets if the selection should be rectangular.
+-	 * @param overwrite True if the selection should be rectangular,
++	 * @param rectSelect True if the selection should be rectangular,
+ 	 * false otherwise.
+ 	 */
+ 	public final void setSelectionRectangular(boolean rectSelect)
+diff -ur src.orig/alice/util/jedit/KeywordMap.java src/alice/util/jedit/KeywordMap.java
+--- src.orig/alice/util/jedit/KeywordMap.java	2007-04-23 10:10:38.000000000 +1200
++++ src/alice/util/jedit/KeywordMap.java	2007-06-07 21:17:18.000000000 +1200
+@@ -75,7 +75,7 @@
+ 	/**
+ 	 * Adds a key-value mapping.
+ 	 * @param keyword The key
+-	 * @Param id The value
++	 * @param id The value
+ 	 */
+ 	public void add(String keyword, byte id)
+ 	{
+diff -ur src.orig/alice/util/jedit/TextAreaPainter.java src/alice/util/jedit/TextAreaPainter.java
+--- src.orig/alice/util/jedit/TextAreaPainter.java	2007-04-23 10:10:38.000000000 +1200
++++ src/alice/util/jedit/TextAreaPainter.java	2007-06-07 21:18:00.000000000 +1200
+@@ -75,7 +75,7 @@
+ 	/**
+ 	 * Returns the syntax styles used to paint colorized text. Entry <i>n</i>
+ 	 * will be used to paint tokens with id = <i>n</i>.
+-	 * @see org.gjt.sp.jedit.syntax.Token
++	 * @see alice.util.jedit.Token
+ 	 */
+ 	public final SyntaxStyle[] getStyles()
+ 	{
+@@ -86,7 +86,7 @@
+ 	 * Sets the syntax styles used to paint colorized text. Entry <i>n</i>
+ 	 * will be used to paint tokens with id = <i>n</i>.
+ 	 * @param styles The syntax styles
+-	 * @see org.gjt.sp.jedit.syntax.Token
++	 * @see alice.util.jedit.Token
+ 	 */
+ 	public final void setStyles(SyntaxStyle[] styles)
+ 	{
+@@ -356,7 +356,7 @@
+ 
+ 	/**
+ 	 * Repaints the text.
+-	 * @param g The graphics context
++	 * @param gfx The graphics context
+ 	 */
+ 	public void paint(Graphics gfx)
+ 	{
+diff -ur src.orig/alice/util/jedit/TokenMarker.java src/alice/util/jedit/TokenMarker.java
+--- src.orig/alice/util/jedit/TokenMarker.java	2007-04-23 10:10:40.000000000 +1200
++++ src/alice/util/jedit/TokenMarker.java	2007-06-07 21:15:17.000000000 +1200
+@@ -24,7 +24,7 @@
+  * @author Slava Pestov
+  * @version $Id: TokenMarker.java,v 1.32 1999/12/13 03:40:30 sp Exp $
+  *
+- * @see org.gjt.sp.jedit.syntax.Token
++ * @see alice.util.jedit.Token
+  */
+ public abstract class TokenMarker
+ {
diff --git a/dev-lang/tuprolog/tuprolog-2.1.ebuild b/dev-lang/tuprolog/tuprolog-2.1.ebuild
new file mode 100644
index 000000000000..8044acb0eac8
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-2.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.1.ebuild,v 1.1 2007/06/08 06:17:16 keri Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="2p-${PV}"
+MY_SRC_P="src-J2SE-${PV}"
+
+DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
+HOMEPAGE="http://www.alice.unibo.it/tuProlog/"
+SRC_URI="mirror://sourceforge/tuprolog/2p-2.1.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc test"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	dev-java/ant-core
+	test? ( dev-java/ant-tasks
+		dev-java/junit )"
+RDEPEND=">=virtual/jdk-1.4"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-javadocs.patch
+
+	cd "${S}"
+	cp "${FILESDIR}"/build.xml "${S}"
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_test() {
+	cd "${S}"/dist
+	java-pkg_jar-from junit
+	cd "${S}"
+	eant test || die "eant test failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r docs/*
+		dodoc doc/*.pdf
+	fi
+
+	dodoc CHANGELOG
+}