app-office/scribus: Drop last bits of obsolete aspell support, #483182

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

5 files changed, 34 insertions, 25 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 761f1175022d..2a8d70401d5d 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,10 @@
 # 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.182 2013/08/28 11:37:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.183 2013/09/17 15:58:17 jlec Exp $
+
+  17 Sep 2013; Justin Lecher <jlec@gentoo.org> scribus-1.4.3.ebuild,
+  scribus-1.4.9999.ebuild, scribus-9999.ebuild:
+  Drop last bits of obsolete aspell support, #483182
 
 *scribus-1.4.3 (07 Aug 2013)
 
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 80422cb3ca12..f9c41299a478 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
@@ -17,15 +17,25 @@ DIST scribus-1.4.3.tar.xz 70503072 SHA256 c72ef314c32f995895ca5025127e65ffeccbe2
 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 3882 SHA256 b46df0c47fa10024e8ad4c8f2db6de5d114630c65444b1c35fe0cc5defb2cab4 SHA512 77836095e56fb1102e9dd615ba536d1d9e99a4893cf6adc1b671070c43c035ac9d94e1de9ef67f56754c306771a0f544f11472172120c6401eb574e1bba05de4 WHIRLPOOL e03078ba273d0d46d48757c1f4233f9d7bdcef92e72a201f01b31e74318c300bfc0ca3b0e47112cb715cf0e89d1eedcd634f64c2041cc25e62803cd29eff6d60
-EBUILD scribus-1.4.9999.ebuild 3593 SHA256 6d35cb0da4b998c294981e3d2d10205ebb818510a469117cad6749fcfccac4a1 SHA512 4973932a37396eb7e80e11dd4d1a2238f2aaa34f347bd2db2a3143fe3ec81fdedd536061ae9a164c60773ce8e546dbcc19efdd8b12075ac350bc46ad867f2088 WHIRLPOOL 1ab681d0e11f1189967d2dc790ebd5765909545c2ef92adb44a969f0b9b6f283aee29b9fc14d03baf1a73a72f5395e0a9203a37adf8cc9799777c2392fb5cfe3
-EBUILD scribus-9999.ebuild 3814 SHA256 c9fbe3335b44fde6f1f5229febe7bffc282726ece2abab392f0c2e576dd06f21 SHA512 8c718f473126a2ea7f94e9a3fa2ed4b29d1cacc4a5b71e3b0a640c800464563def3ef53c77ff0dbc01c545382bec6277ab258a1cc47c752bd9bc125a4c562603 WHIRLPOOL c54e2aec74e1e53e7e3a5ad4111d0d4a69a30954d84861cdd754690cf9ad7aadc56c69e530b9424f0c2c039d38879576bce3babc9667018bf9871e208139a880
-MISC ChangeLog 24204 SHA256 acaf6b6e436035883bfb6965e9d2ab94be863a636f490fa9d834d4e19e514054 SHA512 848ca49c8ee874ba1eceeab350d589591c597251cf754f024a4429b9d2866878e518578dce15b5bf8a122df2ebe636f9ac6f2b5176440fcfb857abd63125867a WHIRLPOOL ccd143d78ca202d9ba800bb829abd79aec16d63e1ebe4d03b0844bb05c791088c53f1b7579c5ee88751ed22991a2724b84b86e7dd9d56ef0496a2c474ef724ec
+EBUILD scribus-1.4.3.ebuild 3875 SHA256 a8df2c2351d6cce6579bb719389571662484727680ccc1439bc6219962f4e1c8 SHA512 cb021c33931a7b52df0bba380bce952a6a90dab7e2b220de9ddc86573d8f5698802e11a2c5d098eeff038e5da450a92916c903a0c8d15219388d0c22baea5a52 WHIRLPOOL 539793b1e9949264c8131da3d64fc10852f36e3f4586acdb9b7050868e7b6bf815ba83760adc378d243a7a5c524db5b5634fc523e4b92e161ecbd77c0c0c7566
+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 metadata.xml 1572 SHA256 eefb6f38e8472d35e1849b7fd22a8e34b00cd36ba642386f6dc80189cbe3a9f1 SHA512 90992fb4c7aaa4c25a13681a031ff4e0be76bf9bda808ab4f2ce4eda731aa5232571fb57cbe2e7c52ae0c75cfc1cc6948b36df8656dd6cdcc852fb0a566204a4 WHIRLPOOL 8a613724bea353439a6491f8a2081e8d0a15042df15ca56a7cb656a69c997e38df83786015268708c7cde2ab524abe60c827b254d30e7b7fa25419237f324cff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlId4REACgkQVWmRsqeSphPFJACfekDgk2210VgeXQW4gRCat4X6
-yaUAn2KcCs4p9m59Se4liq1HuUGYVyoK
-=NVwM
+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.3.ebuild b/app-office/scribus/scribus-1.4.3.ebuild
index 8edd8f429eaf..11697e05f053 100644
--- a/app-office/scribus/scribus-1.4.3.ebuild
+++ b/app-office/scribus/scribus-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2013/08/07 20:25:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.3.ebuild,v 1.2 2013/09/17 15:58:17 jlec Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ 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 scripts templates tk"
+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"
diff --git a/app-office/scribus/scribus-1.4.9999.ebuild b/app-office/scribus/scribus-1.4.9999.ebuild
index f915363348b4..98fb13f221ff 100644
--- a/app-office/scribus/scribus-1.4.9999.ebuild
+++ b/app-office/scribus/scribus-1.4.9999.ebuild
@@ -1,6 +1,6 @@
 # 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.9999.ebuild,v 1.7 2013/07/02 13:55:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.8 2013/09/17 15:58:17 jlec Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ ESVN_PROJECT=Scribus-1.4
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aspell cairo debug examples hunspell +minimal +pdf templates"
+IUSE="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"
@@ -32,6 +32,8 @@ COMMON_DEPEND="
 	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
@@ -39,12 +41,9 @@ 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] )
 	pdf? ( app-text/podofo )
-	aspell? ( app-text/aspell )
 	hunspell? ( app-text/hunspell )"
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
@@ -94,7 +93,6 @@ src_configure() {
 		-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)
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 86d02b4cebca..a27b6d1dbf43 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.8 2013/07/02 13:55:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.9 2013/09/17 15:58:17 jlec Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ ESVN_PROJECT=Scribus-1.5
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aspell cairo debug examples graphicsmagick hunspell +minimal osg +pdf templates"
+IUSE="cairo debug examples graphicsmagick hunspell +minimal osg +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"
@@ -32,6 +32,8 @@ COMMON_DEPEND="
 	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
@@ -39,15 +41,11 @@ COMMON_DEPEND="
 	media-libs/tiff:0
 	net-print/cups
 	sys-libs/zlib[minizip]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtwebkit:4
 	virtual/jpeg
 	cairo? ( x11-libs/cairo[X,svg] )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	osg? ( dev-games/openscenegraph )
 	pdf? ( app-text/podofo )
-	aspell? ( app-text/aspell )
 	hunspell? ( app-text/hunspell )"
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
@@ -100,7 +98,6 @@ src_configure() {
 		-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 graphicsmagick)