Merge branch 'master' of ssh://git.animux.de/overlay

20 files changed, 540 insertions, 710 deletions

diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest
deleted file mode 100644
index 4d9c49f..0000000
--- a/dev-python/virtualenvwrapper/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX python-3.patch 1027 RMD160 7b640a40ee5ec7b23b72e98bff874ad1e0b4ca89 SHA1 1f2f84a304189f15331489fd84987c665f126bc2 SHA256 3467df56fb064eb59c3aea7a1e01d8d611aac65004d48f7b08188dbf01638484
-DIST virtualenvwrapper-2.3.tar.gz 219201 RMD160 69927244d7834d7b3ac2e6d1a91e56292f5ebdfa SHA1 ac8f414f870b0e8567167a7e43410db546030cb0 SHA256 fdd0fc508bfe9580ef6a6554b17485171240c608a6ad8e3df38e8dfcf68ad0a0
-EBUILD virtualenvwrapper-2.3.ebuild 760 RMD160 e026ceb1941b0ffec0f7fd8d8f0edb6e8f6091a6 SHA1 8337feaaeab9247246a7502510effde56097fcda SHA256 52cf1fc6544788484f8f43980a107a22a243c1199edb88ef4606cc8e80500d41
diff --git a/dev-python/virtualenvwrapper/files/python-3.patch b/dev-python/virtualenvwrapper/files/python-3.patch
deleted file mode 100644
index 1fe8005..0000000
--- a/dev-python/virtualenvwrapper/files/python-3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/virtualenvwrapper/hook_loader.py	Sun Feb 27 09:24:38 2011 -0500
-+++ b/virtualenvwrapper/hook_loader.py	Mon Feb 28 01:05:11 2011 +0000
-@@ -125,7 +125,7 @@
-             continue
-         plugin = ep.load()
-         if options.listing:
--            print '  {0:10} -- {1}'.format(ep.name, inspect.getdoc(plugin) or '')
-+            print('  {0:10} -- {1}'.format(ep.name, inspect.getdoc(plugin) or ''))
-             continue
-         if options.sourcing:
-             # Show the shell commands so they can
---- a/virtualenvwrapper/user_scripts.py	Sun Feb 27 09:24:38 2011 -0500
-+++ b/virtualenvwrapper/user_scripts.py	Mon Feb 28 01:05:11 2011 +0000
-@@ -28,7 +28,9 @@
-         log.debug('running %s', str(cmd))
-         try:
-             return_code = subprocess.call(cmd)
--        except OSError, msg:
-+        except OSError:
-+            import sys
-+            msg = sys.exc_info()[1]
-             log.error('ERROR: Could not run %s. %s', script_path, str(msg))
-         #log.debug('Returned %s', return_code)
-     return
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-2.3.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-2.3.ebuild
deleted file mode 100644
index 0f5fdba..0000000
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
-inherit distutils eutils
-
-DESCRIPTION="Enhancements to virtualenv"
-HOMEPAGE="http://pypi.python.org/pypi/virtualenvwrapper"
-SRC_URI="http://www.doughellmann.com/downloads/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/virtualenv"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	python_copy_sources
-
-	patching() {
-		[[ "${PYTHON_ABI}" != 3.* ]] && return
-		epatch "${FILESDIR}/python-3.patch"
-	}
-	python_execute_function --action-message 'Applying patches with $(python_get_implementation) $(python_get_version)' -s patching
-}
-
diff --git a/games-util/wbfs_file/Manifest b/games-util/wbfs_file/Manifest
new file mode 100644
index 0000000..7146d08
--- /dev/null
+++ b/games-util/wbfs_file/Manifest
@@ -0,0 +1,4 @@
+AUX 64bit_fix.patch 1079 RMD160 90b6221cd765bb229e7b85dd4fab019872111d73 SHA1 5afb50176e10b2704afa4094b321bf6a90a7385c SHA256 e1eeaa04229447eefe44c71decf75a4d88c7423adee4248f06442cb9a9137d1c
+AUX no-openssl.patch 4011 RMD160 0c26944e6f19374dbd6f6e4412402d982f8aa704 SHA1 548163964592b2d21a944e658dd41aa419619f92 SHA256 48a1d37c8598633fe5b93538fe72aeeeee00a430c7ab0dbd8c70f70d998d9983
+DIST wbfs_file_2.9.zip 687419 RMD160 50aac97941e27917ac3ada763eb3b30b5924118e SHA1 e7b0c9ffe577cb920d3b43f2e7f0134d5e5556d9 SHA256 2a3973c907dc35398047dbf748863191514f4d2c64423449729c7d36f1b8b838
+EBUILD wbfs_file-2.9-r2.ebuild 758 RMD160 8d00c5a8bc636699b709c1d88d765f1c3b41f15f SHA1 4f57bf0f6bba8ba3b41f06a9940608661035d970 SHA256 8fcfab5f0b625f6211a5579fdebfdfe19680d17a0f9bd109c4ee5c99084c9e6e
diff --git a/games-util/wbfs_file/files/64bit_fix.patch b/games-util/wbfs_file/files/64bit_fix.patch
new file mode 100644
index 0000000..97d6db2
--- /dev/null
+++ b/games-util/wbfs_file/files/64bit_fix.patch
@@ -0,0 +1,38 @@
+diff -r -u source/libwbfs/rijndael.c wbfs_file_2.9/source/libwbfs/rijndael.c
+--- source/libwbfs/rijndael.c	2009-03-26 18:37:14.000000000 +0100
++++ source/libwbfs/rijndael.c	2012-03-06 22:44:07.000000000 +0100
+@@ -11,10 +11,11 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <stdint.h>
+ 
+ #define u8 unsigned char       /* 8 bits  */
+-#define u32 unsigned long       /* 32 bits */
+-#define u64 unsigned long long
++#define u32 uint32_t       /* 32 bits */
++#define u64 uint64_t
+ 
+ /* rotates x one bit to the left */
+ 
+diff -r -u source/tools.h wbfs_file_2.9_64bit//source/tools.h
+--- source/tools.h	2009-03-18 17:17:38.000000000 +0100
++++ source/tools.h	2012-03-06 22:43:26.000000000 +0100
+@@ -5,11 +5,13 @@
+ #ifndef _TOOLS_H
+ #define _TOOLS_H
+ 
++#include <stdint.h>
++
+ // basic data types
+ typedef unsigned char u8;
+-typedef unsigned short u16;
+-typedef unsigned int u32;
+-typedef unsigned long long u64;
++typedef uint16_t u16;
++typedef uint32_t u32;
++typedef uint64_t u64;
+ 
+ u16 be16(const u8 *p);
+ u32 be32(const u8 *p);
+Only in wbfs_file_2.9_64bit//source: wbfs_file
diff --git a/games-util/wbfs_file/files/no-openssl.patch b/games-util/wbfs_file/files/no-openssl.patch
new file mode 100644
index 0000000..cecbb97
--- /dev/null
+++ b/games-util/wbfs_file/files/no-openssl.patch
@@ -0,0 +1,169 @@
+diff -r -u source/tools.c wbfs_file_2.9_no_openssl//source/tools.c
+--- source/tools.c	2010-01-12 13:52:20.000000000 +0100
++++ wbfs_file_2.9_no_openssl//source/tools.c	2012-03-06 23:14:55.000000000 +0100
+@@ -5,9 +5,6 @@
+ #include "tools.h"
+ 
+ #include <stddef.h>	// to accommodate certain broken versions of openssl
+-#include <openssl/md5.h>
+-#include <openssl/aes.h>
+-#include <openssl/sha.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -61,16 +58,6 @@
+ // crypto
+ //
+ 
+-void md5(u8 *data, u32 len, u8 *hash)
+-{
+-	MD5(data, len, hash);
+-}
+-
+-void sha(u8 *data, u32 len, u8 *hash)
+-{
+-	SHA1(data, len, hash);
+-}
+-
+ void get_key(const char *name, u8 *key, u32 len)
+ {
+ 	char path[256];
+@@ -90,35 +77,6 @@
+ 	fclose(fp);
+ }
+ 
+-void aes_cbc_dec(u8 *key, u8 *iv, u8 *in, u32 len, u8 *out)
+-{
+-	AES_KEY aes_key;
+-
+-	AES_set_decrypt_key(key, 128, &aes_key);
+-	AES_cbc_encrypt(in, out, len, &aes_key, iv, AES_DECRYPT);
+-}
+-
+-void aes_cbc_enc(u8 *key, u8 *iv, u8 *in, u32 len, u8 *out)
+-{
+-	AES_KEY aes_key;
+-
+-	AES_set_encrypt_key(key, 128, &aes_key);
+-	AES_cbc_encrypt(in, out, len, &aes_key, iv, AES_ENCRYPT);
+-}
+-
+-void decrypt_title_key(u8 *tik, u8 *title_key)
+-{
+-	u8 common_key[16];
+-	u8 iv[16];
+-
+-	get_key("common-key", common_key, 16);
+-
+-	memset(iv, 0, sizeof iv);
+-	memcpy(iv, tik + 0x01dc, 8);
+-	aes_cbc_dec(common_key, iv, tik + 0x01bf, 16, title_key);
+-        printf("title key: %02x %02x %02x\n",title_key[0],title_key[1],title_key[2]);
+-}
+-
+ static u8 root_key[0x204];
+ static u8 *get_root_key(void)
+ {
+@@ -166,26 +124,6 @@
+ 	return 0;
+ }
+ 
+-int check_ec(u8 *ng, u8 *ap, u8 *sig, u8 *sig_hash)
+-{
+-	u8 ap_hash[20];
+-	u8 *ng_Q, *ap_R, *ap_S;
+-	u8 *ap_Q, *sig_R, *sig_S;
+-
+-	ng_Q = ng + 0x0108;
+-	ap_R = ap + 0x04;
+-	ap_S = ap + 0x22;
+-
+-	SHA1(ap + 0x80, 0x100, ap_hash);
+-
+-	ap_Q = ap + 0x0108;
+-	sig_R = sig;
+-	sig_S = sig + 30;
+-
+-	return check_ecdsa(ng_Q, ap_R, ap_S, ap_hash)
+-	       && check_ecdsa(ap_Q, sig_R, sig_S, sig_hash);
+-}
+-
+ static int check_rsa(u8 *h, u8 *sig, u8 *key, u32 n)
+ {
+ 	u8 correct[0x200];
+@@ -268,57 +206,6 @@
+ 	return 0;
+ }
+ 
+-int check_cert_chain(u8 *data, u32 data_len, u8 *cert, u32 cert_len)
+-{
+-	u8 *sig;
+-	u8 *sub;
+-	u32 sig_len;
+-	u32 sub_len;
+-	u8 h[20];
+-	u8 *key_cert;
+-	u8 *key;
+-	int ret;
+-	sig = data;
+-	sig_len = get_sig_len(sig);
+-	if (sig_len == 0)
+-		return -1;
+-	sub = data + sig_len;
+-	sub_len = data_len - sig_len;
+-	if (sub_len == 0)
+-		return -2;
+-
+-	for (;;) {
+-                printf(">>>>>> checking sig by %s...\n", sub);
+-                if (strcmp((char*)sub, "Root") == 0) {
+-			key = get_root_key();
+-			sha(sub, sub_len, h);
+-			if (be32(sig) != 0x10000)
+-				return -8;
+-			return check_rsa(h, sig + 4, key, 0x200);
+-		}
+-
+-		key_cert = find_cert_in_chain(sub, cert, cert_len);
+-		if (key_cert == 0)
+-			return -3;
+-
+-		key = key_cert + get_sig_len(key_cert);
+-
+-		sha(sub, sub_len, h);
+-		ret = check_hash(h, sig, key);
+-		if (ret)
+-			return ret;
+-
+-		sig = key_cert;
+-		sig_len = get_sig_len(sig);
+-		if (sig_len == 0)
+-			return -4;
+-		sub = sig + sig_len;
+-		sub_len = get_sub_len(sub);
+-		if (sub_len == 0)
+-			return -5;
+-	}
+-}
+-
+ //
+ // compression
+ //
+diff -r -u source/tools.h wbfs_file_2.9_no_openssl//source/tools.h
+--- source/tools.h	2009-03-18 17:17:38.000000000 +0100
++++ wbfs_file_2.9_no_openssl//source/tools.h	2012-03-06 23:15:03.000000000 +0100
+@@ -32,14 +32,7 @@
+ void bn_exp(u8 *d, u8 *a, u8 *N, u32 n, u8 *e, u32 en);
+ 
+ // crypto
+-void md5(u8 *data, u32 len, u8 *hash);
+-void sha(u8 *data, u32 len, u8 *hash);
+ void get_key(const char *name, u8 *key, u32 len);
+-void aes_cbc_dec(u8 *key, u8 *iv, u8 *in, u32 len, u8 *out);
+-void aes_cbc_enc(u8 *key, u8 *iv, u8 *in, u32 len, u8 *out);
+-void decrypt_title_key(u8 *tik, u8 *title_key);
+-int check_cert_chain(u8 *data, u32 data_len, u8 *cert, u32 cert_len);
+-int check_ec(u8 *ng, u8 *ap, u8 *sig, u8 *sig_hash);
+ void generate_ecdsa(u8 *R, u8 *S, u8 *k, u8 *hash);
+ int check_ecdsa(u8 *Q, u8 *R, u8 *S, u8 *hash);
+ void ec_priv_to_pub(u8 *k, u8 *Q);
diff --git a/games-util/wbfs_file/wbfs_file-2.9-r2.ebuild b/games-util/wbfs_file/wbfs_file-2.9-r2.ebuild
new file mode 100644
index 0000000..bc48d39
--- /dev/null
+++ b/games-util/wbfs_file/wbfs_file-2.9-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="wbfs_file binary for working with wbfs files or partitions"
+HOMEPAGE="http://cfg-loader.googlecode.com"
+LICENSE="GPL-2"
+SLOT="0"
+
+MY_P="${PN}_${PV}"
+SRC_URI="http://cfg-loader.googlecode.com/files/${MY_P}.zip"
+
+KEYWORDS="~x86 ~amd64"
+
+IUSE="-static"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}/source"
+
+src_prepare() {
+	use static || sed -i '/ADD_LF = -static/d' ${S}/Makefile
+	use amd64 && epatch "${FILESDIR}/64bit_fix.patch"
+
+	sed -i 's/-lcrypto//' ${S}/Makefile
+	epatch "${FILESDIR}/no-openssl.patch"
+}
+
+src_install() {
+	dobin wbfs_file
+	dodoc ../readme.txt
+	dodoc ../readme_orig.txt
+}
diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
deleted file mode 100644
index 795f01f..0000000
--- a/media-video/nvidia-settings/ChangeLog
+++ /dev/null
@@ -1,553 +0,0 @@
-# ChangeLog for media-video/nvidia-settings
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/ChangeLog,v 1.99 2011/03/30 08:10:09 nirbheek Exp $
-
-  30 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
-  nvidia-settings-173.14.25.ebuild, nvidia-settings-173.14.27.ebuild,
-  nvidia-settings-185.18.36.ebuild, nvidia-settings-195.36.24.ebuild,
-  nvidia-settings-195.36.31.ebuild, nvidia-settings-256.44.ebuild,
-  nvidia-settings-256.52.ebuild:
-  Fix slot-dep on gtk+
-
-  28 Mar 2011; Gilles Dartiguelongue <eva@gentoo.org>
-  nvidia-settings-260.19.29.ebuild, nvidia-settings-260.19.36.ebuild:
-  Pin gtk+ to slot 2.
-
-*nvidia-settings-260.19.36 (02 Feb 2011)
-
-  02 Feb 2011; Justin Lecher <jlec@gentoo.org>
-  +nvidia-settings-260.19.36.ebuild:
-  non-maintainer: Version Bump
-
-  03 Jan 2011; Christian Faulhammer <fauli@gentoo.org>
-  nvidia-settings-260.19.29.ebuild:
-  stable x86, bug 349816
-
-  24 Dec 2010; Samuli Suominen <ssuominen@gentoo.org>
-  nvidia-settings-260.19.29.ebuild:
-  amd64 stable wrt #348186
-
-*nvidia-settings-260.19.29 (19 Dec 2010)
-
-  19 Dec 2010; Justin Lecher <jlec@gentoo.org>
-  +nvidia-settings-260.19.29.ebuild:
-  Version Bump #339217
-
-  05 Sep 2010; Fabio Erculiani <lxnay@gentoo.org>
-  +nvidia-settings-256.52.ebuild, -nvidia-settings-256.52-r1.ebuild:
-  restore nvidia-settings-256.52 ebuild in broken status
-
-*nvidia-settings-256.52-r1 (05 Sep 2010)
-
-  05 Sep 2010; Fabio Erculiani <lxnay@gentoo.org>
-  -nvidia-settings-256.52.ebuild, +nvidia-settings-256.52-r1.ebuild:
-  fix broken ebuild, it didn't install nvidia-settings executable and icons,
-  used make instead of the wrapper function emake and didn't fix the
-  pre-stripping problem of /usr/bin/nvidia-settings. Bumping revision
-
-  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-settings-256.52.ebuild:
-  Version bump that works with newer x11-drivers/nvidia-drivers that
-  provides its own nvidia-settings app. bug #304255
-
-  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-settings-256.52.ebuild:
-  Did not mean to add this package
-
-*nvidia-settings-195.36.31 (30 Aug 2010)
-*nvidia-settings-173.14.27 (30 Aug 2010)
-*nvidia-settings-173.14.25 (30 Aug 2010)
-
-  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-settings-1.0.20070621.ebuild, -nvidia-settings-173.14.09.ebuild,
-  -nvidia-settings-173.14.12.ebuild, -nvidia-settings-173.14.17.ebuild,
-  +nvidia-settings-173.14.25.ebuild, +nvidia-settings-173.14.27.ebuild,
-  -nvidia-settings-177.80.ebuild, -nvidia-settings-180.22.ebuild,
-  -nvidia-settings-180.27.ebuild, -nvidia-settings-180.29.ebuild,
-  -nvidia-settings-180.37.ebuild, -nvidia-settings-180.44.ebuild,
-  -nvidia-settings-180.51.ebuild, -nvidia-settings-180.60.ebuild,
-  -nvidia-settings-185.18.14.ebuild, -nvidia-settings-185.18.29.ebuild,
-  -nvidia-settings-185.18.31.ebuild, -nvidia-settings-190.18.ebuild,
-  -nvidia-settings-190.25.ebuild, -nvidia-settings-190.32.ebuild,
-  -nvidia-settings-190.36.ebuild, -nvidia-settings-190.40.ebuild,
-  -nvidia-settings-190.42.ebuild, -nvidia-settings-195.30.ebuild,
-  -nvidia-settings-195.36.15.ebuild, +nvidia-settings-195.36.31.ebuild,
-  -nvidia-settings-256.35.ebuild:
-  sync to the versions of x11-drivers/nvidia-drivers we have in the tree.
-
-*nvidia-settings-256.52 (30 Aug 2010)
-
-  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
-  +nvidia-settings-256.52.ebuild:
-  version bump
-
-*nvidia-settings-256.44 (04 Aug 2010)
-
-  04 Aug 2010; Michał Januszewski <spock@gentoo.org>
-  +nvidia-settings-256.44.ebuild:
-  Version bump.
-
-  07 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
-  nvidia-settings-195.36.24.ebuild:
-  x86 stable wrt bug #323639
-
-  26 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
-  nvidia-settings-195.36.24.ebuild:
-  amd64 stable wrt #325513
-
-*nvidia-settings-256.35 (24 Jun 2010)
-
-  24 Jun 2010; Michał Januszewski <spock@gentoo.org>
-  +nvidia-settings-256.35.ebuild:
-  Version bump.
-
-  11 May 2010; <mabi@gentoo.org> nvidia-settings-190.42.ebuild:
-  sync stable version to nvidia-drivers on amd64, with permission from
-  chainsaw
-
-*nvidia-settings-195.36.24 (29 Apr 2010)
-
-  29 Apr 2010; Justin Lecher <jlec@gentoo.org>
-  +nvidia-settings-195.36.24.ebuild:
-  Version Bump, on permission of #315141, requested by wired on IRC
-
-*nvidia-settings-195.36.15 (25 Mar 2010)
-
-  25 Mar 2010; Piotr Jaroszyński <peper@gentoo.org>
-  -nvidia-settings-195.36.03.ebuild, +nvidia-settings-195.36.15.ebuild:
-  Add 195.36.15.
-
-*nvidia-settings-195.36.03 (08 Feb 2010)
-*nvidia-settings-195.30 (08 Feb 2010)
-
-  08 Feb 2010; Michał Januszewski <spock@gentoo.org>
-  +nvidia-settings-195.30.ebuild, +nvidia-settings-195.36.03.ebuild:
-  Version bump.
-
-*nvidia-settings-190.53 (16 Dec 2009)
-
-  16 Dec 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-190.53.ebuild,
-  +files/nvidia-settings-190.53-xf86vidmodeproto.patch:
-  Add 190.53.
-
-  01 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
-  files/nvidia-settings-190.42-xf86vidmodeproto.patch:
-  Update NvCtrlAttributesVidMode patch from bug #291563 by Adrian Ilarion
-  Ciobanu.
-
-  01 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
-  nvidia-settings-190.42.ebuild,
-  +files/nvidia-settings-190.42-xf86vidmodeproto.patch:
-  Missing X11/extensions/xf86vmproto.h include from xf86vidmodeproto to
-  compile with libXxf86vm >= 1.1.0.
-
-*nvidia-settings-185.18.36 (22 Oct 2009)
-
-  22 Oct 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-185.18.36.ebuild:
-  Add 185.18.36.
-
-*nvidia-settings-190.42 (22 Oct 2009)
-
-  22 Oct 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-190.42.ebuild:
-  Add 190.42.
-
-*nvidia-settings-190.40 (17 Oct 2009)
-
-  17 Oct 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-190.40.ebuild:
-  Add 190.40.
-
-*nvidia-settings-190.36 (27 Sep 2009)
-
-  27 Sep 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-190.36.ebuild:
-  Add 190.36.
-
-*nvidia-settings-190.32 (21 Sep 2009)
-
-  21 Sep 2009; Alex Alexander <wired@gentoo.org>
-  +nvidia-settings-190.32.ebuild:
-  version bump, beta 190.32
-
-*nvidia-settings-190.25 (02 Sep 2009)
-
-  02 Sep 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-190.25.ebuild:
-  Add 190.25.
-
-  31 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
-  nvidia-settings-180.60.ebuild:
-  stable x86, bug 280164
-
-  05 Aug 2009; <chainsaw@gentoo.org> nvidia-settings-180.60.ebuild:
-  Marked stable on AMD64 as requested by Víctor "VQuicksilver" Enríquez in
-  bug #280164, arch-tested by same.
-
-*nvidia-settings-185.18.31 (01 Aug 2009)
-
-  01 Aug 2009; Michał Januszewski <spock@gentoo.org>
-  +nvidia-settings-185.18.31.ebuild:
-  Version bump.
-
-*nvidia-settings-190.18 (31 Jul 2009)
-*nvidia-settings-185.18.29 (31 Jul 2009)
-*nvidia-settings-185.18.14 (31 Jul 2009)
-
-  31 Jul 2009; Michał Januszewski <spock@gentoo.org>
-  +nvidia-settings-185.18.14.ebuild, +nvidia-settings-185.18.29.ebuild,
-  +nvidia-settings-190.18.ebuild:
-  Version bump.
-
-  28 Jul 2009; Jeroen Roovers <jer@gentoo.org> metadata.xml:
-  x11-drivers -> x11.
-
-*nvidia-settings-180.60 (03 Jun 2009)
-
-  03 Jun 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-180.60.ebuild:
-  Add 180.60.
-
-  06 May 2009; Markus Meier <maekke@gentoo.org>
-  nvidia-settings-180.29.ebuild:
-  amd64 stable, bug #264373
-
-  02 May 2009; Raúl Porcel <armin76@gentoo.org>
-  nvidia-settings-180.29.ebuild:
-  x86 stable wrt #264373
-
-*nvidia-settings-180.51 (24 Apr 2009)
-
-  24 Apr 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-180.51.ebuild:
-  Add nvidia-settings-180.51.
-
-*nvidia-settings-180.44 (04 Apr 2009)
-
-  04 Apr 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-180.44.ebuild:
-  Add 180.44.
-
-  18 Mar 2009; <ricmm@gentoo.org> nvidia-settings-173.14.12.ebuild,
-  nvidia-settings-177.80.ebuild, nvidia-settings-180.22.ebuild,
-  nvidia-settings-180.27.ebuild, nvidia-settings-180.37.ebuild:
-  Added -fPIC flag for libXNVCtrl. Bug #246364
-
-*nvidia-settings-173.14.17 (18 Mar 2009)
-
-  18 Mar 2009; <ricmm@gentoo.org> +nvidia-settings-173.14.17.ebuild:
-  Version bump.
-
-*nvidia-settings-180.29 (18 Mar 2009)
-
-  18 Mar 2009; <ricmm@gentoo.org> +nvidia-settings-180.29.ebuild:
-  Version bump.
-
-*nvidia-settings-180.37 (10 Mar 2009)
-
-  10 Mar 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-180.37.ebuild:
-  Add 180.37.
-
-  03 Mar 2009; Doug Goldstein <cardoe@gentoo.org>
-  nvidia-settings-177.80.ebuild:
-  newer stable version to match stable version of nvidia-drivers. Thanks to
-  <daniel.pielmeier@googlemail.com> for pointing out the issue.
-
-  03 Mar 2009; Doug Goldstein <cardoe@gentoo.org>
-  -nvidia-settings-169.04.ebuild, -nvidia-settings-169.07.ebuild,
-  -nvidia-settings-171.05.ebuild, -nvidia-settings-173.08.ebuild,
-  -nvidia-settings-177.13.ebuild, -nvidia-settings-177.67.ebuild,
-  -nvidia-settings-177.68.ebuild, -nvidia-settings-177.70.ebuild:
-  remove nvidia-settings for versions of nvidia-drivers that are no longer
-  in the tree
-
-*nvidia-settings-180.27 (08 Feb 2009)
-
-  08 Feb 2009; <ricmm@gentoo.org> +nvidia-settings-180.27.ebuild:
-  Version bump.
-
-*nvidia-settings-180.22 (21 Jan 2009)
-
-  21 Jan 2009; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-180.22.ebuild:
-  Add 180.22.
-
-*nvidia-settings-177.80 (13 Oct 2008)
-
-  13 Oct 2008; Ricardo Mendoza <ricmm@gentoo.org>
-  +nvidia-settings-177.80.ebuild:
-  Version bump per #238969
-
-*nvidia-settings-177.70 (28 Aug 2008)
-
-  28 Aug 2008; Ricardo Mendoza <ricmm@gentoo.org>
-  +nvidia-settings-177.70.ebuild:
-  Version bump
-
-*nvidia-settings-177.68 (27 Aug 2008)
-
-  27 Aug 2008; Ricardo Mendoza <ricmm@gentoo.org>
-  +nvidia-settings-177.68.ebuild:
-  Added corresponding ebuild to latest beta package
-
-*nvidia-settings-177.67 (22 Aug 2008)
-*nvidia-settings-177.13 (22 Aug 2008)
-*nvidia-settings-173.14.12 (22 Aug 2008)
-
-  22 Aug 2008; Ricardo Mendoza <ricmm@gentoo.org>
-  +nvidia-settings-173.14.12.ebuild, +nvidia-settings-177.13.ebuild,
-  +nvidia-settings-177.67.ebuild:
-  Version bumps. Added corresponding ebuilds for beta branch
-
-*nvidia-settings-173.14.09 (29 Jun 2008)
-
-  29 Jun 2008; Piotr Jaroszyński <peper@gentoo.org>
-  nvidia-settings-1.0.20070621.ebuild, nvidia-settings-169.04.ebuild,
-  nvidia-settings-169.07.ebuild, nvidia-settings-171.05.ebuild,
-  nvidia-settings-173.08.ebuild, +nvidia-settings-173.14.09.ebuild:
-  Add 173.14.09 and missing x11-proto/xf86vidmodeproto dep.
-
-*nvidia-settings-173.08 (26 May 2008)
-
-  26 May 2008; <chainsaw@gentoo.org> +nvidia-settings-173.08.ebuild:
-  Version bump. Upstream no longer uses imake, simplify ebuild accordingly.
-
-*nvidia-settings-171.05 (31 Mar 2008)
-
-  31 Mar 2008; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-171.05.ebuild:
-  Add 171.05.
-
-  06 Mar 2008; Olivier Crête <tester@gentoo.org> nvidia-settings-169.07.ebuild:
-  Stable on amd64, bug #212536
-
-  06 Mar 2008; Raúl Porcel <armin76@gentoo.org>
-  nvidia-settings-169.07.ebuild:
-  x86 stable wrt #212536
-
-*nvidia-settings-169.07 (25 Dec 2007)
-
-  25 Dec 2007; Piotr Jaroszyński <peper@gentoo.org>
-  +nvidia-settings-169.07.ebuild:
-  Add 169.07.
-
-  20 Nov 2007; Piotr Jaroszyński <peper@gentoo.org>
-  -nvidia-settings-1.0.20051122-r3.ebuild,
-  -nvidia-settings-1.0.20061102.ebuild,
-  -nvidia-settings-1.0.20070302.ebuild:
-  Remove old versions.
-
-*nvidia-settings-169.04 (20 Nov 2007)
-
-  20 Nov 2007; Piotr Jaroszyński <peper@gentoo.org>
-  +files/nvidia-settings-169.04-no-display.patch,
-  +nvidia-settings-169.04.ebuild:
-  Add 169.04 with a patch allowing to run nvidia-setting without $DISPLAY.
-  Thanks to Tommy Yu <a_korner@hotmail.com> in bug #94240.
-
-  12 Nov 2007; Peter Weller <welp@gentoo.org>
-  nvidia-settings-1.0.20070621.ebuild:
-  Stable on amd64
-
-  12 Nov 2007; Raúl Porcel <armin76@gentoo.org>
-  nvidia-settings-1.0.20070621.ebuild:
-  x86 stable
-
-  10 Aug 2007; Steve Dibb <beandog@gentoo.org>
-  nvidia-settings-1.0.20070302.ebuild:
-  amd64 stable, bug 182703
-
-  01 Aug 2007; Raúl Porcel <armin76@gentoo.org>
-  nvidia-settings-1.0.20070302.ebuild:
-  x86 stable wrt #182703
-
-*nvidia-settings-1.0.20070621 (31 Jul 2007)
-
-  31 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
-  nvidia-settings-1.0.20051122-r3.ebuild,
-  nvidia-settings-1.0.20061102.ebuild, nvidia-settings-1.0.20070302.ebuild,
-  +nvidia-settings-1.0.20070621.ebuild:
-  Add 1.0.20070621 and remove nvidia-legacy-drivers from deps.
-
-  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
-  nvidia-settings-1.0.20051122-r3.ebuild:
-  Drop virtual/x11 references.
-
-  13 Apr 2007; Peter Weller <welp@gentoo.org>
-  nvidia-settings-1.0.20070302.ebuild:
-  Keyworded ~x86-fbsd
-
-*nvidia-settings-1.0.20070302 (07 Mar 2007)
-
-  07 Mar 2007; Piotr Jaroszyński <peper@gentoo.org> metadata.xml,
-  nvidia-settings-1.0.20051122-r3.ebuild,
-  -nvidia-settings-1.0.20060516-r1.ebuild,
-  -nvidia-settings-1.0.20060919.ebuild, nvidia-settings-1.0.20061102.ebuild,
-  +nvidia-settings-1.0.20070302.ebuild:
-  Version bump and a little clean up.
-
-*nvidia-settings-1.0.20061102 (10 Nov 2006)
-
-  10 Nov 2006; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-settings-1.0.20061102.ebuild:
-  Added new version of nvidia-settings.  Bug #154402.  This should be marked
-  stable once nvidia-drivers-1.0.9629 is marked stable.
-
-  30 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-settings-1.0.20051122-r3.ebuild,
-  nvidia-settings-1.0.20060516-r1.ebuild,
-  nvidia-settings-1.0.20060919.ebuild:
-  Added pkgconfig to DEPEND and closing bug #153076.
-
-*nvidia-settings-1.0.20060919 (06 Oct 2006)
-
-  06 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  +nvidia-settings-1.0.20060919.ebuild:
-  Version bump to the new nvidia-settings for bug #148860. This is still
-  masked because there are reports that it requires the masked BETA
-  nvidia-drivers to function properly.
-
-  05 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-settings-1.0.20051122-r3.ebuild,
-  nvidia-settings-1.0.20060516-r1.ebuild:
-  Removing references to media-video/nvidia-glx since it is no longer in the
-  tree.
-
-  04 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  nvidia-settings-1.0.20051122-r3.ebuild,
-  nvidia-settings-1.0.20060516-r1.ebuild:
-  Added x11-libs/libXv to DEPEND for bug #141064.
-
-  07 Jul 2006; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-settings-1.0.20051122-r3.ebuild:
-  Fix DEPEND for new nvidia stuff.  Stable x86.
-
-*nvidia-settings-1.0.20060516-r1 (07 Jul 2006)
-
-  07 Jul 2006; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-settings-1.0.20060516-r1.ebuild:
-  Added rdepend for new nvidia-drivers or nvidia-legacy-drivers.  Bug 139500.
-
-  30 Jun 2006; Olivier Crête <tester@gentoo.org> -files/libXNVCtrl.a,
-  nvidia-settings-1.0.6111.ebuild, nvidia-settings-1.0.6629.ebuild:
-  Moved libXNVCtrl.a to my devspace
-
-*nvidia-settings-1.0.20060516 (27 Jun 2006)
-
-  27 Jun 2006; Martin Schlemmer <azarah@gentoo.org>
-  +nvidia-settings-1.0.20060516.ebuild:
-  New release.
-
-  19 Apr 2006; Kristopher Kersey <augustus@gentoo.org>
-  nvidia-settings-1.0.20051122-r3.ebuild:
-  Marking nvidia-settings-1.0.20051122-r3 stable for amd64 to match stable
-  nvidia-kernel and nvidia-glx.  Should fix bug #129404.
-
-  17 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
-  nvidia-settings-1.0.20051122-r3.ebuild:
-  Accept nvidia-freebsd in alternative to nvidia-kernel package.
-
-  03 Feb 2006; Simon Stelling <blubb@gentoo.org> +files/libXNVCtrl.a,
-  -files/libXNVCtrl.a.bz2, nvidia-settings-1.0.6111.ebuild,
-  nvidia-settings-1.0.6629.ebuild:
-  no need to bzip smallish files
-
-*nvidia-settings-1.0.20051122-r3 (19 Jan 2006)
-
-  19 Jan 2006; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-settings-1.0.20051122-r3.ebuild:
-  Added modular X support.  Bug #114603.
-
-*nvidia-settings-1.0.20051122-r2 (07 Dec 2005)
-
-  07 Dec 2005; Martin Schlemmer <azarah@gentoo.org>
-  +files/icon/nvidia-settings.desktop, +files/icon/nvidia-settings.png,
-  +nvidia-settings-1.0.20051122-r2.ebuild:
-  Do not install manpage into datadir.  Add desktop entry and icon.
-  Resolves bug #114720, thanks to Peter Hyman <pete4abw@comcast.net>.
-
-*nvidia-settings-1.0.20051122-r1 (07 Dec 2005)
-
-  07 Dec 2005; Martin Schlemmer <azarah@gentoo.org>
-  +nvidia-settings-1.0.20051122-r1.ebuild:
-  Add manpage.
-
-*nvidia-settings-1.0.20051122 (05 Dec 2005)
-
-  05 Dec 2005; Martin Schlemmer <azarah@gentoo.org>
-  +nvidia-settings-1.0.20051122.ebuild:
-  New release.
-
-*nvidia-settings-1.0.20050729 (24 Aug 2005)
-
-  24 Aug 2005; Martin Schlemmer <azarah@gentoo.org>
-  +nvidia-settings-1.0.20050729.ebuild:
-  Update version.
-
-*nvidia-settings-1.0.20050525 (21 Jun 2005)
-
-  21 Jun 2005; Martin Schlemmer <azarah@gentoo.org>
-  +nvidia-settings-1.0.20050525.ebuild:
-  Update version. Change version scheme to make updates easier. Include NVCtrl
-  lib and headers, bug #80427.
-
-  12 Jun 2005; Sven Wegener <swegener@gentoo.org>
-  nvidia-settings-1.0.6111.ebuild, nvidia-settings-1.0.6629.ebuild,
-  nvidia-settings-1.0.7167.ebuild:
-  Removed * postfix from <, <=, >= and > dependencies.
-
-  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
-  Update maintainer to x11-drivers.
-
-*nvidia-settings-1.0.7167 (12 Mar 2005)
-
-  12 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
-  +nvidia-settings-1.0.7167.ebuild:
-  Update to latest version, thanks Zander. Fixup libXNVCtrl.a build, so that
-  it is done native (no need for tarball on 64bit machines, etc).
-
-  17 Jan 2005; Andrew Bevitt <cyfred@gentoo.org>
-  nvidia-settings-1.0.6629.ebuild:
-  Marking 6629 stable across archs
-
-*nvidia-settings-1.0.6629 (07 Nov 2004)
-
-  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
-  nvidia-settings-1.0.6106.ebuild, nvidia-settings-1.0.6111.ebuild,
-  +nvidia-settings-1.0.6629.ebuild:
-  Changes to reflect new nvidia drivers
-
-  17 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; :
-  Fixing digests
-
-*nvidia-settings-1.0.6106 (16 Aug 2004)
-
-  16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  +nvidia-settings-1.0.6106.ebuild, -nvidia-settings-1.0.ebuild:
-  Moving versions to match nvidia module versions
-
-*nvidia-settings-1.0.6111 (06 Aug 2004)
-
-  06 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  +nvidia-settings-1.0.6111.ebuild:
-  Manually mirroring nvidia-settings for the new 6111 driver as nvidia didnt do
-  a version change.
-
-  26 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; nvidia-settings-1.0.ebuild:
-  Depending on the 6106 drivers and closing bug 57449
-
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  nvidia-settings-1.0.ebuild:
-  virtual/glibc -> virtual/libc
-
-*nvidia-settings-1.0 (02 Jul 2004)
-
-  02 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; +metadata.xml,
-  +files/libXNVCtrl.a.bz2, +nvidia-settings-1.0.ebuild:
-  New Package nvidia-settings. Introduced to conincide with
-  nvidia-kernel-1.0.6106 which it was released with. Thanks to people on bug
-  #55714 (wolf especially for making the initial ebuild).
-
diff --git a/media-video/nvidia-settings/Manifest b/media-video/nvidia-settings/Manifest
deleted file mode 100644
index c0a3c1f..0000000
--- a/media-video/nvidia-settings/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX icon/nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168
-AUX icon/nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 SHA1 ff485bf300c6e0c56b3d1f08ee87e4d9a425db65 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12
-DIST nvidia-settings-260.19.36.tar.bz2 1536035 RMD160 ea21ff3e3744ea8f774f62bada13dbde7cb4a51e SHA1 762f6bde65483c13f504e8f7dc1e92353be4f663 SHA256 61d7cf54473725da528a9ee0d4ab3b29c38da45c4ae4e9549be014b9939a1c9f
-EBUILD nvidia-settings-260.19.36.ebuild 2159 RMD160 26007698fe508271463cf8d1ec99f6fc1cfae856 SHA1 17197dc36e29a71590ce12d7d65fab8b9029af5d SHA256 9aef6ee17cd01bdb332d95415496e7c9653f2c481114088e2dca2f79c0db855f
-MISC ChangeLog 18766 RMD160 c15c8bf72eba8c511147d0afabe531de047b2fde SHA1 5a44ef31ceab56e1ba4b8cc013e1c2ff676e5a1d SHA256 ad51bf6ec3d9dd6463457bf9cf467ae22178c7c7c07d870520399e39119af711
-MISC metadata.xml 241 RMD160 dbd39e15096a9c09432225b4dee87bcadcb33907 SHA1 1beb1a93e4526085c26b282271027ad508b29059 SHA256 950a704ea9fcebef2e688e8bd6e0f0d292c967e246d58e4778b9955b1d615ab4
diff --git a/media-video/nvidia-settings/files/icon/nvidia-settings.desktop b/media-video/nvidia-settings/files/icon/nvidia-settings.desktop
deleted file mode 100644
index 65f2fd5..0000000
--- a/media-video/nvidia-settings/files/icon/nvidia-settings.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=NVIDIA X Server Settings
-Comment=Configure NVIDIA X Server Settings
-Exec=nvidia-settings
-Icon=nvidia-settings
-Categories=Application;System;
diff --git a/media-video/nvidia-settings/files/icon/nvidia-settings.png b/media-video/nvidia-settings/files/icon/nvidia-settings.png
deleted file mode 100644
index 361c200..0000000
--- a/media-video/nvidia-settings/files/icon/nvidia-settings.png
+++ /dev/null
diff --git a/media-video/nvidia-settings/nvidia-settings-260.19.36.ebuild b/media-video/nvidia-settings/nvidia-settings-260.19.36.ebuild
deleted file mode 100644
index 6170aff..0000000
--- a/media-video/nvidia-settings/nvidia-settings-260.19.36.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-settings/nvidia-settings-260.19.36.ebuild,v 1.2 2011/03/28 22:41:35 eva 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="examples"
-
-# 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
-	dev-util/pkgconfig
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-libs/libXv
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-base/xorg-server
-	x11-libs/libXt
-	x11-drivers/nvidia-drivers"
-
-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"
-
-	cd "${S}"
-	if use examples; then
-		emake -C samples clean || die "emake clean samples failed"
-		emake -C samples/ || die "emake samples failed"
-	fi
-}
-
-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 "${FILESDIR}/icon/${PN}.png"
-	#domenu "${FILESDIR}/icon/${PN}.desktop"
-
-	# Now install documentation
-	dodoc doc/*.txt
-
-	if use examples; then
-		for i in $(find samples/* -executable); do
-			dobin $i
-		done;
-	fi
-}
diff --git a/www-apps/davical/ChangeLog b/www-apps/davical/ChangeLog
new file mode 100644
index 0000000..3928720
--- /dev/null
+++ b/www-apps/davical/ChangeLog
@@ -0,0 +1,130 @@
+# ChangeLog for www-apps/davical
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  22 Jan 2012; Mike Gilbert <floppym@gentoo.org> davical-1.0.2.ebuild:
+  www-apps/davical: rm || die
+
+  16 Jan 2012; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.9.7.ebuild, +davical-1.0.2.ebuild, files/awl_location.patch,
+  +files/inc_path.patch, files/postinstall-en.txt, files/vhost-example:
+  New version of davical
+
+  05 Nov 2011; Sven Schwyn (svoop) <gentoo@bitcetera.com>
+  -davical-0.9.9.6.ebuild, +davical-0.9.9.7.ebuild:
+  Version bump for davical
+
+  05 Oct 2011; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.9.4.ebuild, -files/postinstall-en-0.9.9.4.txt,
+  +davical-0.9.9.6.ebuild, +files/awl_location.patch,
+  +files/postinstall-en.txt:
+  New version of davical
+
+  14 Jan 2011; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.9.3.ebuild, -files/postinstall-en-0.9.9.3.txt,
+  +davical-0.9.9.4.ebuild, +files/postinstall-en-0.9.9.4.txt:
+  New version of davical
+
+  05 Nov 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.9.ebuild, +davical-0.9.9.3.ebuild,
+  +files/postinstall-en-0.9.9.3.txt, -files/postinstall-en-0.9.9.txt:
+  New version of davical
+
+  03 Nov 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  davical-0.9.9.ebuild:
+  Dropped the pcre use for >=php-5.3 as done for awl by Michael Weber (xmw)
+  (See bug #342597 - Thanks to Sven Schwyn (svoop) <svoop@delirium.ch>
+  reporting this on bug #343691)
+
+  21 Apr 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.8.4-r1.ebuild, -files/postinstall-en-0.9.8.4.txt,
+  +davical-0.9.9.ebuild, +files/postinstall-en-0.9.9.txt, -files/rscds.conf,
+  +files/vhost-example:
+  New version for davical New installation layout. (Thanks to Aurelien Requiem
+  <aurelien@menfin.net>
+
+  12 Apr 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.8.4.ebuild, +davical-0.9.8.4-r1.ebuild:
+  Source archive modified by upstream
+
+  12 Mar 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.8.3.ebuild, -files/postinstall-en-0.9.8.3.txt,
+  +davical-0.9.8.4.ebuild, +files/postinstall-en-0.9.8.4.txt:
+  New version for davical
+
+  27 Feb 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  davical-0.9.8.3.ebuild:
+  drop unnecessary pkg_setup
+
+  26 Feb 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.8.1.ebuild, -files/postinstall-en-0.9.8.1.txt,
+  +davical-0.9.8.3.ebuild, +files/postinstall-en-0.9.8.3.txt:
+  New version for davical
+
+  11 Feb 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.8.ebuild, +davical-0.9.8.1.ebuild,
+  +files/postinstall-en-0.9.8.1.txt, -files/postinstall-en-0.9.8.txt:
+  New version for davical
+
+  07 Jan 2010; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.7.6.ebuild, -files/postinstall-en-0.9.7.6.txt,
+  +davical-0.9.8.ebuild, +files/postinstall-en-0.9.8.txt:
+  Version bump, now depends on php with pdo
+
+  28 Oct 2009; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.7.4.ebuild, -files/postinstall-en-0.9.7.4.txt,
+  +davical-0.9.7.6.ebuild, +files/postinstall-en-0.9.7.6.txt:
+  version bump
+
+  12 Oct 2009; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.7.2.ebuild, -files/postinstall-en-0.9.7.2.txt,
+  +davical-0.9.7.4.ebuild, +files/postinstall-en-0.9.7.4.txt:
+  New version for davical
+
+  17 Sep 2009; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.7.1.ebuild, -files/postinstall-en-0.9.7.1.txt,
+  +davical-0.9.7.2.ebuild, +files/postinstall-en-0.9.7.2.txt:
+  New version
+
+  03 Sep 2009; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.7.ebuild, +davical-0.9.7.1.ebuild,
+  +files/postinstall-en-0.9.7.1.txt, -files/postinstall-en-0.9.7.txt:
+  Version bump for davical
+
+  01 Jul 2009; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.6.3.ebuild, -files/postinstall-en-0.9.6.3.txt,
+  +davical-0.9.7.ebuild, +files/postinstall-en-0.9.7.txt:
+  New version for davical
+
+  22 Apr 2009; Christian Ruppert <idl0r@gentoo.org> davical-0.9.6.3.ebuild:
+  Removed unused inherits, added missing die statements.
+
+  22 Apr 2009; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.6.2.ebuild, -files/postinstall-en-0.9.6.2.txt,
+  +davical-0.9.6.3.ebuild, +files/postinstall-en-0.9.6.3.txt:
+  Version bump to 0.9.6.3
+
+  16 Mar 2009; Nick Fortino (nfortino) <nfortino@gmail.com>
+  davical-0.9.6.2.ebuild:
+  Update ebuild to use EAPI 2. Thanks to Cristian Ruppert and Thomas Sachau
+  for review
+
+  24 Nov 2008; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.6.1.ebuild, -files/postinstall-en-0.9.6.1.txt,
+  +davical-0.9.6.2.ebuild, +files/postinstall-en-0.9.6.2.txt:
+  New version for davical - Better ical calendar support
+
+  05 Nov 2008; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.5.2.ebuild, -files/postinstall-en-0.9.5.txt,
+  +davical-0.9.6.1.ebuild, +files/postinstall-en-0.9.6.1.txt:
+  New version
+
+  16 Sep 2008; lebarjack <francois.perichon@univ-lille2.fr>
+  -davical-0.9.5.ebuild, +davical-0.9.5.2.ebuild, -files/driver_ldap.patch:
+  New version for davical (Ex-rscds)
+
+  23 Jun 2008; lebarjack <francois.perichon@univ-lille2.fr>
+  +davical-0.9.5.ebuild, +files/postinstall-en-0.9.5.txt,
+  +files/driver_ldap.patch, +files/rscds.conf, +metadata.xml:
+  New ebuild for bug 195118 - (initial work by Cory Coager <ccoager@gmail.com>)
+
diff --git a/www-apps/davical/Manifest b/www-apps/davical/Manifest
new file mode 100644
index 0000000..ab621c9
--- /dev/null
+++ b/www-apps/davical/Manifest
@@ -0,0 +1,8 @@
+AUX awl_location.patch 1156 RMD160 1f1e81043fe66de8a0dbe5b67010c0aef018e4a5 SHA1 81cc1dc55ab866103f2eaf5e56060a007d4ef634 SHA256 67a0bc37c10a2468919e647953766b8121009c0f3d0eb17c08580987300a0219
+AUX inc_path.patch 1065 RMD160 eaf82caeebc53c4821762b6a81dc347e5d079980 SHA1 36f233e88d20a363df96125ce9c9c0b63a1b74b1 SHA256 cb27a236e33612b5172af659b93c28151e4ee796766c4e79f3ecd4e82dd2a134
+AUX postinstall-en.txt 730 RMD160 a39674de7cefa276aab4d02945b63216cf62a8d9 SHA1 77edb005c8576d681218e4fa471f7492feaafb31 SHA256 a8796e92aace5307fa6911a3019cd2f1f4baefb5bd4b90efedda5793967ceed1
+AUX vhost-example 366 RMD160 aa9831be71c50e608b09c0f9a92ad30c52fc18ba SHA1 2b79bdcbd5d995f6014b86eaceab24418296e5d6 SHA256 3d1609ff3652814c00aeb33effdfca48a60698b8b5da4db7f97951807235b333
+DIST davical-1.0.2.tar.gz 2739740 RMD160 d24ccc16363f30789ec3c0b384f99999405fee7d SHA1 5d8b87018411d6f3995809d959450dd7522a149c SHA256 12633dfc22aeaef9807e347d2c8798f2a3af4b9dd712a8bb736511915b3b9da6
+EBUILD davical-1.0.2-r1.ebuild 1815 RMD160 289a768d9a8791dfdf6628e37914d68911b7d854 SHA1 5042102d5d473fb5940463e5b052d953d67f70f2 SHA256 31bb449ca660d0fc10f0c5b26112c6da4a2b7e41f7d2a8b8c9ff5e004911d153
+MISC ChangeLog 5386 RMD160 14e97b6cc2db4c0898747f852e8c636b85fe6923 SHA1 2464554f7580a104c3050cae537dde1e62348371 SHA256 d3eb5df1516b2cb33089fdec6a8e25ed4efec25026bd706493c6a98d68e5d6eb
+MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
diff --git a/www-apps/davical/davical-1.0.2-r1.ebuild b/www-apps/davical/davical-1.0.2-r1.ebuild
new file mode 100644
index 0000000..5525ef0
--- /dev/null
+++ b/www-apps/davical/davical-1.0.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit depend.php webapp
+
+DESCRIPTION="A CalDAV and CardDAV Server"
+HOMEPAGE="http://davical.org/"
+SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( dev-php/PEAR-PhpDocumentor )"
+RDEPEND="app-admin/pwgen
+	dev-lang/php[pdo,postgres,xml]
+	dev-perl/DBI
+	dev-perl/DBD-Pg
+	dev-perl/yaml
+	>=dev-php/awl-0.51
+	www-servers/apache"
+
+need_php5
+need_httpd
+
+src_prepare() {
+	epatch "${FILESDIR}/awl_location.patch"
+	epatch "${FILESDIR}/inc_path.patch"
+}
+
+src_compile() {
+	if use doc ; then
+		einfo "Generating documentation"
+		phpdoc -q -c "docs/api/phpdoc.ini"\
+			|| die "Documentation failed to build"
+	fi
+	emake built-po || die "emake failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc-php INSTALL README debian/README.Debian \
+		testing/README.regression_tests TODO debian/changelog \
+		|| die "dodoc failed"
+
+	einfo "Installing web files"
+	insinto "${MY_HTDOCSDIR}"
+	doins -r htdocs/* htdocs/.htaccess || die "doins failed"
+
+	einfo "Installing main files and i18n"
+	insinto "${MY_HOSTROOTDIR}/${PN}"
+	doins -r inc locale || die "doins failed"
+	rm "${D}/${MY_HOSTROOTDIR}/${PN}/inc/always.php.in" || die
+
+	einfo "Installing sql files"
+	insinto "${MY_SQLSCRIPTSDIR}"
+	doins -r dba/* || die "doins failed"
+
+	if use doc ; then
+		einfo "Installing documentation"
+		dohtml -r docs/api/ docs/website/ || die "dohtml failed"
+	fi
+
+	insinto /etc/${PN}
+	doins config/* "${FILESDIR}/vhost-example" \
+		|| die "newins failed"
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
+	webapp_src_install
+
+	fperms +x "${MY_SQLSCRIPTSDIR}/create-database.sh"
+	fperms +x "${MY_SQLSCRIPTSDIR}/update-davical-database"
+}
diff --git a/www-apps/davical/files/awl_location.patch b/www-apps/davical/files/awl_location.patch
new file mode 100644
index 0000000..7eee3d8
--- /dev/null
+++ b/www-apps/davical/files/awl_location.patch
@@ -0,0 +1,21 @@
+--- scripts/po/rebuild-translations.sh.orig	2011-09-29 21:23:48.122625252 +0200
++++ scripts/po/rebuild-translations.sh	2011-09-29 21:49:55.642929743 +0200
+@@ -10,7 +10,7 @@
+ PODIR="po"
+ LOCALEDIR="locale"
+ APPLICATION="davical"
+-AWL_LOCATION="../awl"
++AWL_LOCATION="/usr/share/php/awl/inc"
+ 
+ if [ ! -d "${AWL_LOCATION}" ]; then
+   AWL_LOCATION="`find .. -type d -name 'awl-*.*'`"
+@@ -25,7 +25,8 @@
+ 
+ egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1
+ sed "s:../awl:${AWL_LOCATION}:" ${PODIR}/pofilelist.txt >> ${PODIR}/pofilelist.tmp1
+-sort ${PODIR}/pofilelist.tmp1 | uniq > ${PODIR}/pofilelist.tmp
++sed "s:/awl/inc/:/awl/:" ${PODIR}/pofilelist.tmp1 >> ${PODIR}/pofilelist.tmp2
++sort ${PODIR}/pofilelist.tmp2 | uniq > ${PODIR}/pofilelist.tmp
+ xgettext --no-location --add-comments=Translators --keyword=translate --keyword=i18n --output=${PODIR}/messages.tmp -s -f ${PODIR}/pofilelist.tmp
+ sed 's.^"Content-Type: text/plain; charset=CHARSET\\n"."Content-Type: text/plain; charset=UTF-8\\n".' ${PODIR}/messages.tmp > ${PODIR}/messages.pot
+ rm ${PODIR}/messages.tmp ${PODIR}/pofilelist.tmp ${PODIR}/pofilelist.tmp1
diff --git a/www-apps/davical/files/inc_path.patch b/www-apps/davical/files/inc_path.patch
new file mode 100644
index 0000000..bc646f1
--- /dev/null
+++ b/www-apps/davical/files/inc_path.patch
@@ -0,0 +1,20 @@
+--- htdocs/always.php.orig	2012-01-05 21:28:16.382878446 +0100
++++ htdocs/always.php	2012-01-05 21:30:06.828431957 +0100
+@@ -48,7 +48,7 @@
+ // $c->default_locale = array('es_MX', 'es_AR', 'es', 'pt');  // An array of locales to try, or just a single locale
+ // $c->local_tzid = 'Pacific/Auckland';  // Perhaps we should read from /etc/timezone - I wonder how standard that is?
+ $c->default_locale = 'en';
+-$c->locale_path = '../locale';
++$c->locale_path = '../../davical/locale';
+ $c->base_url = preg_replace('#/[^/]+\.php.*$#', '', $_SERVER['SCRIPT_NAME']);
+ $c->base_directory = preg_replace('#/[^/]*$#', '', $_SERVER['DOCUMENT_ROOT']);
+ $c->default_privileges = array('read-free-busy', 'schedule-deliver');
+@@ -95,7 +96,7 @@
+ }
+ 
+ // Ensure that ../inc is in our included paths as early as possible
+-set_include_path( '../inc'. PATH_SEPARATOR. get_include_path());
++set_include_path( '../../davical/inc'. PATH_SEPARATOR. get_include_path());
+ 
+ 
+ /** We actually discovered this and worked around it earlier, but we can't log it until the utilties are loaded */
diff --git a/www-apps/davical/files/postinstall-en.txt b/www-apps/davical/files/postinstall-en.txt
new file mode 100644
index 0000000..5a88a2b
--- /dev/null
+++ b/www-apps/davical/files/postinstall-en.txt
@@ -0,0 +1,18 @@
+You will need access to postgresql database to use davical.
+
+Read /usr/share/doc/www-apps/davical-${PVR}/INSTALL.gz for installation
+instructions.
+Release notes are available at
+http://wiki.davical.org/w/Release_Notes/${PVR}.
+Full documentation and wiki on http://davical.org
+
+If you are upgrading from a previous version of davical, don't forget to
+upgrade the database structure with
+	cd /usr/share/webapps/davical/${PVR}/sqlscripts/
+	./update-davical-database -dbuser xxxxxxx -appuser xxxxxx
+
+You can safely ignore any message about missing time_zone table.
+
+If you are upgrading from a version <= 0.9.8.4 please note inc/ and locale/
+have been moved away from the htdocs directory and placed into hostroot for
+safety reasons.
diff --git a/www-apps/davical/files/vhost-example b/www-apps/davical/files/vhost-example
new file mode 100644
index 0000000..d6f0da2
--- /dev/null
+++ b/www-apps/davical/files/vhost-example
@@ -0,0 +1,16 @@
+<VirtualHost 123.4.56.78 >
+	ServerName davical.example.net
+
+	DocumentRoot /var/www/myvhost/htdocs
+
+	<Directory /var/www/myvhost/htdocs/>
+		AllowOverride None
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	php_value magic_quotes_gpc 0
+	php_value register_globals 0
+	php_value error_reporting "E_ALL & ~E_NOTICE"
+	php_value default_charset "utf-8"
+</VirtualHost>
diff --git a/media-video/nvidia-settings/metadata.xml b/www-apps/davical/metadata.xml
index 7dfbf76..31dc017 100644
--- a/media-video/nvidia-settings/metadata.xml
+++ b/www-apps/davical/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>no-herd</herd>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
+<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
 </pkgmetadata>