From 4b718beb7d5fd4e0b5d741ff3a4c5c570519195e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 May 2023 05:50:34 +0100 Subject: gentoo auto-resync : 13:05:2023 - 05:50:34 --- media-gfx/Manifest.gz | Bin 38016 -> 38021 bytes media-gfx/inkscape/Manifest | 4 +- media-gfx/inkscape/inkscape-1.2.2-r3.ebuild | 195 --------------------------- media-gfx/inkscape/inkscape-1.2.2-r4.ebuild | 196 ++++++++++++++++++++++++++++ media-gfx/inkscape/inkscape-9999.ebuild | 1 + 5 files changed, 199 insertions(+), 197 deletions(-) delete mode 100644 media-gfx/inkscape/inkscape-1.2.2-r3.ebuild create mode 100644 media-gfx/inkscape/inkscape-1.2.2-r4.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 8aafbb4e6b98..bf051b1f19c0 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index c15990853912..477993dc7f32 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -3,7 +3,7 @@ AUX inkscape-1.2.2-fix-compile.patch 1948 BLAKE2B 4482e3f021f9cdee4a26e0d179e5e1 DIST inkscape-1.2.1.tar.xz 98048464 BLAKE2B 2de10beb5a90ba81e2f212710dc78fce7c72acef5d004ab86f443b97dcf12e65fb755d7a2655520bd94561a71664dc75abd1ebf9e6bbba14c912cac487b7f18c SHA512 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521 DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f EBUILD inkscape-1.2.1-r2.ebuild 5251 BLAKE2B fe6bfdbdc8de16ead4e418b91ac13a188d67c3607e7ddf3fa875b749df77894a4de8f96a6be990ae158c222d32ba4e3c2f6242e82224393d40cf98477a97b22c SHA512 070d799f453068cd4c1604fffbae7922373aeb386e9b7522c7860bba61ba82f4a81e342fd494a97b94931f8608d1e29ae48b05d076c89950b50fb7e942ec4a7a -EBUILD inkscape-1.2.2-r3.ebuild 5209 BLAKE2B 9447515517d0f3af60ddd1431cc3ac8ccbc5f9fd4684506430b9a8bdd5375e67ed67fe558aebe14b934d8afef96cd22eee9778cc67d714c5e2183ef79fff2cfc SHA512 5f4f1f32df63750d50bbd685a7dff020f20ae9a927dd5bf580d9284c813f64984b6f6b7df3e7193ed59f7a517429b805276b02d38e0c38c50136f7cca003a44e +EBUILD inkscape-1.2.2-r4.ebuild 5248 BLAKE2B a62930236da7e5f2c84af678aa88abb031fb10ebc40c7113843b3b414fa1ce935fc868153a3c2e2ec353fd2102b3ec252f4e9925ef815b9fb946c19d8762ac3a SHA512 647372b52e794b88a899a5f07aae5f919bd9346875af34471a6d685a02e9b1058c75d6bc98c1c937cc941f60ca95ba120a8eb029471172ec63516490444d85fd EBUILD inkscape-1.2.2.ebuild 5189 BLAKE2B 62a14c92e245ec737176aa3015bd508068fe0c12436f1487f5140bd0f6bf50f4ffed82abd67cb35b2b2814ea0fad9eea3c2b5f634784be5a1c64f8040d48ad55 SHA512 0aaf8dc62bc796b78ec7076fa9d6b6f2c75e767b98e251345e5b7727d65827a23dd55d3ee08fbff7650ef3533f7bf7692a2ab294299bfd36c8d01be3b63f9560 -EBUILD inkscape-9999.ebuild 5055 BLAKE2B e2a38b8958ebb85819cbc9efe0d6f8cab0c97ea7469ade8c5687f5b2022e457c36b72d70a6e5b92339a0f0694e74ab6bac7866ca2c1fd5640a94e90f95dd24df SHA512 d58fea35fd761e3b1d48d68e73c11293ccc9b9c032d26dfdc9b1d0743736b333c59eb277c03d1ff7c8c8351e94307bff7626dbe12b4362e9ee0acc9f62c1461b +EBUILD inkscape-9999.ebuild 5094 BLAKE2B 15003a777c8ef1b39e77dba97d05b3f828dcd1787f3b3d06fe922cf2101f995b858aca9ddb52d6c873169630b9aafa73b9d088fba2f111a0695973748508ed87 SHA512 fef7b6151c95c9f551ca06f913a98bc5f3bda19ef39cc29329b325bdc68011af2cdf02227599773c1140a16880bd5e8e4d6398c80ca21626db0140073579140e MISC metadata.xml 876 BLAKE2B e8998be1909e5848fd13fa4a8c4e2d9a424c818c3a41ebdd0a5807f572f9d0037900ac2516d107b9ab016410c25bc4ca3225e832ef17bd6b345d6471d5b5f0bc SHA512 f9a8581f7f401a40b100f61e67adb032859b2c70bd49eaa60b13a18cf24cc24e3a2704e227cba5590aad4bbaf705f3a4bf8c6ffda75f473c39bb8177af4aca6b diff --git a/media-gfx/inkscape/inkscape-1.2.2-r3.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r3.ebuild deleted file mode 100644 index dec3b3e7e1ac..000000000000 --- a/media-gfx/inkscape/inkscape-1.2.2-r3.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="xml(+)" -MY_P="${P/_/}" -inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 - -if [[ ${PV} = 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" -else - SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -DESCRIPTION="SVG based generic vector-drawing program" -HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg -openmp postscript readline spell svg2 test visio wpg X" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - dev-util/glib-utils - >=sys-devel/gettext-0.17 - virtual/pkgconfig - test? ( virtual/imagemagick-tools ) -" -COMMON_DEPEND="${PYTHON_DEPS} - >=app-text/poppler-0.57.0:=[cairo] - >=dev-cpp/cairomm-1.12:0 - >=dev-cpp/glibmm-2.54.1:2 - dev-cpp/gtkmm:3.0 - >=dev-cpp/pangomm-2.40:1.4 - >=dev-libs/boehm-gc-7.1:= - dev-libs/boost:= - dev-libs/double-conversion:= - >=dev-libs/glib-2.41 - >=dev-libs/libsigc++-2.8:2 - >=dev-libs/libxml2-2.7.4 - >=dev-libs/libxslt-1.1.25 - dev-libs/popt - media-gfx/potrace - media-libs/fontconfig - media-libs/freetype:2 - media-libs/lcms:2 - media-libs/libpng:0= - net-libs/libsoup:2.4 - sci-libs/gsl:= - >=x11-libs/pango-1.44 - x11-libs/gtk+:3[X?] - X? ( x11-libs/libX11 ) - $(python_gen_cond_dep ' - dev-python/cachecontrol[${PYTHON_USEDEP}] - dev-python/cssselect[${PYTHON_USEDEP}] - dev-python/lockfile[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - media-gfx/scour[${PYTHON_USEDEP}] - ') - cdr? ( - app-text/libwpg:0.3 - dev-libs/librevenge - media-libs/libcdr - ) - exif? ( media-libs/libexif ) - imagemagick? ( - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - ) - jemalloc? ( dev-libs/jemalloc ) - jpeg? ( media-libs/libjpeg-turbo:= ) - readline? ( sys-libs/readline:= ) - spell? ( app-text/gspell ) - 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_USEDEP}] - ') - dia? ( app-office/dia ) - postscript? ( app-text/ghostscript-gpl ) -" -DEPEND="${COMMON_DEPEND} - test? ( dev-cpp/gtest ) -" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.2-fix-compile.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} = 9999* ]]; then - git-r3_src_unpack - else - default - fi - [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die -} - -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 - -DWITH_NLS=ON - -DENABLE_POPPLER=ON - -DENABLE_POPPLER_CAIRO=ON - -DWITH_PROFILING=OFF - -DWITH_INTERNAL_2GEOM=ON - -DBUILD_TESTING=$(usex test) - -DWITH_LIBCDR=$(usex cdr) - -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_GNU_READLINE=$(usex readline) - -DWITH_GSPELL=$(usex spell) - -DWITH_JEMALLOC=$(usex jemalloc) - -DENABLE_LCMS=ON - -DWITH_OPENMP=$(usex openmp) - -DBUILD_SHARED_LIBS=ON - -DWITH_SVG2=$(usex svg2) - -DWITH_LIBVISIO=$(usex visio) - -DWITH_LIBWPG=$(usex wpg) - -DWITH_X11=$(usex X) - ) - - cmake_src_configure -} - -src_test() { - local myctestargs=( - # render_text*: needs patched Cairo / maybe upstream changes - # not yet in a release. - # test_lpe/test_lpe64: precision differences b/c of new GCC? - # cli_export-png-color-mode-gray-8_png_check_output: ditto? - -E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)" - ) - - cmake_src_test -j1 -} - -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 - - local extdir="${ED}"/usr/share/${PN}/extensions - - if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then - python_optimize "${ED}"/usr/share/${PN}/extensions - fi - - # Empty directory causes sandbox issues, see bug #761915 - rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." -} diff --git a/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild new file mode 100644 index 000000000000..7189d99a6480 --- /dev/null +++ b/media-gfx/inkscape/inkscape-1.2.2-r4.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="xml(+)" +MY_P="${P/_/}" +inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" +else + SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +DESCRIPTION="SVG based generic vector-drawing program" +HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg +openmp postscript readline spell svg2 test visio wpg X" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + dev-util/glib-utils + >=sys-devel/gettext-0.17 + virtual/pkgconfig + test? ( virtual/imagemagick-tools ) +" +COMMON_DEPEND="${PYTHON_DEPS} + >=app-text/poppler-0.57.0:=[cairo] + >=dev-cpp/cairomm-1.12:0 + >=dev-cpp/glibmm-2.54.1:2 + dev-cpp/gtkmm:3.0 + >=dev-cpp/pangomm-2.40:1.4 + >=dev-libs/boehm-gc-7.1:= + dev-libs/boost:= + dev-libs/double-conversion:= + >=dev-libs/glib-2.41 + >=dev-libs/libsigc++-2.8:2 + >=dev-libs/libxml2-2.7.4 + >=dev-libs/libxslt-1.1.25 + dev-libs/popt + media-gfx/potrace + media-libs/fontconfig + media-libs/freetype:2 + media-libs/lcms:2 + media-libs/libpng:0= + net-libs/libsoup:2.4 + sci-libs/gsl:= + >=x11-libs/pango-1.44 + x11-libs/gtk+:3[X?] + X? ( x11-libs/libX11 ) + $(python_gen_cond_dep ' + dev-python/appdirs[${PYTHON_USEDEP}] + dev-python/cachecontrol[${PYTHON_USEDEP}] + dev-python/cssselect[${PYTHON_USEDEP}] + dev-python/lockfile[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + media-gfx/scour[${PYTHON_USEDEP}] + ') + cdr? ( + app-text/libwpg:0.3 + dev-libs/librevenge + media-libs/libcdr + ) + exif? ( media-libs/libexif ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( media-libs/libjpeg-turbo:= ) + readline? ( sys-libs/readline:= ) + spell? ( app-text/gspell ) + 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_USEDEP}] + ') + dia? ( app-office/dia ) + postscript? ( app-text/ghostscript-gpl ) +" +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest ) +" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.2-fix-compile.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = 9999* ]]; then + git-r3_src_unpack + else + default + fi + [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die +} + +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 + -DWITH_NLS=ON + -DENABLE_POPPLER=ON + -DENABLE_POPPLER_CAIRO=ON + -DWITH_PROFILING=OFF + -DWITH_INTERNAL_2GEOM=ON + -DBUILD_TESTING=$(usex test) + -DWITH_LIBCDR=$(usex cdr) + -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_GNU_READLINE=$(usex readline) + -DWITH_GSPELL=$(usex spell) + -DWITH_JEMALLOC=$(usex jemalloc) + -DENABLE_LCMS=ON + -DWITH_OPENMP=$(usex openmp) + -DBUILD_SHARED_LIBS=ON + -DWITH_SVG2=$(usex svg2) + -DWITH_LIBVISIO=$(usex visio) + -DWITH_LIBWPG=$(usex wpg) + -DWITH_X11=$(usex X) + ) + + cmake_src_configure +} + +src_test() { + local myctestargs=( + # render_text*: needs patched Cairo / maybe upstream changes + # not yet in a release. + # test_lpe/test_lpe64: precision differences b/c of new GCC? + # cli_export-png-color-mode-gray-8_png_check_output: ditto? + -E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)" + ) + + cmake_src_test -j1 +} + +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 + + local extdir="${ED}"/usr/share/${PN}/extensions + + if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then + python_optimize "${ED}"/usr/share/${PN}/extensions + fi + + # Empty directory causes sandbox issues, see bug #761915 + rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory." +} diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index 07e3302df825..e54b80ba8cd3 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -58,6 +58,7 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/gtk+:3[X?] X? ( x11-libs/libX11 ) $(python_gen_cond_dep ' + dev-python/appdirs[${PYTHON_USEDEP}] dev-python/cachecontrol[${PYTHON_USEDEP}] dev-python/cssselect[${PYTHON_USEDEP}] dev-python/lockfile[${PYTHON_USEDEP}] -- cgit v1.2.3