diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-10-12 02:07:50 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-10-13 20:19:43 +0200 |
| commit | afc8683077541722704146f7e99b3c19e55a8738 (patch) | |
| tree | 90ce83d1b8e8fb3c82ac882daa26b5b7ef93672c | |
| parent | app-office/libreoffice: Improve ebuild (diff) | |
| download | gentoo-afc8683077541722704146f7e99b3c19e55a8738.tar.gz gentoo-afc8683077541722704146f7e99b3c19e55a8738.tar.bz2 gentoo-afc8683077541722704146f7e99b3c19e55a8738.zip | |
app-office/libreoffice: Drop apache-commons deps, raise min GCC to 4.7
Removal of apache-commons see also upstream commit 4b6ceed4a4a9b152905a8b1712ffb9bd61373c16
GCC support: upstream commit e4b24c7399352642aeaeb412394d6230562d04d2
Package-Manager: portage-2.2.20.1
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index c93b1e9da59b..7528c3c5c50b 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -178,12 +178,6 @@ COMMON_DEPEND=" jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - libreoffice_extensions_wiki-publisher? ( - dev-java/commons-codec:0 - dev-java/commons-httpclient:3 - dev-java/commons-lang:2.1 - dev-java/commons-logging:0 - ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) telepathy? ( @@ -282,9 +276,9 @@ pkg_pretend() { check-reqs_pkg_pretend if [[ $(gcc-major-version) -lt 4 ]] || { - [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; } + [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then - eerror "Compilation with gcc older than 4.6 is not supported" + eerror "Compilation with gcc older than 4.7 is not supported" die "Too old gcc found." fi fi @@ -423,15 +417,6 @@ src_configure() { use libreoffice_extensions_scripting-javascript && \ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" - - if use libreoffice_extensions_wiki-publisher; then - java_opts+=" - --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) - --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) - --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) - --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar) - " - fi fi # system headers/libs/...: enforce using system packages |