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 | 43670b424a9054e9af77dda3c4443815f0115554 (patch) | |
| tree | e039311c5880ebb6f3cbd919727e3696b2e099e4 /app-office | |
| parent | Fixed to work with JAVA_PKG_STRICT, ant-core is a RDEPEND too, sun-jdk-1.6 ca... (diff) | |
| download | historical-43670b424a9054e9af77dda3c4443815f0115554.tar.gz historical-43670b424a9054e9af77dda3c4443815f0115554.tar.bz2 historical-43670b424a9054e9af77dda3c4443815f0115554.zip | |
Paths to system jars shouldn't be hardcoded
Package-Manager: portage-2.1.2_rc4-r9
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 16 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.1.0.ebuild | 12 |
3 files changed, 20 insertions, 15 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/Manifest b/app-office/openoffice/Manifest index 2d72e77ad773..954ed81a9a6c 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -50,14 +50,14 @@ EBUILD openoffice-2.0.4.ebuild 9992 RMD160 c22b6f7169f61187731cd215ad8013875cd9d MD5 ae7ccc1a160003a2f290036b79af9076 openoffice-2.0.4.ebuild 9992 RMD160 c22b6f7169f61187731cd215ad8013875cd9d939 openoffice-2.0.4.ebuild 9992 SHA256 20aacdfc804f5458abc42d521b07068485ba648481266cc8eceb892ad19d869a openoffice-2.0.4.ebuild 9992 -EBUILD openoffice-2.1.0.ebuild 11160 RMD160 db7593d0419482793775c4ca160f2abec538f621 SHA1 b26689a2430548b92a49d07a8ea7dcb7c6422ada SHA256 a61e55abeabe72e182e3912404ce6ea780042571e6b6bfc5de44d65ed2137d84 -MD5 82ef94854fbacc00a852fe153cf64464 openoffice-2.1.0.ebuild 11160 -RMD160 db7593d0419482793775c4ca160f2abec538f621 openoffice-2.1.0.ebuild 11160 -SHA256 a61e55abeabe72e182e3912404ce6ea780042571e6b6bfc5de44d65ed2137d84 openoffice-2.1.0.ebuild 11160 -MISC ChangeLog 61583 RMD160 20baf4ba52f898f74261c0d5b9ebf133ed9a473d SHA1 dc37e7f56f1ef4f2ac7b7811682618c989e68830 SHA256 0dd86d7ddf9c619f9bf4bd48b931b6e1db4deecf8f4c855838a23ebca53d041a -MD5 b5af35714929629dd747ef1f23f19f21 ChangeLog 61583 -RMD160 20baf4ba52f898f74261c0d5b9ebf133ed9a473d ChangeLog 61583 -SHA256 0dd86d7ddf9c619f9bf4bd48b931b6e1db4deecf8f4c855838a23ebca53d041a ChangeLog 61583 +EBUILD openoffice-2.1.0.ebuild 11180 RMD160 8c2fb4e65fbea38cb26fa93eec93f76f590507b8 SHA1 7c605c4b0d585b9ac8c99fc2de17adc9ddcd7b3f SHA256 de65d4457f1795d4e5744fdbcde2a9edad6b5fd7a72b773f131f58efeb890c4b +MD5 949286c9ba977614e41a8777b4a34465 openoffice-2.1.0.ebuild 11180 +RMD160 8c2fb4e65fbea38cb26fa93eec93f76f590507b8 openoffice-2.1.0.ebuild 11180 +SHA256 de65d4457f1795d4e5744fdbcde2a9edad6b5fd7a72b773f131f58efeb890c4b openoffice-2.1.0.ebuild 11180 +MISC ChangeLog 61767 RMD160 cab953a658ba2f58d5e19ecd43df7b097db94512 SHA1 e2bff03dc252b3a825d1db7347cce7520f610675 SHA256 abd8e9bc0da1e7dd6fbe743d915534db2af9aa27f37b7a481e9f4e40a534fdf4 +MD5 244cec5b25d1d661e21924796deb38b0 ChangeLog 61767 +RMD160 cab953a658ba2f58d5e19ecd43df7b097db94512 ChangeLog 61767 +SHA256 abd8e9bc0da1e7dd6fbe743d915534db2af9aa27f37b7a481e9f4e40a534fdf4 ChangeLog 61767 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461 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} |