commit: 026776c9488a9cd15f24e66e38efa3ea4df156fe Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri May 12 19:11:04 2017 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri May 12 19:11:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=026776c9
media-gfx/inkscape: Remove old Package-Manager: Portage-2.3.5, Repoman-2.3.2 media-gfx/inkscape/Manifest | 1 - .../inkscape/files/inkscape-0.48.0-spell.patch | 45 -------- .../inkscape/files/inkscape-0.48.2-libwpg.patch | 25 ----- .../inkscape/files/inkscape-0.48.3.1-desktop.patch | 11 -- .../files/inkscape-0.48.4-automake-1.13.patch | 21 ---- .../files/inkscape-0.48.4-gc74-configure.patch | 15 --- .../files/inkscape-0.48.4-poppler-0.29.0.patch | 98 ----------------- media-gfx/inkscape/inkscape-0.48.5-r1.ebuild | 119 --------------------- 8 files changed, 335 deletions(-) diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 8712c76e8bc..a2881475517 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -1,2 +1 @@ -DIST inkscape-0.48.5.tar.bz2 19719332 SHA256 2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969 SHA512 97f08d9d31e2ad84e15b9f37be3a3039aabb5b15061919e1500a01ecf56398abb3ab06a4fe557bd379dcf7acd95166637be2f4d3ef1a17c3cc76a79a7868b418 WHIRLPOOL 8147f8328212e8951f026db92b0c6d475e293aa8bff8964b90c1a3d1e85395fab400758954a2e73501b4974d644bd44c0e572aababaec809b3c73f777a13c284 DIST inkscape-0.91.tar.bz2 25858909 SHA256 4d901f8a9e1924404e797ad23b8b0c495a9d155448816d95a55974314e1f141b SHA512 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7 WHIRLPOOL ff538bd47dbea3bc461f24b09f2d26e3b6141053e8289bac1ac973b65b6957257c5aede30e782201c2813919643bf23989c7ce6a8492fa259b3d506e427e4126 diff --git a/media-gfx/inkscape/files/inkscape-0.48.0-spell.patch b/media-gfx/inkscape/files/inkscape-0.48.0-spell.patch deleted file mode 100644 index 946222276b7..00000000000 --- a/media-gfx/inkscape/files/inkscape-0.48.0-spell.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- inkscape-0.48.0/configure.ac.orig 2010-10-26 21:22:06.000000000 +0200 -+++ inkscape-0.48.0/configure.ac 2010-10-26 21:33:39.000000000 +0200 -@@ -433,10 +433,15 @@ - fi - AM_CONDITIONAL(INKJAR, test "$with_ij" = "yes") - -+AC_ARG_WITH([gtkspell], -+ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes]) -+ - ink_spell_pkg= --if pkg-config --exists gtkspell-2.0; then -- ink_spell_pkg=gtkspell-2.0 -- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+if test "x$with_gtkspell" = "xyes"; then -+ if pkg-config --exists gtkspell-2.0; then -+ ink_spell_pkg=gtkspell-2.0 -+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget]) -+ fi - fi - - dnl ****************************** -@@ -758,12 +763,17 @@ - dnl ************************** - dnl Check for aspell - dnl ****************************** --AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) --if test "x$aspell_ok" = "xyes"; then -- AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) -- INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" --else -- AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) -+AC_ARG_WITH([aspell], -+ AS_HELP_STRING([--without-aspell], [disable aspell spell checker]),[with_aspell=$withval], [with_aspell=yes]) -+ -+if test "x$with_aspell" = "xyes"; then -+ AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm) -+ if test "x$aspell_ok" = "xyes"; then -+ AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker]) -+ INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell" -+ else -+ AC_MSG_CHECKING([Aspell not found, spell checker will be disabled]) -+ fi - fi - - dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. diff --git a/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch b/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch deleted file mode 100644 index 998ce41ab3a..00000000000 --- a/media-gfx/inkscape/files/inkscape-0.48.2-libwpg.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- inkscape-0.48.2/configure.ac.orig -+++ inkscape-0.48.2/configure.ac -@@ -713,14 +713,14 @@ - - with_libwpg=no - --PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no) --if test "x$with_libwpg01" = "xyes"; then -- AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x]) -- with_libwpg=yes -- AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS) -- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS) --fi --AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes") -+#PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no) -+#if test "x$with_libwpg01" = "xyes"; then -+# AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x]) -+# with_libwpg=yes -+# AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS) -+# AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS) -+#fi -+#AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes") - - PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no) - if test "x$with_libwpg02" = "xyes"; then diff --git a/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch b/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch deleted file mode 100644 index ea5f214cafc..00000000000 --- a/media-gfx/inkscape/files/inkscape-0.48.3.1-desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- inkscape-0.48.3.1/inkscape.desktop.in -+++ inkscape-0.48.3.1/inkscape.desktop.in -@@ -5,7 +5,7 @@ - _X-GNOME-FullName=Inkscape Vector Graphics Editor - _Comment=Create and edit Scalable Vector Graphics images - Type=Application --Categories=Graphics;VectorGraphics;GTK; -+Categories=Graphics;2DGraphics;VectorGraphics;GTK; - MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; - Exec=inkscape %F - TryExec=inkscape diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.13.patch b/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.13.patch deleted file mode 100644 index 6d649da99de..00000000000 --- a/media-gfx/inkscape/files/inkscape-0.48.4-automake-1.13.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Julian Ospald <[email protected]> -Date: Thu Apr 25 15:06:01 UTC 2013 -Subject: fix building with automake-1.3 - ---- inkscape-0.48.4/configure.ac -+++ inkscape-0.48.4/configure.ac -@@ -21,12 +21,12 @@ - export CC CXX - ]) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_LANG(C++) - AC_ISC_POSIX - AC_PROG_CXX --AM_PROG_CC_STDC -+AC_PROG_CC - AM_PROG_AS - AC_PROG_RANLIB - AC_PROG_INTLTOOL(0.22) diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch b/media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch deleted file mode 100644 index 3ef7ce2c98b..00000000000 --- a/media-gfx/inkscape/files/inkscape-0.48.4-gc74-configure.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- inkscape-0.48.4/configure.ac 2013-12-31 00:38:18.592732496 +0400 -+++ inkscape-0.48.4/configure.ac 2013-12-31 00:39:13.558730872 +0400 -@@ -263,7 +263,11 @@ - # include <gc.h> - #endif - #include <stdio.h> -- extern unsigned GC_version; -+ #if (GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 4) -+ unsigned GC_version = GC_get_version(); -+ #else -+ extern unsigned GC_version; -+ #endif - int main(void){ - unsigned min = ((6 << 16) | (4 << 8) | 0); - printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF); diff --git a/media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch b/media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch deleted file mode 100644 index bcfea9b77ad..00000000000 --- a/media-gfx/inkscape/files/inkscape-0.48.4-poppler-0.29.0.patch +++ /dev/null @@ -1,98 +0,0 @@ - configure.ac | 5 ++++ - src/extension/internal/pdfinput/pdf-parser.cpp | 32 +++++++++++++++++++++----- - 2 files changed, 31 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c8e1ae2..d62c989 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -593,6 +593,11 @@ if test "x$popplernewercolorspaceapi" = "xyes"; then - AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0]) - fi - -+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no) -+if test "x$popplernewernewcolorspaceapi" = "xyes"; then -+ AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0]) -+fi -+ - # Poppler's b604a008 commit changes this - AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor]) - popplergfxcolor="no" -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index b6edbfb..3fbf237 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -860,7 +860,9 @@ void PdfParser::opSetExtGState(Object args[], int numArgs) { - blendingColorSpace = NULL; - isolated = knockout = gFalse; - if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { --#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL); -+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) - blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL); - #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); -@@ -1085,7 +1087,13 @@ void PdfParser::opSetFillColorSpace(Object args[], int numArgs) { - - state->setFillPattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -+ if (obj.isNull()) { -+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); -+ } else { -+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL); -+ } -+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); - } else { -@@ -1126,7 +1134,13 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int numArgs) { - - state->setStrokePattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -+ if (obj.isNull()) { -+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); -+ } else { -+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL); -+ } -+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); - } else { -@@ -2756,7 +2770,9 @@ void PdfParser::doImage(Object *ref, Stream *str, GBool inlineImg) { - } - } - if (!obj1.isNull()) { --#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -+ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL); -+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) - colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); - #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - colorSpace = GfxColorSpace::parse(&obj1, NULL); -@@ -2847,7 +2863,9 @@ void PdfParser::doImage(Object *ref, Stream *str, GBool inlineImg) { - obj2.free(); - } - } --#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL); -+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) - GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); - #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - maskColorSpace = GfxColorSpace::parse(&obj1, NULL); -@@ -3040,7 +3058,9 @@ void PdfParser::doForm(Object *str) { - if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { - transpGroup = gTrue; - if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { --#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL); -+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) - blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL); - #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) - blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); diff --git a/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild b/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild deleted file mode 100644 index 9acd1850da3..00000000000 --- a/media-gfx/inkscape/inkscape-0.48.5-r1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" -GCONF_DEBUG=no - -inherit autotools eutils flag-o-matic gnome2 toolchain-funcs python-single-r1 - -MY_P=${P/_/} - -DESCRIPTION="A SVG based generic vector-drawing program" -HOMEPAGE="http://www.inkscape.org/"; -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="dia gnome postscript inkjar lcms nls spell wmf" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - app-text/libwpd:0.9 - app-text/libwpg:0.2 - >=app-text/poppler-0.12.3-r3:=[cairo,xpdf-headers(+)] - dev-cpp/glibmm - >=dev-cpp/gtkmm-2.18.0:2.4 - >=dev-libs/boehm-gc-6.4 - >=dev-libs/glib-2.6.5 - >=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/imagemagick[cxx] - 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.4.0 - gnome? ( >=gnome-base/gnome-vfs-2.0 ) - lcms? ( media-libs/lcms:2 ) - spell? ( - app-text/aspell - app-text/gtkspell:2 - )" - -# 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 ) - postscript? ( app-text/ghostscript-gpl ) - wmf? ( media-libs/libwmf )" - -DEPEND="${COMMON_DEPEND} - dev-libs/boost - >=dev-util/intltool-0.29 - sys-devel/gettext - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -RESTRICT="test" - -src_prepare() { - gnome2_src_prepare - epatch \ - "${FILESDIR}"/${PN}-0.48.0-spell.patch \ - "${FILESDIR}"/${PN}-0.48.2-libwpg.patch \ - "${FILESDIR}"/${PN}-0.48.3.1-desktop.patch \ - "${FILESDIR}"/${PN}-0.48.4-epython.patch \ - "${FILESDIR}"/${PN}-0.48.4-automake-1.13.patch \ - "${FILESDIR}"/${PN}-0.48.4-gc74-configure.patch \ - "${FILESDIR}"/${PN}-0.48.4-poppler-0.29.0.patch - - sed -i \ - -e "s#@EPYTHON@#${EPYTHON}#" \ - src/extension/implementation/script.cpp || die - - eautoreconf - - # bug 421111 - python_fix_shebang share/extensions -} - -src_configure() { - G2CONF="${G2CONF} - --without-perl - --enable-poppler-cairo - $(use_with gnome gnome-vfs) - $(use_with inkjar) - $(use_enable lcms) - $(use_enable nls) - $(use_with spell aspell) - $(use_with spell gtkspell)" - - # aliasing unsafe wrt #310393 - append-flags -fno-strict-aliasing - gnome2_src_configure -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - gnome2_src_install - python_optimize "${ED}"/usr/share/${PN}/extensions -}
