| 1 |
commit: ce969302196f7f415bcc683bca0d078024fec945 |
| 2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
| 3 |
AuthorDate: Mon Jul 5 12:43:44 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 25 15:58:51 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce969302 |
| 7 |
|
| 8 |
media-gfx/inkscape: sync live |
| 9 |
|
| 10 |
- Add optional readline support, |
| 11 |
- gtkspell dependency was changed to gspell and aspell is not required |
| 12 |
anymore, |
| 13 |
- testing |
| 14 |
|
| 15 |
Closes: https://bugs.gentoo.org/790269 |
| 16 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
| 17 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 18 |
|
| 19 |
media-gfx/inkscape/inkscape-9999.ebuild | 18 ++++++++++++------ |
| 20 |
1 file changed, 12 insertions(+), 6 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild |
| 23 |
index 6912d66bb36..dc4abef7db6 100644 |
| 24 |
--- a/media-gfx/inkscape/inkscape-9999.ebuild |
| 25 |
+++ b/media-gfx/inkscape/inkscape-9999.ebuild |
| 26 |
@@ -16,7 +16,7 @@ LICENSE="GPL-2 LGPL-2.1" |
| 27 |
SLOT="0" |
| 28 |
KEYWORDS="" |
| 29 |
IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms |
| 30 |
-openmp postscript spell static-libs svg2 visio wpg" |
| 31 |
+openmp postscript readline spell static-libs svg2 test visio wpg" |
| 32 |
|
| 33 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 34 |
|
| 35 |
@@ -67,10 +67,8 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 36 |
jemalloc? ( dev-libs/jemalloc ) |
| 37 |
jpeg? ( virtual/jpeg:0 ) |
| 38 |
lcms? ( media-libs/lcms:2 ) |
| 39 |
- spell? ( |
| 40 |
- app-text/aspell |
| 41 |
- app-text/gtkspell:3 |
| 42 |
- ) |
| 43 |
+ readline? ( sys-libs/readline:= ) |
| 44 |
+ spell? ( app-text/gspell ) |
| 45 |
visio? ( |
| 46 |
app-text/libwpg:0.3 |
| 47 |
dev-libs/librevenge |
| 48 |
@@ -94,9 +92,10 @@ RDEPEND="${COMMON_DEPEND} |
| 49 |
" |
| 50 |
DEPEND="${COMMON_DEPEND} |
| 51 |
>=dev-libs/boost-1.65 |
| 52 |
+ test? ( dev-cpp/gtest ) |
| 53 |
" |
| 54 |
|
| 55 |
-RESTRICT="test" |
| 56 |
+RESTRICT="!test? ( test )" |
| 57 |
|
| 58 |
S="${WORKDIR}/${MY_P}" |
| 59 |
|
| 60 |
@@ -121,10 +120,13 @@ src_configure() { |
| 61 |
-DENABLE_POPPLER=ON |
| 62 |
-DENABLE_POPPLER_CAIRO=ON |
| 63 |
-DWITH_PROFILING=OFF |
| 64 |
+ -DBUILD_TESTING=$(usex test) |
| 65 |
-DWITH_LIBCDR=$(usex cdr) |
| 66 |
-DWITH_DBUS=$(usex dbus) |
| 67 |
-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled |
| 68 |
-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick |
| 69 |
+ -DWITH_GNU_READLINE=$(usex readline) |
| 70 |
+ -DWITH_GSPELL=$(usex spell) |
| 71 |
-DWITH_JEMALLOC=$(usex jemalloc) |
| 72 |
-DENABLE_LCMS=$(usex lcms) |
| 73 |
-DWITH_OPENMP=$(usex openmp) |
| 74 |
@@ -156,3 +158,7 @@ src_install() { |
| 75 |
# Empty directory causes sandbox issues, see bug #761915 |
| 76 |
rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." |
| 77 |
} |
| 78 |
+ |
| 79 |
+src_test() { |
| 80 |
+ cmake_build -j1 check |
| 81 |
+} |
Archives