app-office/scribus: Version Bump, #511798; drop old

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

4 files changed, 42 insertions, 175 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 2a8d70401d5d..cf742f3d7ce0 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/scribus
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.183 2013/09/17 15:58:17 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.184 2014/06/02 07:12:17 jlec Exp $
+
+*scribus-1.4.4 (02 Jun 2014)
+
+  02 Jun 2014; Justin Lecher <jlec@gentoo.org> -scribus-1.4.2-r2.ebuild,
+  -scribus-1.4.2-r3.ebuild, +scribus-1.4.4.ebuild:
+  Version Bump, #511798; drop old
 
   17 Sep 2013; Justin Lecher <jlec@gentoo.org> scribus-1.4.3.ebuild,
   scribus-1.4.9999.ebuild, scribus-9999.ebuild:
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index f9c41299a478..1b3ff76f1cbe 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
 AUX scribus-1.3.9-cups-1.5.patch 840 SHA256 1bd000e5d7813b484727a468c9b49f85662a7c6a94140025b6d8eba6fc49f245 SHA512 924f24ff989691aadeb1ca3aee27ea6163f22533340200e3b24a4611a437bf04e2ef6d6decb132271865db1189e54d7be7c524a5ae129b9f7ca6a5799aac8560 WHIRLPOOL 74506602de91ca340b4c6c133818f9d0199f16e42021517810e2d8a29a5018d58b25a19fa078902f28292bd0f6cb8d8ace4278f51c10908f9105741bc17d7b09
@@ -12,30 +9,12 @@ AUX scribus-1.4.2-docs.patch 814 SHA256 5676964e58f241666a0b07513e55055e9badc562
 AUX scribus-1.4.2-imaging.patch 859 SHA256 1ff5d40c526871592e51c58e89416d5e4eda39810b2cf918684872f64a89100c SHA512 430e8cc8e8425f9d41559efac6bc6aa3749c098aa2c0c2deef25e2fa41f8a300e634cdb3e27c09d0c293276165f71883ec56e5dcc7e27b8c1fbf252e6a925e79 WHIRLPOOL 368da6430a33f94fb072183a1351c9bc538c912f62a5a4ee5366488e712d12b5c368642f6b47fe185aaa09965a355d82173186dde81ffee23deb542a3abccb6d
 AUX scribus-1.5.0-docs.patch 751 SHA256 7b34557bc506b9b2f6d2c8d968e619d080ed762586a9eb1c3480d7b2cbc23586 SHA512 d0de059a60c8a3a9545d671f819072a45b68f5955987652eda282dc9edbb5eeaf26a49f7dd06bc00c64bf2d71644e73129594760c8ddfdc1eee7be4dc4a95940 WHIRLPOOL 7c30d33e2a4e40748e1db79064f51184addda67cb845fd2f8bccb83aafdc46dd82a5c02580d66e75ae4f3de99f3ca6710ecd5b4cee61a9f40bf87391d16c78d0
 DIST scribus-1.4.1.tar.xz 63039820 SHA256 6853fc40cd178d0dcefcc9305fba6824bbe7fd915b0eb277d742b13297f8c7d8 SHA512 726c5f05644e573c13e741ed356ce5bd8366b824c71e587167b9c73f5f1ab6eeb7c78f26f2146cbaf09921fd583b1758dc1d3cf1d1c79d1bb8be586df88f055c WHIRLPOOL 0592405daa4b092d2861c6697a835d3564b30fa4fcbd50bdb5d743269ac8113f4dd5d8f187dd1fdcdd2358b28772905f46c3737bea79dfb5f1120b107bfc8c30
-DIST scribus-1.4.2.tar.xz 64405272 SHA256 b951d47913e800b31675fec94ae4e81dc2ee0247506a9218211db62da6386563 SHA512 17c65b39974bfb54d494afd687fc3284350b68da3d4c41cd874101a26d42a03a55b1110d3e14bda25ced1078c825576d8de61c8813a5026a680173a7e74bc63a WHIRLPOOL 570976044e7cfd3386dca5f8895f9b147bf2ee1610d70a133731b5b0a0f75fe5704b9c28ea059f14d1c4ca8947b9526edbef2e7ff4a685ca3e4f4ca6f85590f6
 DIST scribus-1.4.3.tar.xz 70503072 SHA256 c72ef314c32f995895ca5025127e65ffeccbe2d445c358bca334a7249ea0afff SHA512 e4841b346803bc096c2e00b2071d03ce3bae6af8d7317353ebf8e724b5a9b6461d95406bee61c2a316bc6ee5d9e302e3fee7b51dd89eae9adc9e69b3aa40454e WHIRLPOOL fbcbd4ecaadb868d836848ef2656df4a1dba58ce7f7b27a810818604f9a2875c948e91484475a68b034d0cdcd9457b925701a8435a687c7cea0c2606f4d8cfca
+DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
 EBUILD scribus-1.4.1-r1.ebuild 3290 SHA256 e86d7565f83a523cf4d7c6fe437c1c3b2aed46deff58270cb824c7f756f5e8ca SHA512 094999dc18397488da34f764ce4412c2d61f82049c3d61fa110d66d04dbe8223bff421afe716fbf6e279831f945cb03c5a51164f3c069e323d623a53c765a48f WHIRLPOOL 2ec61756f0f43e1eccb29edbe0ab7c74287e7264bcad644976fcff8366afaaa9572f97c178a975ad675e0c50dbea957f5ceb64fad55e0159d6beffdb96485e81
-EBUILD scribus-1.4.2-r2.ebuild 3485 SHA256 eabfcc0518eded07406ded2b95bd29582caf0488cade86b4167f477d12019137 SHA512 d40325a9f93bf4e2fc80fc9b5cc505d9ec9aceb2623c89141769d0c387746a99943a40454605c30875694a973ef7844e28822b355036ddf359c97bbb40b2ab08 WHIRLPOOL 2de61419b0d004cb660e826b8a6ea619b5eee2eaa2d4beeb92c837f4cb39cd44e31ff4826b4aee24eef96df48450c4050b38289018fde82cd84a8af7c295d43f
-EBUILD scribus-1.4.2-r3.ebuild 3578 SHA256 920bacce965aef842407251e92d0a74c88ca74baf999f4d3580dc28df386b5b2 SHA512 5538a01a3cc154f670198aaa7b9d62f6712161b52377da774e3b71d2b6b9d2d9c4b1de1dc02144f6a53c94b111d1aad7473e51c2fdbbb11e8b5478aecef9ca74 WHIRLPOOL 4ec3df9a018aa8f47c47b5a942119c11282edc6a05c4a10b20dddd846d39a44d7daf9f3219684978e171976fd3f02bfaf9f5bfc0801e7714eda8ab8feadb0c18
 EBUILD scribus-1.4.3.ebuild 3875 SHA256 a8df2c2351d6cce6579bb719389571662484727680ccc1439bc6219962f4e1c8 SHA512 cb021c33931a7b52df0bba380bce952a6a90dab7e2b220de9ddc86573d8f5698802e11a2c5d098eeff038e5da450a92916c903a0c8d15219388d0c22baea5a52 WHIRLPOOL 539793b1e9949264c8131da3d64fc10852f36e3f4586acdb9b7050868e7b6bf815ba83760adc378d243a7a5c524db5b5634fc523e4b92e161ecbd77c0c0c7566
+EBUILD scribus-1.4.4.ebuild 3869 SHA256 391eff6771f096b5109dfdfd068d185337692abb51717fa4c1bf8828234cbf30 SHA512 a5494c2645f2011d1ee5b585c62b363f0f87f83da058e2a103c20cb42619298cdc39ad5b644b784bc48fcf9d51740f7e8ca1d838d41479e1ea4478508e1794b1 WHIRLPOOL e686b3c1e77d5ffb404ace7dfae758396f652ee94c2c69a9a57089d663efbf7beae592bd0ab6d8dde3c0d73274970ef612ba8db56e5751794cad0928fbfbe8be
 EBUILD scribus-1.4.9999.ebuild 3517 SHA256 c0e5db000c332f77c342256ac8efe14697cbf763088b3031136ef8567c2fdf91 SHA512 3381824ea8137e6c2ea8c8f0fef3dc9bb00ef3e1baccee2fbcaa70fe21f1ff6a7cce47264937ff462601d487be10efe6cfa438e7eab84e7b775e312952e030eb WHIRLPOOL 49c519a560a23203f9b6e83505f212fecbe6b5d03e5701e01a3234279314c1399cd41400453b5d706a60291945a673d1bc414296b493a25319b0f1b2230dfa8f
 EBUILD scribus-9999.ebuild 3719 SHA256 c0b32b0848f4bfdced5b1f3901d9a2094c04ce306825b212e249d8685049a7c5 SHA512 efa7a309945077a017cac92e7c57dad771ea62ba74e00a9abc1fbefd33c83fb403c9d0a06ede535bd9ffe321b871afbd949734a41d7eb626c2b05b1be3541d32 WHIRLPOOL 5dcca829be08c53f8ce8b37a2967d216a8637fbbf1f4c52d12a208afdc20c78ba88dd528dacbb00b67a705a28bf8558e0ab93fbf34115878e9d000ecbacebe95
-MISC ChangeLog 24376 SHA256 a1879b1a66e524d2c0ccc51a7ff3e9dedb6d6754de2277dbb906159179dffeb4 SHA512 bb018947319522df46e89799d6adaf572919c5b9049991e43c6fac7542e9009e9edf19956ff144239f272d64d2ecfd1b8e79c08ec57b94d82700548d40a0b35f WHIRLPOOL 33ddfee239ef095b62fc0348f5d0cb529bc7a01f4e218517dcef6ebd72baf7c5eca9ffde0ec27442bc9e590f86662ec80962666434828773577ba3fed482a0a2
+MISC ChangeLog 24565 SHA256 616e1862b4876761f093f0962ed31946adec3382aed5bbeea9bc993ef2c65208 SHA512 29b1174955da178d9be87a8cc63634543af558f20442f023cd8386834ab63b2937c9ff45a774d192456e8d92f565b344c14308b65d077f9a39c071b5f2279b2b WHIRLPOOL 78474e0d71fc16bce30e3f245c846c7f0be1d34ebb1969ee681d6e0e56f2b2d1e9c1ee10ab1c2d71c1c1df42ee07cd617f006486cf5bfaa0ff7b9fdd789895a2
 MISC metadata.xml 1572 SHA256 eefb6f38e8472d35e1849b7fd22a8e34b00cd36ba642386f6dc80189cbe3a9f1 SHA512 90992fb4c7aaa4c25a13681a031ff4e0be76bf9bda808ab4f2ce4eda731aa5232571fb57cbe2e7c52ae0c75cfc1cc6948b36df8656dd6cdcc852fb0a566204a4 WHIRLPOOL 8a613724bea353439a6491f8a2081e8d0a15042df15ca56a7cb656a69c997e38df83786015268708c7cde2ab524abe60c827b254d30e7b7fa25419237f324cff
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSOHwQAAoJELnU8jG9FVirdXkP/28UlvvesJPX+T/QJplVhOFA
-a0hGWULXM4/VG/BYYiexTmfrYyfI6IK2o3sZHoJU3lgcGiQkHzGj2IU44/2Lo3C/
-bTojU9aGAtg+xnLdNfWTBK23CFJySCAVLI3w1nbJCuE14BK7DlJrhRBg8yiO/qa1
-NFsYmxHP1rgKkvaIkm3hRZRy07szlNy8qStxUXX1z5rPQdwB8F9bwK2wmdax9oKO
-j+9PjKprBuWrxUTS8N7kBhoyZ3pN/qxXdm6+j0kQ0GIoHzP6bdeG31Yh+3noLQ2K
-T6q0y57MAm0xpPqLYXCpr/1h38T90Zl1C0Os98wtDw0yy8d6z1X7qLKWTEUmsxuX
-/orhBIJIC5yR2KJTmNSFJDKFNRlvBxZ8x0MTahpDxVUjy5MShEm81uhkoNic7e8M
-tTHANCiF58QRsBgM23hXh57HZIJNxwzQ5Yb4IOXPRAazaZvuOs253M31kog9IYSJ
-cRS729LmqduGmlc8yabAllzGd6a0H7SqYIoFf0XFiubkr4X1GpmiaYv3MaBWDGqg
-koCtIErsMvjddlCRSV0aMmW6rnHSRnM22qBtqCnTMqjmUfVcuBGVLeXOxe9HW20K
-bM/HGfWWB8BBQ3DE94lz9xEoElsJyuSCcbvnD1f7ogrNhSdHKlcdfJwcO9uymKWm
-EX4GHx2/3VKhow6rrBRo
-=zxzT
------END PGP SIGNATURE-----
diff --git a/app-office/scribus/scribus-1.4.2-r2.ebuild b/app-office/scribus/scribus-1.4.2-r2.ebuild
deleted file mode 100644
index d5e681b0139c..000000000000
--- a/app-office/scribus/scribus-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.2-r2.ebuild,v 1.4 2013/07/02 13:55:01 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE=tk
-
-inherit cmake-utils fdo-mime multilib python-single-r1
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aspell cairo debug examples hunspell +minimal +pdf templates"
-
-# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
-IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
-
-COMMON_DEPEND="
-	dev-python/imaging[tk,${PYTHON_USEDEP}]
-	dev-libs/boost
-	dev-libs/hyphen
-	dev-libs/libxml2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	virtual/jpeg
-	cairo? ( x11-libs/cairo[X,svg] )
-	pdf? ( app-text/podofo )
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docs.patch
-	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
-	)
-
-src_prepare() {
-	cat > cmake/modules/FindZLIB.cmake <<- EOF
-	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
-
-	rm scribus/{ioapi,unzip}.[ch] || die
-
-	sed \
-		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-		-i resources/templates/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		if use linguas_${lang}; then
-			langs+=",${lang}"
-		else
-			sed -e "/${lang}/d" -i scribus/doc/CMakeLists.txt || die
-		fi
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-		-DPYTHON_LIBRARY="${EPREFIX}/usr/$(get_libdir)/lib${EPYTHON}.so"
-		-DWANT_NORPATH=ON
-		-DWANT_QTARTHUR=ON
-		-DWANT_QT3SUPPORT=OFF
-		-DGENTOOVERSION=${PVR}
-		-DWANT_GUI_LANG=${langs#,}
-		$(cmake-utils_use_with aspell ASPELL)
-		$(cmake-utils_use_with pdf PODOFO)
-		$(cmake-utils_use_want cairo)
-		$(cmake-utils_use_want debug DEBUG)
-		$(cmake-utils_use_want minimal NOHEADERINSTALL)
-		$(cmake-utils_use_want hunspell HUNSPELL)
-		)
-	use examples || mycmakeargs+=( -DWANT_NOEXAMPLES=ON)
-	use templates || mycmakeargs+=( -DWANT_NOTEMPLATES=ON)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang file
-	for lang in ${IUSE_LINGUAS}; do
-		file="${ED}"/usr/share/scribus/translations/scribus.${lang}.qm
-		if ! use linguas_${lang} && [[ -f "${file}" ]]; then
-			rm "${file}" || die
-		fi
-	done
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-	docompress -x /usr/share/doc/${PF}/en
-	doicon resources/icons/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-office/scribus/scribus-1.4.2-r3.ebuild b/app-office/scribus/scribus-1.4.4.ebuild
index 452c3dae40b2..733949ac053d 100644
--- a/app-office/scribus/scribus-1.4.2-r3.ebuild
+++ b/app-office/scribus/scribus-1.4.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.2-r3.ebuild,v 1.4 2013/07/02 13:55:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.4.ebuild,v 1.1 2014/06/02 07:12:17 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE=tk
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
 
-inherit cmake-utils fdo-mime multilib python-single-r1
+inherit cmake-utils fdo-mime python-single-r1
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"
@@ -16,20 +16,23 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="aspell cairo debug examples hunspell +minimal +pdf templates"
+IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
 
 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
 IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
 IUSE+=" ${IUSE_LINGUAS// / linguas_}"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
-	virtual/python-imaging[tk,${PYTHON_USEDEP}]
 	dev-libs/boost
 	dev-libs/hyphen
 	dev-libs/libxml2
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/lcms:2
@@ -37,21 +40,21 @@ COMMON_DEPEND="
 	media-libs/tiff:0
 	net-print/cups
 	sys-libs/zlib[minizip]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
 	virtual/jpeg
 	cairo? ( x11-libs/cairo[X,svg] )
+	!cairo? ( media-libs/libart_lgpl )
+	hunspell? ( app-text/hunspell )
 	pdf? ( app-text/podofo )
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )"
+	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
+"
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-docs.patch
-	"${FILESDIR}"/${P}-imaging.patch
+	"${FILESDIR}"/${PN}-1.4.2-docs.patch
 	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
 	)
 
@@ -85,22 +88,21 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-		-DPYTHON_LIBRARY="${EPREFIX}/usr/$(get_libdir)/lib${EPYTHON}.so"
+		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
 		-DWANT_NORPATH=ON
-		-DWANT_QTARTHUR=ON
 		-DWANT_QT3SUPPORT=OFF
 		-DGENTOOVERSION=${PVR}
 		-DWANT_GUI_LANG=${langs#,}
-		$(cmake-utils_use_with aspell ASPELL)
 		$(cmake-utils_use_with pdf PODOFO)
 		$(cmake-utils_use_want cairo)
+		$(cmake-utils_use_want !cairo QTARTHUR)
 		$(cmake-utils_use_want debug DEBUG)
 		$(cmake-utils_use_want minimal NOHEADERINSTALL)
 		$(cmake-utils_use_want hunspell HUNSPELL)
+		$(cmake-utils_use_want !examples NOEXAMPLES)
+		$(cmake-utils_use_want !templates NOTEMPLATES)
 		)
-	use examples || mycmakeargs+=( -DWANT_NOEXAMPLES=ON)
-	use templates || mycmakeargs+=( -DWANT_NOTEMPLATES=ON)
 	cmake-utils_src_configure
 }
 
@@ -115,6 +117,15 @@ src_install() {
 		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
+
+	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
 	docompress -x /usr/share/doc/${PF}/en