Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/
Date: Sat, 31 Mar 2018 05:12:13
Message-Id: 1522473093.07a4b2a3a4db18a38a7f73ac2177b9c4171fb9ec.radhermit@gentoo
1 commit: 07a4b2a3a4db18a38a7f73ac2177b9c4171fb9ec
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 31 05:10:22 2018 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 31 05:11:33 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a4b2a3
7
8 media-gfx/inkscape: remove old
9
10 media-gfx/inkscape/Manifest | 2 -
11 .../files/inkscape-0.91-fix-gtkmm-2.48.patch | 63 --------
12 .../files/inkscape-0.91_pre3-automagic.patch | 154 ------------------
13 .../files/inkscape-0.91_pre3-desktop.patch | 20 ---
14 media-gfx/inkscape/inkscape-0.91-r3.ebuild | 176 --------------------
15 media-gfx/inkscape/inkscape-0.91-r4.ebuild | 179 ---------------------
16 media-gfx/inkscape/inkscape-0.92.1-r1.ebuild | 173 --------------------
17 7 files changed, 767 deletions(-)
18
19 diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
20 index f44a0ae2f97..00b2e31f116 100644
21 --- a/media-gfx/inkscape/Manifest
22 +++ b/media-gfx/inkscape/Manifest
23 @@ -1,5 +1,3 @@
24 -DIST inkscape-0.91.tar.bz2 25858909 BLAKE2B 9ca69a10a043efa64d7327ca6ba28d04a650d980ef455106d40ae17555d4792a532df493dab23dad2d3c7cdcc68f59391228bae76ebd30f03cf66cbb4fd0ae65 SHA512 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7
25 DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
26 -DIST inkscape-0.92.1.tar.bz2 31222684 BLAKE2B 26364e3ccf447d22d15291b132b44b1abd5ca4efc1df8e5eb4ca494ac9340ed8aa5e2d57d2e14c1859fc202532cf722b4c9c89defa92c630e462b07ce29ec774 SHA512 f8f3bfb812a214216c3ffac7064a4619f847cf9810417c782481dba12e6c6a44123c8b8a9289fbf5287f2e6b6df39a641d94a000d842faee5ff808eec86187a0
27 DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
28 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
29
30 diff --git a/media-gfx/inkscape/files/inkscape-0.91-fix-gtkmm-2.48.patch b/media-gfx/inkscape/files/inkscape-0.91-fix-gtkmm-2.48.patch
31 deleted file mode 100644
32 index f9c06601e83..00000000000
33 --- a/media-gfx/inkscape/files/inkscape-0.91-fix-gtkmm-2.48.patch
34 +++ /dev/null
35 @@ -1,63 +0,0 @@
36 ---- a/src/ui/clipboard.cpp 2016-04-02 15:15:43 +0000
37 -+++ b/src/ui/clipboard.cpp 2016-04-07 16:30:32 +0000
38 -@@ -146,8 +146,6 @@
39 - void _setClipboardColor(guint32);
40 - void _userWarn(SPDesktop *, char const *);
41 -
42 -- void _inkscape_wait_for_targets(std::list<Glib::ustring> &);
43 --
44 - // private properites
45 - SPDocument *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it
46 - Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node
47 -@@ -1302,9 +1300,7 @@
48 - */
49 - Glib::ustring ClipboardManagerImpl::_getBestTarget()
50 - {
51 -- // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets()
52 -- std::list<Glib::ustring> targets; // = _clipboard->wait_for_targets();
53 -- _inkscape_wait_for_targets(targets);
54 -+ std::list<Glib::ustring> targets = _clipboard->wait_for_targets();
55 -
56 - // clipboard target debugging snippet
57 - /*
58 -@@ -1456,39 +1452,6 @@
59 - desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, msg);
60 - }
61 -
62 --
63 --// GTKMM's clipboard::wait_for_targets is buggy and might return bogus, see
64 --//
65 --// https://bugs.launchpad.net/inkscape/+bug/296778
66 --// http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00062.html
67 --//
68 --// for details. Until this has been fixed upstream we will use our own implementation
69 --// of this method, as copied from /gtkmm-2.16.0/gtk/gtkmm/clipboard.cc.
70 --void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list<Glib::ustring> &listTargets)
71 --{
72 -- //Get a newly-allocated array of atoms:
73 -- GdkAtom* targets = NULL;
74 -- gint n_targets = 0;
75 -- gboolean test = gtk_clipboard_wait_for_targets( gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), &targets, &n_targets );
76 -- if (!test || (targets == NULL)) {
77 -- return;
78 -- }
79 --
80 -- //Add the targets to the C++ container:
81 -- for (int i = 0; i < n_targets; i++)
82 -- {
83 -- //Convert the atom to a string:
84 -- gchar* const atom_name = gdk_atom_name(targets[i]);
85 --
86 -- Glib::ustring target;
87 -- if (atom_name) {
88 -- target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
89 -- }
90 --
91 -- listTargets.push_back(target);
92 -- }
93 --}
94 --
95 - /* #######################################
96 - ClipboardManager class
97 - ####################################### */
98 -
99
100 diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch
101 deleted file mode 100644
102 index e29b7e9f787..00000000000
103 --- a/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch
104 +++ /dev/null
105 @@ -1,154 +0,0 @@
106 -Respect configure option for openmp and add configure options for aspell,
107 -gtkspell, imagemagick, jpeg, and exif.
108 -
109 ---- inkscape-0.91pre3/configure.ac
110 -+++ inkscape-0.91pre3/configure.ac
111 -@@ -233,19 +233,28 @@
112 - dnl Check for OpenMP
113 - dnl ******************************
114 - AC_OPENMP
115 --if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
116 -- openmp_ok=yes
117 -- dnl We have it, now set up the flags
118 -- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
119 -- AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
120 -+openmp_ok="no"
121 -+if test "x$enable_openmp" = "xyes"; then
122 -+ if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
123 -+ openmp_ok=yes
124 -+ dnl We have it, now set up the flags
125 -+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
126 -+ AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
127 -+ fi
128 - fi
129 -
130 - dnl ******************************
131 - dnl Check for libexif
132 - dnl ******************************
133 --PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no)
134 --if test "x$exif_ok" = "xyes"; then
135 -- AC_DEFINE(HAVE_EXIF, 1, [Use libexif])
136 -+AC_ARG_ENABLE(exif,
137 -+ AS_HELP_STRING([--enable-exif], [compile with EXIF support]),
138 -+ enable_exif=$enableval,enable_exif=no)
139 -+
140 -+if test "x$enable_exif" = "xyes"; then
141 -+ PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no)
142 -+ if test "x$exif_ok" = "xyes"; then
143 -+ AC_DEFINE(HAVE_EXIF, 1, [Use libexif])
144 -+ fi
145 - fi
146 - AC_SUBST(EXIF_LIBS)
147 - AC_SUBST(EXIF_CFLAGS)
148 -@@ -253,10 +262,16 @@
149 - dnl ******************************
150 - dnl Check for libjpeg
151 - dnl ******************************
152 --AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no)
153 --if test "x$jpeg_ok" = "xyes"; then
154 -- LIBS="-ljpeg $LIBS"
155 -- AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg])
156 -+AC_ARG_ENABLE(jpeg,
157 -+ AS_HELP_STRING([--enable-jpeg], [compile with JPEG support]),
158 -+ enable_jpeg=$enableval,enable_jpeg=no)
159 -+
160 -+if test "x$enable_jpeg" = "xyes"; then
161 -+ AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no)
162 -+ if test "x$jpeg_ok" = "xyes"; then
163 -+ LIBS="-ljpeg $LIBS"
164 -+ AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg])
165 -+ fi
166 - fi
167 -
168 - dnl This check is to get a FIONREAD definition on Solaris 8
169 -@@ -675,9 +690,16 @@
170 - dnl Check for ImageMagick Magick++
171 - dnl ******************************
172 -
173 --PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no)
174 --if test "x$magick_ok" = "xyes"; then
175 -- AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
176 -+AC_ARG_ENABLE(magick,
177 -+ AS_HELP_STRING([--enable-magick], [compile with Image Magick++ support for bitmap effects]),
178 -+ enable_magick=$enableval,enable_magick=no)
179 -+
180 -+magick_ok="no"
181 -+if test "x$enable_magick" = "xyes"; then
182 -+ PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no)
183 -+ if test "x$magick_ok" = "xyes"; then
184 -+ AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
185 -+ fi
186 - fi
187 - AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes")
188 -
189 -@@ -712,6 +734,10 @@
190 - AC_DEFINE(WITH_GLIBMM_2_32,1,[Build with Glibmm 2.32 or higher])
191 - fi
192 -
193 -+
194 -+AC_ARG_WITH([gtkspell],
195 -+ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes])
196 -+
197 - dnl *********************************
198 - dnl Allow experimental GTK+3 build
199 - dnl *********************************
200 -@@ -723,11 +749,13 @@
201 - if test "x$enable_gtk3" = "xyes"; then
202 -
203 - ink_spell_pkg=
204 -- if pkg-config --exists gtkspell-3.0; then
205 -- ink_spell_pkg=gtkspell-3.0
206 -- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
207 -+ if test "x$with_gtkspell" = "xyes"; then
208 -+ if pkg-config --exists gtkspell-3.0; then
209 -+ ink_spell_pkg=gtkspell-3.0
210 -+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
211 -+ fi
212 - fi
213 --
214 -+
215 - PKG_CHECK_MODULES(GTK,
216 - gtkmm-3.0 >= 3.2
217 - gdkmm-3.0 >= 3.2
218 -@@ -800,11 +828,13 @@
219 - else
220 -
221 - ink_spell_pkg=
222 -- if pkg-config --exists gtkspell-2.0; then
223 -- ink_spell_pkg=gtkspell-2.0
224 -- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
225 -+ if test "x$with_gtkspell" = "xyes"; then
226 -+ if pkg-config --exists gtkspell-2.0; then
227 -+ ink_spell_pkg=gtkspell-2.0
228 -+ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
229 -+ fi
230 - fi
231 --
232 -+
233 - PKG_CHECK_MODULES(GTK,
234 - gtk+-2.0 >= 2.24
235 - $ink_spell_pkg
236 -@@ -928,12 +958,17 @@
237 - dnl **************************
238 - dnl Check for aspell
239 - dnl ******************************
240 --AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm)
241 --if test "x$aspell_ok" = "xyes"; then
242 -- AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker])
243 -- INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
244 --else
245 -- AC_MSG_CHECKING([Aspell not found, spell checker will be disabled])
246 -+AC_ARG_WITH([aspell],
247 -+ AS_HELP_STRING([--without-aspell], [disable aspell spell checker]),[with_aspell=$withval], [with_aspell=yes])
248 -+
249 -+if test "x$with_aspell" = "xyes"; then
250 -+ AC_CHECK_LIB(aspell, new_aspell_config, [AC_CHECK_HEADER(aspell.h, aspell_ok=yes, aspell_ok=no)], aspell_ok=no, -lz -lm)
251 -+ if test "x$aspell_ok" = "xyes"; then
252 -+ AC_DEFINE(HAVE_ASPELL, 1, [Use aspell for built-in spellchecker])
253 -+ INKSCAPE_LIBS="$INKSCAPE_LIBS -laspell"
254 -+ else
255 -+ AC_MSG_CHECKING([Aspell not found, spell checker will be disabled])
256 -+ fi
257 - fi
258 -
259 - dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
260
261 diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch
262 deleted file mode 100644
263 index f02fa1a8aca..00000000000
264 --- a/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch
265 +++ /dev/null
266 @@ -1,20 +0,0 @@
267 ---- inkscape-0.91pre3/inkscape.desktop.in
268 -+++ inkscape-0.91pre3/inkscape.desktop.in
269 -@@ -5,7 +5,7 @@
270 - _X-GNOME-FullName=Inkscape Vector Graphics Editor
271 - _Comment=Create and edit Scalable Vector Graphics images
272 - Type=Application
273 --Categories=Graphics;VectorGraphics;GTK;
274 -+Categories=Graphics;2DGraphics;VectorGraphics;GTK;
275 - MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;
276 - Exec=inkscape %F
277 - TryExec=inkscape
278 -@@ -14,7 +14,7 @@
279 - Icon=inkscape
280 - X-Ayatana-Desktop-Shortcuts=Drawing
281 -
282 --[Drawing Shortcut Group]
283 -+[X-Drawing Shortcut Group]
284 - _Name=New Drawing
285 - Exec=inkscape
286 - TargetEnvironment=Unity
287
288 diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
289 deleted file mode 100644
290 index e66661ffc32..00000000000
291 --- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
292 +++ /dev/null
293 @@ -1,176 +0,0 @@
294 -# Copyright 1999-2018 Gentoo Foundation
295 -# Distributed under the terms of the GNU General Public License v2
296 -
297 -EAPI=6
298 -PYTHON_COMPAT=( python2_7 )
299 -PYTHON_REQ_USE="xml"
300 -
301 -inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
302 -
303 -MY_P=${P/_/}
304 -
305 -DESCRIPTION="A SVG based generic vector-drawing program"
306 -HOMEPAGE="https://inkscape.org/"
307 -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
308 -
309 -LICENSE="GPL-2 LGPL-2.1"
310 -SLOT="0"
311 -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
312 -IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
313 -IUSE+=" lcms nls spell static-libs visio wpg"
314 -
315 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
316 -
317 -WPG_DEPS="
318 - || (
319 - ( app-text/libwpg:0.3 dev-libs/librevenge )
320 - ( app-text/libwpd:0.9 app-text/libwpg:0.2 )
321 - )
322 -"
323 -COMMON_DEPEND="
324 - ${PYTHON_DEPS}
325 - >=app-text/poppler-0.26.0:=[cairo]
326 - >=dev-cpp/glibmm-2.48
327 - >=dev-cpp/gtkmm-2.18.0:2.4
328 - >=dev-cpp/cairomm-1.9.8
329 - >=dev-libs/boehm-gc-7.1:=
330 - >=dev-libs/glib-2.28
331 - >=dev-libs/libsigc++-2.0.12
332 - >=dev-libs/libxml2-2.6.20
333 - >=dev-libs/libxslt-1.0.15
334 - dev-libs/popt
335 - dev-python/lxml[${PYTHON_USEDEP}]
336 - media-libs/fontconfig
337 - media-libs/freetype:2
338 - media-libs/libpng:0
339 - sci-libs/gsl:=
340 - x11-libs/libX11
341 - >=x11-libs/gtk+-2.10.7:2
342 - >=x11-libs/pango-1.24
343 - cdr? (
344 - media-libs/libcdr
345 - ${WPG_DEPS}
346 - )
347 - dbus? ( dev-libs/dbus-glib )
348 - exif? ( media-libs/libexif )
349 - gnome? ( >=gnome-base/gnome-vfs-2.0 )
350 - imagemagick? ( media-gfx/imagemagick:=[cxx] )
351 - jpeg? ( virtual/jpeg:0 )
352 - lcms? ( media-libs/lcms:2 )
353 - spell? (
354 - app-text/aspell
355 - app-text/gtkspell:2
356 - )
357 - visio? (
358 - media-libs/libvisio
359 - ${WPG_DEPS}
360 - )
361 - wpg? ( ${WPG_DEPS} )
362 -"
363 -
364 -# These only use executables provided by these packages
365 -# See share/extensions for more details. inkscape can tell you to
366 -# install these so we could of course just not depend on those and rely
367 -# on that.
368 -RDEPEND="${COMMON_DEPEND}
369 - dev-python/numpy[${PYTHON_USEDEP}]
370 - media-gfx/uniconvertor
371 - dia? ( app-office/dia )
372 - latex? (
373 - media-gfx/pstoedit[plotutils]
374 - app-text/dvipsk
375 - app-text/texlive-core
376 - )
377 - postscript? ( app-text/ghostscript-gpl )
378 -"
379 -
380 -DEPEND="${COMMON_DEPEND}
381 - >=dev-libs/boost-1.36
382 - >=dev-util/intltool-0.40
383 - >=sys-devel/gettext-0.17
384 - virtual/pkgconfig
385 -"
386 -
387 -PATCHES=(
388 - "${FILESDIR}/${PN}-0.91_pre3-automagic.patch"
389 - "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
390 - "${FILESDIR}/${PN}-0.91_pre3-desktop.patch"
391 - "${FILESDIR}/${PN}-0.91_pre3-exif.patch"
392 - "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
393 - "${FILESDIR}/${PN}-0.48.4-epython.patch"
394 - "${FILESDIR}/${PN}-0.91-fix-gtkmm-2.48.patch"
395 -)
396 -
397 -S=${WORKDIR}/${MY_P}
398 -
399 -RESTRICT="test"
400 -
401 -pkg_pretend() {
402 - if use openmp; then
403 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
404 - fi
405 -}
406 -
407 -src_prepare() {
408 - default
409 -
410 - sed -i "s#@EPYTHON@#${EPYTHON}#" \
411 - src/extension/implementation/script.cpp || die
412 -
413 - eautoreconf
414 -
415 - # bug 421111
416 - python_fix_shebang share/extensions
417 -}
418 -
419 -src_configure() {
420 - # aliasing unsafe wrt #310393
421 - append-flags -fno-strict-aliasing
422 - # enable c++11 as needed for sigc++-2.6, #566318
423 - # remove it when upstream solves the issue
424 - # https://bugs.launchpad.net/inkscape/+bug/1488079
425 - append-cxxflags -std=c++11
426 -
427 - econf \
428 - $(use_enable static-libs static) \
429 - $(use_enable nls) \
430 - $(use_enable openmp) \
431 - $(use_enable exif) \
432 - $(use_enable jpeg) \
433 - $(use_enable lcms) \
434 - --enable-poppler-cairo \
435 - $(use_enable wpg) \
436 - $(use_enable visio) \
437 - $(use_enable cdr) \
438 - $(use_enable dbus dbusapi) \
439 - $(use_enable imagemagick magick) \
440 - $(use_with gnome gnome-vfs) \
441 - $(use_with inkjar) \
442 - $(use_with spell gtkspell) \
443 - $(use_with spell aspell)
444 -}
445 -
446 -src_compile() {
447 - emake AR="$(tc-getAR)"
448 -}
449 -
450 -src_install() {
451 - default
452 -
453 - prune_libtool_files
454 - python_optimize "${ED}"/usr/share/${PN}/extensions
455 -}
456 -
457 -pkg_preinst() {
458 - gnome2_icon_savelist
459 -}
460 -
461 -pkg_postinst() {
462 - gnome2_icon_cache_update
463 - fdo-mime_desktop_database_update
464 -}
465 -
466 -pkg_postrm() {
467 - gnome2_icon_cache_update
468 - fdo-mime_desktop_database_update
469 -}
470
471 diff --git a/media-gfx/inkscape/inkscape-0.91-r4.ebuild b/media-gfx/inkscape/inkscape-0.91-r4.ebuild
472 deleted file mode 100644
473 index 26296f1bf53..00000000000
474 --- a/media-gfx/inkscape/inkscape-0.91-r4.ebuild
475 +++ /dev/null
476 @@ -1,179 +0,0 @@
477 -# Copyright 1999-2018 Gentoo Foundation
478 -# Distributed under the terms of the GNU General Public License v2
479 -
480 -EAPI=6
481 -PYTHON_COMPAT=( python2_7 )
482 -PYTHON_REQ_USE="xml"
483 -
484 -inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
485 -
486 -MY_P=${P/_/}
487 -
488 -DESCRIPTION="A SVG based generic vector-drawing program"
489 -HOMEPAGE="https://inkscape.org/"
490 -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
491 -
492 -LICENSE="GPL-2 LGPL-2.1"
493 -SLOT="0"
494 -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
495 -IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
496 -IUSE+=" lcms nls spell static-libs visio wpg"
497 -
498 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
499 -
500 -COMMON_DEPEND="
501 - ${PYTHON_DEPS}
502 - >=app-text/poppler-0.26.0:=[cairo]
503 - >=dev-cpp/glibmm-2.48
504 - >=dev-cpp/gtkmm-2.18.0:2.4
505 - >=dev-cpp/cairomm-1.9.8
506 - >=dev-libs/boehm-gc-7.1:=
507 - >=dev-libs/glib-2.28
508 - >=dev-libs/libsigc++-2.0.12
509 - >=dev-libs/libxml2-2.6.20
510 - >=dev-libs/libxslt-1.0.15
511 - dev-libs/popt
512 - dev-python/lxml[${PYTHON_USEDEP}]
513 - media-gfx/potrace
514 - media-gfx/scour[${PYTHON_USEDEP}]
515 - media-libs/fontconfig
516 - media-libs/freetype:2
517 - media-libs/libpng:0
518 - sci-libs/gsl:=
519 - x11-libs/libX11
520 - >=x11-libs/gtk+-2.10.7:2
521 - >=x11-libs/pango-1.24
522 - cdr? (
523 - media-libs/libcdr
524 - app-text/libwpg:0.3
525 - dev-libs/librevenge
526 - )
527 - dbus? ( dev-libs/dbus-glib )
528 - exif? ( media-libs/libexif )
529 - gnome? ( >=gnome-base/gnome-vfs-2.0 )
530 - imagemagick? ( media-gfx/imagemagick:=[cxx] )
531 - jpeg? ( virtual/jpeg:0 )
532 - lcms? ( media-libs/lcms:2 )
533 - spell? (
534 - app-text/aspell
535 - app-text/gtkspell:2
536 - )
537 - visio? (
538 - media-libs/libvisio
539 - app-text/libwpg:0.3
540 - dev-libs/librevenge
541 - )
542 - wpg? (
543 - app-text/libwpg:0.3
544 - dev-libs/librevenge
545 - )
546 -"
547 -
548 -# These only use executables provided by these packages
549 -# See share/extensions for more details. inkscape can tell you to
550 -# install these so we could of course just not depend on those and rely
551 -# on that.
552 -RDEPEND="${COMMON_DEPEND}
553 - dev-python/numpy[${PYTHON_USEDEP}]
554 - media-gfx/uniconvertor
555 - dia? ( app-office/dia )
556 - latex? (
557 - media-gfx/pstoedit[plotutils]
558 - app-text/dvipsk
559 - app-text/texlive-core
560 - )
561 - postscript? ( app-text/ghostscript-gpl )
562 -"
563 -
564 -DEPEND="${COMMON_DEPEND}
565 - >=dev-libs/boost-1.36
566 - >=dev-util/intltool-0.40
567 - >=sys-devel/gettext-0.17
568 - virtual/pkgconfig
569 -"
570 -
571 -PATCHES=(
572 - "${FILESDIR}/${PN}-0.91_pre3-automagic.patch"
573 - "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
574 - "${FILESDIR}/${PN}-0.91_pre3-desktop.patch"
575 - "${FILESDIR}/${PN}-0.91_pre3-exif.patch"
576 - "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
577 - "${FILESDIR}/${PN}-0.48.4-epython.patch"
578 - "${FILESDIR}/${PN}-0.91-fix-gtkmm-2.48.patch"
579 -)
580 -
581 -S=${WORKDIR}/${MY_P}
582 -
583 -RESTRICT="test"
584 -
585 -pkg_pretend() {
586 - if use openmp; then
587 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
588 - fi
589 -}
590 -
591 -src_prepare() {
592 - default
593 -
594 - sed -i "s#@EPYTHON@#${EPYTHON}#" \
595 - src/extension/implementation/script.cpp || die
596 -
597 - eautoreconf
598 -
599 - # bug 421111
600 - python_fix_shebang share/extensions
601 -}
602 -
603 -src_configure() {
604 - # aliasing unsafe wrt #310393
605 - append-flags -fno-strict-aliasing
606 - # enable c++11 as needed for sigc++-2.6, #566318
607 - # remove it when upstream solves the issue
608 - # https://bugs.launchpad.net/inkscape/+bug/1488079
609 - append-cxxflags -std=c++11
610 -
611 - econf \
612 - $(use_enable static-libs static) \
613 - $(use_enable nls) \
614 - $(use_enable openmp) \
615 - $(use_enable exif) \
616 - $(use_enable jpeg) \
617 - $(use_enable lcms) \
618 - --enable-poppler-cairo \
619 - $(use_enable wpg) \
620 - $(use_enable visio) \
621 - $(use_enable cdr) \
622 - $(use_enable dbus dbusapi) \
623 - $(use_enable imagemagick magick) \
624 - $(use_with gnome gnome-vfs) \
625 - $(use_with inkjar) \
626 - $(use_with spell gtkspell) \
627 - $(use_with spell aspell)
628 -}
629 -
630 -src_compile() {
631 - emake AR="$(tc-getAR)"
632 -}
633 -
634 -src_install() {
635 - default
636 -
637 - prune_libtool_files
638 - python_optimize "${ED}"/usr/share/${PN}/extensions
639 -}
640 -
641 -pkg_preinst() {
642 - gnome2_icon_savelist
643 -}
644 -
645 -pkg_postinst() {
646 - gnome2_icon_cache_update
647 - xdg_mimeinfo_database_update
648 - xdg_desktop_database_update
649 -}
650 -
651 -pkg_postrm() {
652 - gnome2_icon_cache_update
653 - xdg_mimeinfo_database_update
654 - xdg_desktop_database_update
655 -}
656
657 diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
658 deleted file mode 100644
659 index 3a632ccb1ac..00000000000
660 --- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
661 +++ /dev/null
662 @@ -1,173 +0,0 @@
663 -# Copyright 1999-2018 Gentoo Foundation
664 -# Distributed under the terms of the GNU General Public License v2
665 -
666 -EAPI=6
667 -PYTHON_COMPAT=( python2_7 )
668 -PYTHON_REQ_USE="xml"
669 -
670 -inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
671 -
672 -MY_P=${P/_/}
673 -
674 -DESCRIPTION="A SVG based generic vector-drawing program"
675 -HOMEPAGE="https://inkscape.org/"
676 -SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
677 -
678 -LICENSE="GPL-2 LGPL-2.1"
679 -SLOT="0"
680 -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
681 -IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
682 -IUSE+=" lcms nls spell static-libs visio wpg"
683 -
684 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
685 -
686 -WPG_DEPS="
687 - || (
688 - ( app-text/libwpg:0.3 dev-libs/librevenge )
689 - ( app-text/libwpd:0.9 app-text/libwpg:0.2 )
690 - )
691 -"
692 -COMMON_DEPEND="
693 - ${PYTHON_DEPS}
694 - >=app-text/poppler-0.26.0:=[cairo]
695 - >=dev-cpp/glibmm-2.48
696 - >=dev-cpp/gtkmm-2.18.0:2.4
697 - >=dev-cpp/cairomm-1.9.8
698 - >=dev-libs/boehm-gc-7.1:=
699 - >=dev-libs/glib-2.28
700 - >=dev-libs/libsigc++-2.0.12
701 - >=dev-libs/libxml2-2.6.20
702 - >=dev-libs/libxslt-1.0.15
703 - dev-libs/popt
704 - dev-python/lxml[${PYTHON_USEDEP}]
705 - media-gfx/potrace
706 - media-gfx/scour[${PYTHON_USEDEP}]
707 - media-libs/fontconfig
708 - media-libs/freetype:2
709 - media-libs/libpng:0
710 - sci-libs/gsl:=
711 - x11-libs/libX11
712 - >=x11-libs/gtk+-2.10.7:2
713 - >=x11-libs/pango-1.24
714 - cdr? (
715 - media-libs/libcdr
716 - ${WPG_DEPS}
717 - )
718 - dbus? ( dev-libs/dbus-glib )
719 - exif? ( media-libs/libexif )
720 - gnome? ( >=gnome-base/gnome-vfs-2.0 )
721 - imagemagick? ( media-gfx/imagemagick:=[cxx] )
722 - jpeg? ( virtual/jpeg:0 )
723 - lcms? ( media-libs/lcms:2 )
724 - spell? (
725 - app-text/aspell
726 - app-text/gtkspell:2
727 - )
728 - visio? (
729 - media-libs/libvisio
730 - ${WPG_DEPS}
731 - )
732 - wpg? ( ${WPG_DEPS} )
733 -"
734 -
735 -# These only use executables provided by these packages
736 -# See share/extensions for more details. inkscape can tell you to
737 -# install these so we could of course just not depend on those and rely
738 -# on that.
739 -RDEPEND="${COMMON_DEPEND}
740 - dev-python/numpy[${PYTHON_USEDEP}]
741 - media-gfx/uniconvertor
742 - dia? ( app-office/dia )
743 - latex? (
744 - media-gfx/pstoedit[plotutils]
745 - app-text/dvipsk
746 - app-text/texlive-core
747 - )
748 - postscript? ( app-text/ghostscript-gpl )
749 -"
750 -
751 -DEPEND="${COMMON_DEPEND}
752 - >=dev-libs/boost-1.36
753 - >=dev-util/intltool-0.40
754 - >=sys-devel/gettext-0.17
755 - virtual/pkgconfig
756 -"
757 -
758 -PATCHES=(
759 - "${FILESDIR}/${PN}-0.92.1-automagic.patch"
760 - "${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
761 - "${FILESDIR}/${PN}-0.92.1-desktop.patch"
762 - "${FILESDIR}/${PN}-0.91_pre3-exif.patch"
763 - "${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
764 - "${FILESDIR}/${PN}-0.48.4-epython.patch"
765 -)
766 -
767 -S=${WORKDIR}/${MY_P}
768 -
769 -RESTRICT="test"
770 -
771 -pkg_pretend() {
772 - if use openmp; then
773 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
774 - fi
775 -}
776 -
777 -src_prepare() {
778 - default
779 -
780 - sed -i "s#@EPYTHON@#${EPYTHON}#" \
781 - src/extension/implementation/script.cpp || die
782 -
783 - eautoreconf
784 -
785 - # bug 421111
786 - python_fix_shebang share/extensions
787 -}
788 -
789 -src_configure() {
790 - # aliasing unsafe wrt #310393
791 - append-flags -fno-strict-aliasing
792 -
793 - econf \
794 - $(use_enable static-libs static) \
795 - $(use_enable nls) \
796 - $(use_enable openmp) \
797 - $(use_enable exif) \
798 - $(use_enable jpeg) \
799 - $(use_enable lcms) \
800 - --enable-poppler-cairo \
801 - $(use_enable wpg) \
802 - $(use_enable visio) \
803 - $(use_enable cdr) \
804 - $(use_enable dbus dbusapi) \
805 - $(use_enable imagemagick magick) \
806 - $(use_with gnome gnome-vfs) \
807 - $(use_with inkjar) \
808 - $(use_with spell gtkspell) \
809 - $(use_with spell aspell)
810 -}
811 -
812 -src_compile() {
813 - emake AR="$(tc-getAR)"
814 -}
815 -
816 -src_install() {
817 - default
818 -
819 - prune_libtool_files
820 - python_optimize "${ED}"/usr/share/${PN}/extensions
821 -}
822 -
823 -pkg_preinst() {
824 - gnome2_icon_savelist
825 -}
826 -
827 -pkg_postinst() {
828 - gnome2_icon_cache_update
829 - fdo-mime_desktop_database_update
830 -}
831 -
832 -pkg_postrm() {
833 - gnome2_icon_cache_update
834 - fdo-mime_desktop_database_update
835 -}