Version Bump

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

6 files changed, 249 insertions, 46 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/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
 			;;
 		*)