From 13d1b4b7703d431263b08e542fccbb8afa84e43b Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Sun, 21 Jan 2007 22:31:51 +0000 Subject: [PATCH] Fix deprecated code and javadoc warnings. Package-Manager: portage-2.1.2-r1 --- dev-lang/tuprolog/ChangeLog | 8 +- dev-lang/tuprolog/Manifest | 24 ++- .../tuprolog/files/tuprolog-2.0-java1.4.patch | 164 ++++++++++++++ .../files/tuprolog-2.0-javadocs.patch | 203 ++++++++++++++++++ dev-lang/tuprolog/tuprolog-2.0.ebuild | 11 +- 5 files changed, 396 insertions(+), 14 deletions(-) create mode 100644 dev-lang/tuprolog/files/tuprolog-2.0-java1.4.patch create mode 100644 dev-lang/tuprolog/files/tuprolog-2.0-javadocs.patch diff --git a/dev-lang/tuprolog/ChangeLog b/dev-lang/tuprolog/ChangeLog index d36d92ca9672..74d540f03d1e 100644 --- a/dev-lang/tuprolog/ChangeLog +++ b/dev-lang/tuprolog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/tuprolog -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/ChangeLog,v 1.7 2006/10/31 08:06:59 keri Exp $ +# 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 $ + + 21 Jan 2007; keri +files/tuprolog-2.0-java1.4.patch, + +files/tuprolog-2.0-javadocs.patch, tuprolog-2.0.ebuild: + Fix deprecated code and javadoc warnings. *tuprolog-2.0 (31 Oct 2006) diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest index e806bca83c7d..3f2901ad5b9a 100644 --- a/dev-lang/tuprolog/Manifest +++ b/dev-lang/tuprolog/Manifest @@ -10,20 +10,28 @@ AUX tuprolog-1.3.0-javadocs.patch 4896 RMD160 d8cabeebc2252f158f12870b04d36a49eb MD5 b36f72b2bf64237431c68eac8f556b09 files/tuprolog-1.3.0-javadocs.patch 4896 RMD160 d8cabeebc2252f158f12870b04d36a49ebca7b18 files/tuprolog-1.3.0-javadocs.patch 4896 SHA256 dd3fd3ed7576ab07a303faa8028490f398962d6a183c44d4c73f068e84625e5e files/tuprolog-1.3.0-javadocs.patch 4896 +AUX tuprolog-2.0-java1.4.patch 6003 RMD160 021243c50db680324065fe01d0983f84b5ab85e2 SHA1 50d9cc4fc408b392ccf40ee2ba02ced59502fbce SHA256 7aa8e94c87e1afedde9ceebcc10eb356cc01bb35b0e213769b76a9c225330d57 +MD5 bb08146ae0efb0c3c9b04e56c9d0d38f files/tuprolog-2.0-java1.4.patch 6003 +RMD160 021243c50db680324065fe01d0983f84b5ab85e2 files/tuprolog-2.0-java1.4.patch 6003 +SHA256 7aa8e94c87e1afedde9ceebcc10eb356cc01bb35b0e213769b76a9c225330d57 files/tuprolog-2.0-java1.4.patch 6003 +AUX tuprolog-2.0-javadocs.patch 7433 RMD160 a4f443a6a9ea067dde247653b1164dfabc4a1648 SHA1 4ffea2c6c5e76f8b180ca83cfe4b791ccd796ffb SHA256 ad826c24df0a0ebd2ad9e6907d69088590d2d65a5079ae0014054a3513d3ea35 +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 DIST 2p-1.3.0.zip 2917856 RMD160 17c28db76873c4855df06992ffcc41e08d2d08c1 SHA1 4ad1500487762367a54981484d36579ce72af768 SHA256 c6fc6b1fadef7d22d24a7e454ebed4e67851e3960524a8730bbcbdea5216ceec 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.ebuild 927 RMD160 96242815b764ea3ae59806294eb5858d1a79d310 SHA1 d4c787f4c8a13eab9ba566c0854cfb8e19427d70 SHA256 367895fd14cd4b01d9b4ede3eda62789cc5029e0f43121296bf696b9f0205bea -MD5 a93b663f3e6db6a840076aa8d7e5917e tuprolog-2.0.ebuild 927 -RMD160 96242815b764ea3ae59806294eb5858d1a79d310 tuprolog-2.0.ebuild 927 -SHA256 367895fd14cd4b01d9b4ede3eda62789cc5029e0f43121296bf696b9f0205bea tuprolog-2.0.ebuild 927 -MISC ChangeLog 984 RMD160 763d793489713cdbb0f19438bf69ac53921f8931 SHA1 161a94df99095116ad3879a0b89e3a59582a4ea2 SHA256 c7c15d8eb9729a8b0afdf9b470b0892f65dcfc304305f0609bdf222c59a10e75 -MD5 ed61027b78db303ec96337540a118ac3 ChangeLog 984 -RMD160 763d793489713cdbb0f19438bf69ac53921f8931 ChangeLog 984 -SHA256 c7c15d8eb9729a8b0afdf9b470b0892f65dcfc304305f0609bdf222c59a10e75 ChangeLog 984 +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 metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159 diff --git a/dev-lang/tuprolog/files/tuprolog-2.0-java1.4.patch b/dev-lang/tuprolog/files/tuprolog-2.0-java1.4.patch new file mode 100644 index 000000000000..8bfb717e89bd --- /dev/null +++ b/dev-lang/tuprolog/files/tuprolog-2.0-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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/tuprologx/ide/AWTFrameLauncher.java 2007-01-22 09:53:52.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/tuprologx/ide/Applet.java 2007-01-22 09:53:52.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/tuprologx/ide/DotNetIOManager.java 2007-01-22 09:53:52.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/tuprologx/ide/GUILauncher.java 2007-01-22 09:53:52.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/util/jedit/JEditTextArea.java 2007-01-22 10:59:07.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/util/jedit/SyntaxStyle.java 2007-01-22 11:03:42.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/util/jedit/TextAreaPainter.java 2007-01-22 10:42:10.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/util/thinlet/Thinlet.java 2007-01-22 09:55:25.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-javadocs.patch b/dev-lang/tuprolog/files/tuprolog-2.0-javadocs.patch new file mode 100644 index 000000000000..e89692feaaac --- /dev/null +++ b/dev-lang/tuprolog/files/tuprolog-2.0-javadocs.patch @@ -0,0 +1,203 @@ +diff -ur src.orig/alice/tuprolog/BuiltIn.java src/alice/tuprolog/BuiltIn.java +--- src.orig/alice/tuprolog/BuiltIn.java 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/tuprolog/BuiltIn.java 2007-01-22 11:07:57.000000000 +1300 +@@ -88,7 +88,6 @@ + + /** + * usata per la retract in basicLibrary +- * @return + */ + public boolean $restore_db_0() { + theoryManager.transRestore(engineManager.restoreLastTheoryStatus()); +diff -ur src.orig/alice/tuprolog/ChoicePointStore.java src/alice/tuprolog/ChoicePointStore.java +--- src.orig/alice/tuprolog/ChoicePointStore.java 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/tuprolog/ChoicePointStore.java 2007-01-22 11:07:58.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/tuprolog/ClauseStore.java 2007-01-22 11:07:58.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/tuprolog/EngineManager.java 2007-01-22 11:07:58.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/tuprolog/PrimitiveManager.java 2007-01-22 11:07:58.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/tuprolog/lib/BasicLibrary.java 2007-01-22 11:11:44.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. + */ +@@ -173,16 +173,16 @@ + return true; + } + +- public boolean warning_0() { +- getEngine().setWarning(true); +- return true; +- } +- +- public boolean nowarning_0() { +- getEngine().setWarning(false); +- return true; +- } +- ++ public boolean warning_0() { ++ getEngine().setWarning(true); ++ return true; ++ } ++ ++ public boolean nowarning_0() { ++ getEngine().setWarning(false); ++ return true; ++ } ++ + // + // term type inspection + // +diff -ur src.orig/alice/tuprolog/lib/JavaLibrary.java src/alice/tuprolog/lib/JavaLibrary.java +--- src.orig/alice/tuprolog/lib/JavaLibrary.java 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/tuprolog/lib/JavaLibrary.java 2007-01-22 11:07:58.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/util/jedit/InputHandler.java 2007-01-22 11:13:33.000000000 +1300 +@@ -24,7 +24,7 @@ + * + * @author Slava Pestov + * @version $Id: tuprolog-2.0-javadocs.patch,v 1.1 2007/01/21 22:31:51 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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/util/jedit/JEditTextArea.java 2007-01-22 11:14:18.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/util/jedit/KeywordMap.java 2007-01-22 11:14:52.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/util/jedit/TextAreaPainter.java 2007-01-22 11:17:22.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 2006-10-30 12:45:16.000000000 +1300 ++++ src/alice/util/jedit/TokenMarker.java 2007-01-22 11:17:55.000000000 +1300 +@@ -24,7 +24,7 @@ + * @author Slava Pestov + * @version $Id: tuprolog-2.0-javadocs.patch,v 1.1 2007/01/21 22:31:51 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.ebuild b/dev-lang/tuprolog/tuprolog-2.0.ebuild index 470095e18adb..ba5c534aa53d 100644 --- a/dev-lang/tuprolog/tuprolog-2.0.ebuild +++ b/dev-lang/tuprolog/tuprolog-2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.ebuild,v 1.1 2006/10/31 08:06:59 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/tuprolog-2.0.ebuild,v 1.2 2007/01/21 22:31:51 keri Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -16,15 +16,18 @@ SLOT="0" KEYWORDS="~ppc ~x86" IUSE="doc" -DEPEND=">=virtual/jdk-1.3 +DEPEND=">=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core" -RDEPEND=">=virtual/jdk-1.3" +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}" } -- 2.26.2