Enhance fPIC patch and fix configure options with USE=osg, bug #550130

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

5 files changed, 277 insertions, 21 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 6ec4198fe097..30b1f89b0d19 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,12 @@
 # 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.209 2015/05/29 07:51:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.210 2015/05/29 09:37:12 jlec Exp $
+
+*scribus-1.5.0-r1 (29 May 2015)
+
+  29 May 2015; Justin Lecher <jlec@gentoo.org> +scribus-1.5.0-r1.ebuild,
+  files/scribus-1.5.0-fpic.patch, scribus-9999.ebuild:
+  Enhance fPIC patch and fix configure options with USE=osg, bug #550130
 
   29 May 2015; Justin Lecher <jlec@gentoo.org> scribus-1.4.5-r1.ebuild:
   Always install en localisation, bug #549876
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 9a3b38a7c444..4fa0b215a71e 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -6,33 +6,34 @@ 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-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
+AUX scribus-1.5.0-fpic.patch 6215 SHA256 b27693eb12bcbffa6b4e7a61ca609435c4165a641f745a46194093fea9d78038 SHA512 c8f67816b9d9c81bee05cb3c743a6dfef0f229ba56e9af2d104d9b22b97a96b2dd80fbe368b38dd1bdb8ffc21d9c45205f35376300e6d7a90fb54ee348998dc2 WHIRLPOOL 62ccba0c8a924a50abc28a389c3252e1213a13d7cdbefe7d9f31249adff51a998bdb541cd7d8c341282710d593bbedb5851979652456535839311b78124aa191
 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 5868 SHA256 95e3e517b0510891ebe7676b89d974a784edcbe0edd253692a9a29e1b4e38691 SHA512 365c6ca6045372a56f70d89c9bce8c5e27f872fb3d1137b0bb55ffd8b4024d3e2732b0abcc24766379970f0f52ce6458ccd9a25dc95267671b129ed754033aa5 WHIRLPOOL a2ac36629c5668288e84962ee999e283f7f4293e5c4eec2310575afd6390c7a24bcba3edffc4d71931872a4fbb7ff760df71a0fecbb25b870c91e91366c1d95c
 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 28294 SHA256 973c08d99236389385e30d985b3a185a6e46495bace4aec62470d13e1c185088 SHA512 9173fc8c4c39262d5e65878dd2ee3732a219506e7e9be12f9d4bb9fa14c9cfac4e60165196bd195ff84e714fb097427581cde0762bc3e240cb2eef651913dd8a WHIRLPOOL feb42f793dd605ee38db0bb2b9b6705946ccbcd53f6072875ffd0870557fc191e0224edd8226f6c40809bd448819688258989c9adaac22b01b965b39c44c34b2
+EBUILD scribus-9999.ebuild 5882 SHA256 8ed20081d674a646d586b8b179193e2a0129389f6cbd304ab683742657031c52 SHA512 05dc3357309c9e137de78f16bc9e5cd1820baef76ceaada06042736d2654cda915e2f3f5094612ad40d9cb44950d14437eea1ce4d803f0db8c0f7e3140b024e5 WHIRLPOOL becd04fb6a976d455eca7d1f93d2d9501f78caaef7b873824678928d25491d08ba7641f331f3382b0a989051a1c3547ab942feac8bb43e13257a2a3f284b8634
+MISC ChangeLog 28529 SHA256 28a4a903277627d64718a21fa21ab91308a7b824600e743d8d4fd28762f9ffe3 SHA512 47c60b8f482b97e63be614a8580899b80a7b1599dd763086428fd4f6d833bdc37f676a010f48ac95c6d70d77eb189ee2b58c81bbb7d0c535f504b1b78ec6cb0e WHIRLPOOL 0d79dfb278e063daa0c578e56966f5e51863e74f73d7709858e15ad5acfd2ea7b005b092132f7956dd855ba8da9dfb0a7dad70f70ed04fcc6bf9ff16341650de
 MISC metadata.xml 900 SHA256 279e9a6f69c420d77bf8859a68f81638032fbf83c0d61d084d68dcbb52830dde SHA512 89d13f2a0a895bfe0b01e30839483d96e25b26164c5a5566bc18fcbb92a2e56a8daef5fbc4478d35aecdad327c7905393f2299007cbf866bdd0543b2eaab30f7 WHIRLPOOL b31847ab5b0274431dc4b3bceab9b5d22235fca15b261046d80f5df661d831f19297cc792e07fe373b157617b65da7f591e231e5a85b34fb78bd67324296b491
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVaBqVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVaDNJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+a0P/jQg+FfsxdeFdYD/+M0GcpQK
-wgh0HwuiicwL/bXAa184vjreESJXc/2wN4GtrZFazbX3+ThVNiHF1YG9u3ecAxG6
-JGXSrQoU0X18HYBbD80dNmzZ36MXQhYkeq90GwYouMJkk+PG1wtuC3giAivJiB4h
-4l3YtD2u6aA0Ah8bAYd5K4MD7/2qUFq8Xz9gPtvCG4OyOZQr29J8DSnJmOy99sAw
-4SA+zbhw3aChQ+1os3H+BCSgCahGPt5fzChwx3sVmr5/bMcuNBkWNqdfjQCAa1ab
-MVUuBT8/cxCHtGpgbSjAj8OvmkWvvgm3LqpQkxqmWvRH/04hxcTC2HD5kMoV9dB9
-RIwBmax0v4vFh10cU5vJUrk3YRyqaQDsFh266ltFDDotZaJG2ao7sykIIfqib7Lo
-iOyYVwmJK4QsRlSrBJFBKAfAt67oxmxdpDJXp/6OStpqtp5RWChEfAW1LDvx/fv+
-+cAM+5Fyyp3+glon9sq/egSH4XXs2F/r8a/rkKoWVJXJmYEuKcmjUH2tN+vHrsY0
-G1rFBU4MhABXqPr1h9Y/svEZluy/2J5zDre5+sCXSvJWtxVUhXdjP9t8PA/PWqEM
-QuuvC9ipVQLm/YM2UGDu3CqbNcBJN7i5vXfuQCDkZt8qYYvl7YEMu16Mz4VcPn9W
-Mt9044NAf6IcLwepam9U
-=SFKC
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXKYQAKC75nm+Elg9QhdUMeLBKt/Z
+dwPzXgVp7VMHH0aUOqdihKgDFtPnE6oreNh1pD9ZYFaghOpGVyy9LK2a79I72Ujh
+REvZgL/R3YwJwwMJmrgvPNKKzEdU9jDOm6Gecv31twPWfIglBJfI+HPB5FUMjE99
+1WwTZf4UhhiwhzYECZpw3UA+bZXxn/1J5moPZJO0H1J6pWljuIRywgXN47GrZvsX
+fVd7ntGRc8h+H1GUEqct1ZcozcBETJr3xyMHJRpsCT7jGoiT6my1qywuo0RRX3Mr
+vcJ6IO65f1/sTKlR4dk+WUzi6q6T2YXuTrUzzfCAO/4QwDLXUbowxZl16I1RWbGD
+MgqwbfzI1nRTsF+RbHPoOe1+bHq7FogEeXj+0gZwc9dc81NQkflh4zEfVVCdn3ZV
+le7yuAHSnc4Tb15lKCRUAqTdhrzfxy9+4ymI0s7Z5fa1l/Ys2YS0fA2u4XTpn0bH
+/5UBASpoPgFqzb6OzPPW1GByM9G4GtKIAtzHTWTTLdEwgyVRnxPkmhgkKnVRJun/
+wN/oqTylhPrrG4IpMduR/DPbpKxRVy0ZOSFj8+OlHLuFnfSa4q8P9/5wWjZidS/U
+/hkZDN5x8cccYfIluJC1qj9JN7RRwmgO6UiduKPAmbROgGvQIi5XKZdhD+TPzVMY
+YpJ3qP41U9cIuvmMxT3U
+=ihvd
 -----END PGP SIGNATURE-----
diff --git a/app-office/scribus/files/scribus-1.5.0-fpic.patch b/app-office/scribus/files/scribus-1.5.0-fpic.patch
index d88619eaa92e..0c33a9c81c8b 100644
--- a/app-office/scribus/files/scribus-1.5.0-fpic.patch
+++ b/app-office/scribus/files/scribus-1.5.0-fpic.patch
@@ -5,8 +5,11 @@
  scribus/styles/CMakeLists.txt               | 2 ++
  scribus/text/CMakeLists.txt                 | 1 +
  scribus/third_party/lib2geom/CMakeLists.txt | 8 +-------
+ scribus/third_party/pgf/CMakeLists.txt      | 2 ++
+ scribus/third_party/prc/CMakeLists.txt      | 2 ++
+ scribus/third_party/wpg/CMakeLists.txt      | 7 ++++---
  scribus/third_party/zip/CMakeLists.txt      | 2 ++
- 8 files changed, 18 insertions(+), 7 deletions(-)
+ 11 files changed, 26 insertions(+), 10 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 29d66f3..62d145f 100644
@@ -108,6 +111,51 @@ index 6187d96..3106f6e 100755
  

  OPTION(2GEOM_BUILD_SHARED

    "Build lib2geom and libtoy as shared libraries."

+diff --git a/scribus/third_party/pgf/CMakeLists.txt b/scribus/third_party/pgf/CMakeLists.txt
+index f84b3d4..d3b1db6 100644
+--- a/scribus/third_party/pgf/CMakeLists.txt
++++ b/scribus/third_party/pgf/CMakeLists.txt
+@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/scribus
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ SET(SCRIBUS_PGF_LIB_SOURCES
+         Decoder.cpp
+         Encoder.cpp
+diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt
+index 5f7c2c6..1da7177 100644
+--- a/scribus/third_party/prc/CMakeLists.txt
++++ b/scribus/third_party/prc/CMakeLists.txt
+@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
+ )
+ 
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ SET(SCRIBUS_PRC_LIB_SOURCES
+     oPRCFile.cc
+     PRCbitStream.cc
+diff --git a/scribus/third_party/wpg/CMakeLists.txt b/scribus/third_party/wpg/CMakeLists.txt
+index ff31e9f..fbc5cd4 100644
+--- a/scribus/third_party/wpg/CMakeLists.txt
++++ b/scribus/third_party/wpg/CMakeLists.txt
+@@ -2,10 +2,11 @@ INCLUDE_DIRECTORIES(
+ ${CMAKE_SOURCE_DIR}

+ ${CMAKE_SOURCE_DIR}/scribus

+ )

++

+ SET(LIB_TYPE STATIC)

+-IF (ARCH_X86_64 EQUAL 1)

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

+-ENDIF (ARCH_X86_64 EQUAL 1)

++

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

++

+ SET(WPG_SOURCES

+     WPG1Parser.cpp

+     WPG2Parser.cpp

 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
diff --git a/app-office/scribus/scribus-1.5.0-r1.ebuild b/app-office/scribus/scribus-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..c6a3b92ab5d5
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.0-r1.ebuild
@@ -0,0 +1,201 @@
+# 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.1 2015/05/29 09:37:12 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} || [[ ${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 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#;};en"
+		$(cmake-utils_use_with pdf PODOFO)
+		$(cmake-utils_use_with boost)
+		$(cmake-utils_use_want graphicsmagick)
+		$(cmake-utils_use !osg WANT_NOOSG)
+		$(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
+}
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 14878ebb6523..ed64087a32c9 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.15 2015/05/21 12:12:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.16 2015/05/29 09:37:12 jlec Exp $
 
 EAPI=5
 
@@ -130,7 +130,7 @@ src_configure() {
 		$(cmake-utils_use_with pdf PODOFO)
 		$(cmake-utils_use_with boost)
 		$(cmake-utils_use_want graphicsmagick)
-		$(cmake-utils_use_want osg)
+		$(cmake-utils_use !osg WANT_NOOSG)
 		$(cmake-utils_use_want debug DEBUG)
 		$(cmake-utils_use_want minimal NOHEADERINSTALL)
 		$(cmake-utils_use_want hunspell HUNSPELL)