diff options
| -rw-r--r-- | app-editors/jedit/ChangeLog | 10 | ||||
| -rw-r--r-- | app-editors/jedit/files/digest-jedit-4.3_pre12 | 3 | ||||
| -rw-r--r-- | app-editors/jedit/files/digest-jedit-4.3_pre9 | 3 | ||||
| -rw-r--r-- | app-editors/jedit/files/jedit-4.2-jdk-1.6.patch | 22 | ||||
| -rw-r--r-- | app-editors/jedit/jedit-4.2-r2.ebuild | 10 | ||||
| -rw-r--r-- | app-editors/jedit/jedit-4.3_pre12.ebuild (renamed from app-editors/jedit/jedit-4.3_pre9.ebuild) | 8 |
6 files changed, 43 insertions, 13 deletions
diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog index c1e0bb93d609..ef65860f3f58 100644 --- a/app-editors/jedit/ChangeLog +++ b/app-editors/jedit/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-editors/jedit # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.80 2007/11/17 22:50:30 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.81 2007/12/20 10:39:45 caster Exp $ + +*jedit-4.3_pre12 (20 Dec 2007) + + 20 Dec 2007; Vlastimil Babka <caster@gentoo.org> + +files/jedit-4.2-jdk-1.6.patch, jedit-4.2-r2.ebuild, + -jedit-4.3_pre9.ebuild, +jedit-4.3_pre12.ebuild: + Version bump to 4.3pre12 - bug #196961. Fix building of 4.2 with jdk 1.6 - + bug #189815, patch by Yoann Pannier <gentoo-bugs@umsar.org>. Remove 4.3pre9. *jedit-4.3_pre11 (17 Nov 2007) diff --git a/app-editors/jedit/files/digest-jedit-4.3_pre12 b/app-editors/jedit/files/digest-jedit-4.3_pre12 new file mode 100644 index 000000000000..2ca6e3b1a1ee --- /dev/null +++ b/app-editors/jedit/files/digest-jedit-4.3_pre12 @@ -0,0 +1,3 @@ +MD5 cb5a91ba6b51ef1f8004ee7b1b39f51b jedit4.3pre12source.tar.bz2 1474075 +RMD160 1803630b928cb5f0651cf3a59ad9495052ce29b0 jedit4.3pre12source.tar.bz2 1474075 +SHA256 554f61a59142b95bea30b23341c6b640d006041eac848ab1b0438beba05a1b41 jedit4.3pre12source.tar.bz2 1474075 diff --git a/app-editors/jedit/files/digest-jedit-4.3_pre9 b/app-editors/jedit/files/digest-jedit-4.3_pre9 deleted file mode 100644 index bc5f3617f0c5..000000000000 --- a/app-editors/jedit/files/digest-jedit-4.3_pre9 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7219767fe93d9c38d23ed760b22df4fa jedit4.3pre9source.tar.bz2 1415361 -RMD160 7a9c4a4942edbb936de21d145c17afaf0419d205 jedit4.3pre9source.tar.bz2 1415361 -SHA256 7919bb603b1ad0e7ac4cd3e6a2486d2d702eebf444e65d5e3e8f8f868604aa4f jedit4.3pre9source.tar.bz2 1415361 diff --git a/app-editors/jedit/files/jedit-4.2-jdk-1.6.patch b/app-editors/jedit/files/jedit-4.2-jdk-1.6.patch new file mode 100644 index 000000000000..c985289ff258 --- /dev/null +++ b/app-editors/jedit/files/jedit-4.2-jdk-1.6.patch @@ -0,0 +1,22 @@ +# correct ambigous references to SplashScreen under jdk-1.6 + +--- jEdit/org/gjt/sp/jedit/GUIUtilities.java.orig 2007-08-22 11:14:15.000000000 +0200 ++++ jEdit/org/gjt/sp/jedit/GUIUtilities.java 2007-08-22 11:15:09.000000000 +0200 +@@ -1516,7 +1516,7 @@ + //{{{ showSplashScreen() method + static void showSplashScreen() + { +- splash = new SplashScreen(); ++ splash = new org.gjt.sp.jedit.gui.SplashScreen(); + } //}}} + + //{{{ advanceSplashProgress() method +@@ -1529,7 +1529,7 @@ + //}}} + + //{{{ Private members +- private static SplashScreen splash; ++ private static org.gjt.sp.jedit.gui.SplashScreen splash; + private static Hashtable icons; + private static String iconPath = "jeditresource:/org/gjt/sp/jedit/icons/"; + private static String defaultIconPath = "jeditresource:/org/gjt/sp/jedit/icons/"; diff --git a/app-editors/jedit/jedit-4.2-r2.ebuild b/app-editors/jedit/jedit-4.2-r2.ebuild index 918ce56649ec..9e5414639130 100644 --- a/app-editors/jedit/jedit-4.2-r2.ebuild +++ b/app-editors/jedit/jedit-4.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2-r2.ebuild,v 1.11 2007/11/13 06:50:26 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2-r2.ebuild,v 1.12 2007/12/20 10:39:45 caster Exp $ inherit java-pkg-2 eutils java-ant-2 @@ -16,11 +16,7 @@ SLOT="0" IUSE="doc" RDEPEND=">=virtual/jre-1.4" -# FIXME doesn't like Java 1.6 for some reason -DEPEND="|| ( - =virtual/jdk-1.5* - =virtual/jdk-1.4* - ) +DEPEND=">=virtual/jdk-1.4 doc? ( =app-text/docbook-xml-dtd-4.3* >=app-text/docbook-xsl-stylesheets-1.65.1 @@ -33,6 +29,8 @@ src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}/${P}-jdk-1.6.patch" + if use doc; then local xsl=$(echo /usr/share/sgml/docbook/xsl-stylesheets-*) xsl=${xsl// */} diff --git a/app-editors/jedit/jedit-4.3_pre9.ebuild b/app-editors/jedit/jedit-4.3_pre12.ebuild index 5858b217a91a..c3ec35b721a8 100644 --- a/app-editors/jedit/jedit-4.3_pre9.ebuild +++ b/app-editors/jedit/jedit-4.3_pre12.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.3_pre9.ebuild,v 1.5 2007/11/13 06:50:26 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.3_pre12.ebuild,v 1.1 2007/12/20 10:39:45 caster Exp $ WANT_ANT_TASKS="ant-nodeps" -inherit java-pkg-2 java-ant-2 eutils +inherit java-pkg-2 java-ant-2 eutils fdo-mime # TODO use versionator MY_PV="${PV//_/}" @@ -75,18 +75,20 @@ src_install () { make_desktop_entry ${PN} \ jEdit \ ${JEDIT_HOME}/doc/${PN}.png \ - "Application;Development;" + "Development;Utility;TextEditor" # keep the plugin directory keepdir ${JEDIT_HOME}/jars } pkg_postinst() { + fdo-mime_desktop_database_update elog "The system directory for jEdit plugins is" elog "${JEDIT_HOME}/jars" } pkg_postrm() { + fdo-mime_desktop_database_update elog "jEdit plugins installed into /usr/share/jedit/jars" elog "(after installation of jEdit itself) haven't been" elog "removed. To get rid of jEdit completely, you may" |