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 F04F913997D for ; Sat, 9 Nov 2019 08:58:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C89F7E095E; Sat, 9 Nov 2019 08:58:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 957CBE095E for ; Sat, 9 Nov 2019 08:58:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C452D34CB0B for ; Sat, 9 Nov 2019 08:57:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D29AD8A9 for ; Sat, 9 Nov 2019 08:57:57 +0000 (UTC) From: "Andreas Sturmlechner" 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 Sturmlechner" Message-ID: <1573289863.f5639e2077638f27c4c69e82aec8dfe87c1f6ca7.asturm@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.0_beta1.ebuild media-gfx/inkscape/metadata.xml X-VCS-Directories: media-gfx/inkscape/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f5639e2077638f27c4c69e82aec8dfe87c1f6ca7 X-VCS-Branch: master Date: Sat, 9 Nov 2019 08:57:57 +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: 58ddb600-7953-483c-9ac2-26af79a17cbc X-Archives-Hash: 18e5cd92d748077c57ff0de444bcd433 commit: f5639e2077638f27c4c69e82aec8dfe87c1f6ca7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 8 23:16:44 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 9 08:57:43 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5639e20 media-gfx/inkscape: Misc ebuild and style fixes Add missing dev-libs/double-conversion slot op Cleanup, sort and local mycmakeargs Don't even install copyright file Drop graphicsmagick,imagemagick from REQUIRED_USE Indentation and more detail for metadata.xml Run cmake-utils_src_prepare first Run cmake-utils_src_install first Sort IUSE Sort *DEPENDs Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/inkscape/inkscape-1.0_beta1.ebuild | 88 +++++++++++++--------------- media-gfx/inkscape/metadata.xml | 32 +++++----- 2 files changed, 58 insertions(+), 62 deletions(-) diff --git a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild index dff48e706a2..9ec18d3c5b9 100644 --- a/media-gfx/inkscape/inkscape-1.0_beta1.ebuild +++ b/media-gfx/inkscape/inkscape-1.0_beta1.ebuild @@ -5,10 +5,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) PYTHON_REQ_USE="xml" - -inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1 - MY_P="${P/_/}" +inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1 DESCRIPTION="SVG based generic vector-drawing program" HOMEPAGE="https://inkscape.org/" @@ -18,21 +16,30 @@ SRC_URI="https://inkscape.org/gallery/item/14917/${MY_P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="cdr dia dbus exif gnome graphicsmagick +imagemagick openmp postscript inkjar jpeg svg2 jemalloc" -IUSE+=" lcms nls spell static-libs visio wpg" +IUSE="cdr dbus dia exif gnome graphicsmagick imagemagick inkjar jemalloc jpeg +lcms nls openmp postscript spell static-libs svg2 visio wpg" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( imagemagick graphicsmagick )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +BDEPEND=" + dev-util/glib-utils + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig +" COMMON_DEPEND="${PYTHON_DEPS} >=app-text/poppler-0.57.0:=[cairo] - >=dev-cpp/glibmm-2.54.1 >=dev-cpp/cairomm-1.12 + >=dev-cpp/glibmm-2.54.1 + dev-cpp/gtkmm:3.0 + >=dev-cpp/pangomm-2.40 >=dev-libs/boehm-gc-7.1:= + dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 + dev-libs/gdl:3 dev-libs/popt dev-python/lxml[${PYTHON_USEDEP}] media-gfx/potrace @@ -40,9 +47,11 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= + net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 + x11-libs/gtk+:3 cdr? ( app-text/libwpg:0.3 dev-libs/librevenge @@ -51,8 +60,11 @@ COMMON_DEPEND="${PYTHON_DEPS} dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - imagemagick? ( =dev-libs/boost-1.65 " -BDEPEND=" - dev-util/glib-utils - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" S="${WORKDIR}/${MY_P}" @@ -112,39 +110,39 @@ pkg_pretend() { } src_prepare() { - einfo "Fixing doc directory path..." - sed -i "s%doc/inkscape%doc/${P}%g" CMakeScripts/ConfigCPack.cmake || die "Failed to fix doc directory path" - cmake-utils_src_prepare + sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die } src_configure() { # aliasing unsafe wrt #310393 append-flags -fno-strict-aliasing - mycmakeargs=( - -DWITH_DBUS="$(usex dbus ON OFF)" # Compile with support for DBus interface - -DENABLE_LCMS="$(usex lcms ON OFF)" # Compile with LCMS support - -DWITH_SVG2="$(usex svg2 ON OFF)" # Compile with support for new SVG2 features - #-DWITH_LPETOOL # Compile with LPE Tool and experimental LPEs enabled - -DWITH_OPENMP="$(usex openmp ON OFF)" # Compile with OpenMP support - #-DWITH_PROFILING # Turn on profiling - -DBUILD_SHARED_LIBS="$(usex !static-libs ON OFF)" # Compile libraries as shared and not static - -DENABLE_POPPLER=ON # Compile with support of libpoppler - -DENABLE_POPPLER_CAIRO=ON # Compile with support of libpoppler-cairo for rendering PDF preview (depends on ENABLE_POPPLER) - -DWITH_IMAGE_MAGICK="$(usex imagemagick ON OFF)" # Compile with support of ImageMagick for raster extensions and image import resolution (requires ImageMagick 6; set to OFF if you prefer GraphicsMagick) - -DWITH_GRAPHICS_MAGICK="$(usex graphicsmagick ON OFF)" # Compile with support of GraphicsMagick for raster extensions and image import resolution - -DWITH_LIBCDR="$(usex cdr ON OFF)" # Compile with support of libcdr for CorelDRAW Diagrams - -DWITH_LIBVISIO="$(usex visio ON OFF)" # Compile with support of libvisio for Microsoft Visio Diagrams - -DWITH_LIBWPG="$(usex wpg ON OFF)" # Compile with support of libwpg for WordPerfect Graphics - -DWITH_NLS="$(usex nls ON OFF)" # Compile with Native Language Support (using gettext) - -DWITH_JEMALLOC="$(usex jemalloc ON OFF)" # Compile with JEMALLOC support + local mycmakeargs=( + # -DWITH_LPETOOL # Compile with LPE Tool and experimental LPEs enabled + -DENABLE_POPPLER=ON + -DENABLE_POPPLER_CAIRO=ON + -DWITH_PROFILING=OFF + -DWITH_LIBCDR=$(usex cdr) + -DWITH_DBUS=$(usex dbus) + -DWITH_IMAGE_MAGICK=$(usex imagemagick) # requires ImageMagick 6 + -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick) + -DWITH_JEMALLOC=$(usex jemalloc) + -DENABLE_LCMS=$(usex lcms) + -DWITH_NLS=$(usex nls) + -DWITH_OPENMP=$(usex openmp) + -DBUILD_SHARED_LIBS=$(usex !static-libs) + -DWITH_SVG2=$(usex svg2) + -DWITH_LIBVISIO=$(usex visio) + -DWITH_LIBWPG=$(usex wpg) ) cmake-utils_src_configure } src_install() { + cmake-utils_src_install + find "${ED}" -type f -name "*.la" -delete || die # No extensions are present in beta1 @@ -153,6 +151,4 @@ src_install() { if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then python_optimize "${ED}"/usr/share/${PN}/extensions fi - - cmake-utils_src_install } diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml index b7fc6b5e478..49c45680f5f 100644 --- a/media-gfx/inkscape/metadata.xml +++ b/media-gfx/inkscape/metadata.xml @@ -1,20 +1,20 @@ - - graphics@gentoo.org - Gentoo Graphics Project - - - Enable support for CorelDRAW Diagrams - pull in app-office/dia for dia import extension - Enable support for OpenOffice.org SVG jar files - pull in dependencies for LaTeX formulas - Enable support for new SVG2 features - Enable support for Microsoft Visio Diagrams - Enable support for WordPerfect Graphics - - - inkscape/inkscape - + + graphics@gentoo.org + Gentoo Graphics Project + + + Enable support for CorelDRAW Diagrams via media-libs/libcdr + pull in app-office/dia for dia import extension + Enable support for OpenOffice.org SVG jar files + pull in dependencies for LaTeX formulas + Enable support for new SVG2 features + Enable support for Microsoft Visio Diagrams via media-libs/libvisio + Enable support for WordPerfect Graphics via app-text/libwpg + + + inkscape/inkscape +