gentoo resync : 30.04.2018

32 files changed, 225 insertions, 747 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index bfc9d3b414c4..b4076bb5a4f3 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 100b6932a3a7..5a5275c9ed46 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,10 +2,12 @@ AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73
 DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b917907a02c365bd011cbf8ba258178e2915e097d373a2dca6a03ea6920df48b8f16f477e7479959371ef19937ceed9 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b
 DIST darktable-2.4.1.tar.xz 3396372 BLAKE2B 916a39b117c3af8bd81a1c6177929bdc0f756c79fef4e4994236569d46e2b770c85303e07c6937f670d0b657ba826cc7b0f1b8b713cdf66b11cd625865db525f SHA512 50de282d26b345deeca19ebacfd9eebcc8b1ef3eec4d73d7853e918eef0d23b5ddba96695e7084b808891f0778b5765dc6bf718b9f25c5e1ce5ed393c1421c94
 DIST darktable-2.4.2.tar.xz 3415724 BLAKE2B 2c7149ff14283f38208f223cab78c57d30cf0f50841484411bec64d8154b6c4f2213990d169da057d734b9ac792a549aa9c3a6137a0ebfcec6b4c7d6f3991817 SHA512 4ad698bbfbeb94ab8d25a5414e65a5e5d6d8edae0e77d1ac327dfed0e0519e1a8a6761f9efe653aa8c421cc37269efaef4da96c5bc3797f923b4a0df4ebdfa8b
+DIST darktable-2.4.3.tar.xz 3422460 BLAKE2B 2fa1d7787301b6bc83b09e8d93bda251d2f9b7cf7d47979087b6da5126272d17c15f925be26652580aad6601f8613eac593c08e91638f2d445de1981f8694798 SHA512 adc0740f866890c53a1389b43042d76a4c668dd22654d91fd5a7eb728aa6979cb7dd3703d6e7d3689b6d3840e892432b3c3ce6953a76d4355dfc1f90a8f29506
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
 DIST darktable-usermanual-2.4.0.pdf 15072726 BLAKE2B a10fb02bb732040e45e4b2c6b6a6e022c6095a29aac894727c8a803bf76ac50924bcd938f3c7085222f32542074cbe051afe8752059a0796db22adabecce3faf SHA512 0259ccd264ec0569a770d92a517932bf5b24ce279c699a636f36656519c400456f0bdbd5de1eacf96e0cb05c0b7e59a6c6fa02803b809bc0fabb902ffe454dd1
 EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0a0a1c83e1a9729161721aa73b390971156bb3784ec4d9c7577821da90390b5bdd1c3c3820976963d45fab510187 SHA512 daf6de876de7db156d979292562411581f06e58f8bddf5b3cb96f75c4b8d38f7dd8ac951c275192ce5d6f5f139566492aa7c08238e35da131a056113c08d9a94
 EBUILD darktable-2.4.1.ebuild 3999 BLAKE2B da571509858accbfcc514c4283c58fe4fe820f5dc0baabfd07a056c7934671c2526c86ded6219f903d094f24888cb0115bf451292facdaf56b657faf48678c8b SHA512 c655edc4067ff2744244bf7f07d5239da45594d906c0032e2bf881d5ab1be7f83807897f8b60d0d7dd4e2fbbbd39e96d2ac47dfdcce79ccf8c16790d0b2ca455
 EBUILD darktable-2.4.2.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
+EBUILD darktable-2.4.3.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
 EBUILD darktable-9999.ebuild 3434 BLAKE2B 9720e4706e25b09ef6b0a652cdd2ee47fdc394fee8a7a8f3a673c8393a081e1a87b136cd6da813ca59aa4c6c6da6930ffcaead9123cf768765eb276cfc8134ab SHA512 99476f1f3742d2404bc491e3fe654e4928b714429070fc338461db8f49c2cc51c089f9426aad1470c65dd606054a90a6d69e8c52deb83e39bc0a298393bf6111
 MISC metadata.xml 925 BLAKE2B 5f8855e5d645a30a6a4fdd5049e04f2269df88b042f69321677733d00b56d5e77b9084d996ab7c08340d24f14fdaea3080962465807266d435a954f0f4ca5dbf SHA512 f247ae77eba5dcebc3381cf6fabc68565dc6880c1b3aa5d90311864d78ba9868eb6848a960ead426c006e1e4c5f7d76baee256c948b68ad44785adf45215d09b
diff --git a/media-gfx/darktable/darktable-2.4.3.ebuild b/media-gfx/darktable/darktable-2.4.3.ebuild
new file mode 100644
index 000000000000..76721f6a80a4
--- /dev/null
+++ b/media-gfx/darktable/darktable-2.4.3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils
+
+DOC_PV="2.4.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/"
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
+# TODO add lua once dev-lang/lua-5.2 is unmasked
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+nls opencl openmp openexr pax_kernel webp
+${LANGS// / l10n_}"
+
+# sse3 support is required to build darktable
+REQUIRED_USE="cpu_flags_x86_sse3"
+
+CDEPEND="
+	dev-db/sqlite:3
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	dev-libs/pugixml:0=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.14:3
+	x11-libs/pango
+	colord? ( x11-libs/colord-gtk:0= )
+	cups? ( net-print/cups )
+	flickr? ( media-libs/flickcurl )
+	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	webp? ( media-libs/libwebp:0= )"
+RDEPEND="${CDEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	opencl? (
+		>=sys-devel/clang-4
+		>=sys-devel/llvm-4
+	)"
+
+PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse3 && append-flags -msse3
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PRINT=$(usex cups)
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DCUSTOM_CFLAGS=ON
+		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+		-DUSE_COLORD=$(usex colord)
+		-DUSE_FLICKR=$(usex flickr)
+		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DUSE_KWALLET=$(usex kwallet)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_LUA=OFF
+		-DUSE_MAP=$(usex geolocation)
+		-DUSE_NLS=$(usex nls)
+		-DUSE_OPENCL=$(usex opencl)
+		-DUSE_OPENEXR=$(usex openexr)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_WEBP=$(usex webp)
+	)
+	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
+
+	for lang in ${LANGS} ; do
+		use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
+	done
+
+	if use pax_kernel && use opencl ; then
+		pax-mark Cm "${ED}"/usr/bin/${PN} || die
+		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
+		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
+		eqawarn "must be modified and this *may* lead to breakage! If"
+		eqawarn "you suspect that ${PN} is broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	elog "when updating from the currently stable 1.6 series,"
+	elog "please bear in mind that your edits will be preserved during this process,"
+	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
+	echo
+	ewarn "It will not be possible to downgrade!"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest
index 15cd065f5449..b78ab24aaf96 100644
--- a/media-gfx/displaycal/Manifest
+++ b/media-gfx/displaycal/Manifest
@@ -1,5 +1,7 @@
 DIST DisplayCAL-3.5.1.0.tar.gz 10378539 BLAKE2B b10e3f70401b9167728c4fc9b59bf66da7e3a09040fdf0800e9697aa9bc328d7d70e4018d14856fbde1a20028ef3aec2922727282050c291ed5a8c83209178e3 SHA512 7dd0c67c8766478223f1e36a36d386b0e8d284001642e34fd1aa27e196fc36be1fd98340f4af202c4b171aa44da9f9d20a53f8dda11ba5e270a1071351fc7a6a
 DIST DisplayCAL-3.5.2.0.tar.gz 10341417 BLAKE2B 218d73756c57107b17a475101a8969af4213ce0417669b5d18f009320cab970da125ddae68a3288f61f05be99f3e2a621a727c2cf6b4aeae43252c8d257ed3af SHA512 607a63c94fbebf916009327bf473c45e6e785e5dfa57bd0b5868616a57b7af1aa3173a43cd7e371b43a8078ad350ff27178c6c13b46a3e67e28a4397c5586665
+DIST DisplayCAL-3.5.3.0.tar.gz 10559161 BLAKE2B a3eb968dcd0b5edbcf22a0ec84da55d8660ffa8782135a908db8ea7a6480ce7be9a59528d35a73b7eb57c9c0dd46996407ea3de834a85e6da1c5d006b8aa33b3 SHA512 ddb405c1d8b7bc5aefac80fb79edbb03c2a3b32821c8bbbdd6d095312fff57e8ffe5e53cc5b53c56fa32e6bcbc10cd76598441d750008c38a512ed1f62d7cd9c
 EBUILD displaycal-3.5.1.0-r1.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
 EBUILD displaycal-3.5.2.0-r1.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
+EBUILD displaycal-3.5.3.0.ebuild 1521 BLAKE2B a42233e85727c294aa646dbad6759dcf78967a49ff95d5dad4c6941dbb805d7e4191c6fa12e22a28b739048b8c8a8c04fabbc89132d9d3ff4f95d06cf41b8964 SHA512 8d3c07821ca6ef5cd136e9d793b164ef743a69231e75c1872e7939b4507919e4ed32ef7d39d0862a37a3c82149f26cea44ba4e499f5f4f9f7eb6e746a4d99f63
 MISC metadata.xml 342 BLAKE2B e74a7767c5b6e82bd35776606de555f9d4f26a25727decc6b0216fa3ea27cee8f28a7749e46b842c52e403c5150b24b4e33e0b971bd49077814e7945ee8cc290 SHA512 f9d5979fc8525c40af8d4e64afb8264873b0ae7cda1e9c4f3b3f30957c2a4f7fcbab76002783213a896395e8b5ef78e315441c28872589a91a0035d5f346d317
diff --git a/media-gfx/displaycal/displaycal-3.5.3.0.ebuild b/media-gfx/displaycal/displaycal-3.5.3.0.ebuild
new file mode 100644
index 000000000000..72a722b64356
--- /dev/null
+++ b/media-gfx/displaycal/displaycal-3.5.3.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils xdg
+
+MY_PN="DisplayCAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Display calibration and characterization powered by Argyll CMS"
+HOMEPAGE="https://displaycal.net/"
+SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=media-gfx/argyllcms-1.1.0
+	dev-python/wxpython:3.0
+	>=x11-libs/libX11-1.3.3
+	>=x11-apps/xrandr-1.3.2
+	>=x11-libs/libXxf86vm-1.1.0
+	>=x11-libs/libXinerama-1.1
+"
+RDEPEND="${DEPEND}
+	>=dev-python/numpy-1.2.1
+"
+
+# Just in case someone renames the ebuild
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Do not generate udev/hotplug files
+	sed -e '/if os.path.isdir/s#/etc/udev/rules.d\|/etc/hotplug#\0-non-existant#' \
+		-i DisplayCAL/setup.py || die
+	# Prohibit setup from running xdg-* programs, resulting to sandbox violation
+	sed -e '/if which/s#xdg-icon-resource#\0-non-existant#' \
+		-e '/if which/s#xdg-desktop-menu#\0-non-existant#' \
+		-i DisplayCAL/postinstall.py || die
+
+	# Remove deprecated Encoding key from .desktop file
+	sed -e '/Encoding=UTF-8/d' -i misc/*.desktop  || die
+
+	# Remove x-world Media Type
+	sed -e 's/x\-world\/x\-vrml\;//g' \
+		-i misc/displaycal-vrml-to-x3d-converter.desktop || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 9d0bbf6bf35e..fd71cced0338 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,4 +1,3 @@
 DIST eog-plugins-3.16.6.tar.xz 398836 BLAKE2B fcd3c6dc61ca6d935580caffdf9c941d34265f8caa6cd3d682e0d7679888f6965f64ac30b807c00417e904b4e0eeff1a213a8f6d284c130abe265f9c97fc636b SHA512 e3bff786785ae36a41bc7c5fcb3cf75233595777409f373c4a6597fa6e432f72c7a75608e09ab66e1033ca0d12e3855346d7f7e0c571014b5aaef40184a3383b
 EBUILD eog-plugins-3.16.6-r1.ebuild 1603 BLAKE2B f260b6b3e7f3f2710b5875bede7448dda4e717205d4abc03ff4f8d102cb3c3e6ad3d1d85108f2382f8b2aea984de910228b2b150c1cd7f9b9483264b3124c8d0 SHA512 46bbf6a0236ce8957d28beb82414c6c3bb6b7e7ae0411f1cf295e0aca0bc5296448076e1aec09f0d970217556fcbe0bdee635741db81f6eb4ef4d2423bf9cf51
-EBUILD eog-plugins-3.16.6.ebuild 1681 BLAKE2B bcda004d6f20ba29826c3637f718cdff0ee1895ce0d79dcf743285d9dd7023772580c3f05eea82871c77c2260d16f8c91b01c5a10ceff8b91ccee60f8c9f7b08 SHA512 2b3137f6b4cceee79c705db382f620e203fc7d5625662b8ec5eb1c92c349d3fa85c1bf7dbf428bd5b327af94dc614f44094e15318e0a987f3e332866c902fcf1
-MISC metadata.xml 483 BLAKE2B fc83eeea54c41053a3857d37d763caa1642ae1074bd759f1a01bf85952825289bfeae5ad0c8b63ca0aa58e78b5bfaa2b29c90de393a912fc7aecafb76cf9a726 SHA512 f1b4c8e14547335019aa74506f2c5391783cabe118aa91e8f658117a6151cd53bb1728d36ae63a5c50fe9d548ee6f6b47294ae0c0af43e869de9815cf600afed
+MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.6.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.6.ebuild
deleted file mode 100644
index e3ed08b382f5..000000000000
--- a/media-gfx/eog-plugins/eog-plugins-3.16.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+exif flickr map picasa +python"
-REQUIRED_USE="
-	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libpeas-0.7.4:=
-	>=media-gfx/eog-3.15.90
-	>=x11-libs/gtk+-3.14:3
-	exif? ( >=media-libs/libexif-0.6.16 )
-	flickr? ( media-gfx/postr )
-	map? (
-		media-libs/libchamplain:0.12[gtk]
-		>=media-libs/clutter-1.9.4:1.0
-		>=media-libs/clutter-gtk-1.1.2:1.0 )
-	picasa? ( >=dev-libs/libgdata-0.9.1:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/glib-2.32:2[dbus]
-		dev-libs/libpeas:=[gtk,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/gsettings-desktop-schemas
-		media-gfx/eog[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
-	use exif && plugins="${plugins},exif-display"
-	use flickr && plugins="${plugins},postr"
-	use map && plugins="${plugins},map"
-	use picasa && plugins="${plugins},postasa"
-	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
-	gnome2_src_configure \
-		$(use_enable python) \
-		--with-plugins=${plugins}
-}
diff --git a/media-gfx/eog-plugins/metadata.xml b/media-gfx/eog-plugins/metadata.xml
index 6943c23f1ddd..3319801fe837 100644
--- a/media-gfx/eog-plugins/metadata.xml
+++ b/media-gfx/eog-plugins/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
-	<flag name="flickr">Enable uploading to Flickr</flag>
 	<flag name="map">Enable world map display using	<pkg>media-libs/libchamplain</pkg></flag>
 	<flag name="picasa">Enable uploading to Google's Picasa Web Albums</flag>
 </use>
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 74c8d55de5be..9ead582aa0ed 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -5,5 +5,5 @@ AUX exiv2-0.26_p20180319-CVE-2018-4868.patch 1694 BLAKE2B c288075acac8c2335da2b0
 DIST exiv2-0.26_p20171104.tar.gz 28368697 BLAKE2B 50013cf0bf30a2a476b02d5db4027fca268a4b38733762eb4c08e5f3bdfaf737038e9a62f7ef471fecb10250d8ae686ef683f9b0ea4ccc5d109440ba534371e4 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474
 DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1
 EBUILD exiv2-0.26_p20171104.ebuild 3086 BLAKE2B 72739b426e741582b3f167f973b250333d37bd68a9a4d381eada321670ff3c41e33f344e759c47641510c724ad4da8b27ee8e2805f4be075a1de9c808b7a2baf SHA512 ddabecf71aef6461442b77ae3afed3581d13a8155b232aa3e946e043853cc8f79bd5866febbd1ca38a4c9a2b6c08afdc1b37b079a30b3d01b358da06cc08db58
-EBUILD exiv2-0.26_p20180319.ebuild 3316 BLAKE2B 14141a522f0312c2cb79f6c58d11d1a2168cc9f69cb53574de5507999c1179ce1d32d2d23d8d4011c6e9a85034eca1d41de7d45b8a32b53f14c4d4c9dd5ea085 SHA512 ff9ca1765ef9699f5027c4e826967af7821aeefa3a3dabdda80133a3422d7a84c13cbe97ce130f1e0f4c76e8cba98c0aaad8beee70ec2885e4ba57939b03fb61
+EBUILD exiv2-0.26_p20180319.ebuild 3314 BLAKE2B 637e11a6bf0f1d82b86342086ef3f35b9fd2390dd3cecf817bb2f90044ec2cf27dbd7dbd4b75fead88b45b0fb1a9f43e459605716fec3dedffb7f61b3db46400 SHA512 6e9857924f8d995ec6af559b57fa63fd7b1a1e46b9a220a93e0abf450246316962eeea1e18fe2e993c746a9f6b20083647a526da106bc4dee620d774cf0d2974
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
index 09c446bf32e6..70bf783d9176 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 else
 	COMMIT=876b1314ab892cbfa6672b6b94adbeb90db4211f
 	SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 fi
 inherit cmake-multilib python-any-r1
 
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index e3eb269358d0..6152d77be595 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-photos-3.24.5.tar.xz 985864 BLAKE2B d5e7dd48a6f81c9ca6efa7dcb2b17fdeb781070d1789514098b8cf30bcd12eba145e57e584f42f66286579ad40ef31f370c471abaab30ba684bada9878afc3c4 SHA512 8dcdb9962a55d6e2e9aa28ef86dcc9100f80fa9739763cea1475052379050a23428e09e8416ed75b9a9b1c85a9bc27d94a75faeefde3d546195c21f04f85379d
 DIST gnome-photos-3.24.6.tar.xz 986200 BLAKE2B 656737326f594958ea1cc956f85e50c7eaebc227491d95342acab9a1fa0e3c5c109efe932cd0465e48ada62beab238e6eef0e01033b145de72a1fb64ce2f3c89 SHA512 47fd858b643fe0bca9a4801d43bd7eb181db08d7e09941a60a134247df97b0e900cd062efef70da5161a9fceb1d33b998b87ad5eca0a5937a10c4e06b908de22
-EBUILD gnome-photos-3.24.5.ebuild 1776 BLAKE2B c4868a2dfe4d4dbbfa7a396ffaf2667844ac63f767162fa4fff975de27aa81cb86b3736f0b9461663a8a311e5e5f9fcce28934cf9e4da9fc8b74f2025810e2c8 SHA512 469751ff495f9a15ada2a680cc6191e5aef9a5e51770075a69578dfbfb1253a2d7e04e0cb5da850f0968e8d3224686f5f354683cd7718262f6f3b3caaee1bc24
 EBUILD gnome-photos-3.24.6.ebuild 1776 BLAKE2B c4868a2dfe4d4dbbfa7a396ffaf2667844ac63f767162fa4fff975de27aa81cb86b3736f0b9461663a8a311e5e5f9fcce28934cf9e4da9fc8b74f2025810e2c8 SHA512 469751ff495f9a15ada2a680cc6191e5aef9a5e51770075a69578dfbfb1253a2d7e04e0cb5da850f0968e8d3224686f5f354683cd7718262f6f3b3caaee1bc24
 MISC metadata.xml 320 BLAKE2B b66fb85cefaafccf9575d4f85c017cc07cb55b75d377e8a95bf482b6cb7817f902c5fd3987e08c3d77b604f10710cb6f9820f5e4451e402b186e7714444abf4a SHA512 86c99b12ed97b3f09e9469dcb093e18f844f5b3efb3a3169e62e10fe446075c7839ba7ca00e3537744d3c839522cf5ed2ee33215cd5988466e35d0f4dd739b11
diff --git a/media-gfx/gnome-photos/gnome-photos-3.24.5.ebuild b/media-gfx/gnome-photos/gnome-photos-3.24.5.ebuild
deleted file mode 100644
index d802c9d1eb7b..000000000000
--- a/media-gfx/gnome-photos/gnome-photos-3.24.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Access, organize and share your photos on GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="flickr test upnp-av"
-
-COMMON_DEPEND="
-	>=app-misc/tracker-1:=[miner-fs]
-	>=dev-libs/glib-2.44:2
-	gnome-base/gsettings-desktop-schemas
-	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
-	media-libs/babl
-	>=media-libs/gegl-0.3.14:0.3[cairo,jpeg2k,raw]
-	media-libs/gexiv2
-	>=media-libs/grilo-0.3.0:0.3=
-	>=media-libs/libpng-1.6:0=
-	>=net-libs/gnome-online-accounts-3.8:=
-	>=net-libs/libgfbgraph-0.2.1:0.2
-	sci-geosciences/geocode-glib
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22.15:3
-"
-# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
-# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
-# so don't pull it always, but only if either USE flag is enabled
-RDEPEND="${COMMON_DEPEND}
-	net-misc/gnome-online-miners[flickr?]
-	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# XXX: how to deal with rdtscp support, x86intrin
-	gnome2_src_configure \
-		$(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/media-gfx/k3d/Manifest b/media-gfx/k3d/Manifest
deleted file mode 100644
index c55625bee392..000000000000
--- a/media-gfx/k3d/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX k3d-0.8.0.5-multilib-strict.patch 833 BLAKE2B ab3ec59b35f27a02d3a09a39ebf8237a2c18dd78c52685945cc983acabdf0fc22d2599388a2849b1e80c5856e71953d13d3de9eb07be34dfc45d7f0b2076651c SHA512 8fc3539845d6da15a521541b684cf8d8fe3e44bb31772ef3dab5c6f3d24fbd117b812081f96e05f0bbbe55ae173fb47a1ad31781d38ac69d1e59db7b4b890a61
-DIST k3d-0.8.0.5.tar.gz 9992671 BLAKE2B dc26e3fe71139023b2d7466d2f7b213d784e9b7e4ac57013bc9b76c45d56ccbeb6dab145b2b00ce85ac6edcb2764dce6d4200335a19a09b3ef122bb74bfaed34 SHA512 229ceb195a07fcf3c07957f5f66b01bbdc03c54d5aa0b2c24be7511864013fb0b58b1e45c4db995c77aa5cc2318b61aed3412c71b16c2c042799863da8912065
-EBUILD k3d-0.8.0.5.ebuild 2670 BLAKE2B d5c1bf138eab174b0df62b43347c738ee95af2e28281816a2db346577d3491c76bc7d939638c691dee8c5c0c1ec42cb45938ec7cc57a4f60c911fde7eb03ec7a SHA512 01ae85275792913c08b3903fa5da8ffcdbc6b38c05dd1862a7258c23c4877fd6c454794ae757aa97a2b0e35b552d2641c82347d32de7ee656a8e5f1a950dddba
-MISC metadata.xml 642 BLAKE2B 6ca4da245a250a82fc97968bdc9e53641668370b2a62878401a6894ddc1a5c5b25c344c31e82ec09fe22f0cbe4b6d4b97592b9eb053df78014ea7dec022e01f6 SHA512 8f5c1eb865f13ec142bc36d81391df1ca284ea5086db0fde6798909c538943b2ff5283cda541ffb957ae775070402d40b16f7b42dd5a208faf31efa7a84724cf
diff --git a/media-gfx/k3d/files/k3d-0.8.0.5-multilib-strict.patch b/media-gfx/k3d/files/k3d-0.8.0.5-multilib-strict.patch
deleted file mode 100644
index 24f84d621873..000000000000
--- a/media-gfx/k3d/files/k3d-0.8.0.5-multilib-strict.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5d20d8daf3fb753785c78d43d86813348d456868 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@fedoraproject.org>
-Date: Tue, 27 Jan 2015 10:54:55 +0100
-Subject: [PATCH 1/4] k3d-0.8.0.2-cmake.diff
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ae8a60d..9f22dae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -362,7 +362,7 @@ ENDIF()
- # Setup output directories ...
- SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${k3d_BINARY_DIR}/bin)
- 
--SET(K3D_LIBDIR lib) # Allows us to handle 64-bit libs if/when it becomes necessary.
-+SET(K3D_LIBDIR lib${LIB_SUFFIX}) # Allows us to handle 64-bit libs if/when it becomes necessary.
- 
- IF(APPLE AND K3D_ENABLE_OSX_BUNDLE)
- 	SET(K3D_BUNDLE_DIRECTORY ${k3d_BINARY_DIR}/K-3D.app/Contents)
--- 
-2.5.0
-
diff --git a/media-gfx/k3d/k3d-0.8.0.5.ebuild b/media-gfx/k3d/k3d-0.8.0.5.ebuild
deleted file mode 100644
index 0382e5044e13..000000000000
--- a/media-gfx/k3d/k3d-0.8.0.5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cmake-utils flag-o-matic
-
-DESCRIPTION="A free 3D modeling, animation, and rendering system"
-HOMEPAGE="http://www.k-3d.org/"
-SRC_URI="https://github.com/K-3D/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="3ds cuda gnome gts imagemagick jpeg nls openexr png python tiff truetype" #TODO cgal tbb
-
-RDEPEND="
-	dev-libs/boost[python]
-	>=dev-cpp/glibmm-2.6:2
-	>=dev-cpp/gtkmm-2.6:2.4
-	dev-libs/expat
-	>=dev-libs/libsigc++-2.2:2
-	media-libs/mesa
-	virtual/glu
-	virtual/opengl
-	>=x11-libs/gtkglext-1.0.6-r3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	3ds? ( media-libs/lib3ds )
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	gnome? ( gnome-base/gnome-vfs:2 )
-	gts? ( sci-libs/gts )
-	imagemagick? ( media-gfx/imagemagick )
-	jpeg? ( virtual/jpeg:0 )
-	openexr? ( media-libs/openexr )
-	png? ( >=media-libs/libpng-1.2.43-r2:= )
-	python? ( >=dev-lang/python-2.3 dev-python/cgkit )
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-# k3d_use_enable()
-#
-# $1: use flag. ON|OFF is determined by this.
-# $2: part of cmake variable name which appended to the base variable name
-#     that is -DK3D_BUILD_$2
-#
-# e.g.) k3d_use_enable gnome GNOME_MODULE #=> -DK3D_BUILD_GNOME_MODULE=ON
-#
-k3d_use_enable() {
-	echo "-DK3D_BUILD_$2=$(use $1 && echo ON || echo OFF)"
-}
-
-k3d_use_module() {
-	echo "-DK3D_BUILD_$2_MODULE=$(use $1 && echo ON || echo OFF)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.0.5-multilib-strict.patch
-	[[ -f CMakeCache.txt ]] && rm CMakeCache.txt
-}
-
-src_configure() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	mycmakeargs="
-		-DK3D_BUILD_SVG_IO_MODULE=ON
-		-DK3D_BUILD_CGAL_MODULE=OFF
-		-DK3D_BUILD_GOOGLE_PERFTOOLS_MODULE=OFF
-		$(k3d_use_module 3ds 3DS_IO)
-		$(k3d_use_module cuda CUDA)
-		$(k3d_use_module gnome GNOME)
-		$(k3d_use_module gts GTS)
-		$(k3d_use_module gts GTS_IO)
-		$(k3d_use_module imagemagick IMAGEMAGICK_IO)
-		$(k3d_use_module jpeg JPEG_IO)
-		$(k3d_use_enable nls NLS)
-		$(k3d_use_module openexr OPENEXR_IO)
-		$(k3d_use_module png PNG_IO)
-		-DK3D_ENABLE_PYTHON=$(use python && echo ON || echo OFF)
-		$(k3d_use_module python PYTHON)
-		$(k3d_use_module python PYUI)
-		$(k3d_use_module python NGUI_PYTHON_SHELL)
-		$(k3d_use_module python NGUI_PYTHON_SHELL_MODULE)
-		$(k3d_use_enable python GUIDE)
-		$(k3d_use_module tiff TIFF_IO)
-		$(k3d_use_module truetype FREETYPE2)
-	"
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/k3d/metadata.xml b/media-gfx/k3d/metadata.xml
deleted file mode 100644
index 482c887906bb..000000000000
--- a/media-gfx/k3d/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@gentoo.org</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<use>
-		<flag name="3ds">Enable support for 3D Studio models</flag>
-		<flag name="cuda">Use nvidia cuda toolkit for speeding up
-	computations</flag>
-		<flag name="gts">Add Support for the GNU Triangulated Surface Library
-	<pkg>sci-libs/gts</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">k3d</remote-id>
-		<remote-id type="github">K-3D/k3d</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 4c98ed4a6b32..4793850de856 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -4,7 +4,7 @@ AUX mypaint-1.1.0-json-c-0.11.patch 403 BLAKE2B 1608cb7706d85cb84284cc58bb78921c
 DIST mypaint-1.1.0.tar.bz2 37416388 BLAKE2B 4ced9087a51b855ad943d104801d06a03a6f78dfd39eba975cbdeddd304c12ffb0ccd48267fcf31f3608acc069b88bc3f07ed2ab750d77eb31bd64df2f6492a9 SHA512 a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9
 DIST mypaint-1.2.0.tar.xz 37895196 BLAKE2B fa0130a0b8ea6aba14f2994584f990c8c0cb4a784df2cbcec10a2be331c3f831dd0913e5b7d1f343ed90b9976b56fa8d55687c4421e11ea6377d2c87f218d59d SHA512 b4e75393cf6ed9b0c3c5a96979607c848d463987e3ac0f711738940ba97be6922e0cce735c56f91261bfce3e0730d69393dd57a45b3b04824c63c74cf1306790
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
-EBUILD mypaint-1.1.0-r2.ebuild 1982 BLAKE2B a8e79b602af406a52a1b83d8707fa78d80db7f7794a8bb10c6e15cebae931ec762fa4edc2c34d6a8724a4d48f592d084f34226f81ff0259742fffa2ac2d825ee SHA512 2981f47cc60dba1c20328070fcf29852dce6bc337456131b199fe8fe9c26dcd5b1d86378ca836876c28ee98821bee58938d9a41c046928e33e179c11e2fcf0c8
-EBUILD mypaint-1.2.0.ebuild 1793 BLAKE2B cb89f1cd533c3ac7e26cb166fd444f01f888bd888079044e478714bfbd4d4d41524e6c6408a7cdfff59f32bc2d0582b93164383873515400691158d2ad2ecb36 SHA512 b959e04df5e568da944d8cb297d6fd40f00b475e121088698526f25fb8edc174cc1e0b66123c4fbe26d492fcc3a313f16b5622b3afa89d2c8fd0ae39ef87f4f9
-EBUILD mypaint-1.2.1.ebuild 1936 BLAKE2B 812dc942f844091e326fa5768ad29006bec98dd89af2a3b8a55612b258b9fde5e943a3feedb67abd0b388f5ca5d4352909f951510b8a1cbca575c584cc057b23 SHA512 30e47402578220696d794cb8debe10ea0e75b32ef05e4eafa85b94e0ef7f9c18a600a88b0546fd1ffe6ac1e457905ea0b6be0025e2b941776da2582306def203
+EBUILD mypaint-1.1.0-r2.ebuild 1927 BLAKE2B e0d4354567a619e5d259fcb50820186fc8b6f4f6f7108c0676059da9a3065830b504b68a2f9e575032fb30e0b5b6e8e71de23d4e4f778cc28bb0d8e3220282ae SHA512 356a6bef73fb283b0e7953be068bdd8feec0d92a3e06a1fdf0fbe1d80fe6225a777cf95c6ae198afa40269bad9d25f8762c9ac318a8b2e4a3763912b40127477
+EBUILD mypaint-1.2.0.ebuild 1738 BLAKE2B e81f01dd6cafee8337c2d6c7d967a02341d9ca4cab1fc8815b2eee71bcf186c32d6ebcc9655038e33f46018342a85be807dd05ba046c26932f67a4f332469ca8 SHA512 d00e0825a85be9e5129fd7895c9b08d91037a1c291d50a8bf2e425eca235d527386013092898061e173855af3c3c2c9c6ab93cef7c5309e028683bb7841217e4
+EBUILD mypaint-1.2.1.ebuild 1881 BLAKE2B 62c4152f2763737e6709fe5425aaab71c2bd69a3560c8acfab36997270d2e1690bb113ed15cbdaa464e8fed828249386cdb547621a1de7cc5e0c39318ab4379c SHA512 900af1c50c8d860b9e0551f7c12abe9ee3df5e21b900b78a92c17e7b9abf57968d6c1a895eb56869e9a45e2132bab40b3a9de6f49990f67577786904e8dccffd
 MISC metadata.xml 330 BLAKE2B bdc4172a0253e4c0f4b53944a51b29ce97e050a22020981ef3b97eeeb6b246cbcf3a75dd9150ed54a41e33ca3841d923f1ea66c6b08889d59fa1cf44cccb948e SHA512 7e42c10fd3d1317f13955d4410f5ee5284925305bd669746695eca4e84d81b7913b1ba84fb14b27ad556c339c0772b3ef96c8063b44574def2b6d9019fdb03d1
diff --git a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
index 5cdf4d15a8f9..8c81ae609842 100644
--- a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
+++ b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild
@@ -22,10 +22,7 @@ RDEPEND="
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	>=dev-libs/json-c-0.11:=
 	media-libs/lcms:2
 	media-libs/libpng:0=
diff --git a/media-gfx/mypaint/mypaint-1.2.0.ebuild b/media-gfx/mypaint/mypaint-1.2.0.ebuild
index 4a465a64cc5f..0e430db29cc8 100644
--- a/media-gfx/mypaint/mypaint-1.2.0.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.0.ebuild
@@ -22,10 +22,7 @@ RDEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	>=dev-libs/json-c-0.11:=
 	media-libs/lcms:2
 	media-libs/libpng:0=
diff --git a/media-gfx/mypaint/mypaint-1.2.1.ebuild b/media-gfx/mypaint/mypaint-1.2.1.ebuild
index ee5a95e57d0c..b2c2e285156a 100644
--- a/media-gfx/mypaint/mypaint-1.2.1.ebuild
+++ b/media-gfx/mypaint/mypaint-1.2.1.ebuild
@@ -22,10 +22,7 @@ RDEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-	|| (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-libs/protobuf[python,${PYTHON_USEDEP}]
-	)
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	>=dev-libs/json-c-0.11:=
 	media-libs/lcms:2
 	>=media-libs/libmypaint-1.3.0
diff --git a/media-gfx/pornview/Manifest b/media-gfx/pornview/Manifest
deleted file mode 100644
index c20c894ab297..000000000000
--- a/media-gfx/pornview/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pornview-0.2.2.tar.xz 489416 BLAKE2B 2d142ff1b530db04fc3fe8b6d4fde85cc81059f5697bce9b1efd891fcff20f6f467e99e94dd1737af8c28cdf6de0b7b3fdf82d74e5aad3c65aeb686ee65a9cc5 SHA512 f7413398b7d6a3807d9a8b59b0cd651fc2728ea12b4eec084a2654ab864b6ac79e75c6c7d80ad0a26b0e1d4a3f3cf757cfa86115ede4bd3ff9dfa199801a870f
-EBUILD pornview-0.2.2-r1.ebuild 974 BLAKE2B 343cc9815d504119ffdff57fab7d19be3c70f43a2541dfbbca0382a23e763be3ea16f2ae509fb7f2b1b7705652f46dd7d7b1858bda95e018913898c85bd50701 SHA512 c27086ff8e55d0856f555c990a99634ff03fe8a3a7b7b61915909b3af221371233449a84e29ad229cd26ff0abffabecb0c94b88e8dc5eb1a0fdbfacf9cf1eeac
-EBUILD pornview-0.2.2.ebuild 1022 BLAKE2B ac3ac7422927a6100212aa337fe23c3629ab2fcfe7735a71211e943bef9959999d12cd2efcbc2dc97e3909170502f26c0e182644024352176ad26b8d8eb1146c SHA512 08f7b431700798353bf3609ef87516f1aa61895e2607ecbca0f67413547c67efea2a3b73ffabb82fbede459f8f0858235cb4f4a87e6f264f59e9e7a393c944e4
-MISC metadata.xml 245 BLAKE2B 29904c33174b5895f19c16167d0650c255036289af906dbb9fcdec8344a2f3500f6d07d0dd3a385448b3289558aa274e49d9274d083adc2f7bd0a531d1896ce1 SHA512 5d6d51920b6810926a788e7692616a3436dae92464a6c49f0446f6be44189ff464e3a2d56038d4e9a9ee715071b08edc29e416bfa35924917ca230c47b6ab26f
diff --git a/media-gfx/pornview/metadata.xml b/media-gfx/pornview/metadata.xml
deleted file mode 100644
index bf356604c7a4..000000000000
--- a/media-gfx/pornview/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">pornview</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/pornview/pornview-0.2.2-r1.ebuild b/media-gfx/pornview/pornview-0.2.2-r1.ebuild
deleted file mode 100644
index 1f9077302ce2..000000000000
--- a/media-gfx/pornview/pornview-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="Image viewer/manager with optional support for MPEG movies"
-HOMEPAGE="http://pornview.sourceforge.net"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
-	mirror://github/gentoo/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 -hppa ~ppc ~x86"
-IUSE="exif nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/libpng:0
-	virtual/jpeg:*
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXinerama
-	exif? ( media-gfx/exiv2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable exif) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	emake DESTDIR="${D}" desktopdir="/usr/share/applications" install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/pornview/pornview-0.2.2.ebuild b/media-gfx/pornview/pornview-0.2.2.ebuild
deleted file mode 100644
index 554d2147923d..000000000000
--- a/media-gfx/pornview/pornview-0.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnome2-utils
-
-DESCRIPTION="Image viewer/manager with optional support for MPEG movies"
-HOMEPAGE="http://pornview.sourceforge.net"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
-	mirror://github/gentoo/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -hppa ppc x86"
-IUSE="exif nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/libpng:0
-	virtual/jpeg
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXinerama
-	exif? ( media-gfx/exiv2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable exif) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" desktopdir="/usr/share/applications" \
-		install || die "emake install failed."
-	dodoc AUTHORS NEWS README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/qingy-themes/Manifest b/media-gfx/qingy-themes/Manifest
deleted file mode 100644
index b0b6e3805077..000000000000
--- a/media-gfx/qingy-themes/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-DIST _aquaish_-default.tar.gz 370262 BLAKE2B 94f84542ff69e0d95f1ec435eed033753d5715cd6210c80175064a8a34123fc1ea6187b500ac57fdf30820be810b7386275d033049f59f48768595e433781ec7 SHA512 d6c887e607029220759e5219fc820404ed16cf72b5ba4e9152c61d78963f19de8ecb93bf0df238cd451b280b3e51c9381115bf319d40882e7e1a709f6e043844
-DIST _biohazard_-default-1.0.tar.gz 273773 BLAKE2B 7d912e3a2e4384d53db910a6ff3c74c3cb3d6a5907edabd849a61123064c72ccc8a3f50e68ae16e76b11a55b487c25e0477c6e8fed5b9638430f45a7e570d557 SHA512 ef17307ce9b86ca0250a6b7dcf564f13898cc059b221a5d5aec51e3042e8be574a540dee3aaf6f8934262dee91535f2e1b1573f1b21a8223dc75a29492e2e4e7
-DIST _casablanca_-default-1.0.tar.gz 129819 BLAKE2B cf8f8a97d4da5d3a58cfad7b5603a6b77614a877c95fefb76f9b0979f2a392f69464583c76f28de1f147e674308880b2e3e9101397498bb0b93cfc3721a2e821 SHA512 a5acdf04c67d810acf486f999e1a6b08882d290ec9b08935070622e744e9b482b84a8b3aa03eb1383b79b83e88200e75966b358ead8221b59deebfad01ae49f4
-DIST _dragonfly_-default.tar.gz 907660 BLAKE2B 36842f79af34cb244f1f111d4922d877fc22e950b58681fc04e9121286da28c4cc663f92ceb0b34297fa5ee52bda4f52869a7f327a49d83644adccd73bda711c SHA512 874831d8e92d9d4ab681090f5756ab9d9c05e1caf03d512ea20c62861c7e77c3aba389db41e06b68a3c72844cf9bf530105be21893218377bca7b6e26f37ed51
-DIST _matrix_-default-2.tar.gz 371502 BLAKE2B 6e736e8a3a07b8e22869346cf4ab4c062d4ff6c5da6180fdc3c5c10b217cd025383af63c148149ff3ea4f3b67958427fb002a3731ac0ce71e743481d28ef82dc SHA512 c992a4dd191e00b0f3f26adac9c584ab1dfa0f2fbd70ab3f8e956d3f14078bb19bb8eac69f48332b562a64394f58659943ede19e3428acafb535d7204fc9963e
-DIST _vendetta_-default.tar.gz 874809 BLAKE2B afe881fbbb4063c6dc89447d81c4acd861e05c710221335c97d007fcd256dad936484b3284e94dc289bfa07c436c0e3c587941f3270cd6787bb5623620dd913f SHA512 1e53d74f6fa87dd2520d06d96b27dccc46640d4f8ec1ff7c35f7c7dc91cd2fc202dc233b9fbc507c448d34a28a5a8da1b45dc45c4e672aabbd1f706366043365
-DIST adc-default.tar.gz 361240 BLAKE2B b045d9fbea306922ae1eda65116f0b58d0d4bd464c302c2f1aaf561190730985ba901667814d8d6a172933cee236a22711673759291a113811ff19cc335a67a4 SHA512 7cef6c54d08d2fe686f36d8f2c6a27ab45e8dca7fcad41034de03a9e5b49532be9f4e16a051b440020f6c596d1d6cd6a161818a1f70ad292c1e555a845e16a8d
-DIST blnkftre-default.tar.gz 49770 BLAKE2B 3cc4e6bf126de14f72501a8e7c7d69e9949056ab4025ae1c75c3d75864660b0bce92d44c1ed5b50351ac47fc776729eb1fecdf1e57a7c92a150e8bc9f4fc6c44 SHA512 e46b29db4dfe4de0d65396cecf3680138bf30b424abe3d9def08f06bbcf27f006bfb24a42b4ea9dbc882a1dd05ab23d7da790c55f086f70ea53c8e60c485436f
-DIST chaosr-default.tar.gz 402463 BLAKE2B 1d1829c1cd4af5f8309a1e5b3ffdbd763c7e508b9c41b725e5eb242f23145a9b71b08be9817c6e53bcbf74d13b50b76fc3a9ee5303d8ad7c07d6fbe0301a2c0e SHA512 6d0be14db77b46f0406bb6b83375eacc6b538705aa4fcbc322b3e9801d1e29318959a86ba45afd10cfdd88fb42eccb20b89edd6972176a70dd0d925ab4c234cd
-DIST computerroom-default.tar.gz 985602 BLAKE2B fecc4db1f4f52db65f99597f391d8e202961879bdda9d015f2dea3db231381e1e18912fa389d4c01b5ba0f78eb922955ec2c74247658e57ee54a22d846b7f73d SHA512 037a77f4282c08e98f46621ce046d029f54588c52d2f5ea5eae630dc8c25280b27b45e584ac71726e9fc2f633e6e3afe47550fca480592bc699570c0dd86a5ec
-DIST fgdm-default.tar.gz 206988 BLAKE2B 0f6204e2a488f0684fa84c6e20b6761993d08cf99f4c4195264adffed5fdb8e6c39b811869ffd81e6b8217ce597947648b09348eef0821cbecee92b286c1ecd8 SHA512 fa997586624393f8013a6859e76a956bb0a4eecf15f066508614cb71089b23054e269589697981fefb2bd5a2749cf2be4818a88fa51de78a787bcd27087c5d7e
-DIST fireplace-default.tar.gz 1392742 BLAKE2B 48cda1530a770c15e30905411fed06c22e78a1baf31c3dd75a94a22d837aef8dd65c9896d1abd025adbfae62908350b76a47ff66b5a1280f1fd674bd8389f237 SHA512 cc94143f64f1ca20b1441c5abc58860c9bcc9472c0558c52cbacb3805c56e3fea40aa500c59dc1a01a3beca85eee70eb9b7acde9f9a137452e8b22dbf2388a42
-DIST fkdm-default.tar.gz 226868 BLAKE2B 696b2e3b17b7453a32d5c995db45a84c1fc93de3ec714702b7adb54ab788708c41a6b88f0f1663c48c389e7ba65266d4538e2c18bdcbff3baa32b90359f2e3dc SHA512 8354afd34b289dd4cd52d65209ceacbe0eb8675442e7e4e643591f014c8d4011a01e69773144b86822fc4667fdf6ca29cbe969071f895a58c16d0d46d8d92b1b
-DIST kitten-default-1.0.tar.gz 103467 BLAKE2B a1994270ee5a2f82359eb74c32a21a3c83d2d8654aea17ee165e210f0214a9072f573dec5fd02be2c3edf65603908007dbffa13c6660e040c547489aac3e90f8 SHA512 4f2907bc212cb22f7ca707f291c396b025d408db34b901a9ccc6a55b6148b32c1fe717be960e152e35920ae38d73195001eb6277adf3f06388787839b705002a
-DIST lambretta-default.tar.gz 214789 BLAKE2B 9bd39fe9610bc45c82bf13de2766108d4ecc467cab16393d47ecc8de1205d65e7400a96b20095fdfc575d56ca6c068b44341a8f351f8ed5d615f54260dbb4053 SHA512 9dc1c00676935cb6dc566f07153785894e2cef5f2b9e28abbaa56d3660ffafe4c5b93738ff51711f2093b2941ed584491e6352d771dee06d6ed5966d6f61e921
-DIST macmen-default.tar.gz 313117 BLAKE2B fe671c0d4a5aed4e6090523ff168626e415ee80305c21d33289f45ce411e0b4507a7ae20ad7f88c5c720f3ebfe1e60b63068a53ae0c3d4bf63854c3db396d8da SHA512 52e26231d9105dbc5d10e2f171518ee66d91f8db463f9f55a776bffd95a141280e4853c9a7b9f06ea294473d6cd2bcd45c46d92504515b6bd716ea6f3314ddd4
-DIST qingy_lila.tar.bz2 433944 BLAKE2B 3beb9f3f38e365e029c167848a15dceec0c41d51b54a7585a48f4dbc49c7fbb3bafec1aca6e1eb5513f31d033967356167c1c232ef37bc5dbb7268aa618c0dac SHA512 9255d1a5ad5d0832302f30a116d34bc1360a3acb417da6bae3febbf0a1d0afabc72583d85fcb63d93930e2f81d1329353aecc94e07431ae3675be83357a4b9c9
-DIST rouge-default.tar.gz 233178 BLAKE2B 02a0a5d0d8ceef64da9169a4a7c9e0ff71383602c4e7d1a337aa78663a4fc5b915636fb3ffd20a492c17e2b9b6add16fafb19f09ac392f55fe560ca82240659f SHA512 18f1dc0d55829b6822bf10b659dbb140c43cbc9e7fc230beaefbfd8566348cf531c8f3b98ef70c154ea41c6d13d27cbfd68b78c40d7b29f245601fe82eeeda24
-EBUILD qingy-themes-20050816.ebuild 2308 BLAKE2B f9e3182d278efcf5c2c77b6d4cc94702031db818a2622b249853ca6a0fd792ca03d45e2cf9a190edc39ea4b4983a6252bd54d2776c7cda02b30e0198e90cf600 SHA512 c02b616330ddf407c2a97198c507db088ccd5d65821379594fac908474a558ef747afa203c8bd83187753e74ff689888a0cd0b3ee4a7f91ccb9222c68283227d
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/qingy-themes/metadata.xml b/media-gfx/qingy-themes/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-gfx/qingy-themes/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-gfx/qingy-themes/qingy-themes-20050816.ebuild b/media-gfx/qingy-themes/qingy-themes-20050816.ebuild
deleted file mode 100644
index 2ebb33ab95aa..000000000000
--- a/media-gfx/qingy-themes/qingy-themes-20050816.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Collection of qingy themes"
-
-HOMEPAGE="http://themes.freshmeat.net/projects/qingy-lila/
-	http://themes.freshmeat.net/projects/kitten/
-	http://themes.freshmeat.net/projects/blnkftre/
-	http://themes.freshmeat.net/projects/fireplace/
-	http://themes.freshmeat.net/projects/_dragonfly_/
-	http://themes.freshmeat.net/projects/computerroom/
-	http://themes.freshmeat.net/projects/_biohazard_/
-	http://themes.freshmeat.net/projects/_casablanca_/
-	http://themes.freshmeat.net/projects/_matrix_/
-	http://themes.freshmeat.net/projects/adc/
-	http://themes.freshmeat.net/projects/rouge/
-	http://themes.freshmeat.net/projects/_aquaish_/
-	http://themes.freshmeat.net/projects/macmen/
-	http://themes.freshmeat.net/projects/lambretta/
-	http://themes.freshmeat.net/projects/_vendetta_/
-	http://themes.freshmeat.net/projects/chaosr/
-	http://themes.freshmeat.net/projects/fgdm/
-	http://themes.freshmeat.net/projects/fkdm/"
-
-THEME_URI="http://download.freshmeat.net/themes"
-
-SRC_URI="http://jefklak.suidzer0.org/downloads/qingy/qingy_lila.tar.bz2
-	${THEME_URI}/kitten/kitten-default-1.0.tar.gz
-	${THEME_URI}/blnkftre/blnkftre-default.tar.gz
-	${THEME_URI}/fireplace/fireplace-default.tar.gz
-	${THEME_URI}/_dragonfly_/_dragonfly_-default.tar.gz
-	${THEME_URI}/computerroom/computerroom-default.tar.gz
-	${THEME_URI}/_biohazard_/_biohazard_-default-1.0.tar.gz
-	${THEME_URI}/_casablanca_/_casablanca_-default-1.0.tar.gz
-	${THEME_URI}/_matrix_/_matrix_-default-2.tar.gz
-	${THEME_URI}/adc/adc-default.tar.gz
-	${THEME_URI}/rouge/rouge-default.tar.gz
-	${THEME_URI}/_aquaish_/_aquaish_-default.tar.gz
-	${THEME_URI}/macmen/macmen-default.tar.gz
-	${THEME_URI}/lambretta/lambretta-default.tar.gz
-	${THEME_URI}/_vendetta_/_vendetta_-default.tar.gz
-	${THEME_URI}/blnkftre/blnkftre-default.tar.gz
-	${THEME_URI}/chaosr/chaosr-default.tar.gz
-	${THEME_URI}/fgdm/fgdm-default.tar.gz
-	${THEME_URI}/fkdm/fkdm-default.tar.gz"
-
-# lila -> freedist
-# all the others -> GPL
-LICENSE="GPL-2 freedist"
-KEYWORDS="amd64 ppc x86"
-
-SLOT="0"
-IUSE=""
-RDEPEND="sys-apps/qingy"
-
-S=${WORKDIR}
-
-src_install()
-{
-	local QINGY_THEMES=/usr/share/qingy/themes
-	dodir ${QINGY_THEMES}
-	cp -dpR * ${D}/${QINGY_THEMES}
-	chown -R root:0 ${D}/${QINGY_THEMES}
-}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 8f7e65105901..f09b997d277c 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -8,6 +8,6 @@ AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b
 AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093
 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965
 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
-EBUILD sane-backends-1.0.27-r1.ebuild 7734 BLAKE2B 244fc0246a9fbacaee6a3a97a7abafe1a0065c181ba34b72551108b7e2e620ffc5dab6f93d94f24b74d6a35cca5650463b8752fa09a2183b6b4d7bd820e34ec5 SHA512 b418d94c56128f2291dce34b13de4b6a56a16ac4d42550f896996fbda78555adc24328eb026a03fc09a88a1ac542c72f6525f3d9e40df8e093ef300f64b72aeb
+EBUILD sane-backends-1.0.27-r1.ebuild 7732 BLAKE2B 4d5fda37f6cabcfd08ef88f8c52e7ec5abff90c646ca0484df1957b465977aec9d7a7d1a3414c6891548feb8c7f263746ac6c56e0cee276a4e2b8f5fa88a871a SHA512 e7ae3b45637547b32ee087a9447c59a1b87131dc312e81583a70c2ebe2662d2fdb6894b3457f33b5f601f5e90723be8bfb71c1090a203285c997907c25da3bbe
 EBUILD sane-backends-1.0.27.ebuild 7913 BLAKE2B f6cdfc03d373fbad3872fdc6f7686d3b006e365860851f821eded0f0cbc661f8ed1d176f6032ca2abfd706afc2846185f09a134ace637e896f3c2e067b748385 SHA512 c228f459e1e62095aa57f75018cd63773cf6c55ef6e24ff28123476f43d8a9798d27d6cc2b6f4d85a79736d824ebc5ca4216199e527158781cf698bcc62b2620
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
index 76ad3f8ec0e5..fe9c0b297e93 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27-r1.ebuild
@@ -122,7 +122,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 5ea5e01489b7..e7d058791789 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -12,6 +12,5 @@ DIST miscsplashutils-0.1.8.tar.bz2 91997 BLAKE2B f0b47b51b7270ce8ba57fd989f289a9
 DIST splashutils-gentoo-1.0.17.tar.bz2 15814 BLAKE2B 8c6e2fea3825e5821ab2a20d0f95dc7050438544b9cdc31dc972e3792050dc7d1687842bfda69f93a721103ced5c7168391f53c0f18906a7def2df4a6fb6127c SHA512 75f1fbfdf165f571b0bf09235235827f370e1b940f1717c4faf5b223caba0b80f853a910ba492c776512aecfafa6e74fd964239bbc6cf412620143d5ffc74167
 DIST splashutils-lite-1.5.4.4.tar.bz2 441340 BLAKE2B a2b348fe675a45d54b25ab60b20f5d4f92e673f5639b674027d0e78496c06948026670e2073c9257a3a0134a18752cc1381b2ba2be2d89d66b711cc7ad68ee2b SHA512 1a78216a1de1fdccff514494d7301640e447c65466e1fe02428e5114485507f67fe4394094880d927d074a8ab2d9c786ba03f9fb0371eb7ab6ef4e3b01aa4613
 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2
-EBUILD splashutils-1.5.4.4-r7.ebuild 6878 BLAKE2B 6f73a0e3a49677b336b16188f45b7d6592e08d446ef9d2de2969b7aeea8367695b1b0fe0d3b919f903a5753d60fa0cf9cea020e11614d700b422dd5321cf3610 SHA512 1b1e328e9b9b06b53d5e676c8dd79d339095194345f94fd135297bccde2afa5044c2a8c16b4ebdef523dce52b8a9075dceabdecc70765312b8baf959c9dd7713
-EBUILD splashutils-1.5.4.4-r8.ebuild 6970 BLAKE2B faa78f97cf0401763e0170397be44df60aca4e00d03d93b67c5075bdcea41d87ae241e5dd032727d96f753a8fc2aba23129c090ab0b19afff845eda65d4f93b1 SHA512 cb4a35904fce48ed971fda59a1a38c64d27684291f6383935dce56532a2b2be0bda5d690e537903f96683293512947b43d21e678fbd9a10f127b27308310eb37
+EBUILD splashutils-1.5.4.4-r8.ebuild 6936 BLAKE2B 41539451da24db7372912edbb76de036a17f2367edbd1997b199c00104dcb8a356dc49898895c02901cf0c3c504fc36ca5a7c6fc03e3fa03e5892a2be0cfc984 SHA512 3bd655e53a90383d5d92c8d3714b555bc5ffcdd0a379ac0066350b8d90d485cd4d1391be21c9894aa30524d657ff74733ef4d2213ddd6b6a56ca8c77d5e8fbd2
 MISC metadata.xml 338 BLAKE2B b1acfec719af910d8c2be2d5224c15c240b2f85ee046e4eb8ebcdd17cfe40c6699d35cf6b2bc68fc73d0bc8ed03643cacd7431409161cfad6a32e551c6ad70ba SHA512 589b371956889ba3388b3c734b51b36605ca0c5e9ba2b1507126cfd805bdc9cd02756c1d8d8b9f10cbffbacecc9e6bd41afc9e8ff505d27612c4d1158fc7cb72
diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r7.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r7.ebuild
deleted file mode 100644
index 06730c581400..000000000000
--- a/media-gfx/splashutils/splashutils-1.5.4.4-r7.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib toolchain-funcs
-
-MISCSPLASH="miscsplashutils-0.1.8"
-GENTOOSPLASH="splashutils-gentoo-1.0.17"
-V_JPEG="8a"
-V_PNG="1.4.3"
-V_ZLIB="1.2.3"
-V_FT="2.3.12"
-
-ZLIBSRC="libs/zlib-${V_ZLIB}"
-LPNGSRC="libs/libpng-${V_PNG}"
-JPEGSRC="libs/jpeg-${V_JPEG}"
-FT2SRC="libs/freetype-${V_FT}"
-
-RESTRICT="test"
-IUSE="hardened +png +truetype gpm fbcondecor"
-
-DESCRIPTION="Framebuffer splash utilities"
-HOMEPAGE="https://sourceforge.net/projects/fbsplash.berlios/"
-SRC_URI="
-	mirror://sourceforge/fbsplash.berlios/${PN}-lite-${PV}.tar.bz2
-	mirror://sourceforge/fbsplash.berlios/${GENTOOSPLASH}.tar.bz2
-	mirror://gentoo/${MISCSPLASH}.tar.bz2
-	mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2
-	ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz
-	mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2
-	http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	gpm? ( sys-libs/gpm[static-libs(+)] )
-	truetype? (
-		>=media-libs/freetype-2[static-libs]
-		app-arch/bzip2[static-libs(+)]
-		sys-libs/zlib[static-libs(+)]
-	)
-	png? (
-		>=media-libs/libpng-1.4.3[static-libs]
-		sys-libs/zlib[static-libs(+)]
-	)
-	virtual/jpeg:0[static-libs]
-	app-arch/cpio
-	media-gfx/fbgrab
-	!sys-apps/lcdsplash
-	sys-apps/openrc"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/klibc-1.5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-SG="${WORKDIR}/${GENTOOSPLASH}"
-SM="${WORKDIR}/${MISCSPLASH}"
-
-pkg_setup() {
-	if use hardened; then
-		ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
-		ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
-		ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
-		ewarn "the splash kernel helper."
-	fi
-}
-
-src_prepare() {
-	mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
-
-	# We need to delete the Makefile and let it be rebuilt when splashutils
-	# is being configured. Either that, or we end up with a segfaulting kernel
-	# helper.
-	rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
-
-	cd "${SG}"
-	epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch"
-	epatch "${FILESDIR}/splashutils-1.5.4.4-sys-queue.patch"
-
-	if use truetype ; then
-		cd "${SM}"
-		epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
-		cd "${WORKDIR}"
-		epatch "${FILESDIR}/splashutils-1.5.4.4-ft25.patch"
-	fi
-
-	cd "${S}"
-	ln -sf "${S}/src" "${WORKDIR}/core"
-
-	#epatch "${FILESDIR}/${P}-bzip2.patch"
-	epatch "${FILESDIR}/${P}-multi-keyboard.patch"
-	# Bug #557126
-	epatch "${FILESDIR}/${P}-no-la.patch"
-
-	if ! tc-is-cross-compiler && \
-	   has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then
-		ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
-		ewarn "splashutils, you're on your own, as this configuration is not supported."
-	else
-		# This should make splashutils compile on systems with hardened GCC.
-		sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
-	fi
-
-	if ! use truetype ; then
-		sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
-	fi
-
-	# Latest version of klibc defined its own version of ferror, so there is
-	# not need for the hack in klibc_compat.h
-	if has_version ">=dev-libs/klibc-1.5.20"; then
-		echo > "libs/klibc_compat.h"
-	fi
-
-	rm -f m4/*
-	epatch_user
-	export PKG_CONFIG="pkg-config --static"
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	cd "${SM}"
-	emake CC="${CC}" LIB=$(get_libdir) STRIP=true
-
-	cd "${S}"
-	econf \
-		$(use_with png) \
-		--without-mng \
-		$(use_with gpm) \
-		$(use_with truetype ttf) \
-		$(use_with truetype ttf-kernel) \
-		$(use_enable fbcondecor) \
-		--docdir=/usr/share/doc/${PF} \
-		--with-freetype2-src=${FT2SRC} \
-		--with-jpeg-src=${JPEGSRC} \
-		--with-lpng-src=${LPNGSRC} \
-		--with-zlib-src=${ZLIBSRC} \
-		--with-essential-libdir=/$(get_libdir)
-}
-
-src_compile() {
-	emake CC="${CC}" STRIP="true"
-
-	cd "${SG}"
-	emake LIB=$(get_libdir)
-}
-
-src_install() {
-	local LIB=$(get_libdir)
-
-	cd "${SM}"
-	emake DESTDIR="${D}" LIB=${LIB} install
-
-	cd "${S}"
-	emake DESTDIR="${D}" STRIP="true" install
-
-	mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
-	gen_usr_ldscript libfbsplash.so
-
-	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
-	doenvd 99splash
-
-	if use fbcondecor ; then
-		newinitd "${SG}"/init-fbcondecor fbcondecor
-		newconfd "${SG}"/fbcondecor.conf fbcondecor
-	fi
-	newconfd "${SG}"/splash.conf splash
-
-	insinto /usr/share/${PN}
-	doins "${SG}"/initrd.splash
-
-	insinto /etc/splash
-	doins "${SM}"/fbtruetype/luxisri.ttf
-
-	cd "${SG}"
-	make DESTDIR="${D}" LIB=${LIB} install
-	prune_libtool_files
-
-	sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
-	keepdir /${LIB}/splash/{tmp,cache,bin,sys}
-	dosym /${LIB}/splash/bin/fbres /sbin/fbres
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-1.0"
-	previous_less_than_1_0=$?
-
-	has_version "<${CATEGORY}/${PN}-1.5.3"
-	previous_less_than_1_5_3=$?
-}
-
-pkg_postinst() {
-	if has_version sys-fs/devfsd || ! has_version virtual/udev ; then
-		elog "This package has been designed with udev in mind. Other solutions, such as"
-		elog "devfs or a static /dev tree might work, but are generally discouraged and"
-		elog "not supported. If you decide to switch to udev, you might want to have a"
-		elog "look at 'The Gentoo udev Guide', which can be found at"
-		elog "  https://wiki.gentoo.org/wiki/Udev"
-		elog ""
-	fi
-
-	if [[ $previous_less_than_1_0 = 0 ]] ; then
-		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
-		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
-		elog ""
-	fi
-
-	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
-		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
-		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
-		elog "to use fbcondecor, run:"
-		elog "  echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
-		elog "and re-emerge splashutils."
-	fi
-
-	if ! test -f /proc/cmdline ||
-		! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then
-		elog "It is required that you add 'console=tty1' to your kernel"
-		elog "command line parameters."
-		elog ""
-		elog "After these modifications, the relevant part of the kernel command"
-		elog "line might look like:"
-		elog "  splash=silent,fadein,theme:emergence console=tty1"
-		elog ""
-	fi
-
-	if ! has_version 'media-gfx/splash-themes-livecd' &&
-		! has_version 'media-gfx/splash-themes-gentoo'; then
-		elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
-		elog "core splashutils package. To get some themes you might want to emerge:"
-		elog "  media-gfx/splash-themes-livecd"
-		elog "  media-gfx/splash-themes-gentoo"
-	fi
-}
diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild
index 8b09df6c5e92..824b27602945 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.4-r8.ebuild
@@ -33,10 +33,9 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
-	elibc_musl? ( sys-libs/queue )
 	gpm? ( sys-libs/gpm[static-libs(+)] )
 	truetype? (
 		>=media-libs/freetype-2[static-libs]