commit: d6b3ed4651f817f3870d413e8d4e0021699c8964 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jul 24 20:57:16 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jul 24 20:57:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6b3ed46
media-gfx/inkscape: Drop 0.92.3-r1 It is broken with all available poppler versions. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/inkscape/Manifest | 2 - .../files/inkscape-0.92.3-freetype_pkgconfig.patch | 34 ---- media-gfx/inkscape/inkscape-0.92.3-r1.ebuild | 178 --------------------- 3 files changed, 214 deletions(-) diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index db8162a0074..3169bf7e90e 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,3 +1 @@ -DIST inkscape-0.92.3-poppler-patches-1.tar.xz 7000 BLAKE2B a7658d592806df7580ab587c677907588678222f53bc8305b9adf399b8237e8ac3e169a22a39e33a50f5e517ea4122d736134dfaf5bd675fb34e5c168eb42e30 SHA512 8254d5cc0651bc6ed389f4610aac5ed9451b8c662e82b5c0f9aa221be748f4cd2075a41234c2516a98159cbd3e23c9ada3d519edbe69f05bab418d2fb1af2ffa -DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120 diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch deleted file mode 100644 index d00c23d8add..00000000000 --- a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 62ed18b4d99e690298cc1984b6f2df2363d165fe Mon Sep 17 00:00:00 2001 -From: Lars Wendler <[email protected]> -Date: Fri, 18 May 2018 07:55:38 +0200 -Subject: [PATCH] Use pkg-config to find freetype - -As of freetype-2.9.1 the freetype-config file no longer gets installed -by default. ---- - configure.ac | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 12a081612b..1b75e23670 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -252,12 +252,9 @@ AC_CHECK_FUNCS([mallinfo], [ - [#include <malloc.h>]) - ]) - --AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) --if test "x$FREETYPE_CONFIG" = "xno"; then -- AC_MSG_ERROR([Cannot find freetype-config]) --fi --FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` --FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` -+PKG_CHECK_MODULES(FREETYPE, freetype2,, -+ AC_MSG_ERROR([Cannot find freetype]) -+) - AC_SUBST(FREETYPE_CFLAGS) - AC_SUBST(FREETYPE_LIBS) - --- -2.17.0 - diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild deleted file mode 100644 index 7e552f52df9..00000000000 --- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2019 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 - https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-patches-1.tar.xz"; - -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 - dev-python/lxml[${PYTHON_USEDEP}] - media-gfx/potrace - media-gfx/scour[${PYTHON_USEDEP}] - 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:=[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} - dev-python/numpy[${PYTHON_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.3-freetype_pkgconfig.patch" - "${WORKDIR}/${PN}-0.92.3-poppler-0.64.patch" - "${WORKDIR}/${PN}-0.92.3-poppler-0.65.patch" - "${WORKDIR}/${PN}-0.92.3-poppler-0.64-2.patch" - "${WORKDIR}/${PN}-0.92.3-poppler-0.69.patch" - "${WORKDIR}/${PN}-0.92.3-poppler-0.71.patch" - "${WORKDIR}/${PN}-0.92.3-poppler-0.72.patch" -) - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -pkg_pretend() { - if 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 AR="$(tc-getAR)" -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete || die - python_optimize "${ED%/}"/usr/share/${PN}/extensions -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -}
