Version Bump

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

7 files changed, 273 insertions, 55 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 211655e7c814..909783010687 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,14 @@
 # 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.207 2015/05/20 04:59:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.208 2015/05/21 12:12:02 jlec Exp $
+
+*scribus-1.5.0 (21 May 2015)
+
+  21 May 2015; Justin Lecher <jlec@gentoo.org>
+  +files/scribus-1.5.0-docdir.patch, +files/scribus-1.5.0-fpic.patch,
+  +scribus-1.5.0.ebuild, -scribus-1.4.9999.ebuild, metadata.xml,
+  scribus-9999.ebuild:
+  Version Bump
 
   20 May 2015; Jeroen Roovers <jer@gentoo.org>
   -files/scribus-1.3.5.1-system-hyphen.patch,
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 799d582eb7c8..e9f0ace3a83d 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,23 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX scribus-1.4.0-minizip.patch 1891 SHA256 dcbe79335a59b7238d6866f7c92757ffb5ac1ef26ff9f146b4fb702814c83dd7 SHA512 99feefb8e4ba9ae903e6a7a68b4cd497572ef254b550c864135e20392902e3595ea4414916474d5e80ceabc66e6cc5fac09af41955cbb2ba8e8d41480009bd86 WHIRLPOOL bc0d8086b146f867ddd807b1bcfa911e678eb13eb7833370871730b46dbf8cd94b93f58157b940da36c1ba9c439335cd952aa1163866e8b4aab2f6964071d9c3
 AUX scribus-1.4.2-docs.patch 814 SHA256 5676964e58f241666a0b07513e55055e9badc562409493714e75aef750e4e00f SHA512 bf26fdf032b2e6d0ae1e11dcfa5f75ba36a1561868b2161afece7a993536c49353f6b53841ab3aa5749ff5b474df72ef87345c496719c4d609b8c1345aa8efe1 WHIRLPOOL 67734220b79f03dfba8cb8a796475e1f23c67c1c0da53a4c5d1f6315dd99ca2ed4a66cf1dc2c1bb3ac11fd92e97f87264a0fc0ebffa5327673fc62b60328fa9f
 AUX scribus-1.4.4-ppc64-fpic.patch 1137 SHA256 6fddac38cc50624b51403c1828a6dddd3cfe53cc364c4a3de53c9509fe4753ad SHA512 3160f4b8ac876cddb2fb5b1134b06940456324c8f7ffd8df29e1578ac6543d22b9603d43b14f7ce7b8359e2311675777395555b07b78bbcffa93ac69c490de9f WHIRLPOOL d3af321c629b260a2d449e4cd44aef9ea8b9ce34ebde8a5314b31643be7f7b5ed6ad116c9f84c9f9f147fa99f8e62dc03838fb3bfd7f0d042597ee442af4d462
+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 4634 SHA256 abf9c5cafb079b9d060c59bc08d51589eb440f82db9b7b263d7bcb5b5bcc1412 SHA512 86ee1d4a395eb34e7ba3b1ab9fc2a45f68be5067fdd080a4704ab4fb0e765996c47adaac2c637f734f651ba02890e265a9c2eb3c65f6e8c066f7464d2e2aa5c7 WHIRLPOOL e33ee203999352212f0a8be5c787cebc3a8666a4a6451f6689e82124d00473502321f499e36a4ab3f3fcddcc19cb08eca68608ac0124f07b0d6eb7f9da8c2006
 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 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 27923 SHA256 e25b22144f5fd3a0086b1dfef76879162c106c288b192d853b162d0fb214810f SHA512 ebdc5955d74a520291b3d2bd3ed49030b46494da576d635570ce1c2fe006a2fdea47b67cd65cfaa58810d8afa9e22d8d84faccf058f3e23d3d3724c91203749f WHIRLPOOL 241a0213d8f30de01d5d8a7a8f9a12cd576f97b6dc21bb57f72ba05b04714a911f33c804d51a0a7fb15f688fc5312c7e2f8efa419472156b73ebce7ff61f2626
-MISC metadata.xml 877 SHA256 1e389ec930988d20e2fa5bbf15b597447420a8a344052ecffa933a0dcc907001 SHA512 8faded7ef8eeaf5b03910b499457621527abebe45c928f7385e5866a4ff52ca5ee1cc2c7619b12c7d46e4b5d542fafd4885a366e72af0ea681fa5243a5d14f45 WHIRLPOOL 7d7822069cd1e45a3127bb053634bc2f04d2b4b5997ed8ac3ec128ee715e68a8bca759001bbe9ee30f6ab9a9755ecdbc9284e789b78022ff09d3fc61da0b9aa3
+EBUILD scribus-1.5.0.ebuild 5828 SHA256 aba34ce3f7392c8a60e526c5d6c6974a2a5b5667ac350f44741d2bed11912303 SHA512 f2858ee5186fc8489bf6518c7451351b155b8edad3cc5d98929608b20097b71621651f809fb775d5ff71b3ef459ef17bd2b5b4d272f21b07103d56a5b5876555 WHIRLPOOL 5cdad215bff48b5d551056879834d9bda7656fa10db15ae0eb20cfcba03fd6894707fd6c129bc5564e05623b3ae9280de947b1ec6580caf4ff722453ecc63920
+EBUILD scribus-9999.ebuild 5875 SHA256 15a3ebe6c7eaffdfc1000aa05affd1fddaf4b903fa1a4ba15c42042984ba2fca SHA512 4c6df2f2e7f06f8f895482c1acdaa10b536a417ee77cdc4a34f2f6cf8a35ae679d283be1782541957b7353f68951d8d092ae4e1495b6778d44547ca5b8a84589 WHIRLPOOL 12b13137cbc9304e939dedd8ac10033bcaf99dfcf1e5e3aae8934c95e30fda2d97c20cdf4a99ca83410e1ed264dc806541fb87ee744ce7afab7b5b28b7de4241
+MISC ChangeLog 28175 SHA256 beb8c08a05027249d2622c3fae436f346cf4d985ee1f6b96149d217be41a91be SHA512 6142c92b9d590f2c5fd145633ff97a434c6028d3e9e96e238f7de6b8385c18bdbe6173ea4249d4feac354cfbb1ea2ef3f81ec29031bcb350ce4013952548b3e5 WHIRLPOOL 7d9e0d2d2e0e723a83d2059bf0e95fb4b508d3408f7ae0e62d082127935dcca1737df1430feccb9f1fbe961f574a52fa9bfcbbcfddee87890ae93f5d7cc1aba9
+MISC metadata.xml 900 SHA256 279e9a6f69c420d77bf8859a68f81638032fbf83c0d61d084d68dcbb52830dde SHA512 89d13f2a0a895bfe0b01e30839483d96e25b26164c5a5566bc18fcbb92a2e56a8daef5fbc4478d35aecdad327c7905393f2299007cbf866bdd0543b2eaab30f7 WHIRLPOOL b31847ab5b0274431dc4b3bceab9b5d22235fca15b261046d80f5df661d831f19297cc792e07fe373b157617b65da7f591e231e5a85b34fb78bd67324296b491
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVcFKwACgkQVWmRsqeSphN+NgCfSTepkhxq8X9V9766lSMEtkRh
-piAAmwcXTGhmllIS8BH3YDRupVDfPb2A
-=H/p8
+iQJ8BAEBCgBmBQJVXcuTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixrgP/A7BCJt9CiPZwsrIYUGntFro
+R7zfwnrT9dftIXepEZeJSbSttqVgFxepclRum8LhZLpEd68czB0RdG/XKy+0kbJe
+vJ0yVYPodCLUmcPW9Tda3JYWk23cA2tv+iWTXhEpzTjSCi1F8Our0l8GMFJ0M01y
+k0e4588XGJh+vaZ1Y4w2Awud+jlv0fwcD2yzOMGxLKQh1HeSeCGdMGavg0doLNQR
+irKfBHRo0n1b0LayjQ+2e+TlXR2JG79XjdKmzXvq/9R/Gfw5vTOatrBFIVTHqPdD
+zK3oCuXDF642dFrm7O9ZKUGsBz1pMC/7aqSMFJX4/LOS9B7PXicxR+rBgbdQe3ZL
+b+9aiDR+8envhQEu+cPco9gvyW/SnZyGu6HOV63KgCVr3ZmTTzzPt9XSTAtzShb0
+LKGeE/KoiBkgGtLEytQH+XOjjoPkH29c+78wCyN1MVf/6+ALmUov/vnBKyr9/qMS
+eXMb6z1tTog4rKNFf759hFP3wlk5hlsODsvMmAT7qMANpgI4AUPGCQ5V/pgdwAr+
+eey3kcjRZWYR0+LmX/uh65k8NtwvWFFAnRu0oYJSo05NDoteV6V8iWBeQIICKqhd
+TyLdIknX5VQObKE0yWwL75+1lm5ilFkhs/Io2j9GiSM6j9nTPpu4uQyKzANKejU7
+j76a7CR9P0kDbWMZ2jSE
+=LQct
 -----END PGP SIGNATURE-----
diff --git a/app-office/scribus/files/scribus-1.5.0-docdir.patch b/app-office/scribus/files/scribus-1.5.0-docdir.patch
new file mode 100644
index 000000000000..2ff316a91b57
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.0-docdir.patch
@@ -0,0 +1,42 @@
+ CMakeLists.txt | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 29d66f3..1c08cdd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,19 +244,21 @@ ELSE()
+ ENDIF()
+ 
+ #SHARE - use the default on Apple as TAG_VERSION is empty
+-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)
+-ENDIF (WIN32 OR OS2)
++IF(NOT DOCDIR)
++	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)
++	ENDIF (WIN32 OR OS2)
++ENDIF(NOT DOCDIR)
+ IF(NOT IS_ABSOLUTE ${DOCDIR})
+ 	ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
+ ELSE()
diff --git a/app-office/scribus/files/scribus-1.5.0-fpic.patch b/app-office/scribus/files/scribus-1.5.0-fpic.patch
new file mode 100644
index 000000000000..d88619eaa92e
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.0-fpic.patch
@@ -0,0 +1,123 @@
+ CMakeLists.txt                              | 8 ++++++++
+ scribus/colormgmt/CMakeLists.txt            | 2 ++
+ scribus/desaxe/CMakeLists.txt               | 1 +
+ scribus/fonts/CMakeLists.txt                | 1 +
+ scribus/styles/CMakeLists.txt               | 2 ++
+ scribus/text/CMakeLists.txt                 | 1 +
+ scribus/third_party/lib2geom/CMakeLists.txt | 8 +-------
+ scribus/third_party/zip/CMakeLists.txt      | 2 ++
+ 8 files changed, 18 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 29d66f3..62d145f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,6 +131,14 @@ IF (_machine_sparc64)
+ 	SET(ARCH64BIT 1)
+ ENDIF (_machine_sparc64)
+ 
++# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
++# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
++# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
++
++IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
++	SET(CMAKE_CXX_FLAGS_FPIC "-fPIC")
++ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
++
+ ## Do our Apple OSX version setup
+ IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
+ 	STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
+diff --git a/scribus/colormgmt/CMakeLists.txt b/scribus/colormgmt/CMakeLists.txt
+index 7298a28..87c4f5e 100644
+--- a/scribus/colormgmt/CMakeLists.txt
++++ b/scribus/colormgmt/CMakeLists.txt
+@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/scribus

+ )

+ 

++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")

++

+ INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} )

+ SET(SCRIBUS_LCMS_IMPL_SOURCES

+ 	sclcms2colormgmtengineimpl.cpp

+diff --git a/scribus/desaxe/CMakeLists.txt b/scribus/desaxe/CMakeLists.txt
+index 0098028..85e76b6 100644
+--- a/scribus/desaxe/CMakeLists.txt
++++ b/scribus/desaxe/CMakeLists.txt
+@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus
+ ${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+ 
+ SET(SCRIBUS_DESAXE_LIB_SOURCES
+ saxXML.cpp
+diff --git a/scribus/fonts/CMakeLists.txt b/scribus/fonts/CMakeLists.txt
+index 799e102..f04c680 100644
+--- a/scribus/fonts/CMakeLists.txt
++++ b/scribus/fonts/CMakeLists.txt
+@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus
+ ${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+ 
+ SET(SCRIBUS_FONTS_LIB_SOURCES
+   scface.cpp
+diff --git a/scribus/styles/CMakeLists.txt b/scribus/styles/CMakeLists.txt
+index 6e0cf0a..2839689 100644
+--- a/scribus/styles/CMakeLists.txt
++++ b/scribus/styles/CMakeLists.txt
+@@ -4,6 +4,8 @@ INCLUDE_DIRECTORIES(
+ 	${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ SET(SCRIBUS_STYLES_MOC_CLASSES
+ )
+ 
+diff --git a/scribus/text/CMakeLists.txt b/scribus/text/CMakeLists.txt
+index 1cd112f..4f658e3 100644
+--- a/scribus/text/CMakeLists.txt
++++ b/scribus/text/CMakeLists.txt
+@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES(
+ 	${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+ 
+ SET(SCRIBUS_TEXT_MOC_CLASSES
+ 	storytext.h
+diff --git a/scribus/third_party/lib2geom/CMakeLists.txt b/scribus/third_party/lib2geom/CMakeLists.txt
+index 6187d96..3106f6e 100755
+--- a/scribus/third_party/lib2geom/CMakeLists.txt
++++ b/scribus/third_party/lib2geom/CMakeLists.txt
+@@ -5,13 +5,7 @@ ${CMAKE_SOURCE_DIR}/scribus
+ 

+ SET(2GEOM_VERSION 0.1.0)

+ 

+-# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:

+-# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and

+-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133

+-

+-IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)

+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")

+-ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)

++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")

+ 

+ OPTION(2GEOM_BUILD_SHARED

+   "Build lib2geom and libtoy as shared libraries."

+diff --git a/scribus/third_party/zip/CMakeLists.txt b/scribus/third_party/zip/CMakeLists.txt
+index edf9683..f7676ab 100644
+--- a/scribus/third_party/zip/CMakeLists.txt
++++ b/scribus/third_party/zip/CMakeLists.txt
+@@ -4,6 +4,8 @@ ${CMAKE_SOURCE_DIR}/scribus
+ ${ZLIB_INCLUDE_DIR}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ SET(SCRIBUS_ZIP_LIB_SOURCES
+         unzip.cpp
+         zip.cpp
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 65f1b6595e29..c5e265ff0076 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -7,13 +7,13 @@
     <name>Justin Lecher</name>
   </maintainer>
   <use>
-    <flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag>
+    <flag name="boost">Enable support for Boost based enhancement</flag>
     <flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg></flag>
-    <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="poppler">Native pdf import</flag>
+    <flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</flag>
+    <flag name="osg">3D redering via <pkg>dev-games/openscenegraph</pkg></flag>
     <flag name="scripts">Install the scripts</flag>
+    <flag name="templates">Document tamplates</flag>
     <flag name="tk">Install tk based scripts e.g. FontSample.py</flag>
   </use>
 </pkgmetadata>
diff --git a/app-office/scribus/scribus-1.4.9999.ebuild b/app-office/scribus/scribus-1.5.0.ebuild
index ec3f1ab9e9d7..1cab19bda6d7 100644
--- a/app-office/scribus/scribus-1.4.9999.ebuild
+++ b/app-office/scribus/scribus-1.5.0.ebuild
@@ -1,51 +1,68 @@
 # 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.9999.ebuild,v 1.12 2015/05/18 16:56:51 jlec Exp $
+# $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 multilib python-single-r1 subversion
+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=""
-ESVN_REPO_URI="svn://scribus.net/branches/Version14x/Scribus"
-ESVN_PROJECT=Scribus-1.4
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +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"
+#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/qtcore:4
-	dev-qt/qtgui:4
+	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=
-	cairo? ( x11-libs/cairo[X,svg] )
-	!cairo? ( media-libs/libart_lgpl )
+	>=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}] )
@@ -56,10 +73,12 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-docs.patch
+	"${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)
@@ -68,18 +87,17 @@ src_prepare() {
 	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
 	EOF
 
-	rm scribus/{ioapi,unzip}.[ch] || die
 	sed \
 		-e "/^\s*unzip\.[ch]/d" \
 		-e "/^\s*ioapi\.[ch]/d" \
-		-i scribus/CMakeLists.txt || die
+		-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
-	subversion_src_prepare
 }
 
 src_configure() {
@@ -91,7 +109,7 @@ src_configure() {
 			langs+=";${lang}"
 		else
 			# Don't install localized documentation
-			sed -e "/${lang}/d" -i scribus/doc/CMakeLists.txt || die
+			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
@@ -103,13 +121,13 @@ src_configure() {
 		-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#,}
+		-DWANT_DISTROBUILD=ON
+		-DDOCDIR="/usr/share/doc/${PF}/"
+		-DWANT_GUI_LANG=${langs#;}
 		$(cmake-utils_use_with pdf PODOFO)
-		$(cmake-utils_use_want cairo)
-		$(cmake-utils_use_want !cairo QTARTHUR)
+		$(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)
@@ -135,8 +153,9 @@ src_install() {
 		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
+	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
@@ -164,12 +183,16 @@ 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
 			;;
 		*)
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 247123615f81..14878ebb6523 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.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-9999.ebuild,v 1.14 2015/05/18 16:56:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.15 2015/05/21 12:12:02 jlec Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ ESVN_PROJECT=Scribus-1.5
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cairo debug examples graphicsmagick hunspell +minimal osg +pdf poppler scripts templates tk"
+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"
@@ -33,6 +33,7 @@ REQUIRED_USE="
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	app-text/libmspub
+	>=app-text/poppler-0.19.0:=
 	dev-libs/boost
 	dev-libs/hyphen
 	dev-libs/librevenge
@@ -59,13 +60,12 @@ COMMON_DEPEND="
 	net-print/cups
 	sys-libs/zlib[minizip]
 	virtual/jpeg:0=
-	cairo? ( >=x11-libs/cairo-1.10.0[X,svg] )
-	!cairo? ( media-libs/libart_lgpl )
+	>=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 )
-	poppler? ( >=app-text/poppler-0.19.0:= )
 	scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
 	tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] )
 "
@@ -75,7 +75,8 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-docs.patch
+	"${FILESDIR}"/${PN}-1.5.0-docdir.patch
+	"${FILESDIR}"/${PN}-1.5.0-fpic.patch
 	)
 
 src_prepare() {
@@ -91,14 +92,13 @@ src_prepare() {
 	sed \
 		-e "/^\s*unzip\.[ch]/d" \
 		-e "/^\s*ioapi\.[ch]/d" \
-		-i scribus/CMakeLists.txt || die
+		-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
 
-	use amd64 && append-flags -fPIC
-
 	cmake-utils_src_prepare
 	subversion_src_prepare
 }
@@ -124,13 +124,11 @@ src_configure() {
 		-DHAVE_PYTHON=ON
 		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
 		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_NORPATH=ON
-		-DWANT_QTARTHUR=ON
-		-DWANT_QT3SUPPORT=OFF
-		-DGENTOOVERSION=${PVR}
+		-DWANT_DISTROBUILD=ON
+		-DDOCDIR="/usr/share/doc/${PF}/"
 		-DWANT_GUI_LANG=${langs#;}
 		$(cmake-utils_use_with pdf PODOFO)
-		$(cmake-utils_use_want cairo)
+		$(cmake-utils_use_with boost)
 		$(cmake-utils_use_want graphicsmagick)
 		$(cmake-utils_use_want osg)
 		$(cmake-utils_use_want debug DEBUG)
@@ -164,7 +162,12 @@ src_install() {
 
 	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
+	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
 }
@@ -183,12 +186,16 @@ 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
 			;;
 		*)