Sync with portage [Mon Feb 11 09:48:26 MSK 2013].

2013-02-11 09:48:32 +04:00 · 2013-02-11 09:48:32 +04:00 · 345d598dc5
commit 345d598dc5
parent abfd8363dc
403 changed files with 3575 additions and 2823 deletions
--- a/app-admin/chef-expander/Manifest
+++ b/app-admin/chef-expander/Manifest
@ -1,2 +1,3 @@
 DIST chef-expander-10.12.0.gem 24576 SHA256 f6d83fa51394e276e33bbd92d39dd30f0cbe93975409b66faffc56f62c1f8534 SHA512 f8abd430c29fa8488e88a7e9b57726a29420cd5982ea28d6c566a07447a9eb51b95be48469aeb4bbd2b1059c0f77977198b11cc169dbf95cdb46b605c13cc361 WHIRLPOOL fc12051fce34b0a70e77d652a1fb1dcd7994f82975d5aa831e0c5d6c5dfce58cd951bd6a9bf5497026e6146bccc4b4f6bfde692af24250bc13ec1f2151fbcf81
 DIST chef-expander-10.16.4.gem 24576 SHA256 104b878569f5eec5d7f8f1378a4a4bda91b11487f2b4f762ccc2697e3c2f1cd4 SHA512 9d2c4c39c61ec6ba419e1c816f766480aff68168462ea3244b2368cba6150a851dbf0e6803f32672220c2107e801c02bb4c2f230f6ee0eaeecaa85297eb6c1e2 WHIRLPOOL 03a9acac043305dbd02d4bd0406a0f297e1910fbe16c92e1e0a834348b8133c2cdc05cd7ccd9338ef8e05912ae16365b8faafa326fd35080115a64d6fbb52736
+DIST chef-expander-10.20.0.gem 24576 SHA256 5cf5464595849471d4bbccac0ec681b89d485e9e752130bdd1f4c84b3770ce30 SHA512 c7ad2db6be3fb4b7161612abb88d6a21a1b4c8d8eb63eb24791048ee5f2a38d5ba08e473ca394c3d0d42197430c708428984be6517728b122d2876c73c7736ea WHIRLPOOL c904fd9140542d1ab0d5ca112ba48b05c131d7233fed89364fde5b494418844a119b40c5b11db08420d33bcd1d37a1fff8db1073a4bdb866b988472f683a3150
--- a/app-admin/chef-expander/chef-expander-10.20.0.ebuild
+++ b/app-admin/chef-expander/chef-expander-10.20.0.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-expander/chef-expander-10.20.0.ebuild,v 1.1 2013/02/10 20:02:16 hollow Exp $
+
+EAPI=4
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Configuration management tool"
+HOMEPAGE="http://wiki.opscode.com/display/chef"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# specs require a live rabbitmq server
+RESTRICT="test"
+
+ruby_add_rdepend "~app-admin/chef-${PV}
+	>=dev-ruby/amqp-0.6.7
+	<dev-ruby/amqp-0.7
+	>=dev-ruby/bunny-0.6.0
+	>=dev-ruby/em-http-request-0.2.11
+	<dev-ruby/em-http-request-0.3
+	>=dev-ruby/eventmachine-0.12.10
+	>=dev-ruby/fast_xs-0.7.3
+	>=dev-ruby/highline-1.6.1
+	<dev-ruby/highline-1.7
+	>=dev-ruby/mixlib-log-1.2.0
+	>=dev-ruby/uuidtools-2.1.1
+	<dev-ruby/uuidtools-2.2
+	>=dev-ruby/yajl-ruby-1.0
+	<dev-ruby/yajl-ruby-2"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doinitd "${FILESDIR}/initd/chef-expander"
+	doconfd "${FILESDIR}/confd/chef-expander"
+
+	keepdir /etc/chef /var/{lib,log,run}/chef
+	fowners chef:chef /var/{lib,log,run}/chef
+}
--- a/app-admin/chef-expander/files/initd/chef-expander
+++ b/app-admin/chef-expander/files/initd/chef-expander
@ -1,22 +1,27 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 CHEF_EXPANDER_LOGFILE=${CHEF_EXPANDER_LOGFILE:-/var/log/chef/expander.log}
 CONFIGFILE=${CONFIGFILE:-/etc/chef/solr.rb}
+CHEF_USER=${CHEF_USER:-chef}
+CHEF_GROUP=${CHEF_GROUP:-chef}

 pidfile=${CHEF_EXPANDER_PIDFILE:-/var/run/chef/expander.pid}
 command=${CHEF_EXPANDER_BINARY:-/usr/bin/chef-expander}
 command_args="-d -P ${pidfile} -L ${CHEF_EXPANDER_LOGFILE} -c ${CONFIGFILE} ${CHEF_EXPANDER_OPTS}"
-
-user=${CHEF_USER:-chef}
-group=${CHEF_GROUP:-chef}
+start_stop_daemon_args="--user ${CHEF_USER} --group ${CHEF_GROUP}"

 depend() {
 	need net chef-solr
 }

 start_pre() {
-	checkpath -q -d -m 0750 -o ${user}:${group} /etc/chef /var/{lib,log,run}/chef
-	checkpath -q -f -m 0600 ${CONFIGFILE}
+	checkpath -q -d -m 0750 -o ${CHEF_USER}:${CHEF_GROUP} \
+		/etc/chef \
+		/etc/chef/certificates \
+		/var/{lib,log,run}/chef
+
+	checkpath -q -f -m 0600 -o ${CHEF_USER}:${CHEF_GROUP} \
+		${CONFIGFILE}
 }
--- a/app-admin/chef-server-api/Manifest
+++ b/app-admin/chef-server-api/Manifest
@ -1,2 +1,3 @@
 DIST chef-server-api-10.12.0.gem 52736 SHA256 00f54eb9220cbb56b47a4f0ffa814ae149a2c9e4c3022c1c5da048f719c0b389 SHA512 99fd4eb230232420c65eccdf6ffa35660185e0ad6032cc7d8113a1845ec164c3aa451b5de8ce4d7bd78d4018f7a042cee2575c8a1a79d446e165d182eab94fbc WHIRLPOOL ccb99fd99a402630187d6152a469b3d72917225406e217f5930c4a1168cf6d6c419847d466fd1b9a8a3751a1265fb7391a852c5209d51ae9414483ebc0fa8f30
 DIST chef-server-api-10.16.4.gem 52736 SHA256 0f2300f80ec8d2c13a197339598d7f32d69abb0e9223bdba8023dc2f727d286f SHA512 7b51a35b160efeb620069ad69896044c3c124774af8551733411af00e687f0fbf0b1680f5d69ec103a271c1d493025cc5ec9b5c29802ca512c6b84e40d24e6e2 WHIRLPOOL 023d52f2e88b4da021a71a0bc02f7daa523182a5a7c85b4b7267e4d5815bf27cacfcc86c929bb58af28d8e045539b5585b9cd5f0dbd9c73215dd5f6670fdd645
+DIST chef-server-api-10.20.0.gem 52736 SHA256 9292da4541f091f68614483e78f824e7c169fb8d53085b29c8aee34b886173a4 SHA512 d2278f229aff50c3f671cb21ccfafdd75e1350200e3db96b3683527a9e26944a23850ae0f55f95621b5a1ac2fcd78d7c27a29baf1d9759a1ab3531114772fcf6 WHIRLPOOL d5e9af5d9cac126c5a4300d477b8d2e1a2a38e45bfea72d09db1e47b2dbc6857ef604a0419543ea4e877253db0ba437746c4a2291513405ada2eb688f23f0da5
--- a/app-admin/chef-server-api/chef-server-api-10.20.0.ebuild
+++ b/app-admin/chef-server-api/chef-server-api-10.20.0.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-api/chef-server-api-10.20.0.ebuild,v 1.1 2013/02/10 20:07:33 hollow Exp $
+
+EAPI=4
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Configuration management tool"
+HOMEPAGE="http://wiki.opscode.com/display/chef"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# specs require root access
+RESTRICT="test"
+
+RDEPEND=">=dev-db/couchdb-0.10.0
+	>=net-misc/rabbitmq-server-1.7.0"
+
+ruby_add_rdepend "~app-admin/chef-${PV}
+	>=dev-ruby/dep_selector-0.0.3
+	>=dev-ruby/merb-assets-1.1.0
+	<dev-ruby/merb-assets-1.2
+	>=dev-ruby/merb-core-1.1.0
+	<dev-ruby/merb-core-1.2
+	>=dev-ruby/merb-helpers-1.1.0
+	<dev-ruby/merb-helpers-1.2
+	>=dev-ruby/merb-param-protection-1.1.0
+	<dev-ruby/merb-param-protection-1.2
+	>=dev-ruby/mixlib-authentication-1.1.3
+	>=dev-ruby/uuidtools-2.1.1
+	<dev-ruby/uuidtools-2.2
+	www-servers/thin"
+
+each_ruby_install() {
+	each_fakegem_install
+	ruby_fakegem_doins -r app
+	ruby_fakegem_doins -r config
+	ruby_fakegem_doins -r public
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doinitd "${FILESDIR}/initd/chef-server-api"
+	doconfd "${FILESDIR}/confd/chef-server-api"
+
+	insinto /etc/chef
+	doins "${FILESDIR}/server.rb"
+}
+
+pkg_postinst() {
+	elog
+	elog "You should edit /etc/chef/server.rb before starting the service with"
+	elog "/etc/init.d/chef-server-api start"
+	elog
+}
--- a/app-admin/chef-server-api/files/initd/chef-server-api
+++ b/app-admin/chef-server-api/files/initd/chef-server-api
@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 depend() {
@ -16,8 +16,13 @@ CHEF_USER=${CHEF_USER:-chef}
 CHEF_GROUP=${CHEF_GROUP:-chef}

 start_pre() {
-	checkpath -q -d -m 0750 -o ${user}:${group} /etc/chef /var/{lib,log,run}/chef
-	checkpath -q -f -m 0600 ${CONFIGFILE}
+	checkpath -q -d -m 0750 -o ${CHEF_USER}:${CHEF_GROUP} \
+		/etc/chef \
+		/etc/chef/certificates \
+		/var/{lib,log,run}/chef
+
+	checkpath -q -f -m 0600 -o ${CHEF_USER}:${CHEF_GROUP} \
+		${CONFIGFILE}
 }

 start() {
--- a/app-admin/chef-server-webui/Manifest
+++ b/app-admin/chef-server-webui/Manifest
@ -1,2 +1,3 @@
 DIST chef-server-webui-10.12.0.gem 181248 SHA256 5e276b25acd0a1080491f674d4b83983ee7537e195898e4bcb7a1e77dfb53caa SHA512 1217060104ae474ec42c02452f0834e25f0172885def6f19e20424bd24bf2730aeac855b35deac458d15f78176e39bdc7c64179f6fc25955afc5a6ad9582cb0f WHIRLPOOL ba1dc086cee27cb8cc7042da3f98c500a680bf70438f8e1e0aacaa1aee13d3b5ddd1387ce4a3b1a0a8b4570f786b095e650b83941f74189646badc63e05454d5
 DIST chef-server-webui-10.16.4.gem 184832 SHA256 578cdea697dcc328e3451e2f4ec2e0d20886b34b74bc1ad4a4ba139401fb42ed SHA512 c1bba3c0ed273f0bf5eda9e0f01d51d21402f6e6ddd6890d4eea4c5e07d07454db3d3d40870df10802b30a3e5a54e11ec1c84491b4f3ca24950baee8e9b7f5c2 WHIRLPOOL b5d5cae58a4da697539c12c2ee8602f2d0e8c8f00007832a6921e7e29d77cc5c45ff4325850a3e5d524750dd382d877a63946cb7b978fe3e3bf94e65b4aa3006
+DIST chef-server-webui-10.20.0.gem 184832 SHA256 34c58fc358e49bd349c191698a54d6ae27909744457f677c145ecad75405bc53 SHA512 435c788074258e9bccee1c1ce06c2b63c0cc1408148cd538ce37ecc37276c88f1c4255d476df996ce60de7fbea537a00c6256d0951cef4a360c4dcff6563a0d0 WHIRLPOOL 84d5abc267dbccdac681a4ef568303f89e4b268c7a0d550f75f95f9c598c7518193232b2a0fbb00d4b21501e35a0f72b3bbf5f57f20d75ec1324bace1a9def00
--- a/app-admin/chef-server-webui/chef-server-webui-10.20.0.ebuild
+++ b/app-admin/chef-server-webui/chef-server-webui-10.20.0.ebuild
@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server-webui/chef-server-webui-10.20.0.ebuild,v 1.1 2013/02/10 20:08:31 hollow Exp $
+
+EAPI=4
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem user
+
+DESCRIPTION="Configuration management tool"
+HOMEPAGE="http://wiki.opscode.com/display/chef"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-db/couchdb-0.10.0
+	>=net-misc/rabbitmq-server-1.7.0"
+
+ruby_add_rdepend "dev-ruby/coderay
+	dev-ruby/haml
+	>=dev-ruby/merb-assets-1.1.0
+	<dev-ruby/merb-assets-1.2
+	>=dev-ruby/merb-core-1.1.0
+	<dev-ruby/merb-core-1.2
+	>=dev-ruby/merb-haml-1.1.0
+	<dev-ruby/merb-haml-1.2
+	>=dev-ruby/merb-helpers-1.1.0
+	<dev-ruby/merb-helpers-1.2
+	>=dev-ruby/merb-param-protection-1.1.0
+	<dev-ruby/merb-param-protection-1.2
+	dev-ruby/ruby-openid
+	www-servers/thin"
+
+pkg_setup() {
+	enewgroup chef
+	enewuser chef -1 -1 /var/lib/chef chef
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	ruby_fakegem_doins -r app
+	ruby_fakegem_doins -r config
+	ruby_fakegem_doins config.ru
+	ruby_fakegem_doins -r public
+
+	# create unversioned path for passenger/rack integration
+	dodir /var/lib/chef/rack
+	dosym $(ruby_fakegem_gemsdir)/gems/${P} /var/lib/chef/rack/webui
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doinitd "${FILESDIR}/initd/chef-server-webui"
+	doconfd "${FILESDIR}/confd/chef-server-webui"
+
+	insinto /etc/chef
+	doins "${FILESDIR}/webui.rb"
+}
+
+pkg_postinst() {
+	elog
+	elog "You should edit or create /etc/chef/webui.rb before starting the service"
+	elog "with /etc/init.d/chef-server-webui start"
+	elog
+}
--- a/app-admin/chef-server-webui/files/initd/chef-server-webui
+++ b/app-admin/chef-server-webui/files/initd/chef-server-webui
@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 depend() {
@ -16,8 +16,13 @@ CHEF_USER=${CHEF_USER:-chef}
 CHEF_GROUP=${CHEF_GROUP:-chef}

 start_pre() {
-	checkpath -q -d -m 0750 -o ${user}:${group} /etc/chef /var/{lib,log,run}/chef
-	checkpath -q -f -m 0600 ${CONFIGFILE}
+	checkpath -q -d -m 0750 -o ${CHEF_USER}:${CHEF_GROUP} \
+		/etc/chef \
+		/etc/chef/certificates \
+		/var/{lib,log,run}/chef
+
+	checkpath -q -f -m 0600 -o ${CHEF_USER}:${CHEF_GROUP} \
+		${CONFIGFILE}
 }

 start() {
--- a/app-admin/chef-server/Manifest
+++ b/app-admin/chef-server/Manifest
@ -1,2 +1,3 @@
 DIST chef-server-10.12.0.gem 8192 SHA256 546393cf70898c79211c4a2fa32a87a69c4514d7e6860684dc037a5ddbcac16d SHA512 c5b927342dce9d5559f1613a3a18ec4db89ae31f63317264a6b791e001e8e5a66ba1a023dd6e05c3d86659f7aaec582da0161c8123ff4e57bb8626c74f6e6e50 WHIRLPOOL 024ac12950d9455f1b782e225ce5f27ad065bb0ee54689b2398774027390cf335badf4b504e4691a381fa78891b5afb0f353249e9223fd03ba5fc52062d5ef70
 DIST chef-server-10.16.4.gem 8192 SHA256 f7bff4c75afbac857714941f31c6158905cc7dc94c970157aec226d445f72c8a SHA512 ff79624df75e97a0f7b6a82ac8004b0b773c969db4b142eb94e6edacb349a83f0790c7b7c74345ae80019c1e3061b241b4ae9e045132a4611b697bf383dbe6f5 WHIRLPOOL ab6256d33b01bb321320f33c6154481d94329fbfbcfaa283d7bcb006f12374a310c7719a84952b516f962197e2e45dfd8da38d0c3e2ca6e0d6485a99aed3bbde
+DIST chef-server-10.20.0.gem 8192 SHA256 0f026a7a8d9743c7fed1108a2f4f6b796f2c1267b587081b40f7759f9f6ce28e SHA512 9ccf5a5abd7910df3646b4305f1d2f0c0a759e14c03e6f48f667992759cbd657d1521b6eeff4c615de4d0ff1abb9807b2c27bfc423844d2502b2dd105e0efbb7 WHIRLPOOL 3453b243cd7710c2894437fff4906027d227da798f43f5cdfef9cbf472dad192aeefdc42286a630ca5e8d85a4e4363f430c2809d4c187dcd1d0605320beedf20
--- a/app-admin/chef-server/chef-server-10.20.0.ebuild
+++ b/app-admin/chef-server/chef-server-10.20.0.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-server/chef-server-10.20.0.ebuild,v 1.1 2013/02/10 20:09:44 hollow Exp $
+
+EAPI=4
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Configuration management tool (meta package)"
+HOMEPAGE="http://wiki.opscode.com/display/chef"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "~app-admin/chef-server-api-${PV}
+	~app-admin/chef-solr-${PV}
+	~app-admin/chef-expander-${PV}"
--- a/app-admin/chef-solr/Manifest
+++ b/app-admin/chef-solr/Manifest
@ -1,2 +1,3 @@
 DIST chef-solr-10.12.0.gem 10217472 SHA256 12cc7afad56869fba3d1659cd8154ab89860b24895676385104e36e1faa6f962 SHA512 116ecc5b52a62d0bbd23883dbaf8f049b00b84add3e15eda817f3777bd6a6b4b49e40d64090e70d003931bf6fac36f5fcd2752f4c60ecdb25995795c7ba6735c WHIRLPOOL fa1484746b40df2812c51138668b5d967b866aedcc5e2cb34943394dcae8f7fa3b3ecdcf3749cde7f4997f063676faf2e6d891df36868c63f3cb29c0f474f99d
 DIST chef-solr-10.16.4.gem 10217472 SHA256 ee52fc77ccc681d00de9c30fbbdf5c67db5440491011d06e6bb0931d5344e963 SHA512 74e8107ddd272f13092459bf198662d86141d48fab1ed6b0eb305c1c7bad906e9eba83660f2e474d9095d7a5b294ebe39cab8e86b64edc9a14e3ee0a318c1e15 WHIRLPOOL 3e3cfe7eef7bcc9016774fc38d12553b5a2695f9b9c35ce3272b192f8b45699e8c73c90da2a0c86487485dfe70f87cb822dc63593f00156b46123dfac4f983a6
+DIST chef-solr-10.20.0.gem 10217472 SHA256 45d1da34e377dc7e2a10d36312a2a140158bbdfb2b0a9c9f5673fa727780bb49 SHA512 1b0841b234f98e7071f0ae779db2fc709409909aea47dc39dd8896127dd4a8ac1b0d8af733da54b97ea4e497d3cd0132058eba2df74fb31f0a548a7be4200867 WHIRLPOOL 8f211f900a712111aef1634d7fdf4092198a0c05353ab426a0523c9bb516a6ae6783d86363afd548a58df055272126bde76fc728afe564de0a666a98982b0ff1
--- a/app-admin/chef-solr/chef-solr-10.16.4.ebuild
+++ b/app-admin/chef-solr/chef-solr-10.16.4.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-10.16.4.ebuild,v 1.1 2012/12/27 07:28:25 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-10.16.4.ebuild,v 1.2 2013/02/10 20:04:56 hollow Exp $

 EAPI=4
 USE_RUBY="ruby18 ruby19"
@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""

 RDEPEND=">=net-misc/rabbitmq-server-1.7.2
-	virtual/jre:1.6"
+	>=virtual/jre-1.6"

 ruby_add_rdepend "~app-admin/chef-${PV}"

--- a/app-admin/chef-solr/chef-solr-10.20.0.ebuild
+++ b/app-admin/chef-solr/chef-solr-10.20.0.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef-solr/chef-solr-10.20.0.ebuild,v 1.1 2013/02/10 20:04:57 hollow Exp $
+
+EAPI=4
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Configuration management tool"
+HOMEPAGE="http://wiki.opscode.com/display/chef"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-misc/rabbitmq-server-1.7.2
+	>=virtual/jre-1.6"
+
+ruby_add_rdepend "~app-admin/chef-${PV}"
+
+each_ruby_test() {
+	${RUBY} -S rspec spec || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	ruby_fakegem_doins -r solr
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doinitd "${FILESDIR}/initd/chef-solr"
+	doconfd "${FILESDIR}/confd/chef-solr"
+
+	insinto /etc/chef
+	doins "${FILESDIR}/solr.rb"
+}
+
+pkg_postinst() {
+	elog
+	elog "You need to run the chef-solr-installer script to setup the SOLR instance:"
+	elog
+	elog "    chef-solr-installer -c /etc/chef/solr.rb -u chef -g chef -f"
+	elog
+}
--- a/app-admin/chef-solr/files/initd/chef-solr
+++ b/app-admin/chef-solr/files/initd/chef-solr
@ -1,16 +1,16 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 CHEF_SOLR_LOGFILE=${CHEF_SOLR_LOGFILE:-/var/log/chef/solr.log}
 CONFIGFILE=${CONFIGFILE:-/etc/chef/solr.rb}
+CHEF_USER=${CHEF_USER:-chef}
+CHEF_GROUP=${CHEF_GROUP:-chef}

 pidfile=${CHEF_SOLR_PIDFILE:-/var/run/chef/solr.pid}
 command=${CHEF_SOLR_BINARY:-/usr/bin/chef-solr}
 command_args="-d -P ${pidfile} -L ${CHEF_SOLR_LOGFILE} -c ${CONFIGFILE} ${CHEF_SOLR_OPTS}"
-
-user=${CHEF_USER:-chef}
-group=${CHEF_GROUP:-chef}
+start_stop_daemon_args="--user ${CHEF_USER} --group ${CHEF_GROUP}"

 depend() {
 	need net rabbitmq
@ -18,6 +18,11 @@ depend() {
 }

 start_pre() {
-	checkpath -q -d -m 0750 -o ${user}:${group} /etc/chef /var/{lib,log,run}/chef
-	checkpath -q -f -m 0600 ${CONFIGFILE}
+	checkpath -q -d -m 0750 -o ${CHEF_USER}:${CHEF_GROUP} \
+		/etc/chef \
+		/etc/chef/certificates \
+		/var/{lib,log,run}/chef
+
+	checkpath -q -f -m 0600 -o ${CHEF_USER}:${CHEF_GROUP} \
+		${CONFIGFILE}
 }
--- a/app-admin/chef/Manifest
+++ b/app-admin/chef/Manifest
@ -1,2 +1,3 @@
 DIST chef-10.12.0.gem 429056 SHA256 dac132f5b91f90f37b95b964ee213bb936ee07aaceb23cb24b9c7a9fcb20377b SHA512 fd227a325874013ce764d79a3eb250626c0370b50447caa445c2a7e502121c3cbf29832c96ad266b1730fe0cdcac86767d7b55e2594ccbb57c09fee4f395ee0c WHIRLPOOL bfd03dcc4a15e3cc4f141d31af441123a0653e7cb0fa26cc46ccfbe7bda0633c2ecf503b99ad2b7608dab90e9dbe2d7e3e44b00ce9b42d57225359dd7422c091
 DIST chef-10.16.4.gem 811008 SHA256 42424ddbcbed716ffc1863d033a1e4f5446b3922f5cd31280423f9779f54bd7f SHA512 250899a274d2324cc713c2dab416a6926188434b9115650c1f64e23fbec410aedc16391f3b3b8198830c3f71430d261dfb5c2beb2627bb04411145d47232ee87 WHIRLPOOL 0b35decc41cad676ab826d8078f1e774df672455999032ccf46a77fd1ec55b98fd8d6c56d528941da68e5d32bc8e379e08d18b3f5b41ac753297bc738ba13237
+DIST chef-10.20.0.gem 820736 SHA256 c195f936760ac2e2f20b5833bc76f19eb1b6f8e0839033bf7cdc41031d51a1ab SHA512 0fe80a9210ad63bc9c4e14b5d638dc427517179971230f9a86b693575b7cc57ca50995832019327ecf9fac7ac9b4bd747f176b93ecee87480580a2a9775f1633 WHIRLPOOL 89c9d8574bec15c4982fd574d81e1f4fd6bc4b2b91d21dbc02619574a87f121f7b12eab9eaf2cb11b7275305405b17d7f2c43f96783edfad3c26cbf7640c43dc
--- a/app-admin/chef/chef-10.20.0.ebuild
+++ b/app-admin/chef/chef-10.20.0.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-10.20.0.ebuild,v 1.2 2013/02/10 21:08:24 hollow Exp $
+
+EAPI=4
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC=${RUBY_FAKEGEM_NAME}.gemspec
+
+inherit ruby-fakegem user
+
+DESCRIPTION="Chef is a systems integration framework"
+HOMEPAGE="http://wiki.opscode.com/display/chef"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# specs have various indempotency issues which result in the global Chef::Config
+# object to be replaced and subsequently fails other specs. Revisit this later.
+RESTRICT="test"
+
+ruby_add_rdepend ">=dev-ruby/bunny-0.6.0
+	dev-ruby/erubis
+	>=dev-ruby/highline-1.6.9
+	>=dev-ruby/json-1.4.4
+	>=dev-ruby/mixlib-authentication-1.3.0
+	>=dev-ruby/mixlib-cli-1.1.0
+	>=dev-ruby/mixlib-config-1.1.2
+	>=dev-ruby/mixlib-log-1.3.0
+	dev-ruby/mixlib-shellout
+	<dev-ruby/moneta-0.7.0
+	>=dev-ruby/net-ssh-2.6
+	<dev-ruby/net-ssh-2.7
+	>=dev-ruby/net-ssh-multi-1.1
+	<dev-ruby/net-ssh-multi-1.2
+	>=dev-ruby/ohai-0.6.0
+	>=dev-ruby/rest-client-1.0.4
+	<dev-ruby/rest-client-1.7
+	dev-ruby/ruby-shadow
+	>=dev-ruby/treetop-1.4.9
+	<dev-ruby/treetop-1.5
+	dev-ruby/uuidtools
+	>=dev-ruby/yajl-ruby-1.1
+	<dev-ruby/yajl-ruby-2"
+
+each_ruby_prepare() {
+	ruby_fakegem_metadata_gemspec ../metadata ${RUBY_FAKEGEM_GEMSPEC}
+
+	# bunny
+	sed -i -e 's/"< 0.8.0", //' ${RUBY_FAKEGEM_GEMSPEC} || die "Unable to fix up dependencies."
+
+	# json
+	sed -i -e 's/"<= 1.6.1", //' ${RUBY_FAKEGEM_GEMSPEC} || die "Unable to fix up dependencies."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	keepdir /etc/chef /var/lib/chef /var/log/chef
+
+	doinitd "${FILESDIR}/initd/chef-client"
+	doconfd "${FILESDIR}/confd/chef-client"
+
+	insinto /etc/chef
+	doins "${FILESDIR}/client.rb"
+	doins "${FILESDIR}/solo.rb"
+
+	doman distro/common/man/man1/*.1
+	doman distro/common/man/man8/*.8
+}
+
+pkg_setup() {
+	enewgroup chef
+	enewuser chef -1 -1 /var/lib/chef chef
+}
+
+pkg_postinst() {
+	elog
+	elog "You should edit /etc/chef/client.rb before starting the service with"
+	elog "/etc/init.d/chef-client start"
+	elog
+}
--- a/app-admin/chef/files/initd/chef-client
+++ b/app-admin/chef/files/initd/chef-client
@ -1,19 +1,20 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 CONFIGFILE=${CONFIGFILE:-/etc/chef/client.rb}
 INTERVAL=${INTERVAL:-1800}
 SPLAY=${SPLAY:-20}
+ENCODING=${ENCODING:-UTF-8}

-command=${CHEF_CLIENT_BINARY:-/usr/bin/chef-client}
-command_args="-d -c ${CONFIGFILE} -i ${INTERVAL} -s ${SPLAY} ${CHEF_CLIENT_OPTS}"
 pidfile=${CHEF_CLIENT_PIDFILE:-/var/run/chef/client.pid}
+command=${CHEF_CLIENT_BINARY:-/usr/bin/ruby19}
+command_args="-E ${ENCODING} /usr/bin/chef-client -d -c ${CONFIGFILE} -i ${INTERVAL} -s ${SPLAY} -P ${pidfile} ${CHEF_CLIENT_OPTS}"

 depend() {
 	need net
 }

 start_pre() {
-	checkpath -q -d -m 0755 -o chef:chef /var/run/chef
+	checkpath -q -d /var/run/chef
 }
--- a/app-admin/conky/conky-1.9.0-r2.ebuild
+++ b/app-admin/conky/conky-1.9.0-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r2.ebuild,v 1.4 2013/02/10 14:46:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r2.ebuild,v 1.5 2013/02/10 17:17:31 ago Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"

 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X xmms2"

 DEPEND_COMMON="
--- a/app-admin/usbview/usbview-2.0.ebuild
+++ b/app-admin/usbview/usbview-2.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-2.0.ebuild,v 1.6 2013/02/10 14:41:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-2.0.ebuild,v 1.7 2013/02/10 17:23:33 ago Exp $

 EAPI=4
 inherit eutils linux-info
@ -11,7 +11,7 @@ SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""

 RDEPEND="x11-libs/gtk+:3"
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@ -1 +1,2 @@
 DIST nwipe-0.12.tar.gz 147380 SHA256 da70976acad36c8f500ecd27b1b0ac4beb81e909f8a761753cd23da37534596a SHA512 c05def96418824fdf372c24323d40c9b4e9fe7ce946af37d8d5bf4dff618c3af2d70dfec6819b89f1dedea835bab66cec2cf4206247c6c7c095aaa18c1bfbb2c WHIRLPOOL 243f840b98994e02dfa9f3737a297b68c754fa0c93f94b7c3799271605501f850f2392edea9e4e33828d15ea05d1d89012c221f073210b9b2e8ef607730201bd
+DIST nwipe-0.13.tar.gz 150344 SHA256 371177edc3784f8dac1b283bfd07cb764f6f8ac0d2cdea2a7030c8e7bd86cac4 SHA512 311142f606cdada7136244adcce8aaeba37fd06a2dc496759ce635db72e9b3d5183e91793f0b5a68d4748b0d3ff00a8663b97ff8118e02b950198edbfcf04382 WHIRLPOOL 4e1c25109179f1a780cbed10c3f344ca0605872899e3f6a4e2954264156c4a39d20e77b8b0dc9a9cf7581cc3f49581b298442e2d5b4e8a1bee95a3d0bc762e99
--- a/app-crypt/nwipe/nwipe-0.13.ebuild
+++ b/app-crypt/nwipe/nwipe-0.13.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/nwipe/nwipe-0.13.ebuild,v 1.1 2013/02/10 18:31:48 alonbl Exp $
+
+EAPI=5
+
+DESCRIPTION="Securely erase disks using a variety of recognized methods"
+HOMEPAGE="http://sourceforge.net/projects/nwipe/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-block/parted-2.3
+	>=sys-libs/ncurses-5.7-r7"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="README"
--- a/app-crypt/pgpdump/Manifest
+++ b/app-crypt/pgpdump/Manifest
@ -1,2 +1 @@
-DIST pgpdump-0.26.tar.gz 55341 SHA256 6b94c8647cc316b64c6ab2e26827bf3530a8a0a1e80876a66cebed4e2be9895e SHA512 a0c76e68f02ad5d151d998045ed1c4dea376c9079ba6e97c6cee82b2fb5f6512777eb37ba334de0291e91204cf5519fb2eeafc0ca96e7014d9ba21752cc2c7ac WHIRLPOOL 3023ff4eee97d86e6d945d8b4e27f0e1b3eef503389935fc8805d24802949bfef48dfe460375614783715b617b63e1b56954c79a9ea730eea709ea8c8a21f1d4
 DIST pgpdump-0.27.tar.gz 62307 SHA256 6c44d58d7e69560891bac7247f8f9c5218f12ad11a26504d968ce4f6b59f8bb9 SHA512 f4eab4398789696dc356219a97615ac3b0ac7e9d9d7568b58582f8bef7f964c6eed66e60e8ce5a96f5d99912230728bda2462b1d436b9bd7ea1a346d534246e4 WHIRLPOOL c030d80e5aab5f55511d58015fa8b2c0adc66329c0cba4fc2970d4ee664903bf12ffaea9310a0459fcf7aaef25439b5122a6bc755dcd24d4d3087b46fe98d277
--- a/app-crypt/pgpdump/pgpdump-0.26.ebuild
+++ b/app-crypt/pgpdump/pgpdump-0.26.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.26.ebuild,v 1.6 2012/11/17 10:27:32 ulm Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="A PGP packet visualizer"
-HOMEPAGE="http://www.mew.org/~kazu/proj/pgpdump/"
-SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="sys-libs/zlib
-	app-arch/bzip2"
-
-src_compile() {
-	econf || die
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	dobin pgpdump
-	doman pgpdump.1
-
-	dodoc CHANGES README
-}
--- a/app-crypt/pgpdump/pgpdump-0.27.ebuild
+++ b/app-crypt/pgpdump/pgpdump-0.27.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.27.ebuild,v 1.5 2013/02/06 19:50:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.27.ebuild,v 1.6 2013/02/10 17:24:16 ago Exp $

 EAPI="3"
 inherit toolchain-funcs
@ -11,7 +11,7 @@ SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""

 DEPEND="sys-libs/zlib
--- a/app-editors/mp/mp-5.2.2.ebuild
+++ b/app-editors/mp/mp-5.2.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.2.ebuild,v 1.7 2013/02/10 14:41:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.2.2.ebuild,v 1.8 2013/02/10 17:20:00 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://www.triptico.com/download/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~ppc ppc64 ~sparc x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="gtk iconv kde ncurses nls pcre qt4"

 MP_LINGUAS="de es it nl ru sv"
--- a/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild,v 1.2 2013/02/10 16:55:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild,v 1.4 2013/02/10 20:48:00 ago Exp $

 EAPI=5

@ -13,7 +13,7 @@ SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"

 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-${PV}.el"
--- a/app-emulation/dinero/dinero-4.7-r1.ebuild
+++ b/app-emulation/dinero/dinero-4.7-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dinero/dinero-4.7-r1.ebuild,v 1.2 2013/02/10 12:47:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dinero/dinero-4.7-r1.ebuild,v 1.4 2013/02/10 19:24:56 nimiux Exp $

 EAPI=4

@ -13,7 +13,7 @@ HOMEPAGE="http://www.cs.wisc.edu/~markhill/DineroIV/"
 SRC_URI="ftp://ftp.cs.wisc.edu/markhill/DineroIV/${MY_P}.tar.gz"

 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 LICENSE="as-is"
 IUSE=""

--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@ -1,2 +1 @@
 DIST qemu-1.2.0.tar.bz2 9865186 SHA256 c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936 SHA512 b590ea4ff484abc1abf2d3ec3fb294d4ece24d2dfa0a179d9c5f60baca0ea474d47a560f5d95b010a53a5563793414f3257240c5e9917a8d0f556a2066ccd60e WHIRLPOOL 5e5a5f09b828b0aff6139d7efad4dd0d1ed8d86badc2657f7ea53352aa1dbb6e6e227501f7ab63f7e95ee248007942ae94431b7f99092a4ed7005c345b10ca4e
-DIST qemu-kvm-1.1.1.tar.gz 6599376 SHA256 c6fab57ccadcad5deb34728623840a0141a0f3c8f29d0c253db577f059c796df SHA512 1106a35212cdac1fe5b043af6754595d03232f22bf74cdab86973759adb3cff2d3d7b42290883d2d99d97d163fe274de0108a05eed906ffdc3349c0631f52492 WHIRLPOOL 4d9b2b788a7f87104032635b3b6e2cd96275b92683e3003510b0951536ed6bcb959959bc7529e3f912a7a2055b5c1710b9310d591a8b443a17a231e5b86f6105
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-1.1.1.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-1.1.1.ebuild
@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.1.1.ebuild,v 1.4 2012/12/13 20:06:01 ssuominen Exp $
-
-EAPI=4
-
-inherit systemd udev
-
-MY_PN="qemu-kvm"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="http://wiki.qemu.org/Features/QAPI/GuestAgent"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-IUSE="systemd"
-
-DEPEND=">=dev-libs/glib-2.22"
-RDEPEND="${DEPEND}
-	!<app-emulation/qemu-1.1.1-r1"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	./configure
-}
-
-src_compile() {
-	emake qemu-ga
-}
-
-src_install() {
-	dobin qemu-ga
-
-	if ! use systemd; then
-		# Normal init stuff
-		newinitd "${FILESDIR}/qemu-ga.init" qemu-guest-agent
-		newconfd "${FILESDIR}/qemu-ga.conf" qemu-guest-agent
-
-		insinto /etc/logrotate.d/
-		newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-	else
-		# systemd stuff
-		udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-		systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-			qemu-guest-agent.service
-	fi
-}
-
-pkg_postinst() {
-	if ! use systemd; then
-		elog "You should add 'qemu-guest-agent' to the default runlevel."
-		elog "e.g. rc-update add qemu-guest-agent default"
-	fi
-}
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-1.2.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-1.2.0.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.2.0.ebuild,v 1.2 2012/12/13 20:06:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.2.0.ebuild,v 1.3 2013/02/10 21:47:50 cardoe Exp $

 EAPI=4

-inherit systemd udev
+inherit systemd udev python

 MY_PN="qemu"
 MY_P="${MY_PN}-${PV}"
@ -29,11 +29,16 @@ IUSE=""
 DEPEND=">=dev-libs/glib-2.22"
 RDEPEND="${DEPEND}
 	!<app-emulation/qemu-1.1.1-r1"
+PYTHON_DEPEND="2:2.4"

 S="${WORKDIR}/${MY_P}"

+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_configure() {
-	./configure
+	./configure --python=python2
 }

 src_compile() {
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@ -3,7 +3,6 @@ DIST qemu-kvm-1.1.1-bp-1.tar.xz 2908 SHA256 16b7cd2e10b3a05d20006898bcfdb26eb596
 DIST qemu-kvm-1.1.1.tar.gz 6599376 SHA256 c6fab57ccadcad5deb34728623840a0141a0f3c8f29d0c253db577f059c796df SHA512 1106a35212cdac1fe5b043af6754595d03232f22bf74cdab86973759adb3cff2d3d7b42290883d2d99d97d163fe274de0108a05eed906ffdc3349c0631f52492 WHIRLPOOL 4d9b2b788a7f87104032635b3b6e2cd96275b92683e3003510b0951536ed6bcb959959bc7529e3f912a7a2055b5c1710b9310d591a8b443a17a231e5b86f6105
 DIST qemu-kvm-1.1.2-6cee76f0.tar.xz 13096 SHA256 0bf503a494d78cc5a59682d22341caa594fcf89a8ce5bd222dd7c45ad009e0c3 SHA512 bb1aa5f40b24cf9860f4af2cbab8bf8d5800ca57c1dccc05f446b5001d426021a3ccc423228ce9607a20dd1fb9e5d93a62f883d5bf56c4ac25b5ebfd3b60940d WHIRLPOOL 3916563bd76d9ae50ddd168863dfada0f44289355c82491a992d2d56c9398c8392fc69a67844154dafb13f9ea315affd27909e3b675ba8b5eab32ab176700b5b
 DIST qemu-kvm-1.1.2.tar.gz 6605075 SHA256 2be9cb9986c0b67ef97a2d21a51a945e91c4032b8c4229297461d8ed91f95178 SHA512 c1fc6a91276347ec2188c9fa8750b51ed14116ea0a7afc74e0ddf305e9f175a6c16d3dc6ef1ee52926c4d8b9bd0fd5465041f32ec24ce315059062a078e2df82 WHIRLPOOL f21af6107de2343c6a45cbd6aa97cbc58e36a37c37db42110397658a2c303d63e5af96b84b778b5f08e958a5e65a84088c596e1b83cbdcd4009efff64dab4d09
-DIST qemu-kvm-1.2.0-3a5940fb.tar.xz 238084 SHA256 031e290d85292e7fce1589fe492093069790c3094b7a302c71db8b2b98cbf3c6 SHA512 316a56a95c35cd304d63f6a444d0360510db79dbbf34c88f26f00998ddd0a1a35b6f6d7848abd6c7a8d7c65253e5449b3def0eefec17ad3989d2e02bc2743d8d WHIRLPOOL bcea3a5c22e7bc46b4c15580fde34de6ddcc3908dd8bb5b4d5f00724a960c5303db275c29b3741665bd47d9309d3d70294be27156958c5948cf17ece2af6da68
+DIST qemu-kvm-1.2.0-7c9a3a87.tar.xz 268436 SHA256 ed9d8f358cc82e920f6d424de25a82165503cd7e6715bc23312bc2eba6dda771 SHA512 dd5f69835c9fb00c7c36f90e83c7380ac1e3712ef8929f465ed18393da0187020f41d49963584a887199d032ec4783be14b8787c6165d723df94204a70346217 WHIRLPOOL c3e0760c6fdc68b616a0d6e654ec6fa8bdedda9a817fecd7723e168d293eb7bc864864c824b6bb3d61054a0b925302ca59a3c0850e98840dfbd0dbc06c254f82
 DIST qemu-kvm-1.2.0-9489a8c0-1.tar.xz 268020 SHA256 3ac9715a6bb50d8e363ea0a225a23472d326c31189637eb7ad25fef47afe526d SHA512 9ea7da5384af22525db40fef62a480e551395907df6bf2420e1ccdaceddb24515f0e463e16e929b6da34ab0c2f0e5e567ef097f186a46c0d2fcc2d0d17fc3045 WHIRLPOOL 89ece68af896212cb9a868f6bb0d0df397d22131e3ae147f575177b39f015860ea0895a1edf938f46d3e2322182f131abc0767b07d8c05565a7ff40420f65464
-DIST qemu-kvm-1.2.0-b6773f5e.tar.xz 264756 SHA256 fbb0c3fd17304d6fe2f12064ac354edb8ec67fe09f6f1ab2bfe5534949728d15 SHA512 c8c94bf534f4e844782ada677bc608425b4d209fd01f9d9eab8b9f3d758b03e48b8a02110793e3555421761f3bc36f1363f0f7a8cbe8f3f64455463ae43e23fa WHIRLPOOL a6bb4fe13526a780f0c46e2838fb721b9fcd5642b7412f454d70118e8db144f606bec0a9daf6ae5ddb9ec8140895b8407beaa807599df4503e6a16a16650c555
 DIST qemu-kvm-1.2.0.tar.gz 6839420 SHA256 e98ab96c24337e312864f2341016695ac11cb9a04be83548a8da89596d591b05 SHA512 c21354127d4585397ab400600ab1ac9aac80cc0431bbf615c8e906819075b00373f382954fbd9fa39bf6479126d8d8e3321b3713346d04abe2c249edfa4eb6fd WHIRLPOOL 3d0662b39174eee0cd8750f6bea5baf57e2dfa82b490c3f1e54f44720ddd05ad029c3011425f651e745973ddb03aaca310bc8acf9f8e656bbb8390a262f7013c
--- a/app-emulation/qemu/qemu-1.2.1.ebuild
+++ b/app-emulation/qemu/qemu-1.2.1.ebuild
@ -1,378 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.1.ebuild,v 1.8 2013/01/12 23:08:29 cardoe Exp $
-
-EAPI="4"
-
-MY_PN="qemu-kvm"
-MY_P=${MY_PN}-1.2.0
-
-PYTHON_DEPEND="2"
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev
-BACKPORTS=3a5940fb
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \
-kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp \
-sdl selinux smartcard spice static systemtap tci +threads tls usbredir +uuid vde \
-+vhost-net virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-done
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio !bluetooth )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-1.0.0[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!app-emulation/kqemu
-	sys-firmware/ipxe
-	~sys-firmware/seabios-1.7.1
-	~sys-firmware/sgabios-0.1_pre8
-	~sys-firmware/vgabios-0.7a
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( =dev-lang/python-2*[ncurses] )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss )
-	spice? ( >=app-emulation/spice-protocol-0.12.0 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? ( ~sys-apps/usbredir-0.4.4 )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${MY_P}"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper"
-
-QA_WX_LOAD="${QA_PRESTRIPPED}
-	usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if use static; then
-		ewarn "USE=static is very much a moving target because of the packages"
-		ewarn "we depend on will have their static libs ripped out or wrapped"
-		ewarn "with USE=static-libs or USE=static due to continued dicsussion"
-		ewarn "on the mailing list about USE=static's place in Gentoo. As a"
-		ewarn "result what worked today may not work tomorrow."
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	enewgroup kvm 78
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
-
-	epatch "${FILESDIR}"/qemu-1.2.0-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	epatch_user
-}
-
-src_configure() {
-	local conf_opts audio_opts user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	if [[ -n ${user_targets} ]]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
-	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static --disable-pie"
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if ! use static && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-	use mixemu && conf_opts="${conf_opts} --enable-mixemu"
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-bsd-user \
-		--disable-guest-agent \
-		--disable-libiscsi \
-		--disable-strip \
-		--disable-werror \
-		--python=python2 \
-		$(use_enable aio linux-aio) \
-		$(use_enable bluetooth bluez) \
-		$(use_enable brltty brlapi) \
-		$(use_enable caps cap-ng) \
-		$(use_enable curl) \
-		$(use_enable debug debug-info) \
-		$(use_enable debug debug-tcg) \
-		$(use_enable doc docs) \
-		$(use_enable fdt) \
-		$(use_enable jpeg vnc-jpeg) \
-		$(use_enable kernel_linux kvm) \
-		$(use_enable kernel_linux nptl) \
-		$(use_enable ncurses curses) \
-		$(use_enable opengl) \
-		$(use_enable png vnc-png) \
-		$(use_enable rbd) \
-		$(use_enable sasl vnc-sasl) \
-		$(use_enable sdl) \
-		$(use_enable seccomp) \
-		$(use_enable smartcard smartcard) \
-		$(use_enable smartcard smartcard-nss) \
-		$(use_enable spice) \
-		$(use_enable tci tcg-interpreter) \
-		$(use_enable tls vnc-tls) \
-		$(use_enable usbredir usb-redir) \
-		$(use_enable uuid) \
-		$(use_enable vde) \
-		$(use_enable vhost-net) \
-		$(use_enable virtfs) \
-		$(use_enable vnc) \
-		$(use_enable xattr attr) \
-		$(use_enable xen) \
-		$(use_enable xen xen-pci-passthrough) \
-		$(use_enable xfs xfsctl) \
-		--audio-drv-list=${audio_opts} \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| die "configure failed"
-
-		# FreeBSD's kernel does not support QEMU assigning/grabbing
-		# host USB devices yet
-		use kernel_FreeBSD && \
-			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	if [[ -n ${softmmu_targets} ]]; then
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			dosym /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm
-			ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
-			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
-			ewarn "your libvirt configs or other wrappers for ${PN}"
-		else
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of the /usr/bin/qemu-kvm symlink."
-		fi
-	fi
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	if use doc; then
-		dohtml qemu-doc.html qemu-tech.html || die
-	fi
-
-	use python && dobin scripts/kvm/kvm_stat
-
-	# Avoid collision with app-emulation/libcacard
-	use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-
-	# Remove vgabios since we're using the vgabios packaged one
-	rm "${ED}/usr/share/qemu/vgabios.bin"
-	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-	dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-	dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-	dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-	dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-
-	# Remove iPXE since we're using the iPXE packaged one
-	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
-	dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-	dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-	dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-	dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-	dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-}
-
-pkg_postinst() {
-	if [[ -n ${softmmu_targets} ]]; then
-		elog "If you don't have kvm compiled into the kernel, make sure you have"
-		elog "the kernel module loaded before running kvm. The easiest way to"
-		elog "ensure that the kernel module is loaded is to load it on boot."
-		elog "For AMD CPUs the module is called 'kvm-amd'"
-		elog "For Intel CPUs the module is called 'kvm-intel'"
-		elog "Please review /etc/conf.d/modules for how to load these"
-		elog
-		elog "Make sure your user is in the 'kvm' group"
-		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-		elog
-		elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
-		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
-	fi
-}
--- a/app-emulation/qemu/qemu-1.2.2-r100.ebuild
+++ b/app-emulation/qemu/qemu-1.2.2-r100.ebuild
@ -1,15 +1,15 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r100.ebuild,v 1.2 2013/02/02 01:14:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r3.ebuild,v 1.2 2013/02/10 21:50:04 cardoe Exp $

 EAPI=5

 MY_PN="qemu-kvm"
 MY_P=${MY_PN}-1.2.0

-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.4"
 inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev
-BACKPORTS=9489a8c0-1
+BACKPORTS=7c9a3a87

 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
@ -348,31 +348,31 @@ src_configure() {
 		einfo "Building the following user targets: ${user_targets}"

 	if [[ -n ${softmmu_targets} ]]; then
-		mkdir ${S}/softmmu-build
+		mkdir "${S}/softmmu-build"
 		qemu_src_configure "softmmu" "${S}/softmmu-build"
 	fi

 	if [[ -n ${user_targets} ]]; then
-		mkdir ${S}/user-build
+		mkdir "${S}/user-build"
 		qemu_src_configure "user" "${S}/user-build"
 	fi
 }

 src_compile() {
 	if [[ -n ${user_targets} ]]; then
-		cd ${S}/user-build
+		cd "${S}/user-build"
 		default
 	fi

 	if [[ -n ${softmmu_targets} ]]; then
-		cd ${S}/softmmu-build
+		cd "${S}/softmmu-build"
 		default
 	fi
 }

 src_install() {
 	if [[ -n ${user_targets} ]]; then
-		cd ${S}/user-build
+		cd "${S}/user-build"
 		emake DESTDIR="${ED}" install

 		# Install binfmt handler init script for user targets
@ -380,7 +380,7 @@ src_install() {
 	fi

 	if [[ -n ${softmmu_targets} ]]; then
-		cd ${S}/softmmu-build
+		cd "${S}/softmmu-build"
 		emake DESTDIR="${ED}" install

 		if use kernel_linux; then
@ -397,11 +397,11 @@ src_install() {
 			elog "of the /usr/bin/qemu-kvm symlink."
 		fi

-		use python && dobin ${S}/scripts/kvm/kvm_stat
-		use python && dobin ${S}/scripts/kvm/vmxcap
+		use python && dobin "${S}/scripts/kvm/kvm_stat"
+		use python && dobin "${S}/scripts/kvm/vmxcap"
 	fi

-	cd ${S}
+	cd "${S}"
 	dodoc Changelog MAINTAINERS TODO pci-ids.txt
 	newdoc pc-bios/README README.pc-bios

--- a/app-emulation/qemu/qemu-1.2.2.ebuild
+++ b/app-emulation/qemu/qemu-1.2.2.ebuild
@ -1,411 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2.ebuild,v 1.10 2013/01/14 23:06:16 cardoe Exp $
-
-EAPI="4"
-
-MY_PN="qemu-kvm"
-MY_P=${MY_PN}-1.2.0
-
-PYTHON_DEPEND="2"
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev
-BACKPORTS=b6773f5e
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \
-kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp \
-sdl selinux smartcard spice static systemtap tci +threads tls usbredir +uuid \
-vde +vhost-net virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
-mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-done
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	static? ( !alsa !pulseaudio !bluetooth !opengl )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!app-emulation/kqemu
-	qemu_softmmu_targets_i386? (
-		sys-firmware/ipxe
-		~sys-firmware/seabios-1.7.1
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	qemu_softmmu_targets_x86_64? (
-		sys-firmware/ipxe
-		~sys-firmware/seabios-1.7.1
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( =dev-lang/python-2*[ncurses] )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss )
-	spice? ( >=app-emulation/spice-protocol-0.12.2 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? ( ~sys-apps/usbredir-0.4.4 )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/texi2html )
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${MY_P}"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper"
-
-QA_WX_LOAD="${QA_PRESTRIPPED}
-	usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or32
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-
-	if use static; then
-		ewarn "USE=static is very much a moving target because of the packages"
-		ewarn "we depend on will have their static libs ripped out or wrapped"
-		ewarn "with USE=static-libs or USE=static due to continued dicsussion"
-		ewarn "on the mailing list about USE=static's place in Gentoo. As a"
-		ewarn "result what worked today may not work tomorrow."
-	fi
-}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	enewgroup kvm 78
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
-	python_convert_shebangs -r 2 "${S}/scripts/kvm/vmxcap"
-
-	epatch "${FILESDIR}"/qemu-1.2.0-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	# Fix ld and objcopy being called directly
-	tc-export LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	epatch_user
-}
-
-src_configure() {
-	local conf_opts audio_opts
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	if [[ -n ${user_targets} ]]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	#conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
-	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static --disable-pie"
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if ! use static && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-	use mixemu && conf_opts="${conf_opts} --enable-mixemu"
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--docdir=/usr/share/doc/${PF}/html \
-		--disable-bsd-user \
-		--disable-guest-agent \
-		--disable-libiscsi \
-		--disable-strip \
-		--disable-werror \
-		--python=python2 \
-		$(use_enable aio linux-aio) \
-		$(use_enable bluetooth bluez) \
-		$(use_enable brltty brlapi) \
-		$(use_enable caps cap-ng) \
-		$(use_enable curl) \
-		$(use_enable debug debug-info) \
-		$(use_enable debug debug-tcg) \
-		$(use_enable doc docs) \
-		$(use_enable fdt) \
-		$(use_enable jpeg vnc-jpeg) \
-		$(use_enable kernel_linux kvm) \
-		$(use_enable kernel_linux nptl) \
-		$(use_enable ncurses curses) \
-		$(use_enable opengl) \
-		$(use_enable png vnc-png) \
-		$(use_enable rbd) \
-		$(use_enable sasl vnc-sasl) \
-		$(use_enable sdl) \
-		$(use_enable seccomp) \
-		$(use_enable smartcard smartcard) \
-		$(use_enable smartcard smartcard-nss) \
-		$(use_enable spice) \
-		$(use_enable tci tcg-interpreter) \
-		$(use_enable tls vnc-tls) \
-		$(use_enable usbredir usb-redir) \
-		$(use_enable uuid) \
-		$(use_enable vde) \
-		$(use_enable vhost-net) \
-		$(use_enable virtfs) \
-		$(use_enable vnc) \
-		$(use_enable xattr attr) \
-		$(use_enable xen) \
-		$(use_enable xen xen-pci-passthrough) \
-		$(use_enable xfs xfsctl) \
-		--audio-drv-list=${audio_opts} \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| die "configure failed"
-
-		# FreeBSD's kernel does not support QEMU assigning/grabbing
-		# host USB devices yet
-		use kernel_FreeBSD && \
-			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	if [[ -n ${softmmu_targets} ]]; then
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			dosym /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm
-			ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
-			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
-			ewarn "your libvirt configs or other wrappers for ${PN}"
-		elif use x86 || use amd64; then
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of the /usr/bin/qemu-kvm symlink."
-		fi
-	fi
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-
-	use python && dobin scripts/kvm/kvm_stat
-	use python && dobin scripts/kvm/vmxcap
-
-	# Avoid collision with app-emulation/libcacard
-	use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
-
-	# Install binfmt handler init script for user targets
-	[[ -n ${user_targets} ]] && \
-		newinitd "${FILESDIR}/qemu-binfmt.initd" qemu-binfmt
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-	fi
-
-	# Remove vgabios since we're using the vgabios packaged one
-	rm "${ED}/usr/share/qemu/vgabios.bin"
-	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-	fi
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-	fi
-
-	# Remove iPXE since we're using the iPXE packaged one
-	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../ipxe/808610de.rom /usr/share/qemu/pxe-e1000.rom
-		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-	fi
-}
-
-pkg_postinst() {
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
-		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
-		use qemu_softmmu_targets_s390x; then
-		elog "If you don't have kvm compiled into the kernel, make sure you have"
-		elog "the kernel module loaded before running kvm. The easiest way to"
-		elog "ensure that the kernel module is loaded is to load it on boot."
-		elog "For AMD CPUs the module is called 'kvm-amd'"
-		elog "For Intel CPUs the module is called 'kvm-intel'"
-		elog "Please review /etc/conf.d/modules for how to load these"
-		elog
-		elog "Make sure your user is in the 'kvm' group"
-		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-		elog
-	fi
-
-	elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
-	elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
-}
--- a/app-emulation/qemu/qemu-1.3.0.ebuild
+++ b/app-emulation/qemu/qemu-1.3.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.3.0.ebuild,v 1.5 2013/02/02 01:14:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.3.0.ebuild,v 1.6 2013/02/10 20:15:35 cardoe Exp $

 EAPI=5

@ -81,11 +81,13 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 		sys-firmware/ipxe
 		~sys-firmware/seabios-1.7.2
 		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
 	)
 	qemu_softmmu_targets_x86_64? (
 		sys-firmware/ipxe
 		~sys-firmware/seabios-1.7.2
 		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
 	)
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd
@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd,v 1.1 2013/02/10 18:11:16 polynomial-c Exp $
+
+pidfile="/var/run/vboxguest-service.pid"
+command="/usr/sbin/vboxguest-service"
+command_args="--foreground"
+start_stop_daemon_args="--make-pidfile --pidfile ${pidfile} --background"
+
+depend() {
+        need dbus localmount
+	before xdm
+}
+
+start_pre() {
+	einfo "Loading kernel modules"
+	/sbin/modprobe vboxguest &> /dev/null
+	/sbin/modprobe vboxsf &> /dev/null
+}
+
+stop_post() {
+	einfo "Removing kernel modules"
+	/sbin/modprobe -r vboxsf &> /dev/null
+	/sbin/modprobe -r vboxguest &> /dev/null
+}
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.6-r1.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.6-r1.ebuild
@ -0,0 +1,201 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.6-r1.ebuild,v 1.1 2013/02/10 18:11:16 polynomial-c Exp $
+
+EAPI=2
+
+inherit eutils linux-mod user
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
+			 x11-apps/xrandr
+			 x11-apps/xrefresh
+			 x11-libs/libXmu
+			 x11-libs/libX11
+			 x11-libs/libXt
+			 x11-libs/libXext
+			 x11-libs/libXau
+			 x11-libs/libXdmcp
+			 x11-libs/libSM
+			 x11-libs/libICE )
+	sys-apps/dbus
+	!!x11-drivers/xf86-input-virtualbox"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.9998_pre20120806
+		>=dev-lang/yasm-0.6.2
+		sys-devel/bin86
+		sys-libs/pam
+		sys-power/iasl
+		X? ( x11-proto/renderproto )
+		!X? ( x11-proto/xproto )"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+		linux-mod_pkg_setup
+		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+		enewgroup vboxguest
+		enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+
+	# stupid new header references...
+	for vboxheader in {product,revision}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+}
+
+src_configure() {
+		# build the user-space tools, warnings are harmless
+		./configure --nofatal \
+		--disable-xpcom \
+		--disable-sdl-ttf \
+		--disable-pulse \
+		--disable-alsa \
+		--build-headless || die "configure failed"
+}
+
+src_compile() {
+		source ./env.sh
+
+		for each in /src/VBox/{Runtime,Additions/common} \
+		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
+				cd "${S}"${each}
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk VBoxControl failed"
+		done
+
+		if use X; then
+				cd "${S}"/src/VBox/Additions/x11/VBoxClient
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk VBoxClient failed"
+		fi
+
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
+}
+
+src_install() {
+		linux-mod_src_install
+
+		cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+		insinto /sbin
+		newins mount.vboxsf mount.vboxsf
+		fperms 4755 /sbin/mount.vboxsf
+
+		newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
+
+		insinto /usr/sbin/
+		newins VBoxService vboxguest-service
+		fperms 0755 /usr/sbin/vboxguest-service
+
+		insinto /usr/bin
+		doins VBoxControl
+		fperms 0755 /usr/bin/VBoxControl
+
+		# VBoxClient user service and xrandr wrapper
+		if use X; then
+			doins VBoxClient
+			fperms 0755 /usr/bin/VBoxClient
+
+			cd "${S}"/src/VBox/Additions/x11/Installer
+			newins 98vboxadd-xclient VBoxClient-all
+			fperms 0755 /usr/bin/VBoxClient-all
+		fi
+
+		# udev rule for vboxdrv
+		dodir /lib/udev/rules.d
+		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+			|| die
+		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${D}/lib/udev/rules.d/60-virtualbox-guest-additions.rules" \
+			|| die
+
+		# VBoxClient autostart file
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}"/vboxclient.desktop
+
+		# sample xorg.conf
+		insinto /usr/share/doc/${PF}
+		doins "${FILESDIR}"/xorg.conf.vbox
+}
+
+pkg_postinst() {
+		linux-mod_pkg_postinst
+		if ! use X ; then
+			elog "use flag X is off, enable it to install the"
+			elog "X Window System video driver."
+		fi
+		elog ""
+		elog "Please add users to the \"vboxguest\" group so they can"
+		elog "benefit from seamless mode, auto-resize and clipboard."
+		elog ""
+		elog "Please add:"
+		elog "/etc/init.d/${PN}"
+		elog "to the default runlevel in order to start"
+		elog "needed services."
+		elog "To use the VirtualBox X driver, use the following"
+		elog "file as your /etc/X11/xorg.conf:"
+		elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+		elog ""
+		elog "Also make sure you use the Mesa library for OpenGL:"
+		elog "    eselect opengl set xorg-x11"
+		elog ""
+		elog "An autostart .desktop file has been installed to start"
+		elog "VBoxClient in desktop sessions."
+		elog ""
+		elog "You can mount shared folders with:"
+		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+		elog ""
+		elog "Warning:"
+		elog "this ebuild is only needed if you are running gentoo"
+		elog "inside a VirtualBox Virtual Machine, you don't need"
+		elog "it to run VirtualBox itself."
+		elog ""
+}
--- a/app-forensics/libewf/Manifest
+++ b/app-forensics/libewf/Manifest
@ -1,3 +1,4 @@
 DIST libewf-20121209.tar.gz 1533967 SHA256 1a10c8ec2b4ed756e9becff49c5596c455702444b5ecde9d9943143cf46c5c9c SHA512 fd350a856650e74177526c7e8e1ab8219b05dd6d60439e8ed26fe3970d0c0503925a7f7b02555c7aab5d661f2a8ba016e5aaa694b2869f9d71a8a64a3945074d WHIRLPOOL 86149b7abe4ee04d58cbc30672f4f03c6a5cc0705cd49f38ae105ab20545f564cc7f91b3a460de5216e644ba64d5c174758aa440a54f4fe21ffe215401217898
 DIST libewf-20130105.tar.gz 1534184 SHA256 ea7397872942717ee307766b204651aa545fdbb0d3191ebf0bed98f34eddd50a SHA512 ce396c6badb29eaac04cf08e107fce5d3a89ccad62a283327ab66d332bc6c6b4a6eed30eaeb86f935702e6a3451bf6adb1ca7b03de904e822ace6b060a509091 WHIRLPOOL 1abb3e7ec234c7256c19a2beea2ffeb4d59d0f61b8f7f58468fc7d60482023bea521041ff706bdbdd454a5be66339808deafa34c2bcc64292f621225fff45afe
 DIST libewf-20130120.tar.gz 1976835 SHA256 9ef1b4f72517150e12716d331f3f70d2577c76689e41584c7a09461ae6788e97 SHA512 671ee8e6a176a96b0d3c8fba1044482255d72b4f1ccf56e977cfd1d8393f183418c0dcbbc372a632aa02ca2c7eb90e8fdd3f93d58d24a5a53cf5b8dbed32c686 WHIRLPOOL d983db196d1f84e5852c0a6fc6963687ac234d83e4a40ef59421f739b21e7a6c16b5b373b52554e291b00a0b89ecd122e275746c3990bf76f8c537e568cd4d2e
+DIST libewf-20130128.tar.gz 1978794 SHA256 769a5662299485f98d50ef484e73da23813827ac52a2963b67a3e3416fd663d5 SHA512 94cdd0c3f0d8f535f3462c5adba266302f9b129abacda077ed429fa38af6862fca5a90ba2e606b78607b509769305cc6134c483c7033c20e226596cca2d42b90 WHIRLPOOL c126f4d074b032ccaeef6e5ef747c188f62c2b09cd7cc021facb94a8c6a9412a0169921b35a2371d7644a927ecb4d15c69a353747a4c6c98111823070c9577cd
--- a/app-forensics/libewf/libewf-20130128.ebuild
+++ b/app-forensics/libewf/libewf-20130128.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/libewf/libewf-20130128.ebuild,v 1.1 2013/02/10 20:39:13 radhermit Exp $
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="Implementation of the EWF (SMART and EnCase) image format"
+HOMEPAGE="http://code.google.com/p/libewf/"
+SRC_URI="http://libewf.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+# upstream bug #2597171, pyewf has implicit declarations
+#IUSE="debug python rawio unicode"
+IUSE="debug ewf +fuse rawio +ssl static-libs +uuid unicode zlib"
+
+DEPEND="
+	sys-libs/zlib
+	fuse? ( sys-fs/fuse )
+	uuid? ( sys-apps/util-linux )
+	ssl? ( dev-libs/openssl )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+DOCS=( AUTHORS ChangeLog NEWS README documents/header.txt documents/header2.txt )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug debug-output)
+		$(use_enable debug verbose-output)
+		$(use_enable ewf v1-api)
+		$(use_enable rawio low-level-functions)
+		$(use_enable unicode wide-character-type)
+		$(use_with zlib)
+		# autodetects bzip2 but does not use
+		--without-bzip2
+		$(use_with ssl openssl)
+		$(use_with uuid libuuid)
+		$(use_with fuse libfuse)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	doman manuals/*.1 manuals/*.3
+}
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@ -1 +1,2 @@
 DIST sleuthkit-4.0.1.tar.gz 7488397 SHA256 719d9a702f74c30302840301fe573c5bb5af5b88471b48657114eba6b0d76f12 SHA512 34de46671c575a61e169af524a8c92701731b58a3f9717a22639b99cab6fd5ac84fe912e699169b5a8bb546816d464370d0e3fa55e714898dd4ca94c7fa907fe WHIRLPOOL df41455499a4a29ffd1efa61925b7d491d1e253c2761e1d8026df41d6620719269954f7fd851a30744ed90816e1ec9e7ccec6dc8d46990e9b20177fb1b6116a1
+DIST sleuthkit-4.0.2.tar.gz 7577570 SHA256 112f80fbc6a868c18c7a924f756b35c79eed9d0cc8923a4f973646f00e546e62 SHA512 acf1d6006db3e75675eb769034ea78fd78133ac0f83c9caa74ec720c0dd25f95fb1a5df2c652027eeeac53e1fca6a3096b5248db95e3a01ce95e72e779e44f37 WHIRLPOOL 72ba21e2b89c6b06974612041c9374e3f306237312328c375d012197409a02fcaa1abc120189d28a8261cabbbd1d6c37b3b14431c47b008f06d43a7c6d9ea612
--- a/app-forensics/sleuthkit/sleuthkit-4.0.2.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.0.2.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-4.0.2.ebuild,v 1.1 2013/02/10 20:54:55 radhermit Exp $
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="A collection of file system and media management forensic analysis tools"
+HOMEPAGE="http://www.sleuthkit.org/sleuthkit/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 IBM"
+SLOT="0/9" # subslot = major soname version
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="aff ewf static-libs"
+
+DEPEND="dev-db/sqlite:3
+	ewf? ( app-forensics/libewf )
+	aff? ( app-forensics/afflib )"
+RDEPEND="${DEPEND}
+	dev-perl/DateManip"
+
+DOCS=( NEWS.txt README.txt )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.0-system-sqlite.patch
+	"${FILESDIR}"/${PN}-3.2.3-tools-shared-libs.patch
+)
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with aff afflib)
+		$(use_with ewf libewf)
+	)
+	autotools-utils_src_configure
+}
--- a/app-i18n/fcitx/fcitx-4.2.5.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.5.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.5.ebuild,v 1.1 2012/07/19 07:43:11 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.5.ebuild,v 1.2 2013/02/10 23:37:24 naota Exp $

 EAPI=4

--- a/app-i18n/fcitx/fcitx-4.2.6.1.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.6.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.6.1.ebuild,v 1.2 2012/10/29 08:48:14 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.6.1.ebuild,v 1.3 2013/02/10 23:37:24 naota Exp $

 EAPI=4

--- a/app-i18n/fcitx/fcitx-4.2.7.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.7.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.7.ebuild,v 1.2 2013/01/31 09:02:45 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.7.ebuild,v 1.3 2013/02/10 23:37:24 naota Exp $

 EAPI=5

@ -38,7 +38,7 @@ RDEPEND="
 		dev-libs/glib:2
 		dev-libs/dbus-glib
 	)
-	icu? ( dev-libs/icu )
+	icu? ( dev-libs/icu:= )
 	introspection? ( dev-libs/gobject-introspection )
 	lua? ( dev-lang/lua )
 	opencc? ( app-i18n/opencc )
--- a/app-i18n/ibus-qt/Manifest
+++ b/app-i18n/ibus-qt/Manifest
@ -1,4 +1,2 @@
-DIST ibus-qt-1.2.0.20091216-Source.tar.gz 135632 SHA256 460ff10c2e45357ce7fa350100a79bb944d8ddc86efccdcd220b8f472768b371 SHA512 03ab38fac8129b28fc015b95c8e6ad188b7da300b38c3cc9c31cde4fca6392724c6fd50328b5bc452b01eff0a027e0a03888e548a95af4516f5d1413cba0ef3d WHIRLPOOL 3eb9ee9f1d39ecef5a8d15a54aa9c7c49a7cbcd18761283b0e388edb40b249abe7f4ba87ff066fcdbcc5ea0ce78a6290d90154880f666cde3d7e38fa03ae9d52
-DIST ibus-qt-1.2.0.20091217-Source.tar.gz 135595 SHA256 2a1e73e8f986cb2d8b0cecab63cecf32598c1e1275e8a6db1b094d3cdf184bb5 SHA512 d0c24ce5815d8443fb99afcf6a7258fd8fd17e20cac040eb5bb5d3cc677e9ce2f0398ad82befa7dccf114a0dcf1ad0b0cfbd96a11c0da9eb46d40b5bdb4bb5eb WHIRLPOOL 6a6ed8cbe260cd24f2c2089aac8f1aa85bdf02bf2173436ba25e9895ad6e67ebd71fa582b3049686a6ecca11e2234a28cd8113cf601b1cabcf7c49cfa97b423c
 DIST ibus-qt-1.3.0-Source.tar.gz 138525 SHA256 f7b143e53c775bd2db14079d0dd6ab9d404e43a5a1634ff3487fe372b494cee0 SHA512 5c8244f25bcd49c0da78a5b38e295df098fb9f8f4d27934036f2e637b43716b1580b2cae9c3fa66ff9c77aba2863f0ad77fb639b2ffa0e49a1f2a373e3b7bef0 WHIRLPOOL 0e98b94be3d1d8f3a72f1e5e1aa3cc3d3a1de39b7f87dda07447c0270a82233b03d8cdbaebf59b0c17ef5cc409a3e3430024cd1505c2b8886bb9796c40830ad4
 DIST ibus-qt-1.3.1-Source.tar.gz 141488 SHA256 4079577a240c961278f7bdab11a5ad546dff414c687c60560fdbc19208b3ac85 SHA512 2cd28f8ff3fff411496ccaf9ab67ab5332b7f2d2d0d0e3460dbeb34874ed931aa56c222c3ea5ce39053577b91cd2de4ebe01152039cd6def37c366ab3065cff2 WHIRLPOOL 585ead9a02d2014f7536aa633c72e07f8ce990c768d0aa9b5bf00105166f467307fb12457c5da4c2aa0b7b5cf9656d616de7d0e344e8d02161e123368bdad9ff
--- a/app-i18n/ibus-qt/ibus-qt-1.2.0.20091216.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.2.0.20091216.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.2.0.20091216.ebuild,v 1.2 2012/05/03 19:24:31 jdhore Exp $
-
-EAPI="1"
-inherit cmake-utils multilib
-
-MY_P="${P}-Source"
-DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/ibus-1.2
-	>=sys-apps/dbus-1.2
-	x11-libs/libX11
-	>=x11-libs/qt-core-4.5:4
-	>=x11-libs/qt-dbus-4.5:4"
-DEPEND="${RDEPEND}
-	app-doc/doxygen
-	>=dev-libs/icu-4
-	dev-util/cmake
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS README TODO"
-
-mycmakeargs="-DLIBDIR=$(get_libdir)"
--- a/app-i18n/ibus-qt/ibus-qt-1.2.0.20091217.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.2.0.20091217.ebuild
@ -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/app-i18n/ibus-qt/ibus-qt-1.2.0.20091217.ebuild,v 1.4 2012/05/03 19:24:31 jdhore Exp $
-
-EAPI="2"
-inherit cmake-utils eutils multilib
-
-MY_P="${P}-Source"
-DESCRIPTION="Qt IBus library and Qt input method plugin"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND=">=app-i18n/ibus-1.2
-	>=sys-apps/dbus-1.2
-	x11-libs/libX11
-	>=x11-libs/qt-core-4.5:4
-	>=x11-libs/qt-dbus-4.5:4"
-DEPEND="${RDEPEND}
-	>=dev-libs/icu-4
-	dev-util/cmake
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS README TODO"
-
-mycmakeargs="-DLIBDIR=$(get_libdir) -DDOCDIR=/usr/share/doc/${PF} all"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-doc.patch"
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc ; then
-		cd "${CMAKE_BUILD_DIR}"
-		emake docs || die
-	fi
-}
-
-src_install() {
-	if use doc ; then
-		HTML_DOCS="${CMAKE_BUILD_DIR}/docs/html/*"
-	fi
-
-	cmake-utils_src_install
-}
--- a/app-i18n/ibus-qt/ibus-qt-1.3.0.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.0.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.3.0.ebuild,v 1.4 2012/05/03 19:24:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.3.0.ebuild,v 1.5 2013/02/10 23:57:43 naota Exp $

-EAPI="2"
+EAPI="5"
 inherit cmake-utils eutils multilib

 MY_P="${P}-Source"
@ -21,7 +21,7 @@ RDEPEND=">=app-i18n/ibus-1.2
 	>=x11-libs/qt-core-4.5:4
 	>=x11-libs/qt-dbus-4.5:4"
 DEPEND="${RDEPEND}
-	>=dev-libs/icu-4
+	>=dev-libs/icu-4:=
 	dev-util/cmake
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
--- a/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
+++ b/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild,v 1.6 2012/12/10 23:06:36 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-qt/ibus-qt-1.3.1.ebuild,v 1.7 2013/02/10 23:57:43 naota Exp $

-EAPI="2"
+EAPI="5"
 inherit cmake-utils eutils multilib

 MY_P="${P}-Source"
@ -21,7 +21,7 @@ RDEPEND=">=app-i18n/ibus-1.3.7
 	>=x11-libs/qt-core-4.5:4
 	>=x11-libs/qt-dbus-4.5:4"
 DEPEND="${RDEPEND}
-	>=dev-libs/icu-4
+	>=dev-libs/icu-4:=
 	dev-util/cmake
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
--- a/app-misc/nut/Manifest
+++ b/app-misc/nut/Manifest
@ -1,3 +1 @@
-DIST nut-18.0.tar.gz 1301699 SHA256 3bba7386686e36735465aa2f95d73c28d808717fed80d3618ac9bb6baeb3cb4d SHA512 19d8bba3b9484bb59119c0aa89184b81b2c482e90e9d3738ef0bfb4dfeabe2a81d94d00838ea3243d2b29e855db0b4129ed7ceeb46304d57d9e73677c5304f48 WHIRLPOOL bfe91c9a64feab1793a00756af556138f1836e3b233f5047cb2c79d8bbe04d9bb96459aacabdf8d85134b0b11c3fcb0adf0f7f8b1e91ab58aa4c2ef1ec76e40d
-DIST nut-18.4.tar.gz 1336493 SHA256 b6cc5382ddbedd788ecdb9745111e3f8c606bfbf7d5fe2f7b9298e9bd77c903a SHA512 9b548322b3a4cee5acc522a11f3e2ecfe0fbd3f6be726979f16fcb236ebafae85f25f472d4bed43b6734ecd8b964c093adaac487d6621da00c96c9e94a0b966d WHIRLPOOL 8ddcd9cb0145800ccb6beb5504977c16f2cc956035e846fc4714a9eeffbdbe54c57afce0504eae5866fe039047cbc01591f19f01cb6329b1d13c124a8480e8a1
 DIST nut-18.5.tar.gz 1331213 SHA256 45c959fe2839a41726fde647b78175c45d4f0d9fb59dc8da1e828103b7fd5507 SHA512 d598532247611556cc4d8fb5d70bcbfc6978f8b1176a9c5a1ccf05df71fa50bac81045ff39c6ddb0344023fa128def12635c21da9b87876278159912a7eeab45 WHIRLPOOL 0c196a3afa40ae1cb31e987f4627d818ccc94166ea816930567ff7d728d862d8a372701747d8b197424aa61b653c866cc5878f7ac8a34b8a9bdcda8d28023cd9
--- a/app-misc/nut/nut-18.0.ebuild
+++ b/app-misc/nut/nut-18.0.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-18.0.ebuild,v 1.4 2012/11/20 20:45:22 ago Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Record what you eat and analyze your nutrient levels"
-HOMEPAGE="http://nut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-17.12-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\"
-}
-
-src_install() {
-	insinto /usr/share/nut
-	doins raw.data/*
-	dobin nut
-	doman nut.1
-}
--- a/app-misc/nut/nut-18.4.ebuild
+++ b/app-misc/nut/nut-18.4.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-18.4.ebuild,v 1.1 2012/11/19 12:28:47 jer Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Record what you eat and analyze your nutrient levels"
-HOMEPAGE="http://nut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-17.12-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\"
-}
-
-src_install() {
-	insinto /usr/share/nut
-	doins raw.data/*
-	dobin nut
-	doman nut.1
-}
--- a/app-misc/nut/nut-18.5.ebuild
+++ b/app-misc/nut/nut-18.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-18.5.ebuild,v 1.3 2013/02/09 19:45:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/nut/nut-18.5.ebuild,v 1.4 2013/02/10 17:14:02 ago Exp $

 EAPI=4
 inherit eutils toolchain-funcs
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc x86"
+KEYWORDS="~alpha amd64 ~arm ppc x86"
 IUSE=""

 src_prepare() {
--- a/app-misc/spacenavd/spacenavd-0.5-r4.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.5-r4.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r4.ebuild,v 1.3 2012/11/16 10:33:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r4.ebuild,v 1.5 2013/02/10 20:48:24 ago Exp $

 EAPI="4"

@ -12,7 +12,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20daemon/${PN}%20${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="X"

 RDEPEND="X? ( x11-apps/xdpyinfo )"
--- a/app-mobilephone/obex-data-server/obex-data-server-0.4.6.ebuild
+++ b/app-mobilephone/obex-data-server/obex-data-server-0.4.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/obex-data-server-0.4.6.ebuild,v 1.4 2013/02/08 11:10:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obex-data-server/obex-data-server-0.4.6.ebuild,v 1.5 2013/02/10 17:17:05 ago Exp $

 EAPI="4"

@ -10,7 +10,7 @@ SRC_URI="http://tadas.dailyda.com/software/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"

 IUSE="debug gtk imagemagick usb"

--- a/app-portage/splat/splat-0.08-r1.ebuild
+++ b/app-portage/splat/splat-0.08-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/splat/splat-0.08-r1.ebuild,v 1.5 2013/02/10 14:44:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/splat/splat-0.08-r1.ebuild,v 1.6 2013/02/10 17:17:54 ago Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="http://www.l8nite.net/projects/splat/downloads/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ~ppc ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""

 DEPEND="dev-lang/perl"
--- a/app-shells/rrs/rrs-1.70-r1.ebuild
+++ b/app-shells/rrs/rrs-1.70-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/rrs-1.70-r1.ebuild,v 1.2 2012/10/11 09:26:19 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/rrs/rrs-1.70-r1.ebuild,v 1.4 2013/02/10 20:47:21 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://www.cycom.se/uploads/36/19/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="ssl"

 DEPEND="ssl? ( dev-libs/openssl )"
--- a/app-text/calibre/calibre-0.9.18.ebuild
+++ b/app-text/calibre/calibre-0.9.18.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.18.ebuild,v 1.1 2013/02/08 17:35:08 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.18.ebuild,v 1.4 2013/02/10 20:11:37 scarabeus Exp $

 EAPI=5
 PYTHON_DEPEND=2:2.7
@ -22,7 +22,7 @@ IUSE="+udisks"

 COMMON_DEPEND="
 	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)]
+	>=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)]
 	>=dev-libs/chmlib-0.40:=
 	>=dev-libs/icu-4.4:=
 	>=dev-python/beautifulsoup-3.0.5:python-2
@ -38,7 +38,7 @@ COMMON_DEPEND="
 	>=dev-python/python-dateutil-1.4.1
 	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
 	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9:=[jpeg,png]
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
 	>=media-libs/freetype-2:=
 	>=media-libs/libwmf-0.2.8
 	>=media-libs/libmtp-1.1.4:=
@ -88,10 +88,15 @@ src_prepare() {
 '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
 '-i', 'Makefile'])" \
 		-i setup/extensions.py || die "sed failed to patch extensions.py"
+
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	epatch \
+		"${FILESDIR}/${PN}-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
 }

 src_install() {
-
 	# Bypass kbuildsycoca and update-mime-database in order to
 	# avoid sandbox violations if xdg-mime tries to call them.
 	cat - > "${T}/kbuildsycoca" <<-EOF
--- a/app-text/calibre/files/calibre-disable_plugins.patch
+++ b/app-text/calibre/files/calibre-disable_plugins.patch
@ -0,0 +1,17 @@
+Description: Disable plugin dialog. It uses a totally non-authenticated and non-trusted way of installing arbitrary code.
+Author: Martin Pitt <mpitt@debian.org>
+Bug-Debian: http://bugs.debian.org/640026
+
+Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py
+===================================================================
+--- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py	2011-12-16 05:49:14.000000000 +0100
+++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py	2011-12-20 19:29:04.798468930 +0100
+@@ -28,8 +28,6 @@
+             pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config)
+         cm('welcome wizard', _('Run welcome wizard'),
+                 icon='wizard.png', triggered=self.gui.run_wizard)
+-        cm('plugin updater', _('Get plugins to enhance calibre'),
+-                icon='plugins/plugin_updater.png', triggered=self.get_plugins)
+         if not DEBUG:
+             pm.addSeparator()
+             cm('restart', _('Restart in debug mode'), icon='debug.png',
--- a/app-text/calibre/files/calibre-no_updates_dialog.patch
+++ b/app-text/calibre/files/calibre-no_updates_dialog.patch
@ -0,0 +1,13 @@
+--- calibre-0.8.60+dfsg.orig/src/calibre/gui2/main.py	2012-07-20 06:26:28.000000000 +0200
+++ calibre-0.8.60+dfsg/src/calibre/gui2/main.py	2012-07-21 17:53:13.944924329 +0200
+@@ -34,8 +34,8 @@
+                       help=_('Start minimized to system tray.'))
+     parser.add_option('-v', '--verbose', default=0, action='count',
+                       help=_('Log debugging information to console'))
+-    parser.add_option('--no-update-check', default=False, action='store_true',
+-            help=_('Do not check for updates'))
+    parser.add_option('--update-check', dest='no_update_check', default=True, action='store_false',
+            help=_('Check for updates'))
+     parser.add_option('--ignore-plugins', default=False, action='store_true',
+             help=_('Ignore custom plugins, useful if you installed a plugin'
+                 ' that is preventing calibre from starting'))
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@ -1,4 +1 @@
-DIST convmv-1.10.tar.gz 21276 SHA256 e3ac03846617df4346eb7537289c5bac80d245c4768a53671c289c98d7bfb9c8 SHA512 db21204f8c382ca9987e329af2ea245bd0818e511150c96f1c9b82ab5fe728bb197466ad3bebc3d4130d0ab9892f90b408eddadd48b74dbe3c50a475702908b6 WHIRLPOOL 16a0cf8b5733236ba41354c26770fe4031260274040c5d1dfda519fc2fedfcfb5513b90a84d52d36b8ba1565dd41b3e067577965929012df5657bb54ab821b3e
-DIST convmv-1.12.tar.gz 23059 SHA256 49a6576b68e986cf1f6c18a93e7bcef554cf614ccdc19dd117becb6624425e0f SHA512 50c19612b0627992cba0670b96b6b44c759cb6a698f33d48b38ae2cfde6d3e691cfb4f2d42c76a901221bf438ed5775b6c28a2e95875724a1317ccc4d2d3fd56 WHIRLPOOL 8315866fb75a1ffdbe3fd752e509fac5839b1c925fe199224cd9818b8094d6c79e7f8ce5e2cf6f49613013823a1511f4592d2d13320679759a741c689d3830ac
-DIST convmv-1.14.tar.gz 26620 SHA256 9695f5e24a17c9056f69479efc4c1b60174de1901ad83d8dbd6ecea2fdca7cef SHA512 c681b857299c7b8929634c561cec490dd0a3cdc522548c392da8c9dbbb9911a22d4c560f51f4aa29bfc2c67e06e7117c5f20fe0e8e10cb8b1c3b658c211ac769 WHIRLPOOL 70f4160343cf57056d6af9d32b0c385836bc0ea21b4d733f6687444be0b1bad6bbe660b82acf7a6a6248c13e381ad022b809f4515bd2988c47a9f1fa5d2ff6fa
 DIST convmv-1.15.tar.gz 27180 SHA256 c315aec78490b588000467d1c51081b36e629de0537c5a17fd48b1acaf8a5135 SHA512 b809f103da48d43f9c7fb6cb3e08a88e1c9b2a2ad691f9fcc4422b4e597c247b86fd0446c777e4c9911b4fad551cdc9fc88eff3a1d8cb4b001e164cc8387b900 WHIRLPOOL d7c3e3fbe918472d96f1cbc40b70f280a179a3c99cef07953c0723dfcba0e81ff383d918382b196d0525724dde650c4a480e5cc91c07f9452308a3eebd1567cc
--- a/app-text/convmv/convmv-1.10.ebuild
+++ b/app-text/convmv/convmv-1.10.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.10.ebuild,v 1.15 2011/02/06 05:44:18 leio Exp $
-
-inherit eutils
-
-DESCRIPTION="convert filenames to utf8 or any other charset"
-HOMEPAGE="http://j3e.de/linux/convmv"
-SRC_URI="http://j3e.de/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall DESTDIR="${D}" PREFIX=/usr || die "einstall failed"
-	dodoc CREDITS Changes TODO VERSION
-}
-
-src_test() {
-	unpack ./testsuite.tar
-	# Never make assumptions as to the ordering of files inside a directory!
-	epatch "${FILESDIR}"/${PN}-1.10-testcase-cleanup.patch
-	cd "${S}"/suite
-	./dotests.sh || die "Tests failed"
-}
--- a/app-text/convmv/convmv-1.12.ebuild
+++ b/app-text/convmv/convmv-1.12.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.12.ebuild,v 1.1 2008/06/07 01:53:16 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="convert filenames to utf8 or any other charset"
-HOMEPAGE="http://j3e.de/linux/convmv"
-SRC_URI="http://j3e.de/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall DESTDIR="${D}" PREFIX=/usr || die "einstall failed"
-	dodoc CREDITS Changes TODO VERSION
-}
-
-src_test() {
-	unpack ./testsuite.tar
-
-	# Patch merged by upstream
-	# Never make assumptions as to the ordering of files inside a directory!
-	#EPATCH_OPTS="-d ${S}/suite/" epatch "${FILESDIR}"/${PN}-1.10-testcase-cleanup.patch
-
-	cd "${S}"/suite
-	./dotests.sh || die "Tests failed"
-}
--- a/app-text/convmv/convmv-1.14.ebuild
+++ b/app-text/convmv/convmv-1.14.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.14.ebuild,v 1.2 2010/02/21 03:53:20 abcd Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="convert filenames to utf8 or any other charset"
-HOMEPAGE="http://j3e.de/linux/convmv"
-SRC_URI="http://j3e.de/linux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_prepare() {
-	sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
-}
-
-src_install() {
-	einstall DESTDIR="${D}" PREFIX="${EPREFIX}"/usr || die "einstall failed"
-	dodoc CREDITS Changes TODO VERSION
-}
-
-src_test() {
-	unpack ./testsuite.tar
-
-	cd "${S}"/suite
-	./dotests.sh || die "Tests failed"
-}
--- a/app-text/convmv/convmv-1.15.ebuild
+++ b/app-text/convmv/convmv-1.15.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.15.ebuild,v 1.1 2012/02/21 08:35:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.15.ebuild,v 1.2 2013/02/10 20:22:51 scarabeus Exp $

 EAPI=3

@ -12,7 +12,7 @@ SRC_URI="http://j3e.de/linux/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""

 DEPEND="dev-lang/perl"
--- a/app-text/convmv/files/convmv-1.10-testcase-cleanup.patch
+++ b/app-text/convmv/files/convmv-1.10-testcase-cleanup.patch
@ -1,75 +0,0 @@
--- convmv-1.10.orig/suite/dotests.sh	2006-06-25 15:01:16.000000000 -0700
-+++ convmv-1.10/suite/dotests.sh	2006-11-13 02:18:13.373820717 -0800
-@@ -3,62 +3,62 @@
- # you might want to change this to GNU find's full path:
- FIND=find
- FINDEXP="%P -- %l\n"
-for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" > out-$dir ; done
-+for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" | sort > out-$dir ; done
- #
- echo smartness-test
- rm -rf test.tmp
- cp -r test test.tmp
- ../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
- false
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test out.tmp > diff.tmp|| { echo "smartness-test failed." ; exit 1; }
- #
- echo double-utf8 test
- ../convmv -f iso8859-15 -t utf8 --notest -r --nosmart test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test-utf8 out.tmp > diff.tmp|| { echo "double-utf8 test failed." ; exit 1; }
- #
- ../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test out.tmp > diff.tmp|| { echo undo-double-utf8 test failed. ; exit 1; }
- #
- echo utf8-to-iso8859-15-test
- rm -r test.tmp
- cp -r test test.tmp
- ../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test-iso8859-15 out.tmp > diff.tmp|| { echo utf8-to-iso8859-15-test failed. ; exit 1; }
- #
- echo iso8859-15-to-utf8-test
- rm -r test.tmp
- cp -r test-iso8859-15 test.tmp
- ../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test out.tmp > diff.tmp|| { echo iso8859-15-to-utf8-test failed. ; exit 1; }
- #
- echo nfc-test
- rm -r test.tmp
- cp -r test test.tmp
- ../convmv -f utf-8 -t utf-8 --nfd --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test-nfd out.tmp > diff.tmp|| { echo nfd-test failed. ; exit 1; }
- #
- ../convmv -f utf8 -t utf8 --nfc --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test out.tmp > diff.tmp|| { echo nfc-test failed. ; exit 1; }
- #
- echo escaped-test
- rm -r test.tmp
- cp -r test-escaped test.tmp
- ../convmv --unescape --notest -r test.tmp
-$FIND test.tmp -printf "$FINDEXP" > out.tmp
-+$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
- diff out-test out.tmp > diff.tmp|| { echo escaped-test failed. ; exit 1; }
- #
- echo upper-test
- rm -r test.tmp
- cp -r test test.tmp
- ../convmv --upper -f utf8 --notest -r test.tmp
-$FIND TEST.TMP -printf "$FINDEXP" > out.tmp
-+$FIND TEST.TMP -printf "$FINDEXP" |sort >out.tmp
- diff out-test-upper out.tmp > diff.tmp|| { echo upper-test failed. ; exit 1; }
- 
- echo All tests successful, cleaning up now ...
--- a/app-text/migemo/files/migemo-0.40-ruby-ng.patch
+++ b/app-text/migemo/files/migemo-0.40-ruby-ng.patch
@ -41,7 +41,7 @@
 
 echo -n "checking Ruby/Bsearch... "
 -if ruby -rbsearch -e 'exit(if Bsearch::VERSION >= "1.2" then 0 else 1 end)'; then
-+if $RUBY -rbsearch -e 'exit(if Bsearch::VERSION >= "1.2" then 0 else 1 end)'; then
+if $RUBY -e 'require "bsearch"; exit(if Bsearch::VERSION::STRING >= "1.2" then 0 else 1 end)'; then
    echo found
 else
    echo not found
--- a/app-text/migemo/migemo-0.40-r5.ebuild
+++ b/app-text/migemo/migemo-0.40-r5.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r5.ebuild,v 1.2 2012/12/11 15:53:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r5.ebuild,v 1.3 2013/02/11 00:55:09 naota Exp $

 EAPI=4
 # ruby19, jruby: dev-ruby/ruby-romkan not work
--- a/dev-cpp/gtest/gtest-1.6.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.6.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r1.ebuild,v 1.5 2013/02/10 14:46:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r1.ebuild,v 1.6 2013/02/10 17:15:23 ago Exp $

 EAPI="4"
 PYTHON_DEPEND="2"
@ -13,7 +13,7 @@ SRC_URI="http://googletest.googlecode.com/files/${P}.zip"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
 IUSE="examples static-libs"

 DEPEND="app-arch/unzip"
--- a/dev-db/m17n-db/m17n-db-1.6.4.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.6.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.6.4.ebuild,v 1.7 2013/02/10 14:45:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.6.4.ebuild,v 1.8 2013/02/10 17:14:26 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/m17n/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 ~sh sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc ~x86"
 IUSE=""

 DEPEND="sys-devel/gettext"
--- a/dev-lang/tcl/tcl-8.5.13-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.5.13-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.13-r1.ebuild,v 1.4 2013/02/10 14:43:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.13-r1.ebuild,v 1.5 2013/02/10 17:21:30 ago Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"

 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"

 SPARENT="${WORKDIR}/${MY_P}"
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@ -1,5 +1,3 @@
-DIST tk8.4.19-src.tar.gz 3362694 SHA256 d056fe6c204ac31539616e1069522dd5864a580b64e521fe1a49bc895ca8699f SHA512 314cc4b52dc27c0b9fab103e69890c160f55ab5d90c8114a0735cb07d4b24dc23506532555f5efeb5a30f208a1b615763d40c3c6ad2e1bcb23e51fc066c2f032 WHIRLPOOL a570eb87dc522c3ac5683bbe925035e2b2bc9ee1e204ba3e3704a651d2c132acfe8aff43edec7269203730af4c58927d287790e590b0113f2b5a3377c46591dd
 DIST tk8.5.10-src.tar.gz 3807862 SHA256 f6ac59a3414a0989c9ca30237b3c14ceee95733eb486739ffc271c8055e37c9f SHA512 c5261dabd12994d6f5eeab1b13aaab53c846608bf33a73b5d92a38868ba4a2c386fe28ec903347d00186266a75646a418fdd9705e7a41e7e6d46e7928067ae72 WHIRLPOOL f73cc598c84b9ad2210c9618827cf49b977b0ca79efca13c948cfc70ad85b3c34b929e6471e8101376252be22ab63994c22ad8e619b77919c0fd1810c3e9105c
-DIST tk8.5.11-src.tar.gz 3809826 SHA256 d35810b33a0931656f1d128e7e0776cc0c4d8b9c72af322cab5a7ee30485eb70 SHA512 c00cc0cdaafbee24d104fb55c90f61143090ad38b47cc5e77e724638ac357dce83417da3adeca7afc881262cd145b286ad5e9957e53338639f2b2426a81750ec WHIRLPOOL adf52b59e26a9458cf47e2acf90ec1cd3d0b072829b96fb1473cfb2a7fa40fadc393fce884a3262e881a77c66b5b4ef1fab0d084a65b1ca8a712a9f4f3122ca1
 DIST tk8.5.13-src.tar.gz 4086092 SHA256 9e83ba2704ad73a65986eb7cdc51e432a5db6eca8d8691e33caceef40ed0c563 SHA512 5b705026d3d80c35bd60311c3df5489a7970c1648f98d843d6ee57c9336de5e63aed488f670f15f2c0bffccbc2402cc98c383c057b7d86f1db4c36340e34e209 WHIRLPOOL e523bfa0ce407f4d5157df7fee93c6d60012bf5b46a4cbd4e4692ad0ce872650563d12db11bfa94ba19b0a5aad1ef9fdd4b02dfb11f0de253839c69adb26a718
 DIST tk8.6.0-src.tar.gz 4239836 SHA256 5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6 SHA512 e78c3f3a8dacd6c1aaa4587f7e4e2a2a6a5adf3957c89bf450cea82d85701242729ccf6232cef71138685926f6a44fe683aa6425d0c4738326637e88b3d9e38d WHIRLPOOL 8344adaa74913eb3dd13d8240a451ebdfe0225a67ea7516e18d4a3920b2e448380c53fe6d2916e36518b3e9b02df0e15c41c9e1a6f1ca30f1b6790a408fdf30b
--- a/dev-lang/tk/tk-8.4.19-r1.ebuild
+++ b/dev-lang/tk/tk-8.4.19-r1.ebuild
@ -1,117 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.19-r1.ebuild,v 1.6 2012/12/05 08:51:37 ulm Exp $
-
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug threads"
-
-RDEPEND="x11-libs/libX11
-	~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	>=x11-proto/xproto-7.0.13"
-
-S=${WORKDIR}/${PN}${PV}
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/remove-control-v-8.4.9.diff
-	epatch "${FILESDIR}"/${PN}-8.4.9-man.patch
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch
-
-	# Bug 225999
-	epatch "${FILESDIR}"/${PN}-8.4-lastevent.patch
-
-	local d
-	for d in */configure ; do
-		cd "${S}"/${d%%/*}
-		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
-		epatch "${FILESDIR}"/tk-configure-LANG.patch
-	done
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_compile() {
-	tc-export CC
-	cd "${S}"/unix
-
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-
-	econf \
-		--with-tcl=/usr/${mylibdir} \
-		$(use_enable threads) \
-		$(use_enable debug symbols)
-
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	make DESTDIR="${D}" install || die
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-		"${D}"/usr/${mylibdir}/tkConfig.sh || die
-
-	# install private headers
-	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-	# install symlink for libraries
-	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
-	if use debug ; then
-		dosym libtk${v1}g.so /usr/${mylibdir}/libtk${v1}.so
-		dosym libtkstub${v1}g.a /usr/${mylibdir}/libtkstub${v1}.a
-		dosym ../tk${v1}g/pkgIndex.tcl /usr/${mylibdir}/tk${v1}/pkgIndex.tcl
-	fi
-	dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	dosym wish${v1} /usr/bin/wish
-
-	cd "${S}"
-	dodoc ChangeLog README changes license.terms
-}
--- a/dev-lang/tk/tk-8.5.11-r1.ebuild
+++ b/dev-lang/tk/tk-8.5.11-r1.ebuild
@ -1,129 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild,v 1.4 2012/12/05 08:51:37 ulm Exp $
-
-EAPI=4
-
-inherit autotools eutils multilib toolchain-funcs prefix
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug threads truetype aqua xscreensaver"
-
-RDEPEND="
-	!aqua? (
-		media-libs/fontconfig
-		x11-libs/libX11
-		x11-libs/libXt
-		truetype? ( x11-libs/libXft )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-	)
-	~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-	!aqua? ( x11-proto/xproto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fedora-xft.patch
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
-	eprefixify unix/Makefile.in
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
-
-	# Bug 354067 : the same applies to tk, since the patch is about tcl.m4, just
-	# copy the tcl patch
-	epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch
-
-	# Bug 441630
-	epatch "${FILESDIR}"/${PN}-8.5.11-fix-name-collision-uclibc.patch
-
-	# Make sure we use the right pkg-config, and link against fontconfig
-	# (since the code base uses Fc* functions).
-	sed -i \
-		-e 's/FT_New_Face/XftFontOpen/g' \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e 's:xft freetype2:xft freetype2 fontconfig:' \
-		unix/configure.in || die
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	cd "${S}"/unix
-
-	local mylibdir=$(get_libdir)
-
-	econf \
-		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
-		$(use_enable threads) \
-		$(use_enable aqua) \
-		$(use_enable truetype xft) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix && emake
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install
-
-	# normalize $S path, bug #280766 (pkgcore)
-	local nS="$(cd "${S}"; pwd)"
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir); mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TK_BUILD_LIB_SPEC='-L.*/unix ,TK_BUILD_LIB_SPEC='," \
-		-e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \
-		-e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix ,TK_BUILD_STUB_LIB_SPEC='," \
-		-e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TK_LIB_FILE='libtk${v1}..TK_DBGX..so',TK_LIB_FILE=\"libtk${v1}\$\{TK_DBGX\}.so\"," \
-		-e "s,^TK_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TK_STUB_LIB_SPEC='," \
-		-e "s,^TK_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TK_LIB_SPEC='," \
-		"${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	if [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed -i \
-				-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
-				-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
-				"${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/unix/*.h
-	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${S}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-	# install symlink for libraries
-	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
-	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	dosym wish${v1} /usr/bin/wish
-
-	cd "${S}"
-	dodoc ChangeLog* README changes
-}
--- a/dev-lang/tk/tk-8.5.13.ebuild
+++ b/dev-lang/tk/tk-8.5.13.ebuild
@ -1,133 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13.ebuild,v 1.4 2013/01/09 16:36:07 jlec Exp $
-
-EAPI=4
-
-inherit autotools eutils multilib prefix toolchain-funcs virtualx
-
-MY_P="${PN}${PV/_beta/b}"
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
-
-LICENSE="tcltk"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug threads truetype aqua xscreensaver"
-
-RDEPEND="
-	!aqua? (
-		media-libs/fontconfig
-		x11-libs/libX11
-		x11-libs/libXt
-		truetype? ( x11-libs/libXft )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-	)
-	~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-	!aqua? ( x11-proto/xproto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	tc-export CC
-
-	epatch \
-		"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
-		"${FILESDIR}"/${P}-multilib.patch
-
-	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
-	eprefixify unix/Makefile.in
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.5.10-conf.patch
-
-	# Bug 354067 : the same applies to tk, since the patch is about tcl.m4, just
-	# copy the tcl patch
-	epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch
-
-	# Make sure we use the right pkg-config, and link against fontconfig
-	# (since the code base uses Fc* functions).
-	sed \
-		-e 's/FT_New_Face/XftFontOpen/g' \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		-e 's:xft freetype2:xft freetype2 fontconfig:' \
-		-i unix/configure.in || die
-	rm -f unix/configure || die
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_configure() {
-	cd "${S}"/unix
-
-	local mylibdir=$(get_libdir)
-
-	econf \
-		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
-		$(use_enable threads) \
-		$(use_enable aqua) \
-		$(use_enable truetype xft) \
-		$(use_enable xscreensaver xss) \
-		$(use_enable debug symbols)
-}
-
-src_compile() {
-	cd "${S}"/unix && emake
-}
-
-src_test() {
-	cd "${S}"/unix && Xemake test
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	S= emake DESTDIR="${D}" install
-
-	# normalize $S path, bug #280766 (pkgcore)
-	local nS="$(cd "${S}"; pwd)"
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir); mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^TK_BUILD_LIB_SPEC='-L.*/unix ,TK_BUILD_LIB_SPEC='," \
-		-e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \
-		-e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix ,TK_BUILD_STUB_LIB_SPEC='," \
-		-e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \
-		-e "s,^TK_LIB_FILE='libtk${v1}..TK_DBGX..so',TK_LIB_FILE=\"libtk${v1}\$\{TK_DBGX\}.so\"," \
-		-e "s,^TK_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TK_STUB_LIB_SPEC='," \
-		-e "s,^TK_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TK_LIB_SPEC='," \
-		"${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	if [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
-		sed -i \
-				-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
-				-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
-				"${ED}"/usr/${mylibdir}/tkConfig.sh || die
-	fi
-
-	# install private headers
-	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/unix/*.h
-	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${S}"/generic/*.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-	# install symlink for libraries
-	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
-	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	dosym wish${v1} /usr/bin/wish
-
-	cd "${S}"
-	dodoc ChangeLog* README changes
-}
--- a/dev-libs/boehm-gc/boehm-gc-7.2d.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.2d.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boehm-gc/boehm-gc-7.2d.ebuild,v 1.7 2013/02/10 14:38:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boehm-gc/boehm-gc-7.2d.ebuild,v 1.8 2013/02/10 17:22:34 ago Exp $

 EAPI=4

@ -16,7 +16,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${MY_P}.tar.gz"

 LICENSE="boehm-gc"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs threads"

 RDEPEND=">=dev-libs/libatomic_ops-7.2"
--- a/dev-libs/libksba/libksba-1.3.0.ebuild
+++ b/dev-libs/libksba/libksba-1.3.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libksba/libksba-1.3.0.ebuild,v 1.1 2012/10/22 10:45:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libksba/libksba-1.3.0.ebuild,v 1.3 2013/02/10 20:48:15 ago Exp $

 EAPI="4"

@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"

 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"

 RDEPEND=">=dev-libs/libgpg-error-1.8"
--- a/dev-libs/qjson/qjson-0.8.1.ebuild
+++ b/dev-libs/qjson/qjson-0.8.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.8.1.ebuild,v 1.4 2013/02/08 14:39:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.8.1.ebuild,v 1.5 2013/02/10 17:16:19 ago Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="mirror://github/flavio/qjson/${P}.tar.bz2"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~amd64-fbsd"
 IUSE="debug doc test"

 RDEPEND="x11-libs/qt-core:4"
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.12-r1.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.12-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.12-r1.ebuild,v 1.5 2013/02/10 15:48:06 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xapian-bindings/xapian-bindings-1.2.12-r1.ebuild,v 1.6 2013/02/10 17:18:55 pinkbyte Exp $

 EAPI="4"

@ -21,7 +21,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"

--- a/dev-ml/camlzip/camlzip-1.05.ebuild
+++ b/dev-ml/camlzip/camlzip-1.05.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/camlzip-1.05.ebuild,v 1.1 2012/11/21 00:15:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlzip/camlzip-1.05.ebuild,v 1.2 2013/02/11 02:59:39 aballier Exp $

-EAPI="4"
+EAPI="5"

 inherit findlib eutils

@ -12,11 +12,11 @@ DESCRIPTION="Compressed file access ML library (ZIP, GZIP and JAR)"
 HOMEPAGE="http://forge.ocamlcore.org/projects/camlzip/"
 SRC_URI="http://forge.ocamlcore.org/frs/download.php/1037/${P}.tar.gz"

-SLOT="1"
+SLOT="1/${PV}"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"

-RDEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 		>=sys-libs/zlib-1.1.3"
 DEPEND="${RDEPEND}"

--- a/dev-ml/findlib/findlib-1.3.3-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.3.3-r1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.3.3-r1.ebuild,v 1.1 2012/11/01 00:14:13 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.3.3-r1.ebuild,v 1.2 2013/02/11 03:02:02 aballier Exp $

-EAPI=4
+EAPI=5

 inherit multilib

@ -18,7 +18,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"

-DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?,tk?]"
+DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?,tk?]"
 RDEPEND="${DEPEND}"

 ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
--- a/dev-ml/ocamlnet/ocamlnet-3.6.3.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-3.6.3.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.6.3.ebuild,v 1.1 2013/02/04 12:44:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.6.3.ebuild,v 1.2 2013/02/11 03:08:27 aballier Exp $

-EAPI="2"
+EAPI="5"

 inherit eutils findlib

@ -12,7 +12,7 @@ HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
 SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"

 LICENSE="ZLIB GPL-2"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="cryptokit gtk ssl tk httpd +ocamlopt +pcre zip"
 RESTRICT="installsources"
@ -21,12 +21,12 @@ RESTRICT="installsources"
 # ocaml-cryptgps, which is not available.

 DEPEND=">=dev-ml/findlib-1.0
-		pcre? ( >=dev-ml/pcre-ocaml-5 )
-		>=dev-lang/ocaml-3.10.2[tk?,ocamlopt?]
-		cryptokit? ( dev-ml/cryptokit )
-		gtk? ( >=dev-ml/lablgtk-2 )
-		ssl? ( >=dev-ml/ocaml-ssl-0.4 )
-		zip? ( dev-ml/camlzip )
+		pcre? ( >=dev-ml/pcre-ocaml-5:= )
+		>=dev-lang/ocaml-3.10.2:=[tk?,ocamlopt?]
+		cryptokit? ( dev-ml/cryptokit:= )
+		gtk? ( >=dev-ml/lablgtk-2:= )
+		ssl? ( >=dev-ml/ocaml-ssl-0.4:= )
+		zip? ( dev-ml/camlzip:= )
 		"
 RDEPEND="${DEPEND}"

@ -63,9 +63,9 @@ src_configure() {
 }

 src_compile() {
-	emake -j1 all || die "make failed"
+	emake -j1 all
 	if use ocamlopt; then
-		emake -j1 opt || die "make failed"
+		emake -j1 opt
 	fi
 }

--- a/dev-ml/pomap/pomap-3.0.1.ebuild
+++ b/dev-ml/pomap/pomap-3.0.1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-3.0.1.ebuild,v 1.1 2012/10/10 11:54:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-3.0.1.ebuild,v 1.2 2013/02/11 03:12:28 aballier Exp $

-EAPI=4
+EAPI=5

 OASIS_BUILD_DOCS=1

@ -15,7 +15,7 @@ LICENSE="LGPL-2.1-with-linking-exception"

 DEPEND=""
 RDEPEND="${DEPEND}"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples"

--- a/dev-ml/postgresql-ocaml/postgresql-ocaml-2.0.2.ebuild
+++ b/dev-ml/postgresql-ocaml/postgresql-ocaml-2.0.2.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/postgresql-ocaml/postgresql-ocaml-2.0.2.ebuild,v 1.1 2012/10/10 11:35:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/postgresql-ocaml/postgresql-ocaml-2.0.2.ebuild,v 1.2 2013/02/11 03:10:03 aballier Exp $

-EAPI=4
+EAPI=5

 OASIS_BUILD_DOCS=1

@ -13,12 +13,11 @@ SRC_URI="http://bitbucket.org/mmottl/postgresql-ocaml/downloads/${P}.tar.gz"
 HOMEPAGE="http://bitbucket.org/mmottl/postgresql-ocaml"
 IUSE="examples"

-DEPEND=">=dev-lang/ocaml-3.11[ocamlopt?]
-	dev-db/postgresql-base
+DEPEND="dev-db/postgresql-base
 	dev-db/postgresql-server"
 RDEPEND="${DEPEND}"

-SLOT="0"
+SLOT="0/${PV}"
 LICENSE="LGPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"

--- a/dev-python/decorator/decorator-3.4.0-r1.ebuild
+++ b/dev-python/decorator/decorator-3.4.0-r1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/decorator-3.4.0-r1.ebuild,v 1.1 2012/12/20 23:33:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/decorator-3.4.0-r1.ebuild,v 1.2 2013/02/10 17:57:53 mgorny Exp $

 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )

 inherit distutils-r1

@ -19,8 +19,6 @@ IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""

-DOCS=( README.txt )
-
 PATCHES=(
 	"${FILESDIR}"/${P}-test-failure-exit.patch
 )
--- a/dev-python/matplotlib/matplotlib-1.2.0-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.2.0-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0-r2.ebuild,v 1.4 2013/02/10 14:25:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0-r2.ebuild,v 1.5 2013/02/10 22:28:02 mgorny Exp $

 EAPI=5

@ -23,6 +23,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-maco
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"

+# #456704 -- a lot of py2-only deps
 PY2_USEDEP=$(python_gen_usedep python2*)
 COMMON_DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
--- a/dev-python/paver/paver-1.1.1-r1.ebuild
+++ b/dev-python/paver/paver-1.1.1-r1.ebuild
@ -1,9 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paver/paver-1.1.1-r1.ebuild,v 1.2 2013/02/06 08:52:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paver/paver-1.1.1-r1.ebuild,v 1.3 2013/02/11 03:02:57 floppym Exp $

 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+# Trivial test fail under pypy:
+# https://github.com/paver/paver/pull/88

 inherit distutils-r1

--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@ -1,3 +1,3 @@
 DIST gtk+-2.24.11.tar.xz 13260984 SHA256 328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9 SHA512 64b7281e63338bd094b1ee692638484f333b6837c8349c220182f651189c9f9be5a95ba7fb1a9940c74479fef35c3b5eb5bc4f9a9b185bfa36ae905110d4cb22 WHIRLPOOL ab7114019cd9dc62d9a9124701c97f67fb1a7d560cca20c724158f5994d8766ab74b84dd102ab4df759e51e1d272a643e0e00fca1f8cf7e40d82ed50de82a017
-DIST gtk+-2.24.13.tar.xz 13278972 SHA256 35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d SHA512 95cdb709b128b5fb35def329b51b14b8c8721db644831f540ed57211945147379027f7866c1463d750a05f447648fc66eb1e6e81c69fda2f90225b8e3401b717 WHIRLPOOL b5dbe77b8eb9fa2ef9a280ac83c7db5dfe4609aa254e72a1d526eda2e157dfbd2097b6ea3d083340a75cb07d2f7b3ab7bba988682be34726154fe34e109bceb9
 DIST gtk+-2.24.14.tar.xz 13258752 SHA256 8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac SHA512 f262ddd728ca2d93889bb1b113866932edf7d61ab3248ca11f2c83dbb181fcc0eaab900e6ed4933e4b597cac1ed1bf622711a617e0867ec10730c934d21dc911 WHIRLPOOL ec1b37c4439e80b6693e52c5c910c28533b478c3c994f5d8f3b8b5be2ac792dae7bec36ed92dc39ce35183d48d8bfdec347c32f55f8cc3b521e90554c8c679c8
+DIST gtk+-2.24.15.tar.xz 13276488 SHA256 d7e1c6d6ae6baa48c88441fe52b73b0fb6008763644867d59b049bafb0cf771b SHA512 5f62c8fb36e0be78d0556024b2e994b11bf81e0a975d5fb5ce68716065ed0f4b330309e81df7c5dd77d76f91a7e00df4358e4a8c6e65b2431d0d588239b68ff7 WHIRLPOOL 349c7bb55fc1304a89a2f1fd7a5a80fb7eb680a41798ba3e1adc4ae4097b0ee44c67460df77aa12778ffbe6934b60eb14c2c2c29e96f753867b4f8d726988073
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.15.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.15.ebuild
@ -1,14 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.13.ebuild,v 1.2 2012/12/06 09:05:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.15.ebuild,v 1.1 2013/02/10 21:54:09 tetromino Exp $

-EAPI="4"
+EAPI="5"

 GNOME_ORG_MODULE="gtk+"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE="xml"

-inherit gnome.org python
+inherit gnome.org python-single-r1

 DESCRIPTION="Converts Glade files to GtkBuilder XML format"
 HOMEPAGE="http://www.gtk.org/"
@ -19,15 +19,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE=""

 # gtk-builder-convert was part of gtk+ until 2.24.10-r1
-RDEPEND="!<=x11-libs/gtk+-2.24.10:2"
-DEPEND=""
+COMMON_DEPEND="${PYTHON_DEPS}"
+RDEPEND="!<=x11-libs/gtk+-2.24.10:2
+	${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"

 src_configure() { :; }

 src_compile() { :; }

 src_install() {
-	cd gtk
-	python_convert_shebangs 2 gtk-builder-convert
-	dobin gtk-builder-convert
+	cd gtk || die
+	python_doscript gtk-builder-convert
 }
--- a/dev-util/pkgconfig/pkgconfig-0.28.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28.ebuild,v 1.8 2013/02/10 14:45:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28.ebuild,v 1.9 2013/02/10 17:14:53 ago Exp $

 EAPI=5

@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
 	inherit autotools git-2
 else
-	KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi

--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@ -1,5 +1,3 @@
-DIST plan9port-20121219.tgz 54175831 SHA256 289a355f0dee5900ece427a5360a510879e305e31c02f76dfe0495629ff38824 SHA512 6086fc3330327a36059fc2ce4170a3b7abac7562d141206e305dff20ec970d11d7fffe3d72848bd6def66179b70908444b638f10064e10f7f97a8e4630438892 WHIRLPOOL eb859377af45b053d1ebcf8132ecc043f1d60c0f30f6a6b59db1cc1f9a899b61432179d6d67129c4400a0bb7c935f9a341bb4111de4d5daf15888c949b343f41
-DIST plan9port-20130103.tgz 54176071 SHA256 62c43c14d2d299c427c1d89cf6755c845c0992f0a0f65d6aca202fd24c1d5333 SHA512 b910b94040a8b745dca8750d2e4c8553dcf49885eaa659092ce261f7b761ea13860278f1ec59d4036be2fbd883b099af32dfc0c40e7f3d0cd329c9278527663f WHIRLPOOL ac2a742585072d54e7ddf0b7c264f958d6f999c6263aef483a1763d14446c65c40f94a6d60d49aecc7899fa123da59c7a62628fc47f9fdf09b76e5f195d8668f
-DIST plan9port-20130105.tgz 54176333 SHA256 e804b0b205070277b7d84333f6aab9cb113bac5ac144348ce9f9da739a6e4876 SHA512 b8dfa8a497294fcf55733adea8d49521a8e6d6e13bc2b3253ec833950c8d5e57b3e00e1c5aaf9d3c1bc26b0f13a1b6c89629540b9c562304db1f2d04cd0348a1 WHIRLPOOL 879f5428700688bf03ad6ec12e732435085f40ec2811fdb7a0a4a6f751c2047a536570146dfe8a702a6b644499e3b053af97850a74d2e5a3341bd0124deb8cc9
 DIST plan9port-20130119.tgz 54176486 SHA256 d63733c4396e2569a04131517e86f253e270f1370449f63c422316488f8d63e1 SHA512 f81795937a6e8ca99cd5a7d59f601298bd14db2cff4141054731985ac806b74927988562530701adb2d0657c508576273a5b13e748f7818d8e49a3abba5521ea WHIRLPOOL 4d83740b046b99d3687069dd95f8265ff7816bc674f4edce2870d1f439fd9820c2efef73e104aab9c22eb073f76198b6a35223ff82a567272f9d8fa0ff68b945
 DIST plan9port-20130131.tgz 54178455 SHA256 ece69e2e4b0f46e8bafef1ea77dbbb616e3b5af0ae0f617e1aa5470fe4351110 SHA512 a8169ffd6f0f469e6c31e62b0b7ead6a31d05a4d3f73cff108c6dd5728ad84f05de88c82b9cd135d8c16b541e38f472413da69e4f9d7aebc6ad91a5be89c390d WHIRLPOOL 0598d959a69a474967458b0e471c32742c676d714b734200ae63624c6f114991616c8fa78fe5c02c45f74b8f3edc50759df547118cc9ef136dd093307aa35a56
+DIST plan9port-20130209.tgz 54179646 SHA256 39d1cd0b09444b19351bd52b1f0574be14a6faffae57e9673bed48d168952da7 SHA512 21f3cf29b517a43cba5871e8c007a81b88f87aeed8b89ff5a395af0d84bce77f873186e54c09a3acdd9e15649ea432bebb2032ec120074c450d3b7b44f79c531 WHIRLPOOL 49769f370b18fc809b61959655c2e2e28f865fa2f02fec09f21b29d0f4d60535ef5f0c554e38059936594c0e95223a5cdf9475ae609fdcea2836d4e995ff03de
--- a/dev-util/plan9port/plan9port-20121219.ebuild
+++ b/dev-util/plan9port/plan9port-20121219.ebuild
@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20121219.ebuild,v 1.3 2013/01/05 13:00:12 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Port of many Plan 9 programs and libraries"
-HOMEPAGE="http://swtch.com/plan9port/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
-
-LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-apps/xauth"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PLAN9=/usr/lib/plan9
-
-src_prepare()
-{
-	epatch "${FILESDIR}/${PN}-"{9660srv-errno,noexecstack}".patch"
-
-	# Fix paths, done in place of ./INSTALL -c
-	einfo "Fixing hard-coded /usr/local/plan9 paths"
-	grep  --null -l -r '/usr/local/plan9' |
-	xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g"
-}
-
-src_compile() {
-	# Convert -j5 to NPROC=5 for mk
-	export NPROC="$(echo "$MAKEOPTS" | sed -r -n 's/.*(^| )-j([0-9]*).*/\2/p')"
-
-	# The INSTALL script builds mk then [re]builds everything using that
-	einfo "Compiling Plan 9 from User Space can take a very long time"
-	einfo "depending on the speed of your computer. Please be patient!"
-	./INSTALL -b
-}
-
-src_install() {
-	dodir "${PLAN9}"
-
-	# P9P's man does not handle compression
-	docompress -x $PLAN9/man
-
-	# do* plays with the executable bit, and we should not modify them
-	cp -a * "${D}/${PLAN9}"
-
-	# build the environment variables and install them in env.d
-	cat > "${T}/30plan9" <<-EOF
-		PLAN9="${PLAN9}"
-		PATH="${PLAN9}/bin"
-		ROOTPATH="${PLAN9}/bin"
-		MANPATH="${PLAN9}/man"
-	EOF
-	doenvd "${T}/30plan9"
-}
-
-pkg_postinst() {
-	elog "Plan 9 from User Space has been successfully installed into"
-	elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
-	elog "also been appropriately set, please use env-update and"
-	elog "source /etc/profile to bring that into immediate effect."
-	elog
-	elog "Please note that ${PLAN9}/bin has been appended to the"
-	elog "*end* or your PATH to prevent conflicts. To use the Plan9"
-	elog "versions of common UNIX tools, use the absolute path:"
-	elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
-	elog
-	elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
-}
--- a/dev-util/plan9port/plan9port-20130103.ebuild
+++ b/dev-util/plan9port/plan9port-20130103.ebuild
@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20130103.ebuild,v 1.1 2013/01/05 13:00:12 blueness Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Port of many Plan 9 programs and libraries"
-HOMEPAGE="http://swtch.com/plan9port/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
-
-LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-apps/xauth"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PLAN9=/usr/lib/plan9
-
-src_prepare()
-{
-	epatch "${FILESDIR}/${PN}-"{9660srv-errno,noexecstack}".patch"
-
-	# Fix paths, done in place of ./INSTALL -c
-	einfo "Fixing hard-coded /usr/local/plan9 paths"
-	grep  --null -l -r '/usr/local/plan9' |
-	xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g"
-}
-
-src_compile() {
-	# Convert -j5 to NPROC=5 for mk
-	export NPROC="$(echo "$MAKEOPTS" | sed -r -n 's/.*(^| )-j([0-9]*).*/\2/p')"
-
-	# The INSTALL script builds mk then [re]builds everything using that
-	einfo "Compiling Plan 9 from User Space can take a very long time"
-	einfo "depending on the speed of your computer. Please be patient!"
-	./INSTALL -b
-}
-
-src_install() {
-	dodir "${PLAN9}"
-
-	# P9P's man does not handle compression
-	docompress -x $PLAN9/man
-
-	# do* plays with the executable bit, and we should not modify them
-	cp -a * "${D}/${PLAN9}"
-
-	# build the environment variables and install them in env.d
-	cat > "${T}/30plan9" <<-EOF
-		PLAN9="${PLAN9}"
-		PATH="${PLAN9}/bin"
-		ROOTPATH="${PLAN9}/bin"
-		MANPATH="${PLAN9}/man"
-	EOF
-	doenvd "${T}/30plan9"
-}
-
-pkg_postinst() {
-	elog "Plan 9 from User Space has been successfully installed into"
-	elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
-	elog "also been appropriately set, please use env-update and"
-	elog "source /etc/profile to bring that into immediate effect."
-	elog
-	elog "Please note that ${PLAN9}/bin has been appended to the"
-	elog "*end* or your PATH to prevent conflicts. To use the Plan9"
-	elog "versions of common UNIX tools, use the absolute path:"
-	elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
-	elog
-	elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
-}
--- a/dev-util/plan9port/plan9port-20130209.ebuild
+++ b/dev-util/plan9port/plan9port-20130209.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20130105.ebuild,v 1.1 2013/01/06 15:45:59 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20130209.ebuild,v 1.1 2013/02/11 00:26:30 blueness Exp $

 EAPI="4"

--- a/dev-util/xdelta/xdelta-3.0.5.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-3.0.5.ebuild,v 1.7 2013/02/10 14:45:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xdelta/xdelta-3.0.5.ebuild,v 1.8 2013/02/10 17:19:08 ago Exp $

 EAPI=5
 inherit autotools python
@ -13,7 +13,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="alpha amd64 hppa ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="examples test"

 RDEPEND="app-arch/xz-utils"
--- a/games-emulation/stella/stella-3.7.5.ebuild
+++ b/games-emulation/stella/stella-3.7.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/stella-3.7.5.ebuild,v 1.2 2013/02/05 18:02:57 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/stella/stella-3.7.5.ebuild,v 1.3 2013/02/10 17:22:52 ago Exp $

 EAPI=2
 inherit eutils gnome2-utils games
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/stella/${P}-src.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="joystick opengl"

 DEPEND="media-libs/libsdl[joystick?,opengl?,video]
--- a/games-strategy/triplea/triplea-1.6.1.2.ebuild
+++ b/games-strategy/triplea/triplea-1.6.1.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-1.6.1.2.ebuild,v 1.3 2013/02/08 21:41:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/triplea/triplea-1.6.1.2.ebuild,v 1.4 2013/02/10 17:23:55 ago Exp $

 EAPI=2
 inherit eutils java-pkg-2 java-ant-2 versionator games
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}_source_code_only.zip"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 RESTRICT="test" # Needs X11 maybe use virtualx.eclass

--- a/kde-base/libkworkspace/libkworkspace-4.10.0.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.10.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.10.0.ebuild,v 1.1 2013/02/07 04:57:50 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkworkspace/libkworkspace-4.10.0.ebuild,v 1.2 2013/02/10 21:57:47 dilfridge Exp $

 EAPI=5

@ -22,6 +22,7 @@ KMSAVELIBS="true"
 DEPEND="
 	x11-libs/libxkbfile
 	x11-libs/libXcomposite
+	x11-libs/xcb-util-renderutil
 "
 RDEPEND=${DEPEND}

--- a/kde-misc/libkfbapi/Manifest
+++ b/kde-misc/libkfbapi/Manifest
@ -0,0 +1 @@
+DIST libkfbapi-1.0_p20130209.tar.xz 26132 SHA256 8e69f3e2cb034b16f0822cb404a14dda0549ca1a8c6fd2aafa9237ee9fdf8b19 SHA512 62b1cce524bfcc9c77ff9e0aa2d2c03edd120aec1d77cc06c94c68b13bc230e1d81bb98648b657d305f90ee5585e4240dd0593ab7adbb2b3233a2baf55966193 WHIRLPOOL c2debedac69a4c2afa7dca053b18ab41d43c210e0fffdee5f52de5c6062b6e5931c1c1dec6b18d8e4f06773e0dd0ba347815c9ed009c838910bff34fecf791ac
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST libkfbapi-1.0_p20130209.tar.xz 26132 SHA256 8e69f3e2cb034b16f0822cb404a14dda0549ca1a8c6fd2aafa9237ee9fdf8b19 SHA512 62b1cce524bfcc9c77ff9e0aa2d2c03edd120aec1d77cc06c94c68b13bc230e1d81bb98648b657d305f90ee5585e4240dd0593ab7adbb2b3233a2baf55966193 WHIRLPOOL c2debedac69a4c2afa7dca053b18ab41d43c210e0fffdee5f52de5c6062b6e5931c1c1dec6b18d8e4f06773e0dd0ba347815c9ed009c838910bff34fecf791ac`