more openstack goodness, and a cleanup, should have seperated these...

42 files changed, 132 insertions, 1395 deletions

diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 3abf039..ab0e8e9 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,6 +1,7 @@
 AUX glance-swift-authv2.patch 38569 SHA256 651afe783f515121d28cbbb94c7d14de5a5c3f7616edba8bf83e941c2c0eb4b4 SHA512 5038c473052b316a524f60f5be6fbf90bec565f74f8f8f44e1c55d5b8e079d68057551998470ee5b8f2da13a865d308dd52504128129f91ec141c846b590b4c3 WHIRLPOOL b077b62101be3b674256ffbd96064441b79c2fefb003011a5f8343e228b133982ecedbf750617e886f5291ca8727df361ce74b7809f8ba6feb156acff541f190
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
 AUX glance.initd 1101 SHA256 6fe85f10513646263755a2b2e232385dfc8dccb1be4f24b5c7e4f8879fb4f288 SHA512 674c68f13566ebd3443af9d6756f4cf4ebf6a17037a03ea93cb89d39f4f5a0141e572576890e481723b82e857040bfe075238d8c919e7a5fb33e1086e2a1e93a WHIRLPOOL 404e53d29f2f01218e445ce6dcdcdf6620ed6a9f245f2dc9020bd059ca461e1b72a692e7cd9c488daaaacb246160a8ca3a07e9481e536386891c07f3ee79b774
-DIST glance-2012.1.2.tar.gz 299991 SHA256 df03f968feb28ad301e5764070776d9e31cf08e4c85ce793e5079fe9b9d3e705
-EBUILD glance-2012.1.2.ebuild 1108 SHA256 17b956c34cb2b151854a843125a2beb1048a89e2906e443685dfbf3eebf2e7e4 SHA512 e012a54ebe91d238008dd53356918b062f606049a0aa4527e24478ebf07c914560378c5f524f75f0ec3b21d87ddcd114f0580bf0e6b75b149167306f4c83e129 WHIRLPOOL f7154e36dfb5d5150e91a8a86123ddb61b951fa3ba229181198cbeeccd288215c6db987e436f4ba76c835fc7433c1bfd598244613c6e891ff75adc99b63cb550
-EBUILD glance-9999.ebuild 1099 SHA256 74c444acb23496e45d1577d27277ecca481b77ff53b2113defa881c0a4b22812 SHA512 a5cce4fcaea0937e8289ea8439a08f17facdfc608d4dda999213008147c7c4caaf2e293938bcb216a771d65bfc80abad119fedab67fdf9329037b4c9e3976193 WHIRLPOOL ffe2ea0250f451f3f97cc07272ba4104d17584a78446a6aa94282dd6be2f8a3a2813619cdc619d54d38cb39ae90cb31608e0aadc258cffeccf03e024d40c1074
+DIST glance-2012.2.tar.gz 632955 SHA256 10f7ffaa1465a747a1f935bef7941334f47b62c8ede99d49fd002c8b4fed2cfc SHA512 60b298bc57523d6e7984e1c7aee8fb7bbef5815dcc20a273516d838e3d37aa9d62075ba036d2d711bf16ce537597cfe97dca04d0cff0cd720b8f540d51b0c561 WHIRLPOOL 8e40b6449a2c1a19937f3f4cbfc0a13e4d48c95ec33c1630b6ccfa623d3c035340177ec79a52e628312f00708111256812431ff1c92628e02d7ae5251d98403b
+EBUILD glance-2012.2.ebuild 1628 SHA256 5f8d1d4d6d9ccd76b369875b3aa64fd7ad443e326f28c611a636cb37fad7e394 SHA512 78fa55581daed5afce903e1201b5e0dea048bf275d7826aa63a9d74313d09561504f742d393c124adfac3c03208df2d53972af153893e1b2c0c2d7a8df3cf21c WHIRLPOOL bf1d9bed52d4e1391d313832be9747c59b355cc1c4e121ec69227f8e2f3b5e07125fc8b64a3c2116f2eaa08a8f34f450e882b514bd7a1211ddf1bdddcb156209
+EBUILD glance-9999.ebuild 1004 SHA256 00343d1772aaa3a87462d711ea6369a3231bc5021e27d37d10fc91afd99bf19b SHA512 38a1d196880481470b51b5a3498373d6e0bda196f4955016990220d21e556ec9ffc5d23ccc5e0faf75d46c2291406d6e997ed49b683c826ef45414d44740b201 WHIRLPOOL 21c6f5e0591f1a5817a0729406a3fe4b6a080f6cee203b6c9358d070cf67893513f633c1f3bbe02745baf8adac93f2ddf297df31f23e69275e9959b345d30e34
+MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
diff --git a/app-admin/glance/glance-2012.1.2.ebuild b/app-admin/glance/glance-2012.1.2.ebuild
deleted file mode 100644
index 7ebcfd7..0000000
--- a/app-admin/glance/glance-2012.1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-PYTHON_DEPENDS="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Provides services for discovering, registering, and retrieving
-virtual machine images. Glance has a RESTful API that allows querying of VM
-image metadata as well as retrieval of the actual image."
-HOMEPAGE="https://launchpad.net/glance"
-SRC_URI="http://launchpad.net/${PN}/essex/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}
-		 dev-python/webob
-		 dev-python/httplib2
-		 dev-python/routes
-		 dev-python/paste
-		 dev-python/pastedeploy
-		 dev-python/pyxattr
-		 dev-python/kombu"
-
-src_install() {
-	distutils_src_install
-	newconfd "${FILESDIR}/glance.confd" glance
-	newinitd "${FILESDIR}/glance.initd" glance
-
-	for function in api registry scrubber; do
-		dosym /etc/init.d/glance /etc/init.d/glance-${function}
-	done
-
-	diropts -m 0750
-	dodir /var/run/glance /var/log/nova /var/lock/nova
-}
diff --git a/app-admin/glance/glance-2012.2.ebuild b/app-admin/glance/glance-2012.2.ebuild
new file mode 100644
index 0000000..76161d7
--- /dev/null
+++ b/app-admin/glance/glance-2012.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+PYTHON_DEPENDS="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Provides services for discovering, registering, and retrieving
+virtual machine images with Openstack"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="http://launchpad.net/${PN}/folsom/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap mysql postgres +sqlite +swift"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-python/boto-2.1.1
+	dev-python/anyjson
+	dev-python/eventlet
+	dev-python/greenlet
+	dev-python/httplib2
+	dev-python/iso8601
+	dev-python/jsonschema
+	dev-python/kombu
+	dev-python/lxml
+	dev-python/passlib
+	dev-python/paste
+	dev-python/pastedeploy
+	dev-python/pycrypto
+	dev-python/routes
+	>=dev-python/sqlalchemy-migrate-0.7
+	>=dev-python/webob-1.0.8
+	virtual/python-argparse
+	swift? (
+		>=dev-python/python-swiftclient-1.2
+		<dev-python/python-swiftclient-2
+	)
+	sqlite? ( dev-python/sqlalchemy[sqlite] )
+	mysql? ( dev-python/sqlalchemy[mysql] )
+	postgres? ( dev-python/sqlalchemy[postgres] )
+	ldap? ( dev-python/python-ldap )
+	( || (
+		sys-auth/keystone[sqlite]
+		sys-auth/keystone[mysql]
+		sys-auth/keystone[postgres]
+		sys-auth/keystone[ldap]
+		) )"
+
+src_install() {
+	distutils_src_install
+	newconfd "${FILESDIR}/glance.confd" glance
+	newinitd "${FILESDIR}/glance.initd" glance
+
+	for function in api registry scrubber; do
+		dosym /etc/init.d/glance /etc/init.d/glance-${function}
+	done
+
+	diropts -m 0750
+	dodir /var/run/glance /var/log/nova /var/lock/nova
+}
diff --git a/app-admin/glance/glance-9999.ebuild b/app-admin/glance/glance-9999.ebuild
index a7957fe..e94264e 100644
--- a/app-admin/glance/glance-9999.ebuild
+++ b/app-admin/glance/glance-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -10,8 +10,7 @@ RESTRICT_PYTHON_ABIS="3.*"
 inherit git-2 distutils
 
 DESCRIPTION="Provides services for discovering, registering, and retrieving
-virtual machine images. Glance has a RESTful API that allows querying of VM
-image metadata as well as retrieval of the actual image."
+virtual machine images with Openstack"
 HOMEPAGE="https://launchpad.net/glance"
 EGIT_REPO_URI="https://github.com/openstack/glance.git"
 
diff --git a/app-admin/glance/metadata.xml b/app-admin/glance/metadata.xml
new file mode 100644
index 0000000..abed320
--- /dev/null
+++ b/app-admin/glance/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    Provides services for discovering, registering, and retrieving virtual 
+    machine images. Glance has a RESTful API that allows querying of VM image 
+    metadata as well as retrieval of the actual image.
+  </longdescription>
+  <use>
+    <flag name='swift'>Adds swift storage support</flag>
+  </use>
+</pkgmetadata>
+
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
new file mode 100644
index 0000000..88ed2ec
--- /dev/null
+++ b/dev-python/python-swiftclient/Manifest
@@ -0,0 +1,2 @@
+EBUILD python-swiftclient-1.2.0.ebuild 568 SHA256 dddff62a926b60516da84f414b40a6c5a2965ce1cea0ab390e7c9b16a189f09e SHA512 94678ffa9c2d8d8af110296f5b584a246c51b76bdb291413f9654a1c950b9cab22489f86723194afcbd26224dfde290faf457023b345b36c0d53e2f879dbdcfc WHIRLPOOL 01fc07f3ffdfc2379f65ee8eb5f1069ed91cc9b423532f54846f21d098b6c17977818d99916a93e6b8a90947787bfe431df2665dc83798251333f34865bad1b5
+MISC metadata.xml 323 SHA256 97e4defd9a3b763a49684a186cf615710fe3c893208bfd4640fb7ef0a576193f SHA512 03b6cfc7835743347b9279c7aafb05cccf8378a728adf85390059c3ba73afec272164ef59ee8e11965cbf9d26312c97a43603a354d456055e1c3c12c4b07e20d WHIRLPOOL bed51f25b8f94df301ee0744735dd029ec4e19f30b6ce43136fe12504812bc85e596a5bc42ef54b87d28ed85147f4213aaf690e2498588072f9715eec96656ec
diff --git a/dev-python/python-swiftclient/metadata.xml b/dev-python/python-swiftclient/metadata.xml
new file mode 100644
index 0000000..818e168
--- /dev/null
+++ b/dev-python/python-swiftclient/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    Python bindings to the OpenStack Object Storage API
+  </longdescription>
+</pkgmetadata>
+
diff --git a/dev-python/python-swiftclient/python-swiftclient-1.2.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-1.2.0.ebuild
new file mode 100644
index 0000000..8f5b081
--- /dev/null
+++ b/dev-python/python-swiftclient/python-swiftclient-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+PYTHON_DEPEND=2
+SUPPORT_PYTHON_ABIS=1
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit git-2 distutils
+
+DESCRIPTION="Python bindings to the OpenStack Object Storage API"
+HOMEPAGE="http://docs.openstack.org/developer/python-swiftclient"
+EGIT_REPO_URI="https://github.com/openstack/${PN}.git"
+# 1.2.0
+EGIT_COMMIT="68d1550"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-python/setuptools
+	dev-python/simplejson"
+RDEPEND="${DEPEND}"
diff --git a/media-sound/mangler/ChangeLog b/media-sound/mangler/ChangeLog
deleted file mode 100644
index e8471c5..0000000
--- a/media-sound/mangler/ChangeLog
+++ /dev/null
@@ -1,71 +0,0 @@
-# ChangeLog for media-sound/mangler
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mangler/ChangeLog,v 1.15 2012/05/05 08:33:47 mgorny Exp $
-
-  05 May 2012; Michał Górny <mgorny@gentoo.org> mangler-1.2.0.ebuild,
-  mangler-1.2.1.ebuild, mangler-1.2.2.ebuild:
-  dev-util/pkgconfig -> virtual/pkgconfig
-
-  08 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> mangler-1.2.2.ebuild:
-  x86 stable wrt bug #404051
-
-  23 Feb 2012; Agostino Sarubbo <ago@gentoo.org> mangler-1.2.2.ebuild:
-  Stable for amd64, wrt bug #404051
-
-*mangler-1.2.2 (15 Nov 2011)
-
-  15 Nov 2011; mthode <mthode@mthode.org> +mangler-1.2.2.ebuild:
-  Version bump to 1.2.2
-
-*mangler-1.2.1 (31 Oct 2010)
-
-  31 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> +mangler-1.2.1.ebuild:
-  Version bump wrt #338196 by Matthew Thode.
-
-  30 Jul 2010; Markos Chandras <hwoarang@gentoo.org> mangler-1.2.0.ebuild:
-  Stable on amd64 wrt bug #329329
-
-  23 Jul 2010; Christian Faulhammer <fauli@gentoo.org> mangler-1.2.0.ebuild:
-  stable x86, bug 329329
-
-*mangler-1.2.0 (16 Jun 2010)
-
-  16 Jun 2010; <chainsaw@gentoo.org> +mangler-1.2.0.ebuild:
-  Version bump, ebuild by Matthew Thode. Closes bug #324409.
-
-*mangler-1.2.0_beta1 (24 May 2010)
-
-  24 May 2010; <chainsaw@gentoo.org> +mangler-1.2.0_beta1.ebuild,
-  metadata.xml:
-  Version bump. Ebuild changes by Matthew Thode, closes bug #315167.
-
-  29 Jan 2010; Ben de Groot <yngwin@gentoo.org> -mangler-1.0_rc4.ebuild,
-  -mangler-1.0.0.ebuild, mangler-1.0.1.ebuild:
-  Add librsvg dep, remove old.
-
-*mangler-1.0.1 (05 Jan 2010)
-
-  05 Jan 2010; Ben de Groot <yngwin@gentoo.org> +mangler-1.0.1.ebuild:
-  Version bump
-
-  02 Dec 2009; Ben de Groot <yngwin@gentoo.org> mangler-1.0.0.ebuild:
-  Force the use of the newer upstream tarball, so we can drop the maintainer
-  mode workaround.
-
-*mangler-1.0.0 (02 Dec 2009)
-
-  02 Dec 2009; Ben de Groot <yngwin@gentoo.org> -mangler-1.0_rc3.ebuild,
-  +mangler-1.0.0.ebuild:
-  Version bump. Remove obsolete.
-
-*mangler-1.0_rc4 (28 Nov 2009)
-
-  28 Nov 2009; Ben de Groot <yngwin@gentoo.org> +mangler-1.0_rc4.ebuild:
-  Version bump
-
-*mangler-1.0_rc3 (22 Nov 2009)
-
-  22 Nov 2009; Ben de Groot <yngwin@gentoo.org> +mangler-1.0_rc3.ebuild,
-  +metadata.xml:
-  Initial import, ebuild based on the live svn one in multimedia overlay.
-
diff --git a/media-sound/mangler/Manifest b/media-sound/mangler/Manifest
deleted file mode 100644
index 7505eb3..0000000
--- a/media-sound/mangler/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST mangler-1.2.0.tar.gz 3781597 RMD160 45b6042dd560b963d9ce015c7f86724a22288cff SHA1 74dbfd0f99e474c22f291d2a966ca452535906cc SHA256 58cd8fe2ea4faf400ddc0951413c8dbd671b419add1975db68abb371d88ba1d3
-DIST mangler-1.2.1.tar.bz2 2878585 RMD160 5b4fc46246170fd9411ef9bbf28e54fa299382aa SHA1 982d95e6d734501992562d0dfed6454e228ee1f1 SHA256 cb1ca271a48f976595a3f62abbf05fe2e566d3548c14290dc2dedaf4ce7bcb71
-DIST mangler-1.2.2.tar.bz2 5187886 RMD160 c1b2f65fb0f695263f46bb55dc653566bc95c09e SHA1 c75f8b47e4d53a02926913f87b2b90c18afa2319 SHA256 17671760c006536fa05138e98422dceb59cbaa7295816b414d4626289e603f20
-DIST mangler-1.2.3.tar.bz2 5477896 RMD160 115025c5af97bb7514cb678c70af7abf12fbacd6 SHA1 017c329ce79ef8b87a8d4673df48e7b89c7bd6ab SHA256 5cf8678368885069cce2e58365d0e601dd6cc918a616e4c87cfd329df49056aa
-EBUILD mangler-1.2.0.ebuild 1127 RMD160 94f2ab03092be1c635b681be744f3d5d7291789c SHA1 d594939b3ae2b40947842e95d28b6c91905771e6 SHA256 18625f60c0489b33d440a3faf032556051d6ca27f811f2ce2d2d814e440284f6
-EBUILD mangler-1.2.1.ebuild 1446 RMD160 3bd8d7b3b6e6ab6d93d2a2bb23e819bf2be542ca SHA1 85484ffdb733213a28164e6542c569844244c022 SHA256 67791856e79efd2119a0f649804a9f88cf945f300f170952b565f771d46eb1a6
-EBUILD mangler-1.2.2.ebuild 1444 RMD160 ad8d316d6c81a06ddabdf1ddba4af33c7efdeaa4 SHA1 e3c00a4d5af3639278ecaaf4e3e8642de72cda12 SHA256 4150c02cb4077e94f057fc7e2d48fa992ab42d59d4c1281544b8c67cc7e34b87
-EBUILD mangler-1.2.3.ebuild 1438 RMD160 8254b506d1160ae5908f2da1d341c987e60ffe37 SHA1 8988b700e52bc7ff7eda506315af3f78fd5f4674 SHA256 5ab104dcefed969a87a1d2b01464b582da6622b2c1a1e66fe0ca908b949b8284
-MISC ChangeLog 2330 RMD160 d154d2c9d7ce1ae64dd65e397d9d49fc62b07367 SHA1 fb035e823ffb0d898ca1985ab00e99935d596712 SHA256 6b8da8f4cf7474cc0845ffea3a5c9dbb682876425d40820fecc9b894c4581959
-MISC metadata.xml 497 RMD160 abde6292cd6aaab661ede79c634744399ac0c0f1 SHA1 9a215b08bdc074525ea812f7234bec9f3d68aacc SHA256 d7ebd2d771dcfaae7be0c30c144dd2db627c5ec10ecb419bef913b1bfca4a8a5
diff --git a/media-sound/mangler/mangler-1.2.0.ebuild b/media-sound/mangler/mangler-1.2.0.ebuild
deleted file mode 100644
index d384d86..0000000
--- a/media-sound/mangler/mangler-1.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mangler/mangler-1.2.0.ebuild,v 1.4 2012/05/05 08:33:47 mgorny Exp $
-
-EAPI=2
-
-DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
-HOMEPAGE="http://www.mangler.org/"
-SRC_URI="http://www.mangler.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa celt espeak g15 +gsm pulseaudio +speex +xosd"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	gnome-base/librsvg
-	alsa? ( media-libs/alsa-lib )
-	celt? ( media-libs/celt )
-	espeak? ( app-accessibility/espeak )
-	g15? ( app-misc/g15daemon )
-	gsm? ( media-sound/gsm )
-	>=dev-libs/dbus-glib-0.80
-	pulseaudio? ( media-sound/pulseaudio )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_/}
-
-src_configure() {
-	econf $(use_with alsa) \
-	$(use_with pulseaudio) \
-	$(use_enable celt) \
-	$(use_enable espeak) \
-	$(use_enable g15) \
-	$(use_enable gsm) \
-	$(use_enable speex) \
-	$(use_enable xosd)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/media-sound/mangler/mangler-1.2.1.ebuild b/media-sound/mangler/mangler-1.2.1.ebuild
deleted file mode 100644
index 9fee989..0000000
--- a/media-sound/mangler/mangler-1.2.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mangler/mangler-1.2.1.ebuild,v 1.2 2012/05/05 08:33:47 mgorny Exp $
-
-EAPI=2
-
-DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
-HOMEPAGE="http://www.mangler.org/"
-SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa celt espeak g15 +gsm oss pulseaudio static-libs +speex +xosd"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	gnome-base/librsvg
-	>=dev-libs/dbus-glib-0.80
-	>=dev-libs/glib-2.20.1:2
-	>=x11-libs/gtk+-2.16:2
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	celt? ( >=media-libs/celt-0.7.1 )
-	espeak? ( app-accessibility/espeak )
-	g15? ( app-misc/g15daemon )
-	gsm? ( media-sound/gsm )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )
-	speex? ( >=media-libs/speex-1.2_rc1 )
-	xosd? ( x11-libs/xosd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable gsm) \
-		$(use_enable speex) \
-		$(use_enable celt) \
-		$(use_enable xosd) \
-		$(use_enable g15) \
-		$(use_enable espeak) \
-		$(use_with pulseaudio) \
-		$(use_with alsa) \
-		$(use_with oss)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-sound/mangler/mangler-1.2.2.ebuild b/media-sound/mangler/mangler-1.2.2.ebuild
deleted file mode 100644
index ca5d410..0000000
--- a/media-sound/mangler/mangler-1.2.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mangler/mangler-1.2.2.ebuild,v 1.4 2012/05/05 08:33:47 mgorny Exp $
-
-EAPI=2
-
-DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
-HOMEPAGE="http://www.mangler.org/"
-SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa celt espeak g15 +gsm oss pulseaudio static-libs +speex +xosd"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	gnome-base/librsvg
-	>=dev-libs/dbus-glib-0.80
-	>=dev-libs/glib-2.20.1:2
-	>=x11-libs/gtk+-2.16:2
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	celt? ( >=media-libs/celt-0.7.1 )
-	espeak? ( app-accessibility/espeak )
-	g15? ( app-misc/g15daemon )
-	gsm? ( media-sound/gsm )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )
-	speex? ( >=media-libs/speex-1.2_rc1 )
-	xosd? ( x11-libs/xosd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable gsm) \
-		$(use_enable speex) \
-		$(use_enable celt) \
-		$(use_enable xosd) \
-		$(use_enable g15) \
-		$(use_enable espeak) \
-		$(use_with pulseaudio) \
-		$(use_with alsa) \
-		$(use_with oss)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-sound/mangler/mangler-1.2.3.ebuild b/media-sound/mangler/mangler-1.2.3.ebuild
deleted file mode 100644
index c1800ee..0000000
--- a/media-sound/mangler/mangler-1.2.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mangler/mangler-1.2.2.ebuild,v 1.4 2012/05/05 08:33:47 mgorny Exp $
-
-EAPI=2
-
-DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
-HOMEPAGE="http://www.mangler.org/"
-SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa opus espeak g15 +gsm oss pulseaudio static-libs +speex +xosd"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	gnome-base/librsvg
-	>=dev-libs/dbus-glib-0.80
-	>=dev-libs/glib-2.20.1:2
-	>=x11-libs/gtk+-2.16:2
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	opus? ( media-libs/opus )
-	espeak? ( app-accessibility/espeak )
-	g15? ( app-misc/g15daemon )
-	gsm? ( media-sound/gsm )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )
-	speex? ( >=media-libs/speex-1.2_rc1 )
-	xosd? ( x11-libs/xosd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable gsm) \
-		$(use_enable speex) \
-		$(use_enable opus) \
-		$(use_enable xosd) \
-		$(use_enable g15) \
-		$(use_enable espeak) \
-		$(use_with pulseaudio) \
-		$(use_with alsa) \
-		$(use_with oss)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/media-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml
deleted file mode 100644
index 8d47f12..0000000
--- a/media-sound/mangler/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>sound</herd>
-  <use>
-    <flag name="celt">High quality, low delay audio codec</flag>
-    <flag name="espeak">Text to speach engine</flag>
-    <flag name="g15">Logitech g15 lcd support</flag>
-	<flag name="opus">Codec specialized for speach over the internet</flag>
-  </use>
-  <maintainer>
-    <email>prometheanfire@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
deleted file mode 100644
index 986adec..0000000
--- a/media-sound/spotify/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST spotify-client_0.8.4.103.g9cb177b.260-1_amd64.deb 31702600 SHA256 d350defa4164aaf129985df7e3ca33fc3f88aad2fac1637e6a26cc1794f3b378 SHA512 0f07ff8e2844d3f2626fa02351474a76b0d7178dd94d4d857ff2a0b6d28f887980889e4bc57fab18ab2a0cb6d7771e90bb7a20c2427ab69e2195f5de47ae3622 WHIRLPOOL 7d8a24fdbd9a12e92443264bcb01f27a322028c2074b40cb26e8f0e06195175ae8f369da41cde5d8dbe741792ad3250dc408addf9ceee594f2782a45772817f7
-DIST spotify-client_0.8.4.103.g9cb177b.260-1_i386.deb 28110850 SHA256 61502995da6b126eb6801bf92a8463a7fdd37dc6be0e0aba3560bdadde3531c7 SHA512 b48c70267781dc4b6d5afeee8061a95266de59ae02d252b054cd3a63a8bdcb19a461e7c28095d3884f7e7ff1129778ab7549dda9b891dc107f54182e13725dc2 WHIRLPOOL 0c443030bad393721c964c36561b84eb1388248a47d0dcc2f14541f5a33de4364a2de081e69c8c379e3a4ef529209b76d1f2e14fdaef68631471b414e01ba239
-EBUILD spotify-0.8.4.103.ebuild 4127 SHA256 6a231c2276d4e8137dd94b44cdfb80c3f31a401a6e13c7282f1708bba3658d04 SHA512 0d7e77c27f5c97443bd12263881a17358d1cfc3bd8a7d0609502d6fd86be71bca1830bc6b551e54c33a8e1b4c39df3064508ab49039b354929a055dd6e5c6685 WHIRLPOOL 9a5472c45e7b3b029d34f52aedd86f8a0e2ab604130edd98eb04ea6521f55f3ad8bec21a535ae6ddf9582bba8c02afe5818d554004a517d07b03553f011952c3
diff --git a/media-sound/spotify/spotify-0.8.4.103.ebuild b/media-sound/spotify/spotify-0.8.4.103.ebuild
deleted file mode 100644
index 2f9797c..0000000
--- a/media-sound/spotify/spotify-0.8.4.103.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit pax-utils
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-MY_PV="${PV}.g9cb177b.260-1"
-MY_P="${PN}-client_${MY_PV}"
-SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}/"
-#SRC_BASE="http://download.spotify.com/preview/"
-SRC_URI="
-	x86?   ( ${SRC_BASE}${MY_P}_i386.deb )
-	amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
-	"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel pulseaudio gnome"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXinerama
-		x11-libs/libXext
-		x11-libs/libxcb
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
-		x11-libs/qt-webkit:4
-		x11-libs/qt-dbus:4
-		x11-libs/libXScrnSaver
-		media-libs/freetype
-		media-libs/fontconfig
-		media-libs/alsa-lib
-		dev-libs/openssl:0
-		dev-libs/glib:2
-		media-libs/libpng:1.2
-		dev-db/sqlite:3
-		sys-libs/zlib
-		app-arch/bzip2
-		sys-apps/dbus
-		sys-apps/util-linux
-		dev-libs/expat
-		>=dev-libs/nspr-4.9
-		gnome-base/gconf:2
-		x11-libs/gtk+:2
-		dev-libs/nss
-		dev-libs/glib:2
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
-		gnome? ( gnome-extra/gnome-integration-spotify )"
-
-RESTRICT="mirror strip"
-
-src_unpack() {
-	mkdir "${P}"
-	cd "${P}"
-	unpack ${A}
-	unpack ./data.tar.gz
-}
-
-src_prepare() {
-	# link against openssl-1.0.0 as it crashes with 0.9.8
-	sed -i \
-		-e 's/\(lib\(ssl\|crypto\).so\).0.9.8/\1.1.0.0/g' \
-		usr/share/spotify/spotify || die "sed failed"
-	# different NSPR / NSS library names for some reason
-	sed -i \
-		-e 's/\(lib\(nss3\|nssutil3\|smime3\).so\).1d/\1.12/g' \
-		-e 's/\(lib\(plc4\|nspr4\).so\).0d\(.\)/\1.9\3\3/g' \
-		usr/share/spotify/libcef.so || die "sed failed"
-	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
-	if use gnome ; then
-	sed -i \
-		-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-		usr/share/applications/spotify.desktop || die "sed failed"
-	fi
-	#and fix other stuff in the desktop file as well
-	sed -i \
-		-e 's/x-scheme-handler\/spotify$/x-scheme-handler\/spotify\;/g' \
-		-e 's/AudioVideo$/AudioVideo\;/g' \
-		usr/share/applications/spotify.desktop || die "sed failed"
-}
-
-src_install() {
-	dodoc usr/share/doc/spotify-client/changelog.Debian.gz
-	dodoc usr/share/doc/spotify-client/copyright
-	insinto /usr/share/applications
-	doins usr/share/applications/*.desktop
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify
-	dodir ${SPOTIFY_HOME}
-	insinto ${SPOTIFY_HOME}
-	doins -r usr/share/spotify/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-	dodir /usr/share
-	dosym ${SPOTIFY_HOME} /usr/share/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify
-		#! /bin/sh
-		LD_PRELOAD="\${LD_PRELOAD} /usr/share/spotify/libcef.so"
-		export LD_PRELOAD
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	# revdep-rebuild produces a false positive because of symbol versioning
-	dodir /etc/revdep-rebuild
-	cat <<-EOF >"${D}"/etc/revdep-rebuild/10${PN}
-		SEARCH_DIRS_MASK="${SPOTIFY_HOME}"
-	EOF
-
-    if use pax_kernel; then                                                     
-		#create the headers, reset them to default, then paxmark -m them
-        pax-mark C "${ED}"/opt/${PN}/${PN} || die                                
-        pax-mark z "${ED}"/opt/${PN}/${PN} || die                                
-        pax-mark m "${ED}"/opt/${PN}/${PN} || die                                
-        eqawarn "You have set USE=pax_kernel meaning that you intendto run"
-        eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
-        eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-        eqawarn "you suspect that ${PN} is being broken by this modification,"
-        eqawarn "please open a bug."
-    fi
-}
-
-pkg_postinst() {
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-}
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 242d27d..3cf8f7d 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -3,6 +3,6 @@ AUX keystone.initd 1069 SHA256 70cbe2d37f139f4e7d99ac128b89d399e291cabd38b9db6e2
 DIST keystone-2012.1.2.tar.gz 447876 SHA256 0634eac122f38af11f73e7e8ef67d4dbb27e4179a23e78682f6b5212f6619c90
 DIST keystone-2012.2.tar.gz 547438 SHA256 1aed5911c00ebffea28cffbc4793921fb2a9c000e9bb967326b7db751c7281cc SHA512 bb6bb4499737474b49012fffffc4a7950a8427adb0b564f40d55bb7a43846e788266810d09ff54707709fba1db07a8b4b8d531e0547399490fe688e7b5d1fd32 WHIRLPOOL 825c9ac7357148cc0f9c732e946c6c07ccdf21ded3cf0f07d25c66615b991c6dcf72d48540c703c33addbf0e3c74c76a72709dd2ab4fe8b90c31addd92373912
 EBUILD keystone-2012.1.2.ebuild 893 SHA256 daa985940f05c56592acbb7868d054613591e2aae12e4d2ef2eb3e092e263010 SHA512 f0de6f8ecb1f5e3d5a32eac209866406e60f5845a4c9520cf779a05f5b1606a2fce8c3675df013079bc2dc8b5604e38ece779cb3d8f1e6042a5601e5e827102c WHIRLPOOL bc2d5ac99d54323a4f77da5a71ffe1ada949c7fe88d2cc7f916d62a49330c76bcf5dbf05cc0d025334668d0fd4a9573763bb27737769a3f0f68f9a8370130bd2
-EBUILD keystone-2012.2.ebuild 1527 SHA256 63fc00dabaa8022411a173b82c5e3850fb63dbf66a3ae372173c700b3f578b93 SHA512 70229d6accf98d16e234a3f33432bf178d34d20c443ee93cddc5ce01582c079c1d56b0967e813fa1c4f2590e4582ef221554fd4f2656e1feeda6b5bd94d227d8 WHIRLPOOL 7c32317645463a69f74925cac91f2dd0a86bfdf5268e979c7a604c0eea77cf26d6c85bb5021a0278c6087d038e164f3e5e3dd8d86b0607c5eab6172d905a3467
+EBUILD keystone-2012.2.ebuild 1566 SHA256 fbb3cd2aa681c700dce2f3db7de37f984b7090b658ec31dd1491ca72eca4d689 SHA512 9448e190970ef0fd32add1ac62cd1e388df4f20e229bbbc9c09e6e2b3ff492af33560bc0380fdc285f3330444fc88aaca416db033ecc86024bf176b0f815bfda WHIRLPOOL 945f03073dea47b46c7aea29a33c5bc81ad61623bc581d93fc7e277d0b3a97633ad0da699859474ec5d7af8fe8e4bceaee97f2c7af5de6dc1f4ee726cf937030
 EBUILD keystone-9999.ebuild 715 SHA256 9279e0d0c9a4bfd2a4076f310136bcee661e69ec14fd35fa797366402e8ab4ae SHA512 b63f413aaa4a92d6fbfcc70a53d1b9e4b99264d37a2b79703b1a993c7470487f8a5cdb3009c8a88e30d99f2b4d6d3e04762caf1d8ce7ba1ffbdf3124c2ba2ebb WHIRLPOOL d8544675a75bcd978162e066298e01243e1596315953a267fb602470c578f1c2180218d055d20b778c00e9f0989d4a545abad1fe3dc7bd74c7fe04b96e9f6454
 MISC metadata.xml 187 SHA256 773142fc211f4f8cd167704604281cbf366eabef6751c52a2895f63e9761a5a2 SHA512 81ef1f7d248dbdf4183b6700885e86071cee75bc1b69c3ed590c18193743da2562be527f212f088fe8ae9242b0aaaf7907912badae1264f14c2f5dde619c3fba WHIRLPOOL 32c1d67c8a74e4f3606e5aedc066ea7cdf09292beea0574c25d7448294b42ee9146a7724fcb9a7da04558e55c07619702e38e90656b962638cf747cb2c67ede3
diff --git a/sys-auth/keystone/keystone-2012.2.ebuild b/sys-auth/keystone/keystone-2012.2.ebuild
index 677b14c..cee9779 100644
--- a/sys-auth/keystone/keystone-2012.2.ebuild
+++ b/sys-auth/keystone/keystone-2012.2.ebuild
@@ -33,8 +33,9 @@ RDEPEND="${DEPEND}
 	dev-python/python-daemon
 	dev-python/python-pam
 	dev-python/routes
-	dev-python/sqlalchemy-migrate
-	dev-python/webob
+	>=dev-python/sqlalchemy-migrate-0.7
+	>=dev-python/webob-1.0.8
+	virtual/python-argparse
 	sqlite? ( dev-python/sqlalchemy[sqlite] )
 	mysql? ( dev-python/sqlalchemy[mysql] )
 	postgres? ( dev-python/sqlalchemy[postgres] )
diff --git a/sys-auth/swift-keystone2/Manifest b/sys-auth/swift-keystone2/Manifest
deleted file mode 100644
index 7e3053c..0000000
--- a/sys-auth/swift-keystone2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD swift-keystone2-9999.ebuild 616 RMD160 cce917936402a8700e29a39a18f29c555c07bfd5 SHA1 66fbffdac52cb2996dda774b8184f7646bae94c5 SHA256 4cbaf92edca02ba91aeb6ad24da9a89ae1c8c7326a0c785b9bd4c9dc42bf0280
diff --git a/sys-auth/swift-keystone2/swift-keystone2-9999.ebuild b/sys-auth/swift-keystone2/swift-keystone2-9999.ebuild
deleted file mode 100644
index 97c7908..0000000
--- a/sys-auth/swift-keystone2/swift-keystone2-9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit git-2 distutils
-
-DESCRIPTION="Keystone to Swift authentication and authorization system."
-HOMEPAGE="https://launchpad.net/swift"
-EGIT_REPO_URI="https://github.com/cloudbuilders/swift-keystone2.git"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="sys-cluster/swift"
-RDEPEND="${DEPEND}"
-
-# Can only use this when python.eclass is using EAPI4
-#REQUIRED_USE="|| ( storage-server proxy-server )"
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
deleted file mode 100644
index dbaaf4c..0000000
--- a/sys-cluster/nova/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX nova.confd 108 RMD160 e6ca2fa9454983ae2760a8474271d5829f140957 SHA1 157215430039e3c2da2f04c1fb8818c1ec690cb7 SHA256 b23978f2d41ac014e7ec7315608e3b3bdc2f4ea834c42a526784eb2fa7f97014
-AUX nova.initd 1152 RMD160 5764d66dfc94ee435276d63346ab0165e2a70a91 SHA1 066ae8198d52c7283cd2259d78401fdd464b5158 SHA256 0a6c7cd12b412a52048c99bbb89e23c10d27358b1269c4ac121078107f8e253c
-DIST nova-2011.3.tar.gz 3865204 RMD160 cbc336aa8da0a9ec1c635922139e400ef17d6488 SHA1 e6851c0adf97c3772e576c534c6c3ab7177a121f SHA256 3eeb9a1ee9bdcd52ca0c937bd4f83dd8b52e8f71b82753ba3f2f98f7859ef321
-DIST nova-2012.1.2.tar.gz 5754615 RMD160 839bc0b7f2158e67d91180cedc3289c316de03c8 SHA1 509ba09c4ecdce460da9e055de4d121f44a070df SHA256 b8383e4bc40facf0c50fe181702bcfb9cff053ad79979ca07134882e5b85eb5b
-DIST nova-2012.1.tar.gz 4359338 RMD160 ee86d911a1027d7d4df48461fd610ff5067d3931 SHA1 ff3c35561be362382218edfe4411b2b8279fb24e SHA256 2784292f8e7255a5246835382f745651a944407f15c2b77911072207dbadd24e
-DIST nova-2012.1~rc1.tar.gz 4247946 RMD160 a3e0b1b49bf5da6ca13aa4c6b01174ef8b210ca8 SHA1 9bc6f8efe7513ae7b645200d351a07119afffbd6 SHA256 10f1cc26909343fa425d89221c3b13aa45157921f6611d2fb52db9a7ce33af6b
-DIST nova-2012.1~rc3.tar.gz 4300506 RMD160 480ff0ff37b22f82c363aed8b7e7a168279b72e3 SHA1 fc2c61b4a1df2b7f3cec88cee7f7677276d69a1c SHA256 7f64933de717872854563926bfcda85be199cb7c3f015fbeb1edfce40bde1ad8
-DIST nova-2012.1~rc4.tar.gz 4359338 RMD160 ee86d911a1027d7d4df48461fd610ff5067d3931 SHA1 ff3c35561be362382218edfe4411b2b8279fb24e SHA256 2784292f8e7255a5246835382f745651a944407f15c2b77911072207dbadd24e
-EBUILD nova-2011.3.ebuild 1080 RMD160 1fb972e75b954e458df3f46d686f966e23f38b2d SHA1 f1898a8aa385cc897d6eacb957a20f473a45b561 SHA256 d4c3664035b1640f8c6a645bd925297de2c89c658bcb32370288dfc099595329
-EBUILD nova-2012.1.2.ebuild 1708 RMD160 d2981d9659cc5245e02bfa9a4099e76b6ef3fc8d SHA1 fdcc99a358e6741f0078626612b046aa483e64a3 SHA256 33716b05608f2d4375fe73b17d5bf17f23210e222d0022a5cd25b65cae06ee88
-EBUILD nova-2012.1.ebuild 1708 RMD160 d2981d9659cc5245e02bfa9a4099e76b6ef3fc8d SHA1 fdcc99a358e6741f0078626612b046aa483e64a3 SHA256 33716b05608f2d4375fe73b17d5bf17f23210e222d0022a5cd25b65cae06ee88
-EBUILD nova-2012.1_rc1-r1.ebuild 1746 RMD160 fb200cf353591461978614bc8a047824b25a4ac5 SHA1 9297fd864bb252bf424fb45d577372ee8a4fe19a SHA256 31ec14e86c02e024bd4967e6d6b1f1316da4322219a24060564131eb80df8f67
-EBUILD nova-2012.1_rc1.ebuild 1741 RMD160 f26a291775a69a13eee31edc4a1ba93b71c899c6 SHA1 5f20ca04b5fd3986e5b0189d13887a86b262d782 SHA256 4d569d1509da8a4cec96ca9f51681e7f36e1ee996199faa269a5fe1760d3e311
-EBUILD nova-2012.1_rc3.ebuild 1746 RMD160 e86d10e3e2130b70460584af5686eb53b71f89e4 SHA1 a2a6aa4e0bee014c487974f2b9b7f357f1908c3c SHA256 a4ae621c430894b784c80d84ee4f064cdf1d00bdc79738f2295543aadb2d57b3
-EBUILD nova-2012.1_rc4.ebuild 1746 RMD160 ad3c29503dfa7d9ff5e9a4c6767c53ce8bc2b318 SHA1 a766fe879affe3e47159dde1d7392ac6bca4711e SHA256 63ca458ae408bac95119258255eef6d90db92264bf75c2a4f098b1066c287d7e
-EBUILD nova-9999.ebuild 1508 RMD160 a62b346967bfd093eff6d5798fa7f763f41443f2 SHA1 0dca417970547da571253d6e5a968d9abe0fe388 SHA256 70bd4ba85b57f74126754a9d1521760c0398dafff00905a054fda90f2c8552d2
diff --git a/sys-cluster/nova/files/nova.confd b/sys-cluster/nova/files/nova.confd
deleted file mode 100644
index ed3bc5c..0000000
--- a/sys-cluster/nova/files/nova.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-FLAG_FILE=/etc/nova/nova.conf
-PID_PATH=/var/run/nova
-LOG_PATH=/var/log/nova
-NOVA_TMP_PATH=/var/lib/nova/tmp
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd
deleted file mode 100644
index b115c48..0000000
--- a/sys-cluster/nova/files/nova.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
-	need net
-}
-
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
-
-checkconfig() {
-	if [ ! -r /etc/conf.d/$BASENAME ]; then
-		eerror "No nova flagfile found: /etc/conf.d/$BASENAME)"
-		return 1
-	fi
-	if [ ${SVCNAME} == "nova-api" ]; then
-		if [ ! -r /etc/nova/api-paste.ini ]; then
-			eerror "No api-paste file found: /etc/nova/api-paste.ini)"
-			return 1
-		fi
-	fi
-	return 0
-}
-
-
-start() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-	
-	ebegin "Starting ${SVCNAME}"
-
-	export TMPDIR=${NOVA_TMP_PATH}
-	start-stop-daemon --start --quiet --make-pidfile --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-					  --exec /usr/bin/${SVCNAME} --background -- --flagfile=${FLAG_FILE} \
-					  --logfile=${LOG_PATH}/${SVCNAME}.log
-	
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-	
-	ebegin "Stopping ${SVCNAME}"
-	
-	start-stop-daemon --stop --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-					  --exec /usr/bin/${SVCNAME} 
-	eend $? "Failed to stop ${SVCNAME}"
-}
-
-#restart() {
-#
-#}
diff --git a/sys-cluster/nova/nova-2012.1.2.ebuild b/sys-cluster/nova/nova-2012.1.2.ebuild
deleted file mode 100644
index ef846cb..0000000
--- a/sys-cluster/nova/nova-2012.1.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-DESCRIPTION="Nova is a cloud computing fabric controller (the main part of an
-IaaS system). It is written in Python."
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="http://launchpad.net/${PN}/essex/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="controller"
-
-DEPEND="dev-python/setuptools
-        dev-python/lockfile
-        dev-python/netaddr
-        dev-python/eventlet
-        dev-python/python-gflags
-        dev-python/nosexcover
-        dev-python/sqlalchemy-migrate
-        dev-python/pylint
-        dev-python/mox
-        dev-python/pep8
-        dev-python/cheetah
-        dev-python/carrot
-        dev-python/lxml
-        dev-python/python-daemon
-        dev-python/wsgiref
-        dev-python/sphinx
-        dev-python/suds
-        dev-python/paramiko
-        dev-python/feedparser"
-RDEPEND="${DEPEND}
-         dev-python/m2crypto
-         app-admin/glance
-         dev-python/python-novaclient
-         dev-python/nova-adminclient
-         dev-python/boto
-         dev-python/prettytable
-         dev-python/mysql-python
-		 dev-python/iso8601
-         controller? ( net-misc/rabbitmq-server )"
-
-src_install() {
-	distutils_src_install
-	newconfd "${FILESDIR}/nova.confd" nova
-	newinitd "${FILESDIR}/nova.initd" nova
-
-	for function in api cert compute consoleauth network objectstore scheduler volume xvpvncproxy; do
-		dosym /etc/init.d/nova /etc/init.d/nova-${function}
-	done
-
-	diropts -m 0750
-	dodir /var/run/nova /var/log/nova /var/lock/nova
-}
diff --git a/sys-cluster/nova/nova-9999.ebuild b/sys-cluster/nova/nova-9999.ebuild
deleted file mode 100644
index ca8a101..0000000
--- a/sys-cluster/nova/nova-9999.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit git-2 distutils
-
-DESCRIPTION="Nova is a cloud computing fabric controller (the main part of an
-IaaS system). It is written in Python."
-HOMEPAGE="https://launchpad.net/nova"
-EGIT_REPO_URI="https://github.com/openstack/nova.git"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="controller"
-
-DEPEND="dev-python/setuptools
-        dev-python/lockfile
-		dev-python/netaddr
-		dev-python/eventlet
-		dev-python/python-gflags
-		dev-python/nosexcover
-		dev-python/sqlalchemy-migrate
-		dev-python/pylint
-		dev-python/mox
-		dev-python/pep8
-		dev-python/cheetah
-		dev-python/carrot
-		dev-python/lxml
-		dev-python/python-daemon
-		dev-python/wsgiref
-		dev-python/sphinx
-		dev-python/suds
-		dev-python/paramiko
-		dev-python/feedparser"
-RDEPEND="${DEPEND}
-		 dev-python/m2crypto
-		 app-admin/glance
-		 dev-python/python-novaclient
-		 dev-python/nova-adminclient
-		 dev-python/boto
-		 dev-python/prettytable
-		 dev-python/mysql-python
-		 controller? ( net-misc/rabbitmq-server )"
-
-src_install() {
-	distutils_src_install
-	newconfd "${FILESDIR}/nova.confd" nova
-	newinitd "${FILESDIR}/nova.initd" nova
-
-	for function in api compute network objectstore scheduler volume xvpvncproxy; do
-		dosym /etc/init.d/nova /etc/init.d/nova-${function}
-	done
-
-	diropts -m 0750
-	dodir /var/run/nova /var/log/nova /var/lock/nova
-}
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
deleted file mode 100644
index ceb8496..0000000
--- a/sys-cluster/swift/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX swift-1.5.0-client-authv2.patch 866 RMD160 60577406c1dc2f44cfddd0a1d7f86039c732a746 SHA1 081e4cf2243a68110c9bfbfec3653caaedcca78b SHA256 e7d422ccc5cbfcd19acf65727b62a8e5a4295ca081abfd0bae1893ff8bee4742
-AUX swift-proxy-server.initd 1491 RMD160 3e7869beb28f32106385cfff211e494a6dffd0d3 SHA1 54059efecf34bda8acb9ceb01f0c3ee20b109fa3 SHA256 6c6de4c0f320ad23f337b2df57db3f457f4ad90731f4f458ad37861baa3a34fd
-AUX swift-storage-server.confd 182 RMD160 6b0a6c3c539c06af077932cfc5ca4d33640413ec SHA1 90cf5c560e7e1a3b6c5c3ebd0bccbef74de939f5 SHA256 4a6d5cecadcf3e915ff88266b99b3d9c008daf88d0a940753be590eb4271c4d1
-AUX swift-storage-server.initd 1497 RMD160 c0ae10d9946413ab6ec9eed75339c60032d22092 SHA1 64ea41e023d188b5fa4c9739689953c9d4ace191 SHA256 1026950280b5e9894a8b81f81a8b3ecc09aeaec79a61fb3a228cc10a58eeba41
-DIST swift-1.4.3.tar.gz 355583 RMD160 5eeedc56647596baa07866c00e2c63f9f5b656d7 SHA1 1a1e7b49568251fbb4f45bee9f58b60c52e03caf SHA256 1638e8c0806b54aabfe58a3a618c5af33a9830ada7c2e820e9abdbbcda0e4da2
-DIST swift-1.4.5.tar.gz 391111 RMD160 09f74ff6afbb88bd1aed2888c5e40cf0b0eb6291 SHA1 cb74a1dffd49d3fb49861cce6fdab531f9e2ed19 SHA256 d6b1501f7ab6c53a361823211d576f1a7d4c81f14069919e3a33f581707c6451
-DIST swift-1.4.7.tar.gz 416927 RMD160 0607287549fd0a05e1b6eb5cd78f1c40daa74239 SHA1 00ef158427c35c7e2541e60b74fe4360c8c18e3f SHA256 7c72be0e0ae3e6db44764120b9e03eb0b5769a2ecd5c8bd79b216ca591c80360
-DIST swift-1.4.8.tar.gz 421496 RMD160 d4eab57d851c18ecfa8e016b64ceb82ff7a03823 SHA1 44d8d9cd96b94d80097eab34da6d1ed7268bb693 SHA256 9663dcf984725d31684291339c42892ab727aff83bfd8eb05169bb881806e7e4
-DIST swift-1.5.0.tar.gz 458825 RMD160 47c2daa47498732efc6f771c8587b21b674f11f1 SHA1 c77a12368b6be34752228db0f658aba02de8a1d5 SHA256 7edcc240609df677c9763867a2ec40711114190688e338b1a2b2dab4caca3844
-EBUILD swift-1.4.3.ebuild 650 RMD160 ddc210e288decd3180a64b2b0f313cc95b1c5405 SHA1 393eb54c73a872dbba87578327ee192fc5c176c3 SHA256 b6968a3c33be6bea6f9df464f992d982face1468fd73f4ea2b79baeb5ecb2443
-EBUILD swift-1.4.5.ebuild 1129 RMD160 b9e7240a3b85fe0dc2879beda1c30f75cd48da77 SHA1 87893f36cb7142301352f88429ae480725f2fba6 SHA256 391aa1bcf7b3aaeb54a0f164eaa8e01ae6a0d310ad7d682a468560de0a4e3bfa
-EBUILD swift-1.4.7.ebuild 1129 RMD160 b9e7240a3b85fe0dc2879beda1c30f75cd48da77 SHA1 87893f36cb7142301352f88429ae480725f2fba6 SHA256 391aa1bcf7b3aaeb54a0f164eaa8e01ae6a0d310ad7d682a468560de0a4e3bfa
-EBUILD swift-1.4.8.ebuild 1129 RMD160 b9e7240a3b85fe0dc2879beda1c30f75cd48da77 SHA1 87893f36cb7142301352f88429ae480725f2fba6 SHA256 391aa1bcf7b3aaeb54a0f164eaa8e01ae6a0d310ad7d682a468560de0a4e3bfa
-EBUILD swift-1.5.0.ebuild 1203 RMD160 74fa282bfc101f21bc6400f8b1e7c2898a77b516 SHA1 891e51570eec0df48d58533ff114c156c350e2c2 SHA256 7ac2a656d9bc9456d424bba2169ebdd723792938982e10c298a3de35e96bf9b9
-EBUILD swift-9999.ebuild 1149 RMD160 cd93c0c9c1c090fb9af8eecc881a7d676e46fd44 SHA1 fe21cf775640efaa6366649615ac874ab7697816 SHA256 6c64e83916d13a710fac48b74ae69af165d510477a2a80034c30520b7aff4b75
diff --git a/sys-cluster/swift/files/swift-1.5.0-client-authv2.patch b/sys-cluster/swift/files/swift-1.5.0-client-authv2.patch
deleted file mode 100644
index 5fd7072..0000000
--- a/sys-cluster/swift/files/swift-1.5.0-client-authv2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- swift-1.5.0.org/swift/common/client.py	2012-06-19 12:40:25.000000000 +0200
-+++ swift-1.5.0/swift/common/client.py	2012-06-19 12:39:51.000000000 +0200
-@@ -187,6 +187,10 @@
- 
- 
- def _get_auth_v2_0(url, user, tenant_name, key, snet):
-+    if not tenant_name and ':' in user:
-+        tenant_name, user = user.split(':', 1)
-+    if not tenant_name:
-+        raise ClientException('No tenant specified')
-     body = {'auth': {'passwordCredentials':
-                       {'password': key, 'username': user},
-                      'tenantName': tenant_name}}
-@@ -238,8 +242,6 @@
-     if auth_version in ["1.0", "1"]:
-         return _get_auth_v1_0(url, user, key, snet)
-     elif auth_version in ["2.0", "2"]:
--        if not tenant_name:
--            raise ClientException('No tenant specified')
-         return _get_auth_v2_0(url, user, tenant_name, key, snet)
- 
- 
diff --git a/sys-cluster/swift/files/swift-proxy-server.initd b/sys-cluster/swift/files/swift-proxy-server.initd
deleted file mode 100755
index 705d1e5..0000000
--- a/sys-cluster/swift/files/swift-proxy-server.initd
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-#
-# Author: Cor Cornelisse <corcornelisse@gmail.com>
-
-depend() {
-	need net
-}
-
-opts="reload"
-
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
-SERVERNAME=$(echo $SVCNAME | cut -c 7-)
-
-checkconfig() {
-	if [ ! -r /etc/${BASENAME}/${SERVICENAME} ]; then
-		eerror "No config file found: /etc/${BASENAME}/${SERVICENAME}"
-		return 1
-	fi
-	return 0
-}
-
-
-start() {
-	checkconfig || return $?
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --pidfile "/var/run/${BASENAME}/${SERVERNAME}.pid" \
-					  --exec /usr/bin/${BASENAME}-init -- ${SERVERNAME} start
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	checkconfig || return $?
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile "/var/run/${BASENAME}/${SERVERNAME}.pid" \
-					  --exec /usr/bin/${BASENAME}-init -- ${SERVERNAME} stop 
-	eend $? "Failed to stop ${SVCNAME}"
-}
-
-reload() {
-	checkconfig || return $?
-
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --exec /usr/bin/${BASENAME}-init -- ${SERVERNAME} reload
-	eend $? "Failed to reload ${SVCNAME}"
-}
-
-restart() {
-	checkconfig || return $?
-
-	ebegin "Restarting ${SVCNAME}"
-	start-stop-daemon --exec /usr/bin/${BASENAME}-init -- ${SERVERNAME} restart
-	eend $? "Failed to restart ${SVCNAME}"
-}
-
-status() {
-	start-stop-daemon --exec /usr/bin/${BASENAME}-init -- ${SERVERNAME} status
-	eend $? "Failed to get status for ${SVCNAME}"
-}
-
diff --git a/sys-cluster/swift/files/swift-storage-server.confd b/sys-cluster/swift/files/swift-storage-server.confd
deleted file mode 100644
index 8735b99..0000000
--- a/sys-cluster/swift/files/swift-storage-server.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-SERVERS="account container object"
-
-ACCOUNTSERVICE="server replicator auditor"
-CONTAINERSERVICE="server replicator updater auditor"
-OBJECTSERVICE="server replicator updater auditor"
diff --git a/sys-cluster/swift/files/swift-storage-server.initd b/sys-cluster/swift/files/swift-storage-server.initd
deleted file mode 100755
index 58d1251..0000000
--- a/sys-cluster/swift/files/swift-storage-server.initd
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-#
-# Author: Cor Cornelisse <corcornelisse@gmail.com>
-
-depend() {
-	need net
-}
-
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
-
-checkconfig() {
-	if [ ! -r /etc/${BASENAME}/${BASENAME}.conf ]; then
-		eerror "Missing required config file: /etc/${BASENAME}/${BASENAME}.conf"
-		return 1
-	fi
-	for server in ${SERVERS}; do
-		if [ ! -r /etc/${BASENAME}/${server}-server.conf ]; then
-			eerror "Missing required config file: /etc/${BASENAME}/${SERVER}-server.conf"
-			return 1
-		fi
-	done
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	einfo "Starting all ${BASENAME} services:"
-
-	for server in ${SERVERS}; do
-		for service in $(eval "echo \$${server^^}SERVICE"); do
-			ebegin "Starting $server-$service"
-			start-stop-daemon --start --pidfile \
-					  "/var/run/${BASENAME}/$server-$service.pid" \
-					  --exec /usr/bin/${BASENAME}-init \
-					  -- $server-$service start
-			eend $? "Failed to start $server-$service"
-		done
-	done
-}
-
-stop() {
-	checkconfig || return $?
-
-	einfo "Stopping all ${BASENAME} services:"
-
-	for server in ${SERVERS}; do
-		for service in $(eval "echo \$${server^^}SERVICE"); do
-			ebegin "Stopping $server-$service"
-			start-stop-daemon --stop --pidfile \
-					  "/var/run/${BASENAME}/$server-$service.pid" \
-					  --exec /usr/bin/${BASENAME}-init \
-					  -- $server-$service stop
-			eend $? "Failed to stop $server-$service"
-		done
-	done
-}
diff --git a/sys-cluster/swift/swift-1.5.0.ebuild b/sys-cluster/swift/swift-1.5.0.ebuild
deleted file mode 100644
index 374639b..0000000
--- a/sys-cluster/swift/swift-1.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="Swift is a highly available, distributed, eventually consistent
-object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-SRC_URI="http://launchpad.net/${PN}/folsom/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="storage-server proxy-server"
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}
-		 dev-python/netifaces
-		 dev-python/eventlet
-		 dev-python/webob
-		 dev-python/pastedeploy
-		 dev-python/pyxattr"
-
-# Can only use this when python.eclass is using EAPI4
-#REQUIRED_USE="|| ( storage-server proxy-server )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-client-authv2.patch"
-}
-
-src_install()
-{
-	distutils_src_install
-
-	dodir "/var/run/swift"
-
-	if use proxy-server; then
-		newinitd "${FILESDIR}/swift-proxy-server.initd" swift-proxy-server
-	fi
-
-	if use storage-server; then
-		newinitd "${FILESDIR}/swift-storage-server.initd" swift-storage-server
-		newconfd "${FILESDIR}/swift-storage-server.confd" swift-storage-server
-	fi
-}
diff --git a/sys-cluster/swift/swift-9999.ebuild b/sys-cluster/swift/swift-9999.ebuild
deleted file mode 100644
index 9b78a76..0000000
--- a/sys-cluster/swift/swift-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit git-2 distutils
-
-DESCRIPTION="Swift is a highly available, distributed, eventually consistent
-object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-EGIT_REPO_URI="https://github.com/openstack/swift.git"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="storage-server proxy-server"
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}
-         dev-python/netifaces
-         dev-python/eventlet
-         dev-python/webob
-         dev-python/pastedeploy
-         dev-python/pyxattr"
-
-# Can only use this when python.eclass is using EAPI4
-#REQUIRED_USE="|| ( storage-server proxy-server )"
-
-src_install()
-{
-	distutils_src_install
-
-	dodir "/var/run/swift"
-
-	if use proxy-server; then
-		newinitd "${FILESDIR}/swift-proxy-server.initd" swift-proxy-server
-	fi
-
-	if use storage-server; then
-		newinitd "${FILESDIR}/swift-storage-server.initd" swift-storage-server
-		newconfd "${FILESDIR}/swift-storage-server.confd" swift-storage-server
-	fi
-}
diff --git a/www-apps/horizon/Manifest b/www-apps/horizon/Manifest
deleted file mode 100644
index 45b153f..0000000
--- a/www-apps/horizon/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX horizon_vhost.conf 529 RMD160 b2e7ecd9c9ec8dcbe90aa500edf0f4c5381a81fd SHA1 d468e6c5ad59d473a1c60c0ccf945f47e5a0caa3 SHA256 9e74616a632e153a88c6d4c2d58c4c4e86e1a3526cccd41643dd27fe2e175d8d
-AUX revert-bugfix-974916.patch 6011 RMD160 60b833032eea86723e8733517fe3eb139247257e SHA1 3b2609ba55b6e54c8a3297a4d04cadff6b044d13 SHA256 c232929fc3862334e3cbf199de4ac841bd90feeccbc8aafdd470b42c9bdc483f
-DIST horizon-2012.1.1.tar.gz 609478 RMD160 17385003e281bf3e098601bf546522dce95a8bc0 SHA1 caf88a1b915d298799fa71b41ecd2583d2d299ea SHA256 9313c01f3f0ef87941f0f49ebea9ccfe68385bf8bed625eb3fe36284d41fd74a
-DIST horizon-2012.1.tar.gz 606289 RMD160 908b4688bb8df6a652dbc1a05cd427e9781f2ce6 SHA1 6ce163482981e8151a4dbfb8584df662387a673f SHA256 68752c6a3d793c0fdc232dfe2a11c1702db9d8c1097f4d9211a3adafe82c445b
-DIST horizon-2012.1~rc1.tar.gz 585720 RMD160 5abb143d68c9f9bea5fdef9b1efa31f7beea5983 SHA1 40c6801961ba5a8e68b35b24c5869d35a9ac7070 SHA256 4b7b141997d0e0ed544a1c1b5c72d49b6089240d6e865d44a2904b9cc91c917d
-DIST horizon-2012.1~rc2.tar.gz 606289 RMD160 908b4688bb8df6a652dbc1a05cd427e9781f2ce6 SHA1 6ce163482981e8151a4dbfb8584df662387a673f SHA256 68752c6a3d793c0fdc232dfe2a11c1702db9d8c1097f4d9211a3adafe82c445b
-EBUILD horizon-2012.1.1-r1.ebuild 2044 RMD160 f67a4f13211d44adc60eea644c91b930e8d730c2 SHA1 14a949af3e12d212d3e5a5eaeb4cf87429127d43 SHA256 a6bc153df585cc517630c4db642a63e1ee5b6276b07e0013d8cbea6f5efdfa85
-EBUILD horizon-2012.1.1.ebuild 1976 RMD160 5e3118b0c5b0d66674e38b3a3383a8c084a7301b SHA1 8b78c7d3ce85790d54559593cbe113f8ef17da2b SHA256 6a2542d79dbfb0062fb1140dc7632c892978af89fef3a85c771c64ebc4422a5a
-EBUILD horizon-2012.1.ebuild 1975 RMD160 2a070d9b414e77406e19cad2d5f9a964e54d15a5 SHA1 7c6ef6a435717db510a61fbaeff20862c4a771e8 SHA256 4fb11b5e083f25e25284be6ddcbe3d3be6349547d2bd3ef96e4c5ff68c2eaa3a
-EBUILD horizon-2012.1_rc1.ebuild 2007 RMD160 fd992f0be7ba9bc2c03b938775e739a84f60726b SHA1 8b7a713ff58f8c6ce6fd2eff77b06826dfb08afd SHA256 57d3caa1cddb56bb8750fb05ffe0a0ae5ba62d402df83c78ab232f592bb7b431
-EBUILD horizon-2012.1_rc2.ebuild 2010 RMD160 7210975e3bb1ceeedb33a4905762554f0f84b727 SHA1 bbf97aef72f14ea13cce3c20350e0c192bb01b86 SHA256 303deb4e7645a55c95aa7da22c0e746a5176b67c425df2a26e5426efe20560ac
-EBUILD horizon-9999.ebuild 1513 RMD160 88417143b72bd0bd7806b648f01ecb992f193b73 SHA1 7adf76bf15b3873ad87f33d62a5620cd74503559 SHA256 ea79e41a993731592e43dc4e3690ec4fbc3d1638e651a855babffe9f603c03d3
diff --git a/www-apps/horizon/files/horizon_vhost.conf b/www-apps/horizon/files/horizon_vhost.conf
deleted file mode 100644
index 45df6ec..0000000
--- a/www-apps/horizon/files/horizon_vhost.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-Listen 8000
-WSGIPythonPath /usr/lib64/python2.7/site-packages/horizon
-WSGIPythonPath /usr/lib64/python2.7/site-packages
-<VirtualHost localhost:8000>
-	ServerName localhost
-	WSGIScriptAlias / /usr/lib64/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi
-	Alias /media/admin/ /usr/lib64/python2.7/site-packages/django/contrib/admin/media/
-	<Directory "/usr/lib64/python2.7/site-packages/openstack_dashboard">
-    	AllowOverride None
-	    Options None
-	    Order allow,deny
-	    Allow from all
-	</Directory>
-</VirtualHost>
diff --git a/www-apps/horizon/files/revert-bugfix-974916.patch b/www-apps/horizon/files/revert-bugfix-974916.patch
deleted file mode 100644
index 70a6ac5..0000000
--- a/www-apps/horizon/files/revert-bugfix-974916.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -urN horizon-2012.1.1.orig/horizon/dashboards/nova/instances_and_volumes/tests.py horizon-2012.1.1/horizon/dashboards/nova/instances_and_volumes/tests.py
---- horizon-2012.1.1.orig/horizon/dashboards/nova/instances_and_volumes/tests.py	2012-09-17 14:42:01.691620470 +0200
-+++ horizon-2012.1.1/horizon/dashboards/nova/instances_and_volumes/tests.py	2012-09-17 14:43:11.002618777 +0200
-@@ -18,7 +18,6 @@
- #    License for the specific language governing permissions and limitations
- #    under the License.
- 
--from copy import deepcopy
- from django import http
- from django.core.urlresolvers import reverse
- from mox import IsA
-@@ -43,50 +42,7 @@
-         self.assertTemplateUsed(res,
-             'nova/instances_and_volumes/index.html')
-         instances = res.context['instances_table'].data
--        volumes = res.context['volumes_table'].data
--
-         self.assertItemsEqual(instances, self.servers.list())
--        self.assertItemsEqual(volumes, self.volumes.list())
--
--    def test_attached_volume(self):
--        volumes = deepcopy(self.volumes.list())
--        attached_volume = deepcopy(self.volumes.list()[0])
--        attached_volume.id = "2"
--        attached_volume.display_name = "Volume2 name"
--        attached_volume.size = "80"
--        attached_volume.status = "in-use"
--        attached_volume.attachments = [{"server_id": "1",
--                                        "device": "/dev/hdn"}]
--        volumes.append(attached_volume)
--
--        self.mox.StubOutWithMock(api, 'server_list')
--        self.mox.StubOutWithMock(api, 'volume_list')
--        api.server_list(IsA(http.HttpRequest)).AndReturn(self.servers.list())
--        api.volume_list(IsA(http.HttpRequest)).AndReturn(volumes)
--
--        self.mox.ReplayAll()
--
--        res = self.client.get(
--            reverse('horizon:nova:instances_and_volumes:index'))
--
--        self.assertTemplateUsed(res,
--            'nova/instances_and_volumes/index.html')
--        instances = res.context['instances_table'].data
--        resp_volumes = res.context['volumes_table'].data
--
--        self.assertItemsEqual(instances, self.servers.list())
--        self.assertItemsEqual(resp_volumes, volumes)
--
--        self.assertContains(res, ">Volume name<", 1, 200)
--        self.assertContains(res, ">40 GB<", 1, 200)
--        self.assertContains(res, ">Available<", 1, 200)
--
--        self.assertContains(res, ">Volume2 name<", 1, 200)
--        self.assertContains(res, ">80 GB<", 1, 200)
--        self.assertContains(res, ">In-Use<", 1, 200)
--        self.assertContains(res,
--                            ">Instance server_1 (1)</a>&nbsp;on /dev/hdn",
--                            1, 200)
- 
-     def test_index_server_list_exception(self):
-         self.mox.StubOutWithMock(api, 'server_list')
-@@ -94,7 +50,6 @@
-         exception = novaclient_exceptions.ClientException('apiException')
-         api.server_list(IsA(http.HttpRequest)).AndRaise(exception)
-         api.volume_list(IsA(http.HttpRequest)).AndReturn(self.volumes.list())
--        api.server_list(IsA(http.HttpRequest)).AndReturn(self.servers.list())
- 
-         self.mox.ReplayAll()
- 
-diff -urN horizon-2012.1.1.orig/horizon/dashboards/nova/instances_and_volumes/views.py horizon-2012.1.1/horizon/dashboards/nova/instances_and_volumes/views.py
---- horizon-2012.1.1.orig/horizon/dashboards/nova/instances_and_volumes/views.py	2012-09-17 14:42:01.690620470 +0200
-+++ horizon-2012.1.1/horizon/dashboards/nova/instances_and_volumes/views.py	2012-09-17 14:44:19.782617090 +0200
-@@ -46,7 +46,7 @@
-     def get_instances_data(self):
-         # Gather our instances
-         try:
--            instances = self._get_instances()
-+            instances = api.server_list(self.request)
-         except:
-             instances = []
-             exceptions.handle(self.request, _('Unable to retrieve instances.'))
-@@ -67,18 +67,8 @@
-         # Gather our volumes
-         try:
-             volumes = api.volume_list(self.request)
--            instances = SortedDict([(inst.id, inst) for inst in
--                                    self._get_instances()])
--            for volume in volumes:
--                for att in volume.attachments:
--                    att['instance'] = instances[att['server_id']]
-         except novaclient_exceptions.ClientException, e:
-             volumes = []
-             LOG.exception("ClientException in volume index")
-             messages.error(self.request, _('Unable to fetch volumes: %s') % e)
-         return volumes
--
--    def _get_instances(self):
--        if not hasattr(self, "_instances_list"):
--            self._instances_list = api.server_list(self.request)
--        return self._instances_list
-diff -urN horizon-2012.1.1.orig/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py horizon-2012.1.1/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py
---- horizon-2012.1.1.orig/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py	2012-09-17 14:42:01.691620470 +0200
-+++ horizon-2012.1.1/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py	2012-09-17 14:45:45.039615013 +0200
-@@ -85,16 +85,16 @@
- 
- def get_attachment(volume):
-     attachments = []
--    link = '<a href="%(url)s">Instance %(name)s (%(instance)s)</a>&nbsp;' \
--           'on %(dev)s'
-+    link = '<a href="%(url)s">Instance %(instance)s&nbsp;' \
-+           '<small>(%(dev)s)</small></a>'
-     # Filter out "empty" attachments which the client returns...
-     for attachment in [att for att in volume.attachments if att]:
-         url = reverse("%s:instances:detail" % URL_PREFIX,
-                       args=(attachment["server_id"],))
-         # TODO(jake): Make "instance" the instance name
-         vals = {"url": url,
--                "name": attachment["instance"].name,
--                "instance": attachment["server_id"],
-+                
-+		"instance": attachment["server_id"],
-                 "dev": attachment["device"]}
-         attachments.append(link % vals)
-     return safestring.mark_safe(", ".join(attachments))
diff --git a/www-apps/horizon/horizon-2012.1.1-r1.ebuild b/www-apps/horizon/horizon-2012.1.1-r1.ebuild
deleted file mode 100644
index e4cecc1..0000000
--- a/www-apps/horizon/horizon-2012.1.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit distutils eutils
-
-DESCRIPTION="The OpenStack Dashboard (Horizon) provides a baseline user
-interface for managing OpenStack services. It is a reference implementation
-built using the django-openstack project which contains all of the core
-functionality needed to develop a site-specific implementation."
-HOMEPAGE="http://wiki.openstack.org/OpenStackDashboard"
-SRC_URI="http://launchpad.net/${PN}/essex/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-python/django-1.3.1
-	    dev-python/python-dateutil
-		dev-python/sphinx
-		dev-python/cherrypy
-		dev-python/coverage
-		dev-python/nose
-		dev-python/mox
-		dev-python/pep8
-		dev-python/pylint
-		dev-python/pastedeploy
-		dev-python/eventlet
-		dev-python/kombu
-		dev-python/pycrypto
-		dev-python/routes
-		dev-python/sqlalchemy
-		dev-python/sqlalchemy-migrate
-		dev-python/webob
-		dev-python/pyxattr
-		dev-python/python-gflags
-		dev-python/python-keystoneclient
-		dev-python/python-novaclient
-		dev-python/python-cloudfiles
-		app-admin/glance
-		dev-python/setuptools
-		www-apps/noVNC"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch ${FILESDIR}"/revert-bugfix-974916.patch"
-}
-
-src_install() {
-	distutils_src_install
-	dodoc ${FILESDIR}"/horizon_vhost.conf"
-	dodir /etc/horizon
-	insinto /etc/horizon
-	doins openstack_dashboard/local/local_settings.py.example
-	# Little dirty this way, but get's the job done bro
-	dosym /etc/horizon/local_settings.py /usr/lib64/python2.7/site-packages/openstack_dashboard/local/local_settings.py
-}
-
-pkg_postinst() {
-	elog
-	elog "A vhost configuration example for apache2 with mod_wsgi can be found"
-	elog "in /usr/share/doc/${PF}/horizon_vhost.conf"
-	elog "Adapt it to suite your needs, and install it in /etc/apache/vhosts.d/"
-	elog "Replace localhost by the real servername"
-	elog
-	elog "The dashboard can be configured through /etc/horizon/settings.py"
-	elog
-}
diff --git a/www-apps/horizon/horizon-9999.ebuild b/www-apps/horizon/horizon-9999.ebuild
deleted file mode 100644
index 71a967a..0000000
--- a/www-apps/horizon/horizon-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit git-2 distutils eutils
-
-DESCRIPTION="The OpenStack Dashboard (Horizon) provides a baseline user
-interface for managing OpenStack services. It is a reference implementation
-built using the django-openstack project which contains all of the core
-functionality needed to develop a site-specific implementation."
-HOMEPAGE="http://wiki.openstack.org/OpenStackDashboard"
-EGIT_REPO_URI="https://github.com/openstack/horizon"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="=dev-python/django-1.3.1
-	    dev-python/python-dateutil
-		dev-python/sphinx
-		dev-python/cherrypy
-		dev-python/coverage
-		dev-python/nose
-		dev-python/mox
-		dev-python/pep8
-		dev-python/pylint
-		dev-python/pastedeploy
-		dev-python/eventlet
-		dev-python/kombu
-		dev-python/pycrypto
-		dev-python/routes
-		dev-python/sqlalchemy
-		dev-python/sqlalchemy-migrate
-		dev-python/webob
-		dev-python/pyxattr
-		dev-python/python-gflags
-		dev-python/python-novaclient
-		dev-python/python-cloudfiles
-		app-admin/glance
-		dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-DISTUTILS_SETUP_FILES=("horizon/setup.py" "openstack-dashboard/setup.py")
-
-src_install() {
-	distutils_src_install
-
-	#newconfd "${FILESDIR}/openstack-dashboard.confd" openstack-dashboard
-	#newinitd "${FILESDIR}/openstack-dashboard.initd" openstack-dashboard
-
-	#diropts -m 0750
-	#dodir /var/run/quantum /var/log/quantum
-}
-
diff --git a/www-apps/noVNC/Manifest b/www-apps/noVNC/Manifest
deleted file mode 100644
index b9f5a70..0000000
--- a/www-apps/noVNC/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX noVNC.confd 104 RMD160 39e7784520afe42c61a1baa35b6b8f69ad7e3287 SHA1 1664a089d8e981910550c6cf5ce016d7ceacedb1 SHA256 f6b072f2292701ded2c9acdc6a2a55d1d2c9b43c6db41ed99a7993d823b51512
-AUX noVNC.initd 1083 RMD160 94044557dc720f266d22a3193b6edde51c72279d SHA1 a2aee95688afcebebf52f20980073a44b085b01a SHA256 897664e68e406ea8feaa6d6fc4b3cd6e0710a377b83c2876d18f6e8cba3777d0
-EBUILD noVNC-9999.ebuild 1288 RMD160 763d8863994e07c3a868b4f6c38bcb459eebed57 SHA1 7d84c0f5fc60cb158098310186ed47dd9bd63b35 SHA256 fd7c513e89d4dc8848d16c5048c6fe57cdca53cbfff983efe66587cb462220ee
diff --git a/www-apps/noVNC/files/noVNC.confd b/www-apps/noVNC/files/noVNC.confd
deleted file mode 100644
index 50ddb5c..0000000
--- a/www-apps/noVNC/files/noVNC.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-FLAG_FILE=/etc/nova/nova.conf
-WEB_ROOT=/opt/noVNC
-LOG_PATH=/var/log/noVNC
-CERT_FILE=/opt/noVNC/self.pem
diff --git a/www-apps/noVNC/files/noVNC.initd b/www-apps/noVNC/files/noVNC.initd
deleted file mode 100755
index f3b88a2..0000000
--- a/www-apps/noVNC/files/noVNC.initd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-#
-# Author: Cor Cornelisse <corcornelisse@gmail.com>
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -r /etc/conf.d/${SVCNAME} ]; then
-		eerror "No config file found: /etc/conf.d/${SVCNAME}"
-		return 1
-	fi
-	return 0
-}
-
-
-start() {
-	checkconfig || return $?
-	. /etc/conf.d/${SVCNAME}
-	
-	ebegin "Starting ${SVCNAME}"
-	
-	start-stop-daemon --start --quiet --make-pidfile --pidfile \
-					  "/var/run/${SVCNAME}.pid" --background \
-					  --stdout ${LOG_PATH}/${SVCNAME}.log \
-					  --stderr ${LOG_PATH}/${SVCNAME}.err --exec \
-					  /opt/noVNC/utils/nova-novncproxy -- \
-					  --flagfile=${FLAG_FILE} --cert=${CERT_FILE} \
-					  --web ${WEB_ROOT}
-					  
-	
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	checkconfig || return $?
-	. /etc/conf.d/${SVCNAME}
-	
-	ebegin "Stopping ${SVCNAME}"
-	
-	start-stop-daemon --stop --pidfile "/var/run/${SVCNAME}.pid" \
-					  --exec /opt/noVNC/utils/nova-novncproxy 
-	eend $? "Failed to stop ${SVCNAME}"
-}
-
diff --git a/www-apps/noVNC/noVNC-9999.ebuild b/www-apps/noVNC/noVNC-9999.ebuild
deleted file mode 100644
index 7f26209..0000000
--- a/www-apps/noVNC/noVNC-9999.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit git-2
-
-DESCRIPTION="noVNC is a VNC client implemented using HTML5 technologies,
-specifically Canvas and WebSockets (supports 'wss://' encryption). noVNC is
-licensed under the LGPLv3."
-HOMEPAGE="http://kanaka.github.com/noVNC/"
-EGIT_REPO_URI="https://github.com/cloudbuilders/noVNC"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		dev-python/numpy
-		www-misc/websockify"
-
-
-src_compile() {
-	cd ${S}/utils
-	emake
-}
-
-src_install() {
-	dodir /opt/noVNC
-	dodir /opt/noVNC/utils
-	dodir /opt/noVNC/include
-	dodir /opt/noVNC/images
-
-	exeinto /opt/noVNC/utils
-	doexe utils/json2graph.py
-	doexe utils/launch.sh
-	doexe utils/nova-novncproxy
-	doexe utils/rebind
-	doexe utils/rebind.so
-	doexe utils/u2x11
-	doexe utils/web.py
-	doexe utils/wsproxy.py
-	doexe utils/websocket.py
-
-	docinto /opt/noVNC/docs
-	dodoc README.md
-	dodoc LICENSE.txt
-
-	dosym /opt/noVNC/images/favicon.ico /opt/noVNC/
-	cp -pPR *.html ${D}/opt/noVNC/
-	cp -pPR include/* ${D}/opt/noVNC/include
-	cp -pPR images/* ${D}/opt/noVNC/images
-
-	newconfd "${FILESDIR}/noVNC.confd" noVNC
-	newinitd "${FILESDIR}/noVNC.initd" noVNC
-
-	diropts -m 0750
-	dodir /var/log/noVNC
-}
-