[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     402f130003a7d3ca58863ba2b8a9430f569f0d5e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 14:41:17 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 16:30:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402f1300

app-office/scribus: 1.5.4 version bump, fix build with poppler-0.64.0

Closes: https://bugs.gentoo.org/656036
Closes: https://bugs.gentoo.org/657802
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-office/scribus/Manifest                        |  2 ++
 .../{scribus-9999.ebuild => scribus-1.5.4.ebuild}  | 36 ++++++++++------------
 app-office/scribus/scribus-9999.ebuild             | 26 +++++-----------
 3 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index deea45c88c3..5fa3548de6d 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1 +1,3 @@
 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
+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

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-1.5.4.ebuild
similarity index 91%
copy from app-office/scribus/scribus-9999.ebuild
copy to app-office/scribus/scribus-1.5.4.ebuild
index 742448b2738..4a0a3138ca5 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-1.5.4.ebuild
@@ -7,17 +7,16 @@ PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 
-inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 subversion xdg-utils
+inherit cmake-utils desktop eutils 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="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz
+https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-0.64.0.patch.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
 
 #a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
@@ -49,8 +48,7 @@ REQUIRED_USE="
 
 # osg
 # couple of third_party libs bundled
-COMMON_DEPEND="
-	${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
 	app-text/libmspub
 	app-text/poppler:=
 	dev-libs/hyphen
@@ -88,14 +86,17 @@ COMMON_DEPEND="
 	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
+	app-text/ghostscript-gpl
+"
 DEPEND="${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
 	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+	"${WORKDIR}"/${P}-poppler-0.64.0.patch # bug 656036
 )
 
 src_prepare() {
@@ -118,7 +119,10 @@ src_prepare() {
 		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
 		-i resources/templates/CMakeLists.txt || die
 
-	edos2unix scribus/ui/propertiespalette_utils.cpp
+	# required for ${P}-poppler-0.64.0.patch
+	edos2unix \
+		scribus/plugins/import/pdf/slaoutput.{cpp,h} \
+		scribus/plugins/import/pdf/importpdf.{cpp,h}
 
 	cmake-utils_src_prepare
 }
@@ -164,18 +168,14 @@ src_configure() {
 		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
 		-DWANT_NOOSG="$(usex !osg)"
 		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_NOHEADERINSTALL="$(usex minimal)"
+		-DWANT_HEADERINSTALL="$(usex !minimal)"
 		-DWANT_HUNSPELL="$(usex hunspell)"
 		-DWANT_NOEXAMPLES="$(usex !examples)"
 		-DWANT_NOTEMPLATES="$(usex !templates)"
-		)
+	)
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
 
@@ -215,10 +215,6 @@ src_install() {
 	domenu scribus.desktop
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 742448b2738..b2939a8c47f 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 CMAKE_MAKEFILE_GENERATOR=ninja
 
-inherit cmake-utils eutils flag-o-matic gnome2 python-single-r1 subversion xdg-utils
+inherit cmake-utils desktop flag-o-matic gnome2-utils python-single-r1 subversion xdg-utils
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
@@ -49,8 +49,7 @@ REQUIRED_USE="
 
 # osg
 # couple of third_party libs bundled
-COMMON_DEPEND="
-	${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
 	app-text/libmspub
 	app-text/poppler:=
 	dev-libs/hyphen
@@ -88,10 +87,12 @@ COMMON_DEPEND="
 	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
+	app-text/ghostscript-gpl
+"
 DEPEND="${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
@@ -118,8 +119,6 @@ src_prepare() {
 		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
 		-i resources/templates/CMakeLists.txt || die
 
-	edos2unix scribus/ui/propertiespalette_utils.cpp
-
 	cmake-utils_src_prepare
 }
 
@@ -158,24 +157,19 @@ src_configure() {
 		-DWANT_DISTROBUILD=ON
 		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
 		-DWANT_GUI_LANG="${langs#;};en"
-		-DWANT_CPP11=ON
 		-DWITH_PODOFO="$(usex pdf)"
 		-DWITH_BOOST="$(usex boost)"
 		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
 		-DWANT_NOOSG="$(usex !osg)"
 		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_NOHEADERINSTALL="$(usex minimal)"
+		-DWANT_HEADERINSTALL="$(usex !minimal)"
 		-DWANT_HUNSPELL="$(usex hunspell)"
 		-DWANT_NOEXAMPLES="$(usex !examples)"
 		-DWANT_NOTEMPLATES="$(usex !templates)"
-		)
+	)
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
 
@@ -215,10 +209,6 @@ src_install() {
 	domenu scribus.desktop
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update