gentoo resync : 18.05.2019

3 files changed, 292 insertions, 0 deletions

diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 4e9f75bf1b68..03ba54ff10b2 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,6 +1,9 @@
 AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
+AUX scribus-1.5.5_pre20190429-poppler-0.76.patch 2102 BLAKE2B 80cc47f73cd3c2d8fe5a5ff379b37c279d65fccc68864e28f0cfcbeaf4953eb548e8ccc87d2754a3d2b7014e5702bfb8a191a57e634e77abba55d59b9c6c3bd9 SHA512 210243d3a2f104cf0e03ba0a8df7db15818fcae5808f3974a1260079d31e83b363b29c85aced985cc29b889ea07359a0ac5e62fb03c3ecc0f2b4bc98d633a5e3
 DIST scribus-1.5.5_pre20190124.tar.gz 85713996 BLAKE2B c4bb181012c5b2d15076239cb06d5b2d88fb24ef67d5e258142a4acb7979a304d5fdbd9163a24aaa47a1c8f354b0b70af7115430173ade9a8e77c1cb489fc849 SHA512 e9bd63c37a4818a5dda151b7bb6b7fa9cf7918949bd5612009646335d630b4b4188c2346c7567a3dc5f857849a2d49967f825320720c12e38a6038c7a0d3c34a
+DIST scribus-1.5.5_pre20190429.tar.gz 85838093 BLAKE2B 4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a SHA512 1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324
 EBUILD scribus-1.5.5_pre20190124.ebuild 6747 BLAKE2B 8d6e459e6168bda2702ed9729602ebf31c0f90f3140f58fd9f02ce34a453fec108aeb98d0fd77febf7aaab322bc0e91448285db30f271137e403ed6519beb59d SHA512 bd8b75b386e11a9b7fc7b19f930453a5e9ca130add472cb0177928bcd50b6f5010b635bca9612b9b591dc6e0708b14cd5bb8ebe5007c2c532ff587331390bf50
+EBUILD scribus-1.5.5_pre20190429.ebuild 6847 BLAKE2B 97e336820b80015b68d0f99ed35d1b283a0239228d5f00c65e925f4f835298b25393f42be07a0a5d80459071620986bad3c76e209569bd5bf2c6d05751609313 SHA512 d49cf3a86b5bb7a2b94c238669ae2e29c5235f2f3d8dcd584f9ed76a8768389a7c7e7e49dd43c36a7d23994f1eebfb2f8b2eb657a9996b89828f3f174ec8c954
 EBUILD scribus-9999.ebuild 6643 BLAKE2B c1c8ea9bb6f97b3f37c8bf10dd974e2ecf2330d564108b30351c3f126bd699b8e3ebcdba5e4e4254edacaeb28e78801d954986531379a4b8fc312c2a9d332dee SHA512 6461c89f4ef4fda64e6c31420889fe51666930d3efb5fcb6142329249b314b12ae20feca11800afe735c69e4eeb695f587ab2b9710ae74a3a71c75053d2750c8
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch b/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
new file mode 100644
index 000000000000..d62db93663ef
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
@@ -0,0 +1,59 @@
+From aeea6a2ed4cb15ce8c35bb83066ef03e4e04b29b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 2 May 2019 00:08:12 +0200
+Subject: [PATCH] Fix build with poppler-0.76
+
+findPage(int num, int gen) -> findPage(const Ref ref)
+
+https://gitlab.freedesktop.org/poppler/poppler/commit/244c7d6926463b079b1f96e34d9e4451d352942e
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index fe9794a65..b25082de6 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -429,8 +429,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ 			{

+ 				if (dst->isPageRef())

+ 				{

+-					Ref dstr = dst->getPageRef();

+-					pagNum = pdfDoc->findPage(dstr.num, dstr.gen);

++					pagNum = pdfDoc->findPage(dst->getPageRef());

+ 				}

+ 				else

+ 					pagNum = dst->getPageNum();

+@@ -451,8 +450,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ 					{

+ 						if (dstn->isPageRef())

+ 						{

+-							Ref dstr = dstn->getPageRef();

+-							pagNum = pdfDoc->findPage(dstr.num, dstr.gen);

++							pagNum = pdfDoc->findPage(dstn->getPageRef());

+ 						}

+ 						else

+ 							pagNum = dstn->getPageNum();

+@@ -931,8 +929,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 				{

+ 					if (dst->isPageRef())

+ 					{

+-						Ref dstr = dst->getPageRef();

+-						pagNum = pdfDoc->findPage(dstr.num, dstr.gen);

++						pagNum = pdfDoc->findPage(dst->getPageRef());

+ 					}

+ 					else

+ 						pagNum = dst->getPageNum();

+@@ -955,8 +952,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ 						{

+ 							if (dstn->isPageRef())

+ 							{

+-								Ref dstr = dstn->getPageRef();

+-								pagNum = pdfDoc->findPage(dstr.num, dstr.gen);

++								pagNum = pdfDoc->findPage(dstn->getPageRef());

+ 							}

+ 							else

+ 								pagNum = dstn->getPageNum();

+-- 
+2.21.0
+
diff --git a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
new file mode 100644
index 000000000000..d279c0812655
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
+CMAKE_MAKEFILE_GENERATOR=ninja
+COMMIT=a6cf8dce47922ebe3fca131316236e3aa7ca2d9b
+inherit cmake-utils desktop flag-o-matic python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/"
+SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~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
+# Keep this sorted, otherwise eliminating of duplicates below won't work
+IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
+
+map_lang() {
+	local lang=${1/_/-}
+	case $1 in
+		# Retain the following, which have a specific subtag
+		de_*|en_*|pt_*|zh_*) ;;
+		# Consider all other xx_XX as duplicates of the generic xx tag
+		*_*) lang=${1%%_*} ;;
+	esac
+	echo ${lang}
+}
+
+prev_l=
+for l in ${IUSE_L10N}; do
+	l=$(map_lang ${l})
+	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
+	prev_l=${l}
+done
+unset l prev_l
+
+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[-gles2]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:0=[icu]
+	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libfreehand
+	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:= )
+	pdf? ( app-text/podofo:0= )
+	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
+	"${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
+	find_package(PkgConfig)
+	pkg_check_modules(ZLIB minizip zlib)
+	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
+	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
+	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+	EOF
+
+	sed \
+		-e "/^\s*unzip\.[ch]/d" \
+		-e "/^\s*ioapi\.[ch]/d" \
+		-i scribus/CMakeLists.txt Scribus.pro || die
+	rm scribus/ioapi.[ch] || die
+
+	sed \
+		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+		-i resources/templates/CMakeLists.txt || die
+
+	sed \
+		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
+
+	has_version ">=app-text/poppler-0.76.0" && PATCHES+=( "${FILESDIR}"/${P}-poppler-0.76.patch )
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# bug #550818
+	append-cppflags -DHAVE_MEMRCHR
+
+	local _lang lang langs
+	for _lang in ${IUSE_L10N}; do
+		lang=$(map_lang ${_lang})
+		if use l10n_${lang}; then
+			# From the CMakeLists.txt
+			# "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
+			langs+=";${_lang}"
+		else
+			# Don't install localized documentation
+			sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die
+			safe_delete \
+				./resources/dicts/README_${_lang}.txt \
+				./resources/dicts/README_hyph_${_lang}.txt \
+				./resources/dicts/hyph_${_lang}.dic \
+				./resources/loremipsum/${_lang}.xml
+		fi
+		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
+		safe_delete \
+			./resources/dicts/README_en_EN.txt \
+			./resources/dicts/README_hyph_en_EN.txt \
+			./resources/dicts/hyph_en_EN.dic \
+			./resources/loremipsum/en_EN.xml
+	done
+
+	local mycmakeargs=(
+		-DHAVE_PYTHON=ON
+		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DWANT_DISTROBUILD=ON
+		-DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
+		-DWANT_GUI_LANG="${langs#;};en"
+		-DWITH_PODOFO="$(usex pdf)"
+		-DWITH_BOOST="$(usex boost)"
+		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
+		-DWANT_NOOSG="$(usex !osg)"
+		-DWANT_DEBUG="$(usex debug)"
+		-DWANT_HEADERINSTALL="$(usex !minimal)"
+		-DWANT_HUNSPELL="$(usex hunspell)"
+		-DWANT_NOEXAMPLES="$(usex !examples)"
+		-DWANT_NOTEMPLATES="$(usex !templates)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local lang _lang
+	# en_EN can be deleted always
+	for _lang in ${IUSE_L10N}; do
+		lang=$(map_lang ${_lang})
+		if ! use l10n_${lang}; then
+			safe_delete "${ED%/}"/usr/share/man/${_lang}
+		fi
+	done
+
+	if ! use scripts; then
+		rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
+	elif ! use tk; then
+		rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+
+	use scripts && \
+		python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
+		python_optimize "${ED%/}"/usr/share/scribus/scripts
+
+	mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
+	cat >> "${T}"/COPYING <<- EOF || die
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
+	EOF
+	dodoc "${T}"/COPYING
+	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
+	local size
+	for size in 16 32 128 256; do
+		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
+	done
+	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
+	doicon resources/iconsets/*/scribus.png
+	domenu scribus.desktop
+}
+
+safe_delete () {
+	local x
+	for x in ${@}; do
+		if [[ -d "${x}" ]]; then
+			ebegin "Deleting ${x} recursively"
+			rm -r "${x}" || die
+			eend $?
+		elif [[ -f "${x}" ]]; then
+			ebegin "Deleting ${x}"
+			rm "${x}" || die
+			eend $?
+		fi
+	done
+}