From cc4618c9ba3d974948ebf340b542d8cb01db2f55 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Sep 2021 22:05:01 +0100 Subject: gentoo resync : 16.09.2021 --- media-gfx/inkscape/Manifest | 6 +- media-gfx/inkscape/inkscape-1.0.2-r1.ebuild | 161 ---------------------------- media-gfx/inkscape/inkscape-1.0.2-r2.ebuild | 161 ++++++++++++++++++++++++++++ media-gfx/inkscape/inkscape-9999.ebuild | 2 +- media-gfx/inkscape/metadata.xml | 2 +- 5 files changed, 166 insertions(+), 166 deletions(-) delete mode 100644 media-gfx/inkscape/inkscape-1.0.2-r1.ebuild create mode 100644 media-gfx/inkscape/inkscape-1.0.2-r2.ebuild (limited to 'media-gfx/inkscape') diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 4da3aeccc7ff..c8e680bd1e2a 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,5 +1,5 @@ AUX glib-2.67.3.patch 1945 BLAKE2B 8093eb444a360481e0f6fd89334f4ca6a693c6df0d0cdc5bee0bfcc308fc9e8b8090c3ca8c7c772ad7ac074d56e81ff3202f1bfd4ee526e0927b28118d27d53c SHA512 c355c7e67acb29fe41c50af4ac8724c636516394c33e9d529eed23eb6d7bbf014bb0f2f9981ccea9e1b3b98a3f87dc256dc385099eb218353e2b220a3d130172 DIST inkscape-1.0.2.tar.xz 32421620 BLAKE2B c3f9c37b15343ba0955a6d06810aef5fb9e035a240f99579301b8cd93858a62b5ed1a3ff528a9642ec74b8900305495236cf7f4c672864369a4e33dca3b34bd4 SHA512 f4fbc627c0f07db11194715c505b771a60af29a9a7f8be0232e4f7eb6b1c5814c3f160c2003d64ec62aeb92ef44174320a47aa6b6abc7a67cc27c996cba9522d -EBUILD inkscape-1.0.2-r1.ebuild 4139 BLAKE2B 54de9394120df674c65531a4d8a0d3be771a136960d9a5367fe696e3090d40fb494a6a7e54ff04992b646d14050bf630b82b0743ccf7db9a1229573f08454cf7 SHA512 8a2790a5f1f328346fe3e252e5e199ade7d2713937d57b7dd6b0c6e204668a5eeefe969c7170570e3442c6e17302c32870c1ce12d6debf68d7319b91390da657 -EBUILD inkscape-9999.ebuild 4044 BLAKE2B 84c522e414e89885ed195bd6f12de31a4557a30cc5d1f1a331ee63de238830a96095c797bdec5bc7beb9e8b37ddc1797d2b292e5b1e62ff2c18261d4d78dbbcf SHA512 9e05e5dbb98f7dedf2e7ca17778955d0b37fbc8b462b22f807a0f0cb7d08b4b1dd2a6962f68b32474e5d04ed7338ce043afebadbbef3fbb4e0da43102499284b -MISC metadata.xml 983 BLAKE2B 5b149700a92f0f4e8a07a643eb004ee6669a668a8a04dd74f13883c858bd2457f8a7f193f64313bf3203fa628484e502a0252272ae8f665a9ebe661589f3637d SHA512 7ab0de464a4dece17f9421bf44a660590c4d453447603a57568a092f90a0005e751cd599ca0923152fc101558c46c479dc65c13a8727b6071a43b1703b459b1e +EBUILD inkscape-1.0.2-r2.ebuild 4143 BLAKE2B 3ed501bf97ae01e72dcd644110f2dab770757eac39f5ec10cb89f7900a55ead460b4f712a9dc0266fdadb297e7a063a245e4a24cf841b9619996886678f6843d SHA512 7c57ca4263c701aa524eb5de03900ca95ad5135a6acd1a5c041f23f8c459efc1086c6e8f74f599ff57ad8a215b0eabebd29e80e54b855a21e818ea5d9e3548dd +EBUILD inkscape-9999.ebuild 4048 BLAKE2B 312994fd1988b8f14f681d8b8f68ad89d7a8787b8aa2a89cf746fb6dd06c8861d11609ea5c7d90991d2f1d9a9a548dd4db75ad11a69157eeed6d0cf7b3ee697f SHA512 95f72b8aa4d20a6c4b58741b36bea22f8b7cccd40380fa536849580f17c9463fe1e0bfe4e64ea8289716b3c226d5dc665e888e9caca6200f35278785224a01d5 +MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0 diff --git a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild deleted file mode 100644 index ddee14946262..000000000000 --- a/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -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://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms -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: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/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/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_USEDEP}] - media-gfx/scour[${PYTHON_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_USEDEP}] - ') - dia? ( app-office/dia ) - postscript? ( app-text/ghostscript-gpl ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.65 -" - -RESTRICT="test" - -S="${WORKDIR}"/${P}_2021-01-15_e86c870879 - -PATCHES=( - "${FILESDIR}"/glib-2.67.3.patch -) - -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 - -DWITH_NLS=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) - ) - - 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 - - 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.0.2-r2.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r2.ebuild new file mode 100644 index 000000000000..0a9dc6de2d53 --- /dev/null +++ b/media-gfx/inkscape/inkscape-1.0.2-r2.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) +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://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86" +IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms +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: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/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/gdl:3 + dev-libs/popt + media-gfx/potrace + media-libs/fontconfig + media-libs/freetype:2 + media-libs/libpng:0= + net-libs/libsoup:2.4 + sci-libs/gsl:= + x11-libs/libX11 + >=x11-libs/pango-1.37.2 + x11-libs/gtk+:3 + $(python_gen_cond_dep ' + dev-python/lxml[${PYTHON_USEDEP}] + media-gfx/scour[${PYTHON_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_USEDEP}] + ') + dia? ( app-office/dia ) + postscript? ( app-text/ghostscript-gpl ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.65 +" + +RESTRICT="test" + +S="${WORKDIR}"/${P}_2021-01-15_e86c870879 + +PATCHES=( + "${FILESDIR}"/glib-2.67.3.patch +) + +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 + -DWITH_NLS=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) + ) + + 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 + + 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 963ed3548658..6912d66bb360 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -44,7 +44,7 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= - net-libs/libsoup + net-libs/libsoup:2.4 sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml index 67658aa01494..7d427ef68dad 100644 --- a/media-gfx/inkscape/metadata.xml +++ b/media-gfx/inkscape/metadata.xml @@ -1,5 +1,5 @@ - + zlogene@gentoo.org -- cgit v1.2.3