summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/amdcccle/Manifest21
-rw-r--r--media-video/amdcccle/amdcccle-13.12.ebuild73
-rw-r--r--media-video/amdcccle/amdcccle-14.4.ebuild72
-rw-r--r--media-video/ffmpeg/Manifest3
-rw-r--r--media-video/mkvtoolnix-gui/Manifest4
-rw-r--r--media-video/mkvtoolnix-gui/files/mkvtoolnix-5.8.0-boost-configure.patch63
-rw-r--r--media-video/mkvtoolnix-gui/files/mkvtoolnix-5.8.0-system-pugixml.patch31
-rw-r--r--media-video/mkvtoolnix-gui/mkvtoolnix-gui-5.8.0.ebuild106
-rw-r--r--media-video/mkvtoolnix-gui/mkvtoolnix-gui-6.2.0.ebuild82
-rw-r--r--media-video/mkvtoolnix/Manifest3
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch63
-rw-r--r--media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch31
-rw-r--r--media-video/mkvtoolnix/mkvtoolnix-6.2.0.ebuild89
-rw-r--r--media-video/nvidia-settings/Manifest15
-rw-r--r--media-video/nvidia-settings/nvidia-settings-331.67.ebuild76
-rw-r--r--media-video/nvidia-settings/nvidia-settings-334.21-r3.ebuild76
-rw-r--r--media-video/nvidia-settings/nvidia-settings-337.25.ebuild76
-rw-r--r--media-video/nvidia-settings/nvidia-settings-340.46.ebuild76
-rw-r--r--media-video/nvidia-settings/nvidia-settings-340.58.ebuild76
19 files changed, 1002 insertions, 34 deletions
diff --git a/media-video/amdcccle/Manifest b/media-video/amdcccle/Manifest
index 38dcf63e..6531d911 100644
--- a/media-video/amdcccle/Manifest
+++ b/media-video/amdcccle/Manifest
@@ -1,18 +1,3 @@
-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
+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 xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512 aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35 WHIRLPOOL 69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951
diff --git a/media-video/amdcccle/amdcccle-13.12.ebuild b/media-video/amdcccle/amdcccle-13.12.ebuild
new file mode 100644
index 00000000..6c80e324
--- /dev/null
+++ b/media-video/amdcccle/amdcccle-13.12.ebuild
@@ -0,0 +1,73 @@
+# 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.4.ebuild b/media-video/amdcccle/amdcccle-14.4.ebuild
new file mode 100644
index 00000000..09311a20
--- /dev/null
+++ b/media-video/amdcccle/amdcccle-14.4.ebuild
@@ -0,0 +1,72 @@
+# 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/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index bf20ba29..2cbc1c4a 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,2 +1 @@
-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
+DIST ffmpeg-0.5_p20373.tar.bz2 3087600 SHA256 2a217144c82f11c80f325c653157bd9fc5424dc43a2b2ccbc8eb03a01d33418d
diff --git a/media-video/mkvtoolnix-gui/Manifest b/media-video/mkvtoolnix-gui/Manifest
index d3bb2b67..6ddd5318 100644
--- a/media-video/mkvtoolnix-gui/Manifest
+++ b/media-video/mkvtoolnix-gui/Manifest
@@ -1,2 +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
+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
new file mode 100644
index 00000000..72b94b96
--- /dev/null
+++ b/media-video/mkvtoolnix-gui/files/mkvtoolnix-5.8.0-boost-configure.patch
@@ -0,0 +1,63 @@
+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
new file mode 100644
index 00000000..a3fcf219
--- /dev/null
+++ b/media-video/mkvtoolnix-gui/files/mkvtoolnix-5.8.0-system-pugixml.patch
@@ -0,0 +1,31 @@
+--- 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.8.0.ebuild b/media-video/mkvtoolnix-gui/mkvtoolnix-gui-5.8.0.ebuild
new file mode 100644
index 00000000..ac943069
--- /dev/null
+++ b/media-video/mkvtoolnix-gui/mkvtoolnix-gui-5.8.0.ebuild
@@ -0,0 +1,106 @@
+# 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
new file mode 100644
index 00000000..e35b33e4
--- /dev/null
+++ b/media-video/mkvtoolnix-gui/mkvtoolnix-gui-6.2.0.ebuild
@@ -0,0 +1,82 @@
+# 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
index 8f705b8f..13375e98 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,2 +1 @@
-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
+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
new file mode 100644
index 00000000..72b94b96
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch
@@ -0,0 +1,63 @@
+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
new file mode 100644
index 00000000..a3fcf219
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-system-pugixml.patch
@@ -0,0 +1,31 @@
+--- 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-6.2.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-6.2.0.ebuild
new file mode 100644
index 00000000..1c987801
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-6.2.0.ebuild
@@ -0,0 +1,89 @@
+# 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
index ec1a9d57..0c67710d 100644
--- a/media-video/nvidia-settings/Manifest
+++ b/media-video/nvidia-settings/Manifest
@@ -1,10 +1,5 @@
-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
diff --git a/media-video/nvidia-settings/nvidia-settings-331.67.ebuild b/media-video/nvidia-settings/nvidia-settings-331.67.ebuild
new file mode 100644
index 00000000..fd52276f
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-331.67.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/nvidia-settings/nvidia-settings-334.21-r3.ebuild b/media-video/nvidia-settings/nvidia-settings-334.21-r3.ebuild
new file mode 100644
index 00000000..fd52276f
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-334.21-r3.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/nvidia-settings/nvidia-settings-337.25.ebuild b/media-video/nvidia-settings/nvidia-settings-337.25.ebuild
new file mode 100644
index 00000000..fd52276f
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-337.25.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/nvidia-settings/nvidia-settings-340.46.ebuild b/media-video/nvidia-settings/nvidia-settings-340.46.ebuild
new file mode 100644
index 00000000..fd52276f
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-340.46.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/nvidia-settings/nvidia-settings-340.58.ebuild b/media-video/nvidia-settings/nvidia-settings-340.58.ebuild
new file mode 100644
index 00000000..fd52276f
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-340.58.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
+}