app-office/scribus: Fix live ebuilds support for Qt5, #486288

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 52 insertions, 28 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 15e3ec33e88f..59732fe36d97 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/scribus
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.196 2014/09/08 16:32:37 nimiux Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.197 2015/01/28 08:49:52 jlec Exp $
+
+  28 Jan 2015; Justin Lecher <jlec@gentoo.org> scribus-9999.ebuild:
+  Fix live ebuilds support for Qt5, #486288
 
   08 Sep 2014; Chema Alonso <nimiux@gentoo.org> scribus-1.4.4-r1.ebuild:
   Stable for amd64 wrt bug #519890
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 82395aab5b42..9fe1242ac950 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX scribus-1.3.5.1-system-hyphen.patch 3754 SHA256 f17ef356e0c096b71e83048a4c97b53e455a73af7f25bc9048136c8000744e67 SHA512 0dae24abfc63253d3979398073645a510a872cec685c83d2c854221c9537b86c4285e248b42fa8e09aed5e8b8b83b5365eec9b4769db6a513d3010536b832d81 WHIRLPOOL 16b3101ca254f96507e1bc9675dc871d6b766a8f0a780b28040e0ceab88b42c2729347da57e110ba4c60b7e6773d941406b86003d6fc372407ff17969b58a8f5
 AUX scribus-1.3.6-podofo-0.8.0.patch 1749 SHA256 498e2ec592175123b54cc090b1b839c8452c1a1a768d9b29737c5386aad963b7 SHA512 b3215b9028875288c1848e69c00dbc84b5375b29954394af75291fe9352950c45412f9471becd9d38b9dbea7c4a66899ddb1a0021d557541056185fc420a51d6 WHIRLPOOL 6ef3d13307334fe2a9338d4088b88fe7d43303e6f12e4d93eb2b03a51c70ef8985915a7a653a61e740f825009032cbb7dbdf13ad3371b476dc90320e6b3a303c
@@ -16,23 +16,25 @@ DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad
 EBUILD scribus-1.4.3.ebuild 3870 SHA256 4fa63fe3561abc61956ab3b159e13010f90c30a89db2c0ce07ba5d2939eb7110 SHA512 d462c22fdf9423e36a06b3a2a068f4366bf4faaec3e0609c2b16d3d1eb4cd9b1a0e8951d1ad7552ce3ea47ce477b54b5f7988d6afc1a7b7147282b1d4477cf02 WHIRLPOOL 7046c1f4d806de3b044677620c47858ddda69f54b6fa0efaee2b499cf953fd042855e1dc428316b78af31fd4694992b1e3692328ec53154a5a291ac2e2374188
 EBUILD scribus-1.4.4-r1.ebuild 4116 SHA256 c2eb3a1e9c5487085ae0e928a997df15191432b5a642e4e136095b0a4dbea404 SHA512 1e24ac51561a2e7994f156e23fe7fdc6e6d6be3ac121cf4c5421ace10aa99b8fc590d9bea8f1a23af4a0003096b821949c3ea2072564042e73bbe5888f3840a1 WHIRLPOOL a1213329a976a6570406336e35235b6acb816deda2a598183cbf7875be3416ca381f8da0d4b5ee470a397d5998d9bf0728c9ea86ff7f131e48e5d021779817d2
 EBUILD scribus-1.4.9999.ebuild 3980 SHA256 128439f5422e8fe164daa6d009ae86332bdf1c1ee9bb6de3d4e73854ebd6d528 SHA512 ae6331a53c82a11e4520011ec130776719a52bba08006a33077a5ccdd8e0645d41d9f01b8ac9763ab1ce6539380602569cfec842f5b095cc90f3630006e28b2c WHIRLPOOL 13abbe23339587854474473c15ec8396a72ce253ea41999804b3fa9cf72673923dccd84573d811fe3c7a638d05d584fb2f91ff43921d4bed0c859a08ed670703
-EBUILD scribus-9999.ebuild 4106 SHA256 3b85e9115115abe71195a4d8cccba1242c6252348bb4f17d97c5c4e4d596e009 SHA512 d5cd4ae30f6d9ee81e652c543a7cca790b1eecbc379c96c49d8b4d2c7dfac3f94377f6b550b0e3f96291d1e06afd5a73ba7941f1d68000f975e1a7bfbc8ff77e WHIRLPOOL 597da55784d33404bdb4e14a2db6ebfb5b03f5196ce10bb0f31efb88964cebbcdf1ebac9cabf9d0b1f3ca815f45c0bada2c06857fb5fa26fc5f222105ba0b1ce
-MISC ChangeLog 26007 SHA256 5af6f6815799fb7a08efa673d0c3dfa7137468c5d1336afa588d750e2a8e2968 SHA512 13d3460250ec1da5550b61c55d5c76922a4257972bb99fb7250e213846a2696d290e56f91ffd69864a8778251252fa11b764d3d862ff141820700bfe75a59b91 WHIRLPOOL a228fbf58db0c1b8b47453536147888b34ae0f6a94b2182b01a89d8217e9879ae6174b91796554fc438be6c631c8fd1b780233a78faf8dba8132433f0739bcd6
+EBUILD scribus-9999.ebuild 4568 SHA256 d8610f55a9079fa709e162b0825a0717d4371280e42b9d2946dbfb4c5a2426af SHA512 a4b806185079c4dbbf58c05850765de1f2da0c8cc2c572514df8017c1921cdc23bbebc3a756574d4383079ed951b620a40d389566c4fe595d68b45bb1fbd1bdb WHIRLPOOL 89a935b8006373da2c5d592b0a83bc01f24e543e748a8c769cfacc8aaaad3647f0b5eb3e06c7c41f5a02adb329daf2a36712fcc7ff4d9ff74e2c3d38641d25d6
+MISC ChangeLog 26118 SHA256 fc969bbfc66335a35fe564006cb8a0303275cbd9ce4e5dba048e289e8eeb256d SHA512 5bb9b883f2ceb29038c40a794104c37f85093f64aa935cd89eb7bd529c43fa258ecb5e900792759d6fb4669b579173bf542df1bc6f1ebf168346d6fd58a7ea9b WHIRLPOOL baf5b87d40069e9a712cb84346c494666f14c394bbb69ead3574e3674390170c27a032cc062671ca0a79a7502495492da3717fd53514ad27c09d95c80517e802
 MISC metadata.xml 1525 SHA256 23a06249a009e2b5fb3b11d1d2e9790ae25f9898333bb885d5764fcdd7a146a9 SHA512 8ab161b6a1b6981f8a81e95e62b514886b893d57243540f6f2f66c076047c147600d8f5d6b2341f667a70fed53d6ae74f427904c670aa4b5ca35500d81997ddf WHIRLPOOL aaaec9da2b5a731190be8b3b1fb3956fa88b9f6e59bead78db610d146fe455ae766ed8af21e40109486a37d8eb6022392c350bcef374c140a269bd38d6dc2914
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUDdp7AAoJEH/rgyzyU9sVuI8QALFD97KwH5MdqO+lEZNtV2tm
-zMmQh8F/ikU2d5ltHeMMY/jSxt99fuVwGOIJjyIV01UYJAcInioq7XEwpwYt4opi
-g2VlAr1hOBA0JVknzIVJslDUhu2slCPoBqayHUF4KGMcXK4kBOBX3eDJW99Gv3OZ
-VTeS79iDgFpjyPVXLrGz5vcfQX9L8F53pEN75BwW0ycpDi+UryZcgf43b8ORREE+
-jKmaalYvOnzpvUT7M1MLMZ8DBn+JwGaLlmcDmJjjB6uFyjmLU0cJbWfk0EQZXw5m
-rNeWMx8/DIaZ0PWpin8UX3EY/triyYztl56XBWNxKFdQzoSMVAvlJTRsr/wo3xce
-B2PHHv5QKU2EIBnz7wMaGxjMMe619dXK9cNCqGLHt+gtV/GDDtGYFxZ/bWayXVA4
-PHH/+i9dzOCRK58SwDCc+bTgZQpfC2VZKCpYAB6gYvk28U7aWGxTXqRhQ0q1wYbZ
-G1cyuQ5A8A0sR4zjhBYTYyGHyikc9GXTPThuDUYmMSWgzUky6FtOWk3XDf3xz6zj
-degfwRbMjxuZP3q3mtLaLbUNhdGz2r3HWd4z27lV3VvhrDGExmxQSEUqIQNHcFbP
-ao1OVBGR7CWQUl+wiWRyTsiyHHwRsClfLoxS2TzyqIdG+OvjPHrvZru6KHu3eTU6
-0yEDs8x4Llcpi4An0VUA
-=Cmp5
+iQJ8BAEBCgBmBQJUyKONXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirh+UP/i8R+ELvWt1cqVZlUUUl9JLe
+UfGH3/nMDhSOVKHQHDgJPnGApf7n9Fg0EM4FB9fOe07sxn2hZVsWHQDVTxbz1Kpd
+OrjTwVwl36IkQDtAUOUwz3RYJc0+MWzUCiBIxcHz0c5dDDnmcPDj0foKH+ZtmDd9
+Egfr1yRgtOxdTxnCJ9Nsula+SGl/DEXshSazWzDFPGF09kuDAELuYwLME6j7KtEm
+WtpuCC1ricEyIY3eNda3yQmF+dpKRMkcisRLl4sx3DmvKLIvKyVWHJWaZMrGLcnv
+YbDjxF8GcIWo47KwQWVbpEDmp5ywWI2i2hoVmSZj18ZpJ9/YHATebSlHEIPdxX9/
+oS0VrWt/6qjJc6FjwFVh4RXMgXA2qKUO2RD+kGmjp+0NJzFF1M95/944uRUO7J3W
+SPUJB7z4vJNKPc5X6Oxg0Ye2IjAE101AlhLS0UvDF84w73ROv8BHr0rJPhn6MdFl
+QMuUATgrTnAkOfDr6iN2LUCXkHRzxzb2yEM552cjv+ybAb2vUKeaooDcC5NQK7km
+eSv1kNXWYoQfEbOpIykT492hpJYIhdy0OEt7ftT+4FOvRO4tgOV7ic6AWKTBGf41
+HRLNTIwkb3oDBJw6VoYKHGhVdzrskKk4kuN/yvHiWtyiy9SPRoXy67uhOjngCLFa
+k0KWhHtpzbI+q4EA+PlL
+=AgH0
 -----END PGP SIGNATURE-----
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 27b1c572d8ab..2648f1eda0f9 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.10 2014/08/14 07:15:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.11 2015/01/28 08:49:52 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
 
-inherit cmake-utils fdo-mime multilib python-single-r1 subversion
+inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1 subversion
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"
@@ -28,28 +28,44 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	tk? ( scripts )"
 
+# osg
+# couple of third_party libs bundled
 COMMON_DEPEND="
 	${PYTHON_DEPS}
+	app-text/libmspub
 	dev-libs/boost
 	dev-libs/hyphen
+	dev-libs/librevenge
 	dev-libs/libxml2
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
+	dev-qt/linguist:5
+	dev-qt/linguist-tools:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libpagemaker
 	media-libs/libpng:0
+	media-libs/libvisio
 	media-libs/tiff:0
 	net-print/cups
 	sys-libs/zlib[minizip]
 	virtual/jpeg
-	cairo? ( x11-libs/cairo[X,svg] )
+	cairo? ( >=x11-libs/cairo-1.10.0[X,svg] )
 	!cairo? ( media-libs/libart_lgpl )
 	hunspell? ( app-text/hunspell )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	osg? ( dev-games/openscenegraph )
 	pdf? ( app-text/podofo )
-	poppler? ( app-text/poppler )
+	poppler? ( >=app-text/poppler-0.19.0 )
 	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
 	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
 "
@@ -63,6 +79,7 @@ PATCHES=(
 	)
 
 src_prepare() {
+	rm -r codegen/cheetah || die
 	cat > cmake/modules/FindZLIB.cmake <<- EOF
 	find_package(PkgConfig)
 	pkg_check_modules(ZLIB minizip zlib)
@@ -80,6 +97,8 @@ src_prepare() {
 		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
 		-i resources/templates/CMakeLists.txt || die
 
+	use amd64 && append-flags -fPIC
+
 	cmake-utils_src_prepare
 	subversion_src_prepare
 }
@@ -133,8 +152,8 @@ src_install() {
 		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
 	fi
 
-	python_fix_shebang "${ED}"/usr/share/scribus/scripts
-	python_optimize "${ED}"/usr/share/scribus/scripts
+	use scripts && python_fix_shebang "${ED}"/usr/share/scribus/scripts
+	use 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