commit: 6e2781d43a16e3994bddfeeedc7400bc72218dd9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 09:08:17 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 09:08:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2781d4
app-office/scribus: bump to 1.5.6.1
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
app-office/scribus/Manifest | 1 +
.../{scribus-9999.ebuild => scribus-1.5.6.1.ebuild} | 19 ++++++++++---------
app-office/scribus/scribus-9999.ebuild | 8 ++++----
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 968c3cbf84b..d253eedb7a6 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,2 @@
DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B
183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e
SHA512
ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
+DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B
183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e
SHA512
ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
diff --git a/app-office/scribus/scribus-9999.ebuild
b/app-office/scribus/scribus-1.5.6.1.ebuild
similarity index 91%
copy from app-office/scribus/scribus-9999.ebuild
copy to app-office/scribus/scribus-1.5.6.1.ebuild
index 944a609bb5c..a535eb5a50b 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -5,17 +5,16 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7,8,9} )
PYTHON_REQ_USE="tk?"
-inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
+COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a
+inherit cmake desktop flag-o-matic python-single-r1 xdg
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="https://www.scribus.net/";
-SRC_URI=""
-ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
-ESVN_PROJECT=Scribus-1.5
+SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts
+templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -32,7 +31,7 @@ DEPEND="${PYTHON_DEPS}
app-text/libqxp
app-text/poppler:=
dev-libs/hyphen
- >=dev-libs/icu-58.2:0=
+ dev-libs/icu:0=
dev-libs/librevenge
dev-libs/libxml2
dev-qt/qtcore:5
@@ -44,7 +43,7 @@ DEPEND="${PYTHON_DEPS}
dev-qt/qtxml:5
media-libs/fontconfig
media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:0=[icu]
+ media-libs/harfbuzz:0=[icu]
media-libs/lcms:2
media-libs/libcdr
media-libs/libfreehand
@@ -56,8 +55,8 @@ DEPEND="${PYTHON_DEPS}
net-print/cups
sys-libs/zlib[minizip]
virtual/jpeg:0=
- >=x11-libs/cairo-1.10.0[X,svg]
- boost? ( >=dev-libs/boost-1.67:= )
+ x11-libs/cairo[X,svg]
+ boost? ( dev-libs/boost:= )
graphicsmagick? ( media-gfx/graphicsmagick:= )
hunspell? ( app-text/hunspell:= )
osg? ( dev-games/openscenegraph:= )
@@ -82,6 +81,8 @@ PATCHES=(
CMAKE_BUILD_TYPE="Release"
+S="${WORKDIR}"/${PN}-${COMMIT}
+
src_prepare() {
cmake_src_prepare
diff --git a/app-office/scribus/scribus-9999.ebuild
b/app-office/scribus/scribus-9999.ebuild
index 944a609bb5c..3fbcb491ffe 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -32,7 +32,7 @@ DEPEND="${PYTHON_DEPS}
app-text/libqxp
app-text/poppler:=
dev-libs/hyphen
- >=dev-libs/icu-58.2:0=
+ dev-libs/icu:0=
dev-libs/librevenge
dev-libs/libxml2
dev-qt/qtcore:5
@@ -44,7 +44,7 @@ DEPEND="${PYTHON_DEPS}
dev-qt/qtxml:5
media-libs/fontconfig
media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:0=[icu]
+ media-libs/harfbuzz:0=[icu]
media-libs/lcms:2
media-libs/libcdr
media-libs/libfreehand
@@ -56,8 +56,8 @@ DEPEND="${PYTHON_DEPS}
net-print/cups
sys-libs/zlib[minizip]
virtual/jpeg:0=
- >=x11-libs/cairo-1.10.0[X,svg]
- boost? ( >=dev-libs/boost-1.67:= )
+ x11-libs/cairo[X,svg]
+ boost? ( dev-libs/boost:= )
graphicsmagick? ( media-gfx/graphicsmagick:= )
hunspell? ( app-text/hunspell:= )
osg? ( dev-games/openscenegraph:= )
