From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B22DE1388BF for ; Thu, 14 Jan 2016 09:54:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA3EE21C01E; Thu, 14 Jan 2016 09:53:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03BFF21C01C for ; Thu, 14 Jan 2016 09:53:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00606340948 for ; Thu, 14 Jan 2016 09:53:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3EA06E68 for ; Thu, 14 Jan 2016 09:53:46 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1452765217.187c5630dcab29fca836cc08fe3d6bb82dbe51c2.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/Manifest app-office/scribus/scribus-1.4.5.ebuild app-office/scribus/scribus-1.4.6.ebuild X-VCS-Directories: app-office/scribus/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 187c5630dcab29fca836cc08fe3d6bb82dbe51c2 X-VCS-Branch: master Date: Thu, 14 Jan 2016 09:53:46 +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: e71cec33-59ce-4205-a62d-0f9b2c7af4d5 X-Archives-Hash: 7836de864a5ff4b6a80e041f47514c35 commit: 187c5630dcab29fca836cc08fe3d6bb82dbe51c2 Author: Justin Lecher gentoo org> AuthorDate: Thu Jan 14 08:58:45 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Jan 14 09:53:37 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187c5630 app-office/scribus: Version Bump Package-Manager: portage-2.2.26 Signed-off-by: Justin Lecher gentoo.org> app-office/scribus/Manifest | 1 + app-office/scribus/scribus-1.4.5.ebuild | 13 +++++------ .../{scribus-1.4.5.ebuild => scribus-1.4.6.ebuild} | 25 +++++++++++----------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 517756d..70f4809 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,3 +1,4 @@ DIST scribus-1.4.4.tar.xz 71274196 SHA256 a43b9d55518ccebdb770d3cdac44ebf75c60ad11c284b210f6b0bd8c7a0217ae SHA512 aafcb0870d4a3054585d79ef7d7e7726dd8bd8eb8a177bcf812a42d00583a1d684a9abb61607e69c64bf9fdb4a98258be4a5b2df5cfb7c953238bc3a6a2d34bb WHIRLPOOL dff4f44ed0600737076a233ef3c7d2fd6b534f30e9d6016b884eadab2512c3f4a8610e932207d95a597795812ec7a45128ca66b6bc294fa1336f3411595c5df9 DIST scribus-1.4.5.tar.bz2 78251228 SHA256 9f706f0561d26bb11bbe558690ae0507cd3689e381f6e17aa9411d9c4ef58498 SHA512 60db402b0fc4880f795694f3d6823ff2cedd660e7431c311ec7b75d79f09815e790da562c4cd4c080811559d1c16a3e65be8e1a348f655dbc37c3a6cec74650e WHIRLPOOL f53273810ae2b7aa35403d6e622fb0ebb67f35d454aa4667dbbe81efe5fb2de3564d346741b80c5bed33a307e8c58fe7ba695900e45f602b3a14db1cae82d948 +DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7 DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.5.ebuild index 246e7fc..a123e31 100644 --- a/app-office/scribus/scribus-1.4.5.ebuild +++ b/app-office/scribus/scribus-1.4.5.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$ @@ -120,13 +120,14 @@ src_install() { if ! use scripts; then rm "${ED}"/usr/share/scribus/scripts/*.py || die - elif ! use tk; then - rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die + else + if ! use tk; then + 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 fi - python_fix_shebang "${ED}"/usr/share/scribus/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 cat >> "${T}"/COPYING <<- EOF diff --git a/app-office/scribus/scribus-1.4.5.ebuild b/app-office/scribus/scribus-1.4.6.ebuild similarity index 85% copy from app-office/scribus/scribus-1.4.5.ebuild copy to app-office/scribus/scribus-1.4.6.ebuild index 246e7fc..a60d73f 100644 --- a/app-office/scribus/scribus-1.4.5.ebuild +++ b/app-office/scribus/scribus-1.4.6.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$ @@ -11,7 +11,7 @@ inherit cmake-utils fdo-mime python-single-r1 DESCRIPTION="Desktop publishing (DTP) and layout program" HOMEPAGE="http://www.scribus.net/" -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.bz2" +SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" @@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk" # 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 eo 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_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de_1901 de_CH de el en_AU en_GB en_US eo 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+=" ${IUSE_LINGUAS// / linguas_}" REQUIRED_USE=" @@ -54,9 +54,7 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-1.4.2-docs.patch "${FILESDIR}"/${PN}-1.4.0-minizip.patch - "${FILESDIR}"/${PN}-1.4.4-ppc64-fpic.patch ) src_prepare() { @@ -93,8 +91,10 @@ src_configure() { -DPYTHON_LIBRARY="$(python_get_library_path)" -DWANT_NORPATH=ON -DWANT_QT3SUPPORT=OFF - -DGENTOOVERSION=${PVR} + -IUSE_LINGUAS=ON -DWANT_GUI_LANG=${langs#,} + -DCMAKE_INSTALL_DATAROOTDIR="${EPREFIX}/usr/share" + -DTAG_VERSION=-${PVR} $(cmake-utils_use_with pdf PODOFO) $(cmake-utils_use_want cairo) $(cmake-utils_use_want !cairo QTARTHUR) @@ -119,14 +119,15 @@ src_install() { done if ! use scripts; then - rm "${ED}"/usr/share/scribus/scripts/*.py || die - elif ! use tk; then - rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die + rm "${ED}"/usr/share/${PF}/scripts/*.py || die + else + if ! use tk; then + rm "${ED}"/usr/share/${PF}/scripts/{FontSample,CalendarWizard}.py* || die + fi + python_fix_shebang "${ED}"/usr/share/${PF}/scripts + python_optimize "${ED}"/usr/share/${PF}/scripts fi - python_fix_shebang "${ED}"/usr/share/scribus/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 cat >> "${T}"/COPYING <<- EOF