Added ebuilds for kogaion desktop

40 files changed, 2042 insertions, 0 deletions

diff --git a/media-video/amdcccle/Manifest b/media-video/amdcccle/Manifest
new file mode 100644
index 00000000..38dcf63e
--- /dev/null
+++ b/media-video/amdcccle/Manifest
@@ -0,0 +1,18 @@
+DIST amd-driver-installer-12-1-x86.x86_64.run 106085279 RMD160 13fd67ad49cb1bf0aa3a0ca92da52c1a4ba93dc1 SHA1 8262b2a66cf87063713852c8f3a20bc995be47e6 SHA256 8d76700e0db68f74f735808ee7fd446cb5072734ba6ec03f2dd82c05ebfdc81d
+DIST amd-driver-installer-12-2-x86.x86_64.run 107213014 RMD160 b3966f0ad6c756f6d4fd77cde5761a86ef2ef3b2 SHA1 24bbaa07dbc8354a0393c4ceeed552d7ac37b09d SHA256 054796cbf2d99e4b545d062ce8eabfd973e74e2e21a159092816238b001618fd
+DIST amd-driver-installer-12-3-x86.x86_64.run 108029053 RMD160 176b4544269671fc10bff8caa0663d25893d7b19 SHA1 f62146ed5653ce81dca578e0252c7f32d55627be SHA256 5f90c7e472ca0095efc16097ac7bcda846be0e980cc4d3e588cc4089efe8fb57
+DIST ati-driver-installer-11-10-x86.x86_64.run 77926379 RMD160 bef9aa8ff1bd366b5e8505789e87ac268ebc6807 SHA1 406e0a69f1e9dfd899bbcc6fa00d00adfba077cb SHA256 a245e0305051313767fef1be88693702fccfb3f11c18a98f61c233af17e85f9e
+DIST ati-driver-installer-11-11-x86.x86_64.run 97090080 RMD160 07c19b48ccb6d7d95d585545ec3a3038fdfb65bd SHA1 7de856b9464e617fa3b880de6b45ef9ec56e6336 SHA256 fcd51cdc0c7572d443f5ce54576888f09efaced10b12ccf9fa775c81eaade013
+DIST ati-driver-installer-11-12-x86.x86_64.run 99618112 RMD160 70ae7407bab182c7fc9b1d4a177c2e1493ffb508 SHA1 d20a185165eff1b6d9631b7e3ed7201eeda9312a SHA256 0179d1f0425036e50b637e5153b0c64b25836d09e9d22bc50edfbdf6aed32b42
+DIST ati-driver-installer-11-6-x86.x86_64.run 75503458 RMD160 fce2a7c1b7c213f26befc2beab47eefdcfd0059f SHA1 463dba00b419f761db2bf97088e6cfbcfc63c9fa SHA256 3dbb7cf1a5493588d872eb29b7376eb5db3913c4f35d631c3183d168eed1f67f
+DIST ati-driver-installer-11-8-x86.x86_64.run 75754239 RMD160 92e33779416228ef75fd8bc8790c5aebd2f3332f SHA1 807a5663b062a9cf6295ac8cf3dee7439aabda57 SHA256 71e0194daef7a50c6d0d3b5712b05375a003d452e39c754278336c3811a2acdf
+DIST ati-driver-installer-11-9-x86.x86_64.run 76564617 RMD160 8631c510ace5a7d73c97064f8ca16ee9a6fe94e4 SHA1 e01caf1211fd3f9602017a340921aa1b9c38b802 SHA256 d9ad9c8e0bd250ac41c39d9b8e9f77efc82631f4bebacb82ddde982a86530d56
+EBUILD amdcccle-11.10.ebuild 1477 RMD160 d39dc4d58bdad2046bd9964cee3169689479a770 SHA1 a6fff090cad0a882cfca8fd6c33939c2479d3c1c SHA256 50c02b61ae6147683f14e59a6ff186461b2e4013c00d6b9620c2e4a8c6f9e988
+EBUILD amdcccle-11.11.ebuild 1563 RMD160 2accea4fb08b9b77d0e0fafb8b0cb037701343d0 SHA1 40411c71ea65bfcd1cf1cbb5e3987a229eba64d4 SHA256 f27f047f34ce9774fff7ca0c20978259b46a203ece333a3f5b44aad7e2aae904
+EBUILD amdcccle-11.12.ebuild 1563 RMD160 2accea4fb08b9b77d0e0fafb8b0cb037701343d0 SHA1 40411c71ea65bfcd1cf1cbb5e3987a229eba64d4 SHA256 f27f047f34ce9774fff7ca0c20978259b46a203ece333a3f5b44aad7e2aae904
+EBUILD amdcccle-11.6.ebuild 1477 RMD160 d39dc4d58bdad2046bd9964cee3169689479a770 SHA1 a6fff090cad0a882cfca8fd6c33939c2479d3c1c SHA256 50c02b61ae6147683f14e59a6ff186461b2e4013c00d6b9620c2e4a8c6f9e988
+EBUILD amdcccle-11.8.ebuild 1477 RMD160 d39dc4d58bdad2046bd9964cee3169689479a770 SHA1 a6fff090cad0a882cfca8fd6c33939c2479d3c1c SHA256 50c02b61ae6147683f14e59a6ff186461b2e4013c00d6b9620c2e4a8c6f9e988
+EBUILD amdcccle-11.9.ebuild 1477 RMD160 d39dc4d58bdad2046bd9964cee3169689479a770 SHA1 a6fff090cad0a882cfca8fd6c33939c2479d3c1c SHA256 50c02b61ae6147683f14e59a6ff186461b2e4013c00d6b9620c2e4a8c6f9e988
+EBUILD amdcccle-12.1-r1.ebuild 1563 RMD160 52352ad5c024988484673ae7031e2f5e0fbe04b5 SHA1 b6523c645b6330d0f61d03297e33161f8c8c5cec SHA256 827ae7cd785494e2a49ec963c464800ba6cd3714245bf43d140ff72ba819d4cc
+EBUILD amdcccle-12.2.ebuild 1563 RMD160 52352ad5c024988484673ae7031e2f5e0fbe04b5 SHA1 b6523c645b6330d0f61d03297e33161f8c8c5cec SHA256 827ae7cd785494e2a49ec963c464800ba6cd3714245bf43d140ff72ba819d4cc
+EBUILD amdcccle-12.3.ebuild 1563 RMD160 52352ad5c024988484673ae7031e2f5e0fbe04b5 SHA1 b6523c645b6330d0f61d03297e33161f8c8c5cec SHA256 827ae7cd785494e2a49ec963c464800ba6cd3714245bf43d140ff72ba819d4cc
diff --git a/media-video/amdcccle/amdcccle-11.10.ebuild b/media-video/amdcccle/amdcccle-11.10.ebuild
new file mode 100644
index 00000000..f0ed060b
--- /dev/null
+++ b/media-video/amdcccle/amdcccle-11.10.ebuild
@@ -0,0 +1,62 @@
+# 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
new file mode 100644
index 00000000..bf86fc54
--- /dev/null
+++ b/media-video/amdcccle/amdcccle-11.11.ebuild
@@ -0,0 +1,64 @@
+# 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
new file mode 100644
index 00000000..bf86fc54
--- /dev/null
+++ b/media-video/amdcccle/amdcccle-11.12.ebuild
@@ -0,0 +1,64 @@
+# 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
new file mode 100644
index 00000000..f0ed060b
--- /dev/null
+++ b/media-video/amdcccle/amdcccle-11.6.ebuild
@@ -0,0 +1,62 @@
+# 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
new file mode 100644
index 00000000..f0ed060b
--- /dev/null
+++ b/media-video/amdcccle/amdcccle-11.8.ebuild
@@ -0,0 +1,62 @@
+# 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
new file mode 100644
index 00000000..f0ed060b
--- /dev/null
+++ b/media-video/amdcccle/amdcccle-11.9.ebuild
@@ -0,0 +1,62 @@
+# 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
new file mode 100644
index 00000000..4e6e66ce
--- /dev/null
+++ b/media-video/amdcccle/amdcccle-12.1-r1.ebuild
@@ -0,0 +1,64 @@
+# 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
new file mode 100644
index 00000000..4e6e66ce
--- /dev/null
+++ b/media-video/amdcccle/amdcccle-12.2.ebuild
@@ -0,0 +1,64 @@
+# 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
new file mode 100644
index 00000000..4e6e66ce
--- /dev/null
+++ b/media-video/amdcccle/amdcccle-12.3.ebuild
@@ -0,0 +1,64 @@
+# 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/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
new file mode 100644
index 00000000..bf20ba29
--- /dev/null
+++ b/media-video/ffmpeg/Manifest
@@ -0,0 +1,2 @@
+DIST ffmpeg-0.5_p20373.tar.bz2 3087600 RMD160 6a960e0837f419c882c7bd18c91f582df0e19c58 SHA1 ddf5d0389586d8ceb2979e0804a7b80a9640aad4 SHA256 2a217144c82f11c80f325c653157bd9fc5424dc43a2b2ccbc8eb03a01d33418d
+EBUILD ffmpeg-0.5_p20373.ebuild 7714 RMD160 838aff2ef33f2947af39714eecc6d6660b30176e SHA1 43efda8ebf7b4106138d426b7889cfdb7f54faf0 SHA256 71ef718d0f1cec16d30f603cae2a7e53a8e708773cb6cafe075b87a6cfe1f658
diff --git a/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild
new file mode 100644
index 00000000..1f89c173
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.5_p20373.ebuild
@@ -0,0 +1,255 @@
+# 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
new file mode 100644
index 00000000..d3bb2b67
--- /dev/null
+++ b/media-video/mkvtoolnix-gui/Manifest
@@ -0,0 +1,2 @@
+DIST mkvtoolnix-5.0.1.tar.bz2 2155095 RMD160 3c6220a1ff304a18e4d7125d6981966c3e9d368e SHA1 900211d47ba6cbeb4188bb45a492a2b9edf08ed2 SHA256 eecc48d17c0583b6b071e710bfe88ae09439bd99bb90c694a2fed0651bb08f19
+EBUILD mkvtoolnix-gui-5.0.1.ebuild 1944 RMD160 7a51e60d50668cd22f194d4739f5da660941fe4b SHA1 6226427f76d8e98d702bca5f1a273a7d0e4ccb08 SHA256 6688d8731baaf28b953da4adf05b33f70c6f81ac1f6746ad4ebc7008d4a1e290
diff --git a/media-video/mkvtoolnix-gui/mkvtoolnix-gui-5.0.1.ebuild b/media-video/mkvtoolnix-gui/mkvtoolnix-gui-5.0.1.ebuild
new file mode 100644
index 00000000..bf200869
--- /dev/null
+++ b/media-video/mkvtoolnix-gui/mkvtoolnix-gui-5.0.1.ebuild
@@ -0,0 +1,81 @@
+# 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/Manifest b/media-video/mkvtoolnix/Manifest
new file mode 100644
index 00000000..8f705b8f
--- /dev/null
+++ b/media-video/mkvtoolnix/Manifest
@@ -0,0 +1,2 @@
+DIST mkvtoolnix-5.0.1.tar.bz2 2155095 RMD160 3c6220a1ff304a18e4d7125d6981966c3e9d368e SHA1 900211d47ba6cbeb4188bb45a492a2b9edf08ed2 SHA256 eecc48d17c0583b6b071e710bfe88ae09439bd99bb90c694a2fed0651bb08f19
+EBUILD mkvtoolnix-5.0.1.ebuild 1907 RMD160 f65e203b483c425b8e453803a6f4a3a4dc5d7a2f SHA1 bf7b6cd8679100e002bdbd803ed66ae757216011 SHA256 4b842af11a50fdaa5541fef1726cd1a01c31b791463db5259c5d3746f82a6b01
diff --git a/media-video/mkvtoolnix/mkvtoolnix-5.0.1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-5.0.1.ebuild
new file mode 100644
index 00000000..ce3a2a5c
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-5.0.1.ebuild
@@ -0,0 +1,86 @@
+# 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/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
new file mode 100644
index 00000000..12d029f9
--- /dev/null
+++ b/media-video/nvidia-settings/Manifest
@@ -0,0 +1,20 @@
+AUX 95-nvidia-settings 54 SHA256 cbc6e8cae863b768b2ec570390e409476ec3ca1137006888810a9ec7f0029eb0 SHA512 de9edf678c64ca3d10c912397800b2cb651ef9108b33ece97a4cc1e86dad0a9e81986cca6b96cfe80740d9cb433de7ef93f29be45178db714ee408c7f6570ac7 WHIRLPOOL 032fbfd24378659f30b0ca2d653dff8fa09106aa55803740f22f82515251c099e9637310d420d909135e9f7850cb2890cf4abeac9d6a4b5e390a7d061462b13a
+AUX nvidia-autostart.desktop 227 SHA256 a2f55b8b6778de2343e16f3a5d6a38719c14220cdb02e0d83eaf12f9bcdb7cd3 SHA512 9e4f81a1085c0bb1e56142bc68050fc6a2e5823d728991745df50c62d161208dbb8f1e34770871161eebd2610fbfb0a64d683a05d8d236a326281770e612511d WHIRLPOOL 881b1934e6c8a094554cac3a16e9e733c5bca2e10eadaa3fe56fdc8a8e5145ba6c7f11bb9948f5d8e4b144eb41a4629a74a74dda0fa18f87ff4a00093fd0561d
+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
+EBUILD nvidia-settings-295.33.ebuild 2149 SHA256 c8d5dd2f4e32d98f29f0763c0a4fc8148224e5e447913f1346fea580daf1b8e3 SHA512 38ec460aa7369672dc8257f2d8142491836a15f14640a94991cfc54c1629459331be2c88feecee73c6855bb2ef0ac04b9b9c66a76cfbb8cec96b24b5ec1476d0 WHIRLPOOL 3401d06502690bf17e632f0f2183639eae496d448142994320e900c2e2befb57572579f439f74f3166c0130d6a4f2bd91bc810ee670238f994c9f47f8e4d6f2e
+EBUILD nvidia-settings-295.40.ebuild 2149 SHA256 c8d5dd2f4e32d98f29f0763c0a4fc8148224e5e447913f1346fea580daf1b8e3 SHA512 38ec460aa7369672dc8257f2d8142491836a15f14640a94991cfc54c1629459331be2c88feecee73c6855bb2ef0ac04b9b9c66a76cfbb8cec96b24b5ec1476d0 WHIRLPOOL 3401d06502690bf17e632f0f2183639eae496d448142994320e900c2e2befb57572579f439f74f3166c0130d6a4f2bd91bc810ee670238f994c9f47f8e4d6f2e
+EBUILD nvidia-settings-302.07.ebuild 2149 SHA256 c8d5dd2f4e32d98f29f0763c0a4fc8148224e5e447913f1346fea580daf1b8e3 SHA512 38ec460aa7369672dc8257f2d8142491836a15f14640a94991cfc54c1629459331be2c88feecee73c6855bb2ef0ac04b9b9c66a76cfbb8cec96b24b5ec1476d0 WHIRLPOOL 3401d06502690bf17e632f0f2183639eae496d448142994320e900c2e2befb57572579f439f74f3166c0130d6a4f2bd91bc810ee670238f994c9f47f8e4d6f2e
+EBUILD nvidia-settings-304.22.ebuild 1558 SHA256 5c5cef6cb2ec65a5243755dd39b427ed89ec3417c91090708f849101aff37edd SHA512 4dc73ea79b8fa4c202ca0e0c75ef76178e8a79e178ea0792d7a9e4d83c372ca84d6e5a0d7d859a93b23446fc321eebf2357a25e6b0fed1a2a0f32e6f9bb50f1d WHIRLPOOL 4b7c0e4fb81d97edcd9ba4f4e793e2f192be61dbee120c9247b126d5ec906b9859f409cc03b136f1e71f2fd9151de73ed4af50b4d080cb7ca1343140215a9e2a
+EBUILD nvidia-settings-304.60.ebuild 1666 SHA256 c36d08361b8c902b6a6df840f2f368c9c6107d299921fcfc21d6be00dd9b3c0e SHA512 81604aa64d62afb3bf20b4333d2d86ad686d162f21551fb13a154be64eef8f864f918c455c0d5564a4e84c46a0ae8f1d4185556ee5faa0c627531a031339a42e WHIRLPOOL 57fd85225ca9cbadb164d2c7cf894133d286d44e9ea052844d095482aae61d297f10e3a920e263d3f51a8231cdcc179650f3e14b68ff60c5c99ee51ad9a89e1b
+EBUILD nvidia-settings-304.88.ebuild 2124 SHA256 d17f2f904fefa91652133d443ad7f2798fe636eecc6ee2c61842c8f312be93a9 SHA512 52f3adc00efe2d700c9bd806182722380a5c5f280455530131df381e2fa0fe88e4471dbf840051fe8b446336794db96421b0e2125393703ec4964bde1e997282 WHIRLPOOL 47171584629f1d701575453f882eb66eb7d0dcdc6ba513c36ed71994b270a78d9609f82b83124995a8a5d00cdbb1d26d6d53623b658b78d91a4446b7ee51a448
+EBUILD nvidia-settings-310.19.ebuild 1558 SHA256 5c5cef6cb2ec65a5243755dd39b427ed89ec3417c91090708f849101aff37edd SHA512 4dc73ea79b8fa4c202ca0e0c75ef76178e8a79e178ea0792d7a9e4d83c372ca84d6e5a0d7d859a93b23446fc321eebf2357a25e6b0fed1a2a0f32e6f9bb50f1d WHIRLPOOL 4b7c0e4fb81d97edcd9ba4f4e793e2f192be61dbee120c9247b126d5ec906b9859f409cc03b136f1e71f2fd9151de73ed4af50b4d080cb7ca1343140215a9e2a
+EBUILD nvidia-settings-313.30.ebuild 2003 SHA256 0e930e57bac62e0d8f1a2df56fe3d5e9c1fca5cb9fa7352874bd103ac31a44db SHA512 c3bc593587cddc9ca02736d6a641a7e7404e5227fb8b5828b7124854d35f59cc8db0795ea9b4baa2d06f975d5c1a8b8060e3b53d204baea511c2cfca4a476553 WHIRLPOOL bae876400f73691aa96435bab9e245813e900e9a91edbf85aef650f9733b108bfb56381a1a91a0426fd830da41e68ac407ffa9dc06af81d6e0a3cc39a7988410
+EBUILD nvidia-settings-325.15.ebuild 2028 SHA256 da27bdb190b3e53a423923ce7cffea8c45c1084b746624203ad6aa34dd3c627a SHA512 29a7dd16ae1b025466bcdca2d1863ccacacd7af7398615940abd8f797c472d05a34f3d269c8be939cb8de43cee66954691195933f691186d4a52771e9390aa35 WHIRLPOOL 9749983650382375a08945d65b9e8f056a29ca9ff58551718b546e561ba70117da6058723287ec612b0ec910ff3a9e6cf0d818bb3ccd4239bea0958bb46acc46
diff --git a/media-video/nvidia-settings/files/95-nvidia-settings b/media-video/nvidia-settings/files/95-nvidia-settings
new file mode 100644
index 00000000..48c41d8a
--- /dev/null
+++ b/media-video/nvidia-settings/files/95-nvidia-settings
@@ -0,0 +1,2 @@
+#!/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
new file mode 100644
index 00000000..5c6d7a4b
--- /dev/null
+++ b/media-video/nvidia-settings/files/nvidia-autostart.desktop
@@ -0,0 +1,8 @@
+[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
new file mode 100644
index 00000000..fe353232
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-295.33.ebuild
@@ -0,0 +1,72 @@
+# 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
new file mode 100644
index 00000000..fe353232
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-295.40.ebuild
@@ -0,0 +1,72 @@
+# 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
new file mode 100644
index 00000000..fe353232
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-302.07.ebuild
@@ -0,0 +1,72 @@
+# 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
new file mode 100644
index 00000000..42f9cf45
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-304.22.ebuild
@@ -0,0 +1,66 @@
+# 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
new file mode 100644
index 00000000..956e1ce4
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-304.60.ebuild
@@ -0,0 +1,66 @@
+# 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
new file mode 100644
index 00000000..3a93d39d
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-304.88.ebuild
@@ -0,0 +1,69 @@
+# 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
new file mode 100644
index 00000000..42f9cf45
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-310.19.ebuild
@@ -0,0 +1,66 @@
+# 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
new file mode 100644
index 00000000..8b52e042
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-313.30.ebuild
@@ -0,0 +1,69 @@
+# 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
new file mode 100644
index 00000000..fd52276f
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-325.15.ebuild
@@ -0,0 +1,76 @@
+# 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/tovid/Manifest b/media-video/tovid/Manifest
new file mode 100644
index 00000000..4c256fa1
--- /dev/null
+++ b/media-video/tovid/Manifest
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 00000000..d9df1878
--- /dev/null
+++ b/media-video/tovid/metadata.xml
@@ -0,0 +1,5 @@
+<?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
new file mode 100644
index 00000000..dedacf4d
--- /dev/null
+++ b/media-video/tovid/tovid-0.34.ebuild
@@ -0,0 +1,61 @@
+# 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
new file mode 100644
index 00000000..45c0ae73
--- /dev/null
+++ b/media-video/tovid/tovid-0.34_p20120123.ebuild
@@ -0,0 +1,65 @@
+# 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/tv-maxe/Manifest b/media-video/tv-maxe/Manifest
new file mode 100644
index 00000000..df2b5e0e
--- /dev/null
+++ b/media-video/tv-maxe/Manifest
@@ -0,0 +1,2 @@
+DIST tv-maxe-0.08.tar.gz 1175803 SHA256 ba2dbef7e69a63e55367c42f7479d8ec19a31703b34f403823036395c8a348c7 SHA512 d20ed7f8740d09c45f9bdaa34c77a07ebdd20f4332ab3bb584db9b70384ad2a59834a8ea0b3ebbd3ca850c05cb0c485db513e401b06901852d57206088cbafb9 WHIRLPOOL 616a6de75e4642bf10b5c2f6f33e35dd2bc333e626bfe28461bffac16ab6ddfff1ccc5e03d621e4650fad57dc762d7d3415a26ff1c270f534d33963bf9fbf250
+DIST tv-maxe-0.09.tar.gz 2157775 SHA256 3f580f0801cc2326ed1c367917bea9d1d9d68d86384d85380fda4d3adf391210 SHA512 516feaf829758626d643791c7ab84093ce717c42e9af5d46c5ab0adf032c5c56ccb164bcf5c93d9e89a8fc4de8b4c2f32ea07283c38865c3d71adb291b339d19 WHIRLPOOL e92413d3d0f976683f97c7392f5eda548207eac90868c029a2b07f027c5139a9244cead8891f0f50688bc79314b965a3b9637a7f37b90d2cafade0d0daa0b249
diff --git a/media-video/tv-maxe/tv-maxe-0.08.ebuild b/media-video/tv-maxe/tv-maxe-0.08.ebuild
new file mode 100644
index 00000000..07b764d9
--- /dev/null
+++ b/media-video/tv-maxe/tv-maxe-0.08.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="Program to view free channels"
+HOMEPAGE="http://code.google.com/p/tv-maxe"
+SRC_URI="http://tv-maxe.googlecode.com/files/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/imaging
+	media-video/mplayer
+	media-video/vlc
+	virtual/ffmpeg
+	dev-python/python-virtkey
+	dev-python/pygtk
+	dev-lang/python
+	media-tv/sopcast-player
+	media-video/rtmpdump
+	dev-python/sqlite3dbm
+	dev-python/gst-python 
+	media-libs/gst-plugins-good 
+	media-plugins/gst-plugins-meta"
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -i "s|python|python2|g" ${S}/${PN}-${PV}/${PN} || die "Cannot sed file"
+}
+
+src_install() {
+	cd "${S}"
+	dodir /usr/share/${PN} || die
+	insinto /usr/share/${PN} || die
+	doins -r "${S}"/${PN}-${PV}/* || die
+	fperms 755 /usr/share/${PN}/${PN} || die "Errors on permission giving"
+	fperms 755 /usr/share/${PN} || die "Errors on permission folder giving"
+	dosym /usr/share/${PN}/${PN} /usr/bin/${PN} || die "Not too many symbolic links"
+	make_desktop_entry tv-maxe TV-maxe \
+		"/usr/share/tv-maxe/tvmaxe_mini.png" \
+		Video
+}
diff --git a/media-video/tv-maxe/tv-maxe-0.09.ebuild b/media-video/tv-maxe/tv-maxe-0.09.ebuild
new file mode 100644
index 00000000..08265748
--- /dev/null
+++ b/media-video/tv-maxe/tv-maxe-0.09.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="Program to view free channels"
+HOMEPAGE="http://code.google.com/p/tv-maxe"
+SRC_URI="http://tv-maxe.googlecode.com/files/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sqlite"
+
+RDEPEND="dev-python/imaging
+	media-video/mplayer2
+	media-video/vlc
+	virtual/ffmpeg
+	dev-python/python-virtkey
+	dev-python/pygtk
+	dev-lang/python[sqlite]
+	media-tv/sp-auth
+	media-video/rtmpdump
+	sqlite? ( dev-python/sqlite3dbm )
+	dev-python/gst-python 
+	media-libs/gst-plugins-good 
+	media-plugins/gst-plugins-meta"
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -i "s|python|python2|g" ${S}/${PN}-${PV}/${PN} || die "Cannot sed file"
+}
+
+src_install() {
+	cd "${S}"
+	dodir /usr/share/${PN} || die
+	insinto /usr/share/${PN} || die
+	doins -r "${S}"/${PN}-${PV}/* || die
+	fperms 755 /usr/share/${PN}/${PN} || die "Errors on permission giving"
+	fperms 755 /usr/share/${PN} || die "Errors on permission folder giving"
+	dosym /usr/share/${PN}/${PN} /usr/bin/${PN} || die "Not too many symbolic links"
+	make_desktop_entry tv-maxe TV-maxe \
+		"/usr/share/tv-maxe/tvmaxe_mini.png" \
+		Video
+}
diff --git a/media-video/tvmaxe-cli/Manifest b/media-video/tvmaxe-cli/Manifest
new file mode 100644
index 00000000..d3144547
--- /dev/null
+++ b/media-video/tvmaxe-cli/Manifest
@@ -0,0 +1,2 @@
+DIST tvmaxe-cli-20120906.tar.gz 3927 RMD160 080df7d83a82d4b8c33386be748172c50153eb32 SHA1 ef73607a77353ec643970d4ea9a4eb6a63ae5846 SHA256 fd4be269b79855065f22ddf29e5bc59332dad95461c8f7c88d1ffaa3effe9f6f
+EBUILD tvmaxe-cli-20120906.ebuild 705 RMD160 f71c0beb06e2b83f924ecc3e3a0fc4a38bcee8fc SHA1 37b8137b5d06ae1ffdcfb5dc6f0e132d87c32777 SHA256 351e0e5eac184a1a2fb09c2a6f04543f34cdcb65a36d9458bb123d44ba10ebf4
diff --git a/media-video/tvmaxe-cli/tvmaxe-cli-20120906.ebuild b/media-video/tvmaxe-cli/tvmaxe-cli-20120906.ebuild
new file mode 100644
index 00000000..18a2ccfd
--- /dev/null
+++ b/media-video/tvmaxe-cli/tvmaxe-cli-20120906.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+DESCRIPTION="CLI version of tv-maxe"
+HOMEPAGE="http://nknwn.github.com/tvmaxe-cli/"
+SRC_URI="dl.dropbox.com/u/5635113/tvmaxe-cli-20120906.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-video/mplayer
+	 net-p2p/sopcast-bin"
+DEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	cd "${S}"
+	dodir /usr/bin/${PN} || die "Error. Could not create directory."
+	insinto /usr/bin/${PN} || die "Error. Could not set install path."
+	doins -r  "${S}"/${PN}-${PV}/* || die " Error. Could not install."
+	fperms 755 /usr/bin/${PN}/${PN} || die "Error. Permissions not set."
+}
diff --git a/media-video/webcamstudio-module/Manifest b/media-video/webcamstudio-module/Manifest
new file mode 100644
index 00000000..9354bb02
--- /dev/null
+++ b/media-video/webcamstudio-module/Manifest
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..4f162f16
--- /dev/null
+++ b/media-video/webcamstudio-module/webcamstudio-module-1.4-r2.ebuild
@@ -0,0 +1,51 @@
+# 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
new file mode 100644
index 00000000..42b505b4
--- /dev/null
+++ b/media-video/webcamstudio-module/webcamstudio-module-1.4-r2.ebuild.save
@@ -0,0 +1,52 @@
+# 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 ""
+}