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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 974BC15808B for ; Fri, 18 Mar 2022 21:30:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 078EFE0822; Fri, 18 Mar 2022 21:30:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA1C7E0822 for ; Fri, 18 Mar 2022 21:30:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07A2C343897 for ; Fri, 18 Mar 2022 21:30:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46A3B32A for ; Fri, 18 Mar 2022 21:30:34 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1647639020.c93f64cd7214c6005652bac39f92db41724a17b4.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/inkscape/inkscape-1.1.2.ebuild media-gfx/inkscape/inkscape-9999.ebuild X-VCS-Directories: media-gfx/inkscape/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: c93f64cd7214c6005652bac39f92db41724a17b4 X-VCS-Branch: master Date: Fri, 18 Mar 2022 21:30:34 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 094469d7-6f9f-4824-8c8d-e02171ab84b2 X-Archives-Hash: 6b4cc3e47a9017f88c37b0dbb317f7f5 commit: c93f64cd7214c6005652bac39f92db41724a17b4 Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Mar 18 19:49:25 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Mar 18 21:30:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93f64cd media-gfx/inkscape: minor fixes, also from live ebuild Signed-off-by: Andreas K. Hüttel gentoo.org> media-gfx/inkscape/inkscape-1.1.2.ebuild | 37 +++++++++++++++++++++++++------- media-gfx/inkscape/inkscape-9999.ebuild | 4 ++-- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild index c966f1a88c05..58011f3429ba 100644 --- a/media-gfx/inkscape/inkscape-1.1.2.ebuild +++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild @@ -5,18 +5,24 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" - +MY_P="${P/_/}" inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" +else + SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + DESCRIPTION="SVG based generic vector-drawing program" HOMEPAGE="https://inkscape.org/" -SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg -openmp postscript readline spell svg2 visio wpg" +openmp postscript readline spell svg2 test visio wpg" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -91,11 +97,13 @@ RDEPEND="${COMMON_DEPEND} dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl ) " -DEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest ) +" -RESTRICT="test" +RESTRICT="!test? ( test )" -S="${WORKDIR}/${P}_2022-02-04_0a00cf5339" +S="${WORKDIR}/${MY_P}" pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]] && use openmp; then @@ -103,6 +111,15 @@ pkg_pretend() { fi } +src_unpack() { + if [[ ${PV} = 9999* ]]; then + git-r3_src_unpack + else + default + fi + [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die +} + src_prepare() { cmake_src_prepare sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die @@ -119,7 +136,7 @@ src_configure() { -DENABLE_POPPLER_CAIRO=ON -DWITH_PROFILING=OFF -DWITH_INTERNAL_2GEOM=ON - -DBUILD_TESTING=OFF + -DBUILD_TESTING=$(usex test) -DWITH_LIBCDR=$(usex cdr) -DWITH_DBUS=$(usex dbus) -DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled @@ -138,6 +155,10 @@ src_configure() { cmake_src_configure } +src_test() { + cmake_build -j1 check +} + src_install() { cmake_src_install diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index 70cee13a08d3..58011f3429ba 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" @@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" else SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="SVG based generic vector-drawing program"