linguas_* descriptions belong in profiles/desc/linguas.desc. Drop unused patches.

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

10 files changed, 17 insertions, 319 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 1b4f00bb31a2..211655e7c814 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,15 @@
 # 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.206 2015/05/19 06:57:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.207 2015/05/20 04:59:20 jer Exp $
+
+  20 May 2015; Jeroen Roovers <jer@gentoo.org>
+  -files/scribus-1.3.5.1-system-hyphen.patch,
+  -files/scribus-1.3.6-podofo-0.8.0.patch, -files/scribus-1.3.9-cups-1.5.patch,
+  -files/scribus-1.4.0-export.patch, -files/scribus-1.4.0_rc5-docs.patch,
+  -files/scribus-1.4.2-cups.patch, -files/scribus-1.4.2-imaging.patch,
+  metadata.xml:
+  linguas_* descriptions belong in profiles/desc/linguas.desc. Drop unused
+  patches.
 
   19 May 2015; Justin Lecher <jlec@gentoo.org> -scribus-1.4.3.ebuild,
   scribus-1.4.5-r1.ebuild:
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 737e192ea19e..799d582eb7c8 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,15 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-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
-AUX scribus-1.4.0-export.patch 786 SHA256 f7e1a9db36f65b77282d728a0aaf064fe8ea939fb0cdb8184e3de93b350c6379 SHA512 3010f4a785c61b7bc81f7bf27914cbddb4a3b6169576af42b89cb4bb65dde0074766ded077d38fd289392489ffdeb787b5d53f3dc2676d53484cd40f03a5d0db WHIRLPOOL 70d7deae905c3145a84cb8822d32a5a1551b6da83f371ae5b544dddca5e4fffd5d54a0e6099a5d9b58a927ee807d65eb6442382a5daf7c1e0c1e7a40c6101065
 AUX scribus-1.4.0-minizip.patch 1891 SHA256 dcbe79335a59b7238d6866f7c92757ffb5ac1ef26ff9f146b4fb702814c83dd7 SHA512 99feefb8e4ba9ae903e6a7a68b4cd497572ef254b550c864135e20392902e3595ea4414916474d5e80ceabc66e6cc5fac09af41955cbb2ba8e8d41480009bd86 WHIRLPOOL bc0d8086b146f867ddd807b1bcfa911e678eb13eb7833370871730b46dbf8cd94b93f58157b940da36c1ba9c439335cd952aa1163866e8b4aab2f6964071d9c3
-AUX scribus-1.4.0_rc5-docs.patch 828 SHA256 50c56976bcc2e2a7d04ee62b8c2398d91137360f69e95910c6f2a01b49c8595f SHA512 d0d4230a5bf848ed02efd6dbc5c48fd34bc4a68b97f6434577d221fa5bafb0bc74b4c77a45e8a21ba40f4ae6e16c0d1f65cde5be9d4f40e47344d49c3dee80ab WHIRLPOOL 3c6c4d330bfb892be4081f45f4f39fda3249cdfa6ead8f99ff38d9abca628dde1caeda4fe96febae25e979e88e86f9ccbc6b94942cccec4d0ef5bc0a66df99fe
-AUX scribus-1.4.2-cups.patch 831 SHA256 f054055c99e465475286a991f2a2f713fdd1e52874211e5423b0964ec72f29b6 SHA512 ff0e3ddf7374e84c80a17dde66f2c97c110d93064db5dedcad455fb1db588d94822ed9a8623b4d24a7b4d369323095ff6b8d4b3e1d199208b7af1d648794eefb WHIRLPOOL 70dca3d43ed9f5b86b04e9958a495160ab3c9079da3faad6e56441157db081da49e562c04f27c19f50f4c2afa3c0edeb87fd5e017688f9007db90afc5d510406
 AUX scribus-1.4.2-docs.patch 814 SHA256 5676964e58f241666a0b07513e55055e9badc562409493714e75aef750e4e00f SHA512 bf26fdf032b2e6d0ae1e11dcfa5f75ba36a1561868b2161afece7a993536c49353f6b53841ab3aa5749ff5b474df72ef87345c496719c4d609b8c1345aa8efe1 WHIRLPOOL 67734220b79f03dfba8cb8a796475e1f23c67c1c0da53a4c5d1f6315dd99ca2ed4a66cf1dc2c1bb3ac11fd92e97f87264a0fc0ebffa5327673fc62b60328fa9f
-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.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9
@@ -19,24 +12,12 @@ EBUILD scribus-1.4.5-r1.ebuild 5167 SHA256 9c96d224ee0eadcee3c14e720be7109a9e7b5
 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 27503 SHA256 22753f7ddaf7cb7d488b14db86526aa2f4cc41455e07cac82513bb39ad732f14 SHA512 1915aa5f1452204a9b5c558e16c7a69e18fa2b1b665f702c3782b9579fb805343395737c76bdbb7a9d9b54c9a4e70e011db82a4b7f601a4709f1efcd33e42e55 WHIRLPOOL 30cc996eae5defdc38d7e73c4ea16e3ba356105c3819c9c0933b8afa63742c0347adfa91cac94b4fc2f194ef769cb1f3052602a2d6fe78a20950257b9651c224
-MISC metadata.xml 1525 SHA256 23a06249a009e2b5fb3b11d1d2e9790ae25f9898333bb885d5764fcdd7a146a9 SHA512 8ab161b6a1b6981f8a81e95e62b514886b893d57243540f6f2f66c076047c147600d8f5d6b2341f667a70fed53d6ae74f427904c670aa4b5ca35500d81997ddf WHIRLPOOL aaaec9da2b5a731190be8b3b1fb3956fa88b9f6e59bead78db610d146fe455ae766ed8af21e40109486a37d8eb6022392c350bcef374c140a269bd38d6dc2914
+MISC ChangeLog 27923 SHA256 e25b22144f5fd3a0086b1dfef76879162c106c288b192d853b162d0fb214810f SHA512 ebdc5955d74a520291b3d2bd3ed49030b46494da576d635570ce1c2fe006a2fdea47b67cd65cfaa58810d8afa9e22d8d84faccf058f3e23d3d3724c91203749f WHIRLPOOL 241a0213d8f30de01d5d8a7a8f9a12cd576f97b6dc21bb57f72ba05b04714a911f33c804d51a0a7fb15f688fc5312c7e2f8efa419472156b73ebce7ff61f2626
+MISC metadata.xml 877 SHA256 1e389ec930988d20e2fa5bbf15b597447420a8a344052ecffa933a0dcc907001 SHA512 8faded7ef8eeaf5b03910b499457621527abebe45c928f7385e5866a4ff52ca5ee1cc2c7619b12c7d46e4b5d542fafd4885a366e72af0ea681fa5243a5d14f45 WHIRLPOOL 7d7822069cd1e45a3127bb053634bc2f04d2b4b5997ed8ac3ec128ee715e68a8bca759001bbe9ee30f6ab9a9755ecdbc9284e789b78022ff09d3fc61da0b9aa3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-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
+iEYEAREIAAYFAlVcFKwACgkQVWmRsqeSphN+NgCfSTepkhxq8X9V9766lSMEtkRh
+piAAmwcXTGhmllIS8BH3YDRupVDfPb2A
+=H/p8
 -----END PGP SIGNATURE-----
diff --git a/app-office/scribus/files/scribus-1.3.5.1-system-hyphen.patch b/app-office/scribus/files/scribus-1.3.5.1-system-hyphen.patch
deleted file mode 100644
index 2884cdde1565..000000000000
--- a/app-office/scribus/files/scribus-1.3.5.1-system-hyphen.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -Nrup scribus-1.3.5.rc3.orig/cmake/modules/FindHYPHEN.cmake scribus-1.3.5.rc3/cmake/modules/FindHYPHEN.cmake
---- scribus-1.3.5.rc3.orig/cmake/modules/FindHYPHEN.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ scribus-1.3.5.rc3/cmake/modules/FindHYPHEN.cmake	2009-07-02 14:23:26.000000000 +0200
-@@ -0,0 +1,28 @@
-+# - Find HYPHEN library
-+# Find the native HYPHEN includes and library
-+# This module defines
-+#  HYPHEN_INCLUDE_DIR, where to find hyphen.h, etc.
-+#  HYPHEN_LIBRARIES, libraries to link against to use HYPHEN.
-+#  HYPHEN_FOUND, If false, do not try to use HYPHEN.
-+# also defined, but not for general use are
-+#  HYPHEN_LIBRARY, where to find the HYPHEN library.
-+
-+FIND_PATH(HYPHEN_INCLUDE_DIR hyphen.h)
-+
-+SET(HYPHEN_NAMES_RELEASE ${HYPHEN_NAMES_RELEASE} ${HYPHEN_NAMES} hyphen libhyphen)
-+SET(HYPHEN_NAMES_DEBUG ${HYPHEN_NAMES_DEBUG} hyphend libhyphend)
-+
-+FIND_LIBRARY(HYPHEN_LIBRARY_RELEASE NAMES ${HYPHEN_NAMES_RELEASE} )
-+FIND_LIBRARY(HYPHEN_LIBRARY_DEBUG NAMES ${HYPHEN_NAMES_DEBUG} )
-+
-+INCLUDE(LibraryDebugAndRelease)
-+SET_LIBRARY_FROM_DEBUG_AND_RELEASE(HYPHEN)
-+
-+# handle the QUIETLY and REQUIRED arguments and set HYPHEN_FOUND to TRUE if 
-+# all listed variables are TRUE
-+INCLUDE(ScribusFindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(HYPHEN DEFAULT_MSG HYPHEN_LIBRARY HYPHEN_INCLUDE_DIR)
-+
-+IF(HYPHEN_FOUND)
-+  SET( HYPHEN_LIBRARIES ${HYPHEN_LIBRARY} )
-+ENDIF(HYPHEN_FOUND)
---- scribus-1.3.5.rc3.orig/CMakeLists.txt	2009-05-30 14:38:09.000000000 +0200
-+++ scribus-1.3.5.rc3/CMakeLists.txt	2009-07-02 14:32:24.000000000 +0200
-@@ -638,6 +638,16 @@ ELSE(LIBPODOFO_FOUND)
- ENDIF(LIBPODOFO_FOUND)
- #>>PoDoFo for AI PDF import
- 
-+#<<HYPHEN for system hyphenation library
-+FIND_PACKAGE(HYPHEN)
-+IF(HYPHEN_FOUND)
-+  MESSAGE("system hyphenation library found OK")
-+  SET(HAVE_HYPHEN 1)
-+ELSE(HYPHEN_FOUND)
-+  MESSAGE("system hyphenation library NOT found - will use internal one")
-+ENDIF(HYPHEN_FOUND)
-+#>>HYPHEN for system hyphenation library
-+
- ##############################################################################################################
- ########## Include Setup                                                                            ##########
- 
-diff -Nrup -x CMakeFiles -x Makefile -x FindHYPHEN.cmake scribus-1.3.5.rc3.orig/scribus/CMakeLists.txt scribus-1.3.5.rc3/scribus/CMakeLists.txt
---- scribus-1.3.5.rc3.orig/scribus/CMakeLists.txt	2009-06-07 09:05:54.000000000 +0200
-+++ scribus-1.3.5.rc3/scribus/CMakeLists.txt	2009-07-02 15:22:52.000000000 +0200
-@@ -403,10 +403,8 @@ SET(SCRIBUS_SOURCES
-   guidesdelegate.cpp
-   guidesmodel.cpp
-   helpbrowser.cpp
--  hnjalloc.c
-   hruler.cpp
-   hyask.cpp
--  hyphen.c
-   hyphenator.cpp
-   hysettings.cpp
-   imageinfodialog.cpp
-@@ -641,6 +639,14 @@ SET(SCRIBUS_SOURCES
-   vruler.cpp
- )
- 
-+IF(NOT HAVE_HYPHEN)
-+  SET(SCRIBUS_SOURCES
-+    ${SCRIBUS_SOURCES}
-+    hnjalloc.c
-+    hyphen.c
-+  )
-+ENDIF(NOT HAVE_HYPHEN)
-+
- IF(WIN32)
-   SET(SCRIBUS_MOC_WIN32_ONLY_CLASSES scprintengine_gdi.h)
-   SET(SCRIBUS_WIN32_ONLY_SOURCES
-@@ -785,6 +791,12 @@ IF(HAVE_PODOFO)
-   )
- ENDIF(HAVE_PODOFO)
- 
-+IF(HAVE_HYPHEN)
-+  TARGET_LINK_LIBRARIES(${EXE_NAME}
-+    ${HYPHEN_LIBRARY}
-+  )
-+ENDIF(HAVE_HYPHEN)
-+
- # Now build plugins
- SET(PLUGIN_LIBRARIES)
- IF(WIN32)
-diff -Nrup -x CMakeFiles -x Makefile -x '*.cmake' scribus-1.3.5.rc3.orig/scribus/hyphenator.h scribus-1.3.5.rc3/scribus/hyphenator.h
---- scribus-1.3.5.rc3.orig/scribus/hyphenator.h	2007-07-10 22:33:09.000000000 +0200
-+++ scribus-1.3.5.rc3/scribus/hyphenator.h	2009-07-02 14:03:11.000000000 +0200
-@@ -13,7 +13,7 @@ for which a new license (GPL+exception) 
- #include <QSet>
- 
- #include "scribusapi.h"
--#include "hyphen.h"
-+#include <hyphen.h>
- class ScribusDoc;
- class ScribusMainWindow;
- class PageItem;
diff --git a/app-office/scribus/files/scribus-1.3.6-podofo-0.8.0.patch b/app-office/scribus/files/scribus-1.3.6-podofo-0.8.0.patch
deleted file mode 100644
index 2d590b3f56d1..000000000000
--- a/app-office/scribus/files/scribus-1.3.6-podofo-0.8.0.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Nur scribus-1.3.6.orig/scribus/pdflib_core.cpp scribus-1.3.6/scribus/pdflib_core.cpp
---- scribus-1.3.6.orig/scribus/pdflib_core.cpp	2010-03-16 14:14:03.000000000 -0700
-+++ scribus-1.3.6/scribus/pdflib_core.cpp	2010-04-30 15:09:29.297220587 -0700
-@@ -6364,7 +6364,9 @@
- 			}
- 			*/
- 			char * mbuffer = NULL;
--#if defined(pdf_long)
-+#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
-+			PoDoFo::pdf_long mlen = 0;
-+#elif defined(pdf_long)
- 			pdf_long mlen = 0;
- #else
- 			long mlen = 0;
-@@ -6631,7 +6633,9 @@
- 	if (obj->HasStream())
- 	{
- 		char * mbuffer = NULL;
--#if defined(pdf_long)
-+#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)
-+			PoDoFo::pdf_long mlen = 0;
-+#elif defined(pdf_long)
- 			pdf_long mlen = 0;
- #else
- 			long mlen = 0;
-diff -Nur scribus-1.3.6.orig/scribus/plugins/aiimplugin/importai.cpp scribus-1.3.6/scribus/plugins/aiimplugin/importai.cpp
---- scribus-1.3.6.orig/scribus/plugins/aiimplugin/importai.cpp	2010-02-17 14:08:03.000000000 -0800
-+++ scribus-1.3.6/scribus/plugins/aiimplugin/importai.cpp	2010-04-30 15:11:14.985832229 -0700
-@@ -413,7 +413,9 @@
- 							data = priv->GetIndirectKey(PoDoFo::PdfName(Key.toUtf8().data()));

- 							PoDoFo::PdfStream const *stream = data->GetStream();

- 							char *Buffer;

--#if defined(pdf_long)

-+#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)

-+							PoDoFo::pdf_long bLen = 0;

-+#elif defined(pdf_long)

- 							pdf_long bLen = 0;

- #else

- 							long bLen = 0;

-@@ -432,7 +434,9 @@
- 									break;

- 								PoDoFo::PdfStream const *stream = data->GetStream();

- 								char *Buffer;

--#if defined(pdf_long)

-+#if (PODOFO_MAJOR == 0 && PODOFO_MINOR >= 8)

-+								PoDoFo::pdf_long bLen = 0;

-+#elif defined(pdf_long)

- 								pdf_long bLen = 0;

- #else

- 								long bLen = 0;

diff --git a/app-office/scribus/files/scribus-1.3.9-cups-1.5.patch b/app-office/scribus/files/scribus-1.3.9-cups-1.5.patch
deleted file mode 100644
index 97a021538a4f..000000000000
--- a/app-office/scribus/files/scribus-1.3.9-cups-1.5.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- scribus/cupsoptions.cpp  |    1 +
- scribus/util_printer.cpp |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/scribus/cupsoptions.cpp b/scribus/cupsoptions.cpp
-index 134bead..34edc06 100644
---- a/scribus/cupsoptions.cpp
-+++ b/scribus/cupsoptions.cpp
-@@ -42,6 +42,7 @@ for which a new license (GPL+exception) is in place.
- #include "scconfig.h"
- #ifdef HAVE_CUPS
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #endif
- #include "util_icon.h"
- 
-diff --git a/scribus/util_printer.cpp b/scribus/util_printer.cpp
-index 8d08cba..1b173cd 100644
---- a/scribus/util_printer.cpp
-+++ b/scribus/util_printer.cpp
-@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place.
- 
- #if defined( HAVE_CUPS )
-  #include <cups/cups.h>
-+ #include <cups/ppd.h>
- #elif defined(_WIN32)
-  #include <windows.h>
-  #include <winspool.h>
diff --git a/app-office/scribus/files/scribus-1.4.0-export.patch b/app-office/scribus/files/scribus-1.4.0-export.patch
deleted file mode 100644
index 4ae87b34ea45..000000000000
--- a/app-office/scribus/files/scribus-1.4.0-export.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- scribus/plugins/pixmapexport/export.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/scribus/plugins/pixmapexport/export.cpp b/scribus/plugins/pixmapexport/export.cpp
-index 6ff5e0a..d9e273a 100644
---- a/scribus/plugins/pixmapexport/export.cpp
-+++ b/scribus/plugins/pixmapexport/export.cpp
-@@ -96,7 +96,7 @@ bool PixmapExportPlugin::run(ScribusDoc* doc, QString target)
- 	Q_ASSERT(target.isEmpty());
- 	Q_ASSERT(!doc->masterPageMode());
- 	QSharedPointer<ExportBitmap> ex( new ExportBitmap() );
--	QSharedPointer<ExportForm>  dia( new ExportForm(doc->scMW(), doc, ex->pageDPI, ex->quality, ex->bitmapType) );
-+	QSharedPointer<ExportForm>  dia( new ExportForm(0, doc, ex->pageDPI, ex->quality, ex->bitmapType) );
- 
- 	// interval widgets handling
- 	QString tmp;
diff --git a/app-office/scribus/files/scribus-1.4.0_rc5-docs.patch b/app-office/scribus/files/scribus-1.4.0_rc5-docs.patch
deleted file mode 100644
index c6e49e68d7a3..000000000000
--- a/app-office/scribus/files/scribus-1.4.0_rc5-docs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- CMakeLists.txt |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3f34048..4880594 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -267,7 +267,7 @@ ELSE (WIN32 OR OS2)
-     SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-   ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
-         IF(NOT WANT_VERSIONING)
--            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/")
-+            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/")
-         ELSE(NOT WANT_VERSIONING)
-             SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
-         ENDIF(NOT WANT_VERSIONING)
-@@ -801,12 +801,10 @@ INSTALL(FILES
-   BUILDING
-   ChangeLog
-   ChangeLogSVN
--  COPYING
-   LINKS
-   NEWS
-   PACKAGING
-   README
--  README.MacOSX
-   TODO
-   TRANSLATION
-   DESTINATION ${DOCDIR}
diff --git a/app-office/scribus/files/scribus-1.4.2-cups.patch b/app-office/scribus/files/scribus-1.4.2-cups.patch
deleted file mode 100644
index 87f0d7a04abd..000000000000
--- a/app-office/scribus/files/scribus-1.4.2-cups.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 141301f..78578de 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -612,7 +612,7 @@ ENDIF (OLDRENDERLIBLOST OR WANT_QTARTHUR OR RENDER_LIB STREQUAL "QTARTHUR" OR NO
- #>>Render Library
- 
- #<<CUPS
--IF(NOT WIN32)
-+IF(NOT WIN32 AND WANT_CUPS)
-   IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
-     SET(Cups_DIR ${CMAKE_MODULE_PATH})
-   ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
-@@ -621,10 +621,10 @@ IF(NOT WIN32)
-     SET(HAVE_CUPS 1)
-     MESSAGE("CUPS Library Found OK")
-   ENDIF(CUPS_FOUND)
--ELSE(NOT WIN32)
-+ELSE(NOT WIN32 AND WANT_CUPS)
-   # Windows doesn't use CUPS
-   SET(CUPS_INCLUDE_DIR)
--ENDIF(NOT WIN32)
-+ENDIF(NOT WIN32 AND WANT_CUPS)
- #>>CUPS
- 
- #<<LibXML2
diff --git a/app-office/scribus/files/scribus-1.4.2-imaging.patch b/app-office/scribus/files/scribus-1.4.2-imaging.patch
deleted file mode 100644
index e94e812d1353..000000000000
--- a/app-office/scribus/files/scribus-1.4.2-imaging.patch
+++ /dev/null
@@ -1,25 +0,0 @@
- scribus/plugins/scriptplugin/scripts/FontSample.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scribus/plugins/scriptplugin/scripts/FontSample.py b/scribus/plugins/scriptplugin/scripts/FontSample.py
-index 0219a32..1e9be38 100644
---- a/scribus/plugins/scriptplugin/scripts/FontSample.py
-+++ b/scribus/plugins/scriptplugin/scripts/FontSample.py
-@@ -154,7 +154,7 @@ if not os.path.exists(CONFIG_PATH):
- 
- 
- try:
--    import Image
-+    from PIL import Image
- except ImportError,err:
-     print 'You need to install Python Imaging Library (PIL).'
-     print 'If using gentoo then you need to emerge /dev-python/imaging'
-@@ -164,7 +164,7 @@ except ImportError,err:
- 
- 
- try:
--    import ImageTk
-+    from PIL import ImageTk
- except ImportError,err:
-     print 'Module ImageTk not found, font preview disabled'
-     showPreviewPanel = 0
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 7b8b492736f7..65f1b6595e29 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -12,16 +12,6 @@
     <flag name="osg">3D redering via <pkg>dev-games/openscenegraph</pkg></flag>
     <flag name="templates">Document tamplates</flag>
     <flag name="hunspell">Enable support for spell checking with <pkg>app-text/hunspell</pkg></flag>
-    <flag name="linguas_cs_CZ">Language support for cs_CZ</flag>
-    <flag name="linguas_da_DK">Language support for da_DK</flag>
-    <flag name="linguas_de_1901">Language support for de_1901</flag>
-    <flag name="linguas_de_CH">Language support for de_CH</flag>
-    <flag name="linguas_en_AU">Language support for en_AU</flag>
-    <flag name="linguas_lt_LT">Language support for lt_LT</flag>
-    <flag name="linguas_pl_PL">Language support for pl_PL</flag>
-    <flag name="linguas_sa">Language support for sa</flag>
-    <flag name="linguas_sk_SK">Language support for sk_SK</flag>
-    <flag name="linguas_th_TH">Language support for th_TH</flag>
     <flag name="poppler">Native pdf import</flag>
     <flag name="scripts">Install the scripts</flag>
     <flag name="tk">Install tk based scripts e.g. FontSample.py</flag>