commit: ac5f3edcd3b476551f1b83216cfc549dfef88511
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Apr 6 23:21:15 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 8 21:58:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac5f3edc
app-office/libreoffice: 5.1.2.2 version bump, EAPI=6
Package-Manager: portage-2.2.27
app-office/libreoffice/Manifest | 2 ++
...-5.1.9999.ebuild => libreoffice-5.1.2.2.ebuild} | 23 +++++-----------------
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 23 +++++-----------------
app-office/libreoffice/libreoffice-9999.ebuild | 20 +++++--------------
4 files changed, 17 insertions(+), 51 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 64d08f4..61ed909 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,6 +9,8 @@ DIST d37daeccb841e5a457b9476d613a6012-xmlsec1-1.2.17.tar.gz
1731324 SHA256 f2d96
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256
1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512
d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305
WHIRLPOOL
95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256
1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512
f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2
WHIRLPOOL
df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
DIST libreoffice-5.1.1.3.tar.xz 175820100 SHA256
2c5afb77e10daaf02b0521f0a3027345a9cfc02fa7a152f4a2e5d7a74abc8e38 SHA512
5aa5be15732808cce56eeb9274de35c15b31b56995ebbb9dfbfc19be23798576889e7276f42cb95cf9b8b1e0f755943ceb1994525bbbaedc24a28ac3345c6fe6
WHIRLPOOL
b79ded47ed673f82df2bdbe1689b8d7fe272072e797868e2712d0f5b14f3cc8cd1cc5ac6437e695e48630504d4630e4e83b3bc03a8ed6f432bfbe7707a7dd078
+DIST libreoffice-5.1.2.2.tar.xz 173763036 SHA256
54ecdc9e0201a64fb6a0898b2e5ebd6c6e22c36965e3eb797ae351219e441781 SHA512
0b2d9d2f91b40fc6eda67d9d6a16f95391f985be8ffa43e8f577c42bc0c1228e2c14de4dfbdef808a6edd61985903d5e12e0696ef43f522e78ee123c1d5f01e8
WHIRLPOOL
059f6f558c5cf3881b2ce5fee1c9ef0286c315481fd17dc7129aaf8ede97ca1759c8b821c1575ad4457e670e54241409e48e54bd1e8d62c8401cf5067ef81226
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256
22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
WHIRLPOOL
1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256
6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512
63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170
WHIRLPOOL
b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
DIST libreoffice-help-5.1.1.3.tar.xz 1904764 SHA256
ce5df97b26d25bf73cf29f122f9f453ca54055ce37a8bb3dc25e4c298b5d3da9 SHA512
2d2400850e0e734df8eb884df2edfabd6dd31c1ef8f43652feca3cc573c1acf6d73716eadf3ded39e2b15f010ec486835830f020aec7b47529064d5cdab4fde0
WHIRLPOOL
1a39adf1b424876b58a5ad8c3e3e625c0e54ad525d93d309698fed33549c40cae00543311f68fe22e39b9f871587811b6867633e741724d61e994d6ad8518cb2
+DIST libreoffice-help-5.1.2.2.tar.xz 1900736 SHA256
dc4d9fd6ca78ad89069ca1f0187f274c9cd83fb8849716193d25bce6ca072953 SHA512
5868e9ec51ac841372cdc8aa7b257082d04269ecd3c2724ddd9f6da36a1a0549eb6bedc2e71a205543f8a23b36df7cebd937a316b22c2be778a1d2f7e4d9df41
WHIRLPOOL
c7565974995b4a95894b59263595f82c6980c2c8e4b3aa37fb787c4ad369774b128062a32dcf14c4f1dc60339c469e47acc9ba3b193ea6e2de6a1d4e38cc21a6
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
b/app-office/libreoffice/libreoffice-5.1.2.2.ebuild
similarity index 98%
copy from app-office/libreoffice/libreoffice-5.1.9999.ebuild
copy to app-office/libreoffice/libreoffice-5.1.2.2.ebuild
index 940c4be..213fd4e 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.2.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_REQUIRED="optional"
QT_MINIMAL="4.7.4"
@@ -255,9 +255,6 @@ REQUIRED_USE="
"
PATCHES=(
- # submitted upstream
- "${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
-
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
)
@@ -271,8 +268,6 @@ elif [[ ${MERGE_TYPE} != binary ]] ; then
fi
pkg_pretend() {
- local pgslot
-
use java || \
ewarn "If you plan to use lbase application you should enable
java or you will get various crashes."
@@ -290,7 +285,7 @@ pkg_pretend() {
# Ensure pg version but we have to be sure the pg is installed (first
# install on clean system)
if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
+ local pgslot=$(postgresql-config show)
if [[ ${pgslot//.} -lt 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
@@ -335,16 +330,9 @@ src_unpack() {
}
src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
@@ -374,7 +362,6 @@ src_prepare() {
src_configure() {
local java_opts
local internal_libs
- local lo_ext
local ext_opts
# optimization flags
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 940c4be..213fd4e 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_REQUIRED="optional"
QT_MINIMAL="4.7.4"
@@ -255,9 +255,6 @@ REQUIRED_USE="
"
PATCHES=(
- # submitted upstream
- "${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
-
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
)
@@ -271,8 +268,6 @@ elif [[ ${MERGE_TYPE} != binary ]] ; then
fi
pkg_pretend() {
- local pgslot
-
use java || \
ewarn "If you plan to use lbase application you should enable
java or you will get various crashes."
@@ -290,7 +285,7 @@ pkg_pretend() {
# Ensure pg version but we have to be sure the pg is installed (first
# install on clean system)
if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
+ local pgslot=$(postgresql-config show)
if [[ ${pgslot//.} -lt 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
@@ -335,16 +330,9 @@ src_unpack() {
}
src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
@@ -374,7 +362,6 @@ src_prepare() {
src_configure() {
local java_opts
local internal_libs
- local lo_ext
local ext_opts
# optimization flags
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild
b/app-office/libreoffice/libreoffice-9999.ebuild
index bd14745..80adfc8 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_REQUIRED="optional"
QT_MINIMAL="4.7.4"
@@ -266,8 +266,6 @@ elif [[ ${MERGE_TYPE} != binary ]] ; then
fi
pkg_pretend() {
- local pgslot
-
use java || \
ewarn "If you plan to use lbase application you should enable
java or you will get various crashes."
@@ -285,7 +283,7 @@ pkg_pretend() {
# Ensure pg version but we have to be sure the pg is installed (first
# install on clean system)
if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
+ local pgslot=$(postgresql-config show)
if [[ ${pgslot//.} -lt 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
@@ -330,16 +328,9 @@ src_unpack() {
}
src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
@@ -368,7 +359,6 @@ src_prepare() {
src_configure() {
local java_opts
- local lo_ext
local ext_opts
# optimization flags
