Drop old; obsoletes bug #490542

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

4 files changed, 26 insertions, 155 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 36bb7b0cb95b..1b4f00bb31a2 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,10 @@
 # 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.205 2015/05/19 04:54:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.206 2015/05/19 06:57:27 jlec Exp $
+
+  19 May 2015; Justin Lecher <jlec@gentoo.org> -scribus-1.4.3.ebuild,
+  scribus-1.4.5-r1.ebuild:
+  Drop old; obsoletes bug #490542
 
   19 May 2015; Jeroen Roovers <jer@gentoo.org> scribus-1.4.4-r1.ebuild:
   Stable for PPC64 (bug #519890).
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index faab41dad982..737e192ea19e 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
@@ -12,21 +12,31 @@ 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.4.4-ppc64-fpic.patch 1137 SHA256 6fddac38cc50624b51403c1828a6dddd3cfe53cc364c4a3de53c9509fe4753ad SHA512 3160f4b8ac876cddb2fb5b1134b06940456324c8f7ffd8df29e1578ac6543d22b9603d43b14f7ce7b8359e2311675777395555b07b78bbcffa93ac69c490de9f WHIRLPOOL d3af321c629b260a2d449e4cd44aef9ea8b9ce34ebde8a5314b31643be7f7b5ed6ad116c9f84c9f9f147fa99f8e62dc03838fb3bfd7f0d042597ee442af4d462
 AUX scribus-1.5.0-docs.patch 916 SHA256 083fddac4b6ad08cf8859a95d425f8c70831fa19f86491baac600b86939aab1d SHA512 be5c86466490414724f4293450200fbcbb10c69d7a23e3589591f38c2e333af76227a01575836fb4bb28409366aac6b8d2c2b1b881ed7439c81e1739835723b8 WHIRLPOOL 38159673d5410186088011417eb9f6671e98662e86af3925da05dd8564eb52b898403f7ec7f6648971c14d2377c9a56c67dddaa52850447d9dd8fb2d85ec9679
-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
 DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948
-EBUILD scribus-1.4.3.ebuild 3868 SHA256 aba62da14fc96a524efa0f2a1143daee116cfee08cc6ebd1b2421abdfc3fe977 SHA512 222934f8baeb79324bc7d55ba45e3abc211476890694a40a30f214a5244c330d5047647264e980ea044cd1b115006bc9006494d95236d5ead90ca15f2160dac4 WHIRLPOOL 3d680054c77b198a0c270df5d923d3ea11ca91e5490bf75eac70bef1f64ba05b11c73e2d79e385ca0e5f5254e5aa22130df519a134cea4dc97c090af6860f912
 EBUILD scribus-1.4.4-r1.ebuild 4150 SHA256 68314e0699df533a1c16acb367306d7f792449c4fd00c22abe543704024babac SHA512 528362a1240dc4ce9ce80f384e1f7d6503d5b2207880f0ecc420ae58996123bc0a19bd20a4af27f3508582df51db2312492a34a6f48121cffe392cbcdd070885 WHIRLPOOL 4f13a0d579fc2a51b57b82464b452cea32b56ef4cfbe809115e6b84500a0b27c6fe7e0deda5e8e64e46c32db073ea2285f4f4f5f3f61dead795aec15a3800ecf
-EBUILD scribus-1.4.5-r1.ebuild 5123 SHA256 337c9cd63808d2314ea1bdb7cb2df803a10e3504d431be673cd33be68b01d35b SHA512 069261c18a057f444e7f8d792a64170b87230f9e069c7a16b9887d1b4d805e07a9b9b651ea1d25b9f43aca9ff6d88c432643f04674e5c969e96e26a8eddd2ea7 WHIRLPOOL b8ebeabce07a2743053b0737b6aa57745d1c3b439c6e962e54ee6946ce4f942c5c57701b415ddd9a698bbbd063bab59045d69400798770f0980e2c641a94a0e6
+EBUILD scribus-1.4.5-r1.ebuild 5167 SHA256 9c96d224ee0eadcee3c14e720be7109a9e7b519a7cf0ff216b24b25d79e63c3a SHA512 1d4ba16f06d4f58331076a6c6c36ed82be6a82108aa27a6df4e9eb7b717676ac7c7165f1556d314cefeab315ba6e058f77ab032a7f6e16eb5df91b7a680252a1 WHIRLPOOL 25541a78420ae7073a154e8dd737777b5fcfbb87ab516adb0d5cdf3166f3741f415d35413953b0aea68c38acf4df92108cd7b14163d39275c4679063848a514f
 EBUILD scribus-1.4.5.ebuild 4120 SHA256 075b656f0f695f4951f72cd7e69d8adb3996686e73843b47703f10ec129a2b27 SHA512 fcd26ef6ea67a956a805cec435c6938cf190f7ed1e2b7d8ac364c6fea9cda5bcfbe7b84dddda32bbe99ad9c8a845826cd6d5eba90390e4cc954e70c4ef010f31 WHIRLPOOL 2522e5f34b6c56e35eda523821c5716bb3e937b75dac55baac01095059d40266b8be6a07a59962b348e036770e97231762081886fe60c53a802c8ca9303f13b2
 EBUILD scribus-1.4.9999.ebuild 5231 SHA256 fd408cea2b5dc9503d54c9e15fd90ec8eeaf5135f64e7391a34945d88b95c434 SHA512 5a568567fa3d69d1289b6f6b2e7297930cb05c72bd67b6389ad3993bf938b97a8e75d3e6a1525d5bdd84c647e53460957a0af5113be188ae79ae394df0022410 WHIRLPOOL 29a46d6e45de83c084b43eb1ca4350a360280ab760d9acc45618d765e47d61e2c33d4ef4a44cec0d5b812431382138a48998677341a471142f09ca2c9ec4f5c7
 EBUILD scribus-9999.ebuild 5564 SHA256 b148a07fddd125b2a9c38f497e4ec12f80428160356c9084302b50ccd500ca9f SHA512 ef9d30ba622670b1cf220b2301458fed1818d1ebff57d3bd21adc6268167b7c30f384820bfe632c18fda54051c8a781914bc9b2267c5ad00ca93055c27a582ba WHIRLPOOL d7b4c932aead4a62927e69cc15973ffc21868bae268d8bd58e808f091c8e903d7c18bd639a78162535579c5d6f5f8e50265cece54a4bdbb324b7b52a004ef259
-MISC ChangeLog 27370 SHA256 93d26bb51e76edb9cd598dde50b84c59e2c05b14d7cb5a60081e5f9979ae044c SHA512 ee9fc9b0eb161ed57a1c0f98468794685f180b92ce8bc9b7385ba8d93c55187bd90f8817b059c98b1a572b41e6b7e36836b951c8cecb7cb3e89886c84eb79370 WHIRLPOOL b12c8eed888997e5dc06ab61a8268e53cf24cc13ae9ad5f8c753979c1a71dbe55e1a2c3fc3b4b2d41a0384e747a040a0ee9f994b652ab770f57fa57f4f56769c
+MISC ChangeLog 27503 SHA256 22753f7ddaf7cb7d488b14db86526aa2f4cc41455e07cac82513bb39ad732f14 SHA512 1915aa5f1452204a9b5c558e16c7a69e18fa2b1b665f702c3782b9579fb805343395737c76bdbb7a9d9b54c9a4e70e011db82a4b7f601a4709f1efcd33e42e55 WHIRLPOOL 30cc996eae5defdc38d7e73c4ea16e3ba356105c3819c9c0933b8afa63742c0347adfa91cac94b4fc2f194ef769cb1f3052602a2d6fe78a20950257b9651c224
 MISC metadata.xml 1525 SHA256 23a06249a009e2b5fb3b11d1d2e9790ae25f9898333bb885d5764fcdd7a146a9 SHA512 8ab161b6a1b6981f8a81e95e62b514886b893d57243540f6f2f66c076047c147600d8f5d6b2341f667a70fed53d6ae74f427904c670aa4b5ca35500d81997ddf WHIRLPOOL aaaec9da2b5a731190be8b3b1fb3956fa88b9f6e59bead78db610d146fe455ae766ed8af21e40109486a37d8eb6022392c350bcef374c140a269bd38d6dc2914
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVawhwACgkQVWmRsqeSphOWFgCfdfHI2E+cW8Hy1kei5+OlMAYy
-K/EAniPu1e70ck23Dh04ZvU9LQkplLvZ
-=+ZjA
+iQJ8BAEBCgBmBQJVWt7YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijcgP/03U1ywBu2XKC+N3hpZa2KbX
+NpWn9WJni0GJDDJe43+uRs6JrFLaPOcKVPp6NnQmnJXmArD1qjjpkirYnr5ds1iP
+RoWCkvG0P9dgd6CjlXQuFcL2BQVba4/J1AsvcWRTawIvTVFL+lvsnVo31C4Y4PSt
+E1BKHJ1R74/4/qe2Hj1mSQZHKlG69fL1kQNeOYP8g3JPon+65LM7jklKYZTslty6
+Tkzx5dvC1XSPuvkWp4Q4wBV362C72ZGovV4FYkzqQ9A6MuLFsl1+aPOBozY7Y+DA
+mKf8/qrQHlUxgcLo6e0NvwfxPOyodFyo1GJ+32dOcILeffpxCcpEMgBY0Yo2yQyZ
+em8iQ4NGnpL1FXRd7eizfc4hDWOPKIT7xJtgMzlp7brbni5y0i63pHQuq6sreq+i
+od5VvORBu5kqWSNT4tsPORtWeXyr6jaMILGAa6nyTEMEfydXu+kLdfSoQVHQOUfO
+sDSh3rx2R7VL+hlZTYotqpfiLbnXRmVCekc/mdENBi2eqmJzvi8Lgq3pqytyyIQE
+1rQhnjZSM0ibL1nNQqgDrO7Z7TzDFqbSmlqO9H4TjJgI6a3a08rlanx/XT7ADWAv
+gKRxBsFv2r61t8KKlVc8tOiBrcoRbdeZ3W3DmXJ7o0gqkrho0AJyShk+BZmaIFbI
+EY4TwsxGuwV1bFqzyVcs
+=763S
 -----END PGP SIGNATURE-----
diff --git a/app-office/scribus/scribus-1.4.3.ebuild b/app-office/scribus/scribus-1.4.3.ebuild
deleted file mode 100644
index b4d01bd00b79..000000000000
--- a/app-office/scribus/scribus-1.4.3.ebuild
+++ /dev/null
@@ -1,144 +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.3.ebuild,v 1.11 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.xz"
-
-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 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
-	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.5-r1.ebuild b/app-office/scribus/scribus-1.4.5-r1.ebuild
index 24acf5ee6b73..d10e21936f7e 100644
--- a/app-office/scribus/scribus-1.4.5-r1.ebuild
+++ b/app-office/scribus/scribus-1.4.5-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.4.5-r1.ebuild,v 1.1 2015/05/18 16:56:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.5-r1.ebuild,v 1.2 2015/05/19 06:57:27 jlec Exp $
 
 EAPI=5
 
@@ -56,6 +56,7 @@ DEPEND="${COMMON_DEPEND}
 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() {