repo cleanup...drop old ebuilds, drop ebuilds already in portage tree

66 files changed, 0 insertions, 4009 deletions

diff --git a/media-video/amdcccle/Manifest b/media-video/amdcccle/Manifest
deleted file mode 100644
index 727eddd2..00000000
--- a/media-video/amdcccle/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST amd-catalyst-13.12-linux-x86.x86_64.zip 160571830 SHA256 024033f4847d1c2a182fc44e0b3df29b2d133e24aeaba390f4504a8f3361a0ca SHA512 bf02aea47dc0588e8fe6590ff5665b25b34b3e10499348e2eb786ba89b32703897753852e6ee8ed52c3d0f8eef46f2026d130329d7af75191e605975379d0109 WHIRLPOOL bcdac0f9641cfdc6d89cd5544fe22dda91f64ae8d34dcd25b55930702108b1bee1db0cdc85d8a68a78fddc34f7f30ab88c9813d3a6ba38b3abf37a24d6210707
-DIST amd-catalyst-14-4-linux-x86-x86-64.zip 122867159 SHA256 03cc022a49f47888b04f12343ace82bc1eff3aac524e6b4433848c20dc77fec0 SHA512 b359e6c9c349e7a3bee2bd95d3e39f0c596b9a9066893ade3eefcc89ee792094d26a04b2f6bdc31431b368a90ae5870ef07f848a4cbcca723ca1c7c3fcf79d98 WHIRLPOOL bd81574e1fc3be3f82ff51392a3044694e2834ce57395f9d4fe1a89dfa4bebd4b9fe24bc739a45173305bd267d1752226f0648145d5982c9dbe2a0ed23cf37f6
-DIST amd-catalyst-omega-14.12-linux-run-installers.zip 155616187 SHA256 68669836f20ad4351e08b13c5766c6b2ffc6b8cd2a37e9baf55779da32d3a249 SHA512 f87be6a56c03ca4aae3782668af8700d83c85872387753cf002ba4a0e0816fae9af29841a4390db972bfe2f7fb853571b32f8434c2008983461b80699347ac21 WHIRLPOOL 2675a387abd372b34c51f4e8ebfd6547300a8c3ffcc0562633838bc0cdaec3675ca3f4cfa2ab7481c8fa1238a46059f5f848611780638ef6d2301a527d900326
-DIST amd-driver-installer-12-1-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12-2-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-12-3-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST amd-driver-installer-15.20.1046-x86.x86_64.zip 51988 SHA256 7a967062bfed30c50f757e649f01d558393d0e2cd9e5fc71e93ece97ff7f877a SHA512 97fdceba59d5914b464fcb1c33242307c3d939552f7de93882d0b4701673609974d790380e0a33890f736393d6d2999bbd1d8118ec3e87145eb6d091b1e7b0c1 WHIRLPOOL 1cbb3f7934f5f9dabdddbfff2241f3bf1d39c33bcb3bc80d0a99dcf030d376c996aeb559f7ec5a84dd782b389c0c70f0a74f2f08fa2e6906f0515a74168730d9
-DIST ati-driver-installer-11-10-x86.x86_64.run 50201 SHA256 a8136110a0117cdfb29f1ce7f4a9ffe42fb2132ef2388baffe0d9922f4d50bfb SHA512 0cdde584ed578d5da11335c1d2e4189b1f3f54f8e8ac4b49e07e66014b79a06c146686519dc6615a83bdccff627d9a940a5d55eb73afff2c5ca710267d8f52aa WHIRLPOOL 088d5d4a8a1851e4da879d8d39188271ef7f302d2cd0615b4c54def147f5e8ec1bd026beb8f36abd0941a57e7d57fb9865bae93d09ebd987825df11ce66fda9a
-DIST ati-driver-installer-11-11-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST ati-driver-installer-11-12-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST ati-driver-installer-11-6-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST ati-driver-installer-11-8-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST ati-driver-installer-11-9-x86.x86_64.run 50201 SHA256 e3d63bfaeefff0a23f5af6df2592b7876e63a0a360e62adbf6fafdaa9b681c77 SHA512 6a69af5a00fa28bfaf36aff45723abd78072753ebb29808456494237daad79a78d7d6ad1701ee1fac235a0166446a9683198372314980c05746e4198861c8d76 WHIRLPOOL f5a30b24869ff77c8be180e372482b6b1d979618fd93dd20adb2cfc7610020e0068a48e3d96f7905d673af6f1a17ae0eb2d54e84b23d46a35a1c8472a0bfbe6b
-DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512 aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35 WHIRLPOOL 69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951
diff --git a/media-video/amdcccle/amdcccle-11.10.ebuild b/media-video/amdcccle/amdcccle-11.10.ebuild
deleted file mode 100644
index f0ed060b..00000000
--- a/media-video/amdcccle/amdcccle-11.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="x11-drivers/ati-drivers[-qt4(-)]
-	x11-libs/qt-core
-	x11-libs/qt-gui"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# Switching to a standard way to extract the files since otherwise no signature file
-		# would be created
-		local src="${DISTDIR}/${A}"
-		sh "${src}" --extract "${S}"
-	else
-		unpack ${A}
-	fi
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/"${ARCH_BASE}"/usr/X11R6/bin/amdcccle
-}
diff --git a/media-video/amdcccle/amdcccle-11.11.ebuild b/media-video/amdcccle/amdcccle-11.11.ebuild
deleted file mode 100644
index bf86fc54..00000000
--- a/media-video/amdcccle/amdcccle-11.11.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="~x11-drivers/ati-drivers-${PV}[-qt4(-)]
-	~x11-drivers/ati-userspace-${PV}
-	x11-libs/qt-core
-	x11-libs/qt-gui"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# Switching to a standard way to extract the files since otherwise no signature file
-		# would be created
-		local src="${DISTDIR}/${A}"
-		sh "${src}" --extract "${S}"
-	else
-		unpack ${A}
-	fi
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/${ARCH_BASE}/usr/X11R6/bin/amdcccle
-	dosbin arch/${ARCH_BASE}/usr/sbin/amdnotifyui
-}
diff --git a/media-video/amdcccle/amdcccle-11.12.ebuild b/media-video/amdcccle/amdcccle-11.12.ebuild
deleted file mode 100644
index bf86fc54..00000000
--- a/media-video/amdcccle/amdcccle-11.12.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="~x11-drivers/ati-drivers-${PV}[-qt4(-)]
-	~x11-drivers/ati-userspace-${PV}
-	x11-libs/qt-core
-	x11-libs/qt-gui"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# Switching to a standard way to extract the files since otherwise no signature file
-		# would be created
-		local src="${DISTDIR}/${A}"
-		sh "${src}" --extract "${S}"
-	else
-		unpack ${A}
-	fi
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/${ARCH_BASE}/usr/X11R6/bin/amdcccle
-	dosbin arch/${ARCH_BASE}/usr/sbin/amdnotifyui
-}
diff --git a/media-video/amdcccle/amdcccle-11.6.ebuild b/media-video/amdcccle/amdcccle-11.6.ebuild
deleted file mode 100644
index f0ed060b..00000000
--- a/media-video/amdcccle/amdcccle-11.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="x11-drivers/ati-drivers[-qt4(-)]
-	x11-libs/qt-core
-	x11-libs/qt-gui"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# Switching to a standard way to extract the files since otherwise no signature file
-		# would be created
-		local src="${DISTDIR}/${A}"
-		sh "${src}" --extract "${S}"
-	else
-		unpack ${A}
-	fi
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/"${ARCH_BASE}"/usr/X11R6/bin/amdcccle
-}
diff --git a/media-video/amdcccle/amdcccle-11.8.ebuild b/media-video/amdcccle/amdcccle-11.8.ebuild
deleted file mode 100644
index f0ed060b..00000000
--- a/media-video/amdcccle/amdcccle-11.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="x11-drivers/ati-drivers[-qt4(-)]
-	x11-libs/qt-core
-	x11-libs/qt-gui"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# Switching to a standard way to extract the files since otherwise no signature file
-		# would be created
-		local src="${DISTDIR}/${A}"
-		sh "${src}" --extract "${S}"
-	else
-		unpack ${A}
-	fi
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/"${ARCH_BASE}"/usr/X11R6/bin/amdcccle
-}
diff --git a/media-video/amdcccle/amdcccle-11.9.ebuild b/media-video/amdcccle/amdcccle-11.9.ebuild
deleted file mode 100644
index f0ed060b..00000000
--- a/media-video/amdcccle/amdcccle-11.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://ati.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="x11-drivers/ati-drivers[-qt4(-)]
-	x11-libs/qt-core
-	x11-libs/qt-gui"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# Switching to a standard way to extract the files since otherwise no signature file
-		# would be created
-		local src="${DISTDIR}/${A}"
-		sh "${src}" --extract "${S}"
-	else
-		unpack ${A}
-	fi
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/"${ARCH_BASE}"/usr/X11R6/bin/amdcccle
-}
diff --git a/media-video/amdcccle/amdcccle-12.1-r1.ebuild b/media-video/amdcccle/amdcccle-12.1-r1.ebuild
deleted file mode 100644
index 4e6e66ce..00000000
--- a/media-video/amdcccle/amdcccle-12.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="~x11-drivers/ati-drivers-${PV}[-qt4(-)]
-	~x11-drivers/ati-userspace-${PV}
-	x11-libs/qt-core
-	x11-libs/qt-gui"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# Switching to a standard way to extract the files since otherwise no signature file
-		# would be created
-		local src="${DISTDIR}/${A}"
-		sh "${src}" --extract "${S}"
-	else
-		unpack ${A}
-	fi
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/${ARCH_BASE}/usr/X11R6/bin/amdcccle
-	dosbin arch/${ARCH_BASE}/usr/sbin/amdnotifyui
-}
diff --git a/media-video/amdcccle/amdcccle-12.2.ebuild b/media-video/amdcccle/amdcccle-12.2.ebuild
deleted file mode 100644
index 4e6e66ce..00000000
--- a/media-video/amdcccle/amdcccle-12.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="~x11-drivers/ati-drivers-${PV}[-qt4(-)]
-	~x11-drivers/ati-userspace-${PV}
-	x11-libs/qt-core
-	x11-libs/qt-gui"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# Switching to a standard way to extract the files since otherwise no signature file
-		# would be created
-		local src="${DISTDIR}/${A}"
-		sh "${src}" --extract "${S}"
-	else
-		unpack ${A}
-	fi
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/${ARCH_BASE}/usr/X11R6/bin/amdcccle
-	dosbin arch/${ARCH_BASE}/usr/sbin/amdnotifyui
-}
diff --git a/media-video/amdcccle/amdcccle-12.3.ebuild b/media-video/amdcccle/amdcccle-12.3.ebuild
deleted file mode 100644
index 4e6e66ce..00000000
--- a/media-video/amdcccle/amdcccle-12.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
-	ATI_URL="http://www2.ati.com/drivers/linux/"
-	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
-	FOLDER_PREFIX="common/"
-else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
-fi
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-SLOT="1"
-
-RDEPEND="~x11-drivers/ati-drivers-${PV}[-qt4(-)]
-	~x11-drivers/ati-userspace-${PV}
-	x11-libs/qt-core
-	x11-libs/qt-gui"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# Switching to a standard way to extract the files since otherwise no signature file
-		# would be created
-		local src="${DISTDIR}/${A}"
-		sh "${src}" --extract "${S}"
-	else
-		unpack ${A}
-	fi
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/${ARCH_BASE}/usr/X11R6/bin/amdcccle
-	dosbin arch/${ARCH_BASE}/usr/sbin/amdnotifyui
-}
diff --git a/media-video/amdcccle/amdcccle-13.12.ebuild b/media-video/amdcccle/amdcccle-13.12.ebuild
deleted file mode 100644
index 6c80e324..00000000
--- a/media-video/amdcccle/amdcccle-13.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://www.amd.com"
-SLOT="1"
-# Uses javascript for download YESSSS
-#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
-DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/amd-catalyst-13.12-linux-x86.x86_64.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="~x11-drivers/ati-drivers-${PV}[-qt4(-)]
-	~x11-drivers/ati-userspace-${PV}
-	dev-qt/qtcore
-	dev-qt/qtgui"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/${ARCH_BASE}/usr/X11R6/bin/amdcccle
-	dosbin arch/${ARCH_BASE}/usr/sbin/amdnotifyui
-}
diff --git a/media-video/amdcccle/amdcccle-14.12.ebuild b/media-video/amdcccle/amdcccle-14.12.ebuild
deleted file mode 100644
index ed38bae3..00000000
--- a/media-video/amdcccle/amdcccle-14.12.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://www.amd.com"
-RUN="${WORKDIR}/fglrx-14.501.1003/amd-driver-installer-14.501.1003-x86.x86_64.run"
-SLOT="1"
-# Uses javascript for download YESSSS
-#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"
-DRIVERS_URI="mirror://gentoo/amd-catalyst-omega-14.12-linux-run-installers.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="~x11-drivers/ati-drivers-${PV}[-qt4(-)]
-	~x11-drivers/ati-userspace-${PV}
-	dev-qt/qtcore
-	dev-qt/qtgui"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/${ARCH_BASE}/usr/X11R6/bin/amdcccle
-	dosbin arch/${ARCH_BASE}/usr/sbin/amdnotifyui
-}
diff --git a/media-video/amdcccle/amdcccle-14.4.ebuild b/media-video/amdcccle/amdcccle-14.4.ebuild
deleted file mode 100644
index 09311a20..00000000
--- a/media-video/amdcccle/amdcccle-14.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://www.amd.com"
-RUN="${WORKDIR}/fglrx-14.10.1006/amd-driver-installer-14.10.1006-x86.x86_64.run"
-SLOT="1"
-DRIVERS_URI="mirror://kogaion/${CATEGORY}/amd-catalyst-14-4-linux-x86-x86-64.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="~x11-drivers/ati-drivers-${PV}[-qt4(-)]
-	~x11-drivers/ati-userspace-${PV}
-	dev-qt/qtcore
-	dev-qt/qtgui"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/${ARCH_BASE}/usr/X11R6/bin/amdcccle
-	dosbin arch/${ARCH_BASE}/usr/sbin/amdnotifyui
-}
diff --git a/media-video/amdcccle/amdcccle-15.7.ebuild b/media-video/amdcccle/amdcccle-15.7.ebuild
deleted file mode 100644
index 38924633..00000000
--- a/media-video/amdcccle/amdcccle-15.7.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils versionator
-
-DESCRIPTION="AMD Catalyst Control Center Linux Edition"
-HOMEPAGE="http://www.amd.com"
-#RUN="${WORKDIR}/fglrx-14.10.1006/amd-driver-installer-14.10.1006-x86.x86_64.run"
-SLOT="1"
-DRIVERS_URI="mirror://gentoo/amd-driver-installer-15.20.1046-x86.x86_64.zip"
-XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
-SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
-FOLDER_PREFIX="common/"
-IUSE=""
-
-LICENSE="QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="~x11-drivers/ati-drivers-${PV}
-	~x11-drivers/ati-userspace-${PV}
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-
-DEPEND=""
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/bin/amdcccle"
-
-src_unpack() {
-	local DRIVERS_DISTFILE XVBA_SDK_DISTFILE
-	DRIVERS_DISTFILE=${DRIVERS_URI##*/}
-	XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/}
-
-	if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then
-		unpack ${DRIVERS_DISTFILE}
-                mkdir -p common
-                mv etc lib usr common || die "Assumed to find etc lib and usr for common"
-	else
-		#please note, RUN may be insanely assigned at top near SRC_URI
-		if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then
-			unpack ${DRIVERS_DISTFILE}
-			[[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}"
-		else
-			RUN="${DISTDIR}/${DRIVERS_DISTFILE}"
-		fi
-		sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die
-	fi
-
-	mkdir xvba_sdk
-	cd xvba_sdk
-	unpack ${XVBA_SDK_DISTFILE}
-}
-
-src_compile() {
-	echo
-}
-
-src_install() {
-	insinto /usr/share
-	doins -r ${FOLDER_PREFIX}usr/share/ati
-	insinto /usr/share/pixmaps
-	doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	use x86 && ARCH_BASE="x86"
-	use amd64 && ARCH_BASE="x86_64"
-        into /opt
-        dobin arch/${ARCH_BASE}/usr/X11R6/bin/amdcccle
-	dosbin arch/${ARCH_BASE}/usr/sbin/amdnotifyui
-}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
deleted file mode 100644
index 2cbc1c4a..00000000
--- a/media-video/ffmpeg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ffmpeg-0.5_p20373.tar.bz2 3087600 SHA256 2a217144c82f11c80f325c653157bd9fc5424dc43a2b2ccbc8eb03a01d33418d
diff --git a/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild
deleted file mode 100644
index 1f89c173..00000000
--- a/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild,v 1.12 2010/04/23 12:53:48 ssuominen Exp $
-
-EAPI=2
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM=subversion
-	ESVN_REPO_URI="svn://svn.ffmpeg.org/ffmpeg/trunk"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
-	  doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test
-	  theora threads x264 xvid network zlib sdl X mp3 amr
-	  oss pic schroedinger +hardcoded-tables bindist v4l v4l2
-	  speex +ssse3 jpeg2k vdpau"
-
-VIDEO_CARDS="nvidia"
-
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
-done
-
-RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
-	alsa? ( media-libs/alsa-lib )
-	encode? (
-		faac? ( media-libs/faac )
-		mp3? ( media-sound/lame )
-		vorbis? ( media-libs/libvorbis media-libs/libogg )
-		theora? ( media-libs/libtheora[encode] media-libs/libogg )
-		x264? ( >=media-libs/x264-0.0.20091021 )
-		xvid? ( >=media-libs/xvid-1.1.0 ) )
-	faad? ( >=media-libs/faad2-2.6.1 )
-	zlib? ( sys-libs/zlib )
-	ieee1394? ( media-libs/libdc1394
-				sys-libs/libraw1394 )
-	dirac? ( media-video/dirac )
-	gsm? ( >=media-sound/gsm-1.0.12-r1 )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-	amr? ( media-libs/opencore-amr )
-	schroedinger? ( media-libs/schroedinger )
-	speex? ( >=media-libs/speex-1.2_beta3 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( x11-libs/libX11 x11-libs/libXext )
-	video_cards_nvidia? (
-		vdpau? ( >=x11-libs/libvdpau-0.3 )
-	)"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	dirac? ( dev-util/pkgconfig )
-	schroedinger? ( dev-util/pkgconfig )
-	mmx? ( dev-lang/yasm )
-	doc? ( app-text/texi2html )
-	test? ( net-misc/wget )
-	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )"
-
-src_prepare() {
-	if [[ ${PV} = *9999* ]]; then
-		# Set SVN version manually
-		subversion_wc_info
-		sed -i s/UNKNOWN/SVN-r${ESVN_WC_REVISION}/ "${S}/version.sh"
-	elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-		sed -i s/UNKNOWN/SVN-r${FFMPEG_REVISION}/ "${S}/version.sh"
-	fi
-}
-
-src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
-
-	# enabled by default
-	use debug || myconf="${myconf} --disable-debug"
-	use zlib || myconf="${myconf} --disable-zlib"
-	use sdl || myconf="${myconf} --disable-ffplay"
-
-	if use network; then
-		use ipv6 || myconf="${myconf} --disable-ipv6"
-	else
-		myconf="${myconf} --disable-network"
-	fi
-
-	use custom-cflags && myconf="${myconf} --disable-optimizations"
-	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
-
-	# enabled by default
-	if use encode
-	then
-		use mp3 && myconf="${myconf} --enable-libmp3lame"
-		use vorbis && myconf="${myconf} --enable-libvorbis"
-		use theora && myconf="${myconf} --enable-libtheora"
-		use x264 && myconf="${myconf} --enable-libx264"
-		use xvid && myconf="${myconf} --enable-libxvid"
-	else
-		myconf="${myconf} --disable-encoders"
-	fi
-
-	# libavdevice options
-	use ieee1394 && myconf="${myconf} --enable-libdc1394"
-	# Indevs
-	for i in v4l v4l2 alsa oss jack ; do
-		use $i || myconf="${myconf} --disable-indev=$i"
-	done
-	# Outdevs
-	for i in alsa oss ; do
-		use $i || myconf="${myconf} --disable-outdev=$i"
-	done
-	use X && myconf="${myconf} --enable-x11grab"
-
-	# Threads; we only support pthread for now but ffmpeg supports more
-	use threads && myconf="${myconf} --enable-pthreads"
-
-	# Decoders
-	use amr && myconf="${myconf} --enable-libopencore-amrwb
-		--enable-libopencore-amrnb"
-	for i in faad dirac schroedinger speex; do
-		use $i && myconf="${myconf} --enable-lib$i"
-	done
-	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
-	if use gsm; then
-		myconf="${myconf} --enable-libgsm"
-		# Crappy detection or our installation is weird, pick one (FIXME)
-		append-flags -I/usr/include/gsm
-	fi
-	if use bindist
-	then
-		use faac && ewarn "faac is nonfree and cannot be distributed; disabling
-		faac support."
-	else
-		use faac && myconf="${myconf} --enable-libfaac"
-		{ use faac ; } && myconf="${myconf} --enable-nonfree"
-	fi
-
-	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
-	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i"
-	#	use vdpau || myconf="${myconf} --disable-decoder=$i"
-	#done
-	use video_cards_nvidia || myconf="${myconf} --disable-vdpau"
-	use vdpau || myconf="${myconf} --disable-vdpau"
-
-	# CPU features
-	for i in mmx ssse3 altivec ; do
-		use $i ||  myconf="${myconf} --disable-$i"
-	done
-	use mmxext || myconf="${myconf} --disable-mmx2"
-	use 3dnow || myconf="${myconf} --disable-amd3dnow"
-	use 3dnowext || myconf="${myconf} --disable-amd3dnowext"
-	# disable mmx accelerated code if PIC is required
-	# as the provided asm decidedly is not PIC.
-	if gcc-specs-pie ; then
-		myconf="${myconf} --disable-mmx --disable-mmx2"
-	fi
-
-	# Option to force building pic
-	use pic && myconf="${myconf} --enable-pic"
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host" # bug #273421
-		myconf="${myconf} --cpu=$i"
-		break
-	done
-
-	# Mandatory configuration
-	myconf="${myconf} --enable-gpl --enable-version3 --enable-postproc \
-			--enable-avfilter --enable-avfilter-lavf \
-			--disable-stripping"
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
-		case ${CHOST} in
-			*freebsd*)
-				myconf="${myconf} --target-os=freebsd"
-				;;
-			mingw32*)
-				myconf="${myconf} --target-os=mingw32"
-				;;
-			*linux*)
-				myconf="${myconf} --target-os=linux"
-				;;
-		esac
-	fi
-
-	# Misc stuff
-	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr -momit-leaf-frame-pointer
-		append-flags -fomit-frame-pointer
-		is-flag -O? || append-flags -O2
-		if (use debug); then
-			# no need to warn about debug if not using debug flag
-			ewarn ""
-			ewarn "Debug information will be almost useless as the frame pointer is omitted."
-			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
-			ewarn "difficult to fix. Please have that in mind."
-			ewarn ""
-		fi
-	fi
-
-	cd "${S}"
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		--shlibdir=/usr/$(get_libdir) \
-		--mandir=/usr/share/man \
-		--enable-static --enable-shared \
-		--cc="$(tc-getCC)" \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	emake version.h || die #252269
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install Failed"
-
-	dodoc Changelog README INSTALL
-	dodoc doc/*
-}
-
-src_test() {
-	if use encode ; then
-		for t in codectest lavftest seektest ; do
-			LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-				emake ${t} || die "Some tests in ${t} failed"
-		done
-	else
-		ewarn "Tests fail without USE=encode, skipping"
-	fi
-}
diff --git a/media-video/mkvtoolnix-gui/Manifest b/media-video/mkvtoolnix-gui/Manifest
deleted file mode 100644
index 6ddd5318..00000000
--- a/media-video/mkvtoolnix-gui/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mkvtoolnix-5.8.0.tar.bz2 4454971 SHA256 3c9ec7e4c035b82a35850c5ada98a29904edc44a0d1c9b900ed05d56e6274960 SHA512 c24850a8e5c68b06eec006028e7e53c92cff91e748c71bd3799f14e2299e23730043005ce3bd45271848c899df6a44c0f9bc84928c72ba886e8dd894c4b704f3 WHIRLPOOL 6e98c340bb80be55756f3d24272d712e2301f1eb8e314eababa59cf602cab7d27ea6f8ee3aa048db369abec1cfba8c5bdd2b679a0662741cea0c6cfdb5db7886
-DIST mkvtoolnix-6.2.0.tar.xz 5122644 SHA256 567b1cc3e67f1da92df17bf18e956778a6bb3d303e6c27162b933bcb5addc420 SHA512 e41fac3858f60d4725a8666d02c3f0afa3dd1ab83ed0051d95c5ab59b375637aac30775fe52fd650c20ad3f363cdd8fd1a41e3f242b9073a6ee58926d95e208a WHIRLPOOL 48b0a84b21c8e1fc91ff3e2f974532bb19b6bff28afce6aa602d53589e54d975c92aec05f5f850ea180eaceae8e7bb590a16ce49d9107b1f5e698646592240fb
diff --git a/media-video/mkvtoolnix-gui/files/mkvtoolnix-5.8.0-boost-configure.patch b/media-video/mkvtoolnix-gui/files/mkvtoolnix-5.8.0-boost-configure.patch
deleted file mode 100644
index 72b94b96..00000000
--- a/media-video/mkvtoolnix-gui/files/mkvtoolnix-5.8.0-boost-configure.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/ac/ax_boost_filesystem.m4 b/ac/ax_boost_filesystem.m4
-index 97c4ad0..87b94a8 100644
---- a/ac/ax_boost_filesystem.m4
-+++ b/ac/ax_boost_filesystem.m4
-@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
- 			AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
-             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-             if test "x$ax_boost_user_filesystem_lib" = "x"; then
--                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_filesystem.*\)\.so.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.a.*$,\1,'`; do
-+                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.\(dylib\|a\|so\).*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
-                                  [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-                                  [link_filesystem="no"],[$BOOST_SYSTEM_LIB])
- 				done
-                 if test "x$link_filesystem" != "xyes"; then
--                for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
-+                for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.dll* $BOOSTLIBDIR/boost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.\(dll\|a\).*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
-                                  [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-diff --git a/ac/ax_boost_regex.m4 b/ac/ax_boost_regex.m4
-index ffd537f..2cef64f 100644
---- a/ac/ax_boost_regex.m4
-+++ b/ac/ax_boost_regex.m4
-@@ -75,14 +75,14 @@ AC_DEFUN([AX_BOOST_REGEX],
- 			AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
-             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-             if test "x$ax_boost_user_regex_lib" = "x"; then
--                for libextension in `ls $BOOSTLIBDIR/libboost_regex*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_regex.*\)\.so.*$,\1,' -e 's,^lib\(boost_regex.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_regex.*\)\.a.*$,\1,'`; do
-+                for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.dylib* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.dylib.*;\1;' -e 's;^lib\(boost_regex.*\)\.a.*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
-                                  [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-                                  [link_regex="no"])
- 				done
-                 if test "x$link_regex" != "xyes"; then
--                for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a*$;\1;'` ; do
-+                for libextension in `ls $BOOSTLIBDIR/boost_regex*.dll* $BOOSTLIBDIR/boost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a.*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
-                                  [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-diff --git a/ac/ax_boost_system.m4 b/ac/ax_boost_system.m4
-index b0685b9..a71907b 100644
---- a/ac/ax_boost_system.m4
-+++ b/ac/ax_boost_system.m4
-@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
- 
- 			LDFLAGS_SAVE=$LDFLAGS
-             if test "x$ax_boost_user_system_lib" = "x"; then
--                for libextension in `ls $BOOSTLIBDIR/libboost_system*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_system.*\)\.so.*$,\1,' -e 's,^lib\(boost_system.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_system.*\)\.a.*$,\1,'`; do
-+                for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
-                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                  [link_system="no"])
- 				done
-                 if test "x$link_system" != "xyes"; then
--                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
-+                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
-                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
diff --git a/media-video/mkvtoolnix-gui/files/mkvtoolnix-5.8.0-system-pugixml.patch b/media-video/mkvtoolnix-gui/files/mkvtoolnix-5.8.0-system-pugixml.patch
deleted file mode 100644
index a3fcf219..00000000
--- a/media-video/mkvtoolnix-gui/files/mkvtoolnix-5.8.0-system-pugixml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mkvtoolnix-5.8.0/rake.d/target.rb
-+++ mkvtoolnix-5.8.0/rake.d/target.rb
-@@ -107,7 +107,6 @@
-       when :mtxunittest then "tests/unit/libmtxunittest.a"
-       when :avi         then "lib/avilib-0.6.10/libavi.a"
-       when :rmff        then "lib/librmff/librmff.a"
--      when :pugixml     then "lib/pugixml/src/libpugixml.a"
-       when :mpegparser  then "src/mpegparser/libmpegparser.a"
-       when :ebml        then c?("EBML_MATROSKA_INTERNAL") ? "lib/libebml/src/libebml.a"         : nil
-       when :matroska    then c?("EBML_MATROSKA_INTERNAL") ? "lib/libmatroska/src/libmatroska.a" : nil
---- mkvtoolnix-5.8.0/Rakefile
-+++ mkvtoolnix-5.8.0/Rakefile
-@@ -55,8 +55,8 @@
-   $applications            =  $programs.collect { |name| "src/#{$application_subdirs[name]}#{name}" + c(:EXEEXT) }
-   $manpages                =  $programs.collect { |name| "doc/man/#{name}.1" }
- 
--  $system_includes         = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Ilib/pugixml/src -Isrc"
--  $system_libdirs          = "-Llib/avilib-0.6.10 -Llib/librmff -Llib/pugixml/src -Lsrc/common"
-+  $system_includes         = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Isrc"
-+  $system_libdirs          = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common"
- 
-   $source_directories      =  %w{lib/avilib-0.6.10 lib/librmff src src/input src/output src/common src/common/chapters src/common/compression src/common/strings src/common/tags src/common/xml
-                                  src/mmg src/mmg/header_editor src/mmg/options src/mmg/tabs src/extract src/propedit src/merge src/info src/mpegparser}
-@@ -605,7 +605,6 @@
- 
- [ { :name => 'avi',         :dir => 'lib/avilib-0.6.10'                                                                             },
-   { :name => 'rmff',        :dir => 'lib/librmff'                                                                                   },
--  { :name => 'pugixml',     :dir => 'lib/pugixml/src'                                                                               },
-   { :name => 'mpegparser',  :dir => 'src/mpegparser'                                                                                },
-   { :name => 'mtxcommon',   :dir => [ 'src/common' ] + %w{chapters compression strings tags xml }.collect { |e| "src/common/#{e}" } },
-   { :name => 'mtxinput',    :dir => 'src/input'                                                                                     },
diff --git a/media-video/mkvtoolnix-gui/mkvtoolnix-gui-5.0.1.ebuild b/media-video/mkvtoolnix-gui/mkvtoolnix-gui-5.0.1.ebuild
deleted file mode 100644
index bf200869..00000000
--- a/media-video/mkvtoolnix-gui/mkvtoolnix-gui-5.0.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit wxwidgets autotools
-
-MY_P=${P/-gui}
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="bzip2 debug lzo pch wxwidgets"
-
-RDEPEND="
-	>=dev-libs/libebml-1.2.2
-	>=media-libs/libmatroska-1.3.0
-	>=dev-libs/boost-1.36.0
-	dev-libs/expat
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	lzo? ( dev-libs/lzo )
-	x11-libs/wxGTK:2.8[X] ~media-video/mkvtoolnix-${PV}[-wxwidgets]
-"
-DEPEND="${RDEPEND}
-	dev-ruby/rake
-"
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e '/^Exec/   s/mkvinfo/mkvinfo-gui/' \
-		share/desktop/mkvinfo.desktop || die
-	# Disable automagic curl dep used for online update checking
-	sed -i -e '/curl/d' configure.in
-	export CURL_CFLAGS="" CURL_LIBS=""
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	use pch || myconf="${myconf} --disable-precompiled-headers"
-
-	WX_GTK_VER="2.8"
-	need-wxwidgets unicode
-	myconf="${myconf} --with-wx-config=${WX_CONFIG}"
-
-	econf \
-		$(use_enable lzo) \
-		$(use_enable bzip2 bz2) \
-		--enable-wxwidgets \
-		$(use_enable debug) \
-		--disable-qt \
-		${myconf} \
-		--with-boost-regex=boost_regex \
-		--with-boost-filesystem=boost_filesystem \
-		--with-boost-system=boost_system
-}
-
-src_compile() {
-	rake || die "rake failed"
-}
-
-src_install() {
-	# Don't run strip while installing stuff, leave to portage the job.
-	DESTDIR="${D}" rake install || die
-
-	find "${ED}usr/share/man" -not -name 'mmg.*' -type f -exec rm {} +
-	rm -r "${ED}usr/share/locale" || die
-	rm "${ED}"usr/bin/{mkvextract,mkvmerge,mkvpropedit} || die
-	mv "${ED}usr/bin/mkvinfo" "${ED}usr/bin/mkvinfo-gui" || die
-}
diff --git a/media-video/mkvtoolnix-gui/mkvtoolnix-gui-5.8.0.ebuild b/media-video/mkvtoolnix-gui/mkvtoolnix-gui-5.8.0.ebuild
deleted file mode 100644
index ac943069..00000000
--- a/media-video/mkvtoolnix-gui/mkvtoolnix-gui-5.8.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-MY_P=${P/-gui}
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="bzip2 debug lzo pch"
-
-RDEPEND="
-	>=dev-libs/libebml-1.2.2
-	>=media-libs/libmatroska-1.3.0
-	>=dev-libs/boost-1.46.0
-	dev-libs/pugixml
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	>=sys-devel/gcc-4.6
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	lzo? ( dev-libs/lzo )
-
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	x11-libs/wxGTK:2.8[X]
-	~media-video/mkvtoolnix-${PV}[-wxwidgets,-qt4]
-"
-DEPEND="${RDEPEND}
-	dev-lang/ruby
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# http://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/^Exec/   s/mkvinfo/mkvinfo-gui/' \
-		share/desktop/mkvinfo.desktop || die
-
-	epatch "${FILESDIR}"/${MY_P}-system-pugixml.patch \
-		"${FILESDIR}"/${MY_P}-boost-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	use pch || myconf+=" --disable-precompiled-headers"
-
-	#if use wxwidgets ; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-		myconf+=" --with-wx-config=${WX_CONFIG}"
-	#fi
-
-	econf \
-		$(use_enable bzip2 bz2) \
-		$(use_enable debug) \
-		$(use_enable lzo) \
-		--enable-qt \
-		--enable-wxwidgets \
-		${myconf} \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--without-curl
-}
-
-src_compile() {
-	./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" ./drake -j$(makeopts_jobs) install || die
-
-	dodoc AUTHORS ChangeLog README TODO
-	doman doc/man/*.1
-
-	#use wxwidgets
-	docompress -x /usr/share/doc/${PF}/guide
-
-	find "${ED}usr/share/man" -not -name 'mmg.*' -type f -exec rm {} +
-	rm -r "${ED}usr/share/locale" || die
-	rm "${ED}usr/share/doc/${PF}/"{AUTHORS*,ChangeLog*,README*,TODO*} || die
-	rm "${ED}"usr/bin/{mkvextract,mkvmerge,mkvpropedit} || die
-	mv "${ED}usr/bin/mkvinfo" "${ED}usr/bin/mkvinfo-gui" || die
-}
diff --git a/media-video/mkvtoolnix-gui/mkvtoolnix-gui-6.2.0.ebuild b/media-video/mkvtoolnix-gui/mkvtoolnix-gui-6.2.0.ebuild
deleted file mode 100644
index e35b33e4..00000000
--- a/media-video/mkvtoolnix-gui/mkvtoolnix-gui-6.2.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-MY_P=${P/-gui}
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch"
-
-RDEPEND="~media-video/mkvtoolnix-${PV}
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	x11-libs/wxGTK:2.8[X]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	# http://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN/-gui}-5.8.0-system-pugixml.patch \
-		"${FILESDIR}"/${PN/-gui}-5.8.0-boost-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	#if use wxwidgets ; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-		myconf="--with-wx-config=${WX_CONFIG}"
-	#fi
-
-	econf \
-		$(use_enable debug) \
-		$(usex pch "" --disable-precompiled-headers) \
-		${myconf} \
-		--enable-qt \
-		--enable-wxwidgets \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--without-curl
-}
-
-src_compile() {
-	./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" ./drake -j$(makeopts_jobs) install || die
-
-	dodoc AUTHORS ChangeLog README TODO
-	doman doc/man/*.1
-
-	docompress -x /usr/share/doc/${PF}/guide
-
-	find "${ED}usr/share/man" -not -name 'mmg.*' -type f -exec rm {} +
-	rm -r "${ED}usr/share/locale" || die
-	rm "${ED}usr/share/doc/${PF}/"{AUTHORS*,ChangeLog*,README*,TODO*} || die
-	rm "${ED}"usr/bin/{mkvextract,mkvmerge,mkvpropedit} || die
-	mv "${ED}usr/bin/mkvinfo" "${ED}usr/bin/mkvinfo-gui" || die
-}
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
deleted file mode 100644
index 13375e98..00000000
--- a/media-video/mkvtoolnix/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mkvtoolnix-6.2.0.tar.xz 5122644 SHA256 567b1cc3e67f1da92df17bf18e956778a6bb3d303e6c27162b933bcb5addc420 SHA512 e41fac3858f60d4725a8666d02c3f0afa3dd1ab83ed0051d95c5ab59b375637aac30775fe52fd650c20ad3f363cdd8fd1a41e3f242b9073a6ee58926d95e208a WHIRLPOOL 48b0a84b21c8e1fc91ff3e2f974532bb19b6bff28afce6aa602d53589e54d975c92aec05f5f850ea180eaceae8e7bb590a16ce49d9107b1f5e698646592240fb
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch
deleted file mode 100644
index 72b94b96..00000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/ac/ax_boost_filesystem.m4 b/ac/ax_boost_filesystem.m4
-index 97c4ad0..87b94a8 100644
---- a/ac/ax_boost_filesystem.m4
-+++ b/ac/ax_boost_filesystem.m4
-@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
- 			AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
-             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-             if test "x$ax_boost_user_filesystem_lib" = "x"; then
--                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_filesystem.*\)\.so.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.a.*$,\1,'`; do
-+                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.\(dylib\|a\|so\).*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
-                                  [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-                                  [link_filesystem="no"],[$BOOST_SYSTEM_LIB])
- 				done
-                 if test "x$link_filesystem" != "xyes"; then
--                for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
-+                for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.dll* $BOOSTLIBDIR/boost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.\(dll\|a\).*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
-                                  [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
-diff --git a/ac/ax_boost_regex.m4 b/ac/ax_boost_regex.m4
-index ffd537f..2cef64f 100644
---- a/ac/ax_boost_regex.m4
-+++ b/ac/ax_boost_regex.m4
-@@ -75,14 +75,14 @@ AC_DEFUN([AX_BOOST_REGEX],
- 			AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
-             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-             if test "x$ax_boost_user_regex_lib" = "x"; then
--                for libextension in `ls $BOOSTLIBDIR/libboost_regex*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_regex.*\)\.so.*$,\1,' -e 's,^lib\(boost_regex.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_regex.*\)\.a.*$,\1,'`; do
-+                for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.dylib* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.dylib.*;\1;' -e 's;^lib\(boost_regex.*\)\.a.*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
-                                  [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-                                  [link_regex="no"])
- 				done
-                 if test "x$link_regex" != "xyes"; then
--                for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a*$;\1;'` ; do
-+                for libextension in `ls $BOOSTLIBDIR/boost_regex*.dll* $BOOSTLIBDIR/boost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a.*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
-                                  [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
-diff --git a/ac/ax_boost_system.m4 b/ac/ax_boost_system.m4
-index b0685b9..a71907b 100644
---- a/ac/ax_boost_system.m4
-+++ b/ac/ax_boost_system.m4
-@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
- 
- 			LDFLAGS_SAVE=$LDFLAGS
-             if test "x$ax_boost_user_system_lib" = "x"; then
--                for libextension in `ls $BOOSTLIBDIR/libboost_system*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_system.*\)\.so.*$,\1,' -e 's,^lib\(boost_system.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_system.*\)\.a.*$,\1,'`; do
-+                for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
-                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                  [link_system="no"])
- 				done
-                 if test "x$link_system" != "xyes"; then
--                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
-+                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;'` ; do
-                      ax_lib=${libextension}
- 				    AC_CHECK_LIB($ax_lib, exit,
-                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch
deleted file mode 100644
index a3fcf219..00000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mkvtoolnix-5.8.0/rake.d/target.rb
-+++ mkvtoolnix-5.8.0/rake.d/target.rb
-@@ -107,7 +107,6 @@
-       when :mtxunittest then "tests/unit/libmtxunittest.a"
-       when :avi         then "lib/avilib-0.6.10/libavi.a"
-       when :rmff        then "lib/librmff/librmff.a"
--      when :pugixml     then "lib/pugixml/src/libpugixml.a"
-       when :mpegparser  then "src/mpegparser/libmpegparser.a"
-       when :ebml        then c?("EBML_MATROSKA_INTERNAL") ? "lib/libebml/src/libebml.a"         : nil
-       when :matroska    then c?("EBML_MATROSKA_INTERNAL") ? "lib/libmatroska/src/libmatroska.a" : nil
---- mkvtoolnix-5.8.0/Rakefile
-+++ mkvtoolnix-5.8.0/Rakefile
-@@ -55,8 +55,8 @@
-   $applications            =  $programs.collect { |name| "src/#{$application_subdirs[name]}#{name}" + c(:EXEEXT) }
-   $manpages                =  $programs.collect { |name| "doc/man/#{name}.1" }
- 
--  $system_includes         = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Ilib/pugixml/src -Isrc"
--  $system_libdirs          = "-Llib/avilib-0.6.10 -Llib/librmff -Llib/pugixml/src -Lsrc/common"
-+  $system_includes         = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Isrc"
-+  $system_libdirs          = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common"
- 
-   $source_directories      =  %w{lib/avilib-0.6.10 lib/librmff src src/input src/output src/common src/common/chapters src/common/compression src/common/strings src/common/tags src/common/xml
-                                  src/mmg src/mmg/header_editor src/mmg/options src/mmg/tabs src/extract src/propedit src/merge src/info src/mpegparser}
-@@ -605,7 +605,6 @@
- 
- [ { :name => 'avi',         :dir => 'lib/avilib-0.6.10'                                                                             },
-   { :name => 'rmff',        :dir => 'lib/librmff'                                                                                   },
--  { :name => 'pugixml',     :dir => 'lib/pugixml/src'                                                                               },
-   { :name => 'mpegparser',  :dir => 'src/mpegparser'                                                                                },
-   { :name => 'mtxcommon',   :dir => [ 'src/common' ] + %w{chapters compression strings tags xml }.collect { |e| "src/common/#{e}" } },
-   { :name => 'mtxinput',    :dir => 'src/input'                                                                                     },
diff --git a/media-video/mkvtoolnix/mkvtoolnix-5.0.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-5.0.1.ebuild
deleted file mode 100644
index ce3a2a5c..00000000
--- a/media-video/mkvtoolnix/mkvtoolnix-5.0.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit wxwidgets autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="bzip2 debug lzo pch wxwidgets"
-
-RDEPEND="
-	>=dev-libs/libebml-1.2.2
-	>=media-libs/libmatroska-1.3.0
-	>=dev-libs/boost-1.36.0
-	dev-libs/expat
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	lzo? ( dev-libs/lzo )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] !media-video/mkvtoolnix-gui )
-"
-DEPEND="${RDEPEND}
-	dev-ruby/rake
-"
-
-src_prepare() {
-	# Disable automagic curl dep used for online update checking
-	sed -i -e '/curl/d' configure.in
-	export CURL_CFLAGS="" CURL_LIBS=""
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	use pch || myconf="${myconf} --disable-precompiled-headers"
-
-	if use wxwidgets ; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-		myconf="${myconf} --with-wx-config=${WX_CONFIG}"
-	fi
-
-	econf \
-		$(use_enable lzo) \
-		$(use_enable bzip2 bz2) \
-		$(use_enable wxwidgets) \
-		$(use_enable debug) \
-		--disable-qt \
-		${myconf} \
-		--with-boost-regex=boost_regex \
-		--with-boost-filesystem=boost_filesystem \
-		--with-boost-system=boost_system
-}
-
-src_compile() {
-	rake || die "rake failed"
-}
-
-src_install() {
-	# Don't run strip while installing stuff, leave to portage the job.
-	DESTDIR="${D}" rake install || die
-
-	dodoc AUTHORS ChangeLog README TODO
-	doman doc/man/*.1
-
-	if use !wxwidgets; then
-		rm "${ED}usr/share/man/man1/mmg."* || die
-		rm -r "${ED}/usr/share/doc/${PN}/guide" || die
-	fi
-}
-
-pkg_postinst() {
-	einfo "On Sabayon the GUI is provided by media-video/mkvtoolnix-gui package."
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-6.2.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-6.2.0.ebuild
deleted file mode 100644
index 1c987801..00000000
--- a/media-video/mkvtoolnix/mkvtoolnix-6.2.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
-SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch qt4 wxwidgets"
-
-RDEPEND="
-	>=dev-libs/libebml-1.3.0:=
-	>=media-libs/libmatroska-1.4.0:=
-	>=dev-libs/boost-1.46.0
-	dev-libs/pugixml
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-apps/file
-	>=sys-devel/gcc-4.6
-	sys-libs/zlib
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		!media-video/mkvtoolnix-gui
-	)
-	wxwidgets? ( x11-libs/wxGTK:2.8[X] !media-video/mkvtoolnix-gui )
-"
-DEPEND="${RDEPEND}
-	dev-lang/ruby
-	virtual/pkgconfig
-"
-
-pkg_pretend() {
-	# http://bugs.gentoo.org/419257
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-	if ! version_is_at_least ${ver} $(gcc-version); then
-		eerror ${msg}
-		die ${msg}
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.8.0-system-pugixml.patch \
-		"${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use wxwidgets ; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-		myconf="--with-wx-config=${WX_CONFIG}"
-	fi
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable qt4 qt) \
-		$(use_enable wxwidgets) \
-		$(usex pch "" --disable-precompiled-headers) \
-		${myconf} \
-		--disable-optimization \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-boost="${EPREFIX}"/usr \
-		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--without-curl
-}
-
-src_compile() {
-	./drake V=1 -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" ./drake -j$(makeopts_jobs) install || die
-
-	dodoc AUTHORS ChangeLog README TODO
-	doman doc/man/*.1
-
-	use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
-}
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
deleted file mode 100644
index 7e0b14fe..00000000
--- a/media-video/nvidia-settings/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST nvidia-settings-295.33.tar.bz2 1545933 SHA256 37128d2a90b22600c2df582c78dcc9d7c3cd1e26b2db8ab81a50a3fc3acfcdba SHA512 b1d6f3b3b679bc91b39259b8b0d03d33696f05ba700e07fd70d7e2a90f4708557a106315d43eba8fa771bcfdf270842e36a9b9f139189e571e8f4c463f3e7217 WHIRLPOOL bc56aac3c409ea398e00b03284ca18ba80373608c11d22c6c8b2bda574d12137ea84905054c094d0327198e71344fc203ab4cff23a5427ca16780f2f75fd8428
-DIST nvidia-settings-295.40.tar.bz2 1545625 SHA256 68e8da979ef69b487a5ef237d7cc0f6d1d1cf3e027ffa2e90fa2501dc793d909 SHA512 3260cdfcb933833616ae5b97d6735135834947cc77f74bd2b7d8e2a7c4035fb5d848c9146421e4b9675d034d9008b0331545c9a5faf38f7cfd52c9aa5c50ac25 WHIRLPOOL 958bba15f9d2a62651bd9ad94f57c511d76c0a1b72a1565fdfd04f3758d5ff5f7b63b3a0b337b2388729ad4d12baf2ab2ccbd17b9f6c701c7b9bfd7c34b00da2
-DIST nvidia-settings-302.07.tar.bz2 1479582 SHA256 4f4a163d277202f88e40289f1081df4e6d0b2a9b4133e9728ae10dcef5c7c784 SHA512 10ebae882740f4092ff00029add1ffd1716a6a346475e61269fd674f1bbae0919f4e573eaf8080cd9bf689be6c5bd69a645176d6e7a4ae6a6ec604ee215008a0 WHIRLPOOL 430f2414ff367ece40635beb9fa18d5ef94a356ff28dc256c3eeb184058a4baf76ab56e7f803ce8addd47674e2145e260cba65b48395556ad96e74de9ef1d9b4
-DIST nvidia-settings-304.22.tar.bz2 1476172 SHA256 58566c8079101cbddaef0b5f16af7fde86dbb045e5641a3112d9868afc8809ec SHA512 2f58099dc34e7de6772f6541b57a4fad4b8a7c760960ac8a9521931b2399f5015433e3ff721a828be652371d5a815ded32e048e50265aa8bd45528145421fa11 WHIRLPOOL c8e6bc0a8a5b9538283a6ae47b62eb0b245ab54a3284a8220c426b23f63eeb42d8f1469ad73d1f84a27a9afafc0e35e1d5d7a56f98f80323bebc64fd1bbe445f
-DIST nvidia-settings-304.60.tar.bz2 1479772 SHA256 96f0f984d2d4e37c3e492476c3506283f5666d952ae94ddc79d7e16b047a9b36 SHA512 7b55621b97c39f3905d6368151c344a3914b0855951f92b4ff479ba94e92fca715505692d8ad72b9dca33b93eb45d5e3342b569c898d837053686ebce71b14bc WHIRLPOOL 9c63088ec558d55469764422ef26e2697663b3d4bfb9c075b17c4c90ec90b5fee9ff42fbc711c7f1e22a102f2bf1e3ec696923531b54ac374283318594f89ff5
-DIST nvidia-settings-304.88.tar.bz2 1479968 SHA256 22d7c1eeb080ef5d3a99b57acfbd0afa579f42c44c1897f4c786fda167a1d7b0 SHA512 9dc8f2620fb7df689354f7a06eae47490db168eb4226bef2f4e8843f3167cfa25dda73420914fd18280d481446095c2a09831e743f565a48cffb73d13001d520 WHIRLPOOL 441a3e35bb5a4aafe3092e7fecf1144c46ac7e3adf1d7a62c30e0262314c02594451d4efab1d5a6837d0eb1238ffc173c5c0145c7f14f016d16c38d199135ea3
-DIST nvidia-settings-310.19.tar.bz2 1482012 SHA256 1af2cd902c2adf261a6951b1d729523e515f37e45f86785675404fc58ec1c03a SHA512 fd3e376f6518e9e844e0fe7f2aecce18c03da0ebdfa67e41bc566614c89f9b284251e2e0841aa486ac8cb429c246e0b19c77773929ec1393f986bc267556ae84 WHIRLPOOL 2d3ff4a08d44a2abc31679e2779514b95de429cd1ec9e5ca865ef193ce64985dbe192e1e303f17c96dd84df2fa81eeabe1c7120945220ad17c26dc38e9e90f5a
-DIST nvidia-settings-313.30.tar.bz2 1496166 SHA256 50c9eeb31d64310f3d49a9596dd582a7dc84f8911a93c7514c501912a944f960 SHA512 a6cbb9078d0d46ad5fc19026d5f2ec3100ddf731caa360e8586c23d7bedcb19998ddd2dc07806c871b58b79765b3dff902f25d69a27bd2c2f08afc6c70f1f1ef WHIRLPOOL 33b152e48a3692cc3efa5b2c10d47f624e0b89d915d30cc75eab3cae4ac3e691f3ab656993377fc6e7f06bc327126252d83d3d6b3f0e89fc4d207ccc057a1f5b
-DIST nvidia-settings-325.15.tar.bz2 1541319 SHA256 e7dabddf1240bcbe2990a470defba480d619cd97fa1c0ef4e28653c689be0b03 SHA512 ccb5808fcd2d34cb7fb6cdb2e081bbebb3ced5d53c296cabac76685e6612faffc20609a6e4cdbd4170a3a72b3487f8520df799342004914a42b8dfb69d8d5fc0 WHIRLPOOL 8ad4be1357358c0e7ac6cdf4247f216ac7598f804ec74285a3fe02f51a41cc35742d043dc56feee82bb2099e598a1a13eb2d1a7bab8c72e922aee495b017f34e
-DIST nvidia-settings-331.49.tar.bz2 1545177 SHA256 a9ba53d2c811d28fc1d6dd6131a2fdba44160c32d792f77e55cc834ca3205510 SHA512 6de9ae7fb7758ae93782608456f06a9ddab8cf91c885920ac99365a609e257a01dca9e03e5517bbc8383d799f09cf3455e66ccb6e553e477262591cb89390f74 WHIRLPOOL f9576a00cbfc2efc5d84a8a0178d6976674666fe941aef31d52852c26b99936fbc2178c21948624bc16cf4ca8991eb9bb7e6a704650f493c23b8e612ed417128
-DIST nvidia-settings-331.67.tar.bz2 1552309 SHA256 61d4bafe558136430112019ebb7c774708e831f96212c49def8d180605ecfac9 SHA512 9c42c91d7dc5f5fd4af6476ebc153dc90da738111c0139c20fb2c851428f169f51c467c22a61909cfa6d071a50a6c54ca9f19a66321dc4e07721b871ad5b10e5 WHIRLPOOL af9ce21b4289a1d152ff723c0a580c2cfcd9d6761484578abf4059cbd5619d61e081dbee39fe80f85e88d05bf42e61325890af0d11f41bb4360ae59b64b29cab
-DIST nvidia-settings-334.21.tar.bz2 1545486 SHA256 acd497588f37c15ccb853cdfe144729b2b45dc3b888185239ba9d69d441a0da4 SHA512 b9c3e79f364067b9f578652afc4cd366555df9dd217ab8d1454ddaf69ec891f78c1ebc1c5be0ed108d46da5f6733a5aca680a39b418ff9216ebcc49c1d4faaa2 WHIRLPOOL 617e124fc279ae36cb554ae1347825d2854cd0dae3646ebe7256219b33adbb83408d2ca51802181cc78d1fbdc9c9b1c15587b840a6572ae34d8ef5b13f763ba3
-DIST nvidia-settings-337.25.tar.bz2 1549314 SHA256 f17197e2176cca2ed8f5898c94bbbd992d1ffe777b585cd3f6c6a38cd031a53a SHA512 3719c81a71a93c6df5ef8e108f203b252a79fb755a80a7ffce6faf44ea72310ab75386bb0fb41953df9ab5f18dd6659373d3f3615d64e2cc06e183fe8c847824 WHIRLPOOL 857e4f74cbd504d1b53578ee1ecfb45d46b243cebe194c34365aae3bc420bdb9ec8893af1798ec712039cf51471162b5b8fa3e309a01bc935a3c5830a12af481
-DIST nvidia-settings-340.46.tar.bz2 1549925 SHA256 c4e5921be9968701b4ee1aa840f157dffd7e54a382f4dd3f900b2b0391fdf23d SHA512 5922abafcaa1b35836ff7f62758ba9d8b6a44a69344ac5a27850af41b007c947439e826839ab6e8f22bdd3888f764799cfafcfbb760713b14f7fafeaadb9b482 WHIRLPOOL 977e541e81deca62fa14e20e781fc3ceffb7a6c66b2be9d10234dc92f9e4255d334fcf21c65b5c102ad3d8002f02fb1f9b5f718eddd8845234945b644409c24f
-DIST nvidia-settings-340.58.tar.bz2 1549850 SHA256 21cd29fea50e62766d1985c84f6d6de8efa911e32abcbff8e7ccf0e43ebe25c0 SHA512 4c581a940c99fac28564ab6154f47cae496ebfda6339b7f10c5decf8fea52b6c12e5b63dfcf78f8365909e49539560a50338edb17117881b6a03c196bd51836c WHIRLPOOL b486032339c4f8c4767239e3a4b001667bceb2c3ef5f3e94f08d1c54c60a958e1c76456415769ce9ff0503b6eb3d903aa89599a0234e08447c33671c598e66c8
-DIST nvidia-settings-346.35.tar.bz2 1557427 SHA256 1c4aafa497eaf67a9d5c21761a20f08ff7603aefe169389b86e4055040d39d2f SHA512 db5b5867904b2ad2073bf55b765228c2d3e751d92d9aebd22752c2160ec401534db75cb7614ce68faae83162c251634b4c9ead60db564fa0b456abc5d5dc7997 WHIRLPOOL 6a5c73f32d5ad015f967ace653040a033afd936c8bcbedac96b2ebc525b1f5f62c992adfa9a89b67e3d2e3905a80f04163acdc45098d271d26e8a232473abda8
diff --git a/media-video/nvidia-settings/files/95-nvidia-settings b/media-video/nvidia-settings/files/95-nvidia-settings
deleted file mode 100644
index 48c41d8a..00000000
--- a/media-video/nvidia-settings/files/95-nvidia-settings
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/nvidia-settings --load-config-only
diff --git a/media-video/nvidia-settings/files/nvidia-autostart.desktop b/media-video/nvidia-settings/files/nvidia-autostart.desktop
deleted file mode 100644
index 5c6d7a4b..00000000
--- a/media-video/nvidia-settings/files/nvidia-autostart.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=NVIDIA X Server Settings
-Comment=Configure NVIDIA X Server Settings
-Exec=sh -c "/usr/bin/nvidia-settings --load-config-only"
-Terminal=false
-Icon=nvidia-settings
-Categories=System;Settings;
diff --git a/media-video/nvidia-settings/nvidia-settings-295.33.ebuild b/media-video/nvidia-settings/nvidia-settings-295.33.ebuild
deleted file mode 100644
index fe353232..00000000
--- a/media-video/nvidia-settings/nvidia-settings-295.33.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-256.52-r1.ebuild,v 1.1 2010/09/05 13:28:32 lxnay Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND=">=x11-libs/gtk+-2:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-drivers/nvidia-drivers
-	!x11-drivers/nvidia-drivers[gtk]"
-
-src_prepare() {
-	sed -i -e "s#prefix = .*#prefix = ${D}/usr#" utils.mk
-}
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	cd "${S}/src/libXNVCtrl"
-	emake clean || die "Cleaning old libXNVCtrl failed"
-	append-flags -fPIC
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!"
-	filter-flags -fPIC
-
-	cd "${S}"
-	einfo "Building nVidia-Settings..."
-	emake  CC="$(tc-getCC)" STRIP_CMD=/bin/true || die "Failed to build nvidia-settings"
-}
-
-src_install() {
-	emake STRIP_CMD=/bin/true install || die
-
-	# Install libXNVCtrl and headers
-	insinto "/usr/$(get_libdir)"
-	doins src/libXNVCtrl/libXNVCtrl.a
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-
-	# Now install documentation
-	dodoc doc/*.txt
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
deleted file mode 100644
index fe353232..00000000
--- a/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-256.52-r1.ebuild,v 1.1 2010/09/05 13:28:32 lxnay Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND=">=x11-libs/gtk+-2:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-drivers/nvidia-drivers
-	!x11-drivers/nvidia-drivers[gtk]"
-
-src_prepare() {
-	sed -i -e "s#prefix = .*#prefix = ${D}/usr#" utils.mk
-}
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	cd "${S}/src/libXNVCtrl"
-	emake clean || die "Cleaning old libXNVCtrl failed"
-	append-flags -fPIC
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!"
-	filter-flags -fPIC
-
-	cd "${S}"
-	einfo "Building nVidia-Settings..."
-	emake  CC="$(tc-getCC)" STRIP_CMD=/bin/true || die "Failed to build nvidia-settings"
-}
-
-src_install() {
-	emake STRIP_CMD=/bin/true install || die
-
-	# Install libXNVCtrl and headers
-	insinto "/usr/$(get_libdir)"
-	doins src/libXNVCtrl/libXNVCtrl.a
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-
-	# Now install documentation
-	dodoc doc/*.txt
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-302.07.ebuild b/media-video/nvidia-settings/nvidia-settings-302.07.ebuild
deleted file mode 100644
index fe353232..00000000
--- a/media-video/nvidia-settings/nvidia-settings-302.07.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-256.52-r1.ebuild,v 1.1 2010/09/05 13:28:32 lxnay Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND=">=x11-libs/gtk+-2:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-drivers/nvidia-drivers
-	!x11-drivers/nvidia-drivers[gtk]"
-
-src_prepare() {
-	sed -i -e "s#prefix = .*#prefix = ${D}/usr#" utils.mk
-}
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	cd "${S}/src/libXNVCtrl"
-	emake clean || die "Cleaning old libXNVCtrl failed"
-	append-flags -fPIC
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!"
-	filter-flags -fPIC
-
-	cd "${S}"
-	einfo "Building nVidia-Settings..."
-	emake  CC="$(tc-getCC)" STRIP_CMD=/bin/true || die "Failed to build nvidia-settings"
-}
-
-src_install() {
-	emake STRIP_CMD=/bin/true install || die
-
-	# Install libXNVCtrl and headers
-	insinto "/usr/$(get_libdir)"
-	doins src/libXNVCtrl/libXNVCtrl.a
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-
-	# Now install documentation
-	dodoc doc/*.txt
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-304.22.ebuild b/media-video/nvidia-settings/nvidia-settings-304.22.ebuild
deleted file mode 100644
index 42f9cf45..00000000
--- a/media-video/nvidia-settings/nvidia-settings-304.22.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~amd64-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2"
-
-RDEPEND="=x11-drivers/nvidia-drivers-3*
-	${COMMON_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-304.60.ebuild b/media-video/nvidia-settings/nvidia-settings-304.60.ebuild
deleted file mode 100644
index 956e1ce4..00000000
--- a/media-video/nvidia-settings/nvidia-settings-304.60.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-304.60.ebuild,v 1.2 2012/12/06 10:33:09 pinkbyte Exp $
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 ~x86 ~x86-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2"
-
-RDEPEND="=x11-drivers/nvidia-drivers-3*
-	${COMMON_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-304.88.ebuild b/media-video/nvidia-settings/nvidia-settings-304.88.ebuild
deleted file mode 100644
index 3a93d39d..00000000
--- a/media-video/nvidia-settings/nvidia-settings-304.88.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-256.52-r1.ebuild,v 1.1 2010/09/05 13:28:32 lxnay Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND=">=x11-libs/gtk+-2:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/pango[X]"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	cd "${S}/src/libXNVCtrl"
-	emake clean || die "Cleaning old libXNVCtrl failed"
-	append-flags -fPIC
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!"
-	filter-flags -fPIC
-
-	cd "${S}"
-	einfo "Building nVidia-Settings..."
-	emake  CC="$(tc-getCC)" STRIP_CMD=/bin/true || die "Failed to build nvidia-settings"
-}
-
-src_install() {
-	emake STRIP_CMD=/bin/true PREFIX="${D}/usr" install || die
-
-	# Install libXNVCtrl and headers
-	insinto "/usr/$(get_libdir)"
-	doins src/libXNVCtrl/libXNVCtrl.a
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}"/95-nvidia-settings
-
-	# Now install documentation
-	dodoc doc/*.txt
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-310.19.ebuild b/media-video/nvidia-settings/nvidia-settings-310.19.ebuild
deleted file mode 100644
index 42f9cf45..00000000
--- a/media-video/nvidia-settings/nvidia-settings-310.19.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~amd64-fbsd"
-IUSE="examples"
-
-COMMON_DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf[X]
-	media-libs/mesa
-	x11-libs/pango[X]
-	x11-libs/libXv
-	x11-libs/libXrandr
-	dev-libs/glib:2"
-
-RDEPEND="=x11-drivers/nvidia-drivers-3*
-	${COMMON_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ CC="$(tc-getCC)" LD="$(tc-getLD)" STRIP_CMD="$(type -P true)" NV_VERBOSE=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-#	doicon doc/${PN}.png # Installed through nvidia-drivers
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	# bug 412569 - Installed through nvidia-drivers
-#	rm -rf "${D}"/usr/share/man
-
-	dodoc doc/*.txt
-
-	if use examples; then
-		docinto examples/
-		dodoc samples/*.c
-		dodoc samples/README
-	fi
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-313.30.ebuild b/media-video/nvidia-settings/nvidia-settings-313.30.ebuild
deleted file mode 100644
index 8b52e042..00000000
--- a/media-video/nvidia-settings/nvidia-settings-313.30.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND=">=x11-libs/gtk+-2:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/pango[X]"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	cd "${S}/src/libXNVCtrl"
-	emake clean || die "Cleaning old libXNVCtrl failed"
-	append-flags -fPIC
-	emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" libXNVCtrl.a || die "Building libXNVCtrl failed!"
-	filter-flags -fPIC
-
-	cd "${S}"
-	einfo "Building nVidia-Settings..."
-	emake  CC="$(tc-getCC)" STRIP_CMD=/bin/true || die "Failed to build nvidia-settings"
-}
-
-src_install() {
-	emake STRIP_CMD=/bin/true PREFIX="${D}/usr" install || die
-
-	# Install libXNVCtrl and headers
-	insinto "/usr/$(get_libdir)"
-	doins src/libXNVCtrl/libXNVCtrl.a
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}"/95-nvidia-settings
-
-	# Now install documentation
-	dodoc doc/*.txt
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-325.15.ebuild b/media-video/nvidia-settings/nvidia-settings-325.15.ebuild
deleted file mode 100644
index fd52276f..00000000
--- a/media-video/nvidia-settings/nvidia-settings-325.15.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND=">=x11-libs/gtk+-2:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/pango[X]"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	dodoc doc/*.txt
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}"/95-nvidia-settings
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-331.49.ebuild b/media-video/nvidia-settings/nvidia-settings-331.49.ebuild
deleted file mode 100644
index fd52276f..00000000
--- a/media-video/nvidia-settings/nvidia-settings-331.49.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND=">=x11-libs/gtk+-2:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/pango[X]"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	dodoc doc/*.txt
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}"/95-nvidia-settings
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-331.67.ebuild b/media-video/nvidia-settings/nvidia-settings-331.67.ebuild
deleted file mode 100644
index fd52276f..00000000
--- a/media-video/nvidia-settings/nvidia-settings-331.67.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND=">=x11-libs/gtk+-2:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/pango[X]"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	dodoc doc/*.txt
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}"/95-nvidia-settings
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-334.21-r3.ebuild b/media-video/nvidia-settings/nvidia-settings-334.21-r3.ebuild
deleted file mode 100644
index fd52276f..00000000
--- a/media-video/nvidia-settings/nvidia-settings-334.21-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND=">=x11-libs/gtk+-2:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/pango[X]"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	dodoc doc/*.txt
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}"/95-nvidia-settings
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-337.25.ebuild b/media-video/nvidia-settings/nvidia-settings-337.25.ebuild
deleted file mode 100644
index fd52276f..00000000
--- a/media-video/nvidia-settings/nvidia-settings-337.25.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND=">=x11-libs/gtk+-2:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/pango[X]"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	dodoc doc/*.txt
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}"/95-nvidia-settings
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-340.46.ebuild b/media-video/nvidia-settings/nvidia-settings-340.46.ebuild
deleted file mode 100644
index fd52276f..00000000
--- a/media-video/nvidia-settings/nvidia-settings-340.46.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND=">=x11-libs/gtk+-2:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/pango[X]"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	dodoc doc/*.txt
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}"/95-nvidia-settings
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
deleted file mode 100644
index fd52276f..00000000
--- a/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-DEPEND=">=x11-libs/gtk+-2:2
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/pango[X]"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	dodoc doc/*.txt
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}"/95-nvidia-settings
-}
diff --git a/media-video/nvidia-settings/nvidia-settings-346.35.ebuild b/media-video/nvidia-settings/nvidia-settings-346.35.ebuild
deleted file mode 100644
index 814503eb..00000000
--- a/media-video/nvidia-settings/nvidia-settings-346.35.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="NVIDIA Linux X11 Settings Utility"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-# xorg-server is used in the depends as nvidia-settings builds against some
-# headers in /usr/include/xorg/.
-# This also allows us to optimize out a lot of the other dependancies, as
-# between gtk and xorg-server, almost all libraries and headers are accounted
-# for.
-COMMON=">=x11-libs/gtk+-2:2 x11-libs/gtk+:3"
-DEPEND="${COMMON}
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	>=x11-libs/libvdpau-0.9
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND="${COMMON}
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/pango[X]"
-
-src_compile() {
-	einfo "Building libXNVCtrl..."
-	emake -C src/libXNVCtrl/ clean # NVidia ships pre-built archives :(
-	emake -C src/libXNVCtrl/ \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libXNVCtrl.a
-
-	einfo "Building nvidia-settings..."
-	emake -C src/ \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		STRIP_CMD="$(type -P true)" \
-		NV_VERBOSE=1 \
-		USE_EXTERNAL_JANSSON=1
-}
-
-src_install() {
-	emake -C src/ DESTDIR="${D}" PREFIX=/usr USE_EXTERNAL_JANSSON=1 install
-
-	insinto /usr/$(get_libdir)
-	doins src/libXNVCtrl/libXNVCtrl.a
-
-	insinto /usr/include/NVCtrl
-	doins src/libXNVCtrl/*.h
-
-	doicon doc/${PN}.png
-	make_desktop_entry ${PN} "NVIDIA X Server Settings" ${PN} Settings
-
-	dodoc doc/*.txt
-
-	# Install icon and .desktop entry
-	doicon "${S}/doc/${PN}.png"
-	sed -i "s:__UTILS_PATH__:/usr/bin:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__PIXMAP_PATH__:/usr/share/pixmaps:" "${S}/doc/${PN}.desktop"
-	sed -i "s:__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__:Utility:" "${S}/doc/${PN}.desktop"
-	domenu "${S}/doc/${PN}.desktop"
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}"/95-nvidia-settings
-}
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
deleted file mode 100644
index 2e4ed368..00000000
--- a/media-video/openshot/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST openshot-1.4.3.tar.gz 31990991 SHA256 5bebf1c59a8667b0263599544f2d23ce6be3ab79ce24a85b766e1e39cab859d0 SHA512 f3221c3e508ccf61d4fd2771de47f42ddb1a78996853011ee336e8ccf842a0fd97707a60c677e1465a89e6eb67911b6eb98b002959f8a29ac9e31924bbb6fcda WHIRLPOOL 4fd8d5b5db2923c8b7349032847087b9cf4ccdbade206c5c6cc9aac27ace6e99c6053bd1184cf14b20c80b4f666baf356798a5b6a8d6c7c737a9a986894943af
diff --git a/media-video/openshot/openshot-1.4.3.ebuild b/media-video/openshot/openshot-1.4.3.ebuild
deleted file mode 100644
index 37921af2..00000000
--- a/media-video/openshot/openshot-1.4.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/openshot/openshot-1.4.3.ebuild,v 1.2 2015/04/08 18:16:25 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_REQ_USE=xml
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator distutils-r1 python-r1 fdo-mime
-
-DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
-HOMEPAGE="http://www.openshotvideo.com"
-SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="+python +ffmpeg"
-REQUIRED_USE="|| ( python ffmpeg )"
-
-RDEPEND="
-	dev-python/pygoocanvas[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
-	>=media-libs/mlt-0.8.2[ffmpeg,frei0r,gtk,melt,python,sdl,xml]
-	ffmpeg? (
-		>=virtual/ffmpeg-0.6[encode,sdl,x264,mp3,theora]
-	)
-	python? (
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/librsvg-python
-	)
-	x11-libs/gtk+:2
-"
-
-src_prepare() {
-	sed -ie '/launcher/,+1d' setup.py || die
-	sed -ie '/FAILED = /,$d' setup.py || die
-
-	# Fix up launchers to not throw an error.
-	sed -i 's/\(from \)\(openshot import main\)/\1openshot.\2/' bin/openshot || die
-	sed -i 's/\(from \)\(openshot_render import main\)/\1openshot.\2/' bin/openshot-render || die
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
deleted file mode 100644
index ac90d787..00000000
--- a/media-video/simplescreenrecorder/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST 0.2.0.tar.gz 1177716 SHA256 e958e0afc6633a8ad3ba3e7712dec2015e2f348a43b1d70a657ea04dcd90cc56 SHA512 467fe9a437244033d29cab5ce40446873d5a7908a0cd9ec094dfc21c3a44ef4127ba441e51bbd0fa9ac99e524cbb615efb6fbf61176fbb1fe77342687c4dc925 WHIRLPOOL 20e5e61634ef307eafe840e1bd77d50fcee836739ae3c9cb59d7fb71c20edf049fc5492bb2a72e7f4d0f125ad12a1cb222f3bce2cc9d3e5a897c2a120ae435f0
-DIST 0.2.1.tar.gz 1177723 SHA256 257e856c45209452bbda8c21a99e92248ae81dc6dafb02e08bf8d5f7bda4a452 SHA512 9c752cfe7b4dfe6afca2e13abdf5ddb20073c3878dbc08aa0cbfa1403c02eff66a34a55c75c0fff8fe719cadf5a29f32d115ec5c2af0b9b0a0f754c85e22a336 WHIRLPOOL e9fe0ea37bc607158c4ad371d649acef595a7678fdffc98ad18ae5d3753815bbe41bf7c7bf6fc60bc96a72e0b7b5d677cb035d6414a6ee9d325519e7f8af7bbe
-DIST 0.3.3.tar.gz 1571466 SHA256 cb75df563927d3fa74cb825c9040522332c49cd9745e02c8a64be0bff0aeac26 SHA512 d2541ccadd410067ddf043bc2cbaa863e4bac7c828b3591faf429aa3d1ba43cbfc789ccc21cd045cb54c6d2aa1381a94d8558c7a11a8e8c12850c885409a44e8 WHIRLPOOL 9dcdc460aeffb5d6117d2bc984e31bb59d706a37eebafcf379568dce6105b4039ea670931b18862105bf720411bb516e0081ee06c21275c5b2ab8738668e0181
diff --git a/media-video/simplescreenrecorder/metadata.xml b/media-video/simplescreenrecorder/metadata.xml
deleted file mode 100644
index d846dd0a..00000000
--- a/media-video/simplescreenrecorder/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <use>
-	  <flag name="vpx">Enables vp8 codec support using libvpx from ffmpeg/libav</flag>
-  </use>
-</pkgmetadata>
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.2.0-r1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.2.0-r1.ebuild
deleted file mode 100644
index 5692941a..00000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-2
-fi
-
-DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
-S=${WORKDIR}/${PKGNAME}-${PV}
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/MaartenBaert/${PKGNAME}.git
-		https://github.com/MaartenBaert/${PKGNAME}.git"
-	EGIT_BOOTSTRAP="eautoreconf"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-SLOT="0"
-IUSE="debug jack mp3 pulseaudio theora vorbis vpx x264"
-
-RDEPEND="
-	dev-qt/qtcore
-	dev-qt/qtgui
-	virtual/glu
-	media-libs/alsa-lib
-	media-libs/mesa
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	abi_x86_32? (
-		app-emulation/emul-linux-x86-opengl
-		app-emulation/emul-linux-x86-xlibs
-	)
-	jack? ( media-sound/jack-audio-connection-kit )
-	pulseaudio? ( media-sound/pulseaudio )
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
-	"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ ${PV} == "9999" ]]; then
-		elog
-		elog "This ebuild merges the latest revision available from upstream's"
-		elog "git repository, and might fail to compile or work properly once"
-		elog "merged."
-		elog
-	fi
-
-	if [[ ${ABI} == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
-	fi
-
-	if ( has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ) && has_version media-libs/x264[10bit]; then
-		ewarn
-		ewarn "media-libs/x264 is currently built with 10bit useflag."
-		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
-		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
-		ewarn "record videos with x264."
-		ewarn
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=( --enable-dependency-tracking )
-
-	if multilib_build_binaries; then
-		myconf+=(
-			$(use_enable debug assert)
-			$(use_enable pulseaudio)
-			$(use_enable jack)
-		)
-	else
-		myconf+=(
-			--disable-assert
-			--disable-pulseaudio
-			--disable-jack
-			--disable-ssrprogram
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-		econf ${myconf[@]}
-}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.2.0-r2.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.2.0-r2.ebuild
deleted file mode 100644
index edae685a..00000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-2
-fi
-
-DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
-S=${WORKDIR}/${PKGNAME}-${PV}
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/MaartenBaert/${PKGNAME}.git
-		https://github.com/MaartenBaert/${PKGNAME}.git"
-	EGIT_BOOTSTRAP=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SLOT="0"
-IUSE="debug jack mp3 pulseaudio theora vorbis vpx x264"
-
-RDEPEND="
-	dev-qt/qtcore
-	dev-qt/qtgui
-	virtual/glu[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/mesa[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	jack? ( media-sound/jack-audio-connection-kit )
-	pulseaudio? ( media-sound/pulseaudio )
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
-	"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ ${PV} == "9999" ]]; then
-		elog
-		elog "This ebuild merges the latest revision available from upstream's"
-		elog "git repository, and might fail to compile or work properly once"
-		elog "merged."
-		elog
-	fi
-
-	if [[ ${ABI} == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
-	fi
-
-	if ( has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ) && has_version media-libs/x264[10bit]; then
-		ewarn
-		ewarn "media-libs/x264 is currently built with 10bit useflag."
-		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
-		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
-		ewarn "record videos with x264."
-		ewarn
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=( --enable-dependency-tracking )
-
-	if multilib_build_binaries; then
-		myconf+=(
-			$(use_enable debug assert)
-			$(use_enable pulseaudio)
-			$(use_enable jack)
-		)
-	else
-		myconf+=(
-			--disable-assert
-			--disable-pulseaudio
-			--disable-jack
-			--disable-ssrprogram
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-		econf ${myconf[@]}
-}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.2.0.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.2.0.ebuild
deleted file mode 100644
index edae685a..00000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.2.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-2
-fi
-
-DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
-S=${WORKDIR}/${PKGNAME}-${PV}
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/MaartenBaert/${PKGNAME}.git
-		https://github.com/MaartenBaert/${PKGNAME}.git"
-	EGIT_BOOTSTRAP=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SLOT="0"
-IUSE="debug jack mp3 pulseaudio theora vorbis vpx x264"
-
-RDEPEND="
-	dev-qt/qtcore
-	dev-qt/qtgui
-	virtual/glu[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/mesa[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	jack? ( media-sound/jack-audio-connection-kit )
-	pulseaudio? ( media-sound/pulseaudio )
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
-	"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ ${PV} == "9999" ]]; then
-		elog
-		elog "This ebuild merges the latest revision available from upstream's"
-		elog "git repository, and might fail to compile or work properly once"
-		elog "merged."
-		elog
-	fi
-
-	if [[ ${ABI} == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
-	fi
-
-	if ( has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ) && has_version media-libs/x264[10bit]; then
-		ewarn
-		ewarn "media-libs/x264 is currently built with 10bit useflag."
-		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
-		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
-		ewarn "record videos with x264."
-		ewarn
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=( --enable-dependency-tracking )
-
-	if multilib_build_binaries; then
-		myconf+=(
-			$(use_enable debug assert)
-			$(use_enable pulseaudio)
-			$(use_enable jack)
-		)
-	else
-		myconf+=(
-			--disable-assert
-			--disable-pulseaudio
-			--disable-jack
-			--disable-ssrprogram
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-		econf ${myconf[@]}
-}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.2.1-r1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.2.1-r1.ebuild
deleted file mode 100644
index edae685a..00000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-2
-fi
-
-DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
-S=${WORKDIR}/${PKGNAME}-${PV}
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/MaartenBaert/${PKGNAME}.git
-		https://github.com/MaartenBaert/${PKGNAME}.git"
-	EGIT_BOOTSTRAP=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SLOT="0"
-IUSE="debug jack mp3 pulseaudio theora vorbis vpx x264"
-
-RDEPEND="
-	dev-qt/qtcore
-	dev-qt/qtgui
-	virtual/glu[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/mesa[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	jack? ( media-sound/jack-audio-connection-kit )
-	pulseaudio? ( media-sound/pulseaudio )
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
-	"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ ${PV} == "9999" ]]; then
-		elog
-		elog "This ebuild merges the latest revision available from upstream's"
-		elog "git repository, and might fail to compile or work properly once"
-		elog "merged."
-		elog
-	fi
-
-	if [[ ${ABI} == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
-	fi
-
-	if ( has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ) && has_version media-libs/x264[10bit]; then
-		ewarn
-		ewarn "media-libs/x264 is currently built with 10bit useflag."
-		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
-		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
-		ewarn "record videos with x264."
-		ewarn
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=( --enable-dependency-tracking )
-
-	if multilib_build_binaries; then
-		myconf+=(
-			$(use_enable debug assert)
-			$(use_enable pulseaudio)
-			$(use_enable jack)
-		)
-	else
-		myconf+=(
-			--disable-assert
-			--disable-pulseaudio
-			--disable-jack
-			--disable-ssrprogram
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-		econf ${myconf[@]}
-}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.2.1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.2.1.ebuild
deleted file mode 100644
index 5692941a..00000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.2.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-2
-fi
-
-DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
-S=${WORKDIR}/${PKGNAME}-${PV}
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/MaartenBaert/${PKGNAME}.git
-		https://github.com/MaartenBaert/${PKGNAME}.git"
-	EGIT_BOOTSTRAP="eautoreconf"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-SLOT="0"
-IUSE="debug jack mp3 pulseaudio theora vorbis vpx x264"
-
-RDEPEND="
-	dev-qt/qtcore
-	dev-qt/qtgui
-	virtual/glu
-	media-libs/alsa-lib
-	media-libs/mesa
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	abi_x86_32? (
-		app-emulation/emul-linux-x86-opengl
-		app-emulation/emul-linux-x86-xlibs
-	)
-	jack? ( media-sound/jack-audio-connection-kit )
-	pulseaudio? ( media-sound/pulseaudio )
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
-	"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ ${PV} == "9999" ]]; then
-		elog
-		elog "This ebuild merges the latest revision available from upstream's"
-		elog "git repository, and might fail to compile or work properly once"
-		elog "merged."
-		elog
-	fi
-
-	if [[ ${ABI} == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
-	fi
-
-	if ( has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ) && has_version media-libs/x264[10bit]; then
-		ewarn
-		ewarn "media-libs/x264 is currently built with 10bit useflag."
-		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
-		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
-		ewarn "record videos with x264."
-		ewarn
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=( --enable-dependency-tracking )
-
-	if multilib_build_binaries; then
-		myconf+=(
-			$(use_enable debug assert)
-			$(use_enable pulseaudio)
-			$(use_enable jack)
-		)
-	else
-		myconf+=(
-			--disable-assert
-			--disable-pulseaudio
-			--disable-jack
-			--disable-ssrprogram
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-		econf ${myconf[@]}
-}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.3-r1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.3-r1.ebuild
deleted file mode 100644
index 652628ca..00000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit flag-o-matic multilib-minimal
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-2
-fi
-
-DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
-S=${WORKDIR}/${PKGNAME}-${PV}
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/MaartenBaert/${PKGNAME}.git
-		https://github.com/MaartenBaert/${PKGNAME}.git"
-	EGIT_BOOTSTRAP=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-SLOT="0"
-IUSE="debug jack mp3 pulseaudio theora vorbis vpx x264 +qt4 qt5"
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-RDEPEND="
-	qt4? (
-		>=dev-qt/qtcore-4.8.0:4
-		>=dev-qt/qtgui-4.8.0:4
-	)
-	qt5? (
-		>=dev-qt/qtcore-5.1.0:5
-		>=dev-qt/qtgui-5.1.0:5
-		>=dev-qt/qtwidgets-5.1.0:5
-		>=dev-qt/qtx11extras-5.1.0:5
-	)
-	virtual/glu[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/mesa[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	jack? ( media-sound/jack-audio-connection-kit )
-	pulseaudio? ( media-sound/pulseaudio )
-	|| (
-		media-video/ffmpeg:0[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
-	"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ ${PV} == "9999" ]]; then
-		elog
-		elog "This ebuild merges the latest revision available from upstream's"
-		elog "git repository, and might fail to compile or work properly once"
-		elog "merged."
-		elog
-	fi
-
-	if [[ ${ABI} == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
-	fi
-
-	if ( has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ) && has_version media-libs/x264[10bit]; then
-		ewarn
-		ewarn "media-libs/x264 is currently built with 10bit useflag."
-		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
-		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
-		ewarn "record videos with x264."
-		ewarn
-	fi
-
-	# QT requires -fPIC. Compile fails otherwise.
-	# Recently removed from the default compile options upstream
-	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
-	append-flags -fPIC
-}
-
-multilib_src_configure() {
-
-	local myconf=(
-		--enable-dependency-tracking
-		$(multilib_native_use_enable debug assert)
-		$(multilib_native_use_with pulseaudio)
-		$(multilib_native_use_with jack)
-		$(multilib_native_use_with qt5)
-	)
-
-	# libav doesn't have AVFrame::channels
-	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
-	if has_version media-video/libav; then
-		myconf+=( --disable-ffmpeg-versions )
-	fi
-
-	multilib_is_native_abi || myconf+=( --disable-ssrprogram )
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		${myconf[@]}
-
-}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
deleted file mode 100644
index edae685a..00000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit autotools multilib-minimal
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-2
-fi
-
-DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
-S=${WORKDIR}/${PKGNAME}-${PV}
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="git://github.com/MaartenBaert/${PKGNAME}.git
-		https://github.com/MaartenBaert/${PKGNAME}.git"
-	EGIT_BOOTSTRAP=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SLOT="0"
-IUSE="debug jack mp3 pulseaudio theora vorbis vpx x264"
-
-RDEPEND="
-	dev-qt/qtcore
-	dev-qt/qtgui
-	virtual/glu[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/mesa[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	jack? ( media-sound/jack-audio-connection-kit )
-	pulseaudio? ( media-sound/pulseaudio )
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
-	"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ ${PV} == "9999" ]]; then
-		elog
-		elog "This ebuild merges the latest revision available from upstream's"
-		elog "git repository, and might fail to compile or work properly once"
-		elog "merged."
-		elog
-	fi
-
-	if [[ ${ABI} == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
-	fi
-
-	if ( has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ) && has_version media-libs/x264[10bit]; then
-		ewarn
-		ewarn "media-libs/x264 is currently built with 10bit useflag."
-		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
-		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
-		ewarn "record videos with x264."
-		ewarn
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=( --enable-dependency-tracking )
-
-	if multilib_build_binaries; then
-		myconf+=(
-			$(use_enable debug assert)
-			$(use_enable pulseaudio)
-			$(use_enable jack)
-		)
-	else
-		myconf+=(
-			--disable-assert
-			--disable-pulseaudio
-			--disable-jack
-			--disable-ssrprogram
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-		econf ${myconf[@]}
-}
diff --git a/media-video/smtube/Manifest b/media-video/smtube/Manifest
deleted file mode 100644
index 38ffc75b..00000000
--- a/media-video/smtube/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST smtube-15.5.17.tar.bz2 652324 SHA256 cf2f5b0b978c31f0580bf67ea10c95f42c4475ad74fde5031a67856503997149 SHA512 5257f703f84140d70aea8073d0363ce8a1415364ce21b974adba08d86d2324de5600cde7f69bc8b7e3f2fc9650e81e884763524ef33fec139f6f4b16736d8566 WHIRLPOOL 06a8fc0313585e5d6374d3bea723efe913ac822ce446fe5d5d93d7f431eef9b3e97665e243ce7b8bd4cac4132f15d5ea1730403ec223b8823421d647ddc06388
diff --git a/media-video/smtube/smtube-15.5.17.ebuild b/media-video/smtube/smtube-15.5.17.ebuild
deleted file mode 100644
index 2cb42877..00000000
--- a/media-video/smtube/smtube-15.5.17.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-#
-EAPI=5
-
-PLOCALES="en es de eu fr gl it ja ko pt pt_BR ru sr zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit l10n qt4-r2
-
-DESCRIPTION="YouTube Browser for SMPlayer"
-HOMEPAGE="http://smplayer.sourceforge.net/smtube"
-SRC_URI="mirror://sourceforge/smtube/${P}.tar.bz2"
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}
-	|| ( media-video/mpv media-video/smplayer media-video/mplayer media-video/vlc kde-base/dragon media-video/totem media-video/gnome-mplayer )"
-
-src_prepare() {
-	eqmake4 src/${PN}.pro
-}
-
-gen_translation() {
-	lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	emake
-
-	cd "${S}"/src/translations
-	l10n_for_each_locale_do gen_translation
-}
-
-install_locale() {
-	insinto /usr/share/${PN}/translations
-	doins "${S}"/src/translations/${PN}_${1}.qm
-	eend $? || die "failed to install $1 translation"
-}
-
-src_install() {
-	dobin ${PN}
-	domenu ${PN}.desktop
-	newicon icons/${PN}_64.png ${PN}.png
-	dodoc Changelog
-
-	l10n_for_each_locale_do install_locale
-}
diff --git a/media-video/tovid/Manifest b/media-video/tovid/Manifest
deleted file mode 100644
index 4c256fa1..00000000
--- a/media-video/tovid/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST tovid-0.34.tar.gz 512950 RMD160 417b1c29d634f03aa6667407826f2e2dbd5175b0 SHA1 e652b9b402174d8c81a2e3b9962c17d25f4feefa SHA256 f95d14ffbd2bd491751b529b09fb27ae45e24af1ad44c87b25bac9c1a184f4ee
-DIST tovid-0.34_p20120123.tar.gz 1008271 RMD160 e7679043a6845e176c24c0dad872117a04dc3ce1 SHA1 0ca25885882633b152ddb800b3500ee8f7148b3f SHA256 941d3ca7aeb68fe306fb41aa1e97d4524f3ce8e340e83a249257f11755084186
-EBUILD tovid-0.34.ebuild 1361 RMD160 384d0de4b25c7f5c9a445157e3ed21572c29e296 SHA1 bbe26ecb9058afaa9d1f1655342dcd49b16bc6fc SHA256 fd32acb24c8ed6c3bc2c0675ecd5413d64982e1d17ee98123a26a4600f0e6fef
-EBUILD tovid-0.34_p20120123.ebuild 1460 RMD160 87b5d833e60fc04c6e25428eb6676ad02784b39b SHA1 5075da9673be3fa47e5311019bcf1871fceab835 SHA256 83b22a161ca74a1f81c33a43ea3d2ef131556d95b46f8f0dd3258327772c2d06
-MISC metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 SHA1 9ac37da489ebe6e58e32fe8e037b1ef2d99c6638 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4
diff --git a/media-video/tovid/metadata.xml b/media-video/tovid/metadata.xml
deleted file mode 100644
index d9df1878..00000000
--- a/media-video/tovid/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>video</herd>
-</pkgmetadata>
diff --git a/media-video/tovid/tovid-0.34.ebuild b/media-video/tovid/tovid-0.34.ebuild
deleted file mode 100644
index dedacf4d..00000000
--- a/media-video/tovid/tovid-0.34.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.34.ebuild,v 1.2 2011/11/12 16:12:43 ssuominen Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils gnome2-utils
-
-DESCRIPTION="A collection of DVD authoring tools"
-HOMEPAGE="http://tovid.wikia.com/wiki/Tovid_Wiki"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-cdr/cdrdao
-	app-cdr/dvd+rw-tools
-	|| ( =dev-lang/python-tk-2.7* =dev-lang/python-tk-2.6* )
-	dev-python/pycairo
-	dev-python/imaging
-	dev-tcltk/tix
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
-	media-sound/normalize
-	>=media-sound/sox-14.3.2
-	media-video/dvdauthor
-	>=media-video/mjpegtools-2.0.0
-	>=media-video/mplayer-1.0_rc4_p20110101
-	>=media-video/transcode-1.1.5
-	media-video/vcdimager
-	sys-devel/bc
-	virtual/ffmpeg"
-DEPEND="app-text/txt2tags"
-
-DOCS="AUTHORS ChangeLog README"
-
-src_install() {
-	distutils_src_install
-
-	# punt at least .install.log
-	find "${ED}" -name '*.log' -exec rm -f {} +
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-video/tovid/tovid-0.34_p20120123.ebuild b/media-video/tovid/tovid-0.34_p20120123.ebuild
deleted file mode 100644
index 45c0ae73..00000000
--- a/media-video/tovid/tovid-0.34_p20120123.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: Exp $
-
-# svn checkout http://tovid.googlecode.com/svn/trunk/tovid tovid-${PV}
-# note: see quickrelease file in the top source directory
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.7"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils gnome2-utils
-
-DESCRIPTION="A collection of DVD authoring tools"
-HOMEPAGE="http://tovid.wikia.com/wiki/Tovid_Wiki"
-SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.gz"
-#SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-cdr/cdrdao
-	app-cdr/dvd+rw-tools
-	|| ( =dev-lang/python-tk-2.7* =dev-lang/python-tk-2.6* )
-	dev-python/pycairo
-	dev-python/imaging
-	dev-tcltk/tix
-	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )
-	media-sound/normalize
-	>=media-sound/sox-14.3.2
-	media-video/dvdauthor
-	>=media-video/mjpegtools-2.0.0
-	>=media-video/mplayer-1.0_rc4_p20110101
-	>=media-video/transcode-1.1.5
-	media-video/vcdimager
-	sys-devel/bc
-	virtual/ffmpeg"
-DEPEND="app-text/txt2tags"
-
-DOCS="AUTHORS ChangeLog README"
-
-src_install() {
-	distutils_src_install
-
-	# punt at least .install.log
-	find "${ED}" -name '*.log' -exec rm -f {} +
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-video/webcamstudio-module/Manifest b/media-video/webcamstudio-module/Manifest
deleted file mode 100644
index 9354bb02..00000000
--- a/media-video/webcamstudio-module/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD webcamstudio-module-1.4-r2.ebuild 1141 RMD160 7ba8459d8493a997a4eaaca30fac9d17ae8a95fa SHA1 3eba5853d6bb1ebea9224f1174e001a34d27647d SHA256 9d9fd997339705f3fdb50e3ef6c4caecf20da9aba8d701fc388df09696b50a71
diff --git a/media-video/webcamstudio-module/webcamstudio-module-1.4-r2.ebuild b/media-video/webcamstudio-module/webcamstudio-module-1.4-r2.ebuild
deleted file mode 100644
index 4f162f16..00000000
--- a/media-video/webcamstudio-module/webcamstudio-module-1.4-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils linux-mod subversion
-
-DESCRIPTION="Kernel module for WebcamStudio."
-HOMEPAGE="http://www.ws4gl.org/"
-ESVN_REPO_URI="https://webcamstudio.svn.sourceforge.net/svnroot/webcamstudio/trunk/vloopback@891"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="virtual/linux-sources"
-
-MODULE_NAMES="webcamstudio(misc:${S})"
-CONFIG_CHECK="VIDEO_DEV"
-
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	rm -f "${S}"/Makefile || die
-
-	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} KERNEL_DIR=${KV_DIR}"
-	BUILD_TARGETS="modules"
-	MODULESD_WEBCAMSTUDIO_ENABLED="yes"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.4-semaphore-fix.patch"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	elog "To use WebcamStudio you need to have the \"webcamstudio\" module"
-	elog "loaded first."
-	elog ""
-	elog "If you want to do it automatically, please add \"webcamstudio\" to:"
-	if has_version sys-apps/openrc; then
-		elog "/etc/conf.d/modules"
-	else
-		elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-	fi
-	elog ""
-}
diff --git a/media-video/webcamstudio-module/webcamstudio-module-1.4-r2.ebuild.save b/media-video/webcamstudio-module/webcamstudio-module-1.4-r2.ebuild.save
deleted file mode 100644
index 42b505b4..00000000
--- a/media-video/webcamstudio-module/webcamstudio-module-1.4-r2.ebuild.save
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils linux-mod subversion
-
-DESCRIPTION="Kernel module for WebcamStudio."
-HOMEPAGE="http://www.ws4gl.org/"
-ESVN_REPO_URI="https://webcamstudio.svn.sourceforge.net/svnroot/webcamstudio/trunk/vloopback@891"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND="
-DEPEND="virtual/linux-sources"
-
-MODULE_NAMES="webcamstudio(misc:${S})"
-CONFIG_CHECK="VIDEO_DEV"
-
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	rm -f "${S}"/Makefile || die
-
-	BUILD_PARAMS="-C ${KV_DIR} SUBDIRS=${S} KERNEL_DIR=${KV_DIR}"
-	BUILD_TARGETS="modules"
-	MODULESD_WEBCAMSTUDIO_ENABLED="yes"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.4-semaphore-fix.patch"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	elog "To use WebcamStudio you need to have the \"webcamstudio\" module"
-	elog "loaded first."
-	elog ""
-	elog "If you want to do it automatically, please add \"webcamstudio\" to:"
-	if has_version sys-apps/openrc; then
-		elog "/etc/conf.d/modules"
-	else
-		elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-	fi
-	elog ""
-}