gentoo resync : 26.11.2017

5 files changed, 221 insertions, 36 deletions

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index ce237eb444e3..8ffd56c343c0 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,17 +1,18 @@
-AUX inkscape-0.48.4-epython.patch 441 SHA256 279c1dd278bf69c69f4ac2351d8d069f08aa444e45c32ccd564f6962304f3cdb SHA512 49253f2cc984b70cb09e90393fda8690efb47b511883ec6e8fcd9942442dadbb2085f5b6eb529b8cf4cb7cd1f4b8e39b88bf68a867d7f0724382d3da89eddc67 WHIRLPOOL 768acee72f3747fdb23a5bdf0665364a316c8b6d9abaa582a7d897153b38f271db25bc1a9c2d4893a45021f1098565dbedba77360add0d50404f2320cb134d87
-AUX inkscape-0.91-fix-gtkmm-2.48.patch 2302 SHA256 e1d8210e3d7ee684ffcaaabe72790cf884af6e44ea3a2f153882e168afcb3ffa SHA512 fcb986d33d1481d9cc9343c833b3cbdd5cc1d25fe71692e078b0ca4b2d934cf776e668500ca65f0b6179e1499281763ba5bfbd0f31db93c0fdf40dee21125215 WHIRLPOOL 3208277a57517ad90799b482a581fd0f5329a522f03f15662488ee405d04246d4a305f7bc7bd49a1bfde5cf45e0ca4bf6849044a2f027ba97ff28da5040454a5
-AUX inkscape-0.91_pre3-automagic.patch 5281 SHA256 100b94eee2a9f5ffacafe0732735342cb14b873296de1e982e7db24ced31124e SHA512 badd58f08d1e3b4e84e8b18de23e08a1ad44b24367e05092629e7793b4c5f54653b3c47ec9189f1297d071cb3ac9cb098ca65aa16f79e5c3e0bb3a97ee5cc9a2 WHIRLPOOL 21ea0226ae352d6225e2065b74e3763b9feb71feb8c9bb072f46a5e7496eae619c42ac62cd560017f0cfb426993f7da5d157c3fc1562a397c90228c20a9d51ad
-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-exif.patch 321 SHA256 ad4295f73e386ebe89c6f86d456853ceba0b7af24a584b51348b788280145ef0 SHA512 c35b97cceba4e9470bd04d3f01f1eb8469c817b848c604540e61830321281b642856b6e38446cb9762c1501c16606ace2776344df20fd80a6952e6cd2e6e9ff2 WHIRLPOOL 2234659df87bfd28099850828a39ba9619431de92d4154d766e96a2cac8d5acc5b56c49959ce4cf7f54e5e119e8d69495c14d79e4bc9cf3fd6fb0d35806d99c5
-AUX inkscape-0.91_pre3-sk-man.patch 362 SHA256 56e24d84d5217308df178d64214ec13c4b81ba59541cc6f52415f2207825a274 SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab WHIRLPOOL d92a002591b0c4c6dd898fd720827ef94d6f801fd025ad8bfd4eaddb262240fb9cbc84485087063485292a300a7411a21c1666de8a3f51178103720079f57eee
-AUX inkscape-0.92.1-automagic.patch 5421 SHA256 6e78f7c83c4112142dbd1e0acd1eb9f0f8f961e4e2993e3c4046f3bd2feb7ef8 SHA512 c6bc791c8e0a4302f2b21c1ad4d39e8e880017f4cdcf8b23d7749498a0f0a1d2460abeab3216e9eeb6b87a300e17451ace86c738c58a174e92946cb280ef43b9 WHIRLPOOL df3f024943af84bbd26f7446746f013cffb8e123e9cb21c1921a728d87f84a350decd6d8e19252406faa1cedcc618d63b4819aaf964b441cc624548fb6e08e52
-AUX inkscape-0.92.1-desktop.patch 919 SHA256 d86658e1579d1d6730f9b332cbc2c26ba2723aa36ca3418f1b9b422592d19fe8 SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2 WHIRLPOOL d4b8e3591a2b553e10cdbc2a30df5c05e1d3f083d2f417956492a917b712a827eca4826f07f3c23dee1764b8711756e58b9639a6fcc0a8d91201a11e7491ce89
-DIST inkscape-0.91.tar.bz2 25858909 SHA256 4d901f8a9e1924404e797ad23b8b0c495a9d155448816d95a55974314e1f141b SHA512 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7 WHIRLPOOL ff538bd47dbea3bc461f24b09f2d26e3b6141053e8289bac1ac973b65b6957257c5aede30e782201c2813919643bf23989c7ce6a8492fa259b3d506e427e4126
+AUX inkscape-0.48.4-epython.patch 441 BLAKE2B 3c30f6a15002b8b046d01220a7528078d877fdb5632dae6f07d65ca257d5021e4ad29ffb1caa8584473f5634f8487189015b0667a696b40ec4eb848cfb282e1e SHA512 49253f2cc984b70cb09e90393fda8690efb47b511883ec6e8fcd9942442dadbb2085f5b6eb529b8cf4cb7cd1f4b8e39b88bf68a867d7f0724382d3da89eddc67
+AUX inkscape-0.91-fix-gtkmm-2.48.patch 2302 BLAKE2B b6409791bcdde3c85287afd7c3cd33fb561e76b41e99b2a7b508ebf5519b0ffb36246118cc61bac052abe280db2d7f8973a8f86b5b83dfc420ed61d1ed002f4f SHA512 fcb986d33d1481d9cc9343c833b3cbdd5cc1d25fe71692e078b0ca4b2d934cf776e668500ca65f0b6179e1499281763ba5bfbd0f31db93c0fdf40dee21125215
+AUX inkscape-0.91_pre3-automagic.patch 5281 BLAKE2B 315082e6f0fb0c58e7fa304d742da6a5061709085487c2c72d24c1f69ccdb402d352b23c073d1ed8c2b6d4479d97d544a7504e5cae76c886d6e584b89f323d3a SHA512 badd58f08d1e3b4e84e8b18de23e08a1ad44b24367e05092629e7793b4c5f54653b3c47ec9189f1297d071cb3ac9cb098ca65aa16f79e5c3e0bb3a97ee5cc9a2
+AUX inkscape-0.91_pre3-cppflags.patch 493 BLAKE2B 6690a5d9eea503c4fccaaca8df67cd64e854a72b2941f51f8f82addca6120692a79e862d8a222b72cb97f0d14ef28f5a3dc19215119e0ab43ec4a472661010f4 SHA512 12253f89d51b2ad7610381aeba637d844c5ee2579eebc75aaad1791c87ef455a6a9a8dd1db5fc9e1adf51a928e8efe06946efc73e3743e209f970a457b397c35
+AUX inkscape-0.91_pre3-desktop.patch 693 BLAKE2B 048ec5bd6069ce1cb157e88a84d654ff0fa0b31a770cd0fe72a4e0ed9dc4a81ad251bd7e8b462fa510e826808e29acad0737f432b55d28a545d99aa8b6e592d9 SHA512 036ddbe38cb2bb229a864ed43445d1b9a2b3a1ade882edf8f24aa2df10c317f60c6be3849470729a1dabe81282864fcfa6e6283b0df5cf0fdbc2f31f0c3bdc46
+AUX inkscape-0.91_pre3-exif.patch 321 BLAKE2B 36f9d7ce19c1716b56800431ac095f047c5392974d64cf8c9374266b89b8fc75197185bb8a48ce8b3a19cd7daf3ac24e26220fdf72b976bcf9f73816ecf61b07 SHA512 c35b97cceba4e9470bd04d3f01f1eb8469c817b848c604540e61830321281b642856b6e38446cb9762c1501c16606ace2776344df20fd80a6952e6cd2e6e9ff2
+AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4e5fe2f2db88c5d7e663e477736a56f226183caa90ca2b421f064ce42e5e7b4e81419026681987aa85040f4379c74511d SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab
+AUX inkscape-0.92.1-automagic.patch 5421 BLAKE2B 0885e9f785b7884e10659c1f8aace9a843113b5d1c059251c75297ef828eb7c704815798c861e03060c89c02e36cb45edf566065234d330c1757e8f2bcc89688 SHA512 c6bc791c8e0a4302f2b21c1ad4d39e8e880017f4cdcf8b23d7749498a0f0a1d2460abeab3216e9eeb6b87a300e17451ace86c738c58a174e92946cb280ef43b9
+AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2
+DIST inkscape-0.91.tar.bz2 25858909 BLAKE2B 9ca69a10a043efa64d7327ca6ba28d04a650d980ef455106d40ae17555d4792a532df493dab23dad2d3c7cdcc68f59391228bae76ebd30f03cf66cbb4fd0ae65 SHA512 3778ef7d4a1c759a7afc093e55eefb69a78dcb60332655cc8ab8c481f54a3e6550df6070178390eb08588245531906b8bef33301f0765a4d28d6c7506fcf3bc7
+DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
 DIST inkscape-0.92.1.tar.bz2 31222684 SHA256 257405bf802de125f17d123638093a37db02ebe334d243cf9b0d8903f7c89005 SHA512 f8f3bfb812a214216c3ffac7064a4619f847cf9810417c782481dba12e6c6a44123c8b8a9289fbf5287f2e6b6df39a641d94a000d842faee5ff808eec86187a0 WHIRLPOOL f8134aed9ddb174fda88e13c201cf9099604e9591228ec306feeabaeee859f657961370ba4d1420f51e5e520f3543d7d129577144d9221e52f638a9f0bf81493
-EBUILD inkscape-0.91-r3.ebuild 3969 SHA256 3d056feb2e3ac701e1df7de7836f0766d30c56447169059e8d99add791387c95 SHA512 d89f30c679ce18adcf6115b7643ff34f144d7bfc71249804042c1ef292225f9bd5aa6c03708eb3401ad4ae3ad8c466008695d23791cd01bebe72de065c1cee2d WHIRLPOOL 0f001e6bedb57d469b0dbb7a07062b5c2c86eea649644e8c419f340938afa801a3171916a05b7b6b0e36ecba9959c9392fc5f1b28cb34ea9bf7563f6c8faae28
-EBUILD inkscape-0.92.1-r1.ebuild 3748 SHA256 6fc21153ce792cafddbdc348109f4af26041f1d8f900a584e8a08297b627bafe SHA512 b5b1ade6467ea28df30cc5f3a900c62703c6de6f702e2668008e98af22be79abc09675ab7a46cd095cf66a7377d2670be8a42e6834b827a88186648e545d4fa9 WHIRLPOOL 3d82b915dab8648ab20f697928c3d4692ac6ead463e2cb8093454a4194823f6f13f9ebab9ab785aa319069cf1ec77fff1fd64a3d52ea4917c53066285f96ec13
-EBUILD inkscape-0.92.1.ebuild 3746 SHA256 03e8b8d78546298a4ca523de755bed03377fb27b2fcd13e42bfb304da45a8926 SHA512 3febfb0363cf5370890302d7b7cd94af50ece5f89edec1541b549b0c4fb75799826f01c858734cd35e148725eed8c881282b639223a8e2c18ee11a37f7bf7c10 WHIRLPOOL 7f3d5af5ab93069de9f7b88b0b651c1454fd3c61bfc6f9813939d9c26875fc0f79398afc21de42191b75f27eed702584939d1b274224d1e8de0c6af4ca494d39
-MISC ChangeLog 5566 SHA256 36b4ba9a002d3ca8e19dc6264d57a2f5180a7be9447188426ce7d99d8b6561fe SHA512 60ae15caf06a68e7ccfc850f5531ae0d8c1235d50480a2f3651c71c8383a6b882f506882a038b9ad7051a4c47d6ff27a07d8ea7b7778ab6e10ffd2eaeb6c7773 WHIRLPOOL 8c3756628d9f582a5e199178f21946ded1c5621c3fa312dfdc643113b03f156cb93e6b7cffbebf75e5f437d2e7ec795f0418c06ab00ac4327bbdf270668c508f
-MISC ChangeLog-2015 33070 SHA256 0b3855102ff38bd7fcd17330dbdef8dc2ba7bbaba17d6d5a6d4982aa1e816f77 SHA512 8fd8f84e2f94fddcc87e8226fab56e5a7e84a703482ee513e14208ef5084eded321c70b992d0687b62674a7e648c454ebb528fd03e98fa1e1b80ac0e5995d1a3 WHIRLPOOL fb3232d6cd9c1d90f353990f988d5b45410b73895683b6958c820a9b4cb7bee1ab9ba108c3cfc9ce79e6d3f3bc299008a303e33dccf9c5257e2bb65436d2ed9b
-MISC metadata.xml 812 SHA256 e71ef237c62542fe3e7c624141ca294b59436e358763ae68f76b052dbf3a0450 SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b WHIRLPOOL 40dd86012e03c8c60ac93a88b5d223dcba80efce8d635c9f0707074371e0367111defb3900806597beedfd4f4137d3f01b968926e3f35a86f119160a175ddc73
+DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
+EBUILD inkscape-0.91-r3.ebuild 3974 BLAKE2B 8e146e8913b76879fc247cbbf004acb0205956ca364b19480226e5cac931cc86cb64d8fc766f5efde23076f4553aaea1127dcfdc10dc533096463e2bf2f72def SHA512 24c5607b5e6d7a0867680672bfd4a9577837b1ab6a25b4bb74e4c9ef457aa74556d4dc75bf358b9a38de87213ef8b36fffe540e99117637161c3b30a971a43b1
+EBUILD inkscape-0.91-r4.ebuild 4049 BLAKE2B d9d0c010bd57f3cbc34dea97b807147a488ac0c6b4afc554a492978a050b9ba0ac1b480b6efefbbdd5c998f966e934236e4c2158a1cfe72d66a91da0dbb11ad2 SHA512 c61b6ee024e1b046e0bdc1e5cfbd9e14e3de02d68e5b699b96884953c00492339ff633e68d4bedcbaa996b989289d38fa8ccd14aa56aa5196382c70610800839
+EBUILD inkscape-0.92.1-r1.ebuild 3753 BLAKE2B 9c6256ddf4426e740e2d122a4735a1ae143a9e4cf859901833d887bf2d8f23636f70554207d9fde96dfcb7fefd9ce6cd869b0a2d1eab1848b608206f0f8fa9ed SHA512 c06351cd4c9f700c387ce115de36410b69f0e1edcf4d7e31cf9c7d6cf26eb79317cec03c801500d372a106f514a0aac091d256ec21b8d429aa1d408bfb2e6eb3
+EBUILD inkscape-0.92.2.ebuild 3877 BLAKE2B 7b24be371cae8563c61c7e76d5cc87471abba8fc0e0c06c5d85942893bfc8b18e560823f18062529af502aacdb866fbcfbe9c3c42a987e368fc3627aaca69701 SHA512 3195572277b3df808e698eda791eca420ff4ea9d43fadb616cb0ab2344271785b7a40d22afb56497632cea578f4d534b2873b6757caee638df2e8765a691a44e
+MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index 7bf584961456..ad850ff0c14a 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=dev-cpp/glibmm-2.48
 	>=dev-cpp/gtkmm-2.18.0:2.4
 	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-6.4
+	>=dev-libs/boehm-gc-7.1
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20
@@ -79,7 +79,7 @@ RDEPEND="${COMMON_DEPEND}
 	latex? (
 		media-gfx/pstoedit[plotutils]
 		app-text/dvipsk
-		app-text/texlive
+		app-text/texlive-core
 	)
 	postscript? ( app-text/ghostscript-gpl )
 "
diff --git a/media-gfx/inkscape/inkscape-0.91-r4.ebuild b/media-gfx/inkscape/inkscape-0.91-r4.ebuild
new file mode 100644
index 000000000000..fa43b4e54d92
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.91-r4.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="A 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 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+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.48
+	>=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? (
+		media-libs/libcdr
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+	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? (
+		media-libs/libvisio
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+	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/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.91_pre3-automagic.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-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.91-fix-gtkmm-2.48.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
+	# enable c++11 as needed for sigc++-2.6, #566318
+	# remove it when upstream solves the issue
+	# https://bugs.launchpad.net/inkscape/+bug/1488079
+	append-cxxflags -std=c++11
+
+	econf \
+		$(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)
+}
+
+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
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
index 09084673b9c3..24b21bd2bb48 100644
--- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=dev-cpp/glibmm-2.48
 	>=dev-cpp/gtkmm-2.18.0:2.4
 	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-6.4
+	>=dev-libs/boehm-gc-7.1
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20
@@ -81,7 +81,7 @@ RDEPEND="${COMMON_DEPEND}
 	latex? (
 		media-gfx/pstoedit[plotutils]
 		app-text/dvipsk
-		app-text/texlive
+		app-text/texlive-core
 	)
 	postscript? ( app-text/ghostscript-gpl )
 "
diff --git a/media-gfx/inkscape/inkscape-0.92.1.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
index efd58af66c68..6f8363666e05 100644
--- a/media-gfx/inkscape/inkscape-0.92.1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -5,41 +5,38 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
-inherit autotools eutils flag-o-matic gnome2-utils fdo-mime toolchain-funcs python-single-r1
+inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
 
 MY_P=${P/_/}
 
 DESCRIPTION="A SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2
+https://dev.gentoo.org/~jstein/dist/inkscape-0.92.1-poppler.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+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}"
 
-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.48
 	>=dev-cpp/gtkmm-2.18.0:2.4
 	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-6.4
+	>=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
@@ -49,7 +46,8 @@ COMMON_DEPEND="
 	>=x11-libs/pango-1.24
 	cdr? (
 		media-libs/libcdr
-		${WPG_DEPS}
+		app-text/libwpg:0.3
+		dev-libs/librevenge
 	)
 	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
@@ -63,9 +61,13 @@ COMMON_DEPEND="
 	)
 	visio? (
 		media-libs/libvisio
-		${WPG_DEPS}
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
 	)
-	wpg? ( ${WPG_DEPS} )
 "
 
 # These only use executables provided by these packages
@@ -79,7 +81,7 @@ RDEPEND="${COMMON_DEPEND}
 	latex? (
 		media-gfx/pstoedit[plotutils]
 		app-text/dvipsk
-		app-text/texlive
+		app-text/texlive-core
 	)
 	postscript? ( app-text/ghostscript-gpl )
 "
@@ -98,6 +100,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
 	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
 	"${FILESDIR}/${PN}-0.48.4-epython.patch"
+	"${DISTDIR}/${PN}-0.92.1-poppler.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -162,10 +165,12 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
 }