diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2007-01-14 12:52:55 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2007-01-14 12:52:55 +0000 |
| commit | baac84406ad8497f1b5330ede3c3d5358df0e653 (patch) | |
| tree | 2e67f12ad8cf9867585010cda16e7ee22cfa52c9 /app-office | |
| parent | Fixed to work with JAVA_PKG_STRICT, ant-core is a RDEPEND too, sun-jdk-1.6 ca... (diff) | |
| download | gentoo-2-baac84406ad8497f1b5330ede3c3d5358df0e653.tar.gz gentoo-2-baac84406ad8497f1b5330ede3c3d5358df0e653.tar.bz2 gentoo-2-baac84406ad8497f1b5330ede3c3d5358df0e653.zip | |
Paths to system jars shouldn't be hardcoded
(Portage version: 2.1.2_rc4-r9)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.1.0.ebuild | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 275118834988..8af13e63dcd2 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.295 2007/01/14 11:14:03 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.296 2007/01/14 12:52:55 suka Exp $ + + 14 Jan 2007; Andreas Proschofsky <suka@gentoo.org> + openoffice-2.1.0.ebuild: + Paths to system jars shouldn't be hardcoded, see + https://bugs.gentoo.org/show_bug.cgi?id=113954#c7 14 Jan 2007; Andreas Proschofsky <suka@gentoo.org> openoffice-2.1.0.ebuild: diff --git a/app-office/openoffice/openoffice-2.1.0.ebuild b/app-office/openoffice/openoffice-2.1.0.ebuild index 830aa1159e0c..a7f00236f40a 100644 --- a/app-office/openoffice/openoffice-2.1.0.ebuild +++ b/app-office/openoffice/openoffice-2.1.0.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-office/openoffice/openoffice-2.1.0.ebuild,v 1.8 2007/01/14 11:14:03 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.9 2007/01/14 12:52:55 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -207,11 +207,11 @@ src_unpack() { echo "--with-system-xalan" >> ${CONFFILE} echo "--with-system-xerces" >> ${CONFFILE} echo "--with-system-xml-apis" >> ${CONFFILE} - echo "--with-beanshell-jar=/usr/share/bsh/lib/bsh.jar" >> ${CONFFILE} - echo "--with-serializer-jar=/usr/share/xalan/lib/serializer.jar" >> ${CONFFILE} - echo "--with-xalan-jar=/usr/share/xalan/lib/xalan.jar" >> ${CONFFILE} - echo "--with-xerces-jar=/usr/share/xerces-2/lib/xercesImpl.jar" >> ${CONFFILE} - echo "--with-xml-apis-jar=/usr/share/xml-commons-external-1.3/lib/xml-apis.jar" >> ${CONFFILE} + echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE} + echo "--with-serializer-jar=$(java-pkg_getjar xalan serializer.jar)" >> ${CONFFILE} + echo "--with-xalan-jar=$(java-pkg_getjar xalan xalan.jar)" >> ${CONFFILE} + echo "--with-xerces-jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> ${CONFFILE} + echo "--with-xml-apis-jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" >> ${CONFFILE} fi use branding && echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE} |