7 files changed, 27 insertions, 194 deletions
diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog
index 474d84a70868..9289eb4046a2 100644
--- a/app-editors/jedit/ChangeLog
+++ b/app-editors/jedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/jedit
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.55 2005/06/09 10:18:03 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.56 2005/07/11 11:23:27 axxo Exp $
+
+  11 Jul 2005; Thomas Matthijs <axxo@gentoo.org> -jedit-4.1.ebuild,
+  -jedit-4.1-r1.ebuild, jedit-4.2.ebuild, jedit-4.2-r1.ebuild:
+  fix doc building
 
   09 Jun 2005; Markus Rothe <corsair@gentoo.org> jedit-4.2-r1.ebuild:
   Stable on ppc64
diff --git a/app-editors/jedit/files/digest-jedit-4.1 b/app-editors/jedit/files/digest-jedit-4.1
deleted file mode 100644
index a7e7ba5f875d..000000000000
--- a/app-editors/jedit/files/digest-jedit-4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93242245baffa3fba02eaa68ec56fea8 jedit41source.tar.gz 1334562
diff --git a/app-editors/jedit/files/digest-jedit-4.1-r1 b/app-editors/jedit/files/digest-jedit-4.1-r1
deleted file mode 100644
index a7e7ba5f875d..000000000000
--- a/app-editors/jedit/files/digest-jedit-4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93242245baffa3fba02eaa68ec56fea8 jedit41source.tar.gz 1334562
diff --git a/app-editors/jedit/jedit-4.1-r1.ebuild b/app-editors/jedit/jedit-4.1-r1.ebuild
deleted file mode 100644
index 137d2be3baf4..000000000000
--- a/app-editors/jedit/jedit-4.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.1-r1.ebuild,v 1.4 2005/01/01 13:28:30 eradicator Exp $
-
-MY_PV="41"
-
-inherit eutils
-
-DESCRIPTION="Programmer's editor written in Java"
-HOMEPAGE="http://www.jedit.org"
-SRC_URI="mirror://sourceforge/jedit/jedit${MY_PV}source.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc ~amd64"
-SLOT="0"
-IUSE="jikes doc"
-
-RDEPEND=">=virtual/jdk-1.3"
-DEPEND="${RDEPEND}
-	>=dev-java/ant-1.4.1
-	jikes? ( >=dev-java/jikes-1.17 )
-	doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt )"
-
-S="${WORKDIR}/jEdit"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use jikes && epatch ${FILESDIR}/${PN}-${PV}-jikes-fix.patch
-}
-
-src_compile() {
-	local antflags="dist"
-
-	if [ -z "$JAVA_HOME" ]; then
-		einfo
-		einfo "\$JAVA_HOME not set!"
-		einfo "Please use java-config to configure your JVM and try again."
-		einfo
-		die "\$JAVA_HOME not set."
-	fi
-
-	if use jikes ; then
-		einfo "Please ignore the following compiler warnings."
-		einfo "Jikes is just too pedantic..."
-		antflags="${antflags} -Dbuild.compiler=jikes"
-	fi
-
-	styleversion=$(best_version app-text/docbook-xsl-stylesheets)
-	docbook="/usr/share/sgml/docbook/${styleversion/*docbook-}"
-
-	use doc && antflags="${antflags} javadoc docs-html-xsltproc -Ddocbook.xsl=${docbook}"
-
-	ant ${antflags} || die "compile problem docs-html-xsltproc"
-}
-
-src_install () {
-	dodir /usr/share/jedit
-	dodir /usr/bin
-
-	cp -R jedit.jar jars doc macros modes properties startup ${D}/usr/share/jedit
-	cd ${D}/usr/share/jedit
-	chmod -R u+rw,ug-s,go+u,go-w \
-		jedit.jar jars doc macros modes properties startup
-
-	cat >${D}/usr/share/jedit/jedit.sh <<-EOF
-		#!/bin/bash
-
-		java -jar /usr/share/jedit/jedit.jar \$@
-	EOF
-	chmod 755 ${D}/usr/share/jedit/jedit.sh
-
-	ln -s ../share/jedit/jedit.sh ${D}/usr/bin/jedit
-
-	keepdir /usr/share/jedit/jars
-}
-
-pkg_postinst() {
-	einfo "The system directory for jEdit plugins is"
-	einfo "/usr/share/jedit/jars"
-}
-
-pkg_postrm() {
-	einfo "jEdit plugins installed into /usr/share/jedit/jars"
-	einfo "(after installation of jEdit itself) haven't been"
-	einfo "removed. To get rid of jEdit completely, you may"
-	einfo "want to run"
-	einfo ""
-	einfo "\trm -r /usr/share/jedit"
-}
diff --git a/app-editors/jedit/jedit-4.1.ebuild b/app-editors/jedit/jedit-4.1.ebuild
deleted file mode 100644
index 962a13e97919..000000000000
--- a/app-editors/jedit/jedit-4.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.1.ebuild,v 1.13 2005/01/01 13:28:30 eradicator Exp $
-
-MY_PV="41"
-
-DESCRIPTION="Programmer's editor written in Java"
-HOMEPAGE="http://www.jedit.org"
-SRC_URI="mirror://sourceforge/jedit/jedit${MY_PV}source.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc ~amd64"
-SLOT="0"
-IUSE="jikes"
-
-RDEPEND=">=virtual/jdk-1.3"
-DEPEND="${RDEPEND}
-	>=dev-java/ant-1.4.1
-	jikes? ( >=dev-java/jikes-1.17 )"
-
-S="${WORKDIR}/jEdit"
-
-src_compile() {
-	local antflags
-
-	if [ -z "$JAVA_HOME" ]; then
-		einfo
-		einfo "\$JAVA_HOME not set!"
-		einfo "Please use java-config to configure your JVM and try again."
-		einfo
-		die "\$JAVA_HOME not set."
-	fi
-
-	antflags=""
-	if use jikes ; then
-		einfo "Please ignore the following compiler warnings."
-		einfo "Jikes is just too pedantic..."
-		antflags="${antflags} -Dbuild.compiler=jikes"
-	fi
-
-	ant ${antflags} || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/share/jedit
-	dodir /usr/bin
-
-	cp -R jedit.jar jars doc macros modes properties startup ${D}/usr/share/jedit
-	cd ${D}/usr/share/jedit
-	chmod -R u+rw,ug-s,go+u,go-w \
-		jedit.jar jars doc macros modes properties startup
-
-	cat >${D}/usr/share/jedit/jedit.sh <<-EOF
-		#!/bin/bash
-
-		java -jar /usr/share/jedit/jedit.jar \$@
-	EOF
-	chmod 755 ${D}/usr/share/jedit/jedit.sh
-
-	ln -s ../share/jedit/jedit.sh ${D}/usr/bin/jedit
-
-	keepdir /usr/share/jedit/jars
-}
-
-pkg_postinst() {
-	einfo "The system directory for jEdit plugins is"
-	einfo "/usr/share/jedit/jars"
-}
-
-pkg_postrm() {
-	einfo "jEdit plugins installed into /usr/share/jedit/jars"
-	einfo "(after installation of jEdit itself) haven't been"
-	einfo "removed. To get rid of jEdit completely, you may"
-	einfo "want to run"
-	einfo ""
-	einfo "\trm -r /usr/share/jedit"
-}
diff --git a/app-editors/jedit/jedit-4.2-r1.ebuild b/app-editors/jedit/jedit-4.2-r1.ebuild
index f51934026595..efb9bade0bc8 100644
--- a/app-editors/jedit/jedit-4.2-r1.ebuild
+++ b/app-editors/jedit/jedit-4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2-r1.ebuild,v 1.5 2005/06/09 10:18:03 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2-r1.ebuild,v 1.6 2005/07/11 11:23:27 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -11,14 +11,14 @@ DESCRIPTION="Programmer's editor written in Java"
 HOMEPAGE="http://www.jedit.org"
 SRC_URI="mirror://sourceforge/jedit/jedit${MY_PV}source.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="doc jikes"
 
 RDEPEND=">=virtual/jre-1.4"
 DEPEND=">=virtual/jdk-1.4
 	doc? (
-		>=app-text/docbook-xml-dtd-4.3
+		=app-text/docbook-xml-dtd-4.3*
 		>=app-text/docbook-xsl-stylesheets-1.65.1
 		dev-libs/libxslt
 	)
@@ -31,20 +31,16 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	local xsl=$(best_version docbook-xsl-stylesheets);
-	xml=${xml/docbook-};
-	xml=${xml/*\/}
+	if use doc; then
+		local xsl=$(echo /usr/share/sgml/docbook/xsl-stylesheets-*)
+		xsl=${xsl// *}
 
-	local xml=$(best_version docbook-xml-dtd)
-	xsl=${xsl/docbook-}
-	xsl=${xsl/*\/}
+		local xml=$(echo /usr/share/sgml/docbook/xml-dtd-4.3*)
+		xml=${xml// *}
 
-	if use doc; then
 		echo "build.directory=." > build.properties
-		echo "docbook.dtd.catalog=/usr/share/sgml/docbook/${xml}/docbook.cat" \
-			 >> build.properties
-		echo "docbook.xsl=/usr/share/sgml/docbook/${xsl}" \
-			 >> build.properties
+		echo "docbook.dtd.catalog=${xml}/docbook.cat" >> build.properties
+		echo "docbook.xsl=${xsl}" >> build.properties
 	fi
 }
 src_compile() {
@@ -59,11 +55,11 @@ src_install () {
 	dodir /usr/bin
 
 	insinto /usr/share/jedit
-	doins -r jedit.jar jars doc modes properties startup
+	doins -r jedit.jar jars doc modes properties startup macros
 	keepdir /usr/share/jedit/jars
 
 	echo "#!/bin/bash" > ${PN}
-	echo "\$(java-config -J) -jar /usr/share/jedit/jedit.jar \$@" >> ${PN}
+	echo "java -jar /usr/share/jedit/jedit.jar \$@" >> ${PN}
 	dobin ${PN}
 
 	insinto /usr/share/icons/hicolor/128x128/apps
diff --git a/app-editors/jedit/jedit-4.2.ebuild b/app-editors/jedit/jedit-4.2.ebuild
index ee7793961696..1c9edf46c5ea 100644
--- a/app-editors/jedit/jedit-4.2.ebuild
+++ b/app-editors/jedit/jedit-4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2.ebuild,v 1.11 2005/04/18 16:49:55 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2.ebuild,v 1.12 2005/07/11 11:23:27 axxo Exp $
 
 inherit java-utils
 
@@ -18,7 +18,7 @@ IUSE="jikes doc gnome kde"
 RDEPEND=">=virtual/jdk-1.4"
 DEPEND="${RDEPEND}
 	doc? (
-		>=app-text/docbook-xml-dtd-4.3
+		=app-text/docbook-xml-dtd-4.3*
 		>=app-text/docbook-xsl-stylesheets-1.65.1
 		dev-libs/libxslt
 	)
@@ -30,17 +30,17 @@ S="${WORKDIR}/jEdit"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	local xsl=$(best_version docbook-xsl-stylesheets);
-	xml=${xml/docbook-};
-	xml=${xml/*\/}
-	local xml=$(best_version docbook-xml-dtd)
-	xsl=${xsl/docbook-}
-	xsl=${xsl/*\/}
 
 	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=/usr/share/sgml/docbook/${xml}/docbook.cat" >> build.properties
-		echo "docbook.xsl=/usr/share/sgml/docbook/${xsl}" >> build.properties
+		echo "docbook.dtd.catalog=${xml}/docbook.cat" >> build.properties
+		echo "docbook.xsl=${xsl}" >> build.properties
 	fi
 }
 src_compile() {