Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/
Date: Sat, 22 Jan 2022 19:19:08
Message-Id: 1642879125.e58c99a40fbd7dac1049684104c46e3e76951dc0.dilfridge@gentoo
1 commit: e58c99a40fbd7dac1049684104c46e3e76951dc0
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 22 19:18:45 2022 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 22 19:18:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58c99a4
7
8 media-gfx/inkscape: Remove useflag static-libs (now always off)
9
10 Closes: https://bugs.gentoo.org/830972
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
13
14 media-gfx/inkscape/Manifest | 2 +-
15 media-gfx/inkscape/inkscape-1.1.1.ebuild | 6 +++---
16 media-gfx/inkscape/inkscape-9999.ebuild | 7 +++----
17 3 files changed, 7 insertions(+), 8 deletions(-)
18
19 diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
20 index 40c08b757d57..83810fd8fb24 100644
21 --- a/media-gfx/inkscape/Manifest
22 +++ b/media-gfx/inkscape/Manifest
23 @@ -1,3 +1,3 @@
24 DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668
25 -DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
26 DIST inkscape-1.1.1.tar.xz 34221284 BLAKE2B e628ead14f76fa3de929cfe14a6f085c5e9cd4304d2ee0a4b2046380284aacb8a32ff311c2e104f39f6abd0d080594ec4f9783fcaff183588107eedb49863c82 SHA512 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c
27 +DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
28
29 diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild
30 index d9c335c12041..080afaf78213 100644
31 --- a/media-gfx/inkscape/inkscape-1.1.1.ebuild
32 +++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild
33 @@ -1,4 +1,4 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 +# Copyright 1999-2022 Gentoo Authors
36 # Distributed under the terms of the GNU General Public License v2
37
38 EAPI=7
39 @@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1"
40 SLOT="0"
41 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
42 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
43 -openmp postscript readline spell static-libs svg2 visio wpg"
44 +openmp postscript readline spell svg2 visio wpg"
45
46 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
47
48 @@ -130,7 +130,7 @@ src_configure() {
49 -DWITH_JEMALLOC=$(usex jemalloc)
50 -DENABLE_LCMS=ON
51 -DWITH_OPENMP=$(usex openmp)
52 - -DBUILD_SHARED_LIBS=$(usex !static-libs)
53 + -DBUILD_SHARED_LIBS=ON
54 -DWITH_SVG2=$(usex svg2)
55 -DWITH_LIBVISIO=$(usex visio)
56 -DWITH_LIBWPG=$(usex wpg)
57
58 diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
59 index 62a44f8decb6..df45f11b2dc0 100644
60 --- a/media-gfx/inkscape/inkscape-9999.ebuild
61 +++ b/media-gfx/inkscape/inkscape-9999.ebuild
62 @@ -1,4 +1,4 @@
63 -# Copyright 1999-2021 Gentoo Authors
64 +# Copyright 1999-2022 Gentoo Authors
65 # Distributed under the terms of the GNU General Public License v2
66
67 EAPI=7
68 @@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1"
69 SLOT="0"
70 KEYWORDS=""
71 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
72 -openmp postscript readline spell static-libs svg2 test visio wpg"
73 +openmp postscript readline spell svg2 test visio wpg"
74
75 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
76
77 @@ -130,7 +130,7 @@ src_configure() {
78 -DWITH_JEMALLOC=$(usex jemalloc)
79 -DENABLE_LCMS=ON
80 -DWITH_OPENMP=$(usex openmp)
81 - -DBUILD_SHARED_LIBS=$(usex !static-libs)
82 + -DBUILD_SHARED_LIBS=ON
83 -DWITH_SVG2=$(usex svg2)
84 -DWITH_LIBVISIO=$(usex visio)
85 -DWITH_LIBWPG=$(usex wpg)
86 @@ -152,7 +152,6 @@ src_install() {
87
88 find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
89
90 - # No extensions are present in beta1
91 local extdir="${ED}"/usr/share/${PN}/extensions
92
93 if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then