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 05E19138359 for ; Fri, 8 May 2020 07:42:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CFF5E086A; Fri, 8 May 2020 07:42:14 +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 CCFF6E086A for ; Fri, 8 May 2020 07:42:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 AF84934F2DB for ; Fri, 8 May 2020 07:42:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E0AE1EE for ; Fri, 8 May 2020 07:42:10 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1588923724.78f08e9a1f04ecc6eecb4bab4a148cb4ce30644a.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/files/, media-gfx/inkscape/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch media-gfx/inkscape/inkscape-9999.ebuild X-VCS-Directories: media-gfx/inkscape/ media-gfx/inkscape/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 78f08e9a1f04ecc6eecb4bab4a148cb4ce30644a X-VCS-Branch: master Date: Fri, 8 May 2020 07:42:10 +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: 43236ec4-09bb-4826-9b55-cdb8e4d4b64a X-Archives-Hash: 7a1c09d24699691ee351c16d2a0c5b1a commit: 78f08e9a1f04ecc6eecb4bab4a148cb4ce30644a Author: Miroslav Šulc gentoo org> AuthorDate: Fri May 8 07:41:31 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri May 8 07:42:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f08e9a media-gfx/inkscape: synced 9999 from 1.0 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Miroslav Šulc gentoo.org> .../files/inkscape-1.0_beta1-detect-imagemagick.patch | 13 ------------- .../files/inkscape-1.0_beta1-do-not-compress-man.patch | 13 ------------- media-gfx/inkscape/inkscape-9999.ebuild | 13 ++++++------- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch b/media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch deleted file mode 100644 index ee4becfd109..00000000000 --- a/media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake -index 91f93e7..95b2af2 100644 ---- a/CMakeScripts/DefineDependsandFlags.cmake -+++ b/CMakeScripts/DefineDependsandFlags.cmake -@@ -330,7 +330,7 @@ list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) - - if(WITH_IMAGE_MAGICK) - # we want "<" but pkg_check_modules only offers "<=" for some reason; let's hope nobody actually has 7.0.0 -- pkg_check_modules(MAGICK ImageMagick++<=7) -+ pkg_check_modules(MAGICK Magick++<=7) - if(MAGICK_FOUND) - set(WITH_GRAPHICS_MAGICK OFF) # prefer ImageMagick for now and disable GraphicsMagick if found - else() diff --git a/media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch b/media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch deleted file mode 100644 index c9d395e807e..00000000000 --- a/media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeScripts/Pod2man.cmake b/CMakeScripts/Pod2man.cmake -index eda6292..b94d5af 100644 ---- a/CMakeScripts/Pod2man.cmake -+++ b/CMakeScripts/Pod2man.cmake -@@ -14,6 +14,8 @@ if(NOT GZIP) - message(STATUS "Could not find gzip - man pages uncompressed") - endif() - -+set(GZIP "") -+ - macro(pod2man PODFILE_FULL RELEASE SECTION CENTER) - get_filename_component(PODFILE ${PODFILE_FULL} NAME) - string(REPLACE "." ";" PODFILE_LIST ${PODFILE}) diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index 158a19eeca9..b87ca681947 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -61,7 +61,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( - !graphicsmagick? (