| 1 |
commit: 7e2afb61ddae9852e6a0834d00aabe6e8b1c8ded |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 3 20:06:58 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 3 20:07:24 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2afb61 |
| 7 |
|
| 8 |
app-office/scribus: Switch to cmake.eclass and fix 9999 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/scribus/scribus-1.5.5.ebuild | 8 ++++---- |
| 14 |
app-office/scribus/scribus-9999.ebuild | 3 +-- |
| 15 |
2 files changed, 5 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild |
| 18 |
index 88bcd5cc441..fa0caa4e246 100644 |
| 19 |
--- a/app-office/scribus/scribus-1.5.5.ebuild |
| 20 |
+++ b/app-office/scribus/scribus-1.5.5.ebuild |
| 21 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 22 |
|
| 23 |
PYTHON_COMPAT=( python2_7 ) |
| 24 |
PYTHON_REQ_USE="tk?" |
| 25 |
-inherit cmake-utils desktop flag-o-matic python-single-r1 xdg |
| 26 |
+inherit cmake desktop flag-o-matic python-single-r1 xdg |
| 27 |
|
| 28 |
DESCRIPTION="Desktop publishing (DTP) and layout program" |
| 29 |
HOMEPAGE="https://www.scribus.net/" |
| 30 |
@@ -78,7 +78,7 @@ PATCHES=( |
| 31 |
) |
| 32 |
|
| 33 |
src_prepare() { |
| 34 |
- cmake-utils_src_prepare |
| 35 |
+ cmake_src_prepare |
| 36 |
|
| 37 |
rm -r codegen/cheetah scribus/third_party/hyphen || die |
| 38 |
|
| 39 |
@@ -124,11 +124,11 @@ src_configure() { |
| 40 |
-DWITH_PODOFO=$(usex pdf) |
| 41 |
-DWANT_NOTEMPLATES=$(usex !templates) |
| 42 |
) |
| 43 |
- cmake-utils_src_configure |
| 44 |
+ cmake_src_configure |
| 45 |
} |
| 46 |
|
| 47 |
src_install() { |
| 48 |
- cmake-utils_src_install |
| 49 |
+ cmake_src_install |
| 50 |
|
| 51 |
if ! use tk; then |
| 52 |
rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die |
| 53 |
|
| 54 |
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild |
| 55 |
index da3a47d2520..2fc0d191008 100644 |
| 56 |
--- a/app-office/scribus/scribus-9999.ebuild |
| 57 |
+++ b/app-office/scribus/scribus-9999.ebuild |
| 58 |
@@ -77,8 +77,7 @@ PATCHES=( |
| 59 |
) |
| 60 |
|
| 61 |
src_prepare() { |
| 62 |
- default |
| 63 |
- _CMAKE_SRC_PREPARE_HAS_RUN=1 |
| 64 |
+ cmake_src_prepare |
| 65 |
|
| 66 |
rm -r codegen/cheetah scribus/third_party/hyphen || die |
Archives