jlec 15/06/15 19:30:04 Modified: scribus-9999.ebuild ChangeLog Log: Adopt to current HEAD, bug #551816; use ninja as build engine (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Revision Changes Path 1.17 app-office/scribus/scribus-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/scribus-9999.ebuild?r1=1.16&r2=1.17 Index: scribus-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- scribus-9999.ebuild 29 May 2015 09:37:12 -0000 1.16 +++ scribus-9999.ebuild 15 Jun 2015 19:30:04 -0000 1.17 @@ -1,11 +1,12 @@ # 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.16 2015/05/29 09:37:12 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.17 2015/06/15 19:30:04 jlec Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="tk?" +CMAKE_MAKEFILE_GENERATOR=ninja inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1 subversion @@ -168,7 +169,7 @@ EOF dodoc "${T}"/COPYING docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} - doicon resources/icons/scribus.png + doicon resources/iconsets/*/scribus.png domenu scribus.desktop } @@ -183,22 +184,21 @@ } safe_delete () { - case $1 in - dir) - if [[ -d "${2}" ]]; then + if path_exists $2; then + case $1 in + dir) ebegin "Deleting ${2} recursively" rm -r "${2}" || die eend $? - fi - ;; - file) - if [[ -f "${2}" ]]; then + ;; + file) ebegin "Deleting ${2}" rm "${2}" || die eend $? - fi - ;; - *) - die "Wrong usage" - esac + ;; + *) + die "Wrong usage" + ;; + esac + fi } 1.213 app-office/scribus/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.213&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?rev=1.213&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/ChangeLog?r1=1.212&r2=1.213 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v retrieving revision 1.212 retrieving revision 1.213 diff -u -r1.212 -r1.213 --- ChangeLog 8 Jun 2015 06:46:33 -0000 1.212 +++ ChangeLog 15 Jun 2015 19:30:04 -0000 1.213 @@ -1,6 +1,9 @@ # 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.212 2015/06/08 06:46:33 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.213 2015/06/15 19:30:04 jlec Exp $ + + 15 Jun 2015; Justin Lecher <[email protected]> scribus-9999.ebuild: + Adopt to current HEAD, bug #551816; use ninja as build engine 08 Jun 2015; Justin Lecher <[email protected]> files/scribus-1.5.0-fpic.patch: Handle fPIC for hppa, bug #551452
