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.

Package-Manager: portage-2.1.4_rc10

7 files changed, 63 insertions, 39 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/Manifest b/app-editors/jedit/Manifest
index 00c78e6b4243..43d7e66bfeea 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,25 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX jedit-4.2-jdk-1.6.patch 805 RMD160 8e123ee2de7aa6ae7d6aaf8ee8c6b10f2257e6fa SHA1 8edc0f7b2709b5e4251150542dcb8fd2719182ea SHA256 c46101784fcfcd5def1cc9caa3319906e3ae95a3853636428cea7a1c0f8bab1d
+MD5 b9695e27aa34d9ae4a6bb69e3a9191b4 files/jedit-4.2-jdk-1.6.patch 805
+RMD160 8e123ee2de7aa6ae7d6aaf8ee8c6b10f2257e6fa files/jedit-4.2-jdk-1.6.patch 805
+SHA256 c46101784fcfcd5def1cc9caa3319906e3ae95a3853636428cea7a1c0f8bab1d files/jedit-4.2-jdk-1.6.patch 805
 DIST jedit4.3pre11source.tar.bz2 1461550 RMD160 fa845acc1e298851e135b27d035027103a9824b5 SHA1 87897cd8dd7ac8a31a71a672cd778a742a5b103c SHA256 78cc5ab5215f064ae866f71bd90db4adeb1d744fd5cdcc1f1946a4c1bbdff250
-DIST jedit4.3pre9source.tar.bz2 1415361 RMD160 7a9c4a4942edbb936de21d145c17afaf0419d205 SHA1 d74add2a25bfe6bb115b660c40b653f414433529 SHA256 7919bb603b1ad0e7ac4cd3e6a2486d2d702eebf444e65d5e3e8f8f868604aa4f
+DIST jedit4.3pre12source.tar.bz2 1474075 RMD160 1803630b928cb5f0651cf3a59ad9495052ce29b0 SHA1 9e15eca30c2b5fb436594e1701e85d7fe1ecf918 SHA256 554f61a59142b95bea30b23341c6b640d006041eac848ab1b0438beba05a1b41
 DIST jedit42source.tar.gz 1685253 RMD160 5f0f59a64455c4dcaf3e0e7589527a9f6989a23d SHA1 404b3e76c749d0b488c005d3af19c335c102ba60 SHA256 12a5037126b87ae00157b0201818fa97b777c824543e87a79b6064c1357c78b2
-EBUILD jedit-4.2-r2.ebuild 2154 RMD160 265692eab451b08ed5a52739a96331820fdeb575 SHA1 d1fe408dbec56a6b89666e76a625b7c2684fe180 SHA256 5226b55a0ffd4535dc4a23fdbfbb2a00f16690901eac91503aa6fc9a06efca08
-MD5 71a8095e3e7fcfe4900401ef46bd6689 jedit-4.2-r2.ebuild 2154
-RMD160 265692eab451b08ed5a52739a96331820fdeb575 jedit-4.2-r2.ebuild 2154
-SHA256 5226b55a0ffd4535dc4a23fdbfbb2a00f16690901eac91503aa6fc9a06efca08 jedit-4.2-r2.ebuild 2154
+EBUILD jedit-4.2-r2.ebuild 2121 RMD160 f86a14f9394055a04712f544fb9df13f3b8c46cc SHA1 df5e51fcc81df251afdc385f4db3cc486879b227 SHA256 97281533b6863db083a118b7cfdd954a07ed4a590ae2b9458c95f38d095cb5f8
+MD5 562b0a49a17a452c1dfabb11233a2b35 jedit-4.2-r2.ebuild 2121
+RMD160 f86a14f9394055a04712f544fb9df13f3b8c46cc jedit-4.2-r2.ebuild 2121
+SHA256 97281533b6863db083a118b7cfdd954a07ed4a590ae2b9458c95f38d095cb5f8 jedit-4.2-r2.ebuild 2121
 EBUILD jedit-4.3_pre11.ebuild 2609 RMD160 770ef994e1413899deeab84ad212afe1d74cb58a SHA1 ac418634cf4ff37ead7a6a4e6b6cf3b2c45034bc SHA256 4156082be714c684852fceb559f0b32e4dcdb93caf20b502aaacc4a4838aa4b4
 MD5 595365256aa93d95baab518f5409fdb7 jedit-4.3_pre11.ebuild 2609
 RMD160 770ef994e1413899deeab84ad212afe1d74cb58a jedit-4.3_pre11.ebuild 2609
 SHA256 4156082be714c684852fceb559f0b32e4dcdb93caf20b502aaacc4a4838aa4b4 jedit-4.3_pre11.ebuild 2609
-EBUILD jedit-4.3_pre9.ebuild 2520 RMD160 0f5912e625679269ded466715274a5cb1b63b615 SHA1 406e73201a3be6170b7eb44ec1d453bcd00f493e SHA256 2b288d7ac908a3ea2e678669d162ee4dd11a703a615182fc42bc30175de87b38
-MD5 fe2aaa12c50d6bf193405b6da0c69024 jedit-4.3_pre9.ebuild 2520
-RMD160 0f5912e625679269ded466715274a5cb1b63b615 jedit-4.3_pre9.ebuild 2520
-SHA256 2b288d7ac908a3ea2e678669d162ee4dd11a703a615182fc42bc30175de87b38 jedit-4.3_pre9.ebuild 2520
-MISC ChangeLog 11069 RMD160 6f70448b0a7086faa1cc2e5131bb4f4824e52edf SHA1 5f915067dd463c850992916293130384b900547e SHA256 22bbe2cf9d1181c32bbf846a3fb2890a6b5b9b28463e30fc582db0a7595abd9f
-MD5 63c9a8a94899326683c5c3a65c76a148 ChangeLog 11069
-RMD160 6f70448b0a7086faa1cc2e5131bb4f4824e52edf ChangeLog 11069
-SHA256 22bbe2cf9d1181c32bbf846a3fb2890a6b5b9b28463e30fc582db0a7595abd9f ChangeLog 11069
+EBUILD jedit-4.3_pre12.ebuild 2605 RMD160 20196bcf58d2fe61607b4268b8a42183d9dfb0e6 SHA1 9499eae1dbbb2f8d3800fac44eba11a64de312ee SHA256 0036a8fc23d734aa48bad4e9710f873d848f6364861cab5274b99ec7e21b826e
+MD5 ab034bbefb9c60f6c0b5251496934b5d jedit-4.3_pre12.ebuild 2605
+RMD160 20196bcf58d2fe61607b4268b8a42183d9dfb0e6 jedit-4.3_pre12.ebuild 2605
+SHA256 0036a8fc23d734aa48bad4e9710f873d848f6364861cab5274b99ec7e21b826e jedit-4.3_pre12.ebuild 2605
+MISC ChangeLog 11411 RMD160 72c4fc080422984c6bb61d6696a2c1d72cf09251 SHA1 76f8d18e42144caebcd8017c6ed26d61eb8c1f63 SHA256 866b44c3af22bd5145f36d12e51944de3069b66b58f402aaa6bc5a9e23334a8b
+MD5 e0a64b5ffac9c8b991021dcb059e7e04 ChangeLog 11411
+RMD160 72c4fc080422984c6bb61d6696a2c1d72cf09251 ChangeLog 11411
+SHA256 866b44c3af22bd5145f36d12e51944de3069b66b58f402aaa6bc5a9e23334a8b ChangeLog 11411
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -30,13 +31,6 @@ SHA256 2c5796e0ee266ad619dc72a404afb20c3c8e03ab9abc47aabd74fc90b9251768 files/di
 MD5 69a85299d94bac7389d73ea85ae4fd2c files/digest-jedit-4.3_pre11 265
 RMD160 7c2bf6c7c3f7db2301a2168a2c2bfd851fbc21a9 files/digest-jedit-4.3_pre11 265
 SHA256 0b75aff3707e598ec4f38e36a904ad07f5769b20ad5cf1e717619c697bba016f files/digest-jedit-4.3_pre11 265
-MD5 376e97cff8e6a1f439cb668b43c771b2 files/digest-jedit-4.3_pre9 262
-RMD160 38a5f0ee46cc65a5b03f4093029772e87fd61f56 files/digest-jedit-4.3_pre9 262
-SHA256 d9b0ffa53301dc60f77e06f1d4329e5756f8b229076800d90d0385f7430b795f files/digest-jedit-4.3_pre9 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHP3AjcxLzpIGCsLQRAoAzAJ4w/kUVTXpYlHV2DN64z7psc4cyOgCeI+h9
-MEjnd+Q7bRoFNuRHU8pilKA=
-=t2LU
------END PGP SIGNATURE-----
+MD5 36ada8044483025894916fb7b4dd8b27 files/digest-jedit-4.3_pre12 265
+RMD160 fba6ed0b7b40ce5e73f7d925d791a8741f4c1ccd files/digest-jedit-4.3_pre12 265
+SHA256 ce7adb50f9126a57818616fe3606fbdb6624ea5ca0f292a4d232eab7c4c65c64 files/digest-jedit-4.3_pre12 265
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"