app-office/scribus: Update live ebuilds

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

5 files changed, 85 insertions, 47 deletions

diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index 97643dbe1b69..5419c86df699 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/scribus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.175 2013/05/29 08:18:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.176 2013/05/29 09:32:40 jlec Exp $
+
+  29 May 2013; Justin Lecher <jlec@gentoo.org> scribus-1.4.2-r3.ebuild,
+  scribus-1.4.9999.ebuild, scribus-9999.ebuild, metadata.xml:
+  Update live ebuilds
 
 *scribus-1.4.2-r3 (29 May 2013)
 
diff --git a/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index 83a43683a8e9..c320019e314e 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/metadata.xml
@@ -12,6 +12,8 @@
   </maintainer>
   <use>
     <flag name="minimal">Don't install headers (only required for e.g. plug-in developers)</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="aspell">Enable support for spell checking with <pkg>app-text/aspell</pkg></flag>
     <flag name="hunspell">Enable support for spell checking with <pkg>app-text/hunspell</pkg></flag>
diff --git a/app-office/scribus/scribus-1.4.2-r3.ebuild b/app-office/scribus/scribus-1.4.2-r3.ebuild
index d9844848fb8f..e95a78bfea6f 100644
--- a/app-office/scribus/scribus-1.4.2-r3.ebuild
+++ b/app-office/scribus/scribus-1.4.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.2-r3.ebuild,v 1.1 2013/05/29 08:18:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.2-r3.ebuild,v 1.2 2013/05/29 09:32:40 jlec Exp $
 
 EAPI=5
 
@@ -22,7 +22,10 @@ IUSE="aspell cairo debug examples hunspell +minimal +pdf templates"
 IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
 IUSE+=" ${IUSE_LINGUAS// / linguas_}"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 COMMON_DEPEND="
+	${PYTHON_DEPS}
 	dev-python/imaging[tk,${PYTHON_USEDEP}]
 	dev-libs/boost
 	dev-libs/hyphen
diff --git a/app-office/scribus/scribus-1.4.9999.ebuild b/app-office/scribus/scribus-1.4.9999.ebuild
index ae5192bd2d8f..319cc5c641fd 100644
--- a/app-office/scribus/scribus-1.4.9999.ebuild
+++ b/app-office/scribus/scribus-1.4.9999.ebuild
@@ -1,29 +1,34 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.4 2013/03/02 19:37:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.5 2013/05/29 09:32:40 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE=tk
 
 inherit cmake-utils fdo-mime multilib python-single-r1 subversion
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 SRC_URI=""
 ESVN_REPO_URI="svn://scribus.net/branches/Version14x/Scribus"
+ESVN_PROJECT=Scribus-1.4
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cairo debug examples hunspell +minimal +pdf spell templates"
+IUSE="aspell cairo debug examples hunspell +minimal +pdf templates"
 
 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
 IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
 IUSE+=" ${IUSE_LINGUAS// / linguas_}"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-python/imaging[tk,${PYTHON_USEDEP}]
 	dev-libs/boost
 	dev-libs/hyphen
 	dev-libs/libxml2
@@ -37,12 +42,14 @@ COMMON_DEPEND="
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
 	virtual/jpeg
-	spell? ( app-text/aspell )
+	cairo? ( x11-libs/cairo[X,svg] )
 	pdf? ( app-text/podofo )
-	cairo? ( x11-libs/cairo[X,svg] )"
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell )"
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.2-docs.patch
@@ -87,11 +94,12 @@ src_configure() {
 		-DWANT_QT3SUPPORT=OFF
 		-DGENTOOVERSION=${PVR}
 		-DWANT_GUI_LANG=${langs#,}
-		$(cmake-utils_use_has spell ASPELL)
-		$(cmake-utils_use_has pdf PODOFO)
+		$(cmake-utils_use_with aspell ASPELL)
+		$(cmake-utils_use_with pdf PODOFO)
 		$(cmake-utils_use_want cairo)
-		$(cmake-utils_use_want minimal NOHEADERINSTALL)
 		$(cmake-utils_use_want debug DEBUG)
+		$(cmake-utils_use_want minimal NOHEADERINSTALL)
+		$(cmake-utils_use_want hunspell HUNSPELL)
 		)
 	use examples || mycmakeargs+=( -DWANT_NOEXAMPLES=ON)
 	use templates || mycmakeargs+=( -DWANT_NOTEMPLATES=ON)
@@ -117,9 +125,11 @@ src_install() {
 }
 
 pkg_postinst() {
+	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 }
 
 pkg_postrm() {
+	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 }
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index fc7ced96e2c3..90618f96519f 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,29 +1,35 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.4 2013/03/02 19:37:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.5 2013/05/29 09:32:40 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE=tk
 
-inherit cmake-utils fdo-mime multilib python subversion
+inherit cmake-utils fdo-mime multilib python-single-r1 subversion
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="http://www.scribus.net/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 SRC_URI=""
 ESVN_REPO_URI="svn://scribus.net/trunk/Scribus"
+ESVN_PROJECT=Scribus-1.5
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cairo debug examples +minimal +pdf spell templates"
+IUSE="aspell cairo debug examples graphicsmagick hunspell +minimal osg +pdf templates"
 
 # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
-IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de_1901 de_CH de el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
+IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de de_1901 de_CH el en_AU en_GB en_US es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt pt_BR ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
 IUSE+=" ${IUSE_LINGUAS// / linguas_}"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-python/imaging[tk,${PYTHON_USEDEP}]
+	dev-libs/boost
 	dev-libs/hyphen
 	dev-libs/libxml2
 	media-libs/fontconfig
@@ -32,39 +38,40 @@ COMMON_DEPEND="
 	media-libs/libpng:0
 	media-libs/tiff:0
 	net-print/cups
-	sys-libs/zlib
+	sys-libs/zlib[minizip]
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
 	dev-qt/qtwebkit:4
 	virtual/jpeg
-	spell? ( app-text/aspell )
+	cairo? ( x11-libs/cairo[X,svg] )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	osg? ( dev-games/openscenegraph )
 	pdf? ( app-text/podofo )
-	cairo? ( x11-libs/cairo[X,svg] )"
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell )"
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
 DEPEND="${COMMON_DEPEND}
-	dev-libs/boost"
+	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.0-docs.patch
 	)
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
-	if use templates; then
-		sed '/ADD_SUBDIRECTORY(resources\/templates)/d' -i CMakeLists.txt || die
-	fi
-	if use examples; then
-		sed '/ADD_SUBDIRECTORY(samples)/d' -i scribus/plugins/scriptplugin/CMakeLists.txt || die
-	fi
+	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
+
+	rm scribus/{ioapi,unzip}.[ch] || die
 
 	sed \
-		-e '1i#define OF(x) x' \
-		-i scribus/fileunzip.cpp scribus/unzip.h scribus/ioapi.h || die
+		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+		-i resources/templates/CMakeLists.txt || die
 
 	base_src_prepare
 	subversion_src_prepare
@@ -73,30 +80,47 @@ src_prepare() {
 src_configure() {
 	local lang langs
 	for lang in ${IUSE_LINGUAS}; do
-		use linguas_${lang} && langs+=",${lang}"
+		if use linguas_${lang}; then
+			langs+=",${lang}"
+		else
+			sed -e "/${lang}/d" -i doc/CMakeLists.txt || die
+		fi
 	done
 
 	local mycmakeargs=(
 		-DHAVE_PYTHON=ON
 		-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-		-DPYTHON_LIBRARY=$(python_get_library)
+		-DPYTHON_LIBRARY="${EPREFIX}/usr/$(get_libdir)/lib${EPYTHON}.so"
 		-DWANT_NORPATH=ON
 		-DWANT_QTARTHUR=ON
 		-DWANT_QT3SUPPORT=OFF
 		-DGENTOOVERSION=${PVR}
 		-DWANT_GUI_LANG=${langs#,}
-		$(cmake-utils_use_has spell ASPELL)
-		$(cmake-utils_use_has pdf PODOFO)
+		$(cmake-utils_use_with aspell ASPELL)
+		$(cmake-utils_use_with pdf PODOFO)
 		$(cmake-utils_use_want cairo)
-		$(cmake-utils_use_want minimal NOHEADERINSTALL)
+		$(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)
 		)
+	use examples || mycmakeargs+=( -DWANT_NOEXAMPLES=ON)
+	use templates || mycmakeargs+=( -DWANT_NOTEMPLATES=ON)
 	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
 
+	local lang file
+	for lang in ${IUSE_LINGUAS}; do
+		file="${ED}"/usr/share/scribus/translations/scribus.${lang}.qm
+		if ! use linguas_${lang} && [[ -f "${file}" ]]; then
+			rm "${file}" || die
+		fi
+	done
+
 	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
@@ -104,17 +128,12 @@ src_install() {
 	domenu scribus.desktop
 }
 
-pkg_preinst() {
-	# 399595
-	rm -vf "${ED}"/usr/share/doc/${PF}/en* || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en
-	subversion_pkg_preinst
-}
-
 pkg_postinst() {
+	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 }
 
 pkg_postrm() {
+	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 }