diff options
Diffstat (limited to 'media-gfx/inkscape')
-rw-r--r-- | media-gfx/inkscape/Manifest | 12 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch | 14 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-1.0_beta1-detect-imagemagick.patch | 13 | ||||
-rw-r--r-- | media-gfx/inkscape/files/inkscape-1.0_beta1-do-not-compress-man.patch | 13 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-0.92.4-r2.ebuild | 165 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-0.92.4-r3.ebuild | 3 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-1.0.ebuild | 162 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-1.0_rc1.ebuild | 2 | ||||
-rw-r--r-- | media-gfx/inkscape/inkscape-9999.ebuild | 13 |
9 files changed, 191 insertions, 206 deletions
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index aacf73eb2231..81562f13f1e1 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -4,15 +4,15 @@ AUX inkscape-0.91_pre3-exif.patch 321 BLAKE2B 36f9d7ce19c1716b56800431ac095f047c AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4e5fe2f2db88c5d7e663e477736a56f226183caa90ca2b421f064ce42e5e7b4e81419026681987aa85040f4379c74511d SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab AUX inkscape-0.92.1-automagic.patch 5416 BLAKE2B 3b17fd7a4cd305b6e683fd6a3f6bd6b81559be5097603f80bb438467f63594dea353acdf92ed5410399b641b6a5a92950e5c6bea582807717891073fe2877b5b SHA512 48f5d20cc32bcaa5fbbd7b9177ef1c68f2c6d2d0c39553bfc9f8e37fa7e74c63129a9ad94d93f26265dd2492359c983c50539286b86830783e001bb5dc3fa4c5 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2 +AUX inkscape-0.92.4-glibmm-2.62.patch 561 BLAKE2B df3797f6b9a4a01338ca707e39da8ccd07728cc3d0d4b57ed981081512c8bed10a82619247ed6d828c116b09c3bd2e5f753e11ad8566c04680d567a96725a834 SHA512 8c6d43760dedd0c2bcdf31aeb0344e8d6bb154cbe7b2fc8f37e933b405fd9c42e05f68e1725c0781818f9a1de7ea292b991b7f12228a694a387f16d0a39ff97b AUX inkscape-0.92.4-poppler-0.76.0.patch 1579 BLAKE2B c8c578dc3c6f0d79403bc0716bb6875544fbf19c98e721294cf9e5f58d9c89c1b8414dd58975846100c4ae5c21eba8e7e4797c037300ce05d741d9245a0dc59c SHA512 2f45e16aba67f4d1498cf012ac6198ec2bb977b9e39b3d4e2d14a216d86b1d407ff7ea5a889b58b5e800c129c0f99ec8bbc0a42dd7d41578d94ae1ab59208698 AUX inkscape-0.92.4-poppler-0.82.0.patch 3223 BLAKE2B 6e530a2d2602d61c9f97f61813fad837536ccd3dc25405cf79ebda6563c56ff09e4a98b99c83aced6e8995473b27c7942c5774abafc7c33a2dbe45df58f419e4 SHA512 4a5f2e3ec9f16abe76786945e3085e405bbe7a4c57dfa0e6e7d4ddd4aadd17463766c7392846db08fa41419e05ef8c688d989ded8905755c010db6b08afa2feb AUX inkscape-0.92.4-poppler-0.83.0.patch 4167 BLAKE2B cccc3ae0a4196815dcd7c2ff7260ed8ab8f81b4aaeecb557bb2f35d0f01ea616dfe7b0144dbf1638a679dc8642485448f479e6fa0a45274581c812ee792f51fc SHA512 1c6b1bd594bc49b392844d0cc232d79a8478e8f222179444cc197c6b93839cfefeb26b3a4cf702896baaa227d7ef5560dfefddc96ee6a9a1b1ea571fe4374bfc -AUX inkscape-1.0_beta1-detect-imagemagick.patch 653 BLAKE2B 1e217306b083550d1f4628dc8385c78336c4c9019f8b35fe474c18c1f917105f423d3a958491432109eea22ef04b63ad5c5d23c03ae36ed7663ed86de3e295ed SHA512 5ee7080d5134b970a7b70b6b5052523e98860d66ee42897b5a84c5e70676359c918ea0d5e603a83b27d0e4656d49f711ae76d2dad47083c8ade223cc7da9e123 -AUX inkscape-1.0_beta1-do-not-compress-man.patch 454 BLAKE2B d680993be80d9069c7986f110d512643849f97fae81a8fdf1ab020a418dfbe44cc2bce3d71c8a79e8acac5170dfc01d084420a439d83f6f0e85706acdc8a0399 SHA512 3fc7ac0750a67b9d90d4ec0eed404ffdaa6910397849fa916eeacf5fb1e77cb0cb17f3f1ba99ad39f16610f2b3d7df387e35d36a0404fbd1fd0f857fa8be822b DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120 DIST inkscape-1.0_rc1.tar.xz 31984596 BLAKE2B 7e4a3618522c7bc9bedba8bb2a846e1cbf40e23868f04548e67fa41b9f8f1e8f696af386c0698a43ae6f7033937e1a3d4e772518162f712468b614a5b4d3b4ad SHA512 13e14a6dad1e89e6edf7c0197c43506d127b2e5136a2d8d931ad5ea0671b65b3feed5baf2f631b1a4b8095f285c19ffe5170904c9ce5e3e484d00ca2f0800b89 -EBUILD inkscape-0.92.4-r2.ebuild 3836 BLAKE2B 39efa33d21c2ae8054827c76cfe451a60fbca48b12a4eeb106bd0b03895ecf02102df8fd2c28626d7daf4a720eaeb67d4e3642f214d9f4ad68b3c183826a4e47 SHA512 8c2304ac76e116472f726b952ebc3a47478ca78d50686c1594ea55555b7e39d1f1003118ec6572244735f871a18f55ec49391fbde3d327b204d518cf84978f03 -EBUILD inkscape-0.92.4-r3.ebuild 3871 BLAKE2B d0653e907e2586a9f2f2d348b62840a7a64856c1a250ffe61b867252ff01f971b756c2adba7b2f608a7a5de615efb582853f224105067de41f4363b45eeb8a3b SHA512 25d2f80dce93f59073e9b81c74a6c62aacbd335366e22a5d7ca9c63113e0bdd987bcfc11e050ed5a53066583f48bba283b50d0f41d09e6b21866abe85f1b7e55 -EBUILD inkscape-1.0_rc1.ebuild 4023 BLAKE2B 4c98a33fb88f8d8ae924dea960c9dbb8bf84b19ace03fedb49f817dc7548cbb4d1df11515e6dea6fa72125fb81af1337e224f791e5e4ebac7b034f7f1e44a338 SHA512 ca20e13243e51b67dbf5b910666444efd9c73ca7ce485351964c27e8796f39d2053a108b00a77773f055c51991e120ca8b605be9f27df0e30c84d0c3c9a54f55 -EBUILD inkscape-9999.ebuild 4058 BLAKE2B 4b97ab1b7a935d62a77398f6d7911bec599ced43db307f5c48b868eb4e3cf0255b4f23c10c8230e30f74b00d57cefd12f6222e56f85e7a0a7fae2b2738187ac0 SHA512 b4a228d2888c982f053fa4a1d456a3b5caea131fe0ecc95bb5bbfa2f2c06e443f27eeb25a29f56dee8d46166af07315db8dd15585ad75f8a4cf7f29cae2c64d6 +DIST inkscape-INKSCAPE_1_0.tar.gz 64306274 BLAKE2B 8bc4e2d156fad99b2b2a700bde29372dd56db6a1a9a8e825d46d214bbd18a1d29365510c16d51dbb2cad88f88fb10232f1bab403da4900beaa72de5d0f8726df SHA512 214c04c7f1d23dd0d296f4262743b2a206fe3b3df7abdb4bc4a4604a7f0caab2d7970d04b5795f121417d0e015e2d42d14be0b67438d752a81c4ad079b486f06 +EBUILD inkscape-0.92.4-r3.ebuild 3921 BLAKE2B ad0b135b5c24cd27954aa493d45b90eb74af7cd13fffcb919b6af4e9b4c66848bfc8ba5eeec5e36fdb6ca14052fa794f78f801c129c762ef4b4a3f9da43cdb58 SHA512 91705b00b90160ea40e2c055900ff51016f5cb0897ce8c23b9798a7158062a8485fc5077b18b5446baf3c5515e8161df1dc8377925ca2865037b9930656d7e53 +EBUILD inkscape-1.0.ebuild 4206 BLAKE2B 43931848f4450b4076f2d0094a0ef4ae24c4919fee8a4b2f8c8642846712ca6f66ea670ec42c0b80f787a46e109da125e70a3302f77dfef3bf662b1ebbab9dec SHA512 50636054af59a19a1365e8ac8d78970807630ab66c7ba947d3d81b65906297b6e0714a545507a48861d735eae9209004c791b6a139ea2f837e08878a8293316e +EBUILD inkscape-1.0_rc1.ebuild 4025 BLAKE2B a389779a3554e8ef91f98451ca92e9458d9491c9057845607f2f8c4090e1a8a6eaca2726a0001555a363ac446452059ef32dbe3b409add74947fe653763c903e SHA512 203d90d1d4f8915801d23513c4df476e93427134bd510df650c6484c9408bb0c20dfdb445d0ca4ff36aaeef7f7c73befffcf32c7726b98f5214fad49444bfca8 +EBUILD inkscape-9999.ebuild 4109 BLAKE2B 86555c26d13d9fcffbef05fb3b6a59338d110462b02b501443ec287b09856a9562cd06a466b09a594820c226bc2c0855d951e1b6e2d61f9d58ad60be4c05465c SHA512 181dfe6ce67120b3fcb08ac69838e5eeeb1853e83f55c5d5b78e93c9c448ba0193f36044d95eae242506c68dc3e51ece773225010fcda90a27e1105570cf4abf MISC metadata.xml 1178 BLAKE2B 437e874d080bbd913e0910e0c7dc3a86834ac88b770493d65f29623db9a87d96f2cfc72e04bcdf51fc9f5d688695742d07a19414db55ff2ccb1a1b20cef20ad2 SHA512 007d65995421695c434b0c4a80474c43c95b7604cbe1cf576f5c7c4741777e563daa19bb25421089a979e0d23ce86522efae01e3f12a0b210323fc5306a2d305 diff --git a/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch b/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch new file mode 100644 index 000000000000..7a35d8d55ada --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.92.4-glibmm-2.62.patch @@ -0,0 +1,14 @@ +diff -Naur a/configure.ac b/configure.ac +--- a/configure.ac 2019-01-15 04:29:27.000000000 +0000 ++++ b/configure.ac 2020-04-03 18:39:26.372870987 +0000 +@@ -879,10 +879,6 @@ + if test "x$enable_strict_build" != "xno"; then + CPPFLAGS="-DGDKMM_DISABLE_DEPRECATED $CPPFLAGS" + +- # Ensure that no deprecated glibmm symbols are introduced. +- # lp:inkscape builds cleanly with this option at r10957 +- CPPFLAGS="-DGLIBMM_DISABLE_DEPRECATED $CPPFLAGS" +- + dnl Pango 1.32.4 uses a deprecated Glib symbol: + dnl https://bugzilla.gnome.org/show_bug.cgi?id=689843 + dnl 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-0.92.4-r2.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild deleted file mode 100644 index bc73e6c6f57d..000000000000 --- a/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" -inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1 - -MY_P="${P/_/}" - -DESCRIPTION="SVG based generic vector-drawing program" -HOMEPAGE="https://inkscape.org/" -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex" -IUSE+=" lcms nls spell static-libs visio wpg" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - >=app-text/poppler-0.26.0:=[cairo] - >=dev-cpp/glibmm-2.54.1 - >=dev-cpp/gtkmm-2.18.0:2.4 - >=dev-cpp/cairomm-1.9.8 - >=dev-libs/boehm-gc-7.1:= - >=dev-libs/glib-2.28 - >=dev-libs/libsigc++-2.0.12 - >=dev-libs/libxml2-2.6.20 - >=dev-libs/libxslt-1.0.15 - dev-libs/popt - media-gfx/potrace - media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0= - sci-libs/gsl:= - x11-libs/libX11 - >=x11-libs/gtk+-2.10.7:2 - >=x11-libs/pango-1.24 - cdr? ( - app-text/libwpg:0.3 - dev-libs/librevenge - media-libs/libcdr - ) - dbus? ( dev-libs/dbus-glib ) - exif? ( media-libs/libexif ) - gnome? ( >=gnome-base/gnome-vfs-2.0 ) - imagemagick? ( <media-gfx/imagemagick-7:=[cxx] ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - spell? ( - app-text/aspell - app-text/gtkspell:2 - ) - visio? ( - app-text/libwpg:0.3 - dev-libs/librevenge - media-libs/libvisio - ) - wpg? ( - app-text/libwpg:0.3 - dev-libs/librevenge - ) -" -# These only use executables provided by these packages -# See share/extensions for more details. inkscape can tell you to -# install these so we could of course just not depend on those and rely -# on that. -RDEPEND="${COMMON_DEPEND} - $(python_gen_cond_dep ' - || ( - dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}] - dev-python/numpy[${PYTHON_MULTI_USEDEP}] - ) - ') - media-gfx/uniconvertor - dia? ( app-office/dia ) - latex? ( - media-gfx/pstoedit[plotutils] - app-text/dvipsk - app-text/texlive-core - ) - postscript? ( app-text/ghostscript-gpl ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.36 - dev-util/glib-utils - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-0.92.1-automagic.patch" - "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch" - "${FILESDIR}/${PN}-0.92.1-desktop.patch" - "${FILESDIR}/${PN}-0.91_pre3-exif.patch" - "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch" - "${FILESDIR}/${PN}-0.48.4-epython.patch" - "${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 - "${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch" - "${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch" -) - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi -} - -src_prepare() { - default - - sed -i "s#@EPYTHON@#${EPYTHON}#" \ - src/extension/implementation/script.cpp || die - - eautoreconf - - # bug 421111 - python_fix_shebang share/extensions -} - -src_configure() { - # aliasing unsafe wrt #310393 - append-flags -fno-strict-aliasing - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable nls) - $(use_enable openmp) - $(use_enable exif) - $(use_enable jpeg) - $(use_enable lcms) - --enable-poppler-cairo - $(use_enable wpg) - $(use_enable visio) - $(use_enable cdr) - $(use_enable dbus dbusapi) - $(use_enable imagemagick magick) - $(use_with gnome gnome-vfs) - $(use_with inkjar) - $(use_with spell gtkspell) - $(use_with spell aspell) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake -C src helper/sp-marshal.h #686304 - emake AR="$(tc-getAR)" -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete || die - python_optimize "${ED%/}"/usr/share/${PN}/extensions -} diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild index 912e7bba247d..1b9241b51aa1 100644 --- a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex" IUSE+=" lcms nls spell static-libs visio wpg uniconvertor" @@ -103,6 +103,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246 "${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch" "${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch" + "${FILESDIR}/${PN}-0.92.4-glibmm-2.62.patch" #715394 ) S="${WORKDIR}/${MY_P}" diff --git a/media-gfx/inkscape/inkscape-1.0.ebuild b/media-gfx/inkscape/inkscape-1.0.ebuild new file mode 100644 index 000000000000..3af00fe145cb --- /dev/null +++ b/media-gfx/inkscape/inkscape-1.0.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="xml" + +inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 + +DESCRIPTION="SVG based generic vector-drawing program" +HOMEPAGE="https://inkscape.org/" +SRC_URI="https://gitlab.com/inkscape/inkscape/-/archive/${PN^^}_$(ver_rs 1-2 "_")/${PN}-${PN^^}_$(ver_rs 1-2 "_").tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls +openmp postscript spell static-libs svg2 visio wpg" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + dev-util/glib-utils + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-text/poppler-0.57.0:=[cairo] + >=dev-cpp/cairomm-1.12 + >=dev-cpp/glibmm-2.54.1 + dev-cpp/gtkmm:3.0 + >=dev-cpp/pangomm-2.40 + >=dev-libs/boehm-gc-7.1:= + dev-libs/double-conversion:= + >=dev-libs/glib-2.41 + >=dev-libs/libsigc++-2.8 + >=dev-libs/libxml2-2.7.4 + >=dev-libs/libxslt-1.1.25 + dev-libs/gdl:3 + dev-libs/popt + media-gfx/potrace + media-libs/fontconfig + media-libs/freetype:2 + media-libs/libpng:0= + net-libs/libsoup + sci-libs/gsl:= + x11-libs/libX11 + >=x11-libs/pango-1.37.2 + x11-libs/gtk+:3 + $(python_gen_cond_dep ' + dev-python/lxml[${PYTHON_MULTI_USEDEP}] + media-gfx/scour[${PYTHON_MULTI_USEDEP}] + ') + cdr? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libcdr + ) + dbus? ( dev-libs/dbus-glib ) + exif? ( media-libs/libexif ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + spell? ( + app-text/aspell + app-text/gtkspell:3 + ) + visio? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libvisio + ) + wpg? ( + app-text/libwpg:0.3 + dev-libs/librevenge + ) +" +# These only use executables provided by these packages +# See share/extensions for more details. inkscape can tell you to +# install these so we could of course just not depend on those and rely +# on that. +RDEPEND="${COMMON_DEPEND} + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + ') + dia? ( app-office/dia ) + postscript? ( app-text/ghostscript-gpl ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.65 +" + +RESTRICT="test" + +S="${WORKDIR}"/${PN}-${PN^^}_$(ver_rs 1-2 "_") + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]] && use openmp; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi +} + +src_prepare() { + cmake_src_prepare + sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die +} + +src_configure() { + # aliasing unsafe wrt #310393 + append-flags -fno-strict-aliasing + + local mycmakeargs=( + # -DWITH_LPETOOL # Compile with LPE Tool and experimental LPEs enabled + -DENABLE_POPPLER=ON + -DENABLE_POPPLER_CAIRO=ON + -DWITH_PROFILING=OFF + -DWITH_LIBCDR=$(usex cdr) + -DWITH_DBUS=$(usex dbus) + -DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled + -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick + -DWITH_JEMALLOC=$(usex jemalloc) + -DENABLE_LCMS=$(usex lcms) + -DWITH_OPENMP=$(usex openmp) + -DBUILD_SHARED_LIBS=$(usex !static-libs) + -DWITH_SVG2=$(usex svg2) + -DWITH_LIBVISIO=$(usex visio) + -DWITH_LIBWPG=$(usex wpg) + ) + # We should also have, + # + # -DWITH_NLS=$(usex nls) + # + # in this list, but it's broken upstream at the moment: + # + # * https://bugs.gentoo.org/699658 + # * https://gitlab.com/inkscape/inkscape/issues/168 + + cmake_src_configure +} + +src_install() { + cmake_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 + + if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then + python_optimize "${ED}"/usr/share/${PN}/extensions + fi +} diff --git a/media-gfx/inkscape/inkscape-1.0_rc1.ebuild b/media-gfx/inkscape/inkscape-1.0_rc1.ebuild index e6249b176dd1..348785806287 100644 --- a/media-gfx/inkscape/inkscape-1.0_rc1.ebuild +++ b/media-gfx/inkscape/inkscape-1.0_rc1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE="xml" RELEASE_SUFFIX="1.0rc1_2020-04-09_09960d6f05" 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 |