Version bump, bug #233813.

Package-Manager: portage-2.2_rc7/cvs/Linux 2.6.25-gentoo-r4 x86_64

4 files changed, 17 insertions, 125 deletions

diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog
index bf834e3045aa..ce2a80a5214a 100644
--- a/app-editors/jedit/ChangeLog
+++ b/app-editors/jedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/jedit
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.83 2008/04/10 20:25:56 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.84 2008/08/12 14:08:01 caster Exp $
+
+*jedit-4.3_pre15 (12 Aug 2008)
+
+  12 Aug 2008; Vlastimil Babka <caster@gentoo.org> -jedit-4.3_pre11.ebuild,
+  -jedit-4.3_pre12.ebuild, +jedit-4.3_pre15.ebuild:
+  Version bump, bug #233813.
 
 *jedit-4.3_pre13 (10 Apr 2008)
 
diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index 52846f3408fa..bd3cedbcd478 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX jedit-4.2-jdk-1.6.patch 805 RMD160 8e123ee2de7aa6ae7d6aaf8ee8c6b10f2257e6fa SHA1 8edc0f7b2709b5e4251150542dcb8fd2719182ea SHA256 c46101784fcfcd5def1cc9caa3319906e3ae95a3853636428cea7a1c0f8bab1d
-DIST jedit4.3pre11source.tar.bz2 1461550 RMD160 fa845acc1e298851e135b27d035027103a9824b5 SHA1 87897cd8dd7ac8a31a71a672cd778a742a5b103c SHA256 78cc5ab5215f064ae866f71bd90db4adeb1d744fd5cdcc1f1946a4c1bbdff250
-DIST jedit4.3pre12source.tar.bz2 1474075 RMD160 1803630b928cb5f0651cf3a59ad9495052ce29b0 SHA1 9e15eca30c2b5fb436594e1701e85d7fe1ecf918 SHA256 554f61a59142b95bea30b23341c6b640d006041eac848ab1b0438beba05a1b41
 DIST jedit4.3pre13source.tar.bz2 1467163 RMD160 8224cad6c746558b58eb146702ddbd3c107f0da8 SHA1 f15db6622b4b40917cc6541a35fbd70286a92796 SHA256 21959fff1042e5d3fb868c566d26d82d7f5f3d8e5793cc4acb540cd7c185808e
+DIST jedit4.3pre15source.tar.bz2 1934488 RMD160 faebb9bc575d277145e1d14f6eec2c2ea039bc3b SHA1 d5aa2e1f4df68cbb3c9738d17c2bacfab53f4e82 SHA256 e352354aa4d7b4475f0c86aa88b1aa2e796a6dac1aaed8014f99eb0fefb05995
 DIST jedit42source.tar.gz 1685253 RMD160 5f0f59a64455c4dcaf3e0e7589527a9f6989a23d SHA1 404b3e76c749d0b488c005d3af19c335c102ba60 SHA256 12a5037126b87ae00157b0201818fa97b777c824543e87a79b6064c1357c78b2
 EBUILD jedit-4.2-r2.ebuild 2157 RMD160 1f503b8808e446fdaa22e8bada143455a64962a1 SHA1 e4030f30ab7bbf334d2d882e5a5976a5aad29a7d SHA256 e578d5593c16a09564b2c0b0bb4e3d90647c1835ff4fd05bc06a77cde289f322
-EBUILD jedit-4.3_pre11.ebuild 2609 RMD160 770ef994e1413899deeab84ad212afe1d74cb58a SHA1 ac418634cf4ff37ead7a6a4e6b6cf3b2c45034bc SHA256 4156082be714c684852fceb559f0b32e4dcdb93caf20b502aaacc4a4838aa4b4
-EBUILD jedit-4.3_pre12.ebuild 2605 RMD160 20196bcf58d2fe61607b4268b8a42183d9dfb0e6 SHA1 9499eae1dbbb2f8d3800fac44eba11a64de312ee SHA256 0036a8fc23d734aa48bad4e9710f873d848f6364861cab5274b99ec7e21b826e
 EBUILD jedit-4.3_pre13.ebuild 2532 RMD160 661937c47fff08710e6f722fee2bb68439ca34a5 SHA1 7d11dc52c7d248ed829a3004138f7f5fe4076c2d SHA256 7feb7ccdab5c4429a99866deac1ed8790ee9f0f0c910bccbf280023fa8a1f083
-MISC ChangeLog 11694 RMD160 42093bc879cced3a8cf7c249aa5b22767bf5b6cf SHA1 9077c471426be2919cfc991b73936a3ca8b068da SHA256 e163d6305f2163c8b31298b61b120646a58ca36e5e37770ddd38a527ceaa5e35
+EBUILD jedit-4.3_pre15.ebuild 2528 RMD160 e6925eddd6b3f89b1967297e26d0d171e442719c SHA1 5f4f86bfbac6f82ccad9df636c4f3b524b1b5ca7 SHA256 6aefe25be28f7f4bc1ff0fedb5d64562c5c7aa9d4a33a12b028658e8458b4584
+MISC ChangeLog 11880 RMD160 2bc20fd6259fd9257a8a2afcb256208f0773397b SHA1 48b29cb50614b1fbc08bc833e8353784910372a7 SHA256 cba12e5a4bd85c23df5d27dc3ba1e95e534efc66b56ecb324d0f00974f492af6
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH/nfYcxLzpIGCsLQRAp29AJ4qRVh36/fu5w2jhkp1MRiQhvn5jACfUmul
-HCk0NVX5AihO0u70ZVom9So=
-=vWtS
------END PGP SIGNATURE-----
diff --git a/app-editors/jedit/jedit-4.3_pre11.ebuild b/app-editors/jedit/jedit-4.3_pre11.ebuild
deleted file mode 100644
index 48552aeda2c9..000000000000
--- a/app-editors/jedit/jedit-4.3_pre11.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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_pre11.ebuild,v 1.1 2007/11/17 22:50:30 betelgeuse Exp $
-
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit java-pkg-2 java-ant-2 eutils fdo-mime
-
-# TODO use versionator
-MY_PV="${PV//_/}"
-
-DESCRIPTION="Programmer's editor written in Java"
-HOMEPAGE="http://www.jedit.org"
-SRC_URI="mirror://sourceforge/${PN}/${PN}${MY_PV}source.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.5
-	=dev-java/gnu-regexp-1*"
-DEPEND=">=virtual/jdk-1.5
-	doc? (
-		=app-text/docbook-xml-dtd-4.3*
-		>=app-text/docbook-xsl-stylesheets-1.65.1
-		dev-libs/libxslt
-	)
-	=dev-java/gnu-regexp-1*"
-
-S="${WORKDIR}/jEdit"
-
-JEDIT_HOME="/usr/share/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# we need to use our own classpath
-	java-ant_rewrite-classpath build.xml
-
-	if use doc; then
-		local xsl=$(echo /usr/share/sgml/docbook/xsl-stylesheets-*)
-		xsl=${xsl// *}
-
-		local xml=$(echo /usr/share/sgml/docbook/xml-dtd-4.3*)
-		xml=${xml// *}
-
-		echo "build.directory=." > build.properties
-		echo "docbook.dtd.catalog=${xml}/docbook.cat" >> build.properties
-		echo "docbook.xsl=${xsl}" >> build.properties
-	fi
-
-	# remove bundled sources
-	rm -r gnu/* # gnu-regexp
-	# still need to do: bsh, com.microstar.xml.*, org.gjt.*
-	java-pkg_filter-compiler jikes
-}
-src_compile() {
-	# TODO could build more docs, ie userdocs target instead of generate-javadoc
-	eant build $(use_doc generate-javadoc) \
-		-Dgentoo.classpath=$(java-pkg_getjars gnu-regexp-1):$(java-config --tools)
-}
-
-src_install () {
-	dodir ${JEDIT_HOME}
-	cp -R build/${PN}.jar jars doc macros modes properties startup \
-		"${D}/usr/share/jedit"
-
-	java-pkg_regjar ${JEDIT_HOME}/${PN}.jar
-
-	java-pkg_dolauncher ${PN} --pwd ${JEDIT_HOME} --main org.gjt.sp.jedit.jEdit
-
-	use doc && java-pkg_dojavadoc build/classes/javadoc/api
-
-	make_desktop_entry ${PN} \
-		jEdit \
-		${JEDIT_HOME}/doc/${PN}.png \
-		"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"
-	elog "want to run"
-	elog ""
-	elog "\trm -r ${JEDIT_HOME}"
-	elog "Ignore this message if you are reinstalling or upgrading."
-}
diff --git a/app-editors/jedit/jedit-4.3_pre12.ebuild b/app-editors/jedit/jedit-4.3_pre15.ebuild
index c3ec35b721a8..33ef05d121fe 100644
--- a/app-editors/jedit/jedit-4.3_pre12.ebuild
+++ b/app-editors/jedit/jedit-4.3_pre15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.3_pre12.ebuild,v 1.1 2007/12/20 10:39:45 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.3_pre15.ebuild,v 1.1 2008/08/12 14:08:01 caster Exp $
 
 WANT_ANT_TASKS="ant-nodeps"
 
@@ -17,15 +17,13 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE="doc"
 
-RDEPEND=">=virtual/jre-1.5
-	=dev-java/gnu-regexp-1*"
+RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5
 	doc? (
 		=app-text/docbook-xml-dtd-4.3*
 		>=app-text/docbook-xsl-stylesheets-1.65.1
 		dev-libs/libxslt
-	)
-	=dev-java/gnu-regexp-1*"
+	)"
 
 S="${WORKDIR}/jEdit"
 
@@ -50,15 +48,13 @@ src_unpack() {
 		echo "docbook.xsl=${xsl}" >> build.properties
 	fi
 
-	# remove bundled sources
-	rm -r gnu/* # gnu-regexp
 	# still need to do: bsh, com.microstar.xml.*, org.gjt.*
 	java-pkg_filter-compiler jikes
 }
 src_compile() {
 	# TODO could build more docs, ie userdocs target instead of generate-javadoc
 	eant build $(use_doc generate-javadoc) \
-		-Dgentoo.classpath=$(java-pkg_getjars gnu-regexp-1):$(java-config --tools)
+		-Dgentoo.classpath=$(java-config --tools)
 }
 
 src_install () {
@@ -68,7 +64,7 @@ src_install () {
 
 	java-pkg_regjar ${JEDIT_HOME}/${PN}.jar
 
-	java-pkg_dolauncher ${PN} --pwd ${JEDIT_HOME} --main org.gjt.sp.jedit.jEdit
+	java-pkg_dolauncher ${PN} --main org.gjt.sp.jedit.jEdit
 
 	use doc && java-pkg_dojavadoc build/classes/javadoc/api
 
@@ -85,6 +81,7 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 	elog "The system directory for jEdit plugins is"
 	elog "${JEDIT_HOME}/jars"
+	elog "If you get plugin related errors on startup, first try updating them."
 }
 
 pkg_postrm() {