summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2014-12-14 20:09:01 +0000
committerTim Harder <radhermit@gentoo.org>2014-12-14 20:09:01 +0000
commitc529ea37503feb77d4deaf5e5b3ae139ae3d784e (patch)
treebde5c06f0a04a185337eadc635f13bd373016aa1 /media-gfx/inkscape
parentSwitch back to ${S} after sedding the ftdemos Makefile so that epatch_user wo... (diff)
downloadhistorical-c529ea37503feb77d4deaf5e5b3ae139ae3d784e.tar.gz
historical-c529ea37503feb77d4deaf5e5b3ae139ae3d784e.tar.bz2
historical-c529ea37503feb77d4deaf5e5b3ae139ae3d784e.zip
Version bump. Add cdr, dbus, imagemagick, openmp, static-libs, visio, and wpg use flags.
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3
Diffstat (limited to 'media-gfx/inkscape')
-rw-r--r--media-gfx/inkscape/ChangeLog12
-rw-r--r--media-gfx/inkscape/Manifest30
-rw-r--r--media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch95
-rw-r--r--media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch14
-rw-r--r--media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch20
-rw-r--r--media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch15
-rw-r--r--media-gfx/inkscape/inkscape-0.91_pre3.ebuild158
-rw-r--r--media-gfx/inkscape/metadata.xml11
8 files changed, 333 insertions, 22 deletions
diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index eb6628eb9e5c..182dcc7ff6b9 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for media-gfx/inkscape
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.215 2014/10/30 09:55:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.216 2014/12/14 20:08:56 radhermit Exp $
+
+*inkscape-0.91_pre3 (14 Dec 2014)
+
+ 14 Dec 2014; Tim Harder <radhermit@gentoo.org> +inkscape-0.91_pre3.ebuild,
+ +files/inkscape-0.91_pre3-automagic.patch,
+ +files/inkscape-0.91_pre3-cppflags.patch,
+ +files/inkscape-0.91_pre3-desktop.patch,
+ +files/inkscape-0.91_pre3-sk-man.patch, metadata.xml:
+ Version bump. Add cdr, dbus, imagemagick, openmp, static-libs, visio, and wpg
+ use flags.
30 Oct 2014; Agostino Sarubbo <ago@gentoo.org> inkscape-0.48.5.ebuild:
Stable for x86, wrt bug #523384
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index c0f38ecf56c9..7226a0b772c5 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -12,28 +12,28 @@ AUX inkscape-0.48.4-gc74-configure.patch 558 SHA256 1d378b0d90f2bde6469a040d61e3
AUX inkscape-0.48.4-gc74.patch 2131 SHA256 e9f308ea08b76af028184fd9e6a3228c7efa57b75697eb65bb0edbf7d6d12f4b SHA512 d4b3189b19c41dff5e835e3ca5454cec7f962cfd5c3bd4098f4346913029bb00d8d8f4b61e6fe056059b3f059c91c350b610cc4d85c830293b5d3ed31202a317 WHIRLPOOL 9ddf564290eb9e7f7b281233c6cac7f1b46fdf338d88a0af699dd48077f10289a482c21ede8f3ceac71cca080b20691dac449b53063805f3d7ababb6b87efdde
AUX inkscape-0.48.4-poppler26.patch 4481 SHA256 fc07d1133ce703b4fc94706e2fe2377a7e58c216781d699360f8b58fa2787748 SHA512 4ed27cdaa2e0c48875942cf609ecb0de256c4fdb17aa30babc996b9113097032d789e4db957e2edcc6aa600b5148c08597dddd57a651a41949e4ae58d27aa22f WHIRLPOOL f973d7b80b106131cc48409bc27489c9ddaa12b52678bb1338acc0d0687e9ed1d2098ddefe3dd631770fd47a41a332d9288e373a9af3e6953472e1269845890d
AUX inkscape-0.48.4-python2.patch 439 SHA256 28fdc6e28f6c7bf0dab4144c4ac2ddbf5c038494906361a4656a2ad76de45f81 SHA512 065444bec9d9511a5eec34e3646bc34dd05f1d64eb4405fc28c47e9d7dc1b702d706b2b8a05593445756d3288c712692d2256fdd46e2b8f0e091253a266d8171 WHIRLPOOL 0f4f2a0c7b961928f8e55e991ef0a08d0f4fcb871ce7df31a5840f9c24d886ceff3e1c2951a186090eacb53e604a757aec9ae2a329b7e76c825475b0aaf09be1
+AUX inkscape-0.91_pre3-automagic.patch 3295 SHA256 2d22669ca8bf93e4a739a617aa502216020c3fd90354d21515a91e4bede00bdc SHA512 a69f6d104391ffd3e37f69768d0dbc3bf1c26cb695f8e4e7eee3956647e5e30333275aed82da7b71b453c6d1f6636ad77e3df1fefb91aa799604e8d7f3c20e42 WHIRLPOOL 4e7a4400fd8f34ce7f07cb0172f64b16453d0a984deced07da2e397de816b0da2c5204f5c4468999f7adcb835b32ca77968ae0ab469fb66ba335718e76e8c7a6
+AUX inkscape-0.91_pre3-cppflags.patch 493 SHA256 49596723efb606990e2131ba637567a2749add6a55505bc6bb6156d3c96ac087 SHA512 12253f89d51b2ad7610381aeba637d844c5ee2579eebc75aaad1791c87ef455a6a9a8dd1db5fc9e1adf51a928e8efe06946efc73e3743e209f970a457b397c35 WHIRLPOOL 037907d21ddc1234376188cf3837e5fd2d671fc7f3ad7c254489525b17e5de9f93485cecbb8c451a2e86b8adb3c8fe34a4d518c083854007f527741860375cc8
+AUX inkscape-0.91_pre3-desktop.patch 693 SHA256 016adfaddb1c6c509318430fab9d74ee81f5ce9f71a85ccb4b06d6dc221fff03 SHA512 036ddbe38cb2bb229a864ed43445d1b9a2b3a1ade882edf8f24aa2df10c317f60c6be3849470729a1dabe81282864fcfa6e6283b0df5cf0fdbc2f31f0c3bdc46 WHIRLPOOL cf4c975d042490b364fa1705c3fc6cdcbc838674831217a94876dc0ebdbca2fbe197e137b59acce91b2adf2daaaeb023ff3fadb5c62a456cc30b3b699cf8e413
+AUX inkscape-0.91_pre3-sk-man.patch 362 SHA256 56e24d84d5217308df178d64214ec13c4b81ba59541cc6f52415f2207825a274 SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab WHIRLPOOL d92a002591b0c4c6dd898fd720827ef94d6f801fd025ad8bfd4eaddb262240fb9cbc84485087063485292a300a7411a21c1666de8a3f51178103720079f57eee
DIST inkscape-0.48.4-freetype251.patch 355 SHA256 dfbd16faa4f27559561e3bad79b7ecbb3ea7d4824223cbfe2e2c1c2f429ce663 SHA512 4b629974954a6228586a4ddff2a1107b170348d6aa2a5886bf8422c44826ea4b6e1eea2e4fb886a6153029b371a33f56d4a62ecbbcb3c705456cca893d1986b7 WHIRLPOOL 2e419a35993dca56d6b6def94d5f58aea4b56fc100aedf52fe8e2c79a8d93ea8fbbe097197e51b962f015564b2316ce1798771ad038cf1ae48759ea2de0c4751
DIST inkscape-0.48.4.tar.bz2 19712522 SHA256 8741ad8cbb5aa5cee4f234ebc45479cff2479b16d903870693174bdede8a519d SHA512 55954925e74e2c222e7ddb86bf75e9ad17c854d991258fd3a1bf1b2aafe7014418138246a51f9ab9c4444795b03419781517910debd3448ae461f1dd1b5848be WHIRLPOOL 927dafd74c81c41ff794b22ed80fb6b6e8fcb60fc5f5b6d21ce222812cf6e34bcea9d415ee1f663d2685f64c1f89c4f62d8475da143d2763c53406d7b50f4053
DIST inkscape-0.48.5.tar.bz2 19719332 SHA256 2b6ce684f9f2a0691ab454656424555cbda131db78e13973360684bc833ad969 SHA512 97f08d9d31e2ad84e15b9f37be3a3039aabb5b15061919e1500a01ecf56398abb3ab06a4fe557bd379dcf7acd95166637be2f4d3ef1a17c3cc76a79a7868b418 WHIRLPOOL 8147f8328212e8951f026db92b0c6d475e293aa8bff8964b90c1a3d1e85395fab400758954a2e73501b4974d644bd44c0e572aababaec809b3c73f777a13c284
+DIST inkscape-0.91pre3.tar.bz2 24817640 SHA256 2163e8e582bc072b84f2f178d1ac201aac41c22e51d3b48a129c0ff44eb50c55 SHA512 383363cf6d5add909ab6424a34a7b7ffefffc18d86c9015e706695b2933a223ffa5b8af7c0ad6fff99f9283fd069e9f5d57c0d4f759bcae380592e5c5b3a5445 WHIRLPOOL 30effd256174ad33ea99eb226008008b514305db090cfd27957ee4ca1f91f46c230f0b1fb3830ee29a5e629f390864da6348fe315f19361c5787ce288488bd05
EBUILD inkscape-0.48.4-r1.ebuild 3175 SHA256 680436bbf448686e992e58432059556d90a49c64bf6caf3f4f95c40c5458339b SHA512 36d466a59b90daee029e09c274a3bdbcb210549d0c117e9d7f8f411c2f37450b9a9b954bd8ff65cec98f5771d80d9a39f6d6afe536733a53f9b7dac26701fb31 WHIRLPOOL a5f0f551565d1dc18cc3a6e4a48ca5d9c5811639bcb2a3e72e348147d98419239570fcaabfd1e46ccd174a7a803c125a3a629f8f2c084b3617a848b0a6ff89f4
EBUILD inkscape-0.48.4.ebuild 2626 SHA256 b7b296bdf6f7d2cb4db4e37eca4a197de03d29d06432b6629ed3145df316185c SHA512 d92b0273f29bc7323b280eedbb2fab7acc50b3a60a215b42c08ca77901dcda1452a0d21d66fc0ea8134487279d5063c2d8cf76dcb28da265ac4c82cc79fd46e4 WHIRLPOOL 30c48e6d9d253832964863117bb6f78922e19e5ae5b81988f4c0a7ec4d5dffabd217b9744cb4d933626341af630bdd6cd185405e9bf8b7242de589944a168e31
EBUILD inkscape-0.48.5.ebuild 2883 SHA256 c9a20a6cda80c95ea71d535ba3d921fc8e66899a12f7416f2619671a07a9f9d2 SHA512 f0a16c33c717d205226a9c6e7c703be0b3335cc7a22ed3daeae55c087456940146763111ee850221d12e7cda0dc625107bf92855d39ce11d17411b6d56b388d6 WHIRLPOOL e21e149bfcd57ee8e163ec5abd564267a8da16487767fdfb5927227067c29663e223330470be712dad68cac1d7477f3a4b3da8a81aabe4cdad38599dc50f1024
-MISC ChangeLog 30283 SHA256 75ee04323ccc136b6f11ef2b5f6a026c5c5b57ffba08dc909ea1387ed4fc0a4c SHA512 c6db856cf4c9483584bb2c6bf5c763f0561593ebb34b35836b8c3ff5b09070a43252fac135f498f666a6d0f381979f220fe686fef25d7398b1f0a21c8caa9a37 WHIRLPOOL eb590c1bdb704e2c4f9cc1108bfca77edab65553f3ef52f7fc352605b99e3a7cc38fa82b848e42b33c0f1bc343afb33a4192d09ee324d3e0599fe1dfca2d1097
-MISC metadata.xml 354 SHA256 705fec37c8550d17c1ef9260c24a45843351908700c9fe3eb1d652e4a601e007 SHA512 e8798a3aa2a76aed27f2b7124792d7b4972300146b7cfec3e8e86c42196e8746f63a45a64c12161d1c2b2f4bd211d43eedbb29738277cd319d899dd156089bd3 WHIRLPOOL c1d998bc9e5fdadaaf70bd0f8cf2e7b41a0495f73a1d6ff0c55d1c006b11d263a2fa1c405cf5eacd0a490e6300578a126303ce47dcbc844a362b7e07ee506608
+EBUILD inkscape-0.91_pre3.ebuild 3589 SHA256 98724a05715e9b6f4a3ec83d563f180937c03b74c45862bfedba19965e7fc008 SHA512 6570ddd6c708e499f7af40eb534c5e554a7c837a84bea26ad0af31339d55828880bb1a10766be61ed8b5615530474ce86ba2ca2b2c7834c00c34c4684f8be6f5 WHIRLPOOL e4a773175f2175baed95f015c64632b3cf30598db3dba275178c221aeb9566dc09a60b74ac5875a18196d884c88619289c45f7337da5582a4092e510cac0a31a
+MISC ChangeLog 30683 SHA256 47a4eb20c196fae46ffcb267a7d717e5c4e13e4f91ebf80aaef5ec799203e9cf SHA512 5d065756874b6732ae2199a849230926d809629ef30804e9d0f1c71b48371983f47bb1adf8e0b6165311551f970ebe57ed9266486d9efa311bc7365714fc5a2c WHIRLPOOL df01b5710d00cfb37ef7dc4d0764fb3f59f6ce52f7928884af44030f420eb3f8f7ff2a85db8d7b728faf1b06ab79750c052d2fea99e736d97ac5a0eadc8955e4
+MISC metadata.xml 541 SHA256 e05476ddcf29ff191f4f3e1b3de798976f8449baa54146610659fccd6203e6e7 SHA512 9004b3ad1510e745b6e42d3882df67df27f78b390aeec549b8e70f37ffbd95ab48d2fd33e27907f85270e66d4bab95f782b43ff3755c1281de9618ded8ff5eee WHIRLPOOL 568daff24271038f5ea5ffc58930dc55d876dfc0815c508d1f644147247ac608ed13ea6e722c439386d94ecdb639b5999dabf6d316f5c4403897e77df035f53a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJUUgsKAAoJELp701BxlEWf50YP/iwrqsE2Qiy75XEGUHBq8fnJ
-cewkAnbWUTiv/0vD1aIt6XHJcJQEJNfANoh6mdSg2KHaGvNCr992sULTUnFpBX8w
-iZoQdmoxQjOE1Q7UQ9uG+NEoSqpl3ja21PdC6wVv1u2nJKlMjZlW2/2bYo6ccGpO
-a3b0xVSMcmnZ8zKOUyRmEoXyZikqlr/93uD6vqWzoCngDmUgZlP1tV/twhezzGPE
-RkuAK+zl7hnNHjy9tZBsrYXrip8RAJBC7j2jHVuNPOkB0PJqvL2dI0baLY4iuZuM
-37s6IpORthO1Hs2vQ3OiepdS8e4M1lQfXYvV8sIXG7m022S28oSCjZCHlWiAPO6G
-6MHAd9zMO/6Ol57C4/9i0uVoTDpRgSysZH7DDd+gB2wEqrdbhdXZQUcmjAlrjDZq
-eSQbCVVEHINaAugkuUTCypQpMJkAVtBzSajxJbYXq9T8DO4/jLuv3UfXcl7eo4IM
-xh7OjiTCQhdBzCurpXVI3zjQDS0pf9+HCsY9/uK1FwkBMtKPuHGwvv/uPlCOmLWu
-Qe7AV75YiCLl8VBdQfRnvsWUvGbplzJs2dKuoKOeMQ6Xz1dT1EyqzmK33dj48pa2
-e+PzgJO6oRRqpjoRy3qVHT1ZNW4LamaxjGeS0dQWP0w71o6Kh5++yruyMGAh+Z20
-jfxBct6V01Ywlv0YQDAQ
-=JAGP
+iQEcBAEBCAAGBQJUje5mAAoJEEqz6FtPBkyjGIEIALKWjWIjBfV7z6tbzoxPiUAh
+QgchJhq5GR51soT7yNEFnJZ4jlYM8FPyPXp1wmPVNhwyJYJqrmCRI2j65t6d1Jpi
+JMMatBz+cpuHmHhMZNjciPAiLBF8dySO8e1UvDezftg9s5pZplGCu3F8Kk/ZF1pV
+B5jmub6AVALb9P+QzRalyFvdSGmqgguxm4mTdnDIAY6FD8KrQ462KQXHs3lL4S8Z
+JWKllyTcfrgZcHNLVN8UFKeC+/Yy12bzfaQgKYwAMJm6eyDYkG8+X6PAyHsHbghn
++vfiZc2i4L53qVcNaFGh6nvYHabbwouvjNewpqvV7q59nkNTHTQW72hRkkBGi74=
+=yGPt
-----END PGP SIGNATURE-----
diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch
new file mode 100644
index 000000000000..e108125355ec
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch
@@ -0,0 +1,95 @@
+Add configure options for aspell, gtkspell, and imagemagick.
+
+--- inkscape-0.91pre3/configure.ac
++++ inkscape-0.91pre3/configure.ac
+@@ -675,9 +675,16 @@
+ dnl Check for ImageMagick Magick++
+ dnl ******************************
+
+-PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no)
+-if test "x$magick_ok" = "xyes"; then
+- AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
++AC_ARG_ENABLE(magick,
++ AS_HELP_STRING([--enable-magick], [compile with Image Magick++ support for bitmap effects]),
++ enable_magick=$enableval,enable_magick=no)
++
++magick_ok="no"
++if test "x$enable_magick" = "xyes"; then
++ PKG_CHECK_MODULES(IMAGEMAGICK, ImageMagick++, magick_ok=yes, magick_ok=no)
++ if test "x$magick_ok" = "xyes"; then
++ AC_DEFINE(WITH_IMAGE_MAGICK,1,[Image Magick++ support for bitmap effects])
++ fi
+ fi
+ AM_CONDITIONAL(USE_IMAGE_MAGICK, test "x$magick_ok" = "xyes")
+
+@@ -712,6 +719,10 @@
+ AC_DEFINE(WITH_GLIBMM_2_32,1,[Build with Glibmm 2.32 or higher])
+ fi
+
++
++AC_ARG_WITH([gtkspell],
++ AS_HELP_STRING([--without-gtkspell], [disable gtk spelling widget]),[with_gtkspell=$withval], [with_gtkspell=yes])
++
+ dnl *********************************
+ dnl Allow experimental GTK+3 build
+ dnl *********************************
+@@ -723,11 +734,13 @@
+ if test "x$enable_gtk3" = "xyes"; then
+
+ ink_spell_pkg=
+- if pkg-config --exists gtkspell-3.0; then
+- ink_spell_pkg=gtkspell-3.0
+- AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
++ if test "x$with_gtkspell" = "xyes"; then
++ if pkg-config --exists gtkspell-3.0; then
++ ink_spell_pkg=gtkspell-3.0
++ AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
++ fi
+ fi
+-
++
+ PKG_CHECK_MODULES(GTK,
+ gtkmm-3.0 >= 3.2
+ gdkmm-3.0 >= 3.2
+@@ -800,11 +813,13 @@
+ else
+
+ 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
+-
++
+ PKG_CHECK_MODULES(GTK,
+ gtk+-2.0 >= 2.24
+ $ink_spell_pkg
+@@ -928,12 +943,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.91_pre3-cppflags.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch
new file mode 100644
index 000000000000..94dbf881de0c
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.91_pre3-cppflags.patch
@@ -0,0 +1,14 @@
+Gentoo enables _FORTIFY_SOURCE by default so this avoids redefined warnings.
+
+--- inkscape-0.91pre3/configure.ac
++++ inkscape-0.91pre3/configure.ac
+@@ -72,9 +72,6 @@
+ ####
+ # Generic cpp flags...
+
+- # What is just plain "-W" ?
+- # Fortify source requires -O2 or higher, which is handled with newer autoconf
+- CPPFLAGS="-W -D_FORTIFY_SOURCE=2 $CPPFLAGS"
+ # Enable format and format security warnings
+ CPPFLAGS="-Wformat -Wformat-security $CPPFLAGS"
+ # Enable all default warnings
diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch
new file mode 100644
index 000000000000..f02fa1a8aca5
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch
@@ -0,0 +1,20 @@
+--- inkscape-0.91pre3/inkscape.desktop.in
++++ inkscape-0.91pre3/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
+@@ -14,7 +14,7 @@
+ Icon=inkscape
+ X-Ayatana-Desktop-Shortcuts=Drawing
+
+-[Drawing Shortcut Group]
++[X-Drawing Shortcut Group]
+ _Name=New Drawing
+ Exec=inkscape
+ TargetEnvironment=Unity
diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch
new file mode 100644
index 000000000000..f14e7d152e19
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-0.91_pre3-sk-man.patch
@@ -0,0 +1,15 @@
+Install sk man page to the right directory.
+
+https://bugs.gentoo.org/show_bug.cgi?id=481276
+
+--- inkscape-0.91pre3/Makefile.am
++++ inkscape-0.91pre3/Makefile.am
+@@ -561,7 +561,7 @@
+ manja_DATA = inkscape.ja.1
+ manjadir = $(mandir)/ja/man1
+
+-mansk_DATA = inkscape.ja.1
++mansk_DATA = inkscape.sk.1
+ manskdir = $(mandir)/sk/man1
+
+ manzhtw_DATA = inkscape.zh_TW.1
diff --git a/media-gfx/inkscape/inkscape-0.91_pre3.ebuild b/media-gfx/inkscape/inkscape-0.91_pre3.ebuild
new file mode 100644
index 000000000000..bbe3d2e05ae3
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.91_pre3.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.91_pre3.ebuild,v 1.1 2014/12/14 20:08:56 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2-utils fdo-mime 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="cdr dia dbus gnome imagemagick openmp postscript inkjar lcms nls spell static-libs visio wpg"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+WPG_DEPS="
+ || (
+ ( app-text/libwpg:0.3 dev-libs/librevenge )
+ ( app-text/libwpd:0.9 app-text/libwpg:0.2 )
+ )
+"
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ >=app-text/poppler-0.26.0:=[cairo]
+ >=dev-cpp/glibmm-2.28
+ >=dev-cpp/gtkmm-2.18.0:2.4
+ >=dev-cpp/cairomm-1.9.8
+ >=dev-cpp/glibmm-2.32
+ >=dev-libs/boehm-gc-6.4
+ >=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-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/libexif
+ media-libs/libpng:0
+ sci-libs/gsl
+ x11-libs/libX11
+ >=x11-libs/gtk+-2.10.7:2
+ >=x11-libs/pango-1.24
+ cdr? (
+ media-libs/libcdr
+ ${WPG_DEPS}
+ )
+ dbus? ( dev-libs/dbus-glib )
+ gnome? ( >=gnome-base/gnome-vfs-2.0 )
+ imagemagick? ( media-gfx/imagemagick:=[cxx] )
+ lcms? ( media-libs/lcms:2 )
+ spell? (
+ app-text/aspell
+ app-text/gtkspell:2
+ )
+ visio? (
+ media-libs/libvisio
+ ${WPG_DEPS}
+ )
+ wpg? ( ${WPG_DEPS} )
+"
+
+# 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 )
+"
+
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.36
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+
+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() {
+ epatch \
+ "${FILESDIR}"/${P}-automagic.patch \
+ "${FILESDIR}"/${P}-cppflags.patch \
+ "${FILESDIR}"/${P}-desktop.patch \
+ "${FILESDIR}"/${P}-sk-man.patch \
+ "${FILESDIR}"/${PN}-0.48.4-epython.patch
+
+ 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
+
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable nls) \
+ $(use_enable openmp) \
+ $(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)
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+
+ prune_libtool_files
+ python_optimize "${ED}"/usr/share/${PN}/extensions
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index 5e939ec0f02e..a282574c953c 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -3,11 +3,10 @@
<pkgmetadata>
<herd>graphics</herd>
<use>
- <flag name='dia'>
- pull in <pkg>app-office/dia</pkg> for dia import extension
- </flag>
- <flag name='inkjar'>
- enables support for OpenOffice.org SVG jar files
- </flag>
+ <flag name='cdr'>Enable support for CorelDRAW Diagrams</flag>
+ <flag name='dia'>pull in <pkg>app-office/dia</pkg> for dia import extension</flag>
+ <flag name='inkjar'>Enable support for OpenOffice.org SVG jar files</flag>
+ <flag name='visio'>Enable support for Microsoft Visio Diagrams</flag>
+ <flag name='wpg'>Enable support for WordPerfect Graphics</flag>
</use>
</pkgmetadata>