app-office/scribus: Version Bump

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

1 files changed, 30 insertions, 31 deletions

diff --git a/app-office/scribus/scribus-1.4.9999.ebuild b/app-office/scribus/scribus-1.4.9999.ebuild
index 1d38ab33717e..8d02c7ac22f2 100644
--- a/app-office/scribus/scribus-1.4.9999.ebuild
+++ b/app-office/scribus/scribus-1.4.9999.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.2 2012/04/30 07:45:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.9999.ebuild,v 1.3 2013/01/21 16:39:29 jlec Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-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="mirror://sourceforge/${PN}/${P}.tar.xz"
 SRC_URI=""
 ESVN_REPO_URI="svn://scribus.net/branches/Version14x/Scribus"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cairo debug examples +minimal +pdf spell templates"
+IUSE="cairo debug examples hunspell +minimal +pdf spell 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_}"
 
 COMMON_DEPEND="
+	dev-libs/boost
 	dev-libs/hyphen
 	dev-libs/libxml2
 	media-libs/fontconfig
@@ -41,19 +42,13 @@ COMMON_DEPEND="
 	cairo? ( x11-libs/cairo[X,svg] )"
 RDEPEND="${COMMON_DEPEND}
 	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost"
+DEPEND="${COMMON_DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0_rc5-docs.patch
+	"${FILESDIR}"/${PN}-1.4.2-docs.patch
 	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
 	)
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	cat > cmake/modules/FindZLIB.cmake <<- EOF
 	find_package(PkgConfig)
@@ -65,12 +60,9 @@ src_prepare() {
 
 	rm scribus/{ioapi,unzip}.[ch] || die
 
-	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
+	sed \
+		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+		-i resources/templates/CMakeLists.txt || die
 
 	base_src_prepare
 	subversion_src_prepare
@@ -79,13 +71,17 @@ 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 scribus/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
@@ -97,12 +93,22 @@ src_configure() {
 		$(cmake-utils_use_want minimal NOHEADERINSTALL)
 		$(cmake-utils_use_want debug DEBUG)
 		)
+	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
@@ -110,13 +116,6 @@ 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_mime_database_update
 }