don't = depend on docbook, and use evilness to find where the stylesheets are located

diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog
index 53bf3645e2470ebc179ee77a0d6d56b34652f3f0..0bd33ebd700e6537307284adf4c465907f50be46 100644 (file)
--- a/app-editors/jedit/ChangeLog
+++ b/app-editors/jedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/jedit
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.45 2004/10/31 20:27:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.46 2004/11/14 16:04:14 axxo Exp $
+
+  14 Nov 2004; Thomas Matthijs <axxo@gentoo.org> jedit-4.2.ebuild:
+  don't = depend on docbook, and use evilness to find where the stylesheets
+  are located
 
   31 Oct 2004; Jason Wever <weeve@gentoo.org> jedit-4.2.ebuild:
   Stable on sparc.

diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index dd6cf2215a62eee0cb4b234027a689ec35c65eac..14edc229209572510426e43eb58cfd770b1e966c 100644 (file)
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,9 +1,19 @@
-MD5 89b424ecfd4d8633fe455f707e343478 ChangeLog 6716
-MD5 4364404349f030ebafdb89842f84d0bc jedit-4.1.ebuild 1861
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 7a28543cd4823bb43a026577f826f959 jedit-4.1-r1.ebuild 2270
+MD5 b9935823058d50ad980db157b83508d6 jedit-4.2.ebuild 2323
+MD5 4364404349f030ebafdb89842f84d0bc jedit-4.1.ebuild 1861
+MD5 18c9e57640590bab00b823de48b11de5 ChangeLog 6873
 MD5 0c1bc759b6cafc454c336cb35fd05550 metadata.xml 257
-MD5 191605e08f8a48f8f2a88d85c3525213 jedit-4.2.ebuild 2127
-MD5 c29174550ae9f95fc60afd5cbf079f0c files/digest-jedit-4.1 66
-MD5 c29174550ae9f95fc60afd5cbf079f0c files/digest-jedit-4.1-r1 66
 MD5 c8305f25e0689d0224f1c0f565a92709 files/jedit-4.1-jikes-fix.patch 492
+MD5 c29174550ae9f95fc60afd5cbf079f0c files/digest-jedit-4.1 66
 MD5 46c44ce1da70402f205102ea5e9ec8b1 files/digest-jedit-4.2 66
+MD5 c29174550ae9f95fc60afd5cbf079f0c files/digest-jedit-4.1-r1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBl4Ia/rLF9B432nYRAvdtAJ9McittKrO1fJyts1SECg9Nti9ohACdEOWb
+AVox5Fas9kuwrpdsYEnJfZ4=
+=1JNO
+-----END PGP SIGNATURE-----

diff --git a/app-editors/jedit/jedit-4.2.ebuild b/app-editors/jedit/jedit-4.2.ebuild
index f41033a081518b11f7537f7f90cf39259b0d3a4d..abe2d4e10413adcc76f1a7accdd9720ad54aea0c 100644 (file)
--- a/app-editors/jedit/jedit-4.2.ebuild
+++ b/app-editors/jedit/jedit-4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.6 2004/10/31 20:27:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2.ebuild,v 1.7 2004/11/14 16:04:14 axxo Exp $
 
 inherit java-utils
 
@@ -18,8 +18,8 @@ IUSE="jikes doc"
 RDEPEND=">=virtual/jdk-1.4"
 DEPEND="${RDEPEND}
        doc? (
-               =app-text/docbook-xml-dtd-4.3*
-               =app-text/docbook-xsl-stylesheets-1.65.1*
+               >=app-text/docbook-xml-dtd-4.3
+               >=app-text/docbook-xsl-stylesheets-1.65.1
                dev-libs/libxslt
        )
        >=dev-java/ant-1.5.4
@@ -30,9 +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
-               echo "docbook.dtd.catalog=/usr/share/sgml/docbook/xml-dtd-4.3/docbook.cat" > build.properties
-               echo "docbook.xsl=/usr/share/sgml/docbook/xsl-stylesheets-1.65.1" >> build.properties
+               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
        fi
 }
 src_compile() {