diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-09-17 03:28:18 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-09-17 03:28:18 +0000 |
| commit | e8c79f197a08bdf88d87c782ae2ca4b566efe0cb (patch) | |
| tree | 744e01b2287c55b36b77eac74b876459b48faee0 /app-office/libreoffice | |
| parent | Upstream rebuilt tarball with the arraycount fix. (diff) | |
| download | gentoo-2-e8c79f197a08bdf88d87c782ae2ca4b566efe0cb.tar.gz gentoo-2-e8c79f197a08bdf88d87c782ae2ca4b566efe0cb.tar.bz2 gentoo-2-e8c79f197a08bdf88d87c782ae2ca4b566efe0cb.zip | |
More smple cleanups.
(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r1.ebuild | 20 |
2 files changed, 11 insertions, 15 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 89e84cac9399..e4c6095a92cf 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.134 2011/09/17 01:26:38 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.135 2011/09/17 03:28:18 scarabeus Exp $ + + 17 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-9999-r1.ebuild: + More smple cleanups. 17 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r1.ebuild: diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index 59b10c6b5650..e5397757f333 100644 --- a/app-office/libreoffice/libreoffice-9999-r1.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.10 2011/09/17 01:26:38 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.11 2011/09/17 03:28:18 scarabeus Exp $ EAPI=3 @@ -49,7 +49,6 @@ unset DEV_URI # addons # FIXME: actually review which one of these are used -ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz" ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz" ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html" @@ -64,7 +63,6 @@ ADDONS_SRC+=" ${ADDONS_URI}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sour ADDONS_SRC+=" ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip" ADDONS_SRC+=" ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip" ADDONS_SRC+=" ${ADDONS_URI}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip" -ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz" ADDONS_SRC+=" ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip" ADDONS_SRC+=" ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip" ADDONS_SRC+=" ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip" @@ -80,6 +78,9 @@ ADDONS_SRC+=" ${ADDONS_URI}/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz" ADDONS_SRC+=" ${ADDONS_URI}/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz" ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll" ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip" +# REALLY REQUIRED +ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz" +ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz" SRC_URI+=" ${ADDONS_SRC}" TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt" @@ -346,7 +347,6 @@ src_prepare() { src_configure() { local java_opts local internal_libs - local extensions local themes="crystal" local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") @@ -357,13 +357,6 @@ src_configure() { use gnome && themes+=" tango" use kde && themes+=" oxygen" - # list the extensions we are going to build by default - extensions=" - --enable-ext-pdfimport - --enable-ext-presenter-console - --enable-ext-presenter-minimizer - " - # dmake: not worth of splitting out # cppunit: patched not to run anything, just main() { return 0; } # workaround to upstream running the tests during build @@ -394,7 +387,7 @@ src_configure() { fi if use branding; then - extensions+=" + internal_libs+=" --with-about-bitmap="${WORKDIR}/branding-about.png" --with-intro-bitmap="${WORKDIR}/branding-intro.png" " @@ -501,8 +494,7 @@ src_configure() { $(use_with nsplugin system-mozilla libxul) \ $(use_with templates sun-templates) \ ${internal_libs} \ - ${java_opts} \ - ${extensions} + ${java_opts} } src_compile() { |