1 |
commit: d6eec871cd9da061cd912294d47ba1de231b514c |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 1 13:43:52 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 1 14:16:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6eec871 |
7 |
|
8 |
app-office/scribus: 1.5.5_p20200626 snapshot bump w/ python3 support |
9 |
|
10 |
Bug: https://bugs.gentoo.org/719938 |
11 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
app-office/scribus/Manifest | 1 + |
15 |
...scribus-9999.ebuild => scribus-1.5.5_p20200626.ebuild} | 15 ++++++++------- |
16 |
app-office/scribus/scribus-9999.ebuild | 4 ++-- |
17 |
3 files changed, 11 insertions(+), 9 deletions(-) |
18 |
|
19 |
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest |
20 |
index e8d12ffa74f..823daf4f2db 100644 |
21 |
--- a/app-office/scribus/Manifest |
22 |
+++ b/app-office/scribus/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50 |
25 |
+DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245 |
26 |
|
27 |
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-1.5.5_p20200626.ebuild |
28 |
similarity index 92% |
29 |
copy from app-office/scribus/scribus-9999.ebuild |
30 |
copy to app-office/scribus/scribus-1.5.5_p20200626.ebuild |
31 |
index d532762422e..a017d67eb01 100644 |
32 |
--- a/app-office/scribus/scribus-9999.ebuild |
33 |
+++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild |
34 |
@@ -3,19 +3,18 @@ |
35 |
|
36 |
EAPI=7 |
37 |
|
38 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
39 |
+PYTHON_COMPAT=( python3_{6,7,8,9} ) |
40 |
PYTHON_REQ_USE="tk?" |
41 |
-inherit cmake desktop flag-o-matic python-single-r1 subversion xdg |
42 |
+COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a |
43 |
+inherit cmake desktop flag-o-matic python-single-r1 xdg |
44 |
|
45 |
DESCRIPTION="Desktop publishing (DTP) and layout program" |
46 |
HOMEPAGE="https://www.scribus.net/" |
47 |
-SRC_URI="" |
48 |
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus" |
49 |
-ESVN_PROJECT=Scribus-1.5 |
50 |
+SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
51 |
|
52 |
LICENSE="GPL-2" |
53 |
SLOT="0" |
54 |
-KEYWORDS="" |
55 |
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
56 |
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" |
57 |
|
58 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
59 |
@@ -58,8 +57,8 @@ DEPEND="${PYTHON_DEPS} |
60 |
virtual/jpeg:0= |
61 |
>=x11-libs/cairo-1.10.0[X,svg] |
62 |
boost? ( >=dev-libs/boost-1.67:= ) |
63 |
- hunspell? ( app-text/hunspell:= ) |
64 |
graphicsmagick? ( media-gfx/graphicsmagick:= ) |
65 |
+ hunspell? ( app-text/hunspell:= ) |
66 |
osg? ( dev-games/openscenegraph:= ) |
67 |
pdf? ( app-text/podofo:0= ) |
68 |
scripts? ( |
69 |
@@ -82,6 +81,8 @@ PATCHES=( |
70 |
|
71 |
CMAKE_BUILD_TYPE="Release" |
72 |
|
73 |
+S="${WORKDIR}"/${PN}-${COMMIT} |
74 |
+ |
75 |
src_prepare() { |
76 |
cmake_src_prepare |
77 |
|
78 |
|
79 |
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild |
80 |
index d532762422e..944a609bb5c 100644 |
81 |
--- a/app-office/scribus/scribus-9999.ebuild |
82 |
+++ b/app-office/scribus/scribus-9999.ebuild |
83 |
@@ -3,7 +3,7 @@ |
84 |
|
85 |
EAPI=7 |
86 |
|
87 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
88 |
+PYTHON_COMPAT=( python3_{6,7,8,9} ) |
89 |
PYTHON_REQ_USE="tk?" |
90 |
inherit cmake desktop flag-o-matic python-single-r1 subversion xdg |
91 |
|
92 |
@@ -58,8 +58,8 @@ DEPEND="${PYTHON_DEPS} |
93 |
virtual/jpeg:0= |
94 |
>=x11-libs/cairo-1.10.0[X,svg] |
95 |
boost? ( >=dev-libs/boost-1.67:= ) |
96 |
- hunspell? ( app-text/hunspell:= ) |
97 |
graphicsmagick? ( media-gfx/graphicsmagick:= ) |
98 |
+ hunspell? ( app-text/hunspell:= ) |
99 |
osg? ( dev-games/openscenegraph:= ) |
100 |
pdf? ( app-text/podofo:0= ) |
101 |
scripts? ( |