From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D602B138330 for ; Tue, 27 Sep 2016 19:15:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B08BE0B78; Tue, 27 Sep 2016 19:15:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C797E0B78 for ; Tue, 27 Sep 2016 19:15:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2BB7133FEDE for ; Tue, 27 Sep 2016 19:15:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 640982486 for ; Tue, 27 Sep 2016 19:15:04 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1475003663.ab0f66c57803c952e7230583e92401054b3f985b.xmw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/scribus-1.5.0-r1.ebuild app-office/scribus/scribus-1.5.2.ebuild app-office/scribus/scribus-9999.ebuild X-VCS-Directories: app-office/scribus/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: ab0f66c57803c952e7230583e92401054b3f985b X-VCS-Branch: master Date: Tue, 27 Sep 2016 19:15:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2084674d-0bbe-4379-8849-a588ab248e35 X-Archives-Hash: ad1572aba6217e700cb9aba3148a7df7 commit: ab0f66c57803c952e7230583e92401054b3f985b Author: Michael Weber gentoo org> AuthorDate: Tue Sep 27 19:14:23 2016 +0000 Commit: Michael Weber gentoo org> CommitDate: Tue Sep 27 19:14:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab0f66c5 app-office/scribus: Update live ebuild. Add qt-5.7.0 patch. Package-Manager: portage-2.2.28 app-office/scribus/scribus-1.5.0-r1.ebuild | 6 ++++- app-office/scribus/scribus-1.5.2.ebuild | 2 +- app-office/scribus/scribus-9999.ebuild | 41 +++++++++++++++++------------- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/app-office/scribus/scribus-1.5.0-r1.ebuild b/app-office/scribus/scribus-1.5.0-r1.ebuild index 80f8a77..aae0c4c 100644 --- a/app-office/scribus/scribus-1.5.0-r1.ebuild +++ b/app-office/scribus/scribus-1.5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -97,6 +97,10 @@ src_prepare() { -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ -i resources/templates/CMakeLists.txt || die + if has_version ">=dev-qt/qtcore-5.7.0" ; then + append-cxxflags "-std=c++11" #bug 591948 + fi + cmake-utils_src_prepare } diff --git a/app-office/scribus/scribus-1.5.2.ebuild b/app-office/scribus/scribus-1.5.2.ebuild index 4faa8de..ea8ec9e 100644 --- a/app-office/scribus/scribus-1.5.2.ebuild +++ b/app-office/scribus/scribus-1.5.2.ebuild @@ -167,7 +167,7 @@ src_install() { EOF dodoc "${T}"/COPYING docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} - doicon resources/iconsets/1_5_0/scribus.png + doicon resources/iconsets/*/scribus.png domenu scribus.desktop } diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index 333a994..59b904e 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -64,7 +64,7 @@ COMMON_DEPEND=" hunspell? ( app-text/hunspell ) graphicsmagick? ( media-gfx/graphicsmagick ) osg? ( dev-games/openscenegraph ) - pdf? ( app-text/podofo ) + pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] ) " @@ -74,7 +74,9 @@ DEPEND="${COMMON_DEPEND} dev-qt/linguist-tools:5 virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${PN}-1.5.0-docdir.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-1.5.0-docdir.patch + ) src_prepare() { rm -r codegen/cheetah || die @@ -96,6 +98,10 @@ src_prepare() { -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ -i resources/templates/CMakeLists.txt || die + if has_version ">=dev-qt/qtcore-5.7.0" ; then + append-cxxflags "-std=c++11" #bug 591948 + fi + cmake-utils_src_prepare subversion_src_prepare } @@ -103,9 +109,9 @@ src_prepare() { src_configure() { local lang langs for lang in ${IUSE_LINGUAS}; do - if use linguas_${lang}; then + if use linguas_${lang} || [[ ${lang} == "en" ]]; then # From the CMakeLists.txt - # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB,de_DE , etc" + # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc" langs+=";${lang}" else # Don't install localized documentation @@ -123,7 +129,7 @@ src_configure() { -DPYTHON_LIBRARY="$(python_get_library_path)" -DWANT_DISTROBUILD=ON -DDOCDIR="/usr/share/doc/${PF}/" - -DWANT_GUI_LANG=${langs#;} + -DWANT_GUI_LANG="${langs#;};en" $(cmake-utils_use_with pdf PODOFO) $(cmake-utils_use_with boost) $(cmake-utils_use_want graphicsmagick) @@ -180,21 +186,22 @@ pkg_postrm() { } safe_delete () { - if path_exists $2; then - case $1 in - dir) + case $1 in + dir) + if [[ -d "${2}" ]]; then ebegin "Deleting ${2} recursively" rm -r "${2}" || die eend $? - ;; - file) + fi + ;; + file) + if [[ -f "${2}" ]]; then ebegin "Deleting ${2}" rm "${2}" || die eend $? - ;; - *) - die "Wrong usage" - ;; - esac - fi + fi + ;; + *) + die "Wrong usage" + esac }