gentoo resync : 31.03.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-03-31 10:55:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-03-31 10:55:17 +0100
commit: 75fc75ae1f0481ffdb78450e801a9b443ba641bd (patch)
tree: cef96ea0860ae39a202bbf1e226100335209627d /media-gfx
parent: 1173ad5704ce725916e0c332416aff326d850d06 (diff)
27 files changed, 66 insertions, 888 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index beeda51ab673..7409fc15cb4c 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 4b3c9d4a05dd..2b50e7bd33f5 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -9,6 +9,6 @@ AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af
 DIST blender-2.72b.tar.gz 52018242 BLAKE2B fa0b8ab3feaeb35e76d833415984eb21d7b6dca47b9e5fb337cdfbdc9924165d3345caa5608ee2849bf71855c917a6fa56d79d4f375b57ff367047ef92e8e0b9 SHA512 9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124
 DIST blender-2.79.tar.gz 50145270 BLAKE2B 5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338 SHA512 9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f
 EBUILD blender-2.72b-r4.ebuild 8115 BLAKE2B c864b87e4003dcf523876a57ba238951e3e31282346de9a132caf68a224abb2b2a076d86676e1e7c100ce7cec6c4a774431a190e0b33cce5389c52b1cc9d2da6 SHA512 5ec076d2e03a8cf459c04d6f03257a3bce47dc41e0007242bb9d70a64683f2787934eaf041ee7ac93e387a6d40cf1371f1d63f60e2e2a5ee2aeb59127d321364
-EBUILD blender-2.79-r1.ebuild 8113 BLAKE2B 224d9b443d4799ed3a87f3bcd498ba0396c15ccc3925cef478beb29cd3feada35e913f2bdb7eba58625d25b213cca9512f99526750d00e75e2bd5be0257bcf88 SHA512 9a70cda8d9a226acc1eeb343d7dd14acbdc5527ea832ea3f3e6b4d987e3c4675342078de2adfb6d8c7e247a956ba4aa33c70c2768379267935dff52fbe570192
+EBUILD blender-2.79-r1.ebuild 8112 BLAKE2B ea780dff719b0eb541e91614abf926a5d6a14815f78d0f18025f2a25680d5757bccfb2721ebdb71cdd7ae0274620030a9a135a9f3591465a8a126ea169968e39 SHA512 d1bc5fbbb3e157245e9a2446513738692cf64c8a457b99c08ec6d7b79eca9c36473d1c3048dde1d1a60f92a3a9099066491e773acf0fbe488ef3edf9cb7660a5
 EBUILD blender-2.79.ebuild 8061 BLAKE2B b272ffbd61642c168c1b248983a819928eea34fcb4f34c196ce75d92aa65dafe2f1f0cf5f1c823ce9cfa001c5e1758f9752f2a2dbd1081e002cfd1389adbef6d SHA512 5966a1b28386891fb9f2aafa0731fbcf0a69bc9c7ff2cb0ce631c3af3888d88364dd18d31d9a4c4b2e28b64727c3a37b9eaf0f0587f362e9fd27ad83ddfad0dc
 MISC metadata.xml 3716 BLAKE2B 2c04c8b2724d9153efc0bdf8772b4a107e072a009032d390977f53972fb4afe27eada91da3991f680f41d8114d22a75e84c4f359e00ef2b378e53d7b507a45de SHA512 77866e595fba02c31ac64d9a124af03a6fe9080b27434ea2f93e615c6e702d1a393103d96c361079b1b5af861f0775cc0e57888d23e528e32c326dca7af4c09d
diff --git a/media-gfx/blender/blender-2.79-r1.ebuild b/media-gfx/blender/blender-2.79-r1.ebuild
index b7db3139bdae..588dd53d6067 100644
--- a/media-gfx/blender/blender-2.79-r1.ebuild
+++ b/media-gfx/blender/blender-2.79-r1.ebuild
@@ -18,7 +18,7 @@ MY_PV="$(get_version_component_range 1-2)"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+bullet +dds +elbeem +game-engine +openexr collada colorio \
 	cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
 	llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 0ccaf72e9730..0d36b40975ba 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -6,7 +6,6 @@ AUX digikam-5.7.0-mariadb-10.2-2.patch 3714 BLAKE2B b08c0544def660bfef87c68204bf
 AUX digikam-5.7.0-qt-5.9.3.patch 1137 BLAKE2B bf369d28083de46d11444eea8ddd35ccc1aa8d052bcd48d8da04a14737d404238717cc70eec7681931f46a455f2e1b441fd1851d3df12d19d8f5653fcc9b2847 SHA512 bfd453d6f4212dfd3e2402d0bba73f9498c04264a7199119fe117a9af834aa95bd12ac8cb2df8be063a8120bbfe159d52f96229692ac7258c4128909dbbffe61
 DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4
 DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
-EBUILD digikam-5.7.0-r1.ebuild 4783 BLAKE2B dbb3bb6471c7dcf6d0652caef80ede410055cefa8cab29bfbd8f8018a0385f17a2ed8a97a5036777acc4a5738f445348049c38082c48955ea67863fc55d0b8e1 SHA512 538610991e4f7780ee908a81444f970ae70b0c01ea53af6d800c2db2d382b4e76d513caaa53560bce282d7362c6defbb90295bbafb272aa09285b1131ec08794
-EBUILD digikam-5.7.0-r3.ebuild 4936 BLAKE2B e09c667b8d39afa27c9e0d09f16db10463fbff130e56b419bf42e32d273709b942aad6ca970548e0de2ac32c08f693cfd5fcdb0d22a101a6795c83392827c60b SHA512 e5fd9e8ce6d9815b995476b26c14cb7bcbabab3ee6e2aa8e165a9660dedd63358558a0028824f0bf3b4a044c66e0d113831a5ba22f435499d11907e7cd504418
+EBUILD digikam-5.7.0-r3.ebuild 4934 BLAKE2B 95967205db7ba14d2d7ebe29ba6d6b42d63182c73b2deee3b32f2024195a437f41a7947db5f8f76a2f9d7e6a1e56f390dcd47c8657de4f83614ef07fbb12985a SHA512 97a73b97fcc7f898f22fa11fed4eb5c72c74ab1657e2d82f9e3b6ada4cb698d19bab5559b7b01e371b604ccd1a72edf55c72bfb93c9de42c7b9595b13219746f
 EBUILD digikam-5.9.0.ebuild 4763 BLAKE2B 516702edbb305434a4681b489cd46a7799f4fedbc2b915648eaa2058b97b520cf450ea0b67b4ecc3998e03ca858144cdda25e896d14594073a143e0e101d95f3 SHA512 ff4a0cabcfa5c945e440ab92cc0edab541b8eabf799466b959a975f3a9c2607afc9d1c1fb1973a37cd60c845169b40882696208f925f36b00da9a28126661076
 MISC metadata.xml 962 BLAKE2B 918fd2665df0b74bfcac369d306bd8989723db59dd436085ba7ad24e640401b8f39d2005674c4ef85c1875d2b31c9603af9b8ee7465b11f94b09ba9c93a6d9f2 SHA512 c8998f630fca57844cb258b42d6d557c7a6c65f8b0b90caf44225b62827e24eeaaa6defdf1334c7b7c80a1132aac96e178fe3b18ab59035534b605aed4665bab
diff --git a/media-gfx/digikam/digikam-5.7.0-r1.ebuild b/media-gfx/digikam/digikam-5.7.0-r1.ebuild
deleted file mode 100644
index 745baaf753b7..000000000000
--- a/media-gfx/digikam/digikam-5.7.0-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KDE_HANDBOOK="true"
-	KDE_TEST="true"
-fi
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="amd64 x86"
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	SRC_BRANCH=stable
-	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
-	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
-	S="${WORKDIR}/${MY_P}/core"
-fi
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql 'mysql?')
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/expat
-	>=media-gfx/exiv2-0.26:=
-	media-libs/lcms:2
-	media-libs/liblqr
-	media-libs/libpng:0=
-	media-libs/opencv:=[-qt4(-)]
-	|| ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 )
-	media-libs/tiff:0
-	virtual/jpeg:0
-	addressbook? (
-		$(add_kdeapps_dep akonadi-contacts)
-		$(add_kdeapps_dep kcontacts)
-	)
-	calendar? ( <kde-apps/kcalcore-17.11.80:5 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	jpeg2k? ( media-libs/jasper:= )
-	kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
-	lensfun? ( media-libs/lensfun )
-	marble? (
-		$(add_frameworks_dep kbookmarks)
-		$(add_kdeapps_dep marble)
-		$(add_qt_dep qtconcurrent)
-		$(add_qt_dep qtnetwork)
-	)
-	mediaplayer? ( media-libs/qtav[opengl] )
-	mysql? ( virtual/mysql[server] )
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/opengl
-	)
-	panorama? ( $(add_frameworks_dep threadweaver) )
-	scanner? ( $(add_kdeapps_dep libksane) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost[threads]
-	sys-devel/gettext
-	panorama? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/kipi-plugins:5
-	panorama? ( media-gfx/hugin )
-	!media-gfx/digikam:4
-"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.9.3.patch" )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	kde5_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	kde5_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_prepare() {
-	if [[ ${KDE_BUILD_TYPE} != live ]]; then
-		# prepare the translations
-		mv "${WORKDIR}/${MY_P}/po" po || die
-		find po -name "*.po" -and -not -name "digikam.po" -delete || die
-		echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
-		echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-		echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
-		if use handbook; then
-			# subdirs need to be preserved b/c relative paths...
-			# doc-translated is, in fact, broken, and ignored
-			mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
-			echo "find_package(KF5DocTools REQUIRED)" >> CMakeLists.txt || die
-			echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die
-		fi
-	fi
-
-	if ! use marble; then
-		punt_bogus_dep Qt5 Network
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_APPSTYLES=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
-		$(cmake-utils_use_find_package calendar KF5CalendarCore)
-		$(cmake-utils_use_find_package gphoto2 Gphoto2)
-		$(cmake-utils_use_find_package jpeg2k Jasper)
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package lensfun LensFun)
-		$(cmake-utils_use_find_package marble Marble)
-		$(cmake-utils_use_find_package mediaplayer QtAV)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package openmp OpenMP)
-		$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/digikam/digikam-5.7.0-r3.ebuild b/media-gfx/digikam/digikam-5.7.0-r3.ebuild
index b9dcb0e75128..fb65507f36be 100644
--- a/media-gfx/digikam/digikam-5.7.0-r3.ebuild
+++ b/media-gfx/digikam/digikam-5.7.0-r3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-${MY_PV}
 	SRC_BRANCH=stable
diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest
index 434185cc4af6..eea99268da4b 100644
--- a/media-gfx/gifsicle/Manifest
+++ b/media-gfx/gifsicle/Manifest
@@ -1,5 +1,5 @@
 DIST gifsicle-1.86.tar.gz 563638 BLAKE2B b42065c11822542b75161f34054c3208ad5425570f025fa6bc3c842e759ed84156e6cf202a73f0efd57afc0dff5b9fc7ca8463b6304b97d3888b5e2b0f885b2e SHA512 d55609e5d71f63ec13c1eed6a9071d756f07c765d2496d468cc7291e3b9e29304be1c3a5b0e822d9dc2df29ac489bafca2650d226d5b3c51dad74dd22c725a13
 DIST gifsicle-1.90.tar.gz 571910 BLAKE2B 607f8ff93818c3ab9d3d74bd7735bcf1bb6412c0607c07cc33bdf9c20d9fa56a004e5aeb66d6fd49bafc12dcb9daf32736597d0377b3dfa1ff665a49f1b47180 SHA512 a5fd815c3aa1388690199edc16c0d5c0c32257cefd1cf8a1b660024b8e2324a6b4a54e19013984f905549df42d7719cdb1a875979b77729723f70d8e43f9bab7
 EBUILD gifsicle-1.86.ebuild 650 BLAKE2B 1202e25ce25e193671835dca4e5a8e4d7c4c5124869a76310cb2b0b762fe8d4d06b4f7990e55e61c32d3c9c64f0d1a99edf108a8354e36ad5ca9641d6e8c380c SHA512 ab68e4ee5e3897296eea9f9cec3207c2f2ef79559d7fbeaa900e5f00e2d7a85840b57077242dcff9f370ee8d6438ede748de8d10ae92a5542a92cf0b897b0bd2
-EBUILD gifsicle-1.90.ebuild 624 BLAKE2B 4b20779b3c99569528a502c1dbed61fcb2eba13ad0e054e15d6c4c4582e41cbb9ed7951a1019469d971d3e25a0ee013a3c0db804ffcdae889cafafe19fb2b077 SHA512 6df0f3e5415f01684a563dc95cd66b9a6db704f4de6406a0b7bc98f90a6e99d8be9361d485f7b51e1837015edb4076d4b34396a68addae2bae2a21b4af02928b
+EBUILD gifsicle-1.90.ebuild 623 BLAKE2B 868e7f02279b40175285676ba12f5d1df4301a7ccfd7a2fb298610eaec16edc7be6f4a47e3cd08383793d18356b7bd32817cae9174251b0cd02b7d25c68ae647 SHA512 9f0d8aa952f205184798e9f0d8778d83a9dade9c04aa395f628c6b8c1cc268a2d0f2484335191a5adda6c5595ba9cf90aa100cad31a14e8e13ea04a0bfaab769
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/gifsicle/gifsicle-1.90.ebuild b/media-gfx/gifsicle/gifsicle-1.90.ebuild
index 1787353501e5..1120482889a9 100644
--- a/media-gfx/gifsicle/gifsicle-1.90.ebuild
+++ b/media-gfx/gifsicle/gifsicle-1.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="X"
 
 RDEPEND="X? ( x11-libs/libX11 x11-libs/libXt )"
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index e1e7441f330b..9c45bd56e44b 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,18 +1,12 @@
 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 BLAKE2B 26364e3ccf447d22d15291b132b44b1abd5ca4efc1df8e5eb4ca494ac9340ed8aa5e2d57d2e14c1859fc202532cf722b4c9c89defa92c630e462b07ce29ec774 SHA512 f8f3bfb812a214216c3ffac7064a4619f847cf9810417c782481dba12e6c6a44123c8b8a9289fbf5287f2e6b6df39a641d94a000d842faee5ff808eec86187a0
 DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
-EBUILD inkscape-0.91-r3.ebuild 3976 BLAKE2B 6109a0638f125b59ce3a01681290a44371016d72ce9fa8147792f106180437b823969981f1fe8cda95c8bc26c9f70c09025aa32f60117ff594c7168491145e3c SHA512 4b9fc5881cd58b4a5e32adc416564e7943c520f8add50673013f6c953080cbccddcd0690742d938df81d93252d5ad3ce4e41f6bf6191c9d018ebc2667c93dca0
-EBUILD inkscape-0.91-r4.ebuild 4051 BLAKE2B 5ccbbd94230ebb9aa4b6ebbd455b260a2b680247091a760d1556d9e4ad8c897441dda1a1edf90eb3846f42cb3885684863389ca067c11a4d7dde51bd6a74a2ee SHA512 93d3af17489e4a2230931cd53690cdf5bc8ffe9d0f5225b9539ba896cd14976c9c5345925e3974a1b57ac0ce0517333eae3b6a641017c94c37334dc35f9a8188
-EBUILD inkscape-0.92.1-r1.ebuild 3755 BLAKE2B 9c16cd19ad761248ffcaf7f4b4c28ee8a7acac0e33ed7c0b58077904cf5c9dbab2069102363fdb1068b29a1a02c4f903324195ecbd6238f88b447225143501da SHA512 7dc891b411af3f5af45df67707db758deb0265b76e3d6d14fc55d20b0de73f9e4188cdf38f30667d7ecaeea69b799976b64551c33aabd242b4503e658cddc26e
+DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
 EBUILD inkscape-0.92.2.ebuild 3875 BLAKE2B 980f69de82cfd74d88e0dccd55fa8500847aba1614ee291e990bcc167dd409e61dccc473d6a62711a125d6586ab26cb9d4c661dcbdea4af6adcca5508785fad9 SHA512 258802353c77b8a1cbec4df73aacc0edfb6b601d6a9a8200f7cf82c97f5bd7582033d547c9f7df1d8ebefd1d8fab2a6ccdd5c9efebbfa05df21990cedcb5a500
+EBUILD inkscape-0.92.3.ebuild 3838 BLAKE2B 73b22aecff0f4859f0e304da287000b146e4d0aa8aac3ca37d42ae623cd29ec969bee9245ceafe014c7dab7051bfcbdf3465c6b7ff6924040ce457e797fcf66c SHA512 9f3dbb7c4d173d310feff9b74927cacc4b8ad3f7b21e57666adebb70928a7fd17854a83610eabe728a1727f55383a41a67fc168584a854ec5b36e022f3a5470a
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
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
deleted file mode 100644
index f9c06601e837..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.91-fix-gtkmm-2.48.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/src/ui/clipboard.cpp	2016-04-02 15:15:43 +0000
-+++ b/src/ui/clipboard.cpp	2016-04-07 16:30:32 +0000
-@@ -146,8 +146,6 @@
-     void _setClipboardColor(guint32);
-     void _userWarn(SPDesktop *, char const *);
- 
--    void _inkscape_wait_for_targets(std::list<Glib::ustring> &);
--
-     // private properites
-     SPDocument *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it
-     Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node
-@@ -1302,9 +1300,7 @@
-  */
- Glib::ustring ClipboardManagerImpl::_getBestTarget()
- {
--    // GTKmm's wait_for_targets() is broken, see the comment in _inkscape_wait_for_targets()
--    std::list<Glib::ustring> targets; // = _clipboard->wait_for_targets();
--    _inkscape_wait_for_targets(targets);
-+    std::list<Glib::ustring> targets = _clipboard->wait_for_targets();
- 
-     // clipboard target debugging snippet
-     /*
-@@ -1456,39 +1452,6 @@
-     desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, msg);
- }
- 
--
--// GTKMM's clipboard::wait_for_targets is buggy and might return bogus, see
--//
--// https://bugs.launchpad.net/inkscape/+bug/296778
--// http://mail.gnome.org/archives/gtk-devel-list/2009-June/msg00062.html
--//
--// for details. Until this has been fixed upstream we will use our own implementation
--// of this method, as copied from /gtkmm-2.16.0/gtk/gtkmm/clipboard.cc.
--void ClipboardManagerImpl::_inkscape_wait_for_targets(std::list<Glib::ustring> &listTargets)
--{
--    //Get a newly-allocated array of atoms:
--    GdkAtom* targets = NULL;
--    gint n_targets = 0;
--    gboolean test = gtk_clipboard_wait_for_targets( gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), &targets, &n_targets );
--    if (!test || (targets == NULL)) {
--        return;
--    }
--
--    //Add the targets to the C++ container:
--    for (int i = 0; i < n_targets; i++)
--    {
--        //Convert the atom to a string:
--        gchar* const atom_name = gdk_atom_name(targets[i]);
--
--        Glib::ustring target;
--        if (atom_name) {
--            target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
--        }
--
--        listTargets.push_back(target);
--    }
--}
--
- /* #######################################
-           ClipboardManager class
-    ####################################### */
-
diff --git a/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch
deleted file mode 100644
index e29b7e9f787e..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.91_pre3-automagic.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Respect configure option for openmp and add configure options for aspell,
-gtkspell, imagemagick, jpeg, and exif.
-
---- inkscape-0.91pre3/configure.ac
-+++ inkscape-0.91pre3/configure.ac
-@@ -233,19 +233,28 @@
- dnl Check for OpenMP 
- dnl ******************************
- AC_OPENMP
--if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
--	openmp_ok=yes
--	dnl We have it, now set up the flags
--	CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
--	AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
-+openmp_ok="no"
-+if test "x$enable_openmp" = "xyes"; then
-+	if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
-+		openmp_ok=yes
-+		dnl We have it, now set up the flags
-+		CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
-+		AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
-+	fi
- fi
- 
- dnl ******************************
- dnl Check for libexif
- dnl ******************************
--PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no)
--if test "x$exif_ok" = "xyes"; then
--   AC_DEFINE(HAVE_EXIF, 1, [Use libexif])
-+AC_ARG_ENABLE(exif,
-+	AS_HELP_STRING([--enable-exif], [compile with EXIF support]),
-+	enable_exif=$enableval,enable_exif=no)
-+
-+if test "x$enable_exif" = "xyes"; then
-+	PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no)
-+	if test "x$exif_ok" = "xyes"; then
-+		AC_DEFINE(HAVE_EXIF, 1, [Use libexif])
-+	fi
- fi
- AC_SUBST(EXIF_LIBS)
- AC_SUBST(EXIF_CFLAGS)
-@@ -253,10 +262,16 @@
- dnl ******************************
- dnl Check for libjpeg
- dnl ******************************
--AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no)
--if test "x$jpeg_ok" = "xyes"; then
--   LIBS="-ljpeg $LIBS"
--   AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg])
-+AC_ARG_ENABLE(jpeg,
-+	AS_HELP_STRING([--enable-jpeg], [compile with JPEG support]),
-+	enable_jpeg=$enableval,enable_jpeg=no)
-+
-+if test "x$enable_jpeg" = "xyes"; then
-+	AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)], jpeg_ok=no)
-+	if test "x$jpeg_ok" = "xyes"; then
-+		LIBS="-ljpeg $LIBS"
-+		AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg])
-+	fi
- fi
- 
- dnl This check is to get a FIONREAD definition on Solaris 8
-@@ -675,9 +690,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 +734,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 +749,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 +828,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 +958,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-desktop.patch b/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch
deleted file mode 100644
index f02fa1a8aca5..000000000000
--- a/media-gfx/inkscape/files/inkscape-0.91_pre3-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
deleted file mode 100644
index e66661ffc32f..000000000000
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2018 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 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="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}"
-
-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-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-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
-		${WPG_DEPS}
-	)
-	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
-		${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 )
-	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
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_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
deleted file mode 100644
index 3a632ccb1ac2..000000000000
--- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2018 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 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="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"
-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-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
-		${WPG_DEPS}
-	)
-	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
-		${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 )
-	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.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"
-)
-
-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
-
-	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
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/inkscape/inkscape-0.91-r4.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild
index 26296f1bf535..69b0c27405f4 100644
--- a/media-gfx/inkscape/inkscape-0.91-r4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3.ebuild
@@ -11,11 +11,12 @@ 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"
 
@@ -93,13 +94,12 @@ DEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.91_pre3-automagic.patch"
+	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
 	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-desktop.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.91-fix-gtkmm-2.48.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -127,10 +127,6 @@ src_prepare() {
 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) \
diff --git a/media-gfx/iscan-plugin-gt-f720/Manifest b/media-gfx/iscan-plugin-gt-f720/Manifest
index 42b4271b8816..a44f4e562bc5 100644
--- a/media-gfx/iscan-plugin-gt-f720/Manifest
+++ b/media-gfx/iscan-plugin-gt-f720/Manifest
@@ -1,5 +1,4 @@
 DIST esci-interpreter-gt-f720-0.0.1-2.i386.rpm 381387 BLAKE2B 1852f0f89e7181d8adad209d146e41f1a122e95256c073ef77b96338585520c25e287bff86a0eda8fd09733328a2c67c22bddffabfc37f5de7aef1726f5c997b SHA512 6ccc6f48d8c00614346a0faee798b876497ba5ac1b35e3fd558a6e01711b944dc713e654d53fff09daff00b91251150665932564fea4fc60ec1a0a7ec95fa1f5
 DIST esci-interpreter-gt-f720-0.0.1-2.x86_64.rpm 170040 BLAKE2B e46bc0841a872883b85b2d91cadcc1007e3639d0f1c6d64948b91a3fd65c66bf295102bd898b9a5b1fe671d0746023ed95ab1325418501f2176be17af88e1f67 SHA512 457fcfa3ae8291336a127e95dc81e24a2125ae8f861bf74d2006e4d019c54bd351c2480254b9173e52dfe489962dffea2819963596f280e1dc05c527fbf6b625
 EBUILD iscan-plugin-gt-f720-0.0.1.2.ebuild 1572 BLAKE2B b4559ff53034389c89ce8c488aaf23773b758e329fbffaba0bf773c292bfc4e493d8881e9a8925e42f6f07351da1f57e668bd9c030d12bda10ea4c6341539d6e SHA512 3de21ed5ecf6c80465aefe88c7188ee8d83ff385304a68efc4fb84ceaf768cbbf6274f26c9fa303d012ce86bf428fb9f4001cc1c1dd3d304121bf53cf49899e4
-EBUILD iscan-plugin-gt-f720-0.0.1.ebuild 1474 BLAKE2B cb0e874d6f5dc2219a2452bf81e288a3375cdb06218b978787a6267f1c6215db5836886e35060b3fbb2e8089b12fe3c0b98d2d06332565fbe423b219d3a8d7cb SHA512 e32b2f4ffd7f61d4a615bcd7261464ea678aa7d6bb51eef63824ac018c936b6b7066c37dd55d94c2da463a2c110cefa4b949148d7d5bd086935a49a86adcbdff
 MISC metadata.xml 445 BLAKE2B b4b62d7f86b0897cac8ce562b27c0cffd16ed8f067f8095d4f1cb2315dc6740dacca43403085832063c3b0babfc74d326a4f2e139c1c571fc8aad832e4c8f9f5 SHA512 ed7c058931f20c758d70f6751841acfafdf388d98d17e80e700d69613e841cf883f02a3a134fb37e24c834012dfa0d8ec67b976ff866a90880b9b561f9c15164
diff --git a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild
deleted file mode 100644
index be5793af5636..000000000000
--- a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit multilib rpm
-
-# Revision used by upstream
-SRC_REV="2"
-
-MY_P="esci-interpreter-gt-f720-${PV}"
-
-DESCRIPTION="Epson Perfection V300 PHOTO scanner plugin for SANE 'epkowa' backend"
-HOMEPAGE="http://www.avasys.jp/english/linux_e/dl_scan.html"
-SRC_URI="
-	x86? ( http://linux.avasys.jp/drivers/scanner-plugins/GT-F720/${MY_P}-${SRC_REV}.i386.rpm )
-	amd64? ( http://linux.avasys.jp/drivers/scanner-plugins/GT-F720/${MY_P}-${SRC_REV}.x86_64.rpm )"
-
-LICENSE="AVASYS"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=">=media-gfx/iscan-2.21.0"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	local MY_LIB="/usr/$(get_libdir)"
-
-	# install scanner firmware
-	insinto /usr/share/esci
-	doins "${WORKDIR}/usr/share/esci/"*
-
-	# install scanner plugins
-	insinto "${MY_LIB}/esci"
-	insopts -m0755
-	doins "${WORKDIR}/usr/$(get_libdir)/esci/"*
-}
-
-pkg_postinst() {
-	local MY_LIB="/usr/$(get_libdir)"
-
-	# Needed for scaner to work properly.
-	iscan-registry --add interpreter usb 0x04b8 0x0131 "${MY_LIB}/esci/libesci-interpreter-gt-f720 /usr/share/esci/esfw8b.bin"
-	elog
-	elog "Firmware file esfw8b.bin for Epson Perfection V300 PHOTO"
-	elog "has been installed in /usr/share/esci and registered for use."
-	elog
-}
-
-pkg_prerm() {
-	local MY_LIB="/usr/$(get_libdir)"
-
-	iscan-registry --remove interpreter usb 0x04b8 0x0131 "${MY_LIB}/esci/libesci-interpreter-gt-f720 /usr/share/esci/esfw8b.bin"
-}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 82f91779f06a..b79f45ec9325 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,5 +1,5 @@
-DIST libimagequant-2.10.1.tar.gz 70783 BLAKE2B 8a8c075b95010d5dc7190591a33bf25b6a95b090d14fd09146dc5016e6ea319494277d8217191a6810c53f973471b8a711168f2960bebbf8b8396cd7544bb434 SHA512 1cbb725e5f3774f931379f640c6532e169ea02a7b502a93af6b75a305e3dab1bd34a375391be0e8fdc15fea578715e8f8319d95d674383b7048e5f73e48b106f
 DIST libimagequant-2.11.4.tar.gz 74117 BLAKE2B 5d42dc876c77694a1d4576e633d2e3aa1e531061aa849a683542cf11b14333f65125bbae699f927bf42896a934ade6d745aa517d6cbc4b7097d96c7579532ec9 SHA512 e9d2aaac2f37968dc93ba0da7d03f0fcf60b3f17d9a0b9edfd6930eade25844dd603de74492d8e1de8dc2da4e7f3e47959a558b5a67588d71e9e1db035eca1cc
-EBUILD libimagequant-2.10.1.ebuild 1173 BLAKE2B 5592028ff9799e260eccd6d6438faa28ea40dbc0b1515ec59f0aeebe5e6198d612a3c26a629bffdf5a903eebfff072a54ec25c3569e11afd07d72613b2a9025d SHA512 8636368abd9bbc7e20d28c968e5fefdf3f8a8d11e5b7c6651a98bc79b724c34abdcf948c8deda9cb5ca421858d2dbb155c2a1079665e5224fbf82c7d48477a76
+DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172
 EBUILD libimagequant-2.11.4.ebuild 1175 BLAKE2B 45ebfb632526601318788fded0c26678026dd518e4168213a523e7baba7a46742fae05cb7db89fa8bca4f7687bdb5faff62da218d236f35c109392d90d7b93c8 SHA512 342ad821a2c7581c1fe603fdbacbe8b72d6f5ee2c3e41c56075056678a9fcaebeba79aa2b68f3c83f8115e1f2b6d2fb839842f67defd9a9fb7f35e30acb80f38
+EBUILD libimagequant-2.11.7.ebuild 1168 BLAKE2B a285163a05f6291ad8987edf4ecfbcd3c9ba8963ae5688f3122afdc1e8b08529f23efce3525c0129df69d1122100873fcb79d408eeddb859de08b10209938af3 SHA512 4048a1d58055a0db23e75b843f5865feb903d47e02f4a0fcb20e4d9508174011e1e984cf136b20378137fe75c0e35385fda698f83084fafd614d134a90ebbf5d
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.10.1.ebuild b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
index 2392cd1682e3..2d2db96f010b 100644
--- a/media-gfx/libimagequant/libimagequant-2.10.1.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
 HOMEPAGE="https://pngquant.org/lib/"
 SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index c4ec1cd7eae8..a10917c78d09 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -10,5 +10,5 @@ DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a06
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
 EBUILD openvdb-3.2.0.ebuild 4011 BLAKE2B ec6225fcd8d9aa3a17c3286765ceb082f134468fb8e436dc627af0ef74ffea4e462fabf3126f8e0e25d5c89638563f9c8ad8d808fc79fffdcda51cd715936ec9 SHA512 c84c3022dad66f313415e01d35db4c9ce28b5a0863a0e5fd8cb20f7c07537dfd06022d9ba688e0e6469224ca2777891c2d812758e53d649d750022463a14abc6
 EBUILD openvdb-4.0.0.ebuild 1927 BLAKE2B 04de68eb7803c116db62397e227b6f56acb4e81f9208f4c615d3c20753fe6252a2ae2ba414b18a96e2c1015fb0d5623cca86f6b8e967c90de9cac50b4e201766 SHA512 dfffa4cb7393df8683df085935acd528683fc7596132cb49cea3c962772f89d732d9a36081403203a3e11470d258c24ee7c509caed2ae56f156ba2298cc9774e
-EBUILD openvdb-4.0.2.ebuild 1954 BLAKE2B 581425563f6b3b65329f30adcf9545f9810accee402cb3016626c61e9ab5a13b65e44b0414742b5b5e3acc9d3b5ba975a4e5cd4edf4f313432001d5e442fe06d SHA512 a08dce7c38f5475b28b1a1e4d501635ff0c70dadcaaf6a009ba4c0b9e7e701263e8c96491b52769bd6b594f1e90598bfe30e712af43bde4a80b61fe90c007d0b
+EBUILD openvdb-4.0.2.ebuild 1953 BLAKE2B 52acb99e6a74fd2cd0ad7b96518b08acc7ed9fce91c1f0a50947cc9624e3663f44284e1def469870efe3f1b368dad2b036de1c7b4ad25c360f057023c6ca4c3e SHA512 b7a1da36eabbdce27090902769c80d9c72f97353e58b30802274a89553268b7916c2895356fa4563cc25829968c1c4dde83a972fdc863aae75bb724d556fd919
 MISC metadata.xml 1250 BLAKE2B 17d651b364b0c114b299c16a71755bda7a4d59a44d5bf6c72b651d65fb504248c36821e1f58c5cf0f3f80b41961369d701feb29a49116d7182450a23458b8c55 SHA512 0f89a03fc29a06e46e4b4960fbe42c304a5c9d3052e823bd4b5b58090b439e873fa9b915243bf905e187d766724df93b75ca57abf3c567070ab84bd26315cecc
diff --git a/media-gfx/openvdb/openvdb-4.0.2.ebuild b/media-gfx/openvdb/openvdb-4.0.2.ebuild
index aeac72948ca4..24ec7fce3e5b 100644
--- a/media-gfx/openvdb/openvdb-4.0.2.ebuild
+++ b/media-gfx/openvdb/openvdb-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> $
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+abi3-compat doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-gfx/pngquant/Manifest b/media-gfx/pngquant/Manifest
index 0ea881e3b732..ba9647a2ff61 100644
--- a/media-gfx/pngquant/Manifest
+++ b/media-gfx/pngquant/Manifest
@@ -1,7 +1,5 @@
 DIST pngquant-2.11.4-src.tar.gz 142149 BLAKE2B eccf0c7a279d62981cfdf44ab0e378b2331377cd892019161b453edc7ffe73616a2aa83a07cf5f8d7292a0f96bf25612c23129348463cac73647021eae44f160 SHA512 171949977e1fd71c05bd75552f2e62535f6c15f31c3192cbe31df7451091634a6fbbfd08b47dd040f353af3b5f41fcc13db4421a212ca07cc6836f029635ddd0
-DIST pngquant-2.5.2-src.tar.bz2 54611 BLAKE2B 5938f0be4db3cf167a8a52267807672643002599574beb5f256edb93a7e6d3bf0a035a6231e5e0f9d102bed9c278fd0323c51fdd044280c7000cb5537468e1b8 SHA512 d542765bc1f7e22fd7199cd4aeb8dc7b82fa87fe05c53ca6b7919522e081c861d419a541909284aa4e5dcfeeedb19729a50150d9139389c1949b3aeaf4933401
-DIST pngquant-2.7.2-src.tar.gz 91721 BLAKE2B d8f1952e9188956cfcad802aec9f09728290298355f333e87cd627a75509ebfd7f6b657133b59c040103fe9f8333f83e07887e7dd919c134c1f5eb4b9bbace98 SHA512 ab84651cf0b5f3af2095b5741e0d03f4ddedbed59e75c5c75faeac20efa8dd2fb482f2a8d9447b5673e9ae6970b9af8dfdbe40062bdf377206ee87eaa69ed9d8
+DIST pngquant-2.11.7-src.tar.gz 141959 BLAKE2B 00e36a818a2150aeb3c927daeb8621bafa41497a6fe32afe30e41ad04d788946390f382139aea9878f58fc7a84fdbaf597681c9d8769e0e23b785a10d2e0233c SHA512 5325577dcb16acf5dff81a5f3bcf8cfa2a12df07a7c2308ebb9a343b74e56ea21184ed3f87819122c8bb97b4a7ffd3b61046c60f7f339da9a93e76dfa17ebee6
 EBUILD pngquant-2.11.4.ebuild 1001 BLAKE2B b448d71c1b9b5f97cfbb96a2f400933c697cf7821f34a1e78731b6fbf23856fcaa079d9a43d9346a2899b55217f6f7ce65a0f52315f89464ea321ec2c7f75224 SHA512 e3c453cb022071993544a910d95025e88222732fd5b533b4ef7b4b4c8fbe42d052528c9329af704d9ba53e7d8e522b2f87895013a337999afd3fe5656ea805cd
-EBUILD pngquant-2.5.2.ebuild 946 BLAKE2B 1331a1223d2b795427398ffb3c002ab4ec8e3ace914aa9dd45bedcd927c09e325894346f5f164827180a2651cb4953148c64f71c9bcd5ed516989ae0aeddc398 SHA512 0a9e059e99d0c96b4d4506c75edfce6f70ba73b0395bbb4953fbd67b2d790ecc949b111563396b8295168d91a5f196a404d3892e6a16f3fa1b1916db97a4b314
-EBUILD pngquant-2.7.2.ebuild 949 BLAKE2B f1cab7bef58f710abc1ff6a6a190ab47e79f689add003de67877e495855516330268df9a6f467abccdb779a2a3eaf369c3a91c29b10540c1b845171acede851e SHA512 f895a15658ad06e9f18bcd388877bc0519f4131d6cf6aca3924300073dc684bac4d5d07c403040870d14a18ad88e7832506fceba0da38ca2063829d5e398fed8
+EBUILD pngquant-2.11.7.ebuild 1001 BLAKE2B a751e5cb2b1ad19dad8e91d01b8ad82d2ca27cfa6abf7327ebd8f4a6a73f371fb999fb4e90506a42f47102dadd9565499d45be6b247caaeba29d6416b06efd30 SHA512 2ae01ecc887e5e11c36e8719631f04a57a82208396839b7d22ebd6197bbd3dc5c7cc8808361ff12d7b180d98ed27a0cb9388b06243dfa24ea527dfb9aea3433a
 MISC metadata.xml 492 BLAKE2B c60cb6917ca56946f1941feb2de555e4ced9c56ea3f25fae727bbfd2a49567ef3b581e877b7304dffe090ed898cc285f1baf5465380eb30582bc086854fdbc8a SHA512 5afec8077fc4f303cc76de855558049bdebf0d40a76381077866fd9d3e658912936fc2cd63411d378475743f8649e68dcc08793eb066d6adf9b232b8c669cb1b
diff --git a/media-gfx/pngquant/pngquant-2.7.2.ebuild b/media-gfx/pngquant/pngquant-2.11.7.ebuild
index a9d5a186736e..2da09ac80e2e 100644
--- a/media-gfx/pngquant/pngquant-2.7.2.ebuild
+++ b/media-gfx/pngquant/pngquant-2.11.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug lcms openmp cpu_flags_x86_sse2"
 
 RDEPEND="media-libs/libpng:0=
+	media-gfx/libimagequant:=
 	sys-libs/zlib:=
 	lcms? ( media-libs/lcms:2 )"
 DEPEND="${RDEPEND}"
@@ -24,6 +25,7 @@ src_configure() {
 	# Hand rolled configure script, so not all flags are supported.
 	./configure \
 		--prefix="${EPREFIX}/usr" \
+		--with-libimagequant \
 		$(use debug && echo --enable-debug) \
 		$(use_enable cpu_flags_x86_sse2 sse) \
 		$(use openmp && tc-has-openmp && echo --with-openmp) \
diff --git a/media-gfx/pngquant/pngquant-2.5.2.ebuild b/media-gfx/pngquant/pngquant-2.5.2.ebuild
deleted file mode 100644
index 04a3c8e8cd2b..000000000000
--- a/media-gfx/pngquant/pngquant-2.5.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="command-line utility and library for lossy compression of PNG images"
-HOMEPAGE="http://pngquant.org/"
-SRC_URI="http://pngquant.org/${P}-src.tar.bz2"
-
-LICENSE="HPND rwpng"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug lcms openmp cpu_flags_x86_sse2"
-
-RDEPEND="media-libs/libpng:0=
-	sys-libs/zlib:=
-	lcms? ( media-libs/lcms:2 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	tc-export AR CC
-	# Hand rolled configure script, so not all flags are supported.
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		$(use debug && echo --enable-debug) \
-		$(use_enable cpu_flags_x86_sse2 sse) \
-		$(use openmp && tc-has-openmp && echo --with-openmp) \
-		$(use_with lcms lcms2) \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc CHANGELOG README.md
-}
diff --git a/media-gfx/videorbits/Manifest b/media-gfx/videorbits/Manifest
index 972e63982625..871b695f7e36 100644
--- a/media-gfx/videorbits/Manifest
+++ b/media-gfx/videorbits/Manifest
@@ -1,8 +1,9 @@
 AUX videorbits-2.201-libpng15.patch 826 BLAKE2B e3051587a3198b2d3df970e01b4a38ec138b9d5c5dfe81269eb19ef6b13b258ff68dc8070fd8987a5f6db41121dbb480ba62d318e00d9047789d6247c35eae75 SHA512 6fd83e3524afb791f7c68755741651052fcb2b531efc0f4d7dc223ba1206999fd1ebcb6374eca9c5938246a0c077de309cd1450e9385b231fd73d12a9ed2cc3a
 AUX videorbits-2.205-fix-buildsystem.patch 635 BLAKE2B 89499ec57ce08722b0e8fcaa0bfc37cabf11627fe867e905b0cb329323453052cbe92ccd00f06d26beef11a134d5430163ac158b40fb398bdf448087f9709b6f SHA512 46462bdf437424f3af86526c1f2dfef68884f504646357ff3e5779f4629fdf22742a26e2dcf9df9b03a20da8125e87cb3b4772600d7590428d6d0a31f711ae9a
 AUX videorbits-2.205-qa-implicit-declarations.patch 712 BLAKE2B 5b24e38dc2951659f2c45ad50e853796d91338e59b1c55e6ffc396c4d3c221e80a559dc0aceb999a3e594ca9b61beeffcd0177d98c5daa6758582af2a25e314a SHA512 cfcab0079719ca2595b83e65ded05b8154a139304c23184823f0c957bb06af09465d486f8763a83baf8cc298b16f9e3b0b53f6218977972555bf2142ab3e43f8
+AUX videorbits-2.205-remove-bits-nan.patch 969 BLAKE2B bae9ba484c80c25c5eeb6e2bd1f9de5a49e3f5cf552e74bd9953985cbea5bff6002bd34c90cae057cd8a41272232760310f510418c0fef5c1ae9fbe3a93b1fb5 SHA512 cca1aa22cab689537248b9c0026acbf33114b359c1ab7b66cf23ac6f038dfb7653c48229b0b581552b23ced35ccdeae00b3676059745775aeac91ee7f5fe8d7e
 DIST videorbits-2.201.tgz 648187 BLAKE2B c279c6bb045412d3a2fbecc7a0955694b761c929ea3f0c73b6e64b1ff9a14e69a168b37eadeb8f99e6e1a2daf4863be87a268b74a619f16efaaeacc4e708ebb3 SHA512 eeb233487ac33702ff58f9434ff1850aac5ede9ecfebe4b1d313f07451c1cbb911ba6adca013136639bc0d01480acd71e5cffddcbf48af5aef58d40f48d6655a
 DIST videorbits-2.205.tgz 672377 BLAKE2B e111d48c3a7e8c3fc1bf878249a07c799879fa3c68e8555c539fd4089800fd7695f1758188295f65aa62fababfc6cc3c534abae384eb820f80bb1bbe0eb4b92d SHA512 faad5a7ab98167d67b7748b4b9aca1ced0e802ed85cba55ba9966d08c48045daa8fef8d387c576dcfa50ace8c4962bb0043bb83e3ba741844ede67d331e4fbf8
 EBUILD videorbits-2.201.ebuild 839 BLAKE2B 0723c77e35508dd0fb030c4b082fced02ade44190c57428870da4788c78da86b030bdfbdc0fba7c7298bb6385540d971a3a12b6e6b9c6fc26abbc9395b9ffa2b SHA512 03e5513d9354c81464e54f3718653bd5e726d507b0eed2089e4ee7f8f57e239a6804f48167fb756ad11a606370b83d0cfb552e2b4caaa18ef740a230004443a5
-EBUILD videorbits-2.205.ebuild 770 BLAKE2B 6622024d1cd1f69f58839a657a9d07fa36c5529648515ba67f5c22c5599346cb750b946e8403f75b1002d3532c7ffa7c4c6d1c9e47c326c232c14af9992d364e SHA512 b7dfe3e15555495d7bda7736ec606f4efa6d8f19d6247cbf1378a2e9027440b7d14e76124783b3e13c7f39dafef076825e1a6f5b1318065878620ef4c3cad2cd
+EBUILD videorbits-2.205.ebuild 812 BLAKE2B c114fa756c9324dd891f52f4241fe7f9ce58120b79b5baf776f83c73eecc86bda8f6c8e4cf4c53d2b22f0df8b3bc35cefde510afd7fc8bc41f902fbbc1883e12 SHA512 602a97746d18fcb6648d66c1e28e46e29b1eea1aff97358094b96ea681653b9bc015b6400cecd180f436293f07fdb9638940d2d20f7c89366d540c6aa0485d3f
 MISC metadata.xml 250 BLAKE2B 50ea93eb13d7a17cbaaa68accbae08e643330655c4af46a99440edbec4d7ef50111c45d91dfa2490de8cc9c77fb8be16e9f4b285f67c91522cbee316db6a860d SHA512 c18112cc613181bf7e1d339de4f2283d8d4f1c8a6492025a9c0e4c54dedeeed696713e844edd437eb1bd3e9659e4eb33cc49132450ff3ec7efa109a0238b3596
diff --git a/media-gfx/videorbits/files/videorbits-2.205-remove-bits-nan.patch b/media-gfx/videorbits/files/videorbits-2.205-remove-bits-nan.patch
new file mode 100644
index 000000000000..822b8dd8167a
--- /dev/null
+++ b/media-gfx/videorbits/files/videorbits-2.205-remove-bits-nan.patch
@@ -0,0 +1,35 @@
+From 27db38e20d2f1c685c9a4aa01cfbde96b0555d80 Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+Date: Tue, 27 Mar 2018 19:45:19 +0300
+Subject: [PATCH] Don't include bits/nan.h
+
+---
+ src/cement.c     | 1 -
+ src/cementinit.c | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/cement.c b/src/cement.c
+index 3dfb6f9..23c424c 100644
+--- a/src/cement.c
++++ b/src/cement.c
+@@ -1,7 +1,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
+-#include <bits/nan.h>
+ #include <limits.h>
+ #include <string.h>
+ #include <errno.h>
+diff --git a/src/cementinit.c b/src/cementinit.c
+index 95850d9..afa160e 100644
+--- a/src/cementinit.c
++++ b/src/cementinit.c
+@@ -1,5 +1,4 @@
+ #include <math.h>
+-#include <bits/nan.h>
+ /* NB:  supposedly nan.h is included from math.h when -std=c99 is on the
+  *      gcc compile line but that doesn't work so its included it directly.
+  *      Not having this line makes nan become unreliable, sometime it is
+-- 
+2.16.3
+
diff --git a/media-gfx/videorbits/videorbits-2.205.ebuild b/media-gfx/videorbits/videorbits-2.205.ebuild
index 030eb3b53d0e..52a423416d45 100644
--- a/media-gfx/videorbits/videorbits-2.205.ebuild
+++ b/media-gfx/videorbits/videorbits-2.205.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.201-libpng15.patch"
 	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
 	"${FILESDIR}/${P}-fix-buildsystem.patch"
+	"${FILESDIR}/${P}-remove-bits-nan.patch"
 )
 DOCS=( AUTHORS README README.MORE )
author	V3n3RiX <venerix@redcorelinux.org>	2018-03-31 10:55:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-03-31 10:55:17 +0100
commit	75fc75ae1f0481ffdb78450e801a9b443ba641bd (patch)
tree	cef96ea0860ae39a202bbf1e226100335209627d /media-gfx
parent	1173ad5704ce725916e0c332416aff326d850d06 (diff)