diff options
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/jext/ChangeLog | 9 | ||||
| -rw-r--r-- | app-editors/jext/files/jext-5.0-enum-as-keyword.patch | 173 | ||||
| -rw-r--r-- | app-editors/jext/jext-5.0-r2.ebuild | 66 |
3 files changed, 247 insertions, 1 deletions
diff --git a/app-editors/jext/ChangeLog b/app-editors/jext/ChangeLog index e8bbb613fd6a..cdd5d77461df 100644 --- a/app-editors/jext/ChangeLog +++ b/app-editors/jext/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-editors/jext # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jext/ChangeLog,v 1.23 2015/06/09 09:50:13 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jext/ChangeLog,v 1.24 2015/07/03 17:12:09 monsieurp Exp $ + +*jext-5.0-r2 (03 Jul 2015) + + 03 Jul 2015; Patrice Clement <monsieurp@gentoo.org> + +files/jext-5.0-enum-as-keyword.patch, +jext-5.0-r2.ebuild: + Add patch to get the package to compile with jdk-1.8. Update dev-java/jython + dependency to :2.7. Fix bug 552452. 09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml: Updating remote-id in metadata.xml diff --git a/app-editors/jext/files/jext-5.0-enum-as-keyword.patch b/app-editors/jext/files/jext-5.0-enum-as-keyword.patch new file mode 100644 index 000000000000..c773e571d182 --- /dev/null +++ b/app-editors/jext/files/jext-5.0-enum-as-keyword.patch @@ -0,0 +1,173 @@ +--- src/lib/org/gjt/sp/jedit/textarea/InputHandler.java.orig 2015-07-03 17:52:13.843000000 +0000 ++++ src/lib/org/gjt/sp/jedit/textarea/InputHandler.java 2015-07-03 17:52:59.746000000 +0000 +@@ -141,10 +141,10 @@ + */ + public static String getActionName(ActionListener listener) + { +- Enumeration enum = getActions(); +- while(enum.hasMoreElements()) ++ Enumeration myEnum = getActions(); ++ while(myEnum.hasMoreElements()) + { +- String name = (String)enum.nextElement(); ++ String name = (String)myEnum.nextElement(); + ActionListener _listener = getAction(name); + if(_listener == listener) + return name; +--- src/lib/org/jext/options/OptionsDialog.java.orig 2015-07-03 17:54:19.179000000 +0000 ++++ src/lib/org/jext/options/OptionsDialog.java 2015-07-03 17:54:33.377000000 +0000 +@@ -297,11 +297,11 @@ + + private void addOptionGroup(OptionGroup child, OptionGroup parent) + { +- ArrayList enum = child.getMembers(); ++ ArrayList myEnum = child.getMembers(); + +- for (int i = 0; i < enum.size(); i++) ++ for (int i = 0; i < myEnum.size(); i++) + { +- Object elem = enum.get(i); ++ Object elem = myEnum.get(i); + + if (elem instanceof OptionPane) + { +@@ -669,4 +669,4 @@ + + } + +-// End of OptionsDialog.java +\ No newline at end of file ++// End of OptionsDialog.java +--- src/lib/org/jext/misc/VirtualFolders.java.orig 2015-07-03 17:49:57.731000000 +0000 ++++ src/lib/org/jext/misc/VirtualFolders.java 2015-07-03 17:51:11.418000000 +0000 +@@ -233,10 +233,10 @@ + ret.append(crlf).append("<folderlist>"); + } + +- Enumeration enum = parent.children(); +- while (enum.hasMoreElements()) ++ Enumeration myEnum = parent.children(); ++ while (myEnum.hasMoreElements()) + { +- VirtualFolderNode child = (VirtualFolderNode) enum.nextElement(); ++ VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement(); + ret.append(toXML(child, depth + 1)); + } + +@@ -317,20 +317,20 @@ + + private void fixVisible() + { +- Enumeration enum = root.depthFirstEnumeration(); ++ Enumeration myEnum = root.depthFirstEnumeration(); + VirtualFolderNode node = null; +- while (enum.hasMoreElements()) ++ while (myEnum.hasMoreElements()) + { + +- node = (VirtualFolderNode)enum.nextElement(); ++ node = (VirtualFolderNode)myEnum.nextElement(); + TreePath path = new TreePath(node.getPath()); + tree.collapsePath(path); + } + +- enum = root.depthFirstEnumeration(); +- while (enum.hasMoreElements()) ++ myEnum = root.depthFirstEnumeration(); ++ while (myEnum.hasMoreElements()) + { +- node = (VirtualFolderNode)enum.nextElement(); ++ node = (VirtualFolderNode)myEnum.nextElement(); + if (node.shouldBeVisible()) + { + TreePath path = new TreePath(((VirtualFolderNode)node.getParent()).getPath()); +@@ -392,10 +392,10 @@ + public static boolean folderExists(VirtualFolderNode parent, String name) + { + boolean exists = false; +- Enumeration enum = parent.children(); +- while ((enum.hasMoreElements()) && !exists) ++ Enumeration myEnum = parent.children(); ++ while ((myEnum.hasMoreElements()) && !exists) + { +- VirtualFolderNode child = (VirtualFolderNode) enum.nextElement(); ++ VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement(); + exists = child.toString().equals(name); + } + return exists; +@@ -526,10 +526,10 @@ + } else { + if (fromMenu) + { +- Enumeration enum = node.children(); +- while (enum.hasMoreElements()) ++ Enumeration myEnum = node.children(); ++ while (myEnum.hasMoreElements()) + { +- VirtualFolderNode child = (VirtualFolderNode) enum.nextElement(); ++ VirtualFolderNode child = (VirtualFolderNode) myEnum.nextElement(); + openNode(child, fromMenu); + } + } +--- src/lib/com/microstar/xml/XmlParser.java.orig 2015-07-03 17:41:23.209000000 +0000 ++++ src/lib/com/microstar/xml/XmlParser.java 2015-07-03 17:46:30.296000000 +0000 +@@ -1346,7 +1346,7 @@ + { + String name; + int type; +- String enum = null; ++ String myEnum = null; + + // Read the attribute name. + name = readNmtoken(true); +@@ -1358,12 +1358,12 @@ + // Get the string of enumerated values + // if necessary. + if (type == ATTRIBUTE_ENUMERATED || type == ATTRIBUTE_NOTATION) { +- enum = dataBufferToString(); ++ myEnum = dataBufferToString(); + } + + // Read the default value. + requireWhitespace(); +- parseDefault(elementName, name, type, enum); ++ parseDefault(elementName, name, type, myEnum); + } + + +@@ -1451,7 +1451,7 @@ + * Parse the default value for an attribute. + * [62] Default ::= '#REQUIRED' | '#IMPLIED' | ((%'#FIXED' S)? %AttValue + */ +- void parseDefault (String elementName, String name, int type, String enum) ++ void parseDefault (String elementName, String name, int type, String myEnum) + throws java.lang.Exception + { + int valueType = ATTRIBUTE_DEFAULT_SPECIFIED; +@@ -1477,7 +1477,7 @@ + value = readLiteral(LIT_CHAR_REF); + context = CONTEXT_DTD; + } +- setAttribute(elementName, name, type, enum, value, valueType); ++ setAttribute(elementName, name, type, myEnum, value, valueType); + } + + +@@ -2714,7 +2714,7 @@ + * - int value type + * *TODO: do something with attribute types. + */ +- void setAttribute (String elName, String name, int type, String enumeration, ++ void setAttribute (String elName, String name, int type, String myEnum, + String value, int valueType) + throws java.lang.Exception + { +@@ -2736,7 +2736,7 @@ + attribute[0] = new Integer(type); + attribute[1] = value; + attribute[2] = new Integer(valueType); +- attribute[3] = enumeration; ++ attribute[3] = myEnum; + attribute[4] = null; + attlist.put(name.intern(), attribute); + diff --git a/app-editors/jext/jext-5.0-r2.ebuild b/app-editors/jext/jext-5.0-r2.ebuild new file mode 100644 index 000000000000..67881f6809a5 --- /dev/null +++ b/app-editors/jext/jext-5.0-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/jext/jext-5.0-r2.ebuild,v 1.1 2015/07/03 17:12:09 monsieurp Exp $ + +EAPI=5 + +JAVA_PKG_IUSE="doc" +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="A cool and fully featured editor in Java" +HOMEPAGE="http://www.jext.org/" +MY_PV="${PV/_}" +SRC_URI="mirror://sourceforge/${PN}/${PN}-sources-${MY_PV}.tar.gz" +LICENSE="|| ( GPL-2 JPython )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CDEPEND="dev-java/jython:2.7 + dev-java/jgoodies-looks:1.2 + dev-java/gnu-regexp:1" +DEPEND=">=virtual/jdk-1.6 + ${CDEPEND}" +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +S="${WORKDIR}/${PN}-src-${MY_PV}" + +# Necessary otherwise it chokes on compiling with jdk-1.8 +# due to unmappable characters. +JAVA_ANT_ENCODING="ISO-8859-1" + +java_prepare() { + # bundles some com.microstar.xml who knows what's that + # also com.jgoodies.uif_lite which is apparently some jgoodies-looks + # example code which we don't package and there is probably no point + rm -v "${S}"/extplugins/Admin/*.jar || die + rm -rf src/lib/gnu || die + + # Fix "enum as a keyword" error. + epatch "${FILESDIR}"/"${P}"-enum-as-keyword.patch +} + +src_compile() { + cd "${S}/src" || die + eant jar $(use_doc javadocs) \ + -Dclasspath="$(java-pkg_getjars jython-2.7,jgoodies-looks-1.2,gnu-regexp-1)" +} + +src_install () { + java-pkg_newjar lib/${P}.jar + java-pkg_dojar lib/dawn*.jar + + java-pkg_dolauncher ${PN} \ + --main org.jext.Jext \ + --java_args '-Dpython.path=$(java-config --classpath=jython-2.7)' \ + -pre "${FILESDIR}/${PN}-pre" + + if use doc; then + java-pkg_dohtml -r docs/api + fi +} + +pkg_postinst() { + elog "Plugins are currently not built/installed. Patches welcome." +} |