| 1 |
commit: 3961a215058b8c479555d58991e438cfc81a9541 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 27 22:19:21 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 28 23:18:59 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3961a215 |
| 7 |
|
| 8 |
app-office/libreoffice: Simplify src_unpack() |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.20, Repoman-2.3.6 |
| 11 |
|
| 12 |
app-office/libreoffice/libreoffice-9999.ebuild | 13 +++++-------- |
| 13 |
1 file changed, 5 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 16 |
index 3b3a7ad4a07..4869257cf96 100644 |
| 17 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 18 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 19 |
@@ -243,6 +243,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 20 |
" |
| 21 |
|
| 22 |
PATCHES=( |
| 23 |
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/} |
| 24 |
+ |
| 25 |
# not upstreamable stuff |
| 26 |
"${FILESDIR}/${PN}-5.4-system-pyuno.patch" |
| 27 |
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
| 28 |
@@ -289,13 +291,9 @@ pkg_setup() { |
| 29 |
} |
| 30 |
|
| 31 |
src_unpack() { |
| 32 |
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} |
| 33 |
- use branding && unpack "${BRANDING}" |
| 34 |
+ default |
| 35 |
|
| 36 |
- if [[ ${PV} != *9999* ]]; then |
| 37 |
- unpack "${P}.tar.xz" |
| 38 |
- unpack "${PN}-help-${PV}.tar.xz" |
| 39 |
- else |
| 40 |
+ if [[ ${PV} = *9999* ]]; then |
| 41 |
local base_uri branch mypv |
| 42 |
base_uri="https://anongit.freedesktop.org/git" |
| 43 |
branch="master" |
| 44 |
@@ -310,7 +308,6 @@ src_unpack() { |
| 45 |
} |
| 46 |
|
| 47 |
src_prepare() { |
| 48 |
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}" |
| 49 |
default |
| 50 |
|
| 51 |
AT_M4DIR="m4" eautoreconf |
| 52 |
@@ -425,8 +422,8 @@ src_configure() { |
| 53 |
$(use_enable bluetooth sdremote-bluetooth) |
| 54 |
$(use_enable coinmp) |
| 55 |
$(use_enable cups) |
| 56 |
- $(use_enable debug) |
| 57 |
$(use_enable dbus) |
| 58 |
+ $(use_enable debug) |
| 59 |
$(use_enable eds evolution2) |
| 60 |
$(use_enable firebird firebird-sdbc) |
| 61 |
$(use_enable gstreamer gstreamer-1-0) |
Archives