commit: 647389856f8b5bcc23adc7e3a11a41a0f28b9e1e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Jan 11 01:16:06 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jan 11 01:23:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64738985
app-office/scribus: 1.5.5_pre20181227 snapshot bump (no keywords) We can't wait forever for them to make a new release, fixes build with poppler up to at least 0.72.0. Add missing deps. Add missing slot ops. Bug: https://bugs.gentoo.org/616088 Bug: https://bugs.gentoo.org/663682 Bug: https://bugs.gentoo.org/674804 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/scribus/Manifest | 1 + ...999.ebuild => scribus-1.5.5_pre20181227.ebuild} | 26 +++++++++++----------- app-office/scribus/scribus-9999.ebuild | 16 ++++++------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index b9ba104e93f..ee5658be540 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,2 +1,3 @@ DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568 DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403 +DIST scribus-1.5.5_pre20181227.tar.gz 84926534 BLAKE2B 1fa392a8a196aac028ad4f1b913f31c5655a191d5ff3db26f16b4b181885bb1035ca95d11b100ad1b6cc7aea0ea21677a211c83dbd94bfe730a94ed4feaaf6bc SHA512 53a9494dca4520ec89b4b4487c09683da00876088ed2750fd80bca6cbc96536c0bcfb8c96d671d9ca0ed0b74cbd8f75382298e3d20285d52cec52951807f4797 diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-1.5.5_pre20181227.ebuild similarity index 93% copy from app-office/scribus/scribus-9999.ebuild copy to app-office/scribus/scribus-1.5.5_pre20181227.ebuild index 3dc73f4dbe9..b92edd436ae 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-1.5.5_pre20181227.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,14 +6,12 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="tk?" CMAKE_MAKEFILE_GENERATOR=ninja - -inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 subversion xdg-utils +COMMIT=d857c1a3430acf207cdde2512db6822c45e98732 +inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 xdg-utils 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" @@ -43,21 +41,21 @@ for l in ${IUSE_L10N}; do done unset l prev_l -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} +REQUIRED_USE="${PYTHON_REQUIRED_USE} tk? ( scripts )" # osg # couple of third_party libs bundled COMMON_DEPEND="${PYTHON_DEPS} app-text/libmspub + app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 - dev-qt/qtgui:5 + dev-qt/qtgui:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 @@ -72,18 +70,18 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio + media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) - hunspell? ( app-text/hunspell ) - graphicsmagick? ( media-gfx/graphicsmagick ) - osg? ( dev-games/openscenegraph ) + hunspell? ( app-text/hunspell:= ) + graphicsmagick? ( media-gfx/graphicsmagick:= ) + osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) - tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) " RDEPEND="${COMMON_DEPEND} app-text/ghostscript-gpl @@ -98,6 +96,8 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.3-fpic.patch ) +S="${WORKDIR}"/${PN}-${COMMIT} + src_prepare() { rm -r codegen/cheetah || die cat > cmake/modules/FindZLIB.cmake <<- EOF || die diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index 3dc73f4dbe9..372e9412ba4 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -43,21 +43,21 @@ for l in ${IUSE_L10N}; do done unset l prev_l -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} +REQUIRED_USE="${PYTHON_REQUIRED_USE} tk? ( scripts )" # osg # couple of third_party libs bundled COMMON_DEPEND="${PYTHON_DEPS} app-text/libmspub + app-text/libqxp app-text/poppler:= dev-libs/hyphen >=dev-libs/icu-58.2:0= dev-libs/librevenge dev-libs/libxml2 dev-qt/qtcore:5 - dev-qt/qtgui:5 + dev-qt/qtgui:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 @@ -72,18 +72,18 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/libpagemaker media-libs/libpng:0= media-libs/libvisio + media-libs/libzmf media-libs/tiff:0 net-print/cups sys-libs/zlib[minizip] virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.62:= ) - hunspell? ( app-text/hunspell ) - graphicsmagick? ( media-gfx/graphicsmagick ) - osg? ( dev-games/openscenegraph ) + hunspell? ( app-text/hunspell:= ) + graphicsmagick? ( media-gfx/graphicsmagick:= ) + osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) - tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) " RDEPEND="${COMMON_DEPEND} app-text/ghostscript-gpl
