| 1 |
commit: 78f08e9a1f04ecc6eecb4bab4a148cb4ce30644a |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 8 07:41:31 2020 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 8 07:42:04 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f08e9a |
| 7 |
|
| 8 |
media-gfx/inkscape: synced 9999 from 1.0 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/inkscape-1.0_beta1-detect-imagemagick.patch | 13 ------------- |
| 14 |
.../files/inkscape-1.0_beta1-do-not-compress-man.patch | 13 ------------- |
| 15 |
media-gfx/inkscape/inkscape-9999.ebuild | 13 ++++++------- |
| 16 |
3 files changed, 6 insertions(+), 33 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
deleted file mode 100644 |
| 20 |
index ee4becfd109..00000000000 |
| 21 |
--- a/media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,13 +0,0 @@ |
| 24 |
-diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake |
| 25 |
-index 91f93e7..95b2af2 100644 |
| 26 |
---- a/CMakeScripts/DefineDependsandFlags.cmake |
| 27 |
-+++ b/CMakeScripts/DefineDependsandFlags.cmake |
| 28 |
-@@ -330,7 +330,7 @@ list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) |
| 29 |
- |
| 30 |
- if(WITH_IMAGE_MAGICK) |
| 31 |
- # we want "<" but pkg_check_modules only offers "<=" for some reason; let's hope nobody actually has 7.0.0 |
| 32 |
-- pkg_check_modules(MAGICK ImageMagick++<=7) |
| 33 |
-+ pkg_check_modules(MAGICK Magick++<=7) |
| 34 |
- if(MAGICK_FOUND) |
| 35 |
- set(WITH_GRAPHICS_MAGICK OFF) # prefer ImageMagick for now and disable GraphicsMagick if found |
| 36 |
- else() |
| 37 |
|
| 38 |
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 |
| 39 |
deleted file mode 100644 |
| 40 |
index c9d395e807e..00000000000 |
| 41 |
--- a/media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch |
| 42 |
+++ /dev/null |
| 43 |
@@ -1,13 +0,0 @@ |
| 44 |
-diff --git a/CMakeScripts/Pod2man.cmake b/CMakeScripts/Pod2man.cmake |
| 45 |
-index eda6292..b94d5af 100644 |
| 46 |
---- a/CMakeScripts/Pod2man.cmake |
| 47 |
-+++ b/CMakeScripts/Pod2man.cmake |
| 48 |
-@@ -14,6 +14,8 @@ if(NOT GZIP) |
| 49 |
- message(STATUS "Could not find gzip - man pages uncompressed") |
| 50 |
- endif() |
| 51 |
- |
| 52 |
-+set(GZIP "") |
| 53 |
-+ |
| 54 |
- macro(pod2man PODFILE_FULL RELEASE SECTION CENTER) |
| 55 |
- get_filename_component(PODFILE ${PODFILE_FULL} NAME) |
| 56 |
- string(REPLACE "." ";" PODFILE_LIST ${PODFILE}) |
| 57 |
|
| 58 |
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild |
| 59 |
index 158a19eeca9..b87ca681947 100644 |
| 60 |
--- a/media-gfx/inkscape/inkscape-9999.ebuild |
| 61 |
+++ b/media-gfx/inkscape/inkscape-9999.ebuild |
| 62 |
@@ -61,7 +61,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 63 |
dbus? ( dev-libs/dbus-glib ) |
| 64 |
exif? ( media-libs/libexif ) |
| 65 |
imagemagick? ( |
| 66 |
- !graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] ) |
| 67 |
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
| 68 |
graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
| 69 |
) |
| 70 |
jemalloc? ( dev-libs/jemalloc ) |
| 71 |
@@ -96,14 +96,9 @@ DEPEND="${COMMON_DEPEND} |
| 72 |
>=dev-libs/boost-1.65 |
| 73 |
" |
| 74 |
|
| 75 |
-S="${WORKDIR}/${MY_P}" |
| 76 |
- |
| 77 |
RESTRICT="test" |
| 78 |
|
| 79 |
-PATCHES=( |
| 80 |
- "${FILESDIR}"/${PN}-1.0_beta1-detect-imagemagick.patch |
| 81 |
- "${FILESDIR}"/${PN}-1.0_beta1-do-not-compress-man.patch |
| 82 |
-) |
| 83 |
+S="${WORKDIR}/${MY_P}" |
| 84 |
|
| 85 |
pkg_pretend() { |
| 86 |
if [[ ${MERGE_TYPE} != binary ]] && use openmp; then |
| 87 |
@@ -154,6 +149,10 @@ src_install() { |
| 88 |
|
| 89 |
find "${ED}" -type f -name "*.la" -delete || die |
| 90 |
|
| 91 |
+ find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die |
| 92 |
+ |
| 93 |
+ find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die |
| 94 |
+ |
| 95 |
# No extensions are present in beta1 |
| 96 |
local extdir="${ED}"/usr/share/${PN}/extensions |
Archives