diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2020-05-08 09:41:31 +0200 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2020-05-08 09:42:04 +0200 |
| commit | 78f08e9a1f04ecc6eecb4bab4a148cb4ce30644a (patch) | |
| tree | fd172e499c01be5f03b0a930b95a6358888df8a5 /media-gfx/inkscape | |
| parent | profiles/desktop/gnome: default enable libical[vala] (diff) | |
| download | gentoo-78f08e9a1f04ecc6eecb4bab4a148cb4ce30644a.tar.gz gentoo-78f08e9a1f04ecc6eecb4bab4a148cb4ce30644a.tar.bz2 gentoo-78f08e9a1f04ecc6eecb4bab4a148cb4ce30644a.zip | |
media-gfx/inkscape: synced 9999 from 1.0
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'media-gfx/inkscape')
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 ee4becfd1090..000000000000 --- 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 c9d395e807e2..000000000000 --- 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 158a19eeca9b..b87ca681947f 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? ( <media-gfx/imagemagick-7:=[cxx] ) + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) @@ -96,14 +96,9 @@ DEPEND="${COMMON_DEPEND} >=dev-libs/boost-1.65 " -S="${WORKDIR}/${MY_P}" - RESTRICT="test" -PATCHES=( - "${FILESDIR}"/${PN}-1.0_beta1-detect-imagemagick.patch - "${FILESDIR}"/${PN}-1.0_beta1-do-not-compress-man.patch -) +S="${WORKDIR}/${MY_P}" pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]] && use openmp; then @@ -154,6 +149,10 @@ src_install() { find "${ED}" -type f -name "*.la" -delete || die + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die + + find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die + # No extensions are present in beta1 local extdir="${ED}"/usr/share/${PN}/extensions |