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

28 files changed, 1455 insertions, 0 deletions

diff --git a/dev-libs/libfreefare/Manifest b/dev-libs/libfreefare/Manifest
new file mode 100644
index 0000000..fad823a
--- /dev/null
+++ b/dev-libs/libfreefare/Manifest
@@ -0,0 +1,2 @@
+DIST libfreefare-0.3.0.tar.gz 448184 RMD160 52b0ba9ad3fbecf8727ccc6e4c8082794e044265 SHA1 864c81dc24050d32dac779fe0bb15fb759d227ff SHA256 e267bb91a547c03d468e4d2f15f17926b5858206b909202799263005c7b27aa3
+EBUILD libfreefare-0.3.0.ebuild 555 RMD160 fad3a1006b96cd49cf2c6059d19af4125440bb6e SHA1 5f1f92651323714546280c3b9910174f38ffa8e1 SHA256 5f7317952769b6e2a064f5bb409f280831d0e50f967b2955338c5937806b4a0a
diff --git a/dev-libs/libfreefare/libfreefare-0.3.0.ebuild b/dev-libs/libfreefare/libfreefare-0.3.0.ebuild
new file mode 100644
index 0000000..b07de3a
--- /dev/null
+++ b/dev-libs/libfreefare/libfreefare-0.3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A library for high level manipulation of MIFARE tags"
+HOMEPAGE="http://code.google.com/p/nfc-tools/"
+SRC_URI="http://nfc-tools.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+CDEPEND=">=dev-libs/libnfc-1.4.0"
+RDEPEND="${CDEPEND}"
+
+src_install() {
+    emake DESTDIR="${D}" install || die "Install failed"
+    dodoc README ChangeLog AUTHORS NEWS TODO || die
+}
diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest
new file mode 100644
index 0000000..474b1b1
--- /dev/null
+++ b/dev-libs/libnfc/Manifest
@@ -0,0 +1,2 @@
+DIST libnfc-1.4.0.tar.gz 471552 RMD160 8e1f812eff0da1bfda28ebf1e706235e2b5e6118 SHA1 1c8f147d6e8b508d6d2e8012ed8bbc37b9b1a9dd SHA256 441246286247f71ebe5f3060304202809601a6f2b91a33251834c65ae4b6ed02
+EBUILD libnfc-1.4.0.ebuild 665 RMD160 6ddfe28589b91d5d2185118c27ab42e3b5429ce4 SHA1 14465e96b19d9a1099b5a55e96767c75055f47a0 SHA256 1f01a3cbbfda100acea95b692b9ba56e41b1f8bd5e4a7c97a0a35b8df42747b3
diff --git a/dev-libs/libnfc/libnfc-1.4.0.ebuild b/dev-libs/libnfc/libnfc-1.4.0.ebuild
new file mode 100644
index 0000000..1b49970
--- /dev/null
+++ b/dev-libs/libnfc/libnfc-1.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Near Field Communications (NFC) library"
+HOMEPAGE="http://www.libnfc.org/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+
+CDEPEND="sys-apps/pcsc-lite
+		dev-libs/libusb"
+DEPEND="${CDEPEND}
+		doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}"
+
+src_compile() {
+	emake || die "Failed to compile."
+	use doc && doxygen
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "Failed to install properly."
+	use doc && dohtml "${S}"/doc/html/*
+}
diff --git a/dev-util/mfoc/Manifest b/dev-util/mfoc/Manifest
new file mode 100644
index 0000000..4dd7ca0
--- /dev/null
+++ b/dev-util/mfoc/Manifest
@@ -0,0 +1,2 @@
+DIST mfoc-0.10.tar.gz 111711 RMD160 f70af8b265417a13df424fd2b9723c6555dbba27 SHA1 9750b00c1d8f96520359886851ea05935335a0f8 SHA256 ef0c7f0229e15b2479c1302eb862bd5327c612c7a0c632abd2b6a517d0b5e47b
+EBUILD mfoc-0.10.ebuild 591 RMD160 ba78dc93a7641e2c8b9e8d0f78b7fa32a17d5389 SHA1 a9440ea46f317ccf620eba2f601598eb5429a6ad SHA256 0e4fe4fcf98476584e4769565592e934242d68a126158552ee915744fc998681
diff --git a/dev-util/mfoc/mfoc-0.10.ebuild b/dev-util/mfoc/mfoc-0.10.ebuild
new file mode 100644
index 0000000..e38eb68
--- /dev/null
+++ b/dev-util/mfoc/mfoc-0.10.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Mifare Classic Offline Cracker is a tool that can recover keys from Mifare Classic cards"
+HOMEPAGE="http://code.google.com/p/nfc-tools/"
+SRC_URI="http://nfc-tools.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+CDEPEND=">=dev-libs/libnfc-1.4.0"
+RDEPEND="${CDEPEND}"
+
+src_install() {
+    emake DESTDIR="${D}" install || die "Install failed"
+    dodoc README ChangeLog AUTHORS NEWS TODO || die
+}
diff --git a/media-video/nvidia-settings/ChangeLog b/media-video/nvidia-settings/ChangeLog
new file mode 100644
index 0000000..795f01f
--- /dev/null
+++ b/media-video/nvidia-settings/ChangeLog
@@ -0,0 +1,553 @@
+# 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
new file mode 100644
index 0000000..c0a3c1f
--- /dev/null
+++ b/media-video/nvidia-settings/Manifest
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000..65f2fd5
--- /dev/null
+++ b/media-video/nvidia-settings/files/icon/nvidia-settings.desktop
@@ -0,0 +1,8 @@
+[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
new file mode 100644
index 0000000..361c200
--- /dev/null
+++ b/media-video/nvidia-settings/files/icon/nvidia-settings.png
diff --git a/media-video/nvidia-settings/metadata.xml b/media-video/nvidia-settings/metadata.xml
new file mode 100644
index 0000000..7dfbf76
--- /dev/null
+++ b/media-video/nvidia-settings/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+</pkgmetadata>
diff --git a/media-video/nvidia-settings/nvidia-settings-260.19.36.ebuild b/media-video/nvidia-settings/nvidia-settings-260.19.36.ebuild
new file mode 100644
index 0000000..6170aff
--- /dev/null
+++ b/media-video/nvidia-settings/nvidia-settings-260.19.36.ebuild
@@ -0,0 +1,80 @@
+# 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/cgit/ChangeLog b/www-apps/cgit/ChangeLog
new file mode 100644
index 0000000..782743f
--- /dev/null
+++ b/www-apps/cgit/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for www-apps/cgit
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  18 Oct 2010; Nikoli <nikoli@lavabit.com> +cgit-0.8.3.4.ebuild,
+  +cgit-9999.ebuild, +files/cgitrc, +files/postinstall-en.txt,
+  +metadata.xml:
+  initial import
+
diff --git a/www-apps/cgit/Manifest b/www-apps/cgit/Manifest
new file mode 100644
index 0000000..872329f
--- /dev/null
+++ b/www-apps/cgit/Manifest
@@ -0,0 +1,7 @@
+AUX cgitrc 2514 RMD160 614cb050acc97caaa1da7caa6a60e74b457bba37 SHA1 376d65e71ab2ee54896addaf4acb98ed7d5ba327 SHA256 5a53e02e38382b46e3e0dea5efb3ab4ff8eccc8c6a26e7213ab2dee192236c48
+AUX postinstall-en.txt 659 RMD160 3b52b26751dc66759a78d23abff0a4762624aea3 SHA1 5b3b7077e1d0fb710afb829b8720f0f9a2ad7849 SHA256 1e1ddd6048719a55c7b854fc64f9e488e61dbf32e0d1d21a16592474ce914751
+DIST cgit-0.9.tar.bz2 63580 RMD160 01e2bf7a5f4f385a0a6cda18292f3f9a55337622 SHA1 acdea79a880521fcfd0d359b41fdd59abf76170d SHA256 530eaf702b8ca0a44750f5ed1f27b1d74b317441cce9d2d4bb340c7dbea8a48f
+DIST git-1.7.4.tar.bz2 2703735 RMD160 a064d7a5b2d3fae6171ca91a03082eb46d7bb9b7 SHA1 57b783627d9a9515ce3ef8f79128074de6197b2e SHA256 8e260b9e5dfb46a35f26e3db450c2dabb4d1df254bfb2820779945a1ecbcef51
+EBUILD cgit-0.9.ebuild 1724 RMD160 ec65afb250131eaf84a2c256e8134e74f6650c60 SHA1 721e809dc7e26e4770b36933b7113e8bc505c0c8 SHA256 cb2d001046970d0ee3be2fdc247cd9297c023187109195a9acf187bdfd2547ff
+MISC ChangeLog 277 RMD160 11f73a2acd2ba9f72ca189871c20340c7e54e1d9 SHA1 b03d9f583d48dbb44e2ee6a0083727c66c64eeeb SHA256 ac3a9ebce741eb21a27b4662a19c014f0eddc31635a5be46d1035a72c1cd2e35
+MISC metadata.xml 520 RMD160 a3326aa3367cd7b1c9bb007fc9e6a7fc4dd593af SHA1 b4ddba1f129725070dff6d3f6757448dda2c0a21 SHA256 b60776af3263493ed2792213dee75fd228b1ab7053ef6386eb32521bfa8d1a64
diff --git a/www-apps/cgit/cgit-0.9.ebuild b/www-apps/cgit/cgit-0.9.ebuild
new file mode 100644
index 0000000..3cb054b
--- /dev/null
+++ b/www-apps/cgit/cgit-0.9.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+inherit webapp eutils multilib
+
+[[ -z "${CGIT_CACHEDIR}" ]] && CGIT_CACHEDIR="/var/cache/${PN}/"
+
+GIT_V="1.7.4"
+
+DESCRIPTION="a fast web-interface for git repositories"
+HOMEPAGE="http://hjemli.net/git/cgit/about/"
+SRC_URI="mirror://kernel/software/scm/git/git-${GIT_V}.tar.bz2
+	http://hjemli.net/git/cgit/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc highlight"
+
+RDEPEND="
+	dev-vcs/git
+	sys-libs/zlib
+	dev-libs/openssl
+	virtual/httpd-cgi
+	highlight? ( app-text/highlight )
+"
+# ebuilds without WEBAPP_MANUAL_SLOT="yes" are broken
+DEPEND="${RDEPEND}
+	!<www-apps/cgit-0.8.3.3
+	doc? ( app-text/docbook-xsl-stylesheets
+		>=app-text/asciidoc-8.5.1 )
+"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	rmdir git || die
+	mv "${WORKDIR}"/git-"${GIT_V}" git || die
+
+	sed -i \
+		-e "/^CACHE_ROOT =/s:/var/cache/cgit:${CGIT_CACHEDIR}:" \
+		Makefile || die
+}
+
+src_compile() {
+	emake || die
+	if use doc ; then
+		emake doc-man || die
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	emake \
+		prefix=/usr \
+		libdir=/usr/$(get_libdir) \
+		CGIT_SCRIPT_PATH="${MY_CGIBINDIR}" \
+		CGIT_DATA_PATH="${MY_HTDOCSDIR}" \
+		DESTDIR="${D}" install || die
+
+	insinto /etc
+	doins "${FILESDIR}"/cgitrc
+
+	dodoc README
+	use doc && doman cgitrc.5
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+
+	keepdir "${CGIT_CACHEDIR}"
+	fowners ${PN}:${PN} "${CGIT_CACHEDIR}"
+	fperms 700 "${CGIT_CACHEDIR}"
+}
+
+pkg_postinst() {
+	ewarn "If you intend to run cgit using web server's user"
+	ewarn "you should change /var/cache/cgit/ permissions."
+}
diff --git a/www-apps/cgit/files/cgitrc b/www-apps/cgit/files/cgitrc
new file mode 100644
index 0000000..a3eba11
--- /dev/null
+++ b/www-apps/cgit/files/cgitrc
@@ -0,0 +1,126 @@
+# Enable caching of up to 1000 output entriess
+#cache-size=1000
+
+
+# Specify some default clone prefixes
+#clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git
+
+# Specify the css url
+#css=/css/cgit.css
+
+
+# Show extra links for each repository on the index page
+#enable-index-links=1
+
+
+# Enable ASCII art commit history graph on the log pages
+#enable-commit-graph=1
+
+
+# Show number of affected files per commit on the log pages
+#enable-log-filecount=1
+
+
+# Show number of added/removed lines per commit on the log pages
+#enable-log-linecount=1
+
+
+# Add a cgit favicon
+#favicon=/favicon.ico
+
+
+# Use a custom logo
+#logo=/img/mylogo.png
+
+
+# Enable statistics per week, month and quarter
+#max-stats=quarter
+
+
+# Set the title and heading of the repository index page
+#root-title=foobar.com git repositories
+
+
+# Set a subheading for the repository index page
+#root-desc=tracking the foobar development
+
+
+# Include some more info about foobar.com on the index page
+#root-readme=/var/www/htdocs/about.html
+
+
+# Allow download of tar.gz, tar.bz2 and zip-files
+#snapshots=tar.gz tar.bz2 zip
+
+
+##
+## List of common mimetypes
+##
+
+#mimetype.gif=image/gif
+#mimetype.html=text/html
+#mimetype.jpg=image/jpeg
+#mimetype.jpeg=image/jpeg
+#mimetype.pdf=application/pdf
+#mimetype.png=image/png
+#mimetype.svg=image/svg+xml
+
+
+##
+## List of repositories.
+## PS: Any repositories listed when section is unset will not be
+##     displayed under a section heading
+## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos')
+##      and included like this:
+##        include=/etc/cgitrepos
+##
+
+
+#repo.url=foo
+#repo.path=/pub/git/foo.git
+#repo.desc=the master foo repository
+#repo.owner=fooman@foobar.com
+#repo.readme=info/web/about.html
+
+
+#repo.url=bar
+#repo.path=/pub/git/bar.git
+#repo.desc=the bars for your foo
+#repo.owner=barman@foobar.com
+#repo.readme=info/web/about.html
+
+
+# The next repositories will be displayed under the 'extras' heading
+#section=extras
+
+
+#repo.url=baz
+#repo.path=/pub/git/baz.git
+#repo.desc=a set of extensions for bar users
+
+#repo.url=wiz
+#repo.path=/pub/git/wiz.git
+#repo.desc=the wizard of foo
+
+
+# Add some mirrored repositories
+#section=mirrors
+
+
+#repo.url=git
+#repo.path=/pub/git/git.git
+#repo.desc=the dscm
+
+
+#repo.url=linux
+#repo.path=/pub/git/linux.git
+#repo.desc=the kernel
+
+# Disable adhoc downloads of this repo
+#repo.snapshots=0
+
+# Disable line-counts for this repo
+#repo.enable-log-linecount=0
+
+# Restrict the max statistics period for this repo
+#repo.max-stats=month
diff --git a/www-apps/cgit/files/postinstall-en.txt b/www-apps/cgit/files/postinstall-en.txt
new file mode 100644
index 0000000..94280c8
--- /dev/null
+++ b/www-apps/cgit/files/postinstall-en.txt
@@ -0,0 +1,15 @@
+There is a few variants of configuration:
+1) Via global config file: /etc/cgitrc
+2) Or via local config file, shipped in ./conf dir into webapp_dir. It has to
+   be explicitly specified with CGIT_CONFIG env variable in your web server
+   configuration.
+
+If you would like to update the list of git repositories in cgit automatically,
+you might consider adding something similar to the following as a cronjob:
+
+"${MY_CGIBINDIR}/cgit.cgi --scan-tree=/git/repo-parent-path > /etc/cgit-repos"
+
+Then add "include=/etc/cgit-repos" in /etc/cgitrc. This way it's simpler and
+more convenient. You won't need to update your cgitrc every time you add a new
+repository.
+
diff --git a/www-apps/cgit/metadata.xml b/www-apps/cgit/metadata.xml
new file mode 100644
index 0000000..51f7146
--- /dev/null
+++ b/www-apps/cgit/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>nikoli@lavabit.com</email>
+		<name>Nikoli</name>
+	</maintainer>
+	<longdescription lang="en">
+	cgit - cgi for git
+
+	This is an attempt to create a fast web interface for the git scm, using a
+	builtin cache to decrease server io-pressure.
+	</longdescription>
+	<use>
+		<flag name="highlight">Enable source code highlighting</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest
new file mode 100644
index 0000000..19a7876
--- /dev/null
+++ b/x11-wm/xmonad-contrib/Manifest
@@ -0,0 +1,2 @@
+AUX xmonad-contrib-0.8-urgency-seconds.patch 753 RMD160 54b78288ded4735f72ff615fd6d29ded46440b60 SHA1 ba6bd6bf125fa743969a94ca46acf25674b9941e SHA256 4a9baa594989361cdbe6f69e104157fe879bd10ef0515f5c21717f607d0bbab1
+EBUILD xmonad-contrib-9999.ebuild 835 RMD160 619b8f1858016bc789a331163082b4a5d4e087c9 SHA1 bc7bffa18aab75d8369b0e4bf3cdb4f350be3215 SHA256 c0dc7e13e5af425861a8bf521d496d5488fcf14dca93d044ad7e2b9aa36f1be6
diff --git a/x11-wm/xmonad-contrib/files/xmonad-contrib-0.8-urgency-seconds.patch b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.8-urgency-seconds.patch
new file mode 100644
index 0000000..d8cb4d0
--- /dev/null
+++ b/x11-wm/xmonad-contrib/files/xmonad-contrib-0.8-urgency-seconds.patch
@@ -0,0 +1,13 @@
+diff -rN -u old-xmonad-contrib-0.8/XMonad/Hooks/UrgencyHook.hs new-xmonad-contrib-0.8/XMonad/Hooks/UrgencyHook.hs
+--- old-xmonad-contrib-0.8/XMonad/Hooks/UrgencyHook.hs	2008-12-29 18:20:15.000000000 +0100
++++ new-xmonad-contrib-0.8/XMonad/Hooks/UrgencyHook.hs	2008-12-29 18:20:15.000000000 +0100
+@@ -356,7 +356,7 @@
+ -- Defaults to a duration of five seconds, and no extra args to dzen.
+ -- See 'DzenUrgencyHook'.
+ dzenUrgencyHook :: DzenUrgencyHook
+-dzenUrgencyHook = DzenUrgencyHook { duration = (5 `seconds`), args = [] }
++dzenUrgencyHook = DzenUrgencyHook { duration = (seconds 5), args = [] }
+ 
+ -- | Spawn a commandline thing, appending the window id to the prefix string
+ -- you provide. (Make sure to add a space if you need it.) Do your crazy
+
diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-9999.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-9999.ebuild
new file mode 100644
index 0000000..57d42f9
--- /dev/null
+++ b/x11-wm/xmonad-contrib/xmonad-contrib-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+CABAL_FEATURES="lib profile haddock hscolour"
+
+inherit haskell-cabal git
+
+DESCRIPTION="Third party extensions for xmonad"
+HOMEPAGE="http://xmonad.org/"
+EGIT_REPO_URI="git://git.animux.de/XMonadContrib"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="xft"
+
+RDEPEND=">=dev-lang/ghc-6.6.1
+		dev-haskell/mtl
+		>=dev-haskell/x11-1.5
+		dev-haskell/utf8-string
+		xft? ( >=dev-haskell/x11-xft-0.2 )
+		~x11-wm/xmonad-${PV}"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2.1"
+
+src_compile() {
+	CABAL_CONFIGURE_FLAGS="--flags=-testing"
+
+	if use xft; then
+		CABAL_CONFIGURE_FLAGS="${CABAL_CONFIGURE_FLAGS} --flags=use_xft"
+	else
+		CABAL_CONFIGURE_FLAGS="${CABAL_CONFIGURE_FLAGS} --flags=-use_xft"
+	fi
+
+	cabal_src_compile
+}
diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest
new file mode 100644
index 0000000..f61bc46
--- /dev/null
+++ b/x11-wm/xmonad/Manifest
@@ -0,0 +1,6 @@
+AUX cabal-extensions.patch 587 RMD160 ba22b1ef014ec88abb60de322d0506c43d83249b SHA1 76dca2b8e5020e2d2adf6997a74f259349960b22 SHA256 4c25076d53fa59e9ee9199535fc2480555b12bb92146dac6825a6e74d4b0f7a3
+AUX config-extensions.patch 10662 RMD160 e8b6b41a9a59d7ca8bbac644ce0839e8d576d13b SHA1 72e43c13aed695c95e829674ea8e360c66959129 SHA256 f593ccfcafc290a5a6963e671f23624e45afa8527a86dd1863be1e50fd48c7db
+AUX xmonad-0.6-version.patch 555 RMD160 d81d896be14f3e3461af61dc7834fb671f72c78f SHA1 545b37270114a8614e72932ec749d2d50d88b51f SHA256 45dbfca9c81d448406f868b59871fd6461edb3cc3b838cce88689c587d3cf218
+AUX xmonad-0.9.1-move-to-oldexception.patch 1849 RMD160 48a7f6b76ad171517f909a1e48651189830f3e3b SHA1 3e225adb8d0ce16ab7dfc1d6b604081200ee8fb5 SHA256 a118c432eb88fa28994c6cbba31368e27787de63a261a950ec9cf2522ae8aa72
+AUX xmonad.desktop 285 RMD160 64cfde0c38eb413e156df3a6814263ac17a62ed4 SHA1 684e20f6c4fc4640a2d1a68e8706069ed51c8a74 SHA256 cca59025f61f4d2aa61bd8410528dab67223696be6bfc3c0eb17ec7e22e4fc1a
+EBUILD xmonad-9999.ebuild 1574 RMD160 ff4eca2120a02c17530cedbe1c55c547f2c86303 SHA1 eb225ab736956cb976c2da9dc3853ea326107254 SHA256 a7758ad42d04e84be5418769aa1c8bd3a9f75fee892ba94bfe842c486079ae93
diff --git a/x11-wm/xmonad/files/cabal-extensions.patch b/x11-wm/xmonad/files/cabal-extensions.patch
new file mode 100644
index 0000000..8ddb31a
--- /dev/null
+++ b/x11-wm/xmonad/files/cabal-extensions.patch
@@ -0,0 +1,11 @@
+--- xmonad.cabal-orig	2007-09-06 04:03:53.000000000 +0000
++++ xmonad.cabal	2007-09-06 03:58:51.000000000 +0000
+@@ -18,7 +18,7 @@
+ license-file:       LICENSE
+ author:             Spencer Janssen
+ maintainer:         sjanssen@cse.unl.edu
+-build-depends:      base>=2.0, X11>=1.2.1, X11-extras>=0.3, mtl>=1.0, unix>=1.0
++build-depends:      base>=2.0, X11>=1.2.1, X11-extras>=0.3, mtl>=1.0, unix>=1.0, readline>=1.0
+ extra-source-files: README TODO tests/loc.hs tests/Properties.hs man/xmonad.1.in
+                     Config.hs-boot util/GenerateManpage.hs man/xmonad.1 man/xmonad.html
+ 
diff --git a/x11-wm/xmonad/files/config-extensions.patch b/x11-wm/xmonad/files/config-extensions.patch
new file mode 100644
index 0000000..91e8964
--- /dev/null
+++ b/x11-wm/xmonad/files/config-extensions.patch
@@ -0,0 +1,249 @@
+--- Config.hs-orig	2007-09-06 03:40:47.000000000 +0000
++++ Config.hs	2007-09-06 03:51:19.000000000 +0000
+@@ -29,6 +29,88 @@
+ import System.Exit
+ import Graphics.X11.Xlib
+ 
++-- Extension-provided imports
++--   For extension Accordion:
++--import XMonadContrib.Accordion
++--   For extension Anneal:
++--import XMonadContrib.Anneal
++--   For extension Circle:
++--import XMonadContrib.Circle
++--   For extension Combo:
++--import XMonadContrib.Combo
++--import XMonadContrib.SimpleStacking
++--   For extension Commands:
++--import XMonadContrib.Commands
++--   For extension CopyWindow:
++--import XMonadContrib.CopyWindow
++--   For extension DeManage:
++--import XMonadContrib.DeManage
++--   For extension Dmenu:
++--import XMonadContrib.Dmenu
++--   For extension DragPane:
++--import XMonadContrib.DragPane
++--   For extension DwmPromote:
++--import XMonadContrib.DwmPromote
++--   For extension DynamicLog:
++--import XMonadContrib.DynamicLog
++--   For extension FindEmptyWorkspace:
++--import XMonadContrib.FindEmptyWorkspace
++--   For extension FlexibleManipulate:
++--import qualified XMonadContrib.FlexibleManipulate as Flex
++--   For extension FlexibleResize:
++--import qualified XMonadContrib.FlexibleResize as Flex
++--   For extension FocusNth:
++--import XMonadContrib.FocusNth
++--   For extension HintedTile:
++--import qualified XMonadContrib.HintedTile
++--   For extension LayoutHints:
++--import XMonadContrib.LayoutHints
++--   For extension LayoutScreens:
++--import XMonadContrib.LayoutScreens
++--   For extension MagicFocus:
++--import XMonadContrib.MagicFocus
++--   For extension Magnifier:
++--import XMonadContrib.Magnifier
++--   For extension Mosaic:
++--import XMonadContrib.Mosaic
++--   For extension NoBorders:
++--import XMonadContrib.NoBorders
++--   For extension Roledex:
++--import XMonadContrib.Roledex
++--   For extension RotSlaves:
++--import XMonadContrib.RotSlaves
++--   For extension RotView:
++--import XMonadContrib.RotView
++--   For extension ShellPrompt:
++--import XMonadContrib.XPrompt
++--import XMonadContrib.ShellPrompt
++--   For extension SimpleDate:
++--import XMonadContrib.SimpleDate
++--   For extension SinkAll:
++--import XMonadContrib.SinkAll
++--   For extension Spiral:
++--import XMonadContrib.Spiral
++--   For extension Square:
++--import XMonadContrib.Square
++--   For extension SshPrompt:
++--import XMonadContrib.XPrompt
++--import XMonadContrib.SshPrompt
++--   For extension Submap:
++--import XMonadContrib.Submap
++--   For extension Tabbed:
++--import XMonadContrib.Tabbed
++--   For extension ThreeColumns:
++--import XMonadContrib.ThreeColumns
++--   For extension TwoPane:
++--import XMonadContrib.TwoPane
++--   For extension Warp:
++--import XMonadContrib.Warp
++--   For extension WorkspaceDir:
++--import XMonadContrib.WorkspaceDir
++--   For extension XMonadPrompt:
++--import XMonadContrib.XPrompt
++--import XMonadContrib.XMonadPrompt
++
+ --
+ -- The number of workspaces (virtual screens, or window groups)
+ --
+@@ -91,7 +173,48 @@
+ -- The default set of tiling algorithms
+ --
+ defaultLayouts :: [Layout Window]
+-defaultLayouts = [ tiled , mirror tiled , full ]
++defaultLayouts = [ tiled
++                 , mirror tiled
++                 , full
++
++                 -- Extension-provided layouts
++                 --   For extension Accordion:
++                 -- , accordion
++                 --   For extension Combo:
++                 -- , simpleStacking $ combo (twoPane 0.03 0.5) [(full,1),(tabbed shrinkText defaultTConf,1)]
++                 --   For extension DragPane:
++                 -- , dragPane "" (fromRational delta) (fromRational delta)
++                 --   For extension HintedTile:
++                 -- , XMonadContrib.HintedTile.tall nmaster delta ratio
++                 --   For extension LayoutHints:
++                 -- , layoutHints tiled
++                 -- , layoutHints $ mirror tiled
++                 --   For extension MagicFocus:
++                 -- , magicFocus tiled
++                 -- , magicFocus $ mirror tiled
++                 --   For extension Magnifier:
++                 -- , magnifier tiled
++                 -- , magnifier $ mirror tiled
++                 --   For extension Mosaic:
++                 -- , mosaic 0.25 0.5 M.empty
++                 --   For extension NoBorders:
++                 -- -- prepend noBorders to default layouts above to remove their borders, like so:
++                 -- , noBorders full
++                 --   For extension Roledex:
++                 -- , roledex
++                 --   For extension Spiral:
++                 -- , spiral (1 % 1)
++                 --   For extension Tabbed:
++                 -- , tabbed shrinkText defaultTConf
++                 --   For extension ThreeColumns:
++                 -- , threeCol nmaster delta ratio
++                 --   For extension TwoPane:
++                 -- , twoPane delta (1%2)
++                 --   For extension WorkspaceDir:
++                 -- -- prepend 'map (workspaceDir "~")' to defaultLayouts definition above,
++                 -- -- just before the list, like the following (don't uncomment next line):
++                 -- -- defaultLayouts = map (workspaceDir "~") [ tiled, ... ]
++                 ]
+   where
+      -- default tiling algorithm partitions the screen into two panes
+      tiled   = tall nmaster delta ratio
+@@ -159,19 +282,83 @@
+     , ((modMask .|. shiftMask, xK_q     ), io (exitWith ExitSuccess)) -- @@ Quit xmonad
+     , ((modMask              , xK_q     ), restart Nothing True) -- @@ Restart xmonad
+ 
+-    ] ++
++    -- Extension-provided key bindings
++    --   For extension Commands:
++    -- , ((modMask .|. controlMask, xK_y), runCommand commands)
++    --   For extension CopyWindow:
++    -- -- comment out default close window binding above if you uncomment this:
++    -- , ((modMask .|. shiftMask, xK_c     ), kill1) -- @@ Close the focused window
++    --   For extension DeManage:
++    -- , ((modMask,               xK_d     ), withFocused demanage)
++    --   For extension DwmPromote:
++    -- , ((modMask,               xK_Return), dwmpromote)
++    --   For extension FindEmptyWorkspace:
++    -- , ((modMask,                xK_m    ), viewEmptyWorkspace)
++    -- , ((modMask .|. shiftMask,  xK_m    ), tagToEmptyWorkspace)
++    --   For extension LayoutScreens:
++    -- , ((modMask .|. shiftMask, xK_space), layoutScreens 2 (twoPane 0.5 0.5))
++    -- , ((controlMask .|. modMask .|. shiftMask, xK_space), rescreen)
++    --   For extension Mosaic:
++    -- , ((controlMask .|. modMask .|. shiftMask, xK_h), withNamedWindow (sendMessage . tallWindow))
++    -- , ((controlMask .|. modMask .|. shiftMask, xK_l), withNamedWindow (sendMessage . wideWindow))
++    -- , ((modMask .|. shiftMask, xK_h     ), withNamedWindow (sendMessage . shrinkWindow))
++    -- , ((modMask .|. shiftMask, xK_l     ), withNamedWindow (sendMessage . expandWindow))
++    -- , ((modMask .|. shiftMask, xK_s     ), withNamedWindow (sendMessage . squareWindow))
++    -- , ((modMask .|. shiftMask, xK_o     ), withNamedWindow (sendMessage . myclearWindow))
++    -- , ((controlMask .|. modMask .|. shiftMask, xK_o     ), withNamedWindow (sendMessage . flexibleWindow))
++    --   For extension RotSlaves:
++    -- , ((modMask .|. shiftMask, xK_Tab   ), rotSlavesUp)
++    --   For extension RotView:
++    -- , ((modMask .|. shiftMask, xK_Right), rotView True)
++    -- , ((modMask .|. shiftMask, xK_Left), rotView False)
++    --   For extension ShellPrompt:
++    -- , ((modMask .|. controlMask, xK_x), shellPrompt defaultXPConfig)
++    --   For extension SimpleDate:
++    -- , ((modMask,               xK_d     ), date)
++    --   For extension SinkAll:
++    -- , ((modMask .|. shiftMask, xK_t), sinkAll)
++    --   For extension SshPrompt:
++    -- , ((modMask .|. controlMask, xK_x), xmonadPrompt defaultXPConfig)
++    --   For extension Submap:
++    -- , ((modMask, xK_a), submap . M.fromList $
++    --     [ ((0, xK_n),     spawn "mpc next")
++    --     , ((0, xK_p),     spawn "mpc prev")
++    --     , ((0, xK_z),     spawn "mpc random")
++    --     , ((0, xK_space), spawn "mpc toggle")
++    --     ])
++    --   For extension Warp:
++    -- , ((modMask,   xK_z     ), warpToWindow (1%2) (1%2)) -- @@ Move pointer to currently focused window
++    --   For extension WorkspaceDir:
++    -- , ((modMask .|. shiftMask, xK_x     ), changeDir defaultXPConfig)
++    --   For extension XMonadPrompt:
++    -- , ((modMask .|. controlMask, xK_x), xmonadPrompt defaultXPConfig)
++    ]
++    ++
+     -- mod-[1..9] @@ Switch to workspace N
+     -- mod-shift-[1..9] @@ Move client to workspace N
+     [((m .|. modMask, k), f i)
+         | (i, k) <- zip workspaces [xK_1 ..]
+         , (f, m) <- [(view, 0), (shift, shiftMask)]]
+-
++    ++
+     -- mod-{w,e,r} @@ Switch to physical/Xinerama screens 1, 2, or 3
+     -- mod-shift-{w,e,r} @@ Move client to screen 1, 2, or 3
+-    ++
+     [((m .|. modMask, key), screenWorkspace sc >>= flip whenJust f)
+         | (key, sc) <- zip [xK_w, xK_e, xK_r] [0..]
+         , (f, m) <- [(windows . W.view, 0), (shift, shiftMask)]]
++    -- Extension-provided key bindings lists
++    --   For extension CopyWindow:
++    -- ++
++    -- -- mod-[1..9] @@ Switch to workspace N
++    -- -- mod-shift-[1..9] @@ Move client to workspace N
++    -- -- mod-control-shift-[1..9] @@ Copy client to workspace N
++    -- [((m .|. modMask, k), f i)
++    --     | (i, k) <- zip workspaces [xK_1 ..]
++    --     , (f, m) <- [(view, 0), (shift, shiftMask), (copy, shiftMask .|. controlMask)]]
++    --   For extension Warp:
++    -- ++
++    -- -- mod-ctrl-{w,e,r} @@ Move mouse pointer to screen 1, 2, or 3
++    -- [((modMask .|. controlMask, key), warpToScreen sc (1%2) (1%2))
++    --     | (key, sc) <- zip [xK_w, xK_e, xK_r] [0..]]
+ 
+ -- |
+ -- default actions bound to mouse events
+@@ -183,4 +370,19 @@
+     -- mod-button2 @@ Raise the window to the top of the stack
+     , ((modMask, button2), (\w -> focus w >> swapMaster))
+     -- mod-button3 @@ Set the window to floating mode and resize by dragging
+-    , ((modMask, button3), (\w -> focus w >> mouseResizeWindow w)) ]
++    , ((modMask, button3), (\w -> focus w >> mouseResizeWindow w))
++
++    -- Extension-provided mouse bindings
++    --   For extension FlexibleManipulate:
++    -- , ((modMask, button1), (\w -> focus w >> Flex.mouseWindow Flex.linear w))
++    --   For extension FlexibleResize:
++    -- , ((modMask, button3), (\w -> focus w >> Flex.mouseResizeWindow w))
++    ]
++
++-- Extension-provided definitions
++--   For extension Commands:
++-- commands :: [(String, X ())]
++-- commands = defaultCommands
++--   For extension DynamicLog:
++-- -- comment out default logHook definition above if you uncomment this:
++-- logHook = dynamicLog
diff --git a/x11-wm/xmonad/files/xmonad-0.6-version.patch b/x11-wm/xmonad/files/xmonad-0.6-version.patch
new file mode 100644
index 0000000..d9f2c53
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-0.6-version.patch
@@ -0,0 +1,13 @@
+diff -rN -u old-xmonad-0.6/Main.hs new-xmonad-0.6/Main.hs
+--- old-xmonad-0.6/Main.hs	2008-02-17 18:31:59.000000000 +0100
++++ new-xmonad-0.6/Main.hs	2008-02-17 18:31:59.000000000 +0100
+@@ -37,7 +37,7 @@
+         ["--resume", _]       -> launch
+         ["--recompile"]       -> recompile False >> return ()
+         ["--recompile-force"] -> recompile True >> return ()
+-        ["--version"]         -> putStrLn "xmonad 0.5"
++        ["--version"]         -> putStrLn "xmonad 0.6"
+ #ifdef TESTING
+         ("--run-tests":_)     -> Properties.main
+ #endif
+
diff --git a/x11-wm/xmonad/files/xmonad-0.9.1-move-to-oldexception.patch b/x11-wm/xmonad/files/xmonad-0.9.1-move-to-oldexception.patch
new file mode 100644
index 0000000..d5b8724
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad-0.9.1-move-to-oldexception.patch
@@ -0,0 +1,52 @@
+diff --git a/XMonad/Core.hs b/XMonad/Core.hs
+index 1b7b70a..aedf7cc 100644
+--- a/XMonad/Core.hs
++++ b/XMonad/Core.hs
+@@ -33,7 +33,7 @@ module XMonad.Core (
+ import XMonad.StackSet hiding (modify)
+ 
+ import Prelude hiding ( catch )
+-import Control.Exception (catch, try, bracket, throw, finally, Exception(ExitException))
++import Control.OldException (catch, try, bracket, throw, finally, Exception(ExitException))
+ import Control.Applicative
+ import Control.Monad.State
+ import Control.Monad.Reader
+diff --git a/XMonad/ManageHook.hs b/XMonad/ManageHook.hs
+index be9bc58..c5674c0 100644
+--- a/XMonad/ManageHook.hs
++++ b/XMonad/ManageHook.hs
+@@ -22,7 +22,7 @@ import Prelude hiding (catch)
+ import XMonad.Core
+ import Graphics.X11.Xlib.Extras
+ import Graphics.X11.Xlib (Display, Window, internAtom, wM_NAME)
+-import Control.Exception (bracket, catch)
++import Control.OldException (bracket, catch)
+ import Control.Monad.Reader
+ import Data.Maybe
+ import Data.Monoid
+diff --git a/XMonad/Operations.hs b/XMonad/Operations.hs
+index fe124f3..5c8c898 100644
+--- a/XMonad/Operations.hs
++++ b/XMonad/Operations.hs
+@@ -33,7 +33,7 @@ import qualified Data.Set as S
+ import Control.Applicative
+ import Control.Monad.Reader
+ import Control.Monad.State
+-import qualified Control.Exception as C
++import qualified Control.OldException as C
+ 
+ import System.IO
+ import System.Posix.Process (executeFile)
+diff --git a/xmonad.cabal b/xmonad.cabal
+index 420050b..a97e187 100644
+--- a/xmonad.cabal
++++ b/xmonad.cabal
+@@ -43,7 +43,7 @@ library
+                         XMonad.StackSet
+ 
+     if flag(small_base)
+-        build-depends: base < 4 && >=3, containers, directory, process, filepath
++        build-depends: base < 5 && >=4, containers, directory, process, filepath
+     else
+         build-depends: base < 3
+     build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix
diff --git a/x11-wm/xmonad/files/xmonad.desktop b/x11-wm/xmonad/files/xmonad.desktop
new file mode 100644
index 0000000..9c0bf6e
--- /dev/null
+++ b/x11-wm/xmonad/files/xmonad.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=xmonad
+Comment=A lightweight window manager
+Exec=/etc/X11/Sessions/xmonad
+TryExec=xmonad
+NoDisplay=true
+Icon=
+X-GNOME-WMName=Xmonad
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=false
diff --git a/x11-wm/xmonad/xmonad-9999.ebuild b/x11-wm/xmonad/xmonad-9999.ebuild
new file mode 100644
index 0000000..f997387
--- /dev/null
+++ b/x11-wm/xmonad/xmonad-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+CABAL_FEATURES="bin lib profile haddock hscolour"
+
+inherit haskell-cabal git
+
+DESCRIPTION="A tiling window manager"
+HOMEPAGE="http://xmonad.org"
+EGIT_REPO_URI="git://git.animux.de/xmonad"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.10
+		dev-haskell/mtl
+		>=dev-haskell/x11-1.5"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+SAMPLE_CONFIG="xmonad.hs"
+SAMPLE_CONFIG_LOC="man"
+
+src_install() {
+	cabal_src_install
+
+	echo -e "#!/bin/sh\n/usr/bin/xmonad" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	doman man/xmonad.1
+
+	dodoc CONFIG README
+}
+
+pkg_postinst() {
+	ghc-package_pkg_postinst
+
+	elog "A sample ${SAMPLE_CONFIG} configuration file can be found here:"
+	elog "    /usr/share/${PF}/ghc-$(ghc-version)/${SAMPLE_CONFIG_LOC}/${SAMPLE_CONFIG}"
+	elog "The parameters in this file are the defaults used by xmonad."
+	elog "To customize xmonad, copy this file to:"
+	elog "    ~/.xmonad/${SAMPLE_CONFIG}"
+	elog "After editing, use 'mod-q' to dynamically restart xmonad "
+	elog "(where the 'mod' key defaults to 'Alt')."
+	elog ""
+	elog "Read the README or man page for more information, and to see "
+	elog "other possible configurations go to:"
+	elog "    http://haskell.org/haskellwiki/Xmonad/Config_archive"
+	elog "Please note that many of these configurations will require the "
+	elog "x11-wm/xmonad-contrib package to be installed."
+}