Drop old; use subslots

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

7 files changed, 25 insertions, 569 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 18e60740df3a..9786b6f442d3 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/scribus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.213 2015/06/15 19:30:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.214 2015/08/05 09:11:47 jlec Exp $
+
+  05 Aug 2015; Justin Lecher <jlec@gentoo.org> -files/scribus-1.5.0-docs.patch,
+  -scribus-1.4.5-r1.ebuild, -scribus-1.4.5.ebuild, -scribus-1.5.0.ebuild,
+  scribus-1.5.0-r1.ebuild:
+  Drop old; use subslots
 
   15 Jun 2015; Justin Lecher <jlec@gentoo.org> scribus-9999.ebuild:
   Adopt to current HEAD, bug #551816; use ninja as build engine
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index c001cd436bec..bbff9a5b0225 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -6,35 +6,30 @@ AUX scribus-1.4.2-docs.patch 814 SHA256 5676964e58f241666a0b07513e55055e9badc562
 AUX scribus-1.4.4-ppc64-fpic.patch 1137 SHA256 6fddac38cc50624b51403c1828a6dddd3cfe53cc364c4a3de53c9509fe4753ad SHA512 3160f4b8ac876cddb2fb5b1134b06940456324c8f7ffd8df29e1578ac6543d22b9603d43b14f7ce7b8359e2311675777395555b07b78bbcffa93ac69c490de9f WHIRLPOOL d3af321c629b260a2d449e4cd44aef9ea8b9ce34ebde8a5314b31643be7f7b5ed6ad116c9f84c9f9f147fa99f8e62dc03838fb3bfd7f0d042597ee442af4d462
 AUX scribus-1.5.0-QObject.patch 596 SHA256 3bc002fb9fbb62b32bd2651d9645b2552a1f42d005eb1d3d6d6d3526a1a6cbef SHA512 97d21d7c301baaf2b610a8adb626401214c174a8f377547ce1484a341bc06a712bcd4009ee8ebc987fd35affb3cb870fc4855843f5f94097dcefa52ab1369c7d WHIRLPOOL 8c828da9bf555c9f6525d510b22d8908f0c570d3710b5286a0b0b763db1359cbb26bf4e1abfa2a99bcae16e0bb42c390a46a6ec184f117435dd6b93a4c884b13
 AUX scribus-1.5.0-docdir.patch 1573 SHA256 ce825d9b85b585f322dda4aa7b9fb71269cc7e84338108a24a66e75b0f802c57 SHA512 fd65a84a2d1f3c432b776b722f68d28b4471b27c8e49dfbc6b616d6ff7f02c96e9c73ff94df3c4aa055b6868dc2a8e80dd6367c474c353f96b55359abff0844a WHIRLPOOL 3ba14965c68ab2f5772ef19af6d46bc7b4c825455be6170826994d278ebfdd9eb1a49124f21543d7317a7112b2defa0641ccd0b636907145e939be5d03284698
-AUX scribus-1.5.0-docs.patch 916 SHA256 083fddac4b6ad08cf8859a95d425f8c70831fa19f86491baac600b86939aab1d SHA512 be5c86466490414724f4293450200fbcbb10c69d7a23e3589591f38c2e333af76227a01575836fb4bb28409366aac6b8d2c2b1b881ed7439c81e1739835723b8 WHIRLPOOL 38159673d5410186088011417eb9f6671e98662e86af3925da05dd8564eb52b898403f7ec7f6648971c14d2377c9a56c67dddaa52850447d9dd8fb2d85ec9679
 AUX scribus-1.5.0-fpic.patch 6395 SHA256 5a2f697ffa3601b9a582d7683402470c4b2db7c47b37bf429afad656f8ba40f6 SHA512 b26e921271656d579b4578a6118fc26fc77557e4842e24231ba7702b024aac0f43954d46857ac2056ee992a485565cc781dbfe0ec9b3eb993429924b6a76f501 WHIRLPOOL 1ca43d27bb68dde90c992c1f6c4212e86062f3aefb0cf385024cac8028199beae1e0fe487d3d6d06698ab06c49b79a8888d3bf440a01ab73ffea1e6659f8b46a
 DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
-DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
 DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
 EBUILD scribus-1.4.4-r1.ebuild 4150 SHA256 68314e0699df533a1c16acb367306d7f792449c4fd00c22abe543704024babac SHA512 528362a1240dc4ce9ce80f384e1f7d6503d5b2207880f0ecc420ae58996123bc0a19bd20a4af27f3508582df51db2312492a34a6f48121cffe392cbcdd070885 WHIRLPOOL 4f13a0d579fc2a51b57b82464b452cea32b56ef4cfbe809115e6b84500a0b27c6fe7e0deda5e8e64e46c32db073ea2285f4f4f5f3f61dead795aec15a3800ecf
-EBUILD scribus-1.4.5-r1.ebuild 5197 SHA256 2dc18a0749e691701ad67aa98589ebcc237540dbe33002ff0a50bae20b3f2147 SHA512 07301421deb399112205563c7d1b2d446358dd816c48e94f4cb20d4e274798fc9b8cd8e0ca5d3b6c977db90f6728d0193d6472aa4394850013aca565350bb440 WHIRLPOOL ae0c6ea43d41245aabb7fc56173dcd684d255c68f3c12a0020c94342ee8d83f80b2b4ae028cfcf0c8654afed108a6978517cc3f27534e64f8c91e3209bd6afe7
-EBUILD scribus-1.4.5.ebuild 4120 SHA256 075b656f0f695f4951f72cd7e69d8adb3996686e73843b47703f10ec129a2b27 SHA512 fcd26ef6ea67a956a805cec435c6938cf190f7ed1e2b7d8ac364c6fea9cda5bcfbe7b84dddda32bbe99ad9c8a845826cd6d5eba90390e4cc954e70c4ef010f31 WHIRLPOOL 2522e5f34b6c56e35eda523821c5716bb3e937b75dac55baac01095059d40266b8be6a07a59962b348e036770e97231762081886fe60c53a802c8ca9303f13b2
-EBUILD scribus-1.5.0-r1.ebuild 5902 SHA256 6bdc67a22544cf199c1267ea105154951400d43a5ce4a9377481c8b4eabf83fb SHA512 917f64bc3dae90e404b403c821ef52a7b3e8bb7900f3741b8322f42748dced37c2a7a34921c2abc47c392249efc883a511d775220c9ad38a82a65ffb0a07fb93 WHIRLPOOL 6db75acdb993d992272ab6392ca15600aef04b4e3fe2f7cf0a38d93234a66a5a576d1fe9993aa19ab74888b70fdbbe6ed3e608d6dd8f20468545b24e60604771
-EBUILD scribus-1.5.0.ebuild 5828 SHA256 aba34ce3f7392c8a60e526c5d6c6974a2a5b5667ac350f44741d2bed11912303 SHA512 f2858ee5186fc8489bf6518c7451351b155b8edad3cc5d98929608b20097b71621651f809fb775d5ff71b3ef459ef17bd2b5b4d272f21b07103d56a5b5876555 WHIRLPOOL 5cdad215bff48b5d551056879834d9bda7656fa10db15ae0eb20cfcba03fd6894707fd6c129bc5564e05623b3ae9280de947b1ec6580caf4ff722453ecc63920
+EBUILD scribus-1.5.0-r1.ebuild 5905 SHA256 a5dd488a89e78144bbec0c368e2a090c6a069e07023bda495781c9336975ab33 SHA512 5d0aeac61efc00c458b390b7893bb5c5078caa96a981b77b1088dee06bf132abab50d9973ab8e2a13e9e43f63a83c6ebf1b41e0c2041720f4a8f4410616ead81 WHIRLPOOL 6adc33d21401e9d600e59b8da4e11c68595038815f6d721d77e6f2ecfd81eaf3041a788f18d72ea36000b5011dd611e046a4c884fca79ceda1de54e116185d7b
 EBUILD scribus-9999.ebuild 5894 SHA256 c2624f4a8123a40eda77f9458d1b204e96257117c4dcb34cf4995422431aaa2d SHA512 c37bd7a93e04c8cd1b2e110276427fa2cbf910aaf03c951f2637760b7839e790289fe05b15868c528ebe13015c54f5dd65839e627876b392029a31c834112c8c WHIRLPOOL b4692c024150f9b4d932a9b296c19d2e2b2552b4fc3b0ac1606f988a99cca7d5ac918b98c2351213aaed26e7ed4e250426a8cfdac85accf4038235944dbb6ed5
-MISC ChangeLog 28935 SHA256 255a6c3f44841864e67b4a39f35d3921664b5d904fff92bbbf72e2c49c494efd SHA512 beba5bd52684e9f15c0cd1bcdac96b4a0ebfd904a9ff84c5656c0908b521e2c8a8b9afe49ab86a8b971f26dbe62fe50287a95baa61ab834531618c1b59a9e0cd WHIRLPOOL 615beec688d214ce5b74a41d5effbd1e68ed11b3d2fb20fd05e0476577513e09b30b94370cad47bd0e674e391a9f7e67199ffd59c204546d80f33e3cfd95c451
+MISC ChangeLog 29142 SHA256 ae387a21c374d46fb2a44a47eb4b8684d7d29eace0aa6cd5ef16ba4ed86fa952 SHA512 7467b987b0683335df402c697fe15657006a24313784049a04f313a684d7b1708d18a14b9c6a3942c6405ecb57f4c731cd53dbca12160c8fecc9c278efb8c945 WHIRLPOOL f768c5d6c111dfda47c4052e0c97abc98a58129a55040553923603468788400894daf37177bffe2e0f8cdd60157933bfb9e5469ca8b2390c09a65642cfffc0ab
 MISC metadata.xml 900 SHA256 279e9a6f69c420d77bf8859a68f81638032fbf83c0d61d084d68dcbb52830dde SHA512 89d13f2a0a895bfe0b01e30839483d96e25b26164c5a5566bc18fcbb92a2e56a8daef5fbc4478d35aecdad327c7905393f2299007cbf866bdd0543b2eaab30f7 WHIRLPOOL b31847ab5b0274431dc4b3bceab9b5d22235fca15b261046d80f5df661d831f19297cc792e07fe373b157617b65da7f591e231e5a85b34fb78bd67324296b491
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfyfCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVwdNVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmid3sQAKNZAKoh0TzAx+EnptgP6ZV/
-x3sk8vwNIDYLJ58WuvLxSCNeeClsV6WuBuDx+pZmyajWGQG1VnOInxyM/KEE6exe
-lNaYgWaWJBT339aEx1+dpZaA+BB2jIQ/1KGfHqExuZmS7YZFKC51qRuXhpQ2fszr
-MueE1hvUSvJwte3oJ1OZt2P2rxGtm3F0vqHFBrvuxfDIaKLFa98qXveOczzuuyir
-AkjQBnybvOG6lTKtmn8UqAhkB7d6U/iqWR9Tctd8MUzL6yjtSl/L6o02n6OumPcM
-U9zzIv3L1i5RNxv7zi5kMvVagJWey2v4yzQHd8pnFbxsPdl9nrTXxMs4SgH6ZuSg
-QNZt0kJDs9OE80rztWIMKZ5Gr1eHfYOMGNxJLHVT+R2AWl3zD97yQYWvva+HaIq2
-Si8766eXL6eOej//aLuFHXSpcjnly71U7HzvpbzlYiH2CyLO/uEMnbJKMBIWwKhC
-By+TSEcgQdu+UjX04O8F+GRuRQIu2m1sGh+tLko7KzUbnvU3NCRFA3FZKi4Bn6mN
-ydygesHLIXT88kNEgNmqN19PMWg1Mv4w80PTzk0hpls9x7/gEqTPUKBUtJYBpHa5
-BbDfa5S0eHVTS94GEZ6WKXkUy1DxSG7OhcI709e5jL/iSkPytvDq2bUznvSIYIex
-f8XrwoBA4RFr2bphOvzt
-=RM74
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizuQQAL7wLWm9WoCxQ0xgPbi6n8T5
+X2aDTUJ7lig8+A1Z4cEA1qoim+QSpLCiaQzY6Dx6clzscuOc/vl5As4/rww3bRR7
+11AkKfMo2BaeITUnSYJXuVQLu6Hq+xzNQJb47qz79DtNa1BSK97eH2gaCj84mtnK
+nE5zwpq5v3RvZ183NUVnXbAxPN1SgQaxVccYp98R0EhV9+BN67HqCfKJWthW6U3J
+Wc3cWG4o72ID149aWiYPzuQwJk1ogzYyKVJbCYr20RWjYpXB7CjSKnW+e7Yq5VmX
+GsdUrYlNhRZODrLk79eWPYx7ul2E+ZWPd1JaTca41ndFi9Z6j+Xx+6hLfgjePTRc
+2pmmh2zANSVQ5OQ6PwL3YmfwavlIxDJp7nMEXgGrZXFatyB55tCr/DG0CXLwTAT8
+bHHiKmQ7/e/kZ83yt8+V9LSfCl1zQIw7Zrvk9+JD1eH5CW7q0kbl0zsL1q1Q/ESE
+xi6fuVucqI4PPSMYEAcZMzlv4ZD3JyzYvWgERd3Wujd1CZHVMBOUzjACzCwe97Wb
+dHI2zb6HsrRwnhMqnKLkssjx0wV1VqxWZdB0TI7JBIe4ZwJVwDJHWKBHq99sxhsd
+2rGLPu8py87uksw4nuyeQASMbBhOmk6sGBVBa5/PhxjAANrZsd1rQSRkjm1N+ncm
+OIsT+P6GZRVVq8YQpWpm
+=bsbE
 -----END PGP SIGNATURE-----
diff --git a/app-office/scribus/files/scribus-1.5.0-docs.patch b/app-office/scribus/files/scribus-1.5.0-docs.patch
deleted file mode 100644
index b566f3f6890c..000000000000
--- a/app-office/scribus/files/scribus-1.5.0-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt	(revision 20042)
-+++ CMakeLists.txt	(working copy)
-@@ -247,15 +247,7 @@
- IF(WIN32 OR OS2)
- 	SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
- ELSE (WIN32 OR OS2)
--	IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
--		SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
--	ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
--		IF(NOT WANT_VERSIONING)
--			SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
--		ELSE(NOT WANT_VERSIONING)
--			SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
--		ENDIF(NOT WANT_VERSIONING)
--	ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
-+	SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/")
- ENDIF (WIN32 OR OS2)
- IF(NOT IS_ABSOLUTE ${DOCDIR})
- 	ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
diff --git a/app-office/scribus/scribus-1.4.5-r1.ebuild b/app-office/scribus/scribus-1.4.5-r1.ebuild
deleted file mode 100644
index 076cea6b5ff7..000000000000
--- a/app-office/scribus/scribus-1.4.5-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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-1.4.5-r1.ebuild,v 1.3 2015/05/29 07:51:48 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-
-inherit cmake-utils fdo-mime python-single-r1
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
-
-# a=$((ls resources/translations/po/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
-IUSE_LINGUAS=" 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 en_AU en_EN en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja 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 sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	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
-	media-libs/libpng:0
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	cairo? ( x11-libs/cairo[X,svg] )
-	!cairo? ( media-libs/libart_lgpl )
-	hunspell? ( app-text/hunspell )
-	pdf? ( app-text/podofo )
-	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}"/${PN}-1.4.2-docs.patch
-	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
-	"${FILESDIR}"/${PN}-1.4.4-ppc64-fpic.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} || [[ ${lang} == "en" ]]; 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 scribus/doc/CMakeLists.txt || die
-			safe_delete file ./resources/dicts/README_${lang}.txt
-			safe_delete file ./resources/dicts/README_hyph_${lang}.txt
-			safe_delete file ./resources/dicts/hyph_${lang}.dic
-			safe_delete file ./resources/loremipsum/${lang}.xml
-		fi
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_NORPATH=ON
-		-DWANT_QT3SUPPORT=OFF
-		-DGENTOOVERSION=${PVR}
-		-DWANT_GUI_LANG="${langs#;};en"
-		$(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)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang
-	for lang in ${IUSE_LINGUAS}; do
-		if ! use linguas_${lang}; then
-			safe_delete dir "${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
-
-	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
-	${PN} is licensed under the "${LICENSE}".
-	Please visit http://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}
-	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
-}
-
-safe_delete () {
-	case $1 in
-		dir)
-			if [[ -d "${2}" ]]; then
-				rm -r "${2}" || die
-			fi
-			;;
-		file)
-			if [[ -f "${2}" ]]; then
-				rm "${2}" || die
-			fi
-			;;
-		*)
-			die "Wrong usage"
-	esac
-}
diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild
deleted file mode 100644
index d134186c8558..000000000000
--- a/app-office/scribus/scribus-1.4.5.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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-1.4.5.ebuild,v 1.1 2015/04/12 14:51:58 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-
-inherit cmake-utils fdo-mime python-single-r1
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-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 eo 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}
-	tk? ( scripts )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	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
-	media-libs/libpng:0
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	cairo? ( x11-libs/cairo[X,svg] )
-	!cairo? ( media-libs/libart_lgpl )
-	hunspell? ( app-text/hunspell )
-	pdf? ( app-text/podofo )
-	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}"/${PN}-1.4.2-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="$(python_get_library_path)"
-		-DWANT_NORPATH=ON
-		-DWANT_QT3SUPPORT=OFF
-		-DGENTOOVERSION=${PVR}
-		-DWANT_GUI_LANG=${langs#,}
-		$(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)
-		)
-	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
-
-	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
-	cat >> "${T}"/COPYING <<- EOF
-	${PN} is licensed under the "${LICENSE}".
-	Please visit http://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}
-	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.5.0-r1.ebuild b/app-office/scribus/scribus-1.5.0-r1.ebuild
index fde818145dd2..3909c6778f36 100644
--- a/app-office/scribus/scribus-1.5.0-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-1.5.0-r1.ebuild,v 1.2 2015/06/01 08:59:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.5.0-r1.ebuild,v 1.3 2015/08/05 09:11:47 jlec Exp $
 
 EAPI=5
 
@@ -63,7 +63,7 @@ COMMON_DEPEND="
 	hunspell? ( app-text/hunspell )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	osg? ( dev-games/openscenegraph )
-	pdf? ( app-text/podofo )
+	pdf? ( app-text/podofo:0= )
 	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
 	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
 "
diff --git a/app-office/scribus/scribus-1.5.0.ebuild b/app-office/scribus/scribus-1.5.0.ebuild
deleted file mode 100644
index 1cab19bda6d7..000000000000
--- a/app-office/scribus/scribus-1.5.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# 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-1.5.0.ebuild,v 1.1 2015/05/21 12:12:02 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-
-inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~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
-IUSE_LINGUAS=" 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_EN en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja 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 sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW"
-IUSE+=" ${IUSE_LINGUAS// / linguas_}"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-text/libmspub
-	>=app-text/poppler-0.19.0:=
-	dev-libs/boost
-	dev-libs/hyphen
-	dev-libs/librevenge
-	dev-libs/libxml2
-	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:0=
-	>=x11-libs/cairo-1.10.0[X,svg]
-	boost? ( dev-libs/boost )
-	hunspell? ( app-text/hunspell )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	osg? ( dev-games/openscenegraph )
-	pdf? ( app-text/podofo )
-	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}-docdir.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	)
-
-src_prepare() {
-	rm -r codegen/cheetah || die
-	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
-
-	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
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local lang langs
-	for lang in ${IUSE_LINGUAS}; do
-		if use linguas_${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 file ./resources/dicts/README_${lang}.txt
-			safe_delete file ./resources/dicts/README_hyph_${lang}.txt
-			safe_delete file ./resources/dicts/hyph_${lang}.dic
-			safe_delete file ./resources/loremipsum/${lang}.xml
-		fi
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_DISTROBUILD=ON
-		-DDOCDIR="/usr/share/doc/${PF}/"
-		-DWANT_GUI_LANG=${langs#;}
-		$(cmake-utils_use_with pdf PODOFO)
-		$(cmake-utils_use_with boost)
-		$(cmake-utils_use_want graphicsmagick)
-		$(cmake-utils_use_want osg)
-		$(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)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang
-	for lang in ${IUSE_LINGUAS}; do
-		if ! use linguas_${lang}; then
-			safe_delete dir "${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
-	${PN} is licensed under the "${LICENSE}".
-	Please visit http://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}
-	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
-}
-
-safe_delete () {
-	case $1 in
-		dir)
-			if [[ -d "${2}" ]]; then
-				ebegin "Deleting ${2} recursively"
-				rm -r "${2}" || die
-				eend $?
-			fi
-			;;
-		file)
-			if [[ -f "${2}" ]]; then
-				ebegin "Deleting ${2}"
-				rm "${2}" || die
-				eend $?
-			fi
-			;;
-		*)
-			die "Wrong usage"
-	esac
-}