jlec 15/01/28 08:49:52 Modified: ChangeLog scribus-9999.ebuild Log: app-office/scribus: Fix live ebuilds support for Qt5, #486288 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.197 app-office/scribus/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.197&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.197&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?r1=1.196&r2=1.197 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- ChangeLog 8 Sep 2014 16:32:37 -0000 1.196 +++ ChangeLog 28 Jan 2015 08:49:52 -0000 1.197 @@ -1,6 +1,9 @@ # ChangeLog for app-office/scribus -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.196 2014/09/08 16:32:37 nimiux Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.197 2015/01/28 08:49:52 jlec Exp $ + + 28 Jan 2015; Justin Lecher <j...@gentoo.org> scribus-9999.ebuild: + Fix live ebuilds support for Qt5, #486288 08 Sep 2014; Chema Alonso <nim...@gentoo.org> scribus-1.4.4-r1.ebuild: Stable for amd64 wrt bug #519890 1.11 app-office/scribus/scribus-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?r1=1.10&r2=1.11 Index: scribus-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scribus-9999.ebuild 14 Aug 2014 07:15:15 -0000 1.10 +++ scribus-9999.ebuild 28 Jan 2015 08:49:52 -0000 1.11 @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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.10 2014/08/14 07:15:15 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.11 2015/01/28 08:49:52 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 subversion DESCRIPTION="Desktop publishing (DTP) and layout program" HOMEPAGE="http://www.scribus.net/"; @@ -28,28 +28,44 @@ ${PYTHON_REQUIRED_USE} tk? ( scripts )" +# osg +# couple of third_party libs bundled COMMON_DEPEND=" ${PYTHON_DEPS} + app-text/libmspub 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 - cairo? ( x11-libs/cairo[X,svg] ) + cairo? ( >=x11-libs/cairo-1.10.0[X,svg] ) !cairo? ( media-libs/libart_lgpl ) hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) pdf? ( app-text/podofo ) - poppler? ( app-text/poppler ) + poppler? ( >=app-text/poppler-0.19.0 ) scripts? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] ) tk? ( virtual/python-imaging[tk?,${PYTHON_USEDEP}] ) " @@ -63,6 +79,7 @@ ) src_prepare() { + rm -r codegen/cheetah || die cat > cmake/modules/FindZLIB.cmake <<- EOF find_package(PkgConfig) pkg_check_modules(ZLIB minizip zlib) @@ -80,6 +97,8 @@ -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 } @@ -133,8 +152,8 @@ 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 + use 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
