summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-01-27 23:19:21 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-01-29 00:18:59 +0100
commit3961a215058b8c479555d58991e438cfc81a9541 (patch)
tree491ec3b49119543fcfaf1e95c85d08c251caea18 /app-office
parentapp-office/libreoffice-l10n: 6.0.0.3 version bump, no keywords (diff)
downloadgentoo-3961a215058b8c479555d58991e438cfc81a9541.tar.gz
gentoo-3961a215058b8c479555d58991e438cfc81a9541.tar.bz2
gentoo-3961a215058b8c479555d58991e438cfc81a9541.zip
app-office/libreoffice: Simplify src_unpack()
Package-Manager: Portage-2.3.20, Repoman-2.3.6
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/libreoffice-9999.ebuild13
1 files changed, 5 insertions, 8 deletions
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3b3a7ad4a075..4869257cf96d 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -243,6 +243,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
"
PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
@@ -289,13 +291,9 @@ pkg_setup() {
}
src_unpack() {
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
+ default
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- unpack "${PN}-help-${PV}.tar.xz"
- else
+ if [[ ${PV} = *9999* ]]; then
local base_uri branch mypv
base_uri="https://anongit.freedesktop.org/git"
branch="master"
@@ -310,7 +308,6 @@ src_unpack() {
}
src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
default
AT_M4DIR="m4" eautoreconf
@@ -425,8 +422,8 @@ src_configure() {
$(use_enable bluetooth sdremote-bluetooth)
$(use_enable coinmp)
$(use_enable cups)
- $(use_enable debug)
$(use_enable dbus)
+ $(use_enable debug)
$(use_enable eds evolution2)
$(use_enable firebird firebird-sdbc)
$(use_enable gstreamer gstreamer-1-0)