commit: 628f97b8ed238770a787c3d0824cf9efb33dd8e1 Author: Jonas Stein <jstein <AT> gentoo <DOT> org> AuthorDate: Tue Mar 31 01:10:02 2020 +0000 Commit: Jonas Stein <jstein <AT> gentoo <DOT> org> CommitDate: Tue Mar 31 01:11:18 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=628f97b8
media-gfx/inkscape: make uniconvertor optional media-gfx/uniconvertor supports only Python 2. The dependency on uniconvertor is now optional to support the transition to Python 3. Bug: https://bugs.gentoo.org/448670 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Jonas Stein <jstein <AT> gentoo.org> media-gfx/inkscape/inkscape-0.92.4-r3.ebuild | 165 +++++++++++++++++++++++++++ media-gfx/inkscape/metadata.xml | 11 +- 2 files changed, 171 insertions(+), 5 deletions(-) diff --git a/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild new file mode 100644 index 00000000000..912e7bba247 --- /dev/null +++ b/media-gfx/inkscape/inkscape-0.92.4-r3.ebuild @@ -0,0 +1,165 @@ +# 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 uniconvertor" + +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}] + ) + ') + uniconvertor? ( 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/metadata.xml b/media-gfx/inkscape/metadata.xml index 49c45680f5f..8bfffeae53d 100644 --- a/media-gfx/inkscape/metadata.xml +++ b/media-gfx/inkscape/metadata.xml @@ -6,13 +6,14 @@ <name>Gentoo Graphics Project</name> </maintainer> <use> - <flag name="cdr">Enable support for CorelDRAW Diagrams via <pkg>media-libs/libcdr</pkg></flag> - <flag name="dia">pull in <pkg>app-office/dia</pkg> for dia import extension</flag> + <flag name="cdr">Enable support for CorelDRAW files via <pkg>media-libs/libcdr</pkg></flag> + <flag name="dia">Enable DIA flow chart import via <pkg>app-office/dia</pkg></flag> <flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag> - <flag name="latex">pull in dependencies for LaTeX formulas</flag> + <flag name="latex">Enable rendering of LaTeX formulas</flag> <flag name="svg2">Enable support for new SVG2 features</flag> - <flag name="visio">Enable support for Microsoft Visio Diagrams via <pkg>media-libs/libvisio</pkg></flag> - <flag name="wpg">Enable support for WordPerfect Graphics via <pkg>app-text/libwpg</pkg></flag> + <flag name="visio">Enable support for Microsoft Visio diagrams via <pkg>media-libs/libvisio</pkg></flag> + <flag name="wpg">Enable support for WordPerfect graphics via <pkg>app-text/libwpg</pkg></flag> + <flag name="uniconvertor">Enable conversion of vector graphic files via <pkg>media-gfx/uniconvertor</pkg> (needs Python 2)</flag> </use> <upstream> <remote-id type="gitlab">inkscape/inkscape</remote-id>
