From: Keri Harris Date: Wed, 31 Jan 2007 07:01:33 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=baba6d8eb639b67aff55e6e2e98ee2cc384bbfd6;p=gentoo.git Version bump. Package-Manager: portage-2.1.2-r5 --- diff --git a/dev-lang/tuprolog/ChangeLog b/dev-lang/tuprolog/ChangeLog index 74d540f03d1e..d62cd756aa1e 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.8 2007/01/21 22:31:51 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.9 2007/01/31 07:01:33 keri Exp $ + +*tuprolog-2.0.1 (31 Jan 2007) + + 31 Jan 2007; keri +files/tuprolog-2.0.1-java1.4.patch, + +files/tuprolog-2.0.1-javadocs.patch, +tuprolog-2.0.1.ebuild: + Version bump. 21 Jan 2007; keri +files/tuprolog-2.0-java1.4.patch, +files/tuprolog-2.0-javadocs.patch, tuprolog-2.0.ebuild: diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest index 3f2901ad5b9a..367bda0be523 100644 --- a/dev-lang/tuprolog/Manifest +++ b/dev-lang/tuprolog/Manifest @@ -18,20 +18,33 @@ AUX tuprolog-2.0-javadocs.patch 7433 RMD160 a4f443a6a9ea067dde247653b1164dfabc4a MD5 3365b09938c1ea9e87e59cb52573b56d files/tuprolog-2.0-javadocs.patch 7433 RMD160 a4f443a6a9ea067dde247653b1164dfabc4a1648 files/tuprolog-2.0-javadocs.patch 7433 SHA256 ad826c24df0a0ebd2ad9e6907d69088590d2d65a5079ae0014054a3513d3ea35 files/tuprolog-2.0-javadocs.patch 7433 +AUX tuprolog-2.0.1-java1.4.patch 6003 RMD160 892ebd69443fad49ae56125cc930f56fa44aaad8 SHA1 4a31d4f5a81c568a6eafd0892486c55a764326cf SHA256 0e9b3e9ac21fe14afd3ba393c8bfdee71b24e8c5c756087384fc2d164e30d43b +MD5 ee02ac496c4c3c9db150ddb71b265f0d files/tuprolog-2.0.1-java1.4.patch 6003 +RMD160 892ebd69443fad49ae56125cc930f56fa44aaad8 files/tuprolog-2.0.1-java1.4.patch 6003 +SHA256 0e9b3e9ac21fe14afd3ba393c8bfdee71b24e8c5c756087384fc2d164e30d43b files/tuprolog-2.0.1-java1.4.patch 6003 +AUX tuprolog-2.0.1-javadocs.patch 10900 RMD160 992021891fda173090dd02b1313a70915d2916c6 SHA1 d3d2d64238abe94826173e60b328ca359c1a7b7e SHA256 b3fd033ed79a61c7facb003e34c8468748e101e971b6357596638e3055b55644 +MD5 7e23ff8f59b891e29ccbbb6a0286ab69 files/tuprolog-2.0.1-javadocs.patch 10900 +RMD160 992021891fda173090dd02b1313a70915d2916c6 files/tuprolog-2.0.1-javadocs.patch 10900 +SHA256 b3fd033ed79a61c7facb003e34c8468748e101e971b6357596638e3055b55644 files/tuprolog-2.0.1-javadocs.patch 10900 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 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 SHA256 0d3796d29d430e52eb2b99ed36af63d5c0ff4dfbaf10ac26cc726ce691627a58 tuprolog-1.3.0-r1.ebuild 1063 +EBUILD tuprolog-2.0.1.ebuild 1014 RMD160 9c9b82e153f98ef0c830098cc72835e441dbd175 SHA1 29cad081783bdee6bea0c4d41aa975ba0b48e903 SHA256 49bde828d2963ce5d9082aefd3f67cc7323edb30a5b172a25ebce1583803244e +MD5 1a708dfc0e2d728353a877dea38fcf4b tuprolog-2.0.1.ebuild 1014 +RMD160 9c9b82e153f98ef0c830098cc72835e441dbd175 tuprolog-2.0.1.ebuild 1014 +SHA256 49bde828d2963ce5d9082aefd3f67cc7323edb30a5b172a25ebce1583803244e tuprolog-2.0.1.ebuild 1014 EBUILD tuprolog-2.0.ebuild 1011 RMD160 293707a0e793f52a4c6aab7ad9c647c9adba0af4 SHA1 dff8d7ca57901cb7b62c0f245cfc965bdfc08a5e SHA256 cd36b7b3a0c2efd36fac741366e048d77f4d9132da38b8e5c821a4ec7c471db3 MD5 40f654914e4b8c3ccccf8fcca799256e tuprolog-2.0.ebuild 1011 RMD160 293707a0e793f52a4c6aab7ad9c647c9adba0af4 tuprolog-2.0.ebuild 1011 SHA256 cd36b7b3a0c2efd36fac741366e048d77f4d9132da38b8e5c821a4ec7c471db3 tuprolog-2.0.ebuild 1011 -MISC ChangeLog 1161 RMD160 b54fac82e906d8595896be63698d4cc32aa12a23 SHA1 9190b80ceead144a60279d80041bb8efeec7b093 SHA256 a2120831b0e05f895133faeb31c76a364140c6ef4d6691b70c4058cb84aac87f -MD5 a972159ea3ae104cb3afd748d7f9d828 ChangeLog 1161 -RMD160 b54fac82e906d8595896be63698d4cc32aa12a23 ChangeLog 1161 -SHA256 a2120831b0e05f895133faeb31c76a364140c6ef4d6691b70c4058cb84aac87f ChangeLog 1161 +MISC ChangeLog 1348 RMD160 c40a1b6845faac47c0f0bb4f26821051292500c8 SHA1 2337efd55f0379c496affab3be70c74fd5d51c6a SHA256 16e132f737066aa29dd969869f8822b75bddd41203ff48511f9a5650e7f65d60 +MD5 c12e720eb4b821e4ff3c36c7267018a1 ChangeLog 1348 +RMD160 c40a1b6845faac47c0f0bb4f26821051292500c8 ChangeLog 1348 +SHA256 16e132f737066aa29dd969869f8822b75bddd41203ff48511f9a5650e7f65d60 ChangeLog 1348 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159 @@ -42,3 +55,6 @@ SHA256 bc807f2ea119ca7c37243f1997577602bf68ca2fc67f07827ef508a10c13ee74 files/di MD5 33915b2eeb3a343fce402f02b43f9c9c files/digest-tuprolog-2.0 214 RMD160 2b1081f8fb8ac246dfa89a6fca937c99a8a0219d files/digest-tuprolog-2.0 214 SHA256 cd2637e9a4657df33aecd56f177721b1f14161eb977f46d033d99263fd74266b files/digest-tuprolog-2.0 214 +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 diff --git a/dev-lang/tuprolog/files/digest-tuprolog-2.0.1 b/dev-lang/tuprolog/files/digest-tuprolog-2.0.1 new file mode 100644 index 000000000000..381c0c0ed3c7 --- /dev/null +++ b/dev-lang/tuprolog/files/digest-tuprolog-2.0.1 @@ -0,0 +1,3 @@ +MD5 5323b23542077234eec3c3e55306b4bb 2p-2.0.1.zip 1815589 +RMD160 569f2ccef98dd4fcf22923b1cd60c257ad94b5e6 2p-2.0.1.zip 1815589 +SHA256 3f9310f3c304c5196410a1ccd18a1fdd9d481fcf02ee46c04c74f38252428154 2p-2.0.1.zip 1815589 diff --git a/dev-lang/tuprolog/files/tuprolog-2.0.1-java1.4.patch b/dev-lang/tuprolog/files/tuprolog-2.0.1-java1.4.patch new file mode 100644 index 000000000000..644a08a52a1e --- /dev/null +++ b/dev-lang/tuprolog/files/tuprolog-2.0.1-java1.4.patch @@ -0,0 +1,164 @@ +diff -ur src.orig/alice/tuprologx/ide/AWTFrameLauncher.java src/alice/tuprologx/ide/AWTFrameLauncher.java +--- src.orig/alice/tuprologx/ide/AWTFrameLauncher.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/tuprologx/ide/AWTFrameLauncher.java 2007-01-31 19:39:21.000000000 +1300 +@@ -88,7 +88,7 @@ + height = Math.min(height, screenSize.height); + setBounds((screenSize.width - width) / 2, (screenSize.height - height) / 2, width, height); + } +- show(); ++ setVisible(true); + } + + public void update(Graphics g) { +diff -ur src.orig/alice/tuprologx/ide/Applet.java src/alice/tuprologx/ide/Applet.java +--- src.orig/alice/tuprologx/ide/Applet.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/tuprologx/ide/Applet.java 2007-01-31 19:39:21.000000000 +1300 +@@ -41,7 +41,7 @@ + ide.removeWindowListener(listeners[i]); + + ide.pack(); +- ide.show(); ++ ide.setVisible(true); + } + + } // end Applet class +\ No newline at end of file +diff -ur src.orig/alice/tuprologx/ide/DotNetIOManager.java src/alice/tuprologx/ide/DotNetIOManager.java +--- src.orig/alice/tuprologx/ide/DotNetIOManager.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/tuprologx/ide/DotNetIOManager.java 2007-01-31 19:39:21.000000000 +1300 +@@ -46,7 +46,7 @@ + FileDialog dialog = new FileDialog(parent, "Load Theory", FileDialog.LOAD); + dialog.setDirectory(currentLoadDirectory); + dialog.setFile("*.pro"); +- dialog.show(); ++ dialog.setVisible(true); + String directory = dialog.getDirectory(); + currentLoadDirectory = directory; + String fileName = dialog.getFile(); +@@ -61,7 +61,7 @@ + public String saveTheoryAs(String theory) throws Exception { + FileDialog dialog = new FileDialog(parent, "Save Theory As...", FileDialog.SAVE); + dialog.setDirectory(currentSaveDirectory); +- dialog.show(); ++ dialog.setVisible(true); + String directory = dialog.getDirectory(); + currentSaveDirectory = directory; + String fileName = dialog.getFile(); +diff -ur src.orig/alice/tuprologx/ide/GUILauncher.java src/alice/tuprologx/ide/GUILauncher.java +--- src.orig/alice/tuprologx/ide/GUILauncher.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/tuprologx/ide/GUILauncher.java 2007-01-31 19:39:21.000000000 +1300 +@@ -74,7 +74,7 @@ + private void launchDotNetGUI() { + DotNetIDE ide = new DotNetIDE(); + ide.pack(); +- ide.show(); ++ ide.setVisible(true); + } + + /** +diff -ur src.orig/alice/util/jedit/JEditTextArea.java src/alice/util/jedit/JEditTextArea.java +--- src.orig/alice/util/jedit/JEditTextArea.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/util/jedit/JEditTextArea.java 2007-01-31 19:39:21.000000000 +1300 +@@ -115,10 +115,10 @@ + * Returns if this component can be traversed by pressing + * the Tab key. This returns false. + */ +- public final boolean isManagingFocus() ++ /*public final boolean isManagingFocus() + { + return true; +- } ++ }*/ + + /** + * Returns the object responsible for painting this text area. +@@ -507,7 +507,7 @@ + if(id == Token.NULL) + fm = painter.getFontMetrics(); + else +- fm = styles[id].getFontMetrics(defaultFont); ++ fm = styles[id].getFontMetrics(painter, defaultFont); + + int length = tokens.length; + +@@ -604,7 +604,7 @@ + if(id == Token.NULL) + fm = painter.getFontMetrics(); + else +- fm = styles[id].getFontMetrics(defaultFont); ++ fm = styles[id].getFontMetrics(painter, defaultFont); + + int length = tokens.length; + +diff -ur src.orig/alice/util/jedit/SyntaxStyle.java src/alice/util/jedit/SyntaxStyle.java +--- src.orig/alice/util/jedit/SyntaxStyle.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/util/jedit/SyntaxStyle.java 2007-01-31 19:39:21.000000000 +1300 +@@ -9,6 +9,7 @@ + package alice.util.jedit; + + import java.awt.*; ++import javax.swing.*; + import java.util.StringTokenizer; + + /** +@@ -86,7 +87,7 @@ + /** + * Returns the font metrics for the styled font. + */ +- public FontMetrics getFontMetrics(Font font) ++ public FontMetrics getFontMetrics(JComponent component, Font font) + { + if(font == null) + throw new NullPointerException("font param must not" +@@ -98,7 +99,7 @@ + (bold ? Font.BOLD : 0) + | (italic ? Font.ITALIC : 0), + font.getSize()); +- fontMetrics = Toolkit.getDefaultToolkit().getFontMetrics( ++ fontMetrics = component.getFontMetrics( + lastStyledFont); + return fontMetrics; + } +diff -ur src.orig/alice/util/jedit/TextAreaPainter.java src/alice/util/jedit/TextAreaPainter.java +--- src.orig/alice/util/jedit/TextAreaPainter.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/util/jedit/TextAreaPainter.java 2007-01-31 19:39:21.000000000 +1300 +@@ -67,10 +67,10 @@ + * Returns if this component can be traversed by pressing the + * Tab key. This returns false. + */ +- public final boolean isManagingFocus() ++ /*public final boolean isManagingFocus() + { + return false; +- } ++ }*/ + + /** + * Returns the syntax styles used to paint colorized text. Entry n +@@ -350,7 +350,7 @@ + public void setFont(Font font) + { + super.setFont(font); +- fm = Toolkit.getDefaultToolkit().getFontMetrics(font); ++ fm = getFontMetrics(font); + textArea.recalculateVisibleLines(); + } + +diff -ur src.orig/alice/util/thinlet/Thinlet.java src/alice/util/thinlet/Thinlet.java +--- src.orig/alice/util/thinlet/Thinlet.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/util/thinlet/Thinlet.java 2007-01-31 19:39:21.000000000 +1300 +@@ -1,4 +1,4 @@ +-/* áÁÕôÛûÍí ++/* ���� + Thinlet GUI toolkit - www.thinlet.com + Copyright (C) 2002 Robert Bajzat (robert.bajzat@thinlet.com) + +@@ -2157,7 +2157,7 @@ + * + * @return true as focus-transverable component, overwrites the default false value + */ +- public boolean isFocusTraversable() { ++ public boolean isFocusable() { + return true; + } + diff --git a/dev-lang/tuprolog/files/tuprolog-2.0.1-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.0.1-javadocs.patch new file mode 100644 index 000000000000..a39abd11f756 --- /dev/null +++ b/dev-lang/tuprolog/files/tuprolog-2.0.1-javadocs.patch @@ -0,0 +1,283 @@ +diff -ur src.orig/alice/tuprolog/BuiltIn.java src/alice/tuprolog/BuiltIn.java +--- src.orig/alice/tuprolog/BuiltIn.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/tuprolog/BuiltIn.java 2007-01-31 19:41:26.000000000 +1300 +@@ -88,7 +88,6 @@ + + /** + * usata per la retract in basicLibrary +- * @return + */ + public boolean $restore_db_0() { + theoryManager.transRestore(); +Only in src/alice/tuprolog: BuiltIn.java.orig +diff -ur src.orig/alice/tuprolog/ChoicePointStore.java src/alice/tuprolog/ChoicePointStore.java +--- src.orig/alice/tuprolog/ChoicePointStore.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/tuprolog/ChoicePointStore.java 2007-01-31 19:41:26.000000000 +1300 +@@ -35,7 +35,6 @@ + + /** + * Return the actual choice-point store +- * @return + */ + public ChoicePointContext getPointer() { + return pointer; +@@ -44,7 +43,6 @@ + /** + * Check if a choice point exists in the store. + * As a side effect, removes choice points which have been already used and are now empty. +- * @return + */ + protected boolean existChoicePoint() { + if (pointer == null) return false; +diff -ur src.orig/alice/tuprolog/ClauseStore.java src/alice/tuprolog/ClauseStore.java +--- src.orig/alice/tuprolog/ClauseStore.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/tuprolog/ClauseStore.java 2007-01-31 19:41:26.000000000 +1300 +@@ -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-01-30 15:12:42.000000000 +1300 ++++ src/alice/tuprolog/EngineManager.java 2007-01-31 19:41:26.000000000 +1300 +@@ -81,7 +81,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-01-30 15:12:42.000000000 +1300 ++++ src/alice/tuprolog/PrimitiveManager.java 2007-01-31 19:41:26.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 + */ + public void identifyDirective(Term term) { + identify(term,PrimitiveInfo.DIRECTIVE); +diff -ur src.orig/alice/tuprolog/lib/BasicLibrary.java src/alice/tuprolog/lib/BasicLibrary.java +--- src.orig/alice/tuprolog/lib/BasicLibrary.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/tuprolog/lib/BasicLibrary.java 2007-01-31 19:43:17.000000000 +1300 +@@ -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. + */ +@@ -342,13 +342,13 @@ + Term val0 = evalExpression(arg1); + if (val0!=null && val0.isNumber()) { + alice.tuprolog.Number val0n = (alice.tuprolog.Number) val0; +- if (val0n.isInt()) { ++ if (val0n.isInt()) { + return new Int(val0n.intValue() * -1); +- } else if (val0n.isDouble()) { ++ } else if (val0n.isDouble()) { + return new alice.tuprolog.Double(val0n.doubleValue() * -1); +- } else if (val0n.isLong()) { ++ } else if (val0n.isLong()) { + return new alice.tuprolog.Long(val0n.longValue() * -1); +- } else if (val0n.isFloat()) { ++ } else if (val0n.isFloat()) { + return new alice.tuprolog.Float(val0n.floatValue() * -1); + } else { + return null; +@@ -367,24 +367,24 @@ + } + } + +- alice.tuprolog.Number getIntegerNumber(long num) { +- if (num > Integer.MIN_VALUE && num < Integer.MAX_VALUE) +- return new Int((int) num); +- else +- return new alice.tuprolog.Long(num); +- } +- ++ alice.tuprolog.Number getIntegerNumber(long num) { ++ if (num > Integer.MIN_VALUE && num < Integer.MAX_VALUE) ++ return new Int((int) num); ++ else ++ return new alice.tuprolog.Long(num); ++ } ++ + public Term expression_plus_2(Term arg0,Term arg1) { + Term val0 = evalExpression(arg0); + Term val1 = evalExpression(arg1); + if (val0!=null && val1!=null && val0.isNumber() && (val1.isNumber())) { + alice.tuprolog.Number val0n = (alice.tuprolog.Number) val0; + alice.tuprolog.Number val1n = (alice.tuprolog.Number) val1; +- if (val0n.isInteger() && (val1n.isInteger())) +- return getIntegerNumber(val0n.longValue() + val1n.longValue()); +- else ++ if (val0n.isInteger() && (val1n.isInteger())) ++ return getIntegerNumber(val0n.longValue() + val1n.longValue()); ++ else + return new alice.tuprolog.Double(val0n.doubleValue() + val1n.doubleValue()); +- } else ++ } else + return null; + } + +@@ -394,11 +394,11 @@ + if (val0!=null && val1!=null && val0.isNumber() && (val1.isNumber())) { + alice.tuprolog.Number val0n = (alice.tuprolog.Number) val0; + alice.tuprolog.Number val1n = (alice.tuprolog.Number) val1; +- if (val0n.isInteger() && (val1n.isInteger())) +- return getIntegerNumber(val0n.longValue() - val1n.longValue()); +- else ++ if (val0n.isInteger() && (val1n.isInteger())) ++ return getIntegerNumber(val0n.longValue() - val1n.longValue()); ++ else + return new alice.tuprolog.Double(val0n.doubleValue() - val1n.doubleValue()); +- } else ++ } else + return null; + } + +@@ -408,11 +408,11 @@ + if (val0!=null && val1!=null && val0.isNumber() && (val1.isNumber())) { + alice.tuprolog.Number val0n = (alice.tuprolog.Number) val0; + alice.tuprolog.Number val1n = (alice.tuprolog.Number) val1; +- if (val0n.isInteger() && (val1n.isInteger())) +- return getIntegerNumber(val0n.longValue() * val1n.longValue()); +- else ++ if (val0n.isInteger() && (val1n.isInteger())) ++ return getIntegerNumber(val0n.longValue() * val1n.longValue()); ++ else + return new alice.tuprolog.Double(val0n.doubleValue() * val1n.doubleValue()); +- } else ++ } else + return null; + } + +@@ -424,7 +424,7 @@ + Number val1n = (Number) val1; + alice.tuprolog.Double result = new alice.tuprolog.Double(val0n.doubleValue()/val1n.doubleValue()); + if (val0n.isInteger() && val1n.isInteger()) +- return getIntegerNumber(result.longValue()); ++ return getIntegerNumber(result.longValue()); + else + return result; + } else +@@ -437,7 +437,7 @@ + if (val0!=null && val1!=null && val0.isNumber() && (val1.isNumber())) { + alice.tuprolog.Number val0n = (alice.tuprolog.Number) val0; + alice.tuprolog.Number val1n = (alice.tuprolog.Number) val1; +- return getIntegerNumber(val0n.longValue() / val1n.longValue()); ++ return getIntegerNumber(val0n.longValue() / val1n.longValue()); + } else { + return null; + } +Only in src/alice/tuprolog/lib: BasicLibrary.java.orig +Only in src/alice/tuprolog/lib: BasicLibrary.java.rej +diff -ur src.orig/alice/tuprolog/lib/JavaLibrary.java src/alice/tuprolog/lib/JavaLibrary.java +--- src.orig/alice/tuprolog/lib/JavaLibrary.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/tuprolog/lib/JavaLibrary.java 2007-01-31 19:41:26.000000000 +1300 +@@ -1227,7 +1227,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-01-30 15:12:42.000000000 +1300 ++++ src/alice/util/jedit/InputHandler.java 2007-01-31 19:41:26.000000000 +1300 +@@ -24,7 +24,7 @@ + * + * @author Slava Pestov + * @version $Id: tuprolog-2.0.1-javadocs.patch,v 1.1 2007/01/31 07:01:33 keri 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-01-30 15:12:42.000000000 +1300 ++++ src/alice/util/jedit/JEditTextArea.java 2007-01-31 19:41:26.000000000 +1300 +@@ -1389,7 +1389,7 @@ + + /** + * Sets if the selection should be rectangular. +- * @param overwrite True if the selection should be rectangular, ++ * @param rectSelect True if the selection should be rectangular, + * false otherwise. + */ + public final void setSelectionRectangular(boolean rectSelect) +diff -ur src.orig/alice/util/jedit/KeywordMap.java src/alice/util/jedit/KeywordMap.java +--- src.orig/alice/util/jedit/KeywordMap.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/util/jedit/KeywordMap.java 2007-01-31 19:41:26.000000000 +1300 +@@ -75,7 +75,7 @@ + /** + * Adds a key-value mapping. + * @param keyword The key +- * @Param id The value ++ * @param id The value + */ + public void add(String keyword, byte id) + { +diff -ur src.orig/alice/util/jedit/TextAreaPainter.java src/alice/util/jedit/TextAreaPainter.java +--- src.orig/alice/util/jedit/TextAreaPainter.java 2007-01-30 15:12:42.000000000 +1300 ++++ src/alice/util/jedit/TextAreaPainter.java 2007-01-31 19:41:26.000000000 +1300 +@@ -75,7 +75,7 @@ + /** + * Returns the syntax styles used to paint colorized text. Entry n + * will be used to paint tokens with id = n. +- * @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 n + * will be used to paint tokens with id = n. + * @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-01-30 15:12:42.000000000 +1300 ++++ src/alice/util/jedit/TokenMarker.java 2007-01-31 19:41:26.000000000 +1300 +@@ -24,7 +24,7 @@ + * @author Slava Pestov + * @version $Id: tuprolog-2.0.1-javadocs.patch,v 1.1 2007/01/31 07:01:33 keri 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.0.1.ebuild b/dev-lang/tuprolog/tuprolog-2.0.1.ebuild new file mode 100644 index 000000000000..93b7ce89fd23 --- /dev/null +++ b/dev-lang/tuprolog/tuprolog-2.0.1.ebuild @@ -0,0 +1,46 @@ +# 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.0.1.ebuild,v 1.1 2007/01/31 07:01:33 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:8080/tuProlog/" +SRC_URI="http://www.alice.unibo.it/download/tuprolog/files/core/2p-2.0.1.zip" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~ppc ~x86" +IUSE="doc" + +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip + dev-java/ant-core" +RDEPEND=">=virtual/jdk-1.4" + +S="${WORKDIR}" + +src_unpack() { + unpack ${A} + epatch "${FILESDIR}"/${P}-java1.4.patch + epatch "${FILESDIR}"/${P}-javadocs.patch + + cd "${S}" + cp "${FILESDIR}"/build.xml "${S}" +} + +src_compile() { + eant jar $(use_doc) +} + +src_install() { + java-pkg_dojar dist/${PN}.jar + + if use doc ; then + java-pkg_dohtml -r docs/* + dodoc doc/*.pdf + fi +}