Big cleanup_ Removed a lot of old versions, which have equal or better in the portage tree. Further Kicked out some stuff with long dead upstream.

36 files changed, 0 insertions, 6150 deletions

diff --git a/media-libs/libsfml/ChangeLog b/media-libs/libsfml/ChangeLog
deleted file mode 100644
index 9356323..0000000
--- a/media-libs/libsfml/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for media-libs/libsfml
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*libsfml-2.0 (12 Apr 2013)
-
-  02 Sep 2013; Sven Eden <yamakuzure@gmx.net> +libsfml-2.1.ebuild:
-  Version bump.
-
diff --git a/media-libs/libsfml/Manifest b/media-libs/libsfml/Manifest
deleted file mode 100644
index d8e374d..0000000
--- a/media-libs/libsfml/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libsfml-2.0_pre20121126-no-docs.patch 481 SHA256 6cd7d7d8e41fea4090acf81b89b1a2422b314c226e57e85d228062c43b4478f3 SHA512 a798d94bff096c0cffb4d532c5aec16e76a9bec46ef9ef48ecd81c2bdccd505058d0f13676ec573024553d06c251b0d2d762c2183c81c79320054ce5508bb4f9 WHIRLPOOL f4ec37c84a09c788406d58da97427dfc14e417fb2113fb5a6f9c2a9556812c222d43313fec1669d884ede3b473b16bc26036ae7635d24e42d47021eb9e1dc1e2
-AUX libsfml-2.0_pre20121126-shared-glew.patch 429 SHA256 c6dd068621dc74795410e374311d9b124c1db47b004647729a93a49759b6e34b SHA512 2bf0d80becd4ed9e4e5311406ed78eddc5af52f7045b9070618be1799e9d2e784a0867dbd2dd804740e91e5bec5a596bced59866845383a930dadea668142205 WHIRLPOOL b65cb7dcd69badf623e5cb457ddc85056e7b4e67c9815545f8edae956dc2d767af842c39452d4b38dc28d81d7c6c2fc71764259a36c789bc046ebae305496094
-DIST libsfml-2.1.tar.gz 9436816 SHA256 4849e2b1bd362949e25a7c4f3fc58001f09a1a2e2999ef7c6c7a69a168518727 SHA512 5a06b34ebaeae15126aa8b8d4a84776cda75482d67161d8d0a2e5d292cc2590e2f3543f98713b3b139a4bd77518b42b3ad8f72b9b90374fac8c2370bf3619b27 WHIRLPOOL 4a978a11db6f9412b56c572649320a7bef47a75f16bdb411378cd4cd9845334d8321d02249551a0963feb55b1246f248d6397da062dd45b47f3ceb905e05fb27
-EBUILD libsfml-2.1.ebuild 1305 SHA256 edceb672ee9f38646e59f44f7794423312446a759b4fd31b194baa92d1f83c8f SHA512 bfdef27866d294d904045317c78b29e5240aa3694e2cefde7380ce61d6d32deb02a6b00b379a151d5be3ecac7ce724072c69f035627d94271e909f19cf43fb38 WHIRLPOOL 3c0e9f5d3083a031614053976416b05e1009f52ea18fae7245f8b5370c9cd52f6f5fbc36a66a0abe08a4c55d9c9958bdb23f2b0230b35fbdc438d103658f8caf
-MISC ChangeLog 231 SHA256 037bdc14314f720a87a549ab3e528bcc0c88ec485caff220f6dc6fa977fce400 SHA512 6a95e20b5b0910edd5b2f83e7cf91a33ad775803853751cce68eaa45b904228d77750024c92d81b32d9eb445b546aa61e33a1e90d0cbf4620446b65acd057f9b WHIRLPOOL 62db8c39eba12b175307bb9be9df9346b795d4b921dce8e728ce3d932a23984ffa9065b8d3512ce0aad51b0403da532cdc413a6fa11b0689d1fc00a32f57330d
-MISC metadata.xml 678 SHA256 56befeaa2bad0d2139834c1a193f107392c208448fdeafd55c65c32a02d620b6 SHA512 f61667e935bd59b88f89fd986584c4b6cf493d1d51dff142b8accedde539599ee65f1bc845e442d62a58bddbf507aaf4bd722146f076ff14e5dadbe333dbe2c0 WHIRLPOOL aaac8afa58426ce082da3b6ec23a10c36a9c650b8bb975d0ca330905c28d1dd91d45f2e11bb218c319a165fc824d9a61a143f6fa3741ff2f8ce1055b1f8d32ab
diff --git a/media-libs/libsfml/files/libsfml-2.0_pre20121126-no-docs.patch b/media-libs/libsfml/files/libsfml-2.0_pre20121126-no-docs.patch
deleted file mode 100644
index c37520c..0000000
--- a/media-libs/libsfml/files/libsfml-2.0_pre20121126-no-docs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libsfml-2.0.0_pre20121126/CMakeLists.txt
-+++ libsfml-2.0.0_pre20121126/CMakeLists.txt
-@@ -211,10 +211,6 @@
-             COMPONENT devel)

- endif()

- 

--install(FILES cmake/Modules/FindSFML.cmake DESTINATION ${INSTALL_MISC_DIR}/cmake/Modules)

--install(FILES license.txt DESTINATION ${INSTALL_MISC_DIR})

--install(FILES readme.txt DESTINATION ${INSTALL_MISC_DIR})

--

- if(WINDOWS)

-     if(ARCH_32BITS)

-         install(FILES extlibs/bin/x86/libsndfile-1.dll DESTINATION bin)

diff --git a/media-libs/libsfml/files/libsfml-2.0_pre20121126-shared-glew.patch b/media-libs/libsfml/files/libsfml-2.0_pre20121126-shared-glew.patch
deleted file mode 100644
index 9f4baf8..0000000
--- a/media-libs/libsfml/files/libsfml-2.0_pre20121126-shared-glew.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsfml-2.0.0_pre20121126/src/SFML/Graphics/CMakeLists.txt
-+++ libsfml-2.0.0_pre20121126/src/SFML/Graphics/CMakeLists.txt
-@@ -102,7 +102,7 @@
- endif()

- 

- # add preprocessor symbols

--add_definitions(-DGLEW_STATIC -DSTBI_FAILURE_USERMSG)

-+add_definitions(-DSTBI_FAILURE_USERMSG)

- 

- # ImageLoader.cpp must be compiled with the -fno-strict-aliasing

- # when gcc is used; otherwise saving PNGs may crash in stb_image_write

diff --git a/media-libs/libsfml/libsfml-2.1.ebuild b/media-libs/libsfml/libsfml-2.1.ebuild
deleted file mode 100644
index 1730b61..0000000
--- a/media-libs/libsfml/libsfml-2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils eutils
-
-MY_P=SFML-${PV}
-
-DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
-HOMEPAGE="http://sfml.sourceforge.net/ https://github.com/LaurentGomila/SFML"
-SRC_URI="https://github.com/LaurentGomila/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples"
-
-RDEPEND="media-libs/freetype:2
-	media-libs/glew
-	media-libs/libpng:0=
-	media-libs/libsndfile
-	media-libs/mesa
-	media-libs/openal
-	sys-libs/zlib
-	virtual/jpeg
-	x11-libs/libX11
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS="readme.txt"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0_pre20121126-no-docs.patch
-	epatch "${FILESDIR}"/${PN}-2.0_pre20121126-shared-glew.patch
-
-	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
-		doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use doc SFML_BUILD_DOC)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-		find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete
-	fi
-}
diff --git a/media-libs/libsfml/metadata.xml b/media-libs/libsfml/metadata.xml
deleted file mode 100644
index c1fe12d..0000000
--- a/media-libs/libsfml/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-	<longdescription lang="en">
-	The Simple and Fast Multimedia Library (SFML) is a portable and easy to use
-	multimedia API written in C++. You can see it as a modern, object-oriented
-	alternative to SDL. SFML is composed of several packages to suit your needs.
-	You can use SFML as a minimal windowing system to interface with OpenGL, or
-	as a fully-featured multimedia library for building games or interactive
-	programs.
-	</longdescription>
-</pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
deleted file mode 100644
index 6d09e0a..0000000
--- a/media-libs/mesa/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-AUX eselect-mesa.conf.9.2 1676 SHA256 bcf5f77140b4695f147d4cd3c2db4b954fb57eccfd4475c7f7c4866edda8436e SHA512 d0061359638c0d9729ba1035fd7740c84d59f538adc11af2ee671b5ddbc83c420159efbefcc39ea680f06d20507f1e1d76b528712a07baeca901a413ba7b55df WHIRLPOOL 0fc650223a1910305bb2c4b7b946ac8b83b5b1ba0b79b586a96303a369b30c9c03dc658a6e8e9a29c5c4605f3865e245be0a0e6a27c40ac37402e8a2616b3ace
-AUX glx_ro_text_segm.patch 731 SHA256 e36af5b530fdbe2b0e62a035bf4bf4baef267c3dc56133d1a58e56899ebffc5c SHA512 90d04d1268cc90e1c5596b49b143895eba99d4e7f7d9bb5f699725c1308e3995edac44e3f61536c7ce70ebf5df84a5a22c18fa84fb54fbddb339f908975bb43c WHIRLPOOL 42171ef67930bebdcfdfcb0c9370234791c6125be760b6419abfff44bd65899982167d6da4d6eb4198383438e6376b4b695109af158083b903071c545160d883
-AUX mesa-10.2-dont-require-llvm-for-r300.patch 547 SHA256 83cfeae33b1e8c84b37ed59c353000eb775978ae3d9035ba8ce4f63a167756fc SHA512 d1cb5a989aa001c99f353d27ab5b28ac05d60050614bbfd76ca5d312e00efcc2b1a2459d30d697b68119310c69512b4195afce6c0ed7f31fb9cf14689a740e27 WHIRLPOOL c06669942d275a9d9f132ec8f51d3ecf23d33cb89cb607ba3a7861f209f283b39a9568513b07e22f0dfcc99339a307d7b2a6b03f261ed583fd4518d3b4d0b464
-AUX mesa-10.3.7-dont-use-clrsb.patch 1140 SHA256 23626c6bf1e502f17f4b9236b512063b41bf52be64f56252f0fc5ce456824d58 SHA512 2d9dd9a56c3bab02e8ec1a1ab4d88c2855746d8243548f197cb43de6e980554447c75e53c07dcd270de7e1c282cf7fdf996e5102a24e47b75e484a18f99092e0 WHIRLPOOL 47b222fb61427bbe2a63ac4b738608e9c3491e6373c33e1d68c79198a111d7668b4cafbac9e58820e8cefae55dffca46ab57dbe91ad819feeb734c32f01020f0
-AUX mesa-10.3.7-format_utils.c.patch 34839 SHA256 81ec8d547d798aa5ef5dfc9f0685291af04f95882608f8e9db39a867f44ab431 SHA512 777597b41c37ced0fb375048cc30c4cac701c6020c70bd0f6fbbc2d6f2c1ac9ece0f6d411d81dd042be7f2fbc17e0536176d8230b93f9eed7d7ddf205ac98bb8 WHIRLPOOL 51a213c415d81250a2bc3ad117581b62c4eed13152a9550b2214a9c63f85a6559b1504e013ae0d8e56d5adcaff053c753aa833d7acbe10185d468fdfed5e1b72
-AUX mesa-10.5.1-fstat-include.patch 1008 SHA256 4d44da3882ae9ae7c5d255189e5ca86569337a53d6aece4c65344c753aa588d3 SHA512 6df3167efe198955198b4eb3e1c883f307ebbeb5ebaa63836f8bddf70173382454de6b0d9cb626bb20a5a649fe355a7d25ed5ce27348d5234df27fb9c920b4b4 WHIRLPOOL b05dee0366e35105a7eac143bd4b59e146b0ca369b522e58d2e9a08c8c35b79e929edeacf90154d826dc7ff40ebc7161cc3a6b663e0418388b8f5f5254747066
-AUX mesa-11.1.2-i965-fix-use-after-free.patch 1874 SHA256 f6c29deb28bf33857b7e9889a199d5373db634d26d5c09bfd6faa7d33df828c1 SHA512 9f4dd00ec9bcab2575957a12f0ca06a7ac3a8edbeefee24a3848013d41886da6697aa1da133efe2437d9ac52e1eb347fc0898fd7ad154336a8d962d3b5cdc6e7 WHIRLPOOL efa644560c5778fd37abdc803e88c9375a131f1c874197cf8115fbdcc8c2ed7ef07c549d810daad13e12b984fb1b40ebae969916d40d4cacc4e006b0ef2163d4
-DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c1f731d0d4b5efb5231063fb6a5b SHA512 bbc027c4146c42aaa160990f5281c71a342d32c10ba56f91da1a60dd4cb7d620ff49b72553d24bc1d87470e2baf9be81b5bdee9abe49d6acc57902fccb9e2e5f WHIRLPOOL 7fa32e70c6aabb84a06f2f852f77eac839aea08726c442742b3d3abdb94a0fd9f033439ab0cb16865f4ee14e1538cb86937856bbdfd1f9090e8e7c43eac52e03
-DIST mesa-11.0.6.tar.xz 7272972 SHA256 8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760 SHA512 946a66803395ef0f4d3b328e981e03a87bb5173a523be5da1dd3363002fceacd8dcbfdbf9716e31bb4247b23cc5ef112b24bb4ef0709b514bc8160c6cbf1dbf3 WHIRLPOOL 19729acb5fbbcff3a99b4d7644750dff4a7a2d41c3f25f2e004938faf0c72abd33e97f5d23d2804f84b957824757b5f64f3a7f54a2dd8999b2a71eb9b1976e0b
-DIST mesa-11.0.9.tar.xz 7282648 SHA256 a1262ff1c66a16ccf341186cf0e57b306b8589eb2cc5ce92ffb6788ab01d2b01 SHA512 8bf9c3bfe61f5d22182b9611d66051d83dfb302cc349921bc1d895acc8681b3e22e77cb360e2f12383fd928793b306f8f98998caa457dc04e3ff4e5561ea78f7 WHIRLPOOL a3477542b5ebfed9b69bd29e7f58a01b02c70d49399afb873744de08e776d712eaca3443f88dbdee25b1d3d35a4eb9dae75a3b9d7d6d652d41cded763836c59a
-DIST mesa-11.1.2.tar.xz 7561920 SHA256 8f72aead896b340ba0f7a4a474bfaf71681f5d675592aec1cb7ba698e319148b SHA512 4037728cbe7c5c492cf1e6d20c61250c0ff4fe82cf89ba1cd6ff029776220160359dce197582d2c3f3f7ba5d76fe6b055515210fc46b59f821fc66f453cb77ae WHIRLPOOL e7a848f542c13eae1a79c89a6bff3fbc0c82041924f1cbecac7eaba6363edebfce568353829c41eb38c0c309e0aa35f36027b0dca262ed54d6627542d74f6bca
-DIST mesa-11.2.0.tar.xz 7856132 SHA256 1c1fed2674abf3f16ed2623e9a5694d6752c293194e18462ebc644a19cfaafb2 SHA512 ce56d9669cb31f465b67fa056428f59c89b60480da1e0b3e293dc740a12ed2ead0574c356017c13dfb4666616843808b9a1b7501eac14fb774981739c7d363b7 WHIRLPOOL 7c2439e836072d7a046605f068c0a50414ac742df622a8a538eb910293e029d84a161531c9b1cf5ecb230c619547cf10cda7eb12e0744903b22c8e813f8b53eb
-EBUILD mesa-10.3.7-r2.ebuild 14754 SHA256 83a79c384fb68cba52d248c8206364e2d80b8a3f241999033b72ea90ceb57d68 SHA512 c76f2fa6e50f40503c3edcd0b914e6b40395c38124cb8ab1627d03466c812669fb5e1998a7b7902cf31dd08b56fe4d04f4f084814c4afbc3b440b24a2ce75b89 WHIRLPOOL d8ea02374f2049e4d6084ea797c21427e832ceeebf1389ed2ee83e65eefd2df0d00cbe0a1dd190d531eb8a1cba7af1bcb2be73badee789ca3d02cb6b452449ef
-EBUILD mesa-11.0.6-r1.ebuild 12794 SHA256 be260268f7fe067e9fe53bb3cc8be53fa3f164ed9e6ee6fd3a1e27902c80f9db SHA512 cd881dcb3562d25f170ff2d71cef73247607decbdac31a8fa5c03de2f5316995d803cbd2816be27865f16e7e3f6d8de027cd868b3002aa065578b567092a107f WHIRLPOOL 9aee7703149a4e31aeec5a01a90eea5dfe9347279f481c442725c21916170530ef58e44eb2004b0eb5e843405a2a4c26a975ff8642679e071605fb64e9cfe867
-EBUILD mesa-11.0.9-r1.ebuild 12677 SHA256 c382e9539ec4bf4e794f574ceae6fba9cf992599b6d385b36ac05a2994ef97fa SHA512 b86e42fe3ce6c650952f497bd6681d29bc9ff199a2fd05ed5591550d30626ea3fe30aad237ae5f3e67c1c570a79c01dcd344c10ff3d6fceb375730c82e3b5b62 WHIRLPOOL 6e7382849661417e28ebe06f2e0eba22f52f4e774a486e142ccded6d279dc071036a5b2b1b923d636bb0aa6a03770681c9f5aa23aa133896752b5261d8ceea70
-EBUILD mesa-11.1.2-r2.ebuild 12742 SHA256 aa09c598c808f6dbc8c69181d8e53b1d10b1d49f3c7af32a5c6a16c370343094 SHA512 30ec7921694ee073bb00d1434bf592d9b5b61ea9ef8da72efd1b7d0fbe2fe0d42acc95d9d0ffb5cd3468ec139b66ef47e0125649e949446079e5f2f4ed91806f WHIRLPOOL db9d8e25552b9dc369fde87dcf4e370c2bafb4a5dc26e910b751af31b5761de6ca695f40f4ceeb0986eb9bf44bebf9acfc2aabcecea2f3967f63442cad100383
-EBUILD mesa-11.2.0-r1.ebuild 12761 SHA256 4a6c29e6c335fe1d402c86bab24c5777b7e5b06ba2786c249b50ee2e2a443e84 SHA512 2fe8560ea682588e965f237ac1e223178d91313fbf9fd6102434512328bd809aabe914cfd43c0555a72b6be7f375e63d867c2e97a6641286c96a342b73d8cbef WHIRLPOOL 9858be3b855bcad6b4f3eaab9b4a7c6814d0428a0ad053f669e9513e131e61fecc1dc7bbd262a57dde1f54e6082e4579606f780d1bfea4ffeb2ea9b85a4b62d8
-EBUILD mesa-9999-r1.ebuild 12761 SHA256 4a6c29e6c335fe1d402c86bab24c5777b7e5b06ba2786c249b50ee2e2a443e84 SHA512 2fe8560ea682588e965f237ac1e223178d91313fbf9fd6102434512328bd809aabe914cfd43c0555a72b6be7f375e63d867c2e97a6641286c96a342b73d8cbef WHIRLPOOL 9858be3b855bcad6b4f3eaab9b4a7c6814d0428a0ad053f669e9513e131e61fecc1dc7bbd262a57dde1f54e6082e4579606f780d1bfea4ffeb2ea9b85a4b62d8
-MISC metadata.xml 2119 SHA256 d8d4890f21345584ed206257047651bd020cfe34e762e63e5be9d3ac883680fe SHA512 9726a4bfc69e16da0ae8bb947a91e6e6ce046afa836a861fa381a41cc7f4ffbcfb7fb1262c1d06a55750b1d6c3fd09860b25e0696d74467fa2134811c268553a WHIRLPOOL fb4a2c866f6e027e3ab4f3262b8fb2b7eb37dd094713015a6163c1f9579df49cec6e51a2a4f2ac6265fb89d9f733ce0ccb1c0c4f168a87e40446baa4c3500dfd
diff --git a/media-libs/mesa/files/eselect-mesa.conf.9.2 b/media-libs/mesa/files/eselect-mesa.conf.9.2
deleted file mode 100644
index ff590f5..0000000
--- a/media-libs/mesa/files/eselect-mesa.conf.9.2
+++ /dev/null
@@ -1,39 +0,0 @@
-# mesa classic/gallium implementations in this release
-
-# Syntax description:
-# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable
-#   classic/gallium implementations.
-# * MESA_DRIVERS is an associative array, for each member "foo" of
-#   MESA_IMPLEMENTATIONS it contains the following elements:
-#   foo,description - Human-readable description of the driver
-#   foo,classicdriver - Filename of the classic driver
-#   foo,galliumdriver - Filename of the gallium driver
-#   foo,default - which of classic or gallium is chosen by default
-
-MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw"
-declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not associative."
-
-MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)"
-MESA_DRIVERS[i915,classicdriver]="i915_dri.so"
-MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so"
-MESA_DRIVERS[i915,default]="gallium"
-
-MESA_DRIVERS[i965,description]="i965 (Intel GMA 965, G/Q3x, G/Q4x, HD)"
-MESA_DRIVERS[i965,classicdriver]="i965_dri.so"
-MESA_DRIVERS[i965,galliumdriver]="ilo_dri.so"
-MESA_DRIVERS[i965,default]="classic"
-
-MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)"
-MESA_DRIVERS[r300,classicdriver]="r300_dri.so"
-MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so"
-MESA_DRIVERS[r300,default]="gallium"
-
-MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700, Evergreen, Northern Islands)"
-MESA_DRIVERS[r600,classicdriver]="r600_dri.so"
-MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so"
-MESA_DRIVERS[r600,default]="gallium"
-
-MESA_DRIVERS[sw,description]="sw (Software renderer)"
-MESA_DRIVERS[sw,classicdriver]="swrast_dri.so"
-MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so"
-MESA_DRIVERS[sw,default]="gallium"
diff --git a/media-libs/mesa/files/glx_ro_text_segm.patch b/media-libs/mesa/files/glx_ro_text_segm.patch
deleted file mode 100644
index 495b7dc..0000000
--- a/media-libs/mesa/files/glx_ro_text_segm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-2011-02-09	Jeremy Huddleston <jeremyhu@freedesktop.org
-
-	#240956
-	* configure.ac	add support to enable readonly test segment on x86
-
---- configure.ac.orig	2008-11-17 23:19:38.000000000 +0100
-+++ configure.ac	2008-11-17 23:20:17.000000000 +0100
-@@ -499,6 +499,20 @@
-     enable_xcb=no
- fi
- 
-+
-+dnl readonly text segment on x86 hardened platforms
-+AC_ARG_ENABLE([glx_rts],
-+    [AS_HELP_STRING([--enable-glx-rts],
-+        [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])],
-+    [enable_glx_rts="$enableval"],
-+    [enable_glx_rts=no])
-+if test "x$enable_glx_rts" = xyes; then
-+    DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT"
-+else
-+    enable_glx_rts=no
-+fi
-+
-+
- dnl
- dnl libGL configuration per driver
- dnl
diff --git a/media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch
deleted file mode 100644
index a85a3c1..0000000
--- a/media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac	2014-03-03 04:05:33.110522943 +0100
-+++ b/configure.ac	2014-03-03 04:06:44.165518094 +0100
-@@ -1774,7 +1774,6 @@
-             HAVE_GALLIUM_R300=yes
-             PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
-             gallium_require_drm_loader
--            gallium_require_llvm "Gallium R300"
-             GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
-             gallium_check_st "radeon/drm" "r300/dri" "" "" ""
-             DRICOMMON_NEED_LIBDRM=yes
diff --git a/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch b/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch
deleted file mode 100644
index c38757d..0000000
--- a/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 32e98e8ef06f0bb6ad55f9fb5858be77c03367b0 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Mon, 2 Feb 2015 17:26:49 -0800
-Subject: [PATCH] gallium/util: Don't use __builtin_clrsb in util_last_bit().
-
-Unclear circumstances lead to undefined symbols on x86.
-
-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=536916
-Cc: mesa-stable@lists.freedesktop.org
-Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
----
- src/gallium/auxiliary/util/u_math.h | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
-index 19c7343..ca6d0f1 100644
---- a/src/gallium/auxiliary/util/u_math.h
-+++ b/src/gallium/auxiliary/util/u_math.h
-@@ -561,14 +561,10 @@ util_last_bit(unsigned u)
- static INLINE unsigned
- util_last_bit_signed(int i)
- {
--#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407) && !defined(__INTEL_COMPILER)
--   return 31 - __builtin_clrsb(i);
--#else
-    if (i >= 0)
-       return util_last_bit(i);
-    else
-       return util_last_bit(~(unsigned)i);
--#endif
- }
- 
- /* Destructively loop over all of the bits in a mask as in:
--- 
-2.0.4
-
diff --git a/media-libs/mesa/files/mesa-10.3.7-format_utils.c.patch b/media-libs/mesa/files/mesa-10.3.7-format_utils.c.patch
deleted file mode 100644
index e1fba03..0000000
--- a/media-libs/mesa/files/mesa-10.3.7-format_utils.c.patch
+++ /dev/null
@@ -1,1089 +0,0 @@
-From cfeb394224f2daeb2139cf4ec489a4dd8297a44d Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 12 Sep 2014 08:31:15 -0600
-Subject: [PATCH] mesa: break up _mesa_swizzle_and_convert() to reduce compile
- time
-
-This reduces gcc -O3 compile time to 1/4 of what it was on my system.
-Reduces MSVC release build time too.
-
-Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
----
- src/mesa/main/format_utils.c | 1030 ++++++++++++++++++++++--------------------
- 1 file changed, 550 insertions(+), 480 deletions(-)
-
-diff --git a/src/mesa/main/format_utils.c b/src/mesa/main/format_utils.c
-index 240e3bc..29d779a 100644
---- a/src/mesa/main/format_utils.c
-+++ b/src/mesa/main/format_utils.c
-@@ -352,9 +352,14 @@ swizzle_convert_try_memcpy(void *dst, GLenum dst_type, int num_dst_channels,
-  */
- #define SWIZZLE_CONVERT(DST_TYPE, SRC_TYPE, CONV)                 \
-    do {                                                           \
-+      const uint8_t swizzle_x = swizzle[0];                       \
-+      const uint8_t swizzle_y = swizzle[1];                       \
-+      const uint8_t swizzle_z = swizzle[2];                       \
-+      const uint8_t swizzle_w = swizzle[3];                       \
-       const SRC_TYPE *typed_src = void_src;                       \
-       DST_TYPE *typed_dst = void_dst;                             \
-       DST_TYPE tmp[7];                                            \
-+      int s, j;                                                   \
-       tmp[4] = 0;                                                 \
-       tmp[5] = one;                                               \
-       switch (num_dst_channels) {                                 \
-@@ -423,7 +428,527 @@ swizzle_convert_try_memcpy(void *dst, GLenum dst_type, int num_dst_channels,
-          }                                                        \
-          break;                                                   \
-       }                                                           \
--   } while (0);
-+   } while (0)
-+
-+
-+static void
-+convert_float(void *void_dst, int num_dst_channels,
-+              const void *void_src, GLenum src_type, int num_src_channels,
-+              const uint8_t swizzle[4], bool normalized, int count)
-+{
-+   const float one = 1.0f;
-+
-+   switch (src_type) {
-+   case GL_FLOAT:
-+      SWIZZLE_CONVERT(float, float, src);
-+      break;
-+   case GL_HALF_FLOAT:
-+      SWIZZLE_CONVERT(float, uint16_t, _mesa_half_to_float(src));
-+      break;
-+   case GL_UNSIGNED_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(float, uint8_t, unorm_to_float(src, 8));
-+      } else {
-+         SWIZZLE_CONVERT(float, uint8_t, src);
-+      }
-+      break;
-+   case GL_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(float, int8_t, snorm_to_float(src, 8));
-+      } else {
-+         SWIZZLE_CONVERT(float, int8_t, src);
-+      }
-+      break;
-+   case GL_UNSIGNED_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(float, uint16_t, unorm_to_float(src, 16));
-+      } else {
-+         SWIZZLE_CONVERT(float, uint16_t, src);
-+      }
-+      break;
-+   case GL_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(float, int16_t, snorm_to_float(src, 16));
-+      } else {
-+         SWIZZLE_CONVERT(float, int16_t, src);
-+      }
-+      break;
-+   case GL_UNSIGNED_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(float, uint32_t, unorm_to_float(src, 32));
-+      } else {
-+         SWIZZLE_CONVERT(float, uint32_t, src);
-+      }
-+      break;
-+   case GL_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(float, int32_t, snorm_to_float(src, 32));
-+      } else {
-+         SWIZZLE_CONVERT(float, int32_t, src);
-+      }
-+      break;
-+   default:
-+      assert(!"Invalid channel type combination");
-+   }
-+}
-+
-+
-+static void
-+convert_half_float(void *void_dst, int num_dst_channels,
-+                   const void *void_src, GLenum src_type, int num_src_channels,
-+                   const uint8_t swizzle[4], bool normalized, int count)
-+{
-+   const uint16_t one = _mesa_float_to_half(1.0f);
-+
-+   switch (src_type) {
-+   case GL_FLOAT:
-+      SWIZZLE_CONVERT(uint16_t, float, _mesa_float_to_half(src));
-+      break;
-+   case GL_HALF_FLOAT:
-+      SWIZZLE_CONVERT(uint16_t, uint16_t, src);
-+      break;
-+   case GL_UNSIGNED_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, uint8_t, unorm_to_half(src, 8));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, uint8_t, _mesa_float_to_half(src));
-+      }
-+      break;
-+   case GL_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, int8_t, snorm_to_half(src, 8));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, int8_t, _mesa_float_to_half(src));
-+      }
-+      break;
-+   case GL_UNSIGNED_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, uint16_t, unorm_to_half(src, 16));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, uint16_t, _mesa_float_to_half(src));
-+      }
-+      break;
-+   case GL_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, int16_t, snorm_to_half(src, 16));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, int16_t, _mesa_float_to_half(src));
-+      }
-+      break;
-+   case GL_UNSIGNED_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, uint32_t, unorm_to_half(src, 32));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, uint32_t, _mesa_float_to_half(src));
-+      }
-+      break;
-+   case GL_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, int32_t, snorm_to_half(src, 32));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, int32_t, _mesa_float_to_half(src));
-+      }
-+      break;
-+   default:
-+      assert(!"Invalid channel type combination");
-+   }
-+}
-+
-+
-+static void
-+convert_ubyte(void *void_dst, int num_dst_channels,
-+              const void *void_src, GLenum src_type, int num_src_channels,
-+              const uint8_t swizzle[4], bool normalized, int count)
-+{
-+   const uint8_t one = normalized ? UINT8_MAX : 1;
-+
-+   switch (src_type) {
-+   case GL_FLOAT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint8_t, float, float_to_unorm(src, 8));
-+      } else {
-+         SWIZZLE_CONVERT(uint8_t, float, (src < 0) ? 0 : src);
-+      }
-+      break;
-+   case GL_HALF_FLOAT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_unorm(src, 8));
-+      } else {
-+         SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_uint(src));
-+      }
-+      break;
-+   case GL_UNSIGNED_BYTE:
-+      SWIZZLE_CONVERT(uint8_t, uint8_t, src);
-+      break;
-+   case GL_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint8_t, int8_t, snorm_to_unorm(src, 8, 8));
-+      } else {
-+         SWIZZLE_CONVERT(uint8_t, int8_t, (src < 0) ? 0 : src);
-+      }
-+      break;
-+   case GL_UNSIGNED_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint8_t, uint16_t, unorm_to_unorm(src, 16, 8));
-+      } else {
-+         SWIZZLE_CONVERT(uint8_t, uint16_t, src);
-+      }
-+      break;
-+   case GL_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint8_t, int16_t, snorm_to_unorm(src, 16, 8));
-+      } else {
-+         SWIZZLE_CONVERT(uint8_t, int16_t, (src < 0) ? 0 : src);
-+      }
-+      break;
-+   case GL_UNSIGNED_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint8_t, uint32_t, unorm_to_unorm(src, 32, 8));
-+      } else {
-+         SWIZZLE_CONVERT(uint8_t, uint32_t, src);
-+      }
-+      break;
-+   case GL_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint8_t, int32_t, snorm_to_unorm(src, 32, 8));
-+      } else {
-+         SWIZZLE_CONVERT(uint8_t, int32_t, (src < 0) ? 0 : src);
-+      }
-+      break;
-+   default:
-+      assert(!"Invalid channel type combination");
-+   }
-+}
-+
-+
-+static void
-+convert_byte(void *void_dst, int num_dst_channels,
-+             const void *void_src, GLenum src_type, int num_src_channels,
-+             const uint8_t swizzle[4], bool normalized, int count)
-+{
-+   const int8_t one = normalized ? INT8_MAX : 1;
-+
-+   switch (src_type) {
-+   case GL_FLOAT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint8_t, float, float_to_snorm(src, 8));
-+      } else {
-+         SWIZZLE_CONVERT(uint8_t, float, src);
-+      }
-+      break;
-+   case GL_HALF_FLOAT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_snorm(src, 8));
-+      } else {
-+         SWIZZLE_CONVERT(uint8_t, uint16_t, _mesa_half_to_float(src));
-+      }
-+      break;
-+   case GL_UNSIGNED_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int8_t, uint8_t, unorm_to_snorm(src, 8, 8));
-+      } else {
-+         SWIZZLE_CONVERT(int8_t, uint8_t, src);
-+      }
-+      break;
-+   case GL_BYTE:
-+      SWIZZLE_CONVERT(int8_t, int8_t, src);
-+      break;
-+   case GL_UNSIGNED_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int8_t, uint16_t, unorm_to_snorm(src, 16, 8));
-+      } else {
-+         SWIZZLE_CONVERT(int8_t, uint16_t, src);
-+      }
-+      break;
-+   case GL_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int8_t, int16_t, snorm_to_snorm(src, 16, 8));
-+      } else {
-+         SWIZZLE_CONVERT(int8_t, int16_t, src);
-+      }
-+      break;
-+   case GL_UNSIGNED_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int8_t, uint32_t, unorm_to_snorm(src, 32, 8));
-+      } else {
-+         SWIZZLE_CONVERT(int8_t, uint32_t, src);
-+      }
-+      break;
-+   case GL_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int8_t, int32_t, snorm_to_snorm(src, 32, 8));
-+      } else {
-+         SWIZZLE_CONVERT(int8_t, int32_t, src);
-+      }
-+      break;
-+   default:
-+      assert(!"Invalid channel type combination");
-+   }
-+}
-+
-+
-+static void
-+convert_ushort(void *void_dst, int num_dst_channels,
-+               const void *void_src, GLenum src_type, int num_src_channels,
-+               const uint8_t swizzle[4], bool normalized, int count)
-+{
-+   const uint16_t one = normalized ? UINT16_MAX : 1;
-+   
-+   switch (src_type) {
-+   case GL_FLOAT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, float, float_to_unorm(src, 16));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, float, (src < 0) ? 0 : src);
-+      }
-+      break;
-+   case GL_HALF_FLOAT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_unorm(src, 16));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_uint(src));
-+      }
-+      break;
-+   case GL_UNSIGNED_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, uint8_t, unorm_to_unorm(src, 8, 16));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, uint8_t, src);
-+      }
-+      break;
-+   case GL_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, int8_t, snorm_to_unorm(src, 8, 16));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, int8_t, (src < 0) ? 0 : src);
-+      }
-+      break;
-+   case GL_UNSIGNED_SHORT:
-+      SWIZZLE_CONVERT(uint16_t, uint16_t, src);
-+      break;
-+   case GL_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, int16_t, snorm_to_unorm(src, 16, 16));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, int16_t, (src < 0) ? 0 : src);
-+      }
-+      break;
-+   case GL_UNSIGNED_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, uint32_t, unorm_to_unorm(src, 32, 16));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, uint32_t, src);
-+      }
-+      break;
-+   case GL_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, int32_t, snorm_to_unorm(src, 32, 16));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, int32_t, (src < 0) ? 0 : src);
-+      }
-+      break;
-+   default:
-+      assert(!"Invalid channel type combination");
-+   }
-+}
-+
-+
-+static void
-+convert_short(void *void_dst, int num_dst_channels,
-+              const void *void_src, GLenum src_type, int num_src_channels,
-+              const uint8_t swizzle[4], bool normalized, int count)
-+{
-+   const int16_t one = normalized ? INT16_MAX : 1;
-+
-+   switch (src_type) {
-+   case GL_FLOAT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, float, float_to_snorm(src, 16));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, float, src);
-+      }
-+      break;
-+   case GL_HALF_FLOAT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_snorm(src, 16));
-+      } else {
-+         SWIZZLE_CONVERT(uint16_t, uint16_t, _mesa_half_to_float(src));
-+      }
-+      break;
-+   case GL_UNSIGNED_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int16_t, uint8_t, unorm_to_snorm(src, 8, 16));
-+      } else {
-+         SWIZZLE_CONVERT(int16_t, uint8_t, src);
-+      }
-+      break;
-+   case GL_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int16_t, int8_t, snorm_to_snorm(src, 8, 16));
-+      } else {
-+         SWIZZLE_CONVERT(int16_t, int8_t, src);
-+      }
-+      break;
-+   case GL_UNSIGNED_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int16_t, uint16_t, unorm_to_snorm(src, 16, 16));
-+      } else {
-+         SWIZZLE_CONVERT(int16_t, uint16_t, src);
-+      }
-+      break;
-+   case GL_SHORT:
-+      SWIZZLE_CONVERT(int16_t, int16_t, src);
-+      break;
-+   case GL_UNSIGNED_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int16_t, uint32_t, unorm_to_snorm(src, 32, 16));
-+      } else {
-+         SWIZZLE_CONVERT(int16_t, uint32_t, src);
-+      }
-+      break;
-+   case GL_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int16_t, int32_t, snorm_to_snorm(src, 32, 16));
-+      } else {
-+         SWIZZLE_CONVERT(int16_t, int32_t, src);
-+      }
-+      break;
-+   default:
-+      assert(!"Invalid channel type combination");
-+   }
-+}
-+
-+static void
-+convert_uint(void *void_dst, int num_dst_channels,
-+             const void *void_src, GLenum src_type, int num_src_channels,
-+             const uint8_t swizzle[4], bool normalized, int count)
-+{
-+   const uint32_t one = normalized ? UINT32_MAX : 1;
-+
-+   switch (src_type) {
-+   case GL_FLOAT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint32_t, float, float_to_unorm(src, 32));
-+      } else {
-+         SWIZZLE_CONVERT(uint32_t, float, (src < 0) ? 0 : src);
-+      }
-+      break;
-+   case GL_HALF_FLOAT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_unorm(src, 32));
-+      } else {
-+         SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_uint(src));
-+      }
-+      break;
-+   case GL_UNSIGNED_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint32_t, uint8_t, unorm_to_unorm(src, 8, 32));
-+      } else {
-+         SWIZZLE_CONVERT(uint32_t, uint8_t, src);
-+      }
-+      break;
-+   case GL_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint32_t, int8_t, snorm_to_unorm(src, 8, 32));
-+      } else {
-+         SWIZZLE_CONVERT(uint32_t, int8_t, (src < 0) ? 0 : src);
-+      }
-+      break;
-+   case GL_UNSIGNED_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint32_t, uint16_t, unorm_to_unorm(src, 16, 32));
-+      } else {
-+         SWIZZLE_CONVERT(uint32_t, uint16_t, src);
-+      }
-+      break;
-+   case GL_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint32_t, int16_t, snorm_to_unorm(src, 16, 32));
-+      } else {
-+         SWIZZLE_CONVERT(uint32_t, int16_t, (src < 0) ? 0 : src);
-+      }
-+      break;
-+   case GL_UNSIGNED_INT:
-+      SWIZZLE_CONVERT(uint32_t, uint32_t, src);
-+      break;
-+   case GL_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint32_t, int32_t, snorm_to_unorm(src, 32, 32));
-+      } else {
-+         SWIZZLE_CONVERT(uint32_t, int32_t, (src < 0) ? 0 : src);
-+      }
-+      break;
-+   default:
-+      assert(!"Invalid channel type combination");
-+   }
-+}
-+
-+
-+static void
-+convert_int(void *void_dst, int num_dst_channels,
-+            const void *void_src, GLenum src_type, int num_src_channels,
-+            const uint8_t swizzle[4], bool normalized, int count)
-+{
-+   const int32_t one = normalized ? INT32_MAX : 12;
-+
-+   switch (src_type) {
-+   case GL_FLOAT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint32_t, float, float_to_snorm(src, 32));
-+      } else {
-+         SWIZZLE_CONVERT(uint32_t, float, src);
-+      }
-+      break;
-+   case GL_HALF_FLOAT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_snorm(src, 32));
-+      } else {
-+         SWIZZLE_CONVERT(uint32_t, uint16_t, _mesa_half_to_float(src));
-+      }
-+      break;
-+   case GL_UNSIGNED_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int32_t, uint8_t, unorm_to_snorm(src, 8, 32));
-+      } else {
-+         SWIZZLE_CONVERT(int32_t, uint8_t, src);
-+      }
-+      break;
-+   case GL_BYTE:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int32_t, int8_t, snorm_to_snorm(src, 8, 32));
-+      } else {
-+         SWIZZLE_CONVERT(int32_t, int8_t, src);
-+      }
-+      break;
-+   case GL_UNSIGNED_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int32_t, uint16_t, unorm_to_snorm(src, 16, 32));
-+      } else {
-+         SWIZZLE_CONVERT(int32_t, uint16_t, src);
-+      }
-+      break;
-+   case GL_SHORT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int32_t, int16_t, snorm_to_snorm(src, 16, 32));
-+      } else {
-+         SWIZZLE_CONVERT(int32_t, int16_t, src);
-+      }
-+      break;
-+   case GL_UNSIGNED_INT:
-+      if (normalized) {
-+         SWIZZLE_CONVERT(int32_t, uint32_t, unorm_to_snorm(src, 32, 32));
-+      } else {
-+         SWIZZLE_CONVERT(int32_t, uint32_t, src);
-+      }
-+      break;
-+   case GL_INT:
-+      SWIZZLE_CONVERT(int32_t, int32_t, src);
-+      break;
-+   default:
-+      assert(!"Invalid channel type combination");
-+   }
-+}
-+
- 
- /**
-  * Convert between array-based color formats.
-@@ -478,499 +1003,44 @@ _mesa_swizzle_and_convert(void *void_dst, GLenum dst_type, int num_dst_channels,
-                           const void *void_src, GLenum src_type, int num_src_channels,
-                           const uint8_t swizzle[4], bool normalized, int count)
- {
--   int s, j;
--   register uint8_t swizzle_x, swizzle_y, swizzle_z, swizzle_w;
--
-    if (swizzle_convert_try_memcpy(void_dst, dst_type, num_dst_channels,
-                                   void_src, src_type, num_src_channels,
-                                   swizzle, normalized, count))
-       return;
- 
--   swizzle_x = swizzle[0];
--   swizzle_y = swizzle[1];
--   swizzle_z = swizzle[2];
--   swizzle_w = swizzle[3];
--
-    switch (dst_type) {
-    case GL_FLOAT:
--   {
--      const float one = 1.0f;
--      switch (src_type) {
--      case GL_FLOAT:
--         SWIZZLE_CONVERT(float, float, src)
--         break;
--      case GL_HALF_FLOAT:
--         SWIZZLE_CONVERT(float, uint16_t, _mesa_half_to_float(src))
--         break;
--      case GL_UNSIGNED_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(float, uint8_t, unorm_to_float(src, 8))
--         } else {
--            SWIZZLE_CONVERT(float, uint8_t, src)
--         }
--         break;
--      case GL_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(float, int8_t, snorm_to_float(src, 8))
--         } else {
--            SWIZZLE_CONVERT(float, int8_t, src)
--         }
--         break;
--      case GL_UNSIGNED_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(float, uint16_t, unorm_to_float(src, 16))
--         } else {
--            SWIZZLE_CONVERT(float, uint16_t, src)
--         }
--         break;
--      case GL_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(float, int16_t, snorm_to_float(src, 16))
--         } else {
--            SWIZZLE_CONVERT(float, int16_t, src)
--         }
--         break;
--      case GL_UNSIGNED_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(float, uint32_t, unorm_to_float(src, 32))
--         } else {
--            SWIZZLE_CONVERT(float, uint32_t, src)
--         }
--         break;
--      case GL_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(float, int32_t, snorm_to_float(src, 32))
--         } else {
--            SWIZZLE_CONVERT(float, int32_t, src)
--         }
--         break;
--      default:
--         assert(!"Invalid channel type combination");
--      }
--   }
--   break;
-+      convert_float(void_dst, num_dst_channels, void_src, src_type,
-+                    num_src_channels, swizzle, normalized, count);
-+      break;
-    case GL_HALF_FLOAT:
--   {
--      const uint16_t one = _mesa_float_to_half(1.0f);
--      switch (src_type) {
--      case GL_FLOAT:
--         SWIZZLE_CONVERT(uint16_t, float, _mesa_float_to_half(src))
--         break;
--      case GL_HALF_FLOAT:
--         SWIZZLE_CONVERT(uint16_t, uint16_t, src)
--         break;
--      case GL_UNSIGNED_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, uint8_t, unorm_to_half(src, 8))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, uint8_t, _mesa_float_to_half(src))
--         }
--         break;
--      case GL_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, int8_t, snorm_to_half(src, 8))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, int8_t, _mesa_float_to_half(src))
--         }
--         break;
--      case GL_UNSIGNED_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, uint16_t, unorm_to_half(src, 16))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, uint16_t, _mesa_float_to_half(src))
--         }
--         break;
--      case GL_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, int16_t, snorm_to_half(src, 16))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, int16_t, _mesa_float_to_half(src))
--         }
--         break;
--      case GL_UNSIGNED_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, uint32_t, unorm_to_half(src, 32))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, uint32_t, _mesa_float_to_half(src))
--         }
--         break;
--      case GL_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, int32_t, snorm_to_half(src, 32))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, int32_t, _mesa_float_to_half(src))
--         }
--         break;
--      default:
--         assert(!"Invalid channel type combination");
--      }
--   }
--   break;
-+      convert_half_float(void_dst, num_dst_channels, void_src, src_type,
-+                    num_src_channels, swizzle, normalized, count);
-+      break;
-    case GL_UNSIGNED_BYTE:
--   {
--      const uint8_t one = normalized ? UINT8_MAX : 1;
--      switch (src_type) {
--      case GL_FLOAT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint8_t, float, float_to_unorm(src, 8))
--         } else {
--            SWIZZLE_CONVERT(uint8_t, float, (src < 0) ? 0 : src)
--         }
--         break;
--      case GL_HALF_FLOAT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_unorm(src, 8))
--         } else {
--            SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_uint(src))
--         }
--         break;
--      case GL_UNSIGNED_BYTE:
--         SWIZZLE_CONVERT(uint8_t, uint8_t, src)
--         break;
--      case GL_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint8_t, int8_t, snorm_to_unorm(src, 8, 8))
--         } else {
--            SWIZZLE_CONVERT(uint8_t, int8_t, (src < 0) ? 0 : src)
--         }
--         break;
--      case GL_UNSIGNED_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint8_t, uint16_t, unorm_to_unorm(src, 16, 8))
--         } else {
--            SWIZZLE_CONVERT(uint8_t, uint16_t, src)
--         }
--         break;
--      case GL_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint8_t, int16_t, snorm_to_unorm(src, 16, 8))
--         } else {
--            SWIZZLE_CONVERT(uint8_t, int16_t, (src < 0) ? 0 : src)
--         }
--         break;
--      case GL_UNSIGNED_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint8_t, uint32_t, unorm_to_unorm(src, 32, 8))
--         } else {
--            SWIZZLE_CONVERT(uint8_t, uint32_t, src)
--         }
--         break;
--      case GL_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint8_t, int32_t, snorm_to_unorm(src, 32, 8))
--         } else {
--            SWIZZLE_CONVERT(uint8_t, int32_t, (src < 0) ? 0 : src)
--         }
--         break;
--      default:
--         assert(!"Invalid channel type combination");
--      }
--   }
--   break;
-+      convert_ubyte(void_dst, num_dst_channels, void_src, src_type,
-+                    num_src_channels, swizzle, normalized, count);
-+      break;
-    case GL_BYTE:
--   {
--      const int8_t one = normalized ? INT8_MAX : 1;
--      switch (src_type) {
--      case GL_FLOAT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint8_t, float, float_to_snorm(src, 8))
--         } else {
--            SWIZZLE_CONVERT(uint8_t, float, src)
--         }
--         break;
--      case GL_HALF_FLOAT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_snorm(src, 8))
--         } else {
--            SWIZZLE_CONVERT(uint8_t, uint16_t, _mesa_half_to_float(src))
--         }
--         break;
--      case GL_UNSIGNED_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(int8_t, uint8_t, unorm_to_snorm(src, 8, 8))
--         } else {
--            SWIZZLE_CONVERT(int8_t, uint8_t, src)
--         }
--         break;
--      case GL_BYTE:
--         SWIZZLE_CONVERT(int8_t, int8_t, src)
--         break;
--      case GL_UNSIGNED_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(int8_t, uint16_t, unorm_to_snorm(src, 16, 8))
--         } else {
--            SWIZZLE_CONVERT(int8_t, uint16_t, src)
--         }
--         break;
--      case GL_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(int8_t, int16_t, snorm_to_snorm(src, 16, 8))
--         } else {
--            SWIZZLE_CONVERT(int8_t, int16_t, src)
--         }
--         break;
--      case GL_UNSIGNED_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(int8_t, uint32_t, unorm_to_snorm(src, 32, 8))
--         } else {
--            SWIZZLE_CONVERT(int8_t, uint32_t, src)
--         }
--         break;
--      case GL_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(int8_t, int32_t, snorm_to_snorm(src, 32, 8))
--         } else {
--            SWIZZLE_CONVERT(int8_t, int32_t, src)
--         }
--         break;
--      default:
--         assert(!"Invalid channel type combination");
--      }
--   }
--   break;
-+      convert_byte(void_dst, num_dst_channels, void_src, src_type,
-+                   num_src_channels, swizzle, normalized, count);
-+      break;
-    case GL_UNSIGNED_SHORT:
--   {
--      const uint16_t one = normalized ? UINT16_MAX : 1;
--      switch (src_type) {
--      case GL_FLOAT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, float, float_to_unorm(src, 16))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, float, (src < 0) ? 0 : src)
--         }
--         break;
--      case GL_HALF_FLOAT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_unorm(src, 16))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_uint(src))
--         }
--         break;
--      case GL_UNSIGNED_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, uint8_t, unorm_to_unorm(src, 8, 16))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, uint8_t, src)
--         }
--         break;
--      case GL_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, int8_t, snorm_to_unorm(src, 8, 16))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, int8_t, (src < 0) ? 0 : src)
--         }
--         break;
--      case GL_UNSIGNED_SHORT:
--         SWIZZLE_CONVERT(uint16_t, uint16_t, src)
--         break;
--      case GL_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, int16_t, snorm_to_unorm(src, 16, 16))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, int16_t, (src < 0) ? 0 : src)
--         }
--         break;
--      case GL_UNSIGNED_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, uint32_t, unorm_to_unorm(src, 32, 16))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, uint32_t, src)
--         }
--         break;
--      case GL_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, int32_t, snorm_to_unorm(src, 32, 16))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, int32_t, (src < 0) ? 0 : src)
--         }
--         break;
--      default:
--         assert(!"Invalid channel type combination");
--      }
--   }
--   break;
-+      convert_ushort(void_dst, num_dst_channels, void_src, src_type,
-+                     num_src_channels, swizzle, normalized, count);
-+      break;
-    case GL_SHORT:
--   {
--      const int16_t one = normalized ? INT16_MAX : 1;
--      switch (src_type) {
--      case GL_FLOAT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, float, float_to_snorm(src, 16))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, float, src)
--         }
--         break;
--      case GL_HALF_FLOAT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_snorm(src, 16))
--         } else {
--            SWIZZLE_CONVERT(uint16_t, uint16_t, _mesa_half_to_float(src))
--         }
--         break;
--      case GL_UNSIGNED_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(int16_t, uint8_t, unorm_to_snorm(src, 8, 16))
--         } else {
--            SWIZZLE_CONVERT(int16_t, uint8_t, src)
--         }
--         break;
--      case GL_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(int16_t, int8_t, snorm_to_snorm(src, 8, 16))
--         } else {
--            SWIZZLE_CONVERT(int16_t, int8_t, src)
--         }
--         break;
--      case GL_UNSIGNED_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(int16_t, uint16_t, unorm_to_snorm(src, 16, 16))
--         } else {
--            SWIZZLE_CONVERT(int16_t, uint16_t, src)
--         }
--         break;
--      case GL_SHORT:
--         SWIZZLE_CONVERT(int16_t, int16_t, src)
--         break;
--      case GL_UNSIGNED_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(int16_t, uint32_t, unorm_to_snorm(src, 32, 16))
--         } else {
--            SWIZZLE_CONVERT(int16_t, uint32_t, src)
--         }
--         break;
--      case GL_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(int16_t, int32_t, snorm_to_snorm(src, 32, 16))
--         } else {
--            SWIZZLE_CONVERT(int16_t, int32_t, src)
--         }
--         break;
--      default:
--         assert(!"Invalid channel type combination");
--      }
--   }
--   break;
-+      convert_short(void_dst, num_dst_channels, void_src, src_type,
-+                    num_src_channels, swizzle, normalized, count);
-+      break;
-    case GL_UNSIGNED_INT:
--   {
--      const uint32_t one = normalized ? UINT32_MAX : 1;
--      switch (src_type) { case GL_FLOAT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint32_t, float, float_to_unorm(src, 32))
--         } else {
--            SWIZZLE_CONVERT(uint32_t, float, (src < 0) ? 0 : src)
--         }
--         break;
--      case GL_HALF_FLOAT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_unorm(src, 32))
--         } else {
--            SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_uint(src))
--         }
--         break;
--      case GL_UNSIGNED_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint32_t, uint8_t, unorm_to_unorm(src, 8, 32))
--         } else {
--            SWIZZLE_CONVERT(uint32_t, uint8_t, src)
--         }
--         break;
--      case GL_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint32_t, int8_t, snorm_to_unorm(src, 8, 32))
--         } else {
--            SWIZZLE_CONVERT(uint32_t, int8_t, (src < 0) ? 0 : src)
--         }
--         break;
--      case GL_UNSIGNED_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint32_t, uint16_t, unorm_to_unorm(src, 16, 32))
--         } else {
--            SWIZZLE_CONVERT(uint32_t, uint16_t, src)
--         }
--         break;
--      case GL_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint32_t, int16_t, snorm_to_unorm(src, 16, 32))
--         } else {
--            SWIZZLE_CONVERT(uint32_t, int16_t, (src < 0) ? 0 : src)
--         }
--         break;
--      case GL_UNSIGNED_INT:
--         SWIZZLE_CONVERT(uint32_t, uint32_t, src)
--         break;
--      case GL_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint32_t, int32_t, snorm_to_unorm(src, 32, 32))
--         } else {
--            SWIZZLE_CONVERT(uint32_t, int32_t, (src < 0) ? 0 : src)
--         }
--         break;
--      default:
--         assert(!"Invalid channel type combination");
--      }
--   }
--   break;
-+      convert_uint(void_dst, num_dst_channels, void_src, src_type,
-+                   num_src_channels, swizzle, normalized, count);
-+      break;
-    case GL_INT:
--   {
--      const int32_t one = normalized ? INT32_MAX : 1;
--      switch (src_type) {
--      case GL_FLOAT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint32_t, float, float_to_snorm(src, 32))
--         } else {
--            SWIZZLE_CONVERT(uint32_t, float, src)
--         }
--         break;
--      case GL_HALF_FLOAT:
--         if (normalized) {
--            SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_snorm(src, 32))
--         } else {
--            SWIZZLE_CONVERT(uint32_t, uint16_t, _mesa_half_to_float(src))
--         }
--         break;
--      case GL_UNSIGNED_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(int32_t, uint8_t, unorm_to_snorm(src, 8, 32))
--         } else {
--            SWIZZLE_CONVERT(int32_t, uint8_t, src)
--         }
--         break;
--      case GL_BYTE:
--         if (normalized) {
--            SWIZZLE_CONVERT(int32_t, int8_t, snorm_to_snorm(src, 8, 32))
--         } else {
--            SWIZZLE_CONVERT(int32_t, int8_t, src)
--         }
--         break;
--      case GL_UNSIGNED_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(int32_t, uint16_t, unorm_to_snorm(src, 16, 32))
--         } else {
--            SWIZZLE_CONVERT(int32_t, uint16_t, src)
--         }
--         break;
--      case GL_SHORT:
--         if (normalized) {
--            SWIZZLE_CONVERT(int32_t, int16_t, snorm_to_snorm(src, 16, 32))
--         } else {
--            SWIZZLE_CONVERT(int32_t, int16_t, src)
--         }
--         break;
--      case GL_UNSIGNED_INT:
--         if (normalized) {
--            SWIZZLE_CONVERT(int32_t, uint32_t, unorm_to_snorm(src, 32, 32))
--         } else {
--            SWIZZLE_CONVERT(int32_t, uint32_t, src)
--         }
--         break;
--      case GL_INT:
--         SWIZZLE_CONVERT(int32_t, int32_t, src)
--         break;
--      default:
--         assert(!"Invalid channel type combination");
--      }
--   }
--   break;
-+      convert_int(void_dst, num_dst_channels, void_src, src_type,
-+                  num_src_channels, swizzle, normalized, count);
-+      break;
-    default:
-       assert(!"Invalid channel type");
-    }
--- 
-2.0.5
-
diff --git a/media-libs/mesa/files/mesa-10.5.1-fstat-include.patch b/media-libs/mesa/files/mesa-10.5.1-fstat-include.patch
deleted file mode 100644
index 212d00d..0000000
--- a/media-libs/mesa/files/mesa-10.5.1-fstat-include.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 771cd266b9d00bdcf2cf7acaa3c8363c358d7478 Mon Sep 17 00:00:00 2001
-From: Emil Velikov <emil.l.velikov@gmail.com>
-Date: Wed, 11 Mar 2015 19:12:35 +0000
-Subject: loader: include <sys/stat.h> for non-sysfs builds
-
-Required by fstat(), otherwise we'll error out due to implicit function
-declaration.
-
-Cc: "10.4 10.5" <mesa-stable@lists.freedesktop.org>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89530
-Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-Reported-by: Vadim Rutkovsky <vrutkovs@redhat.com>
-Tested-by: Vadim Rutkovsky <vrutkovs@redhat.com>
-
-diff --git a/src/loader/loader.c b/src/loader/loader.c
-index 9ff5115..17bf133 100644
---- a/src/loader/loader.c
-+++ b/src/loader/loader.c
-@@ -64,6 +64,7 @@
-  *    Rob Clark <robclark@freedesktop.org>
-  */
- 
-+#include <sys/stat.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <string.h>
-@@ -80,7 +81,6 @@
- #endif
- #endif
- #ifdef HAVE_SYSFS
--#include <sys/stat.h>
- #include <sys/types.h>
- #endif
- #include "loader.h"
--- 
-cgit v0.10.2
-
diff --git a/media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch b/media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch
deleted file mode 100644
index 87ad498..0000000
--- a/media-libs/mesa/files/mesa-11.1.2-i965-fix-use-after-free.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1c145df858ba5ab539386692d9350909fb8f8c82 Mon Sep 17 00:00:00 2001
-From: Jason Ekstrand <jason.ekstrand@intel.com>
-Date: Wed, 10 Feb 2016 12:07:49 -0800
-Subject: [PATCH] nir/lower_vec_to_movs: Better report channels handled by
- insert_mov
-
-This fixes two issues.  First, we had a use-after-free in the case where
-the instruction got deleted and we tried to return mov->dest.write_mask.
-Second, in the case where we are doing a self-mov of a register, we delete
-those channels that are moved to themselves from the write-mask.  This
-means that those channels aren't reported as being handled even though they
-are.  We now stash off the write-mask before remove unneeded channels so
-that they still get reported as handled.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94073
-Reviewed-by: Matt Turner <mattst88@gmail.com>
-Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>
-(cherry picked from commit 70dff4a55e767de8b9ce10f055b94ebb1f6a9755)
----
- src/glsl/nir/nir_lower_vec_to_movs.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/glsl/nir/nir_lower_vec_to_movs.c b/src/glsl/nir/nir_lower_vec_to_movs.c
-index 736a66c..0783596 100644
---- a/src/glsl/nir/nir_lower_vec_to_movs.c
-+++ b/src/glsl/nir/nir_lower_vec_to_movs.c
-@@ -83,6 +83,8 @@ insert_mov(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader)
-       }
-    }
- 
-+   unsigned channels_handled = mov->dest.write_mask;
-+
-    /* In some situations (if the vecN is involved in a phi-web), we can end
-     * up with a mov from a register to itself.  Some of those channels may end
-     * up doing nothing and there's no reason to have them as part of the mov.
-@@ -103,7 +105,7 @@ insert_mov(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader)
-       ralloc_free(mov);
-    }
- 
--   return mov->dest.write_mask;
-+   return channels_handled;
- }
- 
- static bool
--- 
-2.4.10
-
diff --git a/media-libs/mesa/mesa-10.3.7-r2.ebuild b/media-libs/mesa/mesa-10.3.7-r2.ebuild
deleted file mode 100644
index b1b6c98..0000000
--- a/media-libs/mesa/mesa-10.3.7-r2.ebuild
+++ /dev/null
@@ -1,534 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-any-r1 toolchain-funcs pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
-FOLDER="${PV/.0/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl
-	opencl openvg osmesa pax_kernel openmax pic selinux
-	+udev vdpau wayland xvmc xa kernel_FreeBSD kernel_linux"
-
-REQUIRED_USE="
-	llvm?   ( gallium )
-	openvg? ( egl gallium )
-	opencl? (
-		gallium
-		llvm
-	)
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic gallium ) )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4?        ( gallium gbm egl )
-	video_cards_vmware? ( gallium )
-	${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.56"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.2.7
-	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	llvm? (
-		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		video_cards_r600? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		!video_cards_r600? (
-			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-		)
-		>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
-		<sys-devel/llvm-3.6
-		video_cards_radeonsi? ( >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] )
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.16-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-
-# Think about: ggi, fbcon, no-X configs
-
-pkg_setup() {
-	# workaround toc-issue wrt #386545
-	use ppc64 && append-flags -mminimal-toc
-
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	epatch "${FILESDIR}"/${PN}-10.3.7-dont-use-clrsb.patch
-	epatch "${FILESDIR}"/${PN}-10.3.7-format_utils.c.patch
-	epatch "${FILESDIR}"/${PN}-10.5.1-fstat-include.patch
-
-	# relax the requirement that r300 must have llvm, bug 380303
-	epatch "${FILESDIR}"/${PN}-10.2-dont-require-llvm-for-r300.patch
-
-	# fix for hardened pax_kernel, bug 240956
-	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-	# Solaris needs some recent POSIX stuff in our case
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-	fi
-
-	base_src_prepare
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-	# Configurable DRI drivers
-		driver_enable swrast
-
-	# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openvg)
-			$(use_enable openvg gallium-egl)
-			$(use_enable openmax omx)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_vc4 vc4
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if use pax_kernel; then
-		myconf+="
-			$(use_enable x86 glx-rts)
-		"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !udev sysfs) \
-		--enable-llvm-shared-libs \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
-	# because user can eselect desired GL provider.
-	ebegin "Moving libGL and friends for dynamic switching"
-		local x
-		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
-		dodir ${gl_dir}/{lib,extensions,include/GL}
-		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
-			if [ -d ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so vc4_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
-	OLD_IMPLEM="$(eselect opengl show)"
-	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
-		eselect opengl set ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-	fi
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	local using_radeon r_flag
-	for r_flag in ${RADEON_CARDS}; do
-		if use video_cards_${r_flag}; then
-			using_radeon=1
-			break
-		fi
-	done
-
-	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-11.0.6-r1.ebuild b/media-libs/mesa/mesa-11.0.6-r1.ebuild
deleted file mode 100644
index 91ddc3b..0000000
--- a/media-libs/mesa/mesa-11.0.6-r1.ebuild
+++ /dev/null
@@ -1,466 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
-	KEYWORDS="arm hppa ppc64"
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
-	wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4?        ( gallium gbm egl )
-	video_cards_vmware? ( gallium )
-	${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
-	dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	llvm? ( !kernel_FreeBSD? (
-		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		!video_cards_r600? (
-			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-		) )
-		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-		<sys-devel/llvm-3.8
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				!kernel_FreeBSD? ( || (
-					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
-	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	${PYTHON_DEPS}
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openmax omx)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_vc4 vc4
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-read-only-text, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !udev sysfs) \
-		--enable-llvm-shared-libs \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so vc4_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	if ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-11.0.9-r1.ebuild b/media-libs/mesa/mesa-11.0.9-r1.ebuild
deleted file mode 100644
index eb8ba3b..0000000
--- a/media-libs/mesa/mesa-11.0.9-r1.ebuild
+++ /dev/null
@@ -1,464 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
-	wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4?        ( gallium gbm egl )
-	video_cards_vmware? ( gallium )
-	${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	llvm? ( !kernel_FreeBSD? (
-		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		!video_cards_r600? (
-			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-		) )
-		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-		<sys-devel/llvm-3.8
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				!kernel_FreeBSD? ( || (
-					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
-	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	${PYTHON_DEPS}
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openmax omx)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_vc4 vc4
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-read-only-text, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !udev sysfs) \
-		--enable-llvm-shared-libs \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so vc4_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	if ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-11.1.2-r2.ebuild b/media-libs/mesa/mesa-11.1.2-r2.ebuild
deleted file mode 100644
index a69a960..0000000
--- a/media-libs/mesa/mesa-11.1.2-r2.ebuild
+++ /dev/null
@@ -1,466 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
-	wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4?        ( gallium gbm egl )
-	video_cards_vmware? ( gallium )
-	${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	llvm? ( !kernel_FreeBSD? (
-		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		!video_cards_r600? (
-			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-		) )
-		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-		<sys-devel/llvm-3.8
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				!kernel_FreeBSD? ( || (
-					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
-	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	${PYTHON_DEPS}
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-11.1.2-i965-fix-use-after-free.patch
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openmax omx)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_vc4 vc4
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-read-only-text, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !udev sysfs) \
-		--enable-llvm-shared-libs \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so vc4_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	if ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-11.2.0-r1.ebuild b/media-libs/mesa/mesa-11.2.0-r1.ebuild
deleted file mode 100644
index d7a4498..0000000
--- a/media-libs/mesa/mesa-11.2.0-r1.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
-	wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4?        ( gallium gbm egl )
-	video_cards_vmware? ( gallium )
-	${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.67"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	llvm? ( !kernel_FreeBSD? (
-		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		!video_cards_r600? (
-			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-		) )
-		>=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				!kernel_FreeBSD? ( || (
-					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
-	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	${PYTHON_DEPS}
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openmax omx)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_vc4 vc4
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	if use gallium; then
-		myconf+=" $(use_enable osmesa gallium-osmesa)"
-	else
-		myconf+=" $(use_enable osmesa)"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		--disable-shader-cache \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable !udev sysfs) \
-		--enable-llvm-shared-libs \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so vc4_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	if ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-9999-r1.ebuild b/media-libs/mesa/mesa-9999-r1.ebuild
deleted file mode 100644
index d7a4498..0000000
--- a/media-libs/mesa/mesa-9999-r1.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999 ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999 ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
-	wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
-	d3d9?   ( dri3 gallium )
-	llvm?   ( gallium )
-	opencl? ( gallium llvm )
-	openmax? ( gallium )
-	gles1?  ( egl )
-	gles2?  ( egl )
-	vaapi? ( gallium )
-	vdpau? ( gallium )
-	wayland? ( egl gbm )
-	xa?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( classic )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium )
-						  gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vc4?        ( gallium gbm egl )
-	video_cards_vmware? ( gallium )
-	${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.67"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-eselect/eselect-mesa )
-	gallium? ( app-eselect/eselect-mesa )
-	>=app-eselect/eselect-opengl-1.3.0
-	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	llvm? ( !kernel_FreeBSD? (
-		video_cards_radeonsi? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
-		!video_cards_r600? (
-			video_cards_radeon? ( || (
-				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-		) )
-		>=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
-	)
-	opencl? (
-				app-eselect/eselect-opencl
-				dev-libs/libclc
-				!kernel_FreeBSD? ( || (
-					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-				) )
-			)
-	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
-	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
-	dri3? (
-		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
-		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
-	)
-	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
-	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
-	sys-devel/bison
-	sys-devel/flex
-	${PYTHON_DEPS}
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	!pic? (
-		usr/lib*/libglapi.so.0.0.0
-		usr/lib*/libGLESv1_CM.so.1.1.0
-		usr/lib*/libGLESv2.so.2.0.0
-		usr/lib*/libGL.so.1.2.0
-		usr/lib*/libOSMesa.so.8.0.0
-	)
-)"
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-		# Configurable DRI drivers
-		driver_enable swrast
-
-		# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable d3d9 nine)
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openmax omx)
-			$(use_enable vaapi va)
-			$(use_enable vdpau)
-			$(use_enable xa)
-			$(use_enable xvmc)
-		"
-		use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		gallium_enable video_cards_r300 r300
-		gallium_enable video_cards_r600 r600
-		gallium_enable video_cards_radeonsi radeonsi
-		if ! use video_cards_r300 && \
-				! use video_cards_r600; then
-			gallium_enable video_cards_radeon r300 r600
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		gallium_enable video_cards_vc4 vc4
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if [[ ${ABI} == x86 ]]; then
-		myconf+=" $(use_enable pax_kernel glx-read-only-text)"
-	fi
-
-	# on abi_x86_32 hardened we need to have asm disable
-	if [[ ${ABI} == x86* ]] && use pic; then
-		myconf+=" --disable-asm"
-	fi
-
-	if use gallium; then
-		myconf+=" $(use_enable osmesa gallium-osmesa)"
-	else
-		myconf+=" $(use_enable osmesa)"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		--disable-shader-cache \
-		$(use_enable !bindist texture-float) \
-		$(use_enable d3d9 nine) \
-		$(use_enable debug) \
-		$(use_enable dri3) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable !udev sysfs) \
-		--enable-llvm-shared-libs \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so vc4_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			if use classic; then
-				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
-			fi
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-
-	if use openmax; then
-		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
-		doenvd "${T}"/99mesaxdgomx
-		keepdir /usr/share/mesa/xdg
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
-	if use llvm; then
-		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
-		pushd src/gallium/drivers/llvmpipe >/dev/null || die
-		emake ${llvm_tests}
-		pax-mark m ${llvm_tests}
-		popd >/dev/null || die
-	fi
-	emake check
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
-	if use openmax; then
-		ebegin "Registering OpenMAX drivers"
-		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
-			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
-			omxregister-bellagio
-		eend $?
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	if ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-pkg_prerm() {
-	if use openmax; then
-		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
deleted file mode 100644
index 36afb87..0000000
--- a/media-libs/mesa/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<use>
-		<flag name="bindist">Disable patent-encumbered ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float extensions.</flag>
-		<flag name="classic">Build drivers based on the classic architecture.</flag>
-		<flag name="d3d9">Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag>
-		<flag name="dri3">Enable DRI3 support.</flag>
-		<flag name="egl">Enable EGL support.</flag>
-		<flag name="gallium">Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
-		<flag name="gbm">Enable the Graphics Buffer Manager for EGL on KMS.</flag>
-		<flag name="gles">Enable GLES (both v1 and v2) support.</flag>
-		<flag name="gles1">Enable GLESv1 support.</flag>
-		<flag name="gles2">Enable GLESv2 support.</flag>
-		<flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
-		<flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>
-		<flag name="openmax">Enable OpenMAX video decode/encode acceleration for Gallium3D.</flag>
-		<flag name="openvg">Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
-		<flag name="osmesa">Build the Mesa library for off-screen rendering.</flag>
-		<flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
-		<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
-		<flag name="vdpau">Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
-		<flag name="wayland">Enable support for dev-libs/wayland</flag>
-		<flag name="xa">Enable the XA (X Acceleration) API for Gallium3D.</flag>
-		<flag name="xvmc">Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
-		<flag name="video_cards_vc4">Enable the Raspberry PI VC4 driver for Gallium3D.</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">mesa3d</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog
deleted file mode 100644
index 7f806c3..0000000
--- a/media-libs/oyranos/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-# ChangeLog for media-libs/oyranos
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*oyranos-0.9.4-r2.ebuild (28 Mar 2014)
-
-  28 Mar 2014; Sven Eden <yamakuzure@gmx.net> +oyranos-0.9.4-r2.ebuild :
-  Fixed install bug.
-
diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
deleted file mode 100644
index 09fee72..0000000
--- a/media-libs/oyranos/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX oyranos-0.9.4-be-more-verbose.patch 1370 SHA256 6ac0800ce76a0ced9fdd895ec348408064c43299f2718d0571c9f28d71df1f43 SHA512 0e4170fee30865b7e9b2b1ac35df27cdaa3e67f7df9abffe9d8eb437a85461e32f77baba3daa498c6afc83d390d945e1ee7e49722dbbe89de971f3ca79260010 WHIRLPOOL 3d887ca62b4e0d0bc75a706e6b6b1ecfb615ac652e8a4d63544e5118d31ec07fe5b59cf9cca3de5ce1ffd1bc844f655620ee8d75d48717e9c4f465c9dac215db
-AUX oyranos-0.9.4-buildsystem-r1.patch 6065 SHA256 b64462269c67b8791f786cbd4b8037a54571c4dff85650256558a0d988819029 SHA512 50d810da9c1dc2f5487ea96a8acf03845c45824d6bab2c90631f60b542edf9d68be547e08c8203ffba2cd31cc56815606f194574b36e0ee0812886a180cf1408 WHIRLPOOL 45b32d38c72db66904ccf794679fb3410f88ab88d6b1962f6a0764b374d5cd9813ce130520d67c9afa3557681290846c6630064d1c55cb492a0bf5579cde8021
-AUX oyranos-0.9.4-fix-array-access.patch 1082 SHA256 541475585dad65a2d30f7d306d9ca4b8a310615e3e60a4909d2686c8716a3bb0 SHA512 64870430eb014d759daf3e0c7e0ada13bf39a874efac9072ce49f409d747b13820f869320e9eb6be97435335b22741f2c43b849d493d50dd1cc2386a85597161 WHIRLPOOL 35f06ded0df8e481e9802b08eb91bf8a61bf3c2571729ef3c1cff6900b9477e7463b21968cd54352c09a00a6536e18009993483d98a6fb5f38e24cf2b162e651
-AUX oyranos-0.9.4-fix-double-object-release.patch 1183 SHA256 29bc34e193b21265bb07cc1b4296bbb6ed03d25b55f20f9a943e0f0554d3623d SHA512 9f61d1d41dcad0e6fbda2385c934f942f76c74bc93f2ceb1dee91a0346cff498e6db4ffd15a00e40a6468ff3bd528964326da99dbc73524f6f04738a9adeda10 WHIRLPOOL bd655a8edb011075359abe9f1246331d004a37eed9f1424bd21535f24b92058ec87c033052e1e04d6f5083132acbc3e2753e28918e5570526996dda8579c2fac
-AUX oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch 1589 SHA256 041acaa59ef572b7a2604ffbde235ea52bbbe7b11949fa3661d1e00c92441529 SHA512 304a7ec1adf7be2cd18b1e33a52da8ef1153e68078a20bf4d5d2a5be9a98cda756061dd00a675f1b9eedee90b2e753a8583e2c6aacb6309fa647bf2ccebeae13 WHIRLPOOL 3f07dbf78d7513280947870d09e315d8100dbf066a54d60fec73289f5dc2585fcbc7125b6a51e7cd0a8bc451baf192db425c6000c1a571effb014d421faf7199
-AUX oyranos-0.9.4-fix-oyStringSegment-crash.patch 822 SHA256 f12a80e4959759b187847a6ed573bf8972fe098cf3c84e6a0416478d5602efde SHA512 482c8157608c6f9032a3642756155bc495fa3b75586a06ff34377c01fbf5bceb4e5761783d86a1b189bd2d879df6811ed420c58d902dc369ddc8546520f09de3 WHIRLPOOL 80f2e4e07797fd6b28ec0586cc2b1ff9796b858ce932c6853d2efdd27a8da7439f34b84c6b928fbd95dbad9ae0bb79e942abdebf08df63d922c28ddb0d02edfd
-AUX oyranos-0.9.4-fix-runpaths.patch 5200 SHA256 03e1591c85cf59c272b0a415b6c33d4f3fe3f0f7cfb507cad9ec40cd51ee9e16 SHA512 770d8ebeaa2eadf7420ddbd2625a24b80766f5d2d472ad51a3d8736620b16d71033f680ce7d0ac356eea82734dac35a2b124c114b3350c3761d4777356b7f091 WHIRLPOOL 5bd64bcc4e4e192a65193f70b82a9bcc50b8ec50d7f05f1429e5a8f7844a476c507d98460fc220bb6f1bbf3749b7142aa5b3d9be2195a826687446428553c2e3
-AUX oyranos-0.9.4-fix-typos-and-grammar.patch 43847 SHA256 cea8976e827b168bb474a66692351bd9cb346b97c5fc3675bce9a8337c5c7db9 SHA512 06b17498ff4c4cac7b906af8fa912f25e36f294c143dbd3db9ba0ae7ee665af9cf6e1f4fa41b198a284a722962da2ae177cfcc66353030c9ab0ba9ac76c3ef4d WHIRLPOOL afeeb29fe45f1003c076b8f5ad32244b4924e2c709e6c87581b51f51eadd5a43174639b8d50022b7eca12c9d70b983b866d74120d618f1f950846e009de821bb
-AUX oyranos-0.9.4-omit-profile-with-error.patch 1606 SHA256 06ce34d10e2cb9ca5722cb58f624b7041a8f388b53f9298200ae5a9845b7c825 SHA512 594923ae6dcac9aa8430ea3ccb9c7662c421eb2a99a27cfbf46a1083a0217a0c45aae663a1fc30fc6cf13cd2d7f0e4d63e7456180f623c19487b383f0c5a0c2f WHIRLPOOL 94675dd721df309cc10ace447b613b5eae05c8b2e5242f3443c2dd922d62dd253e308bd72e7eac03b735358b47a5c053f142ce9ac75392be99cd981a024f858a
-AUX oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch 5370 SHA256 3d2f260eb37bee4bbcd65677099076626147f22f17fdc938d26a3b86ceb986b4 SHA512 da7a3c05e161945bab4b8336e6848d06353482351aed45febedcd66f0f1b70276ab42f4a6cbcaff7708fc9ef42d135ec2110550ca66f94aef5c3915a7cf5e176 WHIRLPOOL 89b8264aab7026718694a8f84dfefe5b49af1a912c720165305b6d2d483943c83f5c43d109ffddb90ebfe2133731b87a6fc71ec2f6f4b02c4f705785d68bc2a7
-AUX oyranos-0.9.4-use-more-internal-xrandr-info.patch 1615 SHA256 78d1c45cc18ad555a97d2a6cd50c9ad40cd12c02048f351afc0a3893772c309a SHA512 cf4b42b8e794d19dbbbeab12c97fc80b897bcda26271c943c537f827946ca4a021e818c9fa6971b101aecc10d63e4d12b5781a549b6db62977884fa67134ecbc WHIRLPOOL af3992853631a3464b3ac625628031f63c80cc2da6b0d9b0cbd9f75bc460c4213f6fef5485e55eda8784d1b74c5cc9e7722ed07db10a175654df2b85cabd86ac
-DIST oyranos-0.9.4.tar.bz2 1632276 SHA256 6dcf7f8bef0720077ee55484a5b507ba5f049094f21fbbd2752f2ed120c0768a SHA512 23ded5bac4c16aba8a2d4266981e6ad53cfa2ce720d03751625552a873de8311dda721eb8dd732860ae0a0fcdfc7346f92aaeb8bde281ceeb4895f154d6e6c59 WHIRLPOOL 7ec535e326bf102eb0d154ac995b42b4a8b23a606c35417727b54653424807c47c5a4cf7ece6411627dcffd7ca5d8b1ddc588d97d1a02fb079d27d3d20efd2a5
-EBUILD oyranos-0.9.4-r2.ebuild 3885 SHA256 76da4fb50eca0615df1c42f00c6d3cce7c9494ec1957cc69277073217891b5fe SHA512 875573725b1a789edd4ea3e80800373d7bca494b88490c16356d4d16164d989799164e7e5b904d3394b4ad1a1d56d1d6837299a599b9cbdc506badc2bb398e31 WHIRLPOOL 49cc7d4ca928a6fda3135e3f195e88fb79b9d6836b483b98aaf41c9c1daa463a061d3c4021f711ce08472c613bfd45444dcfaecc52a20875d7e6bdba6f5bdf7b
-MISC ChangeLog 254 SHA256 2eab75d62692c6e9fb09a7eac36cc5dcb4b71b1b4773256f1ba6dc78d7cc0994 SHA512 f2c4717362cfc61f994f8428439261a5b1912d23790617a29b3325de32556e0c530355905da7b44ca16cc6c32451240beece3be21f4bc820861c22a0b74cdf86 WHIRLPOOL d0786925d9e5b38ea2a94d2e116e874bde3a3b330142cd2c4e57651ac7df95ec7d3addf547aed8527dca2b7cce494f4f2a88cda68efea530b2601b2f6842a459
-MISC metadata.xml 298 SHA256 3a28ce89dfc48817905b249d8984974bc6ead41dc6f4982005417d68b9760af7 SHA512 fab9927a1eb83cc6dc719846ad7824c7003e9c1d8deef44fe343856d6b5b4e7e036f2d069fc3044507a289b014be3b67ebc2f5bebccefa1dbaf4995144d58ae2 WHIRLPOOL 2c1ebf12df5203e1b7dd18f5da116ba3f8095787c3036573b8a30b6c6d95ca41c38f220077935c1715c48acd76aac0a62dcae30a2544373b1881b17363325de0
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-be-more-verbose.patch b/media-libs/oyranos/files/oyranos-0.9.4-be-more-verbose.patch
deleted file mode 100644
index 66ed023..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-be-more-verbose.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 80fd8efab3f56c698b4182846d8707916849cad9 Mon Sep 17 00:00:00 2001
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Sat, 9 Feb 2013 18:21:47 +0100
-Subject: [PATCH] * [tools]: add more verbosity to oy-monitor -v
-
-Here to the profile assignment part.
----
- src/tools/oyranos_gamma.c |   16 ++++++++++++++++
- 1 files changed, 16 insertions(+), 0 deletions(-)
-
-diff --git a/src/tools/oyranos_gamma.c b/src/tools/oyranos_gamma.c
-index f2206a5..005bdd2 100644
---- a/src/tools/oyranos_gamma.c
-+++ b/src/tools/oyranos_gamma.c
-@@ -747,16 +747,32 @@ int main( int argc , char** argv )
- 
-       if(monitor_profile)
-       {
-+        if(verbose)
-+          fprintf( stdout, "oyDeviceSetProfile()\n" );
-         oyDeviceSetProfile( device, monitor_profile );
-+        if(verbose)
-+          fprintf( stdout, "oyDeviceUnset()\n" );
-         oyDeviceUnset( device );
-       } else
-       if(erase || unset)
-+      {
-+        if(verbose)
-+          fprintf( stdout, "oyDeviceUnset()\n" );
-         oyDeviceUnset( device );
-+      }
-       if(erase)
-+      {
-+        if(verbose)
-+          fprintf( stdout, "oyConfig_EraseFromDB()\n" );
-         oyConfig_EraseFromDB( device );
-+      }
- 
-       if(setup)
-+      {
-+        if(verbose)
-+          fprintf( stdout, "oyDeviceSetup()\n" );
-         oyDeviceSetup( device );
-+      }
- 
-       oyConfig_Release( &device );
-     }
--- 
-1.5.6.5
-
-
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-buildsystem-r1.patch b/media-libs/oyranos/files/oyranos-0.9.4-buildsystem-r1.patch
deleted file mode 100644
index a4516a2..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-buildsystem-r1.patch
+++ /dev/null
@@ -1,162 +0,0 @@
---- oyranos-0.9.4/src/CMakeLists.txt
-+++ oyranos-0.9.4/src/CMakeLists.txt
-@@ -100,7 +100,9 @@
- INCLUDE_DIRECTORIES( ${XCM_INCLUDE_DIRS} )
- LINK_DIRECTORIES( ${XCM_LIBRARY_DIRS} )
- 
--FIND_PACKAGE( X11 )
-+IF(WANT_X11)
-+FIND_PACKAGE( X11 REQUIRED )
-+ENDIF(WANT_X11)
- IF(X11_FOUND)
-   INCLUDE_DIRECTORIES( ${X11_INCLUDE_DIRS} )
-   LINK_DIRECTORIES( ${X11_LIBRARY_DIRS} )
-@@ -123,27 +125,35 @@
-   LINK_DIRECTORIES( ${XXF86VM_LIBRARY_DIRS} )
- ENDIF(X11_FOUND)
- 
--FIND_PACKAGE( CUPS )
-+IF(WANT_CUPS)
-+FIND_PACKAGE( Cups REQUIRED )
-+SET( HAVE_CUPS 1 )
-+ENDIF(WANT_CUPS)
- IF(HAVE_CUPS)
--  INCLUDE_DIRECTORIES( ${CUPS_INCLUDE_DIRS} )
--  LINK_DIRECTORIES( ${CUPS_LIBRARY_DIRS} )
-+  INCLUDE_DIRECTORIES( ${CUPS_INCLUDE_DIR} )
- ENDIF(HAVE_CUPS)
- 
--FIND_PACKAGE( Cairo )
-+IF(WANT_CAIRO)
-+FIND_PACKAGE( Cairo REQUIRED)
-+ENDIF(WANT_CAIRO)
- IF(HAVE_CAIRO)
-   INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR}/cairo )
-   INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR} )
-   LINK_DIRECTORIES( ${CAIRO_LIBRARY_DIRS} )
- ENDIF(HAVE_CAIRO)
- 
--FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui)
-+IF(WANT_QT4)
-+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-+ENDIF(WANT_QT4)
- IF(QT_FOUND)
-   SET( HAVE_QT 1 )
-   INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIRS} )
-   LINK_DIRECTORIES( ${QT_LIBRARY_DIRS} )
- ENDIF(QT_FOUND)
- 
--FIND_PACKAGE( Fltk )
-+IF(WANT_FLTK)
-+FIND_PACKAGE( FLTK REQUIRED)
-+ENDIF(WANT_FLTK)
- IF(FLTK_FOUND)
-   SET( HAVE_FLTK 1 )
-   INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} )
-@@ -159,7 +169,9 @@
-   SET( LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} PARENT_SCOPE)
- ENDIF(LIBXML2_FOUND)
- 
--FIND_PACKAGE( LibRaw )
-+IF(WANT_LIBRAW)
-+FIND_PACKAGE( LibRaw REQUIRED )
-+ENDIF(WANT_LIBRAW)
- IF( HAVE_LIBRAW )
- #  TRY_COMPILE(
- #    HAVE_LIBRAW_REALLY
-@@ -182,7 +194,9 @@
-   MESSAGE( "HAVE_LIBRAW_PLUGIN: ${HAVE_LIBRAW_PLUGIN}" )
- ENDIF()
- 
--FIND_PACKAGE( Exif2 )
-+IF(WANT_EXIV2)
-+FIND_PACKAGE( Exif2 REQUIRED )
-+ENDIF(WANT_EXIV2)
- IF(HAVE_EXIV2)
-   INCLUDE_DIRECTORIES( ${EXIV2_INCLUDE_DIRS} )
-   LINK_DIRECTORIES( ${EXIV2_LIBRARY_DIRS} )
---- oyranos-0.9.4/CMakeLists.txt
-+++ oyranos-0.9.4/CMakeLists.txt
-@@ -41,7 +41,7 @@
- 
- 
- # detect top level projects
--FIND_PACKAGE( Yajl )
-+FIND_PACKAGE( Yajl REQUIRED )
- IF( HAVE_YAJL )
-   INCLUDE_DIRECTORIES( ${YAJL_INCLUDE_DIRS} )
-   LINK_DIRECTORIES( ${YAJL_LIBRARY_DIRS} )
-@@ -51,71 +51,15 @@
-   IF( NOT HAVE_YAJL_VERSION_H )
-     INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/yajl/ )
-   ENDIF( NOT HAVE_YAJL_VERSION_H )
--ELSE( HAVE_YAJL )
--  IF(CMAKE_VERSION VERSION_GREATER 2.8.0)
--    include(ExternalProject)
--    ExternalProject_Add( yajl
--    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yajl
--    CONFIGURE_COMMAND cmake ${CMAKE_CURRENT_SOURCE_DIR}/yajl
--    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/yajl
--    BUILD_COMMAND ${MAKE}
--    # skip installation
--    INSTALL_COMMAND echo )
--    INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/yajl )
--    LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/yajl )
--    SET( YAJL_LIBRARIES yajl-static )
--  ENDIF()
--  
- ENDIF( HAVE_YAJL )
- 
--FIND_PACKAGE( Elektra )
-+FIND_PACKAGE( Elektra REQUIRED )
-+SET( HAVE_ELEKTRA 1 )
- IF(HAVE_ELEKTRA)
-   SET( ELEKTRA_SPEC "Requires: elektra 0.7
- BuildRequires: elektra-devel" )
-   INCLUDE_DIRECTORIES( ${ELEKTRA_INCLUDE_DIRS} )
-   LINK_DIRECTORIES( ${ELEKTRA_LIBRARY_DIRS} )
--ELSE(HAVE_ELEKTRA)
--  SET( ELEKTRA_VERSION elektra-0.7.1 )
--  MESSAGE( "-- Using internal Elektra: ${ELEKTRA_VERSION}" )
--  INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/${ELEKTRA_VERSION}/src/include
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/include )
--  SET( ELEKTRA_LIBRARIES_STATIC
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdb.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhandle.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-key.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyset.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-trie.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhighlevel.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbcapability.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyhelpers.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keymeta.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyname.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keytest.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyvalue.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-serialize.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-split.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-exported_symbols.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libloader/libloader_static_a-kdbLibLoader.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-internal.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-helper.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/backends/filesys/libelektra_filesys_a-filesys.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-kdbtools.o
--       ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-stream.o
--     )
--  SET( ELEKTRA_LIBRARIES 
--       ${LIBXML2_LIBRARIES}
--     )
--  IF(CMAKE_VERSION VERSION_GREATER 2.8.0)
--    include(ExternalProject)
--    ExternalProject_Add( ${ELEKTRA_VERSION}
--    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION}
--    # GCC flags (-fPIC) will fail on Windows, without we get relocation R_X86_64_32 errors
--    CONFIGURE_COMMAND CFLAGS=-fPIC ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION}/configure --enable-static --enable-shared=false
--    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${ELEKTRA_VERSION}
--    BUILD_COMMAND ${MAKE}
--    # skip installation
--    INSTALL_COMMAND echo )
--  ENDIF()
- ENDIF(HAVE_ELEKTRA)
- 
- #now add all directories
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-array-access.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-array-access.patch
deleted file mode 100644
index 0c5ca3c..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-fix-array-access.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Mon, 18 Mar 2013 18:07:16 +0000 (+0100)
-Subject: * [oyX1]: fix array access
-X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=11d848a38608deeeca61288d46cfca55c6916788
-
-* [oyX1]: fix array access
----
-
-diff --git a/src/modules/devices/oyranos_monitor_x11.c b/src/modules/devices/oyranos_monitor_x11.c
-index a530a81..bac09c1 100644
---- a/src/modules/devices/oyranos_monitor_x11.c
-+++ b/src/modules/devices/oyranos_monitor_x11.c
-@@ -1329,6 +1329,13 @@ oyX1Monitor_s* oyX1Monitor_newFrom_      ( const char        * display_name,
-         int n_scr_info = 0;
-         XineramaScreenInfo *scr_info = XineramaQueryScreens( display,
-                                                              &n_scr_info );
-+        if(n_scr_info <= selected_screen)
-+        {
-+          XFree( scr_info );
-+          oyX1Monitor_release_( &disp );
-+          return 0;
-+        }
-+
-         geo[0] = scr_info[selected_screen].x_org;
-         geo[1] = scr_info[selected_screen].y_org;
-         geo[2] = scr_info[selected_screen].width;
-
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-double-object-release.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-double-object-release.patch
deleted file mode 100644
index 1cbdf47..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-fix-double-object-release.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Wed, 20 Mar 2013 17:15:17 +0000 (+0100)
-Subject: * [core]: fix double object release
-X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=6214cf15fafae52d67233d27462488487091d8d6
-
-* [core]: fix double object release
-
-... which was revealed by valgrind
----
-
-diff --git a/src/API_generated/oyranos_devices.c b/src/API_generated/oyranos_devices.c
-index 4ed5138..8cee0c8 100644
---- a/src/API_generated/oyranos_devices.c
-+++ b/src/API_generated/oyranos_devices.c
-@@ -1896,7 +1896,6 @@ OYAPI int  OYEXPORT
-         oyConfigs_MoveIn( taxi_devices, &taxi_dev, -1 );
-       }
-       oyConfigs_Release( &configs_ );
--      oyOptions_Release( &options );
-       oyFree_m_(ranks);
-     }
- 
-diff --git a/src/templates/oyranos_devices.template.c b/src/templates/oyranos_devices.template.c
-index 586ba36..ff555e3 100644
---- a/src/templates/oyranos_devices.template.c
-+++ b/src/templates/oyranos_devices.template.c
-@@ -1881,7 +1881,6 @@ OYAPI int  OYEXPORT
-         oyConfigs_MoveIn( taxi_devices, &taxi_dev, -1 );
-       }
-       oyConfigs_Release( &configs_ );
--      oyOptions_Release( &options );
-       oyFree_m_(ranks);
-     }
- 
-
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch
deleted file mode 100644
index 27c06cd..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-fix-oyRankMap-helper-functions-crashes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Fri, 22 Feb 2013 18:42:23 +0000 (+0100)
-Subject: * [sources]: fix counting in oyRankMap data
-X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=c2feb3e1f1ab45702f98c8728898eab1ee849cd4
-
-* [sources]: fix counting in oyRankMap data
-
-2013-04-21: backport to oyranos-0.9.4, remove (duplicate) patch for nonexistent file
-
-This fixes crashes in several oyRankMap helper functions.
----
-
-diff --git a/src/API_generated/oyConfig_s.c b/src/API_generated/oyConfig_s.c
-index 8ec0ff6..7ea1f3b 100644
---- a/src/API_generated/oyConfig_s.c
-+++ b/src/API_generated/oyConfig_s.c
-@@ -983,14 +983,14 @@ oyRankMap *        oyRankMapCopy     ( const oyRankMap   * rank_map,
- {
-   oyRankMap * map = 0;
-   int error = !rank_map;
--  int n = 0, i;
-+  int n = 0, i = 0;
- 
-   if(!allocateFunc)
-     allocateFunc = oyAllocateFunc_;
- 
-   if(error <= 0)
-   {
--    while( rank_map[n++].key ) {}
-+    while( rank_map[i++].key ) ++n;
- 
-     oyAllocHelper_m_( map, oyRankMap, n + 1, allocateFunc, error = 1 );
-   }
-@@ -1025,7 +1025,7 @@ OYAPI void  OYEXPORT
-                                        oyDeAlloc_f         deAllocateFunc )
- {
-   int error = !rank_map || !*rank_map;
--  int n = 0, i;
-+  int n = 0, i = 0;
- 
-   if(!deAllocateFunc)
-     deAllocateFunc = oyDeAllocateFunc_;
-@@ -1033,7 +1033,7 @@ OYAPI void  OYEXPORT
-   if(error <= 0)
-   {
-     oyRankMap * map = *rank_map;
--    while( (*rank_map)[n++].key ) {}
-+    while( (*rank_map)[i++].key ) ++n;
-     for(i = 0; i < n; ++i)
-     {
-       deAllocateFunc( map[i].key ); map[i].key = 0;
---
-1.5.6.5
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-oyStringSegment-crash.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-oyStringSegment-crash.patch
deleted file mode 100644
index 7de609b..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-fix-oyStringSegment-crash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Wed, 13 Mar 2013 13:59:19 +0000 (+0100)
-Subject: * [core]: fix oyStringSegment_() crash
-X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=cf495d5ede29f7211e498217c4d06428f944bac3
-
-2013-04-21: backport to oyranos-0.9.1, remove unrelated oyStringReplace_ hunk
-
-* [core]: fix oyStringSegment_() crash
----
-
-diff --git a/src/liboyranos_core/oyranos_string.c b/src/liboyranos_core/oyranos_string.c
-index 525ce7e..1d214c0 100644
---- a/src/liboyranos_core/oyranos_string.c
-+++ b/src/liboyranos_core/oyranos_string.c
-@@ -499,7 +499,7 @@ char *             oyStringSegment_  ( char              * text,
-   for(; i < segment; ++i)
-   {
-     t = oyStrchr_( t, delimiter );
--    ++t;
-+    if(t) ++t;
-   }
- 
-   end_pos = (uintptr_t) oyStrchr_(t, delimiter);
--- 
-1.5.6.5
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-runpaths.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-runpaths.patch
deleted file mode 100644
index 0287c11..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-fix-runpaths.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From b8f4a5fe0cea02878de106f5d02751e922438275 Mon Sep 17 00:00:00 2001
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Wed, 3 Apr 2013 10:01:04 +0200
-Subject: [PATCH 1/1] * [build]: fix has insecure RUNPATHs
-
-https://sourceforge.net/tracker/?func=detail&atid=879553&aid=3609840&group_id=177017
-
-2013-04-03: backport to oyranos-0.9.4:
-	merged 1-line change from commit 5b63d318e53ae8b8f3a0ccb166c97acf6103caac
-
----
- CMakeLists.txt                     |    2 +-
- src/examples/CMakeLists.txt        |   26 ++++++++++++++++++++++++++
- src/examples/oforms/CMakeLists.txt |   28 ++++------------------------
- src/tools/CMakeLists.txt           |    2 +-
- 4 files changed, 32 insertions(+), 26 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f24965c..6e9c8fb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,7 +10,7 @@ SET (OYRANOS_DEVEL_MONTH 01)
- SET (OYRANOS_DEVEL_YEAR 2013)
- 
- SET (PACKAGE_NAME "oyranos")
--set (PACKAGE_DESCRIPTION "Oyranos is a Colour Management System (CMS) on operating system level. It allows to match predictably input device colours to output device colours across supporting applications. One goal is to make colour management useful for all users in a automated fashion and regardless of any technical knowledge.")
-+SET (PACKAGE_DESCRIPTION "Oyranos is a Colour Management System (CMS) on operating system level. It allows to match predictably input device colours to output device colours across supporting applications. One goal is to make colour management useful for all users in a automated fashion and regardless of any technical knowledge.")
- 
- SET( OY_CMMSUBPATH     "colour/modules" )
- SET( OY_METASUBPATH    "${PACKAGE_NAME}" )
-diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
-index dfe807c..4adfdc9 100644
---- a/src/examples/CMakeLists.txt
-+++ b/src/examples/CMakeLists.txt
-@@ -60,4 +60,30 @@ IF( FLTK_FOUND )
-   INSTALL (TARGETS oyranos-config-fltk DESTINATION bin)
- ENDIF()
- 
-+
- ADD_SUBDIRECTORY( oforms )
-+
-+# oFORMS for a Oyranos CLI renderer and parser
-+ADD_EXECUTABLE( oyranos-xforms oforms/oyranos_xforms.c )
-+TARGET_LINK_LIBRARIES( oyranos-xforms
-+                  ${OY_OFORMS_LIB} oyranos ${EXTRA_LIBS} )
-+#INSTALL (TARGETS oyranos-xforms DESTINATION bin)
-+
-+# oFORMS for a Oyranos FLTK renderer and parser
-+IF( FLTK_FOUND )
-+  ADD_EXECUTABLE( oyranos-xforms-fltk
-+                  oforms/oyranos_forms_fltk.cxx
-+                  oforms/oyranos_widgets_fltk.cxx
-+                  oforms/oyranos_xforms_fltk.cxx
-+                )
-+  TARGET_LINK_LIBRARIES ( oyranos-xforms-fltk oyranos ${EXTRA_LIBS}
-+                  ${OY_OFORMS_LIB} ${FLTK_LIBRARIES} )
-+  #INSTALL (TARGETS oyranos-xforms-fltk DESTINATION bin)
-+ENDIF()
-+
-+# oFORMS for a Oyranos module generation
-+ADD_EXECUTABLE( oyranos-xforms-modules oforms/oyranos_xforms_modules.c )
-+TARGET_LINK_LIBRARIES( oyranos-xforms-modules
-+             oyranos ${OY_OFORMS_LIB} ${EXTRA_LIBS} )
-+INSTALL (TARGETS oyranos-xforms-modules DESTINATION bin)
-+
-diff --git a/src/examples/oforms/CMakeLists.txt b/src/examples/oforms/CMakeLists.txt
-index 4d248ec..c0ff965 100644
---- a/src/examples/oforms/CMakeLists.txt
-+++ b/src/examples/oforms/CMakeLists.txt
-@@ -1,31 +1,11 @@
- #oFORMS basics
--SET( OY_OFORMS_LIB ${PACKAGE_NAME}_forms_cmd_line )
-+SET( OY_OFORMS_LIB ${PACKAGE_NAME}_forms_cmd_line-static )
-+SET( OY_OFORMS_LIB ${OY_OFORMS_LIB} PARENT_SCOPE )
- ADD_LIBRARY( ${OY_OFORMS_LIB}
--             STATIC ${OY_OFORMS_LIB}.c )
-+             STATIC ${PACKAGE_NAME}_forms_cmd_line.c )
- TARGET_LINK_LIBRARIES ( ${OY_OFORMS_LIB} oyranos ${EXTRA_LIBS} )
- 
--# oFORMS for a Oyranos CML renderer and parser
--ADD_EXECUTABLE( ../oyranos-xforms oyranos_xforms.c )
--TARGET_LINK_LIBRARIES( ../oyranos-xforms
--             oyranos ${OY_OFORMS_LIB} ${EXTRA_LIBS} )
--#INSTALL (TARGETS oyranos-xforms DESTINATION bin)
-+MESSAGE( "-- OY_OFORMS_LIB: ${OY_OFORMS_LIB}" )
- 
--# oFORMS for a Oyranos FLTK renderer and parser
--IF( FLTK_FOUND )
--  ADD_EXECUTABLE( ../oyranos-xforms-fltk
--                  oyranos_forms_fltk.cxx
--                  oyranos_widgets_fltk.cxx
--                  oyranos_xforms_fltk.cxx
--                )
--  TARGET_LINK_LIBRARIES ( ../oyranos-xforms-fltk oyranos ${EXTRA_LIBS}
--                 ${FLTK_LIBRARIES} )
--  #INSTALL (TARGETS oyranos-xforms-fltk DESTINATION bin)
--ENDIF()
--
--# oFORMS for a Oyranos module generation
--ADD_EXECUTABLE( ../oyranos-xforms-modules oyranos_xforms_modules.c )
--TARGET_LINK_LIBRARIES( ../oyranos-xforms-modules
--             oyranos ${OY_OFORMS_LIB} ${EXTRA_LIBS} )
--INSTALL (TARGETS ../oyranos-xforms-modules DESTINATION bin)
- INSTALL (FILES ./oyranos-xforms-modules.1 DESTINATION share/man/man1 )
- 
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index cb23ace..3b2572a 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -30,7 +30,7 @@ ENDIF()
- 
- # colour conversion
- ADD_EXECUTABLE( oyranos-icc "${CMAKE_CURRENT_SOURCE_DIR}/oyranos_convert.c" )
--TARGET_LINK_LIBRARIES( oyranos-icc oyranos ${EXTRA_LIBS} )
-+TARGET_LINK_LIBRARIES( oyranos-icc oyranos ${EXTRA_LIBS} oyranos_forms_cmd_line-static )
- INSTALL (TARGETS oyranos-icc DESTINATION bin)
- 
- ADD_SUBDIRECTORY (qcmsevents)
--- 
-1.5.6.5
-
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-fix-typos-and-grammar.patch b/media-libs/oyranos/files/oyranos-0.9.4-fix-typos-and-grammar.patch
deleted file mode 100644
index 790c424..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-fix-typos-and-grammar.patch
+++ /dev/null
@@ -1,968 +0,0 @@
-commit bf50dbd47ddef1ccb49bb44cbf893ae7844240d6
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Wed Apr 3 02:14:21 2013 +0200
-
-    more typo and grammar fixes
-
-diff --git a/po/cs.po b/po/cs.po
-index 9440519..a99974e 100644
---- a/po/cs.po
-+++ b/po/cs.po
-@@ -290,7 +290,7 @@ msgstr "Již aktivováno"
- 
- #: liboyranos_config/oyranos_texts.c:273
- #, fuzzy
--msgid "Anylyze ICC profile information on your system."
-+msgid "Analyze ICC profile information on your system."
- msgstr "umí zobrazit informace o profilu ICC"
- 
- #: modules/oyranos_cmm_oyra_image.c:1065
-@@ -417,7 +417,7 @@ msgid ""
- "Behaviour of color space transformation for proofing. Most people want a "
- "preview on screen only. The Relative Colorimetric intent is right for that. "
- "The Absolute Colorimetric intent needs a very careful profiling and non-"
--"trivial setup, but allowes for side-by-side comparisions."
-+"trivial setup, but allows for side-by-side comparisons."
- msgstr ""
- "Způsob transformace barev pro simulaci. Většina uživatelů použije funkci "
- "simulace pouze na obrazovce, pro což se hodí relativní kolorimetrický záměr. "
-@@ -670,7 +670,7 @@ msgstr "Transformace barev mohou být interně uloženy různými způsoby"
- #: liboyranos_config/oyranos_texts.c:174
- msgid ""
- "Color content can sometimes have no ICC profile assigned. This is a critical "
--"situation as the system can not properly convert these colors. Therefor the "
-+"situation as the system can not properly convert these colors. Therefore the "
- "color processing parts need to pick some profile as a guess. These settings "
- "allow to change the picked ICC profile to guide the processing components "
- "and allow proper conversion and compositing."
-@@ -1024,7 +1024,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:236
- msgid ""
--"Decide what to do when the default color spaces dont match the current ones."
-+"Decide what to do when the default color spaces don't match the current ones."
- msgstr ""
- "Rozhodnout co dělat, když se výchozí barvový prostor nerovná aktuálnímu."
- 
-@@ -2179,7 +2179,7 @@ msgstr "Oyranos X11"
- #. HTML
- #: liboyranos_config/oyranos_xml.c:1036
- msgid ""
--"Oyranos allowes detailed settings like preferred editing color spaces and "
-+"Oyranos allows detailed settings like preferred editing color spaces and "
- "the behaviour of color conversions or simulation. Oyranos reduces the work "
- "involved in all color management related decisions through automation, "
- "useful defaults and grouping of settings in selectable policies."
-@@ -2372,27 +2372,27 @@ msgid "Postscript CRD Information"
- msgstr "Náhled, saturace"
- 
- #: liboyranos_config/oyranos_texts.c:336
--msgid "Prefered CIE*Lab Editing Color Space"
-+msgid "Preferred CIE*Lab Editing Color Space"
- msgstr "Preferovaný CIE*Lab barvový prostor pro editaci"
- 
- #: API_generated/oyranos_profile.c:66
--msgid "Prefered CMM"
-+msgid "Preferred CMM"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:316
--msgid "Prefered Cmyk Editing Color Space"
-+msgid "Preferred Cmyk Editing Color Space"
- msgstr "Preferovaný barvový prostor CMYK pro editaci"
- 
- #: liboyranos_config/oyranos_texts.c:346
--msgid "Prefered Gray Editing Color Space"
-+msgid "Preferred Gray Editing Color Space"
- msgstr "Preferovaný barvový prostor pro editaci v šedi."
- 
- #: liboyranos_config/oyranos_texts.c:306
--msgid "Prefered Rgb Editing Color Space"
-+msgid "Preferred Rgb Editing Color Space"
- msgstr "Preferovaný barvový prostor RGB pro editaci"
- 
- #: liboyranos_config/oyranos_texts.c:326
--msgid "Prefered XYZ Editing Color Space"
-+msgid "Preferred XYZ Editing Color Space"
- msgstr "Preferovaný barvový prostor XYZ pro editaci"
- 
- #. choices
-@@ -2622,7 +2622,7 @@ msgstr "Záměr transformace"
- 
- #: liboyranos_config/oyranos_texts.c:479
- msgid ""
--"Rendering intent for color space transformations is typical the Relative "
-+"Rendering intent for color space transformations is typically the Relative "
- "Colorimetric intent plus Black Point Compensation or the Perceptual intent."
- msgstr ""
- "Záměr pro transformace mezi různými barvovými prostory se obvykle volí "
-@@ -2932,7 +2932,7 @@ msgstr "The client side window data handler of Oyranos."
- #: liboyranos_config/oyranos_texts.c:219
- msgid ""
- "The conversion between color spaces of different shape and size can happen "
--"in various ways. The Perceptual rendering intent is usual the best choice "
-+"in various ways. The Perceptual rendering intent is usually the best choice "
- "for photographs and artistic imagery. It is used in many automatic systems. "
- "The Relative Colorimetric rendering intent provides a well-defined standard, "
- "one-to-one color mapping, but without applying white point adaption. This "
-@@ -3268,7 +3268,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:347
- msgid ""
--"The preferred Gray Editing Color Space shall describe a single lighness "
-+"The preferred Gray Editing Color Space shall describe a single lightness "
- "channel color space for grayscale images."
- msgstr ""
- "Preferovaný barvový prostor editace v šedi by měl popisovat barvový prostor "
-@@ -3283,13 +3283,13 @@ msgstr ""
- "barvový prostor jako např. sRGB."
- 
- #: liboyranos_config/oyranos_texts.c:327
--msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ."
-+msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ."
- msgstr "Preferovaný barvový prostor editace XYZ by měl popisovat CIE*XYZ."
- 
- #: liboyranos_config/oyranos_texts.c:183
- msgid ""
- "The proofing color space represents a real color device for simulation. "
--"Possible uses cases are to simulate a print machine, a viewing environment "
-+"Possible use cases are to simulate a print machine, a viewing environment "
- "in a theater or a expected small monitor gamut."
- msgstr ""
- "Barvový prostor pro simulaci zastupuje skutečné zařízení, jež má být "
-@@ -3387,7 +3387,7 @@ msgstr "Tepelná vosková tiskárna"
- #: liboyranos_config/oyranos_texts.c:429
- msgid ""
- "This setting decides what to do in the case that colors have no color space "
--"assigned. Typical the according assumed ICC profile should be assigned."
-+"assigned. Typically the according assumed ICC profile should be assigned."
- msgstr ""
- "Toto nastavení rozhoduje, co se má dělat v případě, že barvy nemají přiřazen "
- "žádný barvový prostor. Obvykle by měl být přiřazen příslušný předpokládaný "
-diff --git a/po/de.po b/po/de.po
-index 80a106a..80869df 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -292,7 +292,7 @@ msgid "Already enabled"
- msgstr "Bereits eingeschalten"
- 
- #: liboyranos_config/oyranos_texts.c:273
--msgid "Anylyze ICC profile information on your system."
-+msgid "Analyze ICC profile information on your system."
- msgstr "Details zu ICC Profilen in Ihrem System"
- 
- #: modules/oyranos_cmm_oyra_image.c:1065
-@@ -415,7 +415,7 @@ msgid ""
- "Behaviour of color space transformation for proofing. Most people want a "
- "preview on screen only. The Relative Colorimetric intent is right for that. "
- "The Absolute Colorimetric intent needs a very careful profiling and non-"
--"trivial setup, but allowes for side-by-side comparisions."
-+"trivial setup, but allows for side-by-side comparisons."
- msgstr ""
- "Verhalten der Farbübertragung bei der Simulation. Die meisten Nutzer "
- "wünschen eine Simulation nur an einem Bildschirm. Die relativ farbmetrische "
-@@ -652,7 +652,7 @@ msgstr "Farbumwandlung können intern unterschiedlich gespeichert werden"
- #: liboyranos_config/oyranos_texts.c:174
- msgid ""
- "Color content can sometimes have no ICC profile assigned. This is a critical "
--"situation as the system can not properly convert these colors. Therefor the "
-+"situation as the system can not properly convert these colors. Therefore the "
- "color processing parts need to pick some profile as a guess. These settings "
- "allow to change the picked ICC profile to guide the processing components "
- "and allow proper conversion and compositing."
-@@ -1000,7 +1000,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:236
- msgid ""
--"Decide what to do when the default color spaces dont match the current ones."
-+"Decide what to do when the default color spaces don't match the current ones."
- msgstr ""
- "Was ist zu tuen falls Standardfarbräume nicht mit den Eingestellten "
- "übereinstimmen."
-@@ -2100,7 +2100,7 @@ msgstr "Oyranos X11"
- #. HTML
- #: liboyranos_config/oyranos_xml.c:1036
- msgid ""
--"Oyranos allowes detailed settings like preferred editing color spaces and "
-+"Oyranos allows detailed settings like preferred editing color spaces and "
- "the behaviour of color conversions or simulation. Oyranos reduces the work "
- "involved in all color management related decisions through automation, "
- "useful defaults and grouping of settings in selectable policies."
-@@ -2283,27 +2283,27 @@ msgid "Postscript CRD Information"
- msgstr "Postscript CRD Information"
- 
- #: liboyranos_config/oyranos_texts.c:336
--msgid "Prefered CIE*Lab Editing Color Space"
-+msgid "Preferred CIE*Lab Editing Color Space"
- msgstr "Bevorzugter CIE*Lab Editierfarbraum"
- 
- #: API_generated/oyranos_profile.c:66
--msgid "Prefered CMM"
-+msgid "Preferred CMM"
- msgstr "Bevorzugte CMM"
- 
- #: liboyranos_config/oyranos_texts.c:316
--msgid "Prefered Cmyk Editing Color Space"
-+msgid "Preferred Cmyk Editing Color Space"
- msgstr "Bevorzugter Cmyk Editierfarbraum"
- 
- #: liboyranos_config/oyranos_texts.c:346
--msgid "Prefered Gray Editing Color Space"
-+msgid "Preferred Gray Editing Color Space"
- msgstr "Bevorzugter Grau Editierfarbraum"
- 
- #: liboyranos_config/oyranos_texts.c:306
--msgid "Prefered Rgb Editing Color Space"
-+msgid "Preferred Rgb Editing Color Space"
- msgstr "Bevorzugter Rgb Editierfarbraum"
- 
- #: liboyranos_config/oyranos_texts.c:326
--msgid "Prefered XYZ Editing Color Space"
-+msgid "Preferred XYZ Editing Color Space"
- msgstr "Bevorzugter XYZ Editierfarbraum"
- 
- #. choices
-@@ -2520,7 +2520,7 @@ msgstr "Übertragungsart: "
- 
- #: liboyranos_config/oyranos_texts.c:479
- msgid ""
--"Rendering intent for color space transformations is typical the Relative "
-+"Rendering intent for color space transformations is typically the Relative "
- "Colorimetric intent plus Black Point Compensation or the Perceptual intent."
- msgstr ""
- 
-@@ -2817,7 +2817,7 @@ msgstr "Die benutzerseitige Fensterdatenagent von Oyranos."
- #: liboyranos_config/oyranos_texts.c:219
- msgid ""
- "The conversion between color spaces of different shape and size can happen "
--"in various ways. The Perceptual rendering intent is usual the best choice "
-+"in various ways. The Perceptual rendering intent is usually the best choice "
- "for photographs and artistic imagery. It is used in many automatic systems. "
- "The Relative Colorimetric rendering intent provides a well-defined standard, "
- "one-to-one color mapping, but without applying white point adaption. This "
-@@ -3146,7 +3146,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:347
- msgid ""
--"The preferred Gray Editing Color Space shall describe a single lighness "
-+"The preferred Gray Editing Color Space shall describe a single lightness "
- "channel color space for grayscale images."
- msgstr ""
- "Der bevorzugte Grautonfarbraum soll Farben mit einem einzigen "
-@@ -3159,13 +3159,13 @@ msgid ""
- msgstr "Der bevorzugte Rgb Editierfarbraum sollte wohlgeformt sein."
- 
- #: liboyranos_config/oyranos_texts.c:327
--msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ."
-+msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ."
- msgstr "Der bevorzugter XYZ Editierfarbraum soll CIE*XYZ definieren."
- 
- #: liboyranos_config/oyranos_texts.c:183
- msgid ""
- "The proofing color space represents a real color device for simulation. "
--"Possible uses cases are to simulate a print machine, a viewing environment "
-+"Possible use cases are to simulate a print machine, a viewing environment "
- "in a theater or a expected small monitor gamut."
- msgstr ""
- "Der Simulationsfarbraum stellt das Farbverhalten eines realen Gerätes dar. "
-@@ -3257,7 +3257,7 @@ msgstr "Thermischer Wachsdrucker"
- #: liboyranos_config/oyranos_texts.c:429
- msgid ""
- "This setting decides what to do in the case that colors have no color space "
--"assigned. Typical the according assumed ICC profile should be assigned."
-+"assigned. Typically the according assumed ICC profile should be assigned."
- msgstr ""
- "Die Einstellung entscheidet was mit Farben ohne Farbprofil geschehen soll. "
- "Typischerweise wird das vermutete Farbprofil automatisch zugewiesen."
-diff --git a/po/eo.po b/po/eo.po
-index 787905a..bcf0dfc 100644
---- a/po/eo.po
-+++ b/po/eo.po
-@@ -308,7 +308,7 @@ msgid "Already enabled"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:273
--msgid "Anylyze ICC profile information on your system."
-+msgid "Analyze ICC profile information on your system."
- msgstr ""
- 
- #: modules/oyranos_cmm_oyra_image.c:1065
-@@ -435,7 +435,7 @@ msgid ""
- "Behaviour of color space transformation for proofing. Most people want a "
- "preview on screen only. The Relative Colorimetric intent is right for that. "
- "The Absolute Colorimetric intent needs a very careful profiling and non-"
--"trivial setup, but allowes for side-by-side comparisions."
-+"trivial setup, but allows for side-by-side comparisons."
- msgstr ""
- 
- #: modules/oyranos_cmm_lraw.cpp:1041
-@@ -665,7 +665,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:174
- msgid ""
- "Color content can sometimes have no ICC profile assigned. This is a critical "
--"situation as the system can not properly convert these colors. Therefor the "
-+"situation as the system can not properly convert these colors. Therefore the "
- "color processing parts need to pick some profile as a guess. These settings "
- "allow to change the picked ICC profile to guide the processing components "
- "and allow proper conversion and compositing."
-@@ -992,7 +992,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:236
- msgid ""
--"Decide what to do when the default color spaces dont match the current ones."
-+"Decide what to do when the default color spaces don't match the current ones."
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:154
-@@ -2067,7 +2067,7 @@ msgstr ""
- #. HTML
- #: liboyranos_config/oyranos_xml.c:1036
- msgid ""
--"Oyranos allowes detailed settings like preferred editing color spaces and "
-+"Oyranos allows detailed settings like preferred editing color spaces and "
- "the behaviour of color conversions or simulation. Oyranos reduces the work "
- "involved in all color management related decisions through automation, "
- "useful defaults and grouping of settings in selectable policies."
-@@ -2235,31 +2235,31 @@ msgstr "kolora"
- 
- #: liboyranos_config/oyranos_texts.c:336
- #, fuzzy
--msgid "Prefered CIE*Lab Editing Color Space"
-+msgid "Preferred CIE*Lab Editing Color Space"
- msgstr "kolora"
- 
- #: API_generated/oyranos_profile.c:66
--msgid "Prefered CMM"
-+msgid "Preferred CMM"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:316
- #, fuzzy
--msgid "Prefered Cmyk Editing Color Space"
-+msgid "Preferred Cmyk Editing Color Space"
- msgstr "kolora"
- 
- #: liboyranos_config/oyranos_texts.c:346
- #, fuzzy
--msgid "Prefered Gray Editing Color Space"
-+msgid "Preferred Gray Editing Color Space"
- msgstr "kolora"
- 
- #: liboyranos_config/oyranos_texts.c:306
- #, fuzzy
--msgid "Prefered Rgb Editing Color Space"
-+msgid "Preferred Rgb Editing Color Space"
- msgstr "kolora"
- 
- #: liboyranos_config/oyranos_texts.c:326
- #, fuzzy
--msgid "Prefered XYZ Editing Color Space"
-+msgid "Preferred XYZ Editing Color Space"
- msgstr "kolora"
- 
- #. choices
-@@ -2478,7 +2478,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:479
- msgid ""
--"Rendering intent for color space transformations is typical the Relative "
-+"Rendering intent for color space transformations is typically the Relative "
- "Colorimetric intent plus Black Point Compensation or the Perceptual intent."
- msgstr ""
- 
-@@ -2748,7 +2748,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:219
- msgid ""
- "The conversion between color spaces of different shape and size can happen "
--"in various ways. The Perceptual rendering intent is usual the best choice "
-+"in various ways. The Perceptual rendering intent is usually the best choice "
- "for photographs and artistic imagery. It is used in many automatic systems. "
- "The Relative Colorimetric rendering intent provides a well-defined standard, "
- "one-to-one color mapping, but without applying white point adaption. This "
-@@ -2962,7 +2962,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:347
- msgid ""
--"The preferred Gray Editing Color Space shall describe a single lighness "
-+"The preferred Gray Editing Color Space shall describe a single lightness "
- "channel color space for grayscale images."
- msgstr ""
- 
-@@ -2973,13 +2973,13 @@ msgid ""
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:327
--msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ."
-+msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ."
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:183
- msgid ""
- "The proofing color space represents a real color device for simulation. "
--"Possible uses cases are to simulate a print machine, a viewing environment "
-+"Possible use cases are to simulate a print machine, a viewing environment "
- "in a theater or a expected small monitor gamut."
- msgstr ""
- 
-@@ -3055,7 +3055,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:429
- msgid ""
- "This setting decides what to do in the case that colors have no color space "
--"assigned. Typical the according assumed ICC profile should be assigned."
-+"assigned. Typically the according assumed ICC profile should be assigned."
- msgstr ""
- 
- #: modules/oyranos_cmm_oyIM_profile.c:1167
-diff --git a/po/eu.po b/po/eu.po
-index f86f417..277b42d 100644
---- a/po/eu.po
-+++ b/po/eu.po
-@@ -315,7 +315,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:273
- #, fuzzy
--msgid "Anylyze ICC profile information on your system."
-+msgid "Analyze ICC profile information on your system."
- msgstr "Oyranos-en ezarpenak"
- 
- #: modules/oyranos_cmm_oyra_image.c:1065
-@@ -447,7 +447,7 @@ msgid ""
- "Behaviour of color space transformation for proofing. Most people want a "
- "preview on screen only. The Relative Colorimetric intent is right for that. "
- "The Absolute Colorimetric intent needs a very careful profiling and non-"
--"trivial setup, but allowes for side-by-side comparisions."
-+"trivial setup, but allows for side-by-side comparisons."
- msgstr ""
- 
- #: modules/oyranos_cmm_lraw.cpp:1041
-@@ -679,7 +679,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:174
- msgid ""
- "Color content can sometimes have no ICC profile assigned. This is a critical "
--"situation as the system can not properly convert these colors. Therefor the "
-+"situation as the system can not properly convert these colors. Therefore the "
- "color processing parts need to pick some profile as a guess. These settings "
- "allow to change the picked ICC profile to guide the processing components "
- "and allow proper conversion and compositing."
-@@ -1031,7 +1031,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:236
- msgid ""
--"Decide what to do when the default color spaces dont match the current ones."
-+"Decide what to do when the default color spaces don't match the current ones."
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:154
-@@ -2167,7 +2167,7 @@ msgstr "Oyranos-en ezarpenak"
- #. HTML
- #: liboyranos_config/oyranos_xml.c:1036
- msgid ""
--"Oyranos allowes detailed settings like preferred editing color spaces and "
-+"Oyranos allows detailed settings like preferred editing color spaces and "
- "the behaviour of color conversions or simulation. Oyranos reduces the work "
- "involved in all color management related decisions through automation, "
- "useful defaults and grouping of settings in selectable policies."
-@@ -2349,31 +2349,31 @@ msgstr "Aurrebista, saturatua"
- 
- #: liboyranos_config/oyranos_texts.c:336
- #, fuzzy
--msgid "Prefered CIE*Lab Editing Color Space"
-+msgid "Preferred CIE*Lab Editing Color Space"
- msgstr "Kolore-espazioa"
- 
- #: API_generated/oyranos_profile.c:66
--msgid "Prefered CMM"
-+msgid "Preferred CMM"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:316
- #, fuzzy
--msgid "Prefered Cmyk Editing Color Space"
-+msgid "Preferred Cmyk Editing Color Space"
- msgstr "Kolore-espazioa"
- 
- #: liboyranos_config/oyranos_texts.c:346
- #, fuzzy
--msgid "Prefered Gray Editing Color Space"
-+msgid "Preferred Gray Editing Color Space"
- msgstr "Kolore-espazioa"
- 
- #: liboyranos_config/oyranos_texts.c:306
- #, fuzzy
--msgid "Prefered Rgb Editing Color Space"
-+msgid "Preferred Rgb Editing Color Space"
- msgstr "Kolore-espazioa"
- 
- #: liboyranos_config/oyranos_texts.c:326
- #, fuzzy
--msgid "Prefered XYZ Editing Color Space"
-+msgid "Preferred XYZ Editing Color Space"
- msgstr "Kolore-espazioa"
- 
- #. choices
-@@ -2610,7 +2610,7 @@ msgstr "Oyranos-en ezarpenak"
- 
- #: liboyranos_config/oyranos_texts.c:479
- msgid ""
--"Rendering intent for color space transformations is typical the Relative "
-+"Rendering intent for color space transformations is typically the Relative "
- "Colorimetric intent plus Black Point Compensation or the Perceptual intent."
- msgstr ""
- 
-@@ -2896,7 +2896,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:219
- msgid ""
- "The conversion between color spaces of different shape and size can happen "
--"in various ways. The Perceptual rendering intent is usual the best choice "
-+"in various ways. The Perceptual rendering intent is usually the best choice "
- "for photographs and artistic imagery. It is used in many automatic systems. "
- "The Relative Colorimetric rendering intent provides a well-defined standard, "
- "one-to-one color mapping, but without applying white point adaption. This "
-@@ -3113,7 +3113,7 @@ msgstr "Kolore-espazioa"
- #: liboyranos_config/oyranos_texts.c:347
- #, fuzzy
- msgid ""
--"The preferred Gray Editing Color Space shall describe a single lighness "
-+"The preferred Gray Editing Color Space shall describe a single lightness "
- "channel color space for grayscale images."
- msgstr "Kolore-espazioa"
- 
-@@ -3126,13 +3126,13 @@ msgstr "Kolore-espazioa"
- 
- #: liboyranos_config/oyranos_texts.c:327
- #, fuzzy
--msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ."
-+msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ."
- msgstr "Kolore-espazioa"
- 
- #: liboyranos_config/oyranos_texts.c:183
- msgid ""
- "The proofing color space represents a real color device for simulation. "
--"Possible uses cases are to simulate a print machine, a viewing environment "
-+"Possible use cases are to simulate a print machine, a viewing environment "
- "in a theater or a expected small monitor gamut."
- msgstr ""
- 
-@@ -3208,7 +3208,7 @@ msgstr "Inprimagailu ezko-termala"
- #: liboyranos_config/oyranos_texts.c:429
- msgid ""
- "This setting decides what to do in the case that colors have no color space "
--"assigned. Typical the according assumed ICC profile should be assigned."
-+"assigned. Typically the according assumed ICC profile should be assigned."
- msgstr ""
- 
- #: modules/oyranos_cmm_oyIM_profile.c:1167
-diff --git a/po/fr.po b/po/fr.po
-index f02e45c..737dc28 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -309,7 +309,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:273
- #, fuzzy
--msgid "Anylyze ICC profile information on your system."
-+msgid "Analyze ICC profile information on your system."
- msgstr "Oyranos Préférences"
- 
- #: modules/oyranos_cmm_oyra_image.c:1065
-@@ -441,7 +441,7 @@ msgid ""
- "Behaviour of color space transformation for proofing. Most people want a "
- "preview on screen only. The Relative Colorimetric intent is right for that. "
- "The Absolute Colorimetric intent needs a very careful profiling and non-"
--"trivial setup, but allowes for side-by-side comparisions."
-+"trivial setup, but allows for side-by-side comparisons."
- msgstr ""
- 
- #: modules/oyranos_cmm_lraw.cpp:1041
-@@ -673,7 +673,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:174
- msgid ""
- "Color content can sometimes have no ICC profile assigned. This is a critical "
--"situation as the system can not properly convert these colors. Therefor the "
-+"situation as the system can not properly convert these colors. Therefore the "
- "color processing parts need to pick some profile as a guess. These settings "
- "allow to change the picked ICC profile to guide the processing components "
- "and allow proper conversion and compositing."
-@@ -1020,7 +1020,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:236
- msgid ""
--"Decide what to do when the default color spaces dont match the current ones."
-+"Decide what to do when the default color spaces don't match the current ones."
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:154
-@@ -2156,7 +2156,7 @@ msgstr "Oyranos Préférences"
- #. HTML
- #: liboyranos_config/oyranos_xml.c:1036
- msgid ""
--"Oyranos allowes detailed settings like preferred editing color spaces and "
-+"Oyranos allows detailed settings like preferred editing color spaces and "
- "the behaviour of color conversions or simulation. Oyranos reduces the work "
- "involved in all color management related decisions through automation, "
- "useful defaults and grouping of settings in selectable policies."
-@@ -2335,31 +2335,31 @@ msgstr "Aperçu, saturation"
- 
- #: liboyranos_config/oyranos_texts.c:336
- #, fuzzy
--msgid "Prefered CIE*Lab Editing Color Space"
-+msgid "Preferred CIE*Lab Editing Color Space"
- msgstr "Espace colorimétrique"
- 
- #: API_generated/oyranos_profile.c:66
--msgid "Prefered CMM"
-+msgid "Preferred CMM"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:316
- #, fuzzy
--msgid "Prefered Cmyk Editing Color Space"
-+msgid "Preferred Cmyk Editing Color Space"
- msgstr "Espace colorimétrique"
- 
- #: liboyranos_config/oyranos_texts.c:346
- #, fuzzy
--msgid "Prefered Gray Editing Color Space"
-+msgid "Preferred Gray Editing Color Space"
- msgstr "Espace colorimétrique"
- 
- #: liboyranos_config/oyranos_texts.c:306
- #, fuzzy
--msgid "Prefered Rgb Editing Color Space"
-+msgid "Preferred Rgb Editing Color Space"
- msgstr "Espace colorimétrique"
- 
- #: liboyranos_config/oyranos_texts.c:326
- #, fuzzy
--msgid "Prefered XYZ Editing Color Space"
-+msgid "Preferred XYZ Editing Color Space"
- msgstr "Espace colorimétrique"
- 
- #. choices
-@@ -2589,7 +2589,7 @@ msgstr "Oyranos Préférences"
- 
- #: liboyranos_config/oyranos_texts.c:479
- msgid ""
--"Rendering intent for color space transformations is typical the Relative "
-+"Rendering intent for color space transformations is typically the Relative "
- "Colorimetric intent plus Black Point Compensation or the Perceptual intent."
- msgstr ""
- 
-@@ -2870,7 +2870,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:219
- msgid ""
- "The conversion between color spaces of different shape and size can happen "
--"in various ways. The Perceptual rendering intent is usual the best choice "
-+"in various ways. The Perceptual rendering intent is usually the best choice "
- "for photographs and artistic imagery. It is used in many automatic systems. "
- "The Relative Colorimetric rendering intent provides a well-defined standard, "
- "one-to-one color mapping, but without applying white point adaption. This "
-@@ -3087,7 +3087,7 @@ msgstr "Espace colorimétrique"
- #: liboyranos_config/oyranos_texts.c:347
- #, fuzzy
- msgid ""
--"The preferred Gray Editing Color Space shall describe a single lighness "
-+"The preferred Gray Editing Color Space shall describe a single lightness "
- "channel color space for grayscale images."
- msgstr "Espace colorimétrique"
- 
-@@ -3100,13 +3100,13 @@ msgstr "Espace colorimétrique"
- 
- #: liboyranos_config/oyranos_texts.c:327
- #, fuzzy
--msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ."
-+msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ."
- msgstr "Espace colorimétrique"
- 
- #: liboyranos_config/oyranos_texts.c:183
- msgid ""
- "The proofing color space represents a real color device for simulation. "
--"Possible uses cases are to simulate a print machine, a viewing environment "
-+"Possible use cases are to simulate a print machine, a viewing environment "
- "in a theater or a expected small monitor gamut."
- msgstr ""
- 
-@@ -3182,7 +3182,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:429
- msgid ""
- "This setting decides what to do in the case that colors have no color space "
--"assigned. Typical the according assumed ICC profile should be assigned."
-+"assigned. Typically the according assumed ICC profile should be assigned."
- msgstr ""
- 
- #: modules/oyranos_cmm_oyIM_profile.c:1167
-diff --git a/po/oyranos.pot b/po/oyranos.pot
-index c5f064d..d4eb1f8 100644
---- a/po/oyranos.pot
-+++ b/po/oyranos.pot
-@@ -139,7 +139,7 @@ msgid "Internal stored Size"
- msgstr ""
- 
- #: API_generated/oyranos_profile.c:66
--msgid "Prefered CMM"
-+msgid "Preferred CMM"
- msgstr ""
- 
- #: API_generated/oyranos_profile.c:67
-@@ -552,7 +552,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:174
- msgid ""
- "Color content can sometimes have no ICC profile assigned. This is a critical "
--"situation as the system can not properly convert these colors. Therefor the "
-+"situation as the system can not properly convert these colors. Therefore the "
- "color processing parts need to pick some profile as a guess. These settings "
- "allow to change the picked ICC profile to guide the processing components "
- "and allow proper conversion and compositing."
-@@ -569,7 +569,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:183
- msgid ""
- "The proofing color space represents a real color device for simulation. "
--"Possible uses cases are to simulate a print machine, a viewing environment "
-+"Possible use cases are to simulate a print machine, a viewing environment "
- "in a theater or a expected small monitor gamut."
- msgstr ""
- 
-@@ -631,7 +631,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:219
- msgid ""
- "The conversion between color spaces of different shape and size can happen "
--"in various ways. The Perceptual rendering intent is usual the best choice "
-+"in various ways. The Perceptual rendering intent is usually the best choice "
- "for photographs and artistic imagery. It is used in many automatic systems. "
- "The Relative Colorimetric rendering intent provides a well-defined standard, "
- "one-to-one color mapping, but without applying white point adaption. This "
-@@ -666,7 +666,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:236
- msgid ""
--"Decide what to do when the default color spaces dont match the current ones."
-+"Decide what to do when the default color spaces don't match the current ones."
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:237
-@@ -720,7 +720,7 @@ msgid "Profile Information"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:273
--msgid "Anylyze ICC profile information on your system."
-+msgid "Analyze ICC profile information on your system."
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:284
-@@ -743,7 +743,7 @@ msgid "Editing Rgb"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:306
--msgid "Prefered Rgb Editing Color Space"
-+msgid "Preferred Rgb Editing Color Space"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:307
-@@ -757,7 +757,7 @@ msgid "Editing Cmyk"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:316
--msgid "Prefered Cmyk Editing Color Space"
-+msgid "Preferred Cmyk Editing Color Space"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:317
-@@ -771,11 +771,11 @@ msgid "Editing XYZ"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:326
--msgid "Prefered XYZ Editing Color Space"
-+msgid "Preferred XYZ Editing Color Space"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:327
--msgid "The preferred XYZ Editing Color Space shall decribe CIE*XYZ."
-+msgid "The preferred XYZ Editing Color Space shall describe CIE*XYZ."
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:335
-@@ -783,7 +783,7 @@ msgid "Editing Lab"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:336
--msgid "Prefered CIE*Lab Editing Color Space"
-+msgid "Preferred CIE*Lab Editing Color Space"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:337
-@@ -795,12 +795,12 @@ msgid "Editing Gray"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:346
--msgid "Prefered Gray Editing Color Space"
-+msgid "Preferred Gray Editing Color Space"
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:347
- msgid ""
--"The preferred Gray Editing Color Space shall describe a single lighness "
-+"The preferred Gray Editing Color Space shall describe a single lightness "
- "channel color space for grayscale images."
- msgstr ""
- 
-@@ -910,7 +910,7 @@ msgstr ""
- #: liboyranos_config/oyranos_texts.c:429
- msgid ""
- "This setting decides what to do in the case that colors have no color space "
--"assigned. Typical the according assumed ICC profile should be assigned."
-+"assigned. Typically the according assumed ICC profile should be assigned."
- msgstr ""
- 
- #. choices
-@@ -1012,7 +1012,7 @@ msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:479
- msgid ""
--"Rendering intent for color space transformations is typical the Relative "
-+"Rendering intent for color space transformations is typically the Relative "
- "Colorimetric intent plus Black Point Compensation or the Perceptual intent."
- msgstr ""
- 
-@@ -1067,7 +1067,7 @@ msgid ""
- "Behaviour of color space transformation for proofing. Most people want a "
- "preview on screen only. The Relative Colorimetric intent is right for that. "
- "The Absolute Colorimetric intent needs a very careful profiling and non-"
--"trivial setup, but allowes for side-by-side comparisions."
-+"trivial setup, but allows for side-by-side comparisons."
- msgstr ""
- 
- #: liboyranos_config/oyranos_texts.c:507
-@@ -1168,7 +1168,7 @@ msgstr ""
- #. HTML
- #: liboyranos_config/oyranos_xml.c:1036
- msgid ""
--"Oyranos allowes detailed settings like preferred editing color spaces and "
-+"Oyranos allows detailed settings like preferred editing color spaces and "
- "the behaviour of color conversions or simulation. Oyranos reduces the work "
- "involved in all color management related decisions through automation, "
- "useful defaults and grouping of settings in selectable policies."
-diff --git a/src/liboyranos_config/oyranos_texts.c b/src/liboyranos_config/oyranos_texts.c
-index f7a7244..7a86a42 100644
---- a/src/liboyranos_config/oyranos_texts.c
-+++ b/src/liboyranos_config/oyranos_texts.c
-@@ -171,7 +171,7 @@ oyOptionStringsTranslate_ ()
-       oyGROUP_DEFAULT_PROFILES, 0, 0,
-       _("Assumed Color Space"),
-       _("Assumed Color Space for untagged colors"),
--      _("Color content can sometimes have no ICC profile assigned. This is a critical situation as the system can not properly convert these colors. Therefor the color processing parts need to pick some profile as a guess. These settings allow to change the picked ICC profile to guide the processing components and allow proper conversion and compositing."),
-+      _("Color content can sometimes have no ICC profile assigned. This is a critical situation as the system can not properly convert these colors. Therefore the color processing parts need to pick some profile as a guess. These settings allow to change the picked ICC profile to guide the processing components and allow proper conversion and compositing."),
-       0, /* choices */
-       NULL, NULL, NULL, NULL,
-       NULL,
-@@ -180,7 +180,7 @@ oyOptionStringsTranslate_ ()
-       0, 0, 0,
-       _("Proofing Color Space"),
-       _("Color Space for Simulating real devices"),
--      _("The proofing color space represents a real color device for simulation. Possible uses cases are to simulate a print machine, a viewing environment in a theater or a expected small monitor gamut."),
-+      _("The proofing color space represents a real color device for simulation. Possible use cases are to simulate a print machine, a viewing environment in a theater or a expected small monitor gamut."),
-       0, /* choices */
-       NULL, NULL, NULL, NULL,
-       NULL,
-@@ -216,7 +216,7 @@ oyOptionStringsTranslate_ ()
-       oyGROUP_BEHAVIOUR, 0, 0,
-       _("Rendering"),
-       _("The kind of ICC gamut mapping for transforming colors between differently sized color spaces"),
--      _("The conversion between color spaces of different shape and size can happen in various ways. The Perceptual rendering intent is usual the best choice for photographs and artistic imagery. It is used in many automatic systems. The Relative Colorimetric rendering intent provides a well-defined standard, one-to-one color mapping, but without applying white point adaption. This can lead to color clipping in case of colors falling outside the target gamut as a price for the otherwise colorimetric correctness. The Relative Colorimetric intent is often used in combination with Black Point Compensation. The Saturation rendering intent shall provide an optimal use of saturated device colors. The Absolute Colorimetric rendering intent works like the relative colorimetric one except the white point is adapted. All rendering intents beside the colorimetric ones rely on the color tables designed by the profile vendor."),
-+      _("The conversion between color spaces of different shape and size can happen in various ways. The Perceptual rendering intent is usually the best choice for photographs and artistic imagery. It is used in many automatic systems. The Relative Colorimetric rendering intent provides a well-defined standard, one-to-one color mapping, but without applying white point adaption. This can lead to color clipping in case of colors falling outside the target gamut as a price for the otherwise colorimetric correctness. The Relative Colorimetric intent is often used in combination with Black Point Compensation. The Saturation rendering intent shall provide an optimal use of saturated device colors. The Absolute Colorimetric rendering intent works like the relative colorimetric one except the white point is adapted. All rendering intents beside the colorimetric ones rely on the color tables designed by the profile vendor."),
-       0, /* choices */
-       NULL, NULL, NULL, NULL,
-       NULL,
-@@ -233,7 +233,7 @@ oyOptionStringsTranslate_ ()
-     oySET_OPTIONS_M_( oyWIDGETTYPE_GROUP_TREE, oyWIDGET_GROUP_BEHAVIOUR_MISSMATCH, 1, 
-       oyGROUP_BEHAVIOUR, 0, 0,
-       _("Mismatching"),
--      _("Decide what to do when the default color spaces dont match the current ones."),
-+      _("Decide what to do when the default color spaces don't match the current ones."),
-       _("Decide how to resolve conflicts with input color spaces and current settings."),
-       0, /* choices */
-       NULL, NULL, NULL, NULL,
-@@ -270,7 +270,7 @@ oyOptionStringsTranslate_ ()
-       0, 0, 0,
-       _("Information"),
-       _("Profile Information"),
--      _("Anylyze ICC profile information on your system."),
-+      _("Analyze ICC profile information on your system."),
-       0, /* choices */
-       NULL, NULL, NULL, NULL,
-       NULL,
-@@ -303,7 +303,7 @@ oyOptionStringsTranslate_ ()
-     oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_RGB, 2,
-       oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0,
-       _("Editing Rgb"),
--      _("Prefered Rgb Editing Color Space"),
-+      _("Preferred Rgb Editing Color Space"),
-       _("The preferred Rgb Editing Color Space should represent a well behaving color space like sRGB."),
-       0, /* choices */
-       NULL, NULL, NULL, NULL,
-@@ -313,7 +313,7 @@ oyOptionStringsTranslate_ ()
-     oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_CMYK, 2,
-       oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0,
-       _("Editing Cmyk"),
--      _("Prefered Cmyk Editing Color Space"),
-+      _("Preferred Cmyk Editing Color Space"),
-       _("The preferred Cmyk Editing Color Space should represent a color space that complies to well defined printing conditions like FOGRA or SWOP."),
-       0, /* choices */
-       NULL, NULL, NULL, NULL,
-@@ -323,8 +323,8 @@ oyOptionStringsTranslate_ ()
-     oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_XYZ, 2,
-       oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0,
-       _("Editing XYZ"),
--      _("Prefered XYZ Editing Color Space"),
--      _("The preferred XYZ Editing Color Space shall decribe CIE*XYZ."),
-+      _("Preferred XYZ Editing Color Space"),
-+      _("The preferred XYZ Editing Color Space shall describe CIE*XYZ."),
-       0, /* choices */
-       NULL, NULL, NULL, NULL,
-       OY_DEFAULT_EDITING_XYZ_PROFILE,
-@@ -333,7 +333,7 @@ oyOptionStringsTranslate_ ()
-     oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_LAB, 2,
-       oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0,
-       _("Editing Lab"),
--      _("Prefered CIE*Lab Editing Color Space"),
-+      _("Preferred CIE*Lab Editing Color Space"),
-       _("The preferred CIE*Lab Editing Color Space shall describe the CIE*Lab."),
-       0, /* choices */
-       NULL, NULL, NULL, NULL,
-@@ -343,8 +343,8 @@ oyOptionStringsTranslate_ ()
-     oySET_OPTIONS_M_( oyWIDGETTYPE_DEFAULT_PROFILE, oyWIDGET_EDITING_GRAY, 2,
-       oyGROUP_DEFAULT_PROFILES, oyGROUP_DEFAULT_PROFILES_EDIT, 0,
-       _("Editing Gray"),
--      _("Prefered Gray Editing Color Space"),
--      _("The preferred Gray Editing Color Space shall describe a single lighness channel color space for grayscale images."),
-+      _("Preferred Gray Editing Color Space"),
-+      _("The preferred Gray Editing Color Space shall describe a single lightness channel color space for grayscale images."),
-       0, /* choices */
-       NULL, NULL, NULL, NULL,
-       OY_DEFAULT_EDITING_GRAY_PROFILE,
-@@ -426,7 +426,7 @@ oyOptionStringsTranslate_ ()
-       oyGROUP_BEHAVIOUR, oyGROUP_BEHAVIOUR_MISSMATCH, 0,
-       _("No Image profile"),
-       _("Image has no color space embedded. What default action shall be performed?"),
--      _("This setting decides what to do in the case that colors have no color space assigned. Typical the according assumed ICC profile should be assigned."),
-+      _("This setting decides what to do in the case that colors have no color space assigned. Typically the according assumed ICC profile should be assigned."),
-       3, /* choices */
-       _("Assign No Profile"),_("Assign Assumed Profile"),_("Prompt"), NULL,
-       OY_ACTION_UNTAGGED_ASSIGN,
-@@ -476,7 +476,7 @@ oyOptionStringsTranslate_ ()
-       oyGROUP_BEHAVIOUR, oyGROUP_BEHAVIOUR_RENDERING, 0,
-       _("Rendering Intent"),
-       _("Rendering intent for color space transformations."),
--      _("Rendering intent for color space transformations is typical the Relative Colorimetric intent plus Black Point Compensation or the Perceptual intent."),
-+      _("Rendering intent for color space transformations is typically the Relative Colorimetric intent plus Black Point Compensation or the Perceptual intent."),
-       4, /* choices */
-       _("Perceptual"),_("Relative Colorimetric"),_("Saturation"),_("Absolute Colorimetric"),
-       OY_DEFAULT_RENDERING_INTENT,
-@@ -496,7 +496,7 @@ oyOptionStringsTranslate_ ()
-       oyGROUP_BEHAVIOUR, oyGROUP_BEHAVIOUR_PROOF, 0,
-       _("Proofing Rendering Intent"),
-       _("Behaviour of color space transformation for proofing"),
--      _("Behaviour of color space transformation for proofing. Most people want a preview on screen only. The Relative Colorimetric intent is right for that. The Absolute Colorimetric intent needs a very careful profiling and non-trivial setup, but allowes for side-by-side comparisions."),
-+      _("Behaviour of color space transformation for proofing. Most people want a preview on screen only. The Relative Colorimetric intent is right for that. The Absolute Colorimetric intent needs a very careful profiling and non-trivial setup, but allows for side-by-side comparisons."),
-       2, /* choices */
-       _("Relative Colorimetric"),_("Absolute Colorimetric"),NULL,NULL,
-       OY_DEFAULT_RENDERING_INTENT_PROOF,
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-omit-profile-with-error.patch b/media-libs/oyranos/files/oyranos-0.9.4-omit-profile-with-error.patch
deleted file mode 100644
index f87f004..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-omit-profile-with-error.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Tue, 26 Mar 2013 11:09:01 +0000 (+0100)
-Subject: * [source]: omit profile with error
-X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=ecbfe88cf77863c7c925f61d0e69d11474059cb8
-
-* [source]: omit profile with error
-
-a proper return value would be more helpful
----
-
-diff --git a/src/API_generated/oyProfile_s_.c b/src/API_generated/oyProfile_s_.c
-index 83629fe..338ed08 100644
---- a/src/API_generated/oyProfile_s_.c
-+++ b/src/API_generated/oyProfile_s_.c
-@@ -8,12 +8,12 @@
-  *  Oyranos is an open source Colour Management System
-  *
-  *  @par Copyright:
-- *            2004-2012 (C) Kai-Uwe Behrmann
-+ *            2004-2013 (C) Kai-Uwe Behrmann
-  *
-  *  @author   Kai-Uwe Behrmann <ku.b@gmx.de>
-  *  @par License:
-  *            new BSD - see: http://www.opensource.org/licenses/bsd-license.php
-- *  @date     2012/10/31
-+ *  @date     2013/03/26
-  */
- 
- 
-@@ -724,6 +724,9 @@ oyProfile_s_ *  oyProfile_FromFile_  ( const char        * name,
-     }
-   }
- 
-+  if(error >= 1 && s)
-+    oyProfile_Release( (oyProfile_s**)&s );
-+
-   oyHash_Release_( &entry );
- 
-   return s;
-diff --git a/src/sources/Profile.private_methods_definitions.c b/src/sources/Profile.private_methods_definitions.c
-index 7b49ca6..e131893 100644
---- a/src/sources/Profile.private_methods_definitions.c
-+++ b/src/sources/Profile.private_methods_definitions.c
-@@ -311,6 +311,9 @@ oyProfile_s_ *  oyProfile_FromFile_  ( const char        * name,
-     }
-   }
- 
-+  if(error >= 1 && s)
-+    oyProfile_Release( (oyProfile_s**)&s );
-+
-   oyHash_Release_( &entry );
- 
-   return s;
-
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch b/media-libs/oyranos/files/oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch
deleted file mode 100644
index 6acfcdd..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-set-xcalib-to-screen-if-ge-xrandr-12.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Sun, 17 Feb 2013 19:28:06 +0000 (+0100)
-Subject: * [oyX1]: set xcalib to screen if XRandR >= 1.2
-X-Git-Url: http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff_plain;h=505b3931d9de6c667566278c5b3a1713d43212a8
-
-* [oyX1]: set xcalib to screen if XRandR >= 1.2
----
-
-diff --git a/src/modules/devices/oyranos_monitor_x11.c b/src/modules/devices/oyranos_monitor_x11.c
-index a090b14..a530a81 100644
---- a/src/modules/devices/oyranos_monitor_x11.c
-+++ b/src/modules/devices/oyranos_monitor_x11.c
-@@ -90,6 +90,8 @@ RROutput
- XRROutputInfo *
-     oyX1Monitor_xrrOutputInfo_( oyX1Monitor_s * disp ) { return disp->output_info; }
- int oyX1Monitor_activeOutputs_( oyX1Monitor_s * disp ) { return disp->active_outputs; }
-+int oyX1Monitor_rrVersion_    ( oyX1Monitor_s * disp ) { return disp->rr_version; }
-+int oyX1Monitor_rrScreen_     ( oyX1Monitor_s * disp ) { return disp->rr_screen; }
- 
- 
- #endif
-@@ -680,7 +682,8 @@ int      oyX1MonitorProfileSetup     ( const char        * display_name,
-   char *text = 0;
- 
-   DBG_PROG_START
--  disp = oyX1Monitor_newFrom_( display_name, 0 );
-+  /* XRandR needs a expensive initialisation */
-+  disp = oyX1Monitor_newFrom_( display_name, 1 );
-   if(!disp)
-     return 1;
- 
-@@ -721,6 +724,13 @@ int      oyX1MonitorProfileSetup     ( const char        * display_name,
-      */
-     sprintf(text,"xcalib -d %s -s %d %s \'%s\'", dpy_name, disp->geo[1],
-                  oy_debug?"-v":"", profile_fullname);
-+    if(oyX1Monitor_infoSource_( disp ) == oyX11INFO_SOURCE_XRANDR)
-+      sprintf(text,"xcalib -d %s -s %d %s \'%s\'", dpy_name, oyX1Monitor_rrScreen_(disp),
-+              oy_debug?"-v":"", profile_fullname);
-+    else
-+      sprintf(text,"xcalib -d %s -s %d %s \'%s\'", dpy_name, disp->geo[1],
-+              oy_debug?"-v":"", profile_fullname);
-+
-     {
-       Display * display = oyX1Monitor_device_( disp );
-       int effective_screen = oyX1Monitor_screen_( disp );
-@@ -751,17 +761,21 @@ int      oyX1MonitorProfileSetup     ( const char        * display_name,
- #endif
- 
-       /* Check for incapabilities of X gamma table access */
--      if(can_gamma || oyX1Monitor_screen_( disp ) == 0)
-+      if(can_gamma || oyX1Monitor_screen_( disp ) == 0 || oyX1Monitor_infoSource_( disp ) == oyX11INFO_SOURCE_XRANDR )
-         error = system(text);
-       if(error &&
-          error != 65280)
-       { /* hack */
--        WARNc2_S("%s %s", _("No monitor gamma curves by profile:"),
--                oyNoEmptyName_m_(profil_basename) )
-+        WARNc3_S("%s %s %d", _("No monitor gamma curves by profile:"),
-+                oyNoEmptyName_m_(profil_basename), error )
-         error = -1;
-       } else
-+      {
-         /* take xcalib error not serious, turn into a issue */
-+        if(oy_debug)
-+          DBG1_S("xcalib returned %d", error)
-         error = -1;
-+      }
-     }
- 
-     if(oy_debug)
-@@ -873,7 +887,8 @@ int      oyX1MonitorProfileUnset     ( const char        * display_name )
- 
-   DBG_PROG_START
- 
--  disp = oyX1Monitor_newFrom_( display_name, 0 );
-+  /* XRandR needs a expensive initialisation */
-+  disp = oyX1Monitor_newFrom_( display_name, 1 );
-   if(!disp)
-   {
-     DBG_PROG_ENDE
-@@ -926,10 +941,16 @@ int      oyX1MonitorProfileUnset     ( const char        * display_name )
-           if( (ptr = strchr(ptr,'.')) != 0 )
-             ptr[0] = '\000';
- 
--        oySnprintf2_(command, 1024, "xgamma -gamma 1.0 -screen %d -display %s",
-+        if(oyX1Monitor_infoSource_( disp ) == oyX11INFO_SOURCE_XRANDR)
-+          oySnprintf2_(command, 1024, "xrandr -display %s --output %s --gamma .999999:.999999:.999999",
-+                 dpy_name, oyX1Monitor_systemPort_(disp));
-+        else
-+          oySnprintf2_(command, 1024, "xgamma -gamma 1.0 -screen %d -display %s",
-                  disp->geo[1], dpy_name);
- 
--        if(screen == disp->geo[1])
-+        if(oy_debug)
-+          DBG3_S( "%d %d system: %s", screen, disp->geo[1], command )
-+        if(screen == disp->geo[1] || oyX1Monitor_infoSource_( disp ) == oyX11INFO_SOURCE_XRANDR)
-           r = system( command );
-         if(r) WARNc2_S("%s %d", _("found issues"),r);
- 
-@@ -1347,17 +1368,16 @@ oyX1Monitor_s* oyX1Monitor_newFrom_      ( const char        * display_name,
- 
-           if(monitors == 0)
-           {
--            if(strcmp("default", output_info->name) != 0)
--            {
--              disp->info_source = oyX11INFO_SOURCE_XRANDR;
--
--            } else
-+            if(!XRRGetCrtcGammaSize( display, output_info->crtc ))
-             {
-               XRRFreeOutputInfo( output_info );
-               break;
-             }
-           }
- 
-+          if(XRRGetCrtcGammaSize( display, output_info->crtc ))
-+            disp->info_source = oyX11INFO_SOURCE_XRANDR;
-+
-           crtc_info = XRRGetCrtcInfo( disp->display, res_temp,
-                                       output_info->crtc );
-           if(crtc_info)
-@@ -1390,6 +1410,8 @@ oyX1Monitor_s* oyX1Monitor_newFrom_      ( const char        * display_name,
-             if(disp->output_info->name && oyStrlen_(disp->output_info->name))
-               disp->system_port = oyStringCopy_( disp->output_info->name,
-                                                  oyAllocateFunc_ );
-+            disp->rr_version = major_versionp*100 + minor_versionp;
-+            disp->rr_screen = xrand_screen;
-           }
- 
-           ++ monitors;
-
diff --git a/media-libs/oyranos/files/oyranos-0.9.4-use-more-internal-xrandr-info.patch b/media-libs/oyranos/files/oyranos-0.9.4-use-more-internal-xrandr-info.patch
deleted file mode 100644
index d2a58ea..0000000
--- a/media-libs/oyranos/files/oyranos-0.9.4-use-more-internal-xrandr-info.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5c9b4a85213e5f63d716655b6c61a7efce07223c Mon Sep 17 00:00:00 2001
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Sun, 17 Feb 2013 20:27:04 +0100
-Subject: [PATCH] * [oyX1]: use more internal XRandR information
-
----
- src/include_private/oyranos_monitor_internal_x11.h |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/include_private/oyranos_monitor_internal_x11.h b/src/include_private/oyranos_monitor_internal_x11.h
-index c41aa3a..363b759 100644
---- a/src/include_private/oyranos_monitor_internal_x11.h
-+++ b/src/include_private/oyranos_monitor_internal_x11.h
-@@ -60,6 +60,8 @@ typedef struct {
-   RROutput             output;         /**< XRandR output */
-   XRROutputInfo      * output_info;    /**< XRandR output info */
-   int                  active_outputs; /**< outputs with crtc and gamma size */
-+  int                  rr_version;     /**< XRandR version */
-+  int                  rr_screen;      /**< nth XRandR output */
- # endif
-   char               * system_port;    /**< the operating systems port name */
-   oyBlob_s           * edid;           /**< edid for the device */
-@@ -95,6 +97,8 @@ RROutput     oyX1Monitor_xrrOutput_    ( oyX1Monitor_s       * disp );
- XRROutputInfo *
-              oyX1Monitor_xrrOutputInfo_( oyX1Monitor_s       * disp );
- int          oyX1Monitor_activeOutputs_( oyX1Monitor_s       * disp );
-+int          oyX1Monitor_rrVersion_    ( oyX1Monitor_s       * disp );
-+int          oyX1Monitor_rrScreen_     ( oyX1Monitor_s       * disp );
- # endif
- 
- int          oyX1MonitorProfileSetup ( const char        * display_name,
--- 
-1.5.6.5
-
-
diff --git a/media-libs/oyranos/metadata.xml b/media-libs/oyranos/metadata.xml
deleted file mode 100644
index 07777d5..0000000
--- a/media-libs/oyranos/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd />
-<maintainer>
-  <email>yamakuzure@gmx.net</email>
-  <description>Only through my private overlay - STRICTLY EXPERIMENTAL!</description>
-</maintainer>
-</pkgmetadata>
-
diff --git a/media-libs/oyranos/oyranos-0.9.4-r2.ebuild b/media-libs/oyranos/oyranos-0.9.4-r2.ebuild
deleted file mode 100644
index 51de1bb..0000000
--- a/media-libs/oyranos/oyranos-0.9.4-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.4-r1.ebuild,v 1.5 2013/08/15 03:38:17 patrick Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic cmake-utils cmake-multilib versionator
-
-DESCRIPTION="colour management system allowing to share various settings across applications and services"
-HOMEPAGE="http://www.oyranos.org/"
-SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2"
-
-MY_PV=$(get_version_component_range 1-3)
-MY_P=${PN}-${MY_PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X cairo cups doc exif fltk qt4 raw test"
-
-RDEPEND="=app-admin/elektra-0.7*[${MULTILIB_USEDEP}]
-	dev-libs/yajl[${MULTILIB_USEDEP}]
-	media-libs/icc-profiles-basiccolor-printing2009
-	media-libs/icc-profiles-basiccolor-printing2009
-	>=media-libs/libXcm-0.5.2[${MULTILIB_USEDEP}]
-	X? ( x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	!amd64? (
-		dev-libs/libxml2
-		cairo? ( x11-libs/cairo )
-		cups? ( net-print/cups )
-		qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-		raw? ( media-libs/libraw )
-		)
-	amd64? (
-		abi_x86_64? (
-			dev-libs/libxml2
-			|| ( media-libs/lcms:0 media-libs/lcms:2 )
-			media-libs/libpng:0
-			cairo? ( x11-libs/cairo )
-			cups? ( net-print/cups )
-			qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-			raw? ( media-libs/libraw )
-		)
-		abi_x86_32? (
-			app-emulation/emul-linux-x86-baselibs
-			cairo? ( app-emulation/emul-linux-x86-gtklibs )
-			cups? ( app-emulation/emul-linux-x86-baselibs )
-			qt4? ( app-emulation/emul-linux-x86-qtlibs )
-		)
-	)
-	media-gfx/graphviz
-	exif? ( media-gfx/exiv2 )
-	fltk? ( x11-libs/fltk:1 )"
-DEPEND="${RDEPEND}
-	app-doc/doxygen"
-
-RESTRICT="test"
-REQUIRED_USE="amd64? ( exif? ( !abi_x86_32 )
-	raw? ( !abi_x86_32 ) )"
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUPS"
-
-src_prepare() {
-	einfo remove bundled libs
-	rm -rf elektra* yajl || die
-
-	epatch "${FILESDIR}/${P}"-buildsystem-r1.patch
-
-	#upstream(ed) fixes, be more verbose, better xrandr handling
-	epatch "${FILESDIR}/${P}"-fix-array-access.patch \
-		"${FILESDIR}/${P}"-fix-oyRankMap-helper-functions-crashes.patch \
-		"${FILESDIR}/${P}"-fix-oyStringSegment-crash.patch \
-		"${FILESDIR}/${P}"-be-more-verbose.patch \
-		"${FILESDIR}/${P}"-use-more-internal-xrandr-info.patch \
-		"${FILESDIR}/${P}"-set-xcalib-to-screen-if-ge-xrandr-12.patch \
-		"${FILESDIR}/${P}"-fix-double-object-release.patch \
-		"${FILESDIR}/${P}"-omit-profile-with-error.patch \
-		"${FILESDIR}/${P}"-fix-typos-and-grammar.patch
-
-	#upstream fix for QA notice, gentoo bug 464254
-	epatch "${FILESDIR}/${P}"-fix-runpaths.patch
-
-	#fix really ugly and prominently visible typo (solved in 0.9.5)
-	sed -e 's/Promt/Prompt/' \
-		-i src/liboyranos_config/oyranos_texts.c po/*.{po,pot} settings/*xml || die
-
-	if use fltk ; then
-		#src/examples does not include fltk flags
-		append-cflags $(fltk-config --cflags)
-		append-cxxflags $(fltk-confiag --cxxflags)
-	fi
-
-	cmake-utils_src_prepare
-
-	mycmakeargs=(
-		$(usex X -DWANT_X11=1 "")
-		$(usex cairo -DWANT_CAIRO=1 "")
-		$(usex cups -DWANT_CUPS=1 "")
-		$(usex exif -DWANT_EXIV2=1 "")
-		$(usex fltk -DWANT_FLTK=1 "")
-		$(usex qt4 -DWANT_QT4=1 "")
-		$(usex raw -DWANT_LIBRAW=1 "")
-	)
-}
-
-src_configure() {
-	cmake-multilib_src_configure
-
-	if use abi_x86_32 && use abi_x86_64 ; then
-		sed -e 's:lib64:lib32:g' \
-			-i "${S}"-x86/CMakeCache.txt || die
-	fi
-}
-
-src_install() {
-	if use abi_x86_32 && use abi_x86_64 ; then
-		sed -e '/OY_LIBDIR/s:lib32:lib64:'\
-			-i "${S}"-x86/src/include/oyranos_version.h || die
-	fi
-
-	cmake-multilib_src_install
-
-	dodoc AUTHORS ChangeLog README
-	if use doc ; then
-		mv "${D}usr/share/doc/${PN}/html" "${D}usr/share/doc/${PF}" || die
-	fi
-	rm -rf "${D}usr/share/doc/${PN}" || die
-}