Sync with portage [Thu Feb 14 17:16:18 MSK 2013].

11 years ago · 0bada743a9
parent 2a1550d8ef
commit 0bada743a9
414 changed files with 5591 additions and 5908 deletions
--- a/app-admin/chef-expander/Manifest
+++ b/app-admin/chef-expander/Manifest
@ -1,3 +1,4 @@
 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
+DIST chef-expander-10.22.0.gem 24576 SHA256 99553d2fc1e4af0421143fef86b1926be95a68a4a4f36d11979d9cc8ad860c5b SHA512 953d0e39eb87d4233d045bc67e8f8f6e232e7de6449c0fb83bad530d047593576cc593e329c5e474d7f521996957d466a840be1829e6126625e0a31f1f0edeb3 WHIRLPOOL 092f8928481659a9ba1b67dee7932b042777e9e69ced53c408c75a93fd6ccbb1ca657f7912696ce90e66c07dcdcb0cabffbda408507ce964cbf03624a71d8d75
--- a/app-admin/chef-expander/chef-expander-10.22.0.ebuild
+++ b/app-admin/chef-expander/chef-expander-10.22.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.22.0.ebuild,v 1.1 2013/02/14 08:24:06 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-server-api/Manifest
+++ b/app-admin/chef-server-api/Manifest
@ -1,3 +1,4 @@
 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
+DIST chef-server-api-10.22.0.gem 52736 SHA256 f9149c956ac65d9fd29e4d2bd83ffad0ee0a726ae12d153c7df1a674c4456621 SHA512 3561151aaa34e0e8838dd41e4a1c1c3b86890e5ad4ea74c6c246aaa3b8ff84a8bf1099f01f88823fad018e1f4f132e37a9f0168fe4c9cd310306f3d73e570042 WHIRLPOOL 6b4f3116cb9d0a6b9e01fd6b00b1fe8324e53280c925b26375edc53716671f6f9c58283977837808cb8307aafb36e751fb009887ae35ee30dd269fbec6cdd5e0
--- a/app-admin/chef-server-api/chef-server-api-10.22.0.ebuild
+++ b/app-admin/chef-server-api/chef-server-api-10.22.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.22.0.ebuild,v 1.1 2013/02/14 08:26:37 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-webui/Manifest
+++ b/app-admin/chef-server-webui/Manifest
@ -1,3 +1,4 @@
 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
+DIST chef-server-webui-10.22.0.gem 184832 SHA256 dcb229cc1997418c59406c083bc294547b008b4018f2e9232f28e0a81e4cb7db SHA512 0776869738f853f098e98ed859a2269dc216b8e8209565bcbb20e25ccfcb331ec611580249a59a129f023a94b5a2e645f52e121d7be024201ec40add8d1cfb49 WHIRLPOOL 74758c8e7ce3f71eb5aba7d3879406ac3a63363125df129545b8fffcfb46165d81ae48c9b906dcb5abfe38815b785109b08ea397abf0c1b07b12340eef1f10f7
--- a/app-admin/chef-server-webui/chef-server-webui-10.22.0.ebuild
+++ b/app-admin/chef-server-webui/chef-server-webui-10.22.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.22.0.ebuild,v 1.1 2013/02/14 08:25:52 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/Manifest
+++ b/app-admin/chef-server/Manifest
@ -1,3 +1,4 @@
 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
+DIST chef-server-10.22.0.gem 8192 SHA256 0198ab43d72890bc4b0c8a93fbda606a35c622c97b58fb358c27d64155fe89e4 SHA512 afa30322063036453f0637fb3d2cf2666d504626f51ad7d684e8e513271829a5fbe0fcbac50ccd7d517490c90675850782bbd82bd6843fbac344467d30fb83d7 WHIRLPOOL 3faf15ad5d4e7e2dd522bf22be4da1a2433113db251e417db50f8249c83be19a97673a1d5765dee45a8873d090e25f852b699de40d3e20952e65a84b40be93f3
--- a/app-admin/chef-server/chef-server-10.22.0.ebuild
+++ b/app-admin/chef-server/chef-server-10.22.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.22.0.ebuild,v 1.1 2013/02/14 08:27:20 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,3 +1,4 @@
 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
+DIST chef-solr-10.22.0.gem 10217472 SHA256 5347cab89958600eb25fd257b013c258eb1bf61efb0a3082d686d3683165c57c SHA512 7f1e1a913b93dc1e572791caa1b6477d627376e13743f068606661a0b8b4e8618d72b5fd27e326b257a843d2118adf6fb1f83efdf02a152fb09ecf63a6f236a6 WHIRLPOOL a76f17ce457db9f38cb9c013ac9d9d48facde3e6156ecc6a52416ff4a0d78b8d3016f3eb5ca7c4a85dcc45cd61a47d006b4f2cc32000efa34b44bd51dd382182
--- a/app-admin/chef-solr/chef-solr-10.22.0.ebuild
+++ b/app-admin/chef-solr/chef-solr-10.22.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.22.0.ebuild,v 1.1 2013/02/14 08:25:03 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/Manifest
+++ b/app-admin/chef/Manifest
@ -1,3 +1,4 @@
 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
+DIST chef-10.22.0.gem 822784 SHA256 80e285cef0f8668b13e51888cf763f537042e2b30e8b6f710b1e4d7248e433bc SHA512 b490279302629e00e0d228cbe9d18fbd470d61169774d945253e1ac40652d4b75e530c232ba239e5c608fd0558dcd6b5286e76a9c5e2baf748bbfe20e4ca9289 WHIRLPOOL 031acabc90b4b7cfec28eb3c28d586777e6858aabd29429df182933f1a6027d4f666dbd2a786ba0bd31ed2bed41f3a2b0b704b588d17b5641cd93f4c2e373268
--- a/app-admin/chef/chef-10.22.0.ebuild
+++ b/app-admin/chef/chef-10.22.0.ebuild
@ -0,0 +1,87 @@
+# 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.22.0.ebuild,v 1.1 2013/02/14 08:23:19 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/json-1.7.7
+	>=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."
+}
+
+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/usbview/Manifest
+++ b/app-admin/usbview/Manifest
@ -1,2 +1 @@
-DIST usbview-1.1.tar.gz 353012 SHA256 df3fc23cc48590ad54b9ab5457b8cef41bd59205a41f016fa2155d7c7ab1c879 SHA512 5d6a3d1d8054a9a5cc9e28d97e52d843aaeda3251da3cf33d00e938695b6296106456192dddc48fb02f1e6490e89ebb2a096f68faa64ac10144a80106d986a39 WHIRLPOOL b9942b1b26c7ffb046d68d13669c00d81c328baa40f79a64de59386e8998108e5f3ffba3b2751a7cee2d4128508219a70cb42b740fa2a80f3131528af55b1be1
 DIST usbview-2.0.tar.gz 366337 SHA256 42511e4d43ddc5805bab0dea8aeeea54cc00462d229e04066ed5fb7c065d1b6b SHA512 87b3d0b0c734c94e5527f19575c0460f5c0b894dac29936a759d573058c9c007ad59c9be32a5c6d485cba258193efe4ca15bdd6f3ca31df321ed230778b5404f WHIRLPOOL 6c47fd33cee60f488164fadaaa87c826447fc33fab79526e7471423e251202e4ee62edaaca721052caf0922adc7bcf9f5c84b6e7237b8f7b6e8daeaa9b3d3324
--- a/app-admin/usbview/usbview-1.1.ebuild
+++ b/app-admin/usbview/usbview-1.1.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-1.1.ebuild,v 1.9 2012/05/03 18:02:23 jdhore Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Display the topology of devices on the USB bus"
-HOMEPAGE="http://www.kroah.com/linux-usb/"
-SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	doman ${PN}.8
-	doicon usb_icon.xpm
-	make_desktop_entry ${PN} "USB Viewer" usb_icon
-}
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@ -1,4 +1,2 @@
-DIST clamav-0.97.3.tar.gz 45793398 SHA256 3a8cece5b7e6b15410f6b8f96ff5591b2c5a72f290ee8a28fefda44cb5ae7aba SHA512 7dc22da6a318782bf7a1a1e1ce8efe7256419f28352109146c9139c4a119b61021e23a773a26e7916244dfc186b9839422dc7e5ea88343dcd5ae70002ee8a7e1 WHIRLPOOL db0d6e6f620c3325d2870cb679c99c0d944c0bd24f939d694e10ca82c047467fff5daa6a6413389d8e0f3e5ca76aa9656f1f9e02fbdeb009cb368fb7eaada112
-DIST clamav-0.97.4.tar.gz 48386114 SHA256 958dd09c9da9ceb50c9e556b3ced9cbdf40e836d2bdc98286ce96e84fd4a5a53 SHA512 010b9a2a41755bf2ff7acd279f2ac29bb9709f23ec4cd94ffa62818b7babc7098e98df2819a2c6e8433a51b2b601b95e4e88ecd8f80e0f22575101cb23b2fc06 WHIRLPOOL 5c34e9ae3d89b1e6f560271dc539bbabeebbb3dcf1e0267fe06173d9861c10e53cd1b309f67af3d6a1336e09247363ec3c82506d7ae5b5772fef8ccf36359cf8
 DIST clamav-0.97.5.tar.gz 14754465 SHA256 db6c5e1a5ec8ca0b8006cf82661d3158d3365ba1b4bc14c03c5d0bca89a93c0d SHA512 618ef2f1d256f2e3cd76beaf92b76d9df0963d449c2d80885ed6039f4edd59ddf9a73ebe0b93549c62264d7df4ac918d306d631f8c0b1df8e47a7e763550f1cc WHIRLPOOL 7d148323a4510acfe706a17f27c12bd808a013aa91807257b03af83e4a6daeb619962243689eee5614ce2922dfa39d21ae357d2509617be4642f162ac91d5d7e
 DIST clamav-0.97.6.tar.gz 14765896 SHA256 a15a2bb9200ac9f2c6f1c5e1072ac265a2c4fe5a9be4663b47d076afdfa123f8 SHA512 f897f4c70c7555d1ede480b089f73020501bceb1d5de568785b842d04f35ee0771213b8050ac6159dde1f19816ab9a8373e8bcb419106eeeb701a386932d96e7 WHIRLPOOL 1a4916592843a3568ebef78663f76e8eba96b7d561bd61199ad1e15b239fc4c2bb3c25dcc49fad713cd09fb221ab83e9e7b1ba923ed71220943eec78dc04fb16
--- a/app-antivirus/clamav/clamav-0.97.3.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.3.ebuild
@ -1,121 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.3.ebuild,v 1.11 2012/05/31 03:01:52 zmedico Exp $
-
-EAPI=4
-
-inherit eutils autotools-utils flag-o-matic user
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses )
-	iconv? ( virtual/libiconv )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-PATCHES=( "${FILESDIR}"/${PN}-0.97-nls.patch )
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-experimental
-		--enable-id-check
-		--with-dbdir=/var/lib/clamav
-		--with-system-tommath
-		$(use_enable bzip2)
-		$(use_enable clamdtop)
-		$(use_enable ipv6)
-		$(use_enable milter)
-		$(use_with iconv)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.rc clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/run/clamav
-	fowners clamav:clamav /var/run/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/clamav.logrotate clamav
-
-	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/clamd.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/freshclam.conf
-
-	if use milter ; then
-		# MilterSocket one to include ' /' because there is a 2nd line for
-		# inet: which we want to leave
-		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamav-milter.pid:" \
-			-e "s+^\#\(ClamdSocket\) .*+\1 unix:/var/run/clamav/clamd.sock+" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter read the"
-		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-	fi
-}
--- a/app-antivirus/clamav/clamav-0.97.4.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.4.ebuild
@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.4.ebuild,v 1.4 2012/05/31 15:44:58 radhermit Exp $
-
-EAPI=4
-
-inherit eutils autotools-utils flag-o-matic user
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses )
-	iconv? ( virtual/libiconv )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.97-nls.patch
-	"${FILESDIR}"/${PN}-0.97.4-gcc47.patch
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-experimental
-		--enable-id-check
-		--with-dbdir=/var/lib/clamav
-		--with-system-tommath
-		$(use_enable bzip2)
-		$(use_enable clamdtop)
-		$(use_enable ipv6)
-		$(use_enable milter)
-		$(use_with iconv)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.rc clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/run/clamav
-	fowners clamav:clamav /var/run/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/clamav.logrotate clamav
-
-	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/clamd.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/freshclam.conf
-
-	if use milter ; then
-		# MilterSocket one to include ' /' because there is a 2nd line for
-		# inet: which we want to leave
-		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamav-milter.pid:" \
-			-e "s+^\#\(ClamdSocket\) .*+\1 unix:/var/run/clamav/clamd.sock+" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-	fi
-}
-
-pkg_postinst() {
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter read the"
-		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-	fi
-}
--- a/app-antivirus/clamav/clamav-0.97.5.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.5.ebuild
@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.5.ebuild,v 1.2 2012/06/24 20:07:37 radhermit Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic user
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses )
-	iconv? ( virtual/libiconv )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.97-nls.patch
-)
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--enable-id-check \
-		--with-dbdir=/var/lib/clamav \
-		--with-system-tommath \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.rc clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/run/clamav
-	fowners clamav:clamav /var/run/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/clamav.logrotate clamav
-
-	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/clamd.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/freshclam.conf
-
-	if use milter ; then
-		# MilterSocket one to include ' /' because there is a 2nd line for
-		# inet: which we want to leave
-		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamav-milter.pid:" \
-			-e "s+^\#\(ClamdSocket\) .*+\1 unix:/var/run/clamav/clamd.sock+" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter read the"
-		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-	fi
-}
--- a/app-antivirus/clamav/files/clamav-0.97.4-gcc47.patch
+++ b/app-antivirus/clamav/files/clamav-0.97.4-gcc47.patch
@ -1,24 +0,0 @@
-From bb8ab5ce7ea4e276c310f5a638cd61c0cceb47d1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edvin?= <edwin@clamav.net>
-Date: Mon, 14 May 2012 20:13:21 +0300
-Subject: [PATCH] Fix build with gcc-4.7
-
---
- .../c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-index 274f816..a4e7eee 100644
--- a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-+++ b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-@@ -19,6 +19,7 @@
- #include "llvm/Support/ErrorHandling.h"
- #include "llvm/System/DynamicLibrary.h"
- #include "llvm/Config/config.h"
-+#include <unistd.h>
- using namespace llvm;
- 
- // AtExitHandlers - List of functions to call when the program exits,
-- 
-1.7.8.6
-
--- a/app-antivirus/clamav/files/clamd.rc
+++ b/app-antivirus/clamav/files/clamd.rc
@ -1,102 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/files/clamd.rc,v 1.18 2011/12/04 11:51:46 swegener Exp $
-
-extra_commands="logfix"
-
-depend() {
-	use net
-	provide antivirus
-}
-
-start() {
-	local clamd_socket=`awk '$1 == "LocalSocket" { print $2 }' /etc/clamd.conf`
-
-	logfix
-
-	if [ "${START_CLAMD}" = "yes" ]; then
-		if [ -S "${clamd_socket:-/tmp/clamd}" ]; then
-			rm -f ${clamd_socket:-/tmp/clamd}
-		fi
-		ebegin "Starting clamd"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${CLAMD_NICELEVEL:-0} \
-			--exec /usr/sbin/clamd
-		eend $? "Failed to start clamd"
-	fi
-
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Starting freshclam"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${FRESHCLAM_NICELEVEL:-0} \
-			--exec /usr/bin/freshclam -- -d
-		retcode=$?
-		if [ ${retcode} = 1 ]; then
-			eend 0
-			einfo "Virus databases are already up to date."
-		else
-			eend ${retcode} "Failed to start freshclam"
-		fi
-	fi
-
-	if [ "${START_MILTER}" = "yes" ]; then
-		if [ -z "${MILTER_CONF_FILE}" ]; then
-			MILTER_CONF_FILE="/etc/clamav-milter.conf"
-		fi
-
-		ebegin "Starting clamav-milter"
-		start-stop-daemon --start --quiet \
-			--nicelevel ${MILTER_NICELEVEL:-0} \
-			--exec /usr/sbin/clamav-milter -- -c ${MILTER_CONF_FILE}
-		eend $? "Failed to start clamav-milter"
-	fi
-}
-
-stop() {
-	if [ "${START_CLAMD}" = "yes" ]; then
-		ebegin "Stopping clamd"
-		start-stop-daemon --stop --quiet --name clamd
-		eend $? "Failed to stop clamd"
-	fi
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		ebegin "Stopping freshclam"
-		start-stop-daemon --stop --quiet --name freshclam
-		eend $? "Failed to stop freshclam"
-	fi
-	if [ "${START_MILTER}" = "yes" ]; then
-		ebegin "Stopping clamav-milter"
-		start-stop-daemon --stop --quiet --name clamav-milter
-		eend $? "Failed to stop clamav-milter"
-	fi
-}
-
-logfix() {
-	if [ "${START_CLAMD}" = "yes" ]; then
-		# fix clamd log permissions
-		# (might be clobbered by logrotate or something)
-		local logfile=`awk '$1 == "LogFile" { print $2 }' /etc/clamd.conf`
-		local clamav_user=`awk '$1 == "User" { print $2 }' /etc/clamd.conf`
-		if [ -n "${logfile}" ] && [ -n "${clamav_user}" ]; then
-			if [ ! -f "${logfile}" ]; then
-				touch ${logfile}
-			fi
-			chown ${clamav_user} ${logfile}
-			chmod 640 ${logfile}
-		fi
-	fi
-
-	if [ "${START_FRESHCLAM}" = "yes" ]; then
-		# fix freshclam log permissions
-		# (might be clobbered by logrotate or something)
-		logfile=`awk '$1 == "UpdateLogFile" { print $2 }' /etc/freshclam.conf`
-		local freshclam_user=`awk '$1 == "DatabaseOwner" { print $2 }' /etc/freshclam.conf`
-		if [ -n "${logfile}" -a -n "${clamav_user}" ]; then
-			if [ ! -f "${logfile}" ]; then
-				touch ${logfile}
-			fi	
-			chown ${freshclam_user} ${logfile}
-			chmod 640 ${logfile}
-		fi
-	fi
-}
--- a/app-arch/sharutils/sharutils-4.13.3.ebuild
+++ b/app-arch/sharutils/sharutils-4.13.3.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-arch/sharutils/sharutils-4.13.3.ebuild,v 1.1 2013/01/12 23:44:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.13.3.ebuild,v 1.2 2013/02/14 11:59:51 ago Exp $

 EAPI="5"

@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"

 DEPEND="sys-apps/texinfo
--- a/app-crypt/WiRouterKeyRec/Manifest
+++ b/app-crypt/WiRouterKeyRec/Manifest
@ -1,2 +1 @@
-DIST WiRouterKeyRec-1.1.1.zip 117009 SHA256 bce27453f02c02f20bdac7ce6ba31415511eea8cd3c25e718070c3103dde359b SHA512 ca5beda0f6951dab2172569f1bfbafd7b1546cc91e585b38fbb8338f7be765cc0d6d9f8ce614ce399a5b2dbace90d6c3c561416429035de992af43e257ba5819 WHIRLPOOL 80c0f46ed3e463a8552f9693f3b2c6d0bbae5d6ce69451cc869c6160cb59b892308920af3e3f5f54de7ce93edd681aa7ea5823a54cb7a24e25401dd15162bc05
 DIST WiRouterKeyRec-1.1.2.zip 117262 SHA256 3e59138f35502b32b47bd91fe18c0c232921c08d32525a2ae3c14daec09058d4 SHA512 a3c449497e3f3fed88dfbb35a90a2cfa5937efa02393e825ec51ab390b7094ce619d3238a916afd2b48e35e0e261b454f7d7005af46d6a45d77b2e1d4faaac51 WHIRLPOOL e52d316a01ba84bbe34f3a7b8abdf94287b67f3b28bc4ccfd0036fb21cd38c711d1bb2388b9b55f9253cd01ae26e032547624d8a25b55acfa9ea4e1ee36f96f2
--- a/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.1.ebuild
+++ b/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.1.ebuild
@ -1,41 +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/WiRouterKeyRec/WiRouterKeyRec-1.1.1.ebuild,v 1.3 2012/11/27 13:53:25 ago Exp $
-
-EAPI=5
-
-inherit toolchain-funcs
-
-MY_PN="WiRouter_KeyRec"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="Recovery tool for wpa passphrase"
-HOMEPAGE="http://www.salvatorefresta.net"
-SRC_URI="http://tools.salvatorefresta.net/${MY_P}.zip -> ${P}.zip"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare () {
-	sed -i "s:wirouterkeyrec:${PN}:" src/*.h || die
-}
-
-src_compile () {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install () {
-	newbin build/wirouterkeyrec ${PN}
-	insinto /etc/${PN}
-	doins config/agpf_config.lst config/teletu_config.lst
-}
--- a/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
+++ b/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.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/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild,v 1.1 2013/01/02 17:28:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild,v 1.2 2013/02/14 10:33:30 ago Exp $

 EAPI=5

@ -13,7 +13,7 @@ DESCRIPTION="Recovery tool for wpa passphrase"
 HOMEPAGE="http://www.salvatorefresta.net"
 SRC_URI="http://tools.salvatorefresta.net/${MY_P}.zip -> ${P}.zip"

-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
--- a/app-editors/hteditor/hteditor-2.0.21.ebuild
+++ b/app-editors/hteditor/hteditor-2.0.21.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-editors/hteditor/hteditor-2.0.21.ebuild,v 1.2 2012/12/22 06:26:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-2.0.21.ebuild,v 1.3 2013/02/14 12:00:48 ago Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="X"

 RDEPEND="sys-libs/ncurses
--- a/app-emulation/playonlinux/Manifest
+++ b/app-emulation/playonlinux/Manifest
@ -1 +1,2 @@
 DIST PlayOnLinux_4.1.1.tar.gz 4010031 SHA256 eb314836ac798c7cbafdc76dc0660b2178610d3dc557d97aa7c72dfc0dee8e63 SHA512 4062f6a507e613bc46a118571fc0c6560b20adf3dd4707f581730bf1877a1fbbb234558bedd2b3be81c5ff8f9429dbc6c2030f9ad5b3b5174ff3908c3d0c43fd WHIRLPOOL 87270a50bc356cccd7347aca78d2fd63812701c8cc407b33b94636e11601d5d1bf9e7fefbf4c86195e1e4fd62506ba8c1a0e4107e93185552410ae6ec5004011
+DIST PlayOnLinux_4.1.9.tar.gz 4040628 SHA256 b2c061150451481c3bb038734f49cb2c487a3325c54554ba3c7fffb9a215244c SHA512 71c2ac2479a47398f26804be1e15fdd29c6de66ab26fc00596f354bedc9bac33c23437a8e0e2fac93979117693e28101e581549398d3633eca49f9b10270cd21 WHIRLPOOL d0c3c019e9d95eb67f2ae3a30cf6403da7225619d36168ad360edf0055e9f41052009845e379abd2f788c78702f607ffb4ea856b2b7fdda978e50c07c9ef3ebc
--- a/app-emulation/playonlinux/playonlinux-4.1.9.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.1.9.ebuild
@ -0,0 +1,120 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/playonlinux/playonlinux-4.1.9.ebuild,v 1.1 2013/02/14 07:11:40 xmw Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit eutils python games gnome2-utils
+
+MY_PN="PlayOnLinux"
+
+DESCRIPTION="Set of scripts to easily install and use Windows games and software"
+HOMEPAGE="http://playonlinux.com/"
+SRC_URI="http://www.playonlinux.com/script_files/${MY_PN}/${PV}/${MY_PN}_${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="winbind"
+
+DEPEND=""
+RDEPEND="app-emulation/wine
+	app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unzip
+	app-crypt/gnupg
+	dev-python/wxpython:2.8
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	net-misc/wget
+	x11-apps/mesa-progs
+	x11-terms/xterm
+	media-gfx/icoutils
+	|| ( net-analyzer/netcat net-analyzer/netcat6 )
+	winbind? ( net-fs/samba[winbind] ) "
+
+S=${WORKDIR}/${PN}
+
+# TODO:
+# Having a real install script and let playonlinux use standard filesystem
+# 	architecture to prevent having everything installed into GAMES_DATADIR
+# It will let using LANGUAGES easily
+# How to deal with Microsoft Fonts installation asked every time ?
+# How to deal with wine version installed ? (have a better mgmt of system one)
+# Look at debian pkg: http://packages.debian.org/sid/playonlinux
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	sed -e 's/PYTHON="python"/PYTHON="python2"/' -i playonlinux || die
+	python_convert_shebangs -r 2 .
+
+	# remove playonmac
+	rm etc/{playonmac.icns,terminal.applescript} || die
+
+	# remove desktop integration
+	rm etc/{PlayOnLinux.desktop,PlayOnLinux.directory,playonlinux-Programmes.menu} || die
+}
+
+src_install() {
+	# all things without exec permissions
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r resources lang lib etc plugins
+
+	# bash/ install
+	exeinto "${GAMES_DATADIR}/${PN}/bash"
+	doexe bash/*
+	exeinto "${GAMES_DATADIR}/${PN}/bash/expert"
+	doexe bash/expert/*
+
+	# python/ install
+	exeinto "${GAMES_DATADIR}/${PN}/python"
+	doexe python/*
+	# sub dir without exec permissions
+	insinto "${GAMES_DATADIR}/${PN}/python"
+	doins -r python/lib
+
+	# main executable files
+	exeinto "${GAMES_DATADIR}/${PN}"
+	doexe ${PN}{,-pkg,-bash,-shell,-url_handler}
+
+	# icons
+	doicon -s 128 etc/${PN}.png
+	for size in 16 22 32; do
+		newicon -s $size etc/${PN}$size.png ${PN}.png
+	done
+
+	dodoc CHANGELOG
+
+	games_make_wrapper ${PN} "./${PN}" "${GAMES_DATADIR}/${PN}"
+	make_desktop_entry ${PN} ${MY_PN} ${PN} Game
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	python_mod_optimize "${GAMES_DATADIR}/${PN}"
+	gnome2_icon_cache_update
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Installed softwares and games with playonlinux have not been removed."
+		elog "To remove them, you can re-install playonlinux and remove them using it"
+		elog "or do it manually by removing .PlayOnLinux/ in your home directory."
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${GAMES_DATADIR}/${PN}"
+	gnome2_icon_cache_update
+}
--- a/app-i18n/atokx3/Manifest
+++ b/app-i18n/atokx3/Manifest
@ -1,4 +1,5 @@
-DIST a20y1006lx.tgz 8365634 RMD160 9b07ea828102fad0104019d563cae8dfc9da5e70 SHA1 d29b8bcf4197b3cef697ae89bcd246b816b8ba88 SHA256 3768a40facbe327a4342c3696d3d793f087086c01402a66ed5130600f96035c6
+DIST a20y1006lx.tgz 8365634 SHA256 3768a40facbe327a4342c3696d3d793f087086c01402a66ed5130600f96035c6
 DIST a20y1011lx.tgz 8369537 SHA256 d4ee3643c78bf98bcac6778beccd82a4f6f92860d0d903aae96292637bf9d097 SHA512 6ea62f7c183898f58b2bcf1183914f13f7bffe407494b8bd1ba1ceda645b73c9991ed62b4179dd101cc509bf44c4a1dca353cdf14ab932d38e6af29ba00acb7a WHIRLPOOL b6dcd6b150878f612f37a1e67f0f24a160d881c9391393786540dd3ed6375b9b95efca7c2adf6119513e90c9a205ea1c01c756f1238d52f5e0128404690ba47e
+DIST a20y1211lx.tgz 8471799 SHA256 a6ba278102c3d00363285f0be5d64c6bb35f5a5c10a845cb67bcd70cbc58e57d SHA512 339cecc25089c6c2fe6a31ce34e6c77d38cab3b55596cf9f485189adec7365051d3f236475d72f01b14d0176e6410a2ca6eb6d854498421e3fff006a54d51595 WHIRLPOOL 1e213c4632a2964f9c3622c25f1fa7e680064cf64c118c0bf50ad89278066ea8d9b1be5b15deda2b853e05bdcdabbb8b367e7e02a45a5e7d6a39eaa8083ef192
 DIST atokx3gtk216.tar.gz 69246 SHA256 cd81d0e85872274135d94511ee71eda3f29f00ed299c1dacbdf024b9d96c62e2 SHA512 39c0ff01807626f417f34ef02e4be2fe07c52edc931775299e90fd8725d9c870c3473005fc87be5023d089e94fb4700f9ad36a10ad3373be22ec35e2a418eddd WHIRLPOOL 9bdad5de28564d0c7e3e1b3d67bc0fea09e2b1e9af5fb301ebbb90bc41e58fee405468020a06c84b0d97e3bbab28d7e421a0d9d293d9b957230fa476f823302d
 DIST atokx3up2.tar.gz 8427265 SHA256 d9aae2b3917c3370bd40a3f0f767ad15a09a586986e906835952264cd5c1d28e SHA512 b4ce05882418a18e6a0ab58d805a1edeca69187bfa16a98b8f79d749ec0cfdc1b838de30f3049d3b8b0929214164c4c2054dbe283dce0f18a1ab2daa181e306d WHIRLPOOL 43b5e32e62cba0122e918f497a5c5d1da1b303721af8eb00b70a840431cc2aa0ffa7a7009cb4253caab690445a9921741aa6a6394044c4907e1acd1376c6c76e
--- a/app-i18n/atokx3/atokx3-3.0.0-r8.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r8.ebuild
@ -0,0 +1,206 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r8.ebuild,v 1.1 2013/02/13 10:19:11 matsuu Exp $
+
+EAPI="3"
+
+inherit cdrom eutils multilib
+
+MY_UPDATE_P="${PN}up2"
+MY_UPDATE_GTK="${PN}gtk216"
+MY_ZIPCODE_P="a20y1211lx"
+
+DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine"
+HOMEPAGE="http://www.justsystems.com/jp/products/atok_linux/"
+SRC_URI="http://www3.justsystem.co.jp/download/atok/up/lin/${MY_UPDATE_P}.tar.gz
+	http://www3.justsystem.co.jp/download/atok/up/lin/${MY_UPDATE_GTK}.tar.gz
+	http://www3.justsystem.co.jp/download/zipcode/up/lin/${MY_ZIPCODE_P}.tgz"
+
+LICENSE="ATOK MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="multilib"
+
+RESTRICT="strip mirror binchecks"
+
+RDEPEND="!app-i18n/atokx2
+	!dev-libs/libiiimcf
+	!dev-libs/csconv
+	!app-i18n/iiimgcf
+	!dev-libs/libiiimp
+	!app-i18n/iiimsf
+	!app-i18n/iiimxcf
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	media-libs/fontconfig
+	media-libs/libpng
+	sys-apps/tcp-wrappers
+	virtual/pam
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.4.13:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+	x11-libs/libdrm
+	x11-libs/pangox-compat
+	multilib? (
+		>=app-emulation/emul-linux-x86-baselibs-20091226
+		app-emulation/emul-linux-x86-gtklibs
+		app-emulation/emul-linux-x86-xlibs
+	)"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR="/etc/gtk-2.0"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+	fi
+	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+	fi
+
+	if use amd64 && has_multilib_profile ; then
+		if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0-32" ] ; then
+			"${EPREFIX}/usr/bin/gtk-query-immodules-2.0-32" > "${EPREFIX}/etc/gtk-2.0/$(get_abi_CHOST x86)/gtk.immodules"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if ! cdrom_get_cds atokx3index ; then
+		die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK X3 for Linux."
+	fi
+}
+
+src_unpack() {
+	local targets="
+		IIIMF/iiimf-client-lib-trunk_r3104-js*.i386.tar.gz
+		IIIMF/iiimf-gtk-trunk_r3104-js*.i386.tar.gz
+		IIIMF/iiimf-protocol-lib-trunk_r3104-js*.i386.tar.gz
+		IIIMF/iiimf-server-trunk_r3104-js*.i386.tar.gz
+		IIIMF/iiimf-x-trunk_r3104-js*.i386.tar.gz
+		IIIMF/iiimf-client-lib-devel-trunk_r3104-js*.i386.tar.gz
+		IIIMF/iiimf-protocol-lib-devel-trunk_r3104-js*.i386.tar.gz
+		ATOK/atokx-20.0-*.0.0.i386.tar.gz"
+	#	IIIMF/iiimf-properties-trunk_r3104-js*.i386.tar.gz
+	#	IIIMF/iiimf-docs-trunk_r3104-js*.i386.tar.gz
+	#	IIIMF/iiimf-notuse-trunk_r3104-js*.i386.tar.gz
+
+	if use amd64 ; then
+		targets="${targets}
+			IIIMF/iiimf-client-lib-64-trunk_r3104-js*.x86_64.tar.gz
+			IIIMF/iiimf-gtk-64-trunk_r3104-js*.x86_64.tar.gz
+			IIIMF/iiimf-protocol-lib-64-trunk_r3104-js*.x86_64.tar.gz
+			ATOK/atokx-64-20.0-*.0.0.x86_64.tar.gz"
+		#	IIIMF/iiimf-client-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
+		#	IIIMF/iiimf-protocol-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
+		#	IIIMF/iiimf-notuse-64-trunk_r3104-js*.x86_64.tar.gz
+	fi
+
+	targets="${targets} ATOK/atokxup-20.0-*.0.0.i386.tar.gz"
+
+	unpack ${MY_UPDATE_P}.tar.gz
+
+	for i in ${targets} ; do
+		if [ -f "${S}"/${MY_UPDATE_P}/bin/${i} ] ; then
+			einfo "unpack" $(basename "${S}"/${MY_UPDATE_P}/bin/${i})
+			tar xzf "${S}"/${MY_UPDATE_P}/bin/${i} || die "Failed to unpack ${i}"
+		elif [ -f "${CDROM_ROOT}"/bin/tarball/${i} ] ; then
+			einfo "unpack" $(basename "${CDROM_ROOT}"/bin/tarball/${i})
+			tar xzf "${CDROM_ROOT}"/bin/tarball/${i} || die "Failed to unpack ${i}"
+		else
+			eerror "${i} not found."
+			die "${i} not found."
+		fi
+	done
+	unpack ${MY_UPDATE_GTK}.tar.gz
+	unpack ${MY_ZIPCODE_P}.tgz
+}
+
+src_prepare() {
+	if use amd64 ; then
+		local lib32="$(ABI=x86 get_libdir)"
+		local lib64="$(get_libdir)"
+		if [ "lib" != "${lib32}" ] ; then
+			mv usr/lib "usr/${lib32}" || die
+		fi
+		if [ "lib64" != "${lib64}" ] ; then
+			mv usr/lib64 "usr/${lib64}" || die
+		fi
+		mkdir -p "usr/${lib64}/iiim/le/atokx3" || die
+		mv "usr/${lib32}/iiim/le/atokx3/64" "usr/${lib64}/iiim/le/atokx3/64" || die
+		rm "usr/${lib32}/iiim/le/atokx3/amd64" || die
+		sed -e "s:/usr/lib:/usr/${lib64}:" \
+			"usr/${lib32}/libiiimcf.la" > "usr/${lib64}/libiiimcf.la" || die
+		sed -e "s:/usr/lib:/usr/${lib64}:" \
+			"usr/${lib32}/libiiimp.la" > "usr/${lib64}/libiiimp.la" || die
+		sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimcf.la" || die
+		sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimp.la" || die
+	fi
+}
+
+src_install() {
+	dodoc "${MY_UPDATE_P}/README_UP2.txt" || die
+	rm -rf "${MY_UPDATE_P}"
+
+	cp -dpR * "${ED}" || die
+
+	# amd64 hack
+	if use amd64 ; then
+		local lib32="$(ABI=x86 get_libdir)"
+		local lib64="$(get_libdir)"
+		if [ "${lib32}" != "${lib64}" ] ; then
+			for f in /usr/"${lib32}"/iiim/*iiim* ; do
+				dosym "${f}" /usr/"${lib64}"/iiim/ || die
+			done
+			for f in /usr/"${lib32}"/iiim/le/atokx3/atokx3*.so ; do
+				dosym "${f}" /usr/"${lib64}"/iiim/le/atokx3/ || die
+			done
+			dosym /usr/"${lib64}"/iiim/le/atokx3/64 /usr/"${lib32}"/iiim/le/atokx3/64 || die
+			dosym /usr/"${lib64}"/iiim/le/atokx3/64 /usr/"${lib32}"/iiim/le/atokx3/amd64 || die
+		fi
+	fi
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-iiimf" > "${T}/iiimf.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/iiimf.conf" || die
+
+	dodoc "${CDROM_ROOT}"/doc/atok.pdf || die
+	dohtml "${CDROM_ROOT}"/readme.html || die
+}
+
+pkg_preinst() {
+	# bug #343325
+	if use amd64 && has_multilib_profile && [ -L "${EPREFIX}/usr/$(get_libdir)/iiim" ] ; then
+		rm -f "${EPREFIX}/usr/$(get_libdir)/iiim"
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "To use ATOK for Linux, you need to add following to .xinitrc or .xprofile:"
+	elog
+	elog ". /opt/atokx3/bin/atokx3start.sh"
+	elog
+	update_gtk_immodules
+}
+
+pkg_postrm() {
+	update_gtk_immodules
+}
--- a/app-laptop/thinkfan/thinkfan-0.9_beta2.ebuild
+++ b/app-laptop/thinkfan/thinkfan-0.9_beta2.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-laptop/thinkfan/thinkfan-0.9_beta2.ebuild,v 1.1 2013/02/12 19:52:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkfan/thinkfan-0.9_beta2.ebuild,v 1.2 2013/02/13 22:34:59 xmw Exp $

 EAPI=4

@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="atasmart systemd"

-DEPEND="dev-libs/libatasmart"
+DEPEND="atasmart? ( dev-libs/libatasmart )"
 RDEPEND="${DEPEND}"

 src_prepare() {
--- a/app-misc/tmux/files/tmux-1.7-terminfo.patch
+++ b/app-misc/tmux/files/tmux-1.7-terminfo.patch
@ -0,0 +1,35 @@
+ configure.ac | 21 ++++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f78cfc3..ac40bf9 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -127,11 +127,22 @@ if test "x$found_libevent" = xno; then
+ fi
+ 
+ # Look for curses.
+-AC_SEARCH_LIBS(
+-	setupterm,
+-	[terminfo curses ncurses],
+-	found_curses=yes,
+-	found_curses=no
+PKG_CHECK_MODULES(
+	CURSES,
+	ncurses,
+	[
+		CPPFLAGS="$CURSES_CFLAGS $CPPFLAGS"
+		LIBS="$CURSES_LIBS $LIBS"
+		found_curses=yes
+	],
+	[
+		AC_SEARCH_LIBS(
+			setupterm,
+			[terminfo curses ncurses],
+			found_curses=yes,
+			found_curses=no
+		)
+	]
+ )
+ if test "x$found_curses" = xno; then
+     AC_MSG_ERROR("curses not found")
--- a/app-misc/tmux/tmux-1.7-r3.ebuild
+++ b/app-misc/tmux/tmux-1.7-r3.ebuild
@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.7-r3.ebuild,v 1.1 2013/02/13 09:35:36 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils bash-completion-r1 flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="http://tmux.sourceforge.net"
+SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="vim-syntax"
+
+COMMON_DEPEND="
+	>=dev-libs/libevent-2.0.10
+	sys-libs/ncurses"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	vim-syntax? ( || (
+		app-editors/vim
+		app-editors/gvim ) )"
+
+DOCS=( CHANGES FAQ NOTES TODO )
+
+PATCHES=( "${FILESDIR}"/${P}-terminfo.patch )
+
+pkg_setup() {
+	if has_version "<app-misc/tmux-1.7"; then
+		echo
+		ewarn "Some configuration options changed in this release."
+		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+		ewarn
+		ewarn "WARNING: after updating to ${P} you will _not_ be able to connect to any"
+		ewarn "running 1.6 tmux server instances. You'll have to use an existing client to"
+		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+		ewarn "to temporarily downgrade to tmux 1.6 to access them."
+		echo
+	fi
+}
+
+src_prepare() {
+	# look for config file in the prefix
+	sed -i -e '/SYSTEM_CFG/s:"/etc:"'"${EPREFIX}"'/etc:' tmux.h || die
+	# and don't just add some includes
+	sed -i -e 's:-I/usr/local/include::' Makefile.am || die
+
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	autotools-utils_src_prepare
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	newbashcomp examples/bash_completion_tmux.sh ${PN}
+
+	docinto examples
+	dodoc examples/*.conf
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/tmux.vim
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}"/tmux.vim
+	fi
+}
--- a/app-portage/g-cpan/g-cpan-0.16.4-r1.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.4-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/g-cpan/g-cpan-0.16.4-r1.ebuild,v 1.7 2013/02/12 20:19:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-0.16.4-r1.ebuild,v 1.8 2013/02/13 14:12:41 ago Exp $

 EAPI=4

@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz

 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""

 DEPEND="dev-lang/perl
--- a/app-portage/splat/Manifest
+++ b/app-portage/splat/Manifest
@ -1,2 +1 @@
-DIST splat-0.07.tar.bz2 11992 SHA256 da28531df219e9acf291581894d1a91f78ebc2f045eb13af731897ef5fb64f12 SHA512 df69ce4212d563b392628bd2e491e17f379fec7076199b7af84147115d6af385cc9d08da2d301475d8bd887a5ca1c04bcc97e7c27c2de3500d5f27e9278c59da WHIRLPOOL 6800203ca40a342e4f34e14683345c6f5b7d029e866569a5e1495b6382c7058cdc6f3239acb75613737d6db3fb668825bbce07bda1f1f352b54adcfbd8552541
 DIST splat-0.08.tar.bz2 12180 SHA256 cdadf79909308d830d68e9b2583f91f081291ee9db2dbadd05c291b6566241e3 SHA512 18be949f601cd7ba61babc667a26df9bc5ba7ece33c9b680be7c3541418ea65f3ecf1ae402a70fa3499b79ca2b000c36a58e202d06456cbb7745bec749b1374f WHIRLPOOL a80900d2d831ad9a9a9db65ac644269de60a3f3ca7ad614ff64d0a416c2ce39638520fca7abb58721ea05c58bded3e0d3a8779f92bd6875f956718dcc580862b
--- a/app-portage/splat/splat-0.07.ebuild
+++ b/app-portage/splat/splat-0.07.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/splat/splat-0.07.ebuild,v 1.10 2010/03/31 13:03:55 idl0r Exp $
-
-DESCRIPTION="Simple Portage Log Analyzer Tool"
-HOMEPAGE="http://www.l8nite.net/projects/splat/"
-SRC_URI="http://www.l8nite.net/projects/splat/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_install() {
-	newbin splat.pl splat || die
-	dodoc ChangeLog
-}
--- a/app-portage/splat/splat-0.08.ebuild
+++ b/app-portage/splat/splat-0.08.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/splat/splat-0.08.ebuild,v 1.21 2010/03/31 13:03:55 idl0r Exp $
-
-DESCRIPTION="Simple Portage Log Analyzer Tool"
-HOMEPAGE="http://www.l8nite.net/projects/splat/"
-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"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_install() {
-	newbin splat.pl splat || die
-	dodoc ChangeLog
-}
--- a/app-text/libmspub/libmspub-0.0.4.ebuild
+++ b/app-text/libmspub/libmspub-0.0.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/app-text/libmspub/libmspub-0.0.4.ebuild,v 1.1 2013/02/05 14:03:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libmspub/libmspub-0.0.4.ebuild,v 1.2 2013/02/13 07:11:58 scarabeus Exp $

 EAPI=5

@ -43,6 +43,7 @@ src_prepare() {

 src_configure() {
 	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable static-libs static) \
 		--disable-werror \
 		$(use_with doc docs)
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.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/libmspub/libmspub-9999.ebuild,v 1.3 2013/02/05 14:03:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libmspub/libmspub-9999.ebuild,v 1.4 2013/02/13 07:11:58 scarabeus Exp $

 EAPI=5

@ -43,6 +43,7 @@ src_prepare() {

 src_configure() {
 	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable static-libs static) \
 		--disable-werror \
 		$(use_with doc docs)
--- a/app-text/migemo/migemo-0.40-r5.ebuild
+++ b/app-text/migemo/migemo-0.40-r5.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/migemo/migemo-0.40-r5.ebuild,v 1.4 2013/02/12 16:20:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/migemo/migemo-0.40-r5.ebuild,v 1.8 2013/02/13 16:21:58 ago Exp $

 EAPI=4
 # ruby19, jruby: dev-ruby/ruby-romkan not work
@ -14,7 +14,7 @@ SRC_URI="http://0xcc.net/migemo/stable/${P}.tar.gz"

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

 ruby_add_bdepend "dev-ruby/ruby-romkan dev-ruby/bsearch"
--- a/dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch
+++ b/dev-cpp/tbb/files/tbb-4.1.20121003-ppc.patch
@ -0,0 +1,16 @@
+diff -up tbb40_20120408oss/include/tbb/tbb_machine.h\~ tbb40_20120408oss/include/tbb/tbb_machine.h
+--- tbb40_20120408oss/include/tbb/tbb_machine.h~	2012-04-20 09:21:57.000000000 +0200
+++ tbb40_20120408oss/include/tbb/tbb_machine.h	2012-08-28 13:20:42.150456167 +0200
+@@ -373,8 +373,8 @@ void spin_wait_until_eq( const volatile
+ //  - The operation assumes that the architecture consistently uses either little-endian or big-endian:
+ //      it does not support mixed-endian or page-specific bi-endian architectures.
+ // This function is the only use of __TBB_BIG_ENDIAN.
+-#if (__TBB_BIG_ENDIAN!=-1)
+-    #if ( __TBB_USE_GENERIC_PART_WORD_CAS)
+#if ( __TBB_USE_GENERIC_PART_WORD_CAS)
+    #if (__TBB_BIG_ENDIAN==-1)
+         #error generic implementation of part-word CAS was explicitly disabled for this configuration
+     #endif
+ template<typename T>
+
+Diff finished.  Tue Aug 28 13:20:58 2012
--- a/dev-cpp/tbb/tbb-4.1.20121003.ebuild
+++ b/dev-cpp/tbb/tbb-4.1.20121003.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/tbb/tbb-4.1.20121003.ebuild,v 1.4 2013/02/06 04:26:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20121003.ebuild,v 1.5 2013/02/14 09:34:20 scarabeus Exp $

 EAPI=4
 inherit eutils flag-o-matic multilib versionator toolchain-funcs
@ -24,7 +24,9 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MYP}"

 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.297-underlinking.patch
+	epatch \
+		"${FILESDIR}"/${PN}-4.0.297-underlinking.patch \
+		"${FILESDIR}"/${PN}-4.1.20121003-ppc.patch
 	# use fully qualified gcc compilers. do not force march/mcpu
 	# not tested with icc
 	# order in sed expressions is important
--- 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.9 2013/02/11 11:28:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.6.4.ebuild,v 1.10 2013/02/13 11:18:16 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-games/crystalspace/Manifest
+++ b/dev-games/crystalspace/Manifest
@ -1,2 +1 @@
-DIST crystalspace-src-1.4.0.tar.bz2 45670477 SHA256 a8e1bfc9328470121bfbc6cf98f2c310a34f6998978065aa2f6df7e02a0101ba SHA512 fd661f519723ad16c8fc9dc65fa8148b9c828c01b4b586618b9a58cf0c30aec1b7d70a37e61072a1d5f6121b1767647a3a0c06a5a2dd94f26e7b498366bdff55 WHIRLPOOL e9a9bf8fc2d4b4ad171c988706e34062ea4b0053c6dd68a3a417d44d1717dea50ec5d93bed37969738c852b78f5c8b4913f4b6ab1ba3b2ed9e3837f8f1d41aef
 DIST crystalspace-src-2.0.tar.bz2 185925180 SHA256 f1cda74fd998e44088746803209b1ea6625e80e3d4fb72023d8bed6b677b7b6a SHA512 f09d40669268e26542a2854560ac5033e7f89d0bd5def870e5062e08611c36a0875666abe0c705bb5f9f37dafa619f33f900e358d5fe255746a86127a3899f97 WHIRLPOOL a1705cb88b64eb0e8f6a146c2a75baab01aa598d07b8d36ab0671a47d4092b5c9b53c13f46bb1e56663b2b228c4b95cee3a355554c1de92c3d931187e97c4ca1
--- a/dev-games/crystalspace/crystalspace-1.4.0.ebuild
+++ b/dev-games/crystalspace/crystalspace-1.4.0.ebuild
@ -1,136 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/crystalspace/crystalspace-1.4.0.ebuild,v 1.11 2012/07/17 12:33:39 tupone Exp $
-
-EAPI=2
-inherit eutils flag-o-matic multilib java-pkg-opt-2 autotools wxwidgets versionator
-
-MY_P=${PN}-src-${PV}
-PATH_P=${PN}-$(get_version_component_range 1-2)
-
-DESCRIPTION="Portable 3D Game Development Kit written in C++"
-HOMEPAGE="http://crystal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/crystal/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="3ds alsa bullet cal3d cegui cg doc java jpeg mng ode png
-sdl speex truetype vorbis wxwidgets"
-
-COMMON_DEP="virtual/opengl
-	media-libs/openal
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	ode? ( dev-games/ode )
-	cal3d? ( >=media-libs/cal3d-0.11 )
-	jpeg? ( virtual/jpeg )
-	bullet? ( sci-physics/bullet )
-	sdl? ( media-libs/libsdl )
-	vorbis? ( media-libs/libvorbis )
-	speex? ( media-libs/libogg
-		media-libs/speex )
-	truetype? ( >=media-libs/freetype-2.1 )
-	alsa? ( media-libs/alsa-lib )
-	mng? ( media-libs/libmng )
-	png? ( media-libs/libpng )
-	wxwidgets? ( x11-libs/wxGTK:2.8[X,opengl] )
-	cegui? ( >=dev-games/cegui-0.5.0 )
-	3ds? ( media-libs/lib3ds )"
-
-RDEPEND="${COMMON_DEP}
-	java? ( >=virtual/jre-1.5 )"
-
-DEPEND="${COMMON_DEP}
-	java? ( >=virtual/jdk-1.5
-		dev-java/ant-core )
-	dev-util/ftjam
-	dev-lang/swig
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Installing doc conflict with dodoc on src_install
-	# Removing conflicting target
-	sed -i \
-		-e "/^InstallDoc/d" \
-		Jamfile.in \
-		docs/Jamfile \
-		|| die "sed failed"
-	epatch "${FILESDIR}"/${P}-bullet.patch \
-		"${FILESDIR}"/${P}-png15.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-	AT_M4DIR=mk/autoconf
-	eautoreconf
-}
-
-src_configure() {
-	if use wxwidgets; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets gtk2
-	fi
-
-	econf --enable-cpu-specific-optimizations=no \
-		--disable-separate-debug-info \
-		--without-lcms \
-		--without-caca \
-		--without-jackasyn \
-		--without-perl \
-		$(use_with java) \
-		--disable-make-emulation \
-		$(use_with bullet) \
-		--without-python \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with mng) \
-		$(use_with vorbis) \
-		$(use_with speex) \
-		$(use_with 3ds) \
-		$(use_with ode) \
-		$(use_with truetype freetype2) \
-		$(use_with cal3d) \
-		$(use_with sdl) \
-		$(use_with wxwidgets wx) \
-		$(use_with cegui CEGUI) \
-		$(use_with cg Cg) \
-		$(use_with alsa asound)
-	#remove unwanted CFLAGS added by ./configure
-	sed -i -e '/COMPILER\.CFLAGS\.optimize/d' \
-		Jamconfig \
-		|| die "sed failed"
-}
-
-src_compile() {
-	local jamopts=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
-	jam -q ${jamopts} || die "compile failed"
-}
-
-src_install() {
-	for installTarget in bin plugin lib include data config bindings
-	do
-		jam -q -s DESTDIR="${D}" install_${installTarget} \
-			|| die "jam install_${installTarget} failed"
-	done
-	if use doc; then
-		jam -q -s DESTDIR="${D}" install_doc || die "jam install_doc failed"
-	fi
-	dodoc README docs/history*
-
-	echo "CRYSTAL_PLUGIN=/usr/$(get_libdir)/${PATH_P}" > 90crystalspace
-	echo "CRYSTAL_CONFIG=/etc/${PATH_P}" >> 90crystalspace
-	doenvd 90crystalspace
-}
-
-pkg_postinst() {
-	elog "Examples coming with this package, need correct light calculation"
-	elog "Do the following commands, with the root account, to fix that:"
-	# Fill cache directory for the examples
-	local dir
-	for dir in castle flarge isomap parallaxtest partsys r3dtest stenciltest \
-		terrain terrainf;
-	do
-		elog "cslight -video=null /usr/share/${PATH_P}/data/maps/${dir}"
-	done
-}
--- a/dev-games/crystalspace/files/crystalspace-1.4.0-bullet.patch
+++ b/dev-games/crystalspace/files/crystalspace-1.4.0-bullet.patch
@ -1,12 +0,0 @@
--- configure.ac.old	2010-06-19 21:50:21.000000000 +0200
-+++ configure.ac	2010-06-19 22:00:50.000000000 +0200
-@@ -1318,8 +1318,7 @@
-       btDefaultCollisionConfiguration* c;
-       btDynamicsWorld* world = new btDiscreteDynamicsWorld (d, b, s, c)])],
-     [], [C++], [], [],
-    [], [], [-lbulletdynamics -lbulletcollision -lbulletmath],
-    [bulletdynamics])
-+    [])
- 
- AS_IF([test $cs_cv_libbullet = yes],
-     [CS_CHECK_BUILD([if bullet is sufficiently recent (>=2.68)], [cs_cv_bullet_recent],
--- a/dev-games/crystalspace/files/crystalspace-1.4.0-gcc47.patch
+++ b/dev-games/crystalspace/files/crystalspace-1.4.0-gcc47.patch
@ -1,42 +0,0 @@
--- include/csutil/blockallocator.h.old	2012-07-17 09:08:57.203478402 +0200
-+++ include/csutil/blockallocator.h	2012-07-17 09:10:34.556642885 +0200
-@@ -166,7 +166,7 @@
-   ~csBlockAllocator()
-   {
-     ObjectDispose dispose (*this, false);
-    DisposeAll (dispose);
-+    this->DisposeAll (dispose);
-   }
- 
-   /**
-@@ -177,7 +177,7 @@
-   void Empty()
-   {
-     ObjectDispose dispose (*this, true);
-    DisposeAll (dispose);
-+    this->DisposeAll (dispose);
-   }
- 
-   /**
--- include/csutil/parray.h.old	2012-07-17 13:02:11.524886456 +0200
-+++ include/csutil/parray.h	2012-07-17 13:02:43.531639147 +0200
-@@ -106,7 +106,7 @@
-   {
-     CS_ASSERT (this->GetSize () > 0);
-     T* ret = GetAndClear (this->GetSize () - 1); // see *1*
-    Truncate (this->GetSize () - 1);
-+    this->Truncate (this->GetSize () - 1);
-     return ret;
-   }
- 
--- include/csutil/refarr.h.old	2012-07-17 09:16:33.084469347 +0200
-+++ include/csutil/refarr.h	2012-07-17 09:17:04.008298074 +0200
-@@ -106,7 +106,7 @@
-   {
-     CS_ASSERT (this->GetSize () > 0);
-     csRef<T> ret = this->Get (this->GetSize () - 1); // see *1*
-    SetSize (this->GetSize () - 1);
-+    this->SetSize (this->GetSize () - 1);
-     return csPtr<T> (ret);
-   }
- };
--- a/dev-games/crystalspace/files/crystalspace-1.4.0-png15.patch
+++ b/dev-games/crystalspace/files/crystalspace-1.4.0-png15.patch
@ -1,56 +0,0 @@
--- plugins/video/loader/png/pngimage.cpp.old	2011-09-09 10:39:57.218570796 +0200
-+++ plugins/video/loader/png/pngimage.cpp	2011-09-09 10:46:45.733522309 +0200
-@@ -60,7 +60,7 @@
- 
- static void png_write (png_structp png, png_bytep data, png_size_t length)
- {
-  datastore *ds = (datastore *)png->io_ptr;
-+  datastore *ds = (datastore *)png_get_io_ptr(png);
-   if (ds->pos + (long)length > ds->length)
-   {
-     ds->data = (unsigned char*)cs_realloc (ds->data, ds->pos + (long)length);
-@@ -173,7 +173,7 @@
-   }
- 
-   /* Catch processing errors */
-  if (setjmp(png->jmpbuf))
-+  if (setjmp(png_jmpbuf(png)))
-   {
-     /* If we get here, we had a problem reading the file */
-     png_destroy_write_struct (&png, &info);
-@@ -355,7 +355,7 @@
- void ImagePngFile::PngLoader::ImagePngRead (png_structp png, png_bytep data, 
- 					    png_size_t size)
- {
-  ImagePngRawData *self = (ImagePngRawData *) png->io_ptr;
-+  ImagePngRawData *self = (ImagePngRawData *) png_get_io_ptr(png);
- 
-   if (self->r_size < size)
-     png_error (png, "Read Error");
-@@ -394,7 +394,7 @@
-     return false;
-   }
- 
-  if (setjmp (png->jmpbuf))
-+  if (setjmp (png_jmpbuf(png)))
-   {
- nomem2:
-     // If we get here, we had a problem reading the file
-@@ -524,7 +524,7 @@
- {
-   size_t rowbytes, exp_rowbytes;
- 
-  if (setjmp (png->jmpbuf))
-+  if (setjmp (png_jmpbuf(png)))
-   {
- nomem2:
-     // If we get here, we had a problem reading the file
-@@ -560,7 +560,7 @@
- 
-   png_bytep * const row_pointers = new png_bytep[Height];
- 
-  if (setjmp (png->jmpbuf))             // Set a new exception handler
-+  if (setjmp (png_jmpbuf(png)))             // Set a new exception handler
-   {
-     delete [] row_pointers;
-     goto nomem2;
--- a/dev-haskell/terminfo/Manifest
+++ b/dev-haskell/terminfo/Manifest
@ -1,4 +1,2 @@
-DIST terminfo-0.3.1.1.tar.gz 42858 SHA256 6aef85f980951d0e19e6af8a1958fc19b802e87ffafaf2e67cfb54d02efdd382 SHA512 bb0596452ce1bc8caf0a995b4bb111432263b454963a78f7488ca670bbf5b76c299d1082916c6958cf73cd3b7b55b6614fa13b4c8cb5b9b34c6ded9f81e8ff99 WHIRLPOOL b3e8f55394774cd2f6a7b9c748aa7e8130e84d56a4c91331e4182321fd6133ac59d904ee9bcb43b87876812521d7dc3a98664b99042f66abf3eb1da2d1984499
-DIST terminfo-0.3.1.3.tar.gz 42968 SHA256 10303a46f71973352eed26f1f076447eacba8b23b9ca9ce73b73992b22656503 SHA512 cd2d88a1d31986b39719568041fb2b55f331e29c67c3b0dd4326a4af54f721fc37ff87c4df9139d52d006db9c44adc1cb606408a5421b31b703c01b07bc8c2f8 WHIRLPOOL 7d772338c9fd91ed01b9d1186d767eba6e60f1361f3c9c9f6aef7cb368d4ce5b5934953df74ac36089d7b7c8955fdc2cc476422e76666c4b0b41292ed5d9c6fb
 DIST terminfo-0.3.2.3.tar.gz 41953 SHA256 ae38ebe2e4e2f55291a40c0b5818095c79d4a990feb070c72d8542d24edfc21b SHA512 725a1d520fd01fe6ed62f17834a3d53b879cd7ae1ce90fed6af16e25f8862c99b766415f5631777a3b19ee2474ae69c02da814b1fae2b1ff9072fcfb921eafd1 WHIRLPOOL 4545ca83de99f0f122dce6d6e325e21e4940c5c8847f63c2b0d530f7034cb1a8015f393e2715affedc03d76ee49f5f724cae45e9876d6e200659d5ab2622baa4
 DIST terminfo-0.3.2.5.tar.gz 45361 SHA256 6f419fa3a9afe995993f18022d6a347aedffc9a28a6974701f8421b15f584dc1 SHA512 68a882e6abb6a2e3ee70398761b899d635bfd96118b47437efeb6bc7b1a1d81a3c3e1a7f696d86057d2f8a8dece270ae9005d7905a6da97f12bcf8113ac70203 WHIRLPOOL 9d62f325e6c39f6e295acedcfad8db1312e455cd921c44936dbb982d220ca38b036435b02741415e9cb1e081b2ca63fbb2f5e9c2eb3dd112605fa286ee527b3a
--- a/dev-haskell/terminfo/files/terminfo-0.3.2.5-tinfo.patch
+++ b/dev-haskell/terminfo/files/terminfo-0.3.2.5-tinfo.patch
@ -0,0 +1,25 @@
+http://bugs.gentoo.org/454216
+
+Mon Jan  7 16:34:47 FET 2013  Judah Jacobson <judah.jacobson@gmail.com>
+  * Search for terminfo in libtinfo; fixes GHC #7281.
+  
+  Patch from Paul Johnson.
+diff -rN -u old-terminfo/configure.ac new-terminfo/configure.ac
+--- old-terminfo/configure.ac	2013-02-14 00:16:11.816111434 +0300
+++ new-terminfo/configure.ac	2013-02-14 00:16:11.819111434 +0300
+@@ -39,10 +39,11 @@
+     TERMINFO_INCLUDES="$CursesIncludes term.h"
+ fi
+ 
+-AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw,
+-  [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
+-    [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
+-      HaveLibCurses=NO; LibCurses=not-installed)])])
+AC_CHECK_LIB(tinfo, setupterm, HaveLibCurses=YES; LibCurses=tinfo,
+  [AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw,
+    [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
+      [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
+        HaveLibCurses=NO; LibCurses=not-installed)])])])
+ 
+ if test "x$HaveLibCurses" = "xNO" ; then
+     AC_MSG_FAILURE([curses library not found, so this package cannot be built])
--- a/dev-haskell/terminfo/terminfo-0.3.1.1.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.3.1.1.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.3.1.1.ebuild,v 1.12 2012/09/12 15:34:53 qnikst Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library."
-HOMEPAGE="http://code.haskell.org/terminfo"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.10
-		>=dev-haskell/cabal-1.4
-		sys-libs/ncurses"
--- a/dev-haskell/terminfo/terminfo-0.3.1.3.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.3.1.3.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.3.1.3.ebuild,v 1.7 2012/09/12 15:34:53 qnikst Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library."
-HOMEPAGE="http://code.haskell.org/terminfo"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.3
-		sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.4"
--- a/dev-haskell/terminfo/terminfo-0.3.2.5.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.3.2.5.ebuild
@ -1,13 +1,13 @@
-# 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-haskell/terminfo/terminfo-0.3.2.5.ebuild,v 1.1 2012/11/25 06:08:50 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.3.2.5.ebuild,v 1.2 2013/02/13 21:26:15 slyfox Exp $

 EAPI=5

 # ebuild generated by hackport 0.3.9999

 CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit autotools eutils haskell-cabal

 DESCRIPTION="Haskell bindings to the terminfo library."
 HOMEPAGE="http://code.haskell.org/terminfo"
@ -22,3 +22,9 @@ RDEPEND=">=dev-lang/ghc-6.10.4:=
 		sys-libs/ncurses"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.4"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+
+	eautoreconf
+}
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@ -1,28 +1,44 @@
 DIST icedtea-bin-core-6.1.11.5-amd64.tar.bz2 32980753 SHA256 ca12b761f7c299e7485ead654ce640ecec3e311c342cc8d07f8dfa9e8d4cce16 SHA512 8cdd8256fd432ce7a01775908789953bfdad6b2b944afb42282e258e0bba92b29f6f44190e8911a52a909acd07ed5fd07547e808184129e39314310290703ac3 WHIRLPOOL 3fe1dfe6de3ca5ee5d55fe7cada0bfbd0edcb9e43d1ea90a3c271dd29ecb3ddddf99c564c8416af207897e55af103e2d9c6cc9cf373ea94bf669013b4e24e73e
 DIST icedtea-bin-core-6.1.11.5-x86.tar.bz2 33919404 SHA256 bd086dbf01347fcf88a0217278e3c1a30178f596f8a0e49b5b2e7f4b24ddb7d9 SHA512 b2b42639cda25d3bb49d2383c99c65994e99c976cbc0a1094153ed34b0b95a71bba597dc41fb71ab83dcca5dfb144d347efb90f7ba0db6f443d1b5a87c60848b WHIRLPOOL 454ab0b6ec212aee75e3d4bbef299eb4cb4efd39e527502c63407bbab5559c2a6dbee8e9260ada9e6ab175646002e762704514540ac69dc829f49f3ff9701671
+DIST icedtea-bin-core-6.1.12.2-amd64.tar.bz2 38338494 SHA256 149975fd7de997a5cf95c0e78ae56573ed2bf341285899112fce85242e92107a SHA512 298172cfb859e39d9f00c757c9aa9a8423c23cf87f2adf5ce3f0837244089cfaa32c1146087f96fac64c0a4a7bc6eb89bf4c6e07e73e5bd273c54720762593bd WHIRLPOOL 8ca4033763b339fd357ede0a2b0c7cb205c67fdba489cb966c4b93ac226da7c7df5d1833fe2690d3aa076815f86b36d7b6e1ed3fd628bbe3a4a99c3e7214f54e
+DIST icedtea-bin-core-6.1.12.2-x86.tar.bz2 39106978 SHA256 9d84884320359ea733f600c10f34dd4ba6f4473867f5e17eeca2b08d33c2f176 SHA512 8280d474897f93ebb03cd1906972e7c16893c21f94f7848df4e665add97817e21d3db7072a4d922ebd7713d1c79383953c5ca43d481cc6cd3be6959fd14461e5 WHIRLPOOL 48f316f466d4ca6e2f6ec26132416bbb0cc8451a832a9eb760a99b938674fea49881f9b3bfb75e5b3f7152a134b37354459b4bde32cfd5aa7f58a70d77dd6a8a
 DIST icedtea-bin-core-7.2.3.3-amd64.tar.bz2 48848494 SHA256 3cfdd8d83190892a1540e84daa3c7e454889e151537e708737a413b10ede54ec SHA512 f7238cef43d725e33ec8e27a2ae13500eff2446d393e3704c5c7beb27ffad1bbc52cd13bbbb4ae527702aca56c9b7650a5076b387d760a7f6a0763b439c2a41c WHIRLPOOL eb95a76a9ef25e52f0cc64f2c16ad2d7d8758026cb4c627681b5841e35bc86614a7a9c5a6a6b4d710c4eac50972f9524780e54a65ec041e2fddc1a20c6108f8a
 DIST icedtea-bin-core-7.2.3.3-x86.tar.bz2 49962247 SHA256 d0ad8f8f1f74de7bef59a8284d23e63bb601ba369a86014303b33cf2abcf8bcd SHA512 84efff48a8d3eb5a3c749f7c806c90d1d02e672868dd27573c760ba85b149bbca8979d4a329110d07aa66980e3b33445e261b81554e756a3df802bdee4c61f25 WHIRLPOOL f236132ef0f6ba364789f4cbb6c4451869764028d34c078cb796ee142eb97c8c21ca0a0ff1ebf6410f9c96d0745de21e9dbab78bcf4b7d8c29b1e64fd8544019
 DIST icedtea-bin-core-7.2.3.4-amd64.tar.bz2 48853325 SHA256 89a367e81aaa627a632c35092be7c1089795d8c90f92c83803593ac7d9b01f07 SHA512 2c8b25bc8a4a017bdec06e8a49a14d724d900d08f77e0bfc7e39db5c66bbf17611741ebf6d58ee392afe69dda03eed78dee9c92deb46f832420ffdaf9d0a31f2 WHIRLPOOL 4e15a074cc1f0895ee78fac052b4d9e9b809cce73fa585499b09a051c0a8e11128afa21cfce9a6bd993479279036c270758b03e1cac6f5fa27ca9a26d41de535
 DIST icedtea-bin-core-7.2.3.4-x86.tar.bz2 49964720 SHA256 df223947302274db0f78c6d3f1ac7d751a06b8fc53051b3eeecbc13735de189e SHA512 6d15ba18be1541727ba61d75ea19a65726bff419caf99217f3c1a6f466f9281087f8268fb37c85d4643f96e114f3ec957e33984f922a466adb0678993a4b0add WHIRLPOOL b2a8e817aab965045cefae27da8975c7bfee1028c50a1e8f1e82d9b09ac28870c6f1e5399ddcc877e17951771a731b15a13fca6799d4dca6e9504f7ae9526569
+DIST icedtea-bin-core-7.2.3.6-amd64.tar.bz2 48864185 SHA256 4eef39a8240f483bdbddd3d4b7b81af55c6d4f526336beb486526b2d5b0566a5 SHA512 ef720079aef99f547d857b986915236f0b0d35bd9812223b79892bbda953bdc185e12f8974959eda617e61d91f41ec374e174643c6764543db27075ab1e58289 WHIRLPOOL 6d2ed5ca5e3822e55baa5ac4a792c7a212fe8703e340161514bcde6c54e5dc613ae3ff959ecb3a975c54fb8541f9bc0926006f432c19a120db9e61ce8b07c7d3
+DIST icedtea-bin-core-7.2.3.6-x86.tar.bz2 49977550 SHA256 c4186639f5e295c3126e4bf8812a17d84fa4a76ab86cb8f0032066e1031a4f7f SHA512 ec9b8c9685ee3673d333dd82645e90ed29dd5417f2d2c12da27a47032ad2c5fde21afffb3399889e49a604bc54a65c4a1c2f4336539bee510dd1ce2f9b424507 WHIRLPOOL 5b78b0a69f5032c185409391b0a983b30fafe9fd5e231282193c2349dcb69437e4ea2f4aedee35e60a0d41c4905d815f379492c9c958db181adf59d5f89e05bd
 DIST icedtea-bin-doc-6.1.11.5.tar.bz2 11636975 SHA256 0b5dacb7c5873d58c31870090a641cd0df58424478eff2d72499d1af4db35ba3 SHA512 0ffb517a23ee0b9a3876ed7113e86377a16b6bdca6aafc02aa5eb1343ef3bb958c3c255ff0e0958619ac1ebf5c993239ea736ef07204148cdb62b2ce4d5f7569 WHIRLPOOL ef4c53462f666b5202c43d44533b1991406cddc6243f9c2ac60ca8f4634f6f6636caf55a7d49c66851c13a4067013075816bf3f30b72b51aa208dc62852b40e6
+DIST icedtea-bin-doc-6.1.12.2.tar.bz2 11637228 SHA256 f52d2775edecfd9a9ddfee2456185f8ee20a71f570779d2f680ce349012adb14 SHA512 e88a76d5160ca272b783bb7c52da60c89c1434f35a7bcd26eb1ea72a6bc2ccf18237e0af0c238c8b3b7db2764dcf9ebb741e82aa15084650564651320a571f3a WHIRLPOOL b8d34e5786368a908a235c8fed11e76121c630f38f0350775153c41fef356c4b7a65045c02ce00bdb7d085c380164c217ac1cdbd136dbf2dbbde30bb628efd5a
 DIST icedtea-bin-doc-7.2.3.3.tar.bz2 12533982 SHA256 9f251b1a743f75891ea771de4c6f3f1e250f221f600c59b481cc992ba908fb8a SHA512 cc658427f612c0434411774c47a1e500e56e927f9e77db0685bcdb1e763c6540b286f054f1d2a4f2aeb7db27d02a7e09dbf0b4c1a8fabd9297801ca8608ce006 WHIRLPOOL 31b6fcbfa988001ece3a1dc9dfde679169cf773660c3a5817143f504fb5906b09baa7220e0f4dcb7bccc7a9f84fd5639448b94085e26d040ac67b5811481880d
 DIST icedtea-bin-doc-7.2.3.4.tar.bz2 12535391 SHA256 a7e586bec57f5d29126b2ca4d89b192b33eb2991413e42e7e7f0c14afd922032 SHA512 93cd8559f5adfd0ddfa9b50d9a759ecad47a545b33554208a2ef0a32a454a437f1795146dfe7323dfe89ae02e8905145fd7e88daaa87f48f7ae6eab63b510db3 WHIRLPOOL f0d2f04c592c5bc72c1ffbb2b47cd911eb4ec1831ce63e81c21e1e087251d06fdca72851ce3c029ce8d935652466d13d72d148ec6fcf3b1c7d0675ee2ae1d7a8
+DIST icedtea-bin-doc-7.2.3.6.tar.bz2 12536331 SHA256 2768a8e3d051caa91804773d6efe21e95a344f8105ca672d6572e586b9c113ac SHA512 91087a1631157ef945ddb88d3f3f1fb878b507902010b358384b608040ba21a629c7769bead67301240f260043ca79c59feddbadc1f8aaba7d83afce2fd0f805 WHIRLPOOL a73261bac84e007b0b7eb0d6f420b9c5bb8ff7a3c7c0681ce0616ce335552e7a4e7b17a7021a6eff11c0a4abd8df9416dd92ef1dc9bf3f95b5c1a415c55a541f
 DIST icedtea-bin-examples-6.1.11.5-amd64.tar.bz2 2164804 SHA256 ddfab3fed17111cd766592ed34a3846447a4ea2f779d173f3b7a8e2d0be02286 SHA512 659b32184cbb393cfe925382b8169d2afdd7a68b492aace19ca13e14b76498da042c5a8c0e4e1302098d5b0a7d735beda2d1e2035e43a29abed2d41f737f7726 WHIRLPOOL 13b7373d71fad319fffd1e1d3158f23dd643c4ad78c44c8c0ffe500dee4abbcabf2842a01441efd5625c390519e3c6676a8f912e9c1d4885bbe0bea9210edb8c
 DIST icedtea-bin-examples-6.1.11.5-x86.tar.bz2 2133703 SHA256 4f48a3aa286fc3083f2aaa7e3605bb85c26fea286acfcf800f49e685298593ee SHA512 c01e3b6c323f5ad9163bcd1d27f07cce66cf72f54bc5a2c93240bb7e53a48137fddd9ceab82413aef6781fe1ff79019bb87f2fdecd25a5df685cca9f89957392 WHIRLPOOL 1976e26e211dfa12c30063f2951d91d90c15ead0d1897fcf636451b0f024feff2d691b0f96e440284d7c0d5291af976bae77d4a5c5258c77904f9084302f64f5
+DIST icedtea-bin-examples-6.1.12.2-amd64.tar.bz2 2164728 SHA256 a4231664ede197ad64a27cf0841c261a544da25afc97de4c3f43950a019e15b1 SHA512 04f2bc75085021507fbd7034cc6d8caf6e67d66875846654fb37342e462eef3a4ea38f5876bebc126e5efbf897a6ed3de613396a3266f11af47be5e0324f000a WHIRLPOOL 5111d6692b4b4853127cee5b2062d6bd0f2aaf47883196f2e97789350ad73720341c387139c3ef4e16f3ea0ade374fcc8d2a20ef02e4aa821af970171260d081
+DIST icedtea-bin-examples-6.1.12.2-x86.tar.bz2 2133662 SHA256 fd20501dac712facf6443273057e7a67a5f849183620243695b4653494ec648f SHA512 ee9376e252cafa3a6be25c38a66f56a25442d2cba24967a44bbe529be7d7c36c1e928d8bacc26d9aecd292824673084d9d5a1dbdbeaf207aaf4176223d4c7c7d WHIRLPOOL 428e8165035929e6b1a9c393114aadb49924513746317aa1e496fc762624cb7f7d4a7f64fb52c94ae1e6f9a66d096b35abe1d89e0fc69b4dcf4043aaba5034f5
 DIST icedtea-bin-examples-7.2.3.3-amd64.tar.bz2 2334417 SHA256 f02e6492f9dbfcf70e04b6fa4ef1e0d883c7e3751f16f6dd2c734ce981880124 SHA512 1585e22d5f87446e1c937d6e012025adc39b737bba81aebb52b0ec996e00d8fa20faeda37158f12fe55bfbdf8bdb64539719aabd8f2439112a8e67e17f0e311b WHIRLPOOL a2ef26ee0101249c93ce332742485feaa2df32cdd6ffbf5506ef163f75cb3bb7c28b605350c3b2c15a9a8ac5deacecf0ada4e90099b47bb058e34514faa494c1
 DIST icedtea-bin-examples-7.2.3.3-x86.tar.bz2 2313601 SHA256 61ef2242b646235006bc06451c9620d11b289e4a857286ae20283330545d919b SHA512 77af4a58cbb0a120c898a7cdeec30b4b1f55a74479cdab7801ab274814e5546d2dd2b8c154aedd70edd4aa226eb83538fd23a9fa16481303fc039fe5f5866201 WHIRLPOOL 432d82f02331225d6b70e17676f7fb989e290e915a18db7bf363ec1a35e60a6e470db369632eaeb1b9d8194ae488a49ff9665680d1a949ee94763dd1e0d6e1fd
 DIST icedtea-bin-examples-7.2.3.4-amd64.tar.bz2 2334377 SHA256 42d6cb0deb2402a7faf26efee6b6dfae4439d74d04db57252a3f38f71c93ac21 SHA512 5b9d26726ee5279f927ada923356b3799ae4f8750bf6c61b03333d19b543d406617756a76d2717283ab629a85a29cea01a6382e0a03520bd9e3c2bf8ffaa7813 WHIRLPOOL 646769aa2207ae87db6b446d0c6f9b3fee5299357ded72f2889587c949eaafd1d25d4dd2c0cbf018ce02eb995cb9948407505432159ec7545b21d7d40b6d6e18
 DIST icedtea-bin-examples-7.2.3.4-x86.tar.bz2 2314133 SHA256 3018b9c4552b2ef6b44491c8e6003bde75e497e626ec1abf81138c3dad4222a4 SHA512 f54901d8fab1fe8dbf1ce681e38be84e21db87b8b34f040aafefe4c51f7aa0efe8692a6f571a106200a576f7203c9f76b6cff8d0f9dc085e1fa5739f83a6f3c6 WHIRLPOOL 8617fddbd6083d17fd70357b064bb0c509b15ef3af42fc5e3a0170eb8fd765b78f265ffeab8f3ee6cad4f5fbdad58a7cf7c371ee9ead22786f13c40633f65f98
+DIST icedtea-bin-examples-7.2.3.6-amd64.tar.bz2 2334184 SHA256 37f73707bea574e0e5623bb3ea2c796729460b4b4fb4ad3f1620a2d9d6e4cf18 SHA512 3275a1d295c516b367df6b766e93df95348afe8b3d8f18f7da9ca1cdd83fa7326f0afc8b57e1514c9ace55052de3772b392efc3938a72c39e0d8a9b6f35226ce WHIRLPOOL 503b59c4423f352c7f4a860f0da1f70dee0cd8198dd499c72f4d815fc26df96f1ac1851ac6e7b670cdace92f8b25c0b8c3bc2ef30e1d2e4aa7f5b71255b5e346
+DIST icedtea-bin-examples-7.2.3.6-x86.tar.bz2 2313989 SHA256 c97b482337e05a31ac79845f15c84c338da9f17d343d0d7904560e14c5138796 SHA512 4b0043f42f9f3ee7cf884160e90c12963cafcc9f064401f8ee8687576f57dd9512b9595af58abb10ec1501dd0001ebc36827e7126c5e6361a22d547deb0af7dc WHIRLPOOL 64d0285741428787aade56e70b5afd9832b866bae15a55dcad423ae4b6ca457f5e959d70cd96f22495a39a9fb43d50dff93664fcd8c2f6e112aaf228aa664a0e
 DIST icedtea-bin-nsplugin-6.1.11.5-amd64.tar.bz2 1008682 SHA256 92d960861834d3a8731e4a2f9589dcab4ba8c70e250b0deb63b96582ab33b731 SHA512 05cff934639baece960552938a0f52ac2cc0e5f14bd82ca9922b59870542e0a1d1d1e40a758aa5e77595ff7fad41d3bcf6ca368a9a097eb86fc2b5a424b89276 WHIRLPOOL e4994b44b3044deece2c36862500ffb15e19362e4aec0ad5a856cbb2006d55cedd554155e09153fc15f2c3431b0c90305a59521a256ce402a0e1af731cd98561
 DIST icedtea-bin-nsplugin-6.1.11.5-r1-amd64.tar.bz2 1013352 SHA256 3dd3e219228a3175b4a2f3e806b8aed12082a91ceb712816e860d4021e2d50a9 SHA512 7447db5197e1f57d7a28f7be9b5b6648f1925e430805ae528b5e650736e2b0907d759c07d06058a909c2ecf22827f10ef303f89dea76a57c76855dd02589156f WHIRLPOOL 21dc25df621a66bd494bcd74edf069b823ba7ddc5d07482fd50dbb4e6f8bfd2793441d0d0742f2363d84c50b3d7b83a270b1ed3968913fc27a863e0a4051d019
 DIST icedtea-bin-nsplugin-6.1.11.5-r1-x86.tar.bz2 1007184 SHA256 29a9964aea2c2f3ddeae8f63c03154489e09433014696e0d46ec637582f117e1 SHA512 ea3f690cfd6a974a99f902238beb661fae0506b89ea4cf4778574e4ca101a027780a387de8bad2b739bad8161cd2b7478e27a2d58a4716ca09e33674a772e667 WHIRLPOOL 0e5cf7213650f20d5d0ffaf135e92c2540b5edd6d99d241971ee05c55c59cc5150430df9b28cc6d9f3c9a5ca74a5bb5da06864733e61e792793b5d67ee5d1bfe
 DIST icedtea-bin-nsplugin-6.1.11.5-x86.tar.bz2 1002312 SHA256 bcab76c6e2cb2dd678650ff9505f018a0244c8f2333c1a3ef6bf4ea3acc5372d SHA512 373c9b74f92e2d3ecb68b3815ac999d7e5411078b3398fb71722a4ba6d9518ae96d686536c204f632e19dbe86e2bbd00e8d518b2c8fbb69aba19ce28ff646e57 WHIRLPOOL 09b992843154afdfefbed396746921c4585312f1e4efebf55c872f7a79edbf89452e3078e0ec6cf103a9c87762e1cdcf47fee3eacdc48543f92203df049c86a5
+DIST icedtea-bin-nsplugin-6.1.12.2-amd64.tar.bz2 1013050 SHA256 e26d916a134f4d66dc6366964f1ff5c200b749b58297fb5ce47cb2a6b354b9bf SHA512 96c1eb4bdccd1219d64aba6741cf935f1ddb4b3ef688ca8994e16d4b0f4a6b0047426e5ccafc51ebaa04a94b6f75024d754c0b1962762378d433089075c58c3a WHIRLPOOL a61346bfabceead6ce066eba16003d4a8cb8ad6748a1123f56983df87f17742d2e3ec427a5f9150d060af8e92008037aa9f0539b6ebe616d8895fb4f011e5249
+DIST icedtea-bin-nsplugin-6.1.12.2-x86.tar.bz2 1007012 SHA256 dd16240400560333ee8148d2e63e533557890ee86f1ed0d8f8eb070943aa732d SHA512 1bf98836446c5c3036658185e80e529d05caa10ea69354ce1fef3b61cd88b1d169c6cb26ad9ff401e8b176c2267f555029224d252646c2e21511077e827889c3 WHIRLPOOL 59e782dfde583a9b7c260ec89acf1252acc3abfa6a788e5f5f850d63e0fd9fb34969b445cc042f0c9614161c910c9f5f4a84a069dcac3810f0793fa017e25901
 DIST icedtea-bin-nsplugin-7.2.3.3-amd64.tar.bz2 1042904 SHA256 f3d3b9547260a992b281f19757e2102fe5d635f6785c22d582b5baebcedfccef SHA512 5afb8e775890fd09da3f4394aa17636b6121bd2066d09de508256f1bd6020a58d672ba72351fa71c18a57b9aa0aefbd0b6f7b407dd736181bfd02adcf7a79577 WHIRLPOOL 2ae06ff8702fd276836f5f7b8abc772984fb2628ae2ed265caa089d36b1bf6d22a3116cb6e8db22e8a30d410472156c1fb76d7179733ca33d6b3b2c9a87d858d
 DIST icedtea-bin-nsplugin-7.2.3.3-r1-amd64.tar.bz2 1048025 SHA256 344e9229d62326d28e176ef1dfa2ac8c82e9d11045e45a6e984e037aa91bd403 SHA512 c75d4763662c6fdfbfc7bbc4170c8c790e47d4e61c386a99f245440a1c9f3193e40aabc688c10b9540c615cd90abd34d25d0c45b54390bcd307c27159f413937 WHIRLPOOL a660f6c92484c7845d985618aec40e41addc9328408f249148353074e5af75f179e69f3395c58f82f6094b1fde56f8a584c95ef8b85882e705c38efe1a01063c
 DIST icedtea-bin-nsplugin-7.2.3.3-r1-x86.tar.bz2 1041691 SHA256 cb71e282b902c8012c49edc2d645980586334b0d34ad718b0f8f637dca3bb02b SHA512 03d6921945001370da18f12fcb1d09e0b3188cab2dfae9e215f74398b2f1f8e4a4acc3fae40e88338fc48b818cd431203ed0123813affb99d84a88c8144e8239 WHIRLPOOL 933ce65adee634cd4b176c38119d68aa079ef69faf64c70dab7cb65e35b3a3c8d738ed82c0e12114258a85c7481cc1aafe3c06a57452e03dea8dca1b3eb9feb0
 DIST icedtea-bin-nsplugin-7.2.3.3-x86.tar.bz2 1036471 SHA256 f5bfe521cfe7a88f3d51f38c71e3fdf2bdb36f584f3dc792cb4fd92fc39d934e SHA512 bf5c1f9f6a6e918e096938889aff94d54eb8b0e7e89847475f6a4f4045d65b752ffeeea42040ba64ec057e091a704d6143b0e85d12a84ff0eed8bf52c1fbf78e WHIRLPOOL d331440494dd7f5ede97ccf2441617f6a05752363c395032f88675ee969a52ba79c47e6e13474ac191f17a4474060a66f6d1dd4292f791e6b9e32a3bfa24ac5f
 DIST icedtea-bin-nsplugin-7.2.3.4-amd64.tar.bz2 1048078 SHA256 e3ab61516f6c37872168e4937687f7d4dba194bb8c383141533e87f25dc43e5f SHA512 9dcad66c628aa1699968b9f1943a37ddd8555f630d6b85fb9fce6b1024cdd77d4de38d980ed8d57d3285cc25e0ff946db1bce0a1d25eea813e7c5b9e77e6992a WHIRLPOOL e1427a3a27ce4a440a4217a26e496daaa3935f2110b469e3037b47c47a31e05e0248c42b2e800924c2b64f11d5c778537596ad6574f0664acfef153ed78812ff
 DIST icedtea-bin-nsplugin-7.2.3.4-x86.tar.bz2 1041899 SHA256 9d4351ecc9a4b54b1049ffda9387d9d282b178df9c3a66256925f83a4bd8fec6 SHA512 18c3b530eb64311a304f4e1a23647106f0c8b51f3c275672df06d5643dacce5eaab0073e017259046571e02dc3314fbd1734e50c1495954682780b06f7325183 WHIRLPOOL a7e1b83d42309b1e6bb365930b0db01f601e5332e802ab9397cf0183e9ccf58570125a746b3fcfb9d463ed8341f41bce38e7338b0e96b025e1bac6edb93abd81
+DIST icedtea-bin-nsplugin-7.2.3.6-amd64.tar.bz2 1047827 SHA256 4f276591ddd39977719f9e6e9039b5d78c46c0ec17e62d1efe0424667721ec84 SHA512 ec0f4fb365226aaea78bffde7f7f3275c9f1466d38cf8a884142f994ae6f7eaf819f5640faff371876787599324d4ad54374790ab0787c438425c1c86bfdd43d WHIRLPOOL 653641b88c257f435d26990880159feca24ffd5c57ad88012064651562addfde05ff4d3a5e4d109edc4dd607af4d121fc6b7599cd43a415db7efaf56de20b3c6
+DIST icedtea-bin-nsplugin-7.2.3.6-x86.tar.bz2 1041670 SHA256 6c2664d1e71121b8bb9fbe04d1ccd248562dec69222621ce2dafe5faaf8877ff SHA512 5ddcabb3b72771d849feb59e583167134be0432ffab9bf1ac52ab27c4bf74716fa6b8e5f6af0706b9cfe853a3953d2a710f1aaf3a609af843659d98c3fdbf257 WHIRLPOOL 51239e47da164b5d73822e851f1d8a739167a54caf226c7e2e519e2ee8906c0ef82dfff873773b2f17b361801646f9c7b38bbfd162ece3c8ad35da268589d00f
 DIST icedtea-bin-src-6.1.11.5.tar.bz2 40863162 SHA256 f6108917d2fdfcf201f991fde861df8107978198dd37463f9d2a5e2d7d563074 SHA512 fc0e6a6cd4857abb7c757b14dcb77724e13df85151ef0bcb8f8013e58919f5d7f6ba7ee601e36f99f6f43eee83ac1c74ec567ea64daf7d2d706b60561340d793 WHIRLPOOL 02e7a60a374597561d35c9381872b046de6fb087d5a48dfb2de2097afe4222e1e004e02048229eda7c2561375ab9fbff78eaa193623b825c07158e52237b0290
+DIST icedtea-bin-src-6.1.12.2.tar.bz2 40875911 SHA256 137932402c4f94baa90f57af4108cc224e31c5a07c1fa4a201827e51e7c9b52b SHA512 6668a2ccffbb2090cf34df714027c5c191f6a1e31cc8d921643914153d9bb8b847791558156776a201c6e25d4166a65673234eb248afd5372204cfbc947a1081 WHIRLPOOL b105327201861f0fa00625b6a0c72551b4e56038b23ddbd0b2d428c782acba6accf7be83964da6e66ee320d8e1dc10ee291e4945d4f82363b8e1739544e3781f
 DIST icedtea-bin-src-7.2.3.3.tar.bz2 41285893 SHA256 d781856b75d062480db486945c3a8408078a3a0ef80fe58dae6ac3dc9fa65abb SHA512 0d08e9282fe9e5ca1ae4ce8d866ee85d49f8d53f8c8dca6fe7fc198fb74fd28b6ec84ec8ca74c78d8da8a764c62ab544769cc5b1afa305edbcaad702a956e4c8 WHIRLPOOL 618218c213dce7ab6193c98d6b6fce481c66945aaefbe21cdc3ca8f8c791d8bfa20e40d939e0bbdd18aee8ae151bd0469777c71c96c1d038c635e94f94e84973
 DIST icedtea-bin-src-7.2.3.4.tar.bz2 41284713 SHA256 1830eaa0c8e91a13c6ba0a439f9735de53534ac5b6c5f0569d4cbc10d19607dc SHA512 8289c40d26fefb742fc5b85801286b7ab85f620ee5e2b5605dbc80a931bbcd0daa04ff04a9df3d8e9663bf85e8a33f1b37c7756ae0880de2d6a7e72813f9b24d WHIRLPOOL 873ecc60baecbef9eaacf3410637dd3debd3c5a6c04287e4654075a91cdfff8660148a47d9a88b208365b4dd6bcd810b64f0ad881db39f9f70309ad195397f06
+DIST icedtea-bin-src-7.2.3.6.tar.bz2 41274032 SHA256 b5b2b602e288fd87a83021216d29bdd7f5b72d07034c37836c1c24c2e2ddafd7 SHA512 76d97100d3294512439c681f65c04fc1f6813f6bfd91410f846a56ec76ac2f1b4dc5bf8d2a14ca02c98f8fd29d466ff22aeff9878d7a1a2d528f9ef3d90eeb41 WHIRLPOOL dea51019a5c7326b546805bf4f8712410e5d170cdd299ce900cb4e679bfa99e846743480a43ba78d84ad6462c117543d6ce0d9c312688626d7f30aa1c6928a43
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.12.2.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.12.2.ebuild
@ -0,0 +1,152 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.2.ebuild,v 1.1 2013/02/14 06:15:06 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 multilib prefix
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+TARBALL_VERSION="${PV}"
+PLUGIN_VERSION="${PVR}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	nsplugin? (
+		amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin source"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0.20"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.4"
+X_COMMON_DEP="
+	dev-libs/glib
+	>=media-libs/freetype-2.3.9:2
+	>=x11-libs/gtk+-2.20.1:2
+	>=x11-libs/libX11-1.3
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXtst-1.1"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	>=media-libs/libpng-1.5
+	>=sys-devel/gcc-4.3
+	>=sys-libs/glibc-2.11.2
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg
+	nsplugin? (
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/glib-2.20.5:2
+		>=dev-libs/nspr-4.8
+		>=x11-libs/cairo-1.8.8
+		>=x11-libs/pango-1.24.5
+
+	)"
+
+RDEPEND="${COMMON_DEP}
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	# Remove on next bump as the needed marks are already set by icedtea ebuild.
+	java-vm_set-pax-markings "${ddest}"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
+
+	if use doc; then
+		dohtml -r ../doc/html/*
+	fi
+
+	if use examples; then
+		cp -pRP share/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use nsplugin; then
+		cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
+		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
+		docinto icedtea-web
+		dodoc ../doc/icedtea-web/*
+	fi
+
+	# Remove after next bump, handled by icedtea ebuild. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
+		elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
+		elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
+		elog "such as Firefox 3.5+ and recent Chromium versions."
+	fi
+}
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild
@ -0,0 +1,142 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.6.ebuild,v 1.1 2013/02/14 06:15:06 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 multilib prefix
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+TARBALL_VERSION="${PV}"
+PLUGIN_VERSION="${PVR}"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	nsplugin? (
+		amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="-* ~amd64 ~x86"
+
+IUSE="+X +alsa cjk +cups doc examples nsplugin source"
+REQUIRED_USE="nsplugin? ( X )"
+RESTRICT="strip"
+
+# 423161
+QA_PREBUILT="opt/.*"
+
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0.20"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.4"
+X_COMMON_DEP="
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/glib-2.20.5:2
+		>=media-libs/fontconfig-2.6.0-r2:1.0
+		>=media-libs/freetype-2.3.9:2
+		>=x11-libs/cairo-1.8.8
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.20.1:2
+		>=x11-libs/libX11-1.3
+		>=x11-libs/libXext-1.1
+		>=x11-libs/libXi-1.3
+		x11-libs/libXrender
+		>=x11-libs/libXtst-1.1
+	>=x11-libs/pango-1.24.5"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6-r1
+	media-libs/lcms:2
+	>=media-libs/libpng-1.5
+	>=sys-devel/gcc-4.3
+	>=sys-libs/glibc-2.11.2
+	>=sys-libs/zlib-1.2.3-r1
+	virtual/jpeg"
+
+# cups is needed for X. #390945 #390975
+RDEPEND="${COMMON_DEP}
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	# Remove on next bump as the needed marks are already set by icedtea ebuild.
+	java-vm_set-pax-markings "${ddest}"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
+
+	if use doc; then
+		dohtml -r ../doc/html/*
+	fi
+
+	if use examples; then
+		cp -pRP share/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use nsplugin; then
+		cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
+		install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
+		docinto icedtea-web
+		dodoc ../doc/icedtea-web/*
+	fi
+
+	# Remove after next bump, handled by icedtea ebuild. Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
+		elog "such as Firefox 3.5+ and recent Chromium versions."
+	fi
+}
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@ -1,22 +1,16 @@
 DIST 68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
-DIST 7182233cc27e.tar.gz 2754301 SHA256 7e694d90969413972a51ad1202f3c042b1eca92591e43f1f94f4421a6be5c590 SHA512 03ae3c1732fb3dddebfe863aa05a4036fc1d871d63654cbd147d9a429d9feee61de7e0477fd9b66e2d644397c926b3d1f6750bae9e46da6c966dede697e0caf3 WHIRLPOOL d569b31065b6c0551ef5ea69622cf5a47b1d16afc8a6fff596832fcf2cb2bd2d7b61301cae3e583d1a0bafbc185dad724570303860fcb9a47a40ae586348f915
-DIST 8bd8e70d4a03.tar.gz 130507 SHA256 3ea7c4acd4c2f7b91588231427a8685010f8ce7eb0b9610457d6a35bf2afd6bd SHA512 a2a58d9e1aa4b23c05198fa9ce376e76c5cfbe6b687e9b91bb2461fb99f451ad7b4b23f2ca493506f6ba8e1ea3397deb88f9df9069fbd1ad9794153a86384816 WHIRLPOOL 51bb070a5cfbe1cc6d2deab3c5880ac291bc4202540200e6ca4a4bce8a16924ad079f51a60a6a3953f157f0c29026e4c4051cba996f16ff87e58558b638d2b6d
-DIST 946195011b30.tar.gz 2311091 SHA256 a9f56fbd58047adc9296800cd9c534375ef052074cd40ebc0da1f7db6ce09144 SHA512 fe7dd2191a2552c662393a6e320778449fa0b6659d2acd9e6af606952c90a61bfbe999c0c21e92b3848edbeb0c9aeea57b07a6e8aed80ce52430c46801416173 WHIRLPOOL 888a0fa2fa16420f18c46538bc106cfc5eb1b251d977c9ecf57478908dd36b4535886d2a9e31bf14d086f1520d7edc1f4e2357763f242d3479d350912cddea08
-DIST 96d4f04f2b7c.tar.gz 44950891 SHA256 afba9798a4f2407bdf2cd58d0a99d94bb76ae15aec6ad9cfa0375fb255b0032b SHA512 7cc4ccb8c62b7f3e54c464ae93de6b2a3cf850b149ed68b3e36b9bd1b0290a984453982230f1530975e87b145f82381a3d2e370758458babdf172a2afff19c89 WHIRLPOOL a679c7ddcf42b3857f4305af753f30aab6eb667c263142feb03d928a0e9b3310d4f982d8904981ce30a1fa496a372e8d334de80e027295c1bc2676940772d8dc
+DIST 6bb01322bb5a.tar.gz 44982865 SHA256 a2d4557222eb72b9f1ecf6cfd19c73eb0a02e2f9755eacacabb4c43c682095e2 SHA512 2d52d37393921c297c8856b0b3e234f132f670e72da8d627cce19d87ddcec68f7bb402af3537f90e0ce044240948d4b9442ab7524c87f99652aeeaa5a757d43c WHIRLPOOL 8fbf8aca4b0612b691655ad63198f3d2af78fe19b9c3e5eaf2b61e472ac4d7d14add5643ffd710377d7a1c5c82aee9d1a6aa94a7fafc6381415d9ead79be5e7d
+DIST 97a8b625f6e9.tar.gz 1435633 SHA256 511f9517374babed86f9d3d60d06f0fb7614cff14431a4eb678967b6f1358b1d SHA512 1bc57dcd36e9ebdff4be685936bb3c20d277358f112b7258ced6bcb57826b81df7bda5e7c6383831d26f496801daf6ef58bcb948e5debea76713ae1e43a599b3 WHIRLPOOL afd01b7cf293106dcead6768d1c67731927af2e37cf466925f0f7ac65ccded36b7c03c73949fd6ecdf10119f5052c1f3d34819ccd4570f2b80cc094d545d2e62
 DIST a567bcb7f589.tar.gz 4263355 SHA256 d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 SHA512 2abbd6ad72a5811963610b81ad3f59882fa0109bbffb69316f7bcadd218982abbb7b94ea41ddd379a0dad8586301e1d317226153d2f592876c56e7d338afadf5 WHIRLPOOL e712ee17b9e4e23a1fe54823218a79a45ab1ca11e23de2896b576a2034650bf8b151f01022e0d3f12421008fc1e8d8f9aa0bfc4cc6bce812dcfbbbab1c66af7c
-DIST aa3654afea12.tar.gz 3863916 SHA256 cc9a95c09be36753f9dd5aacd961400deddbdb757f8ea547cd7073f7ab7b87b7 SHA512 223951c2c9d659a0460711cfef332286b6790c7c2c4194d24d90cb41f36c4bba52dda1a533ee756f6bbed8bb7fc2a5775e2975122c238ea96eb0efc0975ab2b2 WHIRLPOOL f96a4c7f85825b63396bb657b0d64b1c5791bd7fd128b52fe7ee6efe583ca068158854634681c52be64df1ae3f23972a20d2ce9f12950c8a72ac7741fb0b594f
-DIST beecf0b9e760.tar.gz 9593942 SHA256 de7a5397a83bb7c7be2458809b576133e8a3b75dc62d62d2f2983b97c220dc4f SHA512 597f0d000240c6b19966008cf91afd3f0e6f5a074cc293717def0523feedb0251c166267e9d6c5c60aec46a8adaa8518e02e39c205e28bf248cc5b0bdb224fce WHIRLPOOL 6fa0b4f980dba08ae16143e722bb7bb130ebadb246e6bd76b1df71a35697ca799900640340976e89508ab132f05fcc056116771a1a816989a8d6e4fb60872a2e
-DIST cff92704c4e0.tar.gz 4261719 SHA256 dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f SHA512 d03f04a13e271a57b8a704ef1684cbf64da0519d579c4bd1aafa0d8e0bc241939018d8425f1b65f6999a7f0dc4b58eb5ba6ea8ed76b3ed5ce3299dd7cd094861 WHIRLPOOL efaabbca72b4471fa72679f071ed0a64184e3281ff7c1a301bcee1a131f3c7f91f93c9f42fc87d4c79e802074da158cdde96578a5eb40f7605c6fbc5b6880959
-DIST dc9234e25ab0.tar.gz 1453876 SHA256 911a049e735c1ab0dfa65426ada7a11494d51fec88126d34588b23f06ef7acf8 SHA512 86e600dc5f4f34b92d1bd92d8d2e8217749f06b1007a442ae1f1a5bc62d918cee1041f1a6e97dd8c880c15689abf71d6c4fe4b6875e4f5cdd6d6625a113c047b WHIRLPOOL 45981222063a22c12acb2caae578f4cbfd972d7b44c36ef100ca83cec0e8204c4970cdd065b2f91d256dedac661bdba21069a4e94b40a2c85d4b2f50a7909f37
-DIST icedtea-2.3.4.tar.gz 5043197 SHA256 ea859f37fb20904ffd40802a41396326f7e301fa6873d88d01bf4afef5a60ca8 SHA512 c236257579da2258571a995ba4180bcc2274cee6351a16503da51374fb39c60113064b6c125b81103f1ccc3ac4b609868771ee0647153ee6953d9b7a8763bdeb WHIRLPOOL 7b0f8db20f6818fe819644f8219ad13e2f6ca50b2e306f4784aeebc1fa4d0b798c29c8b9aeec7b4d08e5319e5a6739dcb2cb673969495b4b3c70084247703e8e
-DIST icedtea6-1.11.5.tar.gz 6411576 SHA256 258d81d957f8ab9322fbaf7c90647f27f6b4e675504fa279858e6dfe513f7574 SHA512 ba09bb5e6e9f1fc4781fbee69f72360ede4d22c560c3232c2316f240c61e3ef2919d9987ca6a9a74dd9ea3365ab03a54d7006cf8354054866267a7edee48346a WHIRLPOOL d1c5b02521da961dba08361a1a49841cf15e57df188347bad42976ed0627197185c6503834c392e69617a77861aa09d95f4a3bb8141031815bf8142e2efe21bc
-DIST icedtea6-1.12.0.tar.gz 6482285 SHA256 4f27f3f42b57836cfb11541736282ccfc22de3f4acc0e540560fcf5512d66ced SHA512 79a7b206438a5dcd6ad3a78a7a80f8d486325182ac1b9c1d22ae009147a22ab061684eba0bbf6498fc543b0b490f989170c71bc7f8175751c8f4a44071946c3c WHIRLPOOL a25d096865672fc1a0ffbcd9e03157a62d29e4c8cffaae05e714c44a4d43eacb6467b64193f8530a7b4bda56e63e6fbbf92df3d0dc0aca078c5b1fc5cac23671
-DIST icedtea6-1.12.1.tar.gz 6668139 SHA256 8e73a3939ba8c2cca888defc6c90811c959273a9bc7bd1352338a72cefcf1157 SHA512 db44d7674e51320984a12f684cf4c9d2392af4e671988359b7cd581b5a740a790eee710f28eff988ac0c666893311b8d0c7cf302c0e38b8b9d03f8683d07d08f WHIRLPOOL 40fc32696b807061b9d85a81beab8f1ef31a6da9a900075d50780fdf436230da46fa7af06d092048e8859455191135cc1ca5e6cc371f91469e7ae4ea653694c1
+DIST b900024eb4ba.tar.gz 2755366 SHA256 276fcc2f7609dd5a9346f9faa317331e722c9c015fa19c61a1228d86cf231bc2 SHA512 b13b14420780e475f483ef0811b7903d73b8667c3d7ca881e89a386d485094172d269ce755df47caccf2527cc2928695b69884c674d1a9460070703d917b05fe WHIRLPOOL 6a17403196720a402eab9cd18aca5f5714710095a107e1617961efffecbb2b5345c104fa0fd3306cf702266e4eca4555c0a8773b725559c92c645e92ad7fb20a
+DIST bc0de5a0ece2.tar.gz 9393915 SHA256 4b571c99b9dfdca6e8456a7d0d47eedb1a8e3c4863322cc853f959b1cb4bc068 SHA512 52a105b11916150f4c38158e53e5649a0185fa0e63ce055f1dc1dc961fec2921460216085971eefadc2a5f3aa468e78be7590a59f3c3ccdd9c91d23803f1d0ca WHIRLPOOL 8cc98d7b5ae839e75eb9ce0c88c99a71f867c1786a6d8698d4d14a5a0230b16cb26d17898e75355c91d240749c062223b3277a43f7ad2563da5c4faf4a79f9fe
+DIST d7feafb8427b.tar.gz 3864991 SHA256 81f30228dfab5669b114841a0b797c6529a5e37ca52eb97c7f9bbfd29aae9941 SHA512 69a29126487707c9a84ffc8989915fc9d620d265683e264a490d89ebac5d27c2c2c3d044b821a476b8f76f2035fb41855022435cc90b66286451c65ad696bc03 WHIRLPOOL e8895f91e0845bdbb256c99f82eff8f830bb3774cecd8ad7540695740964e3ae32b6286891b2986a982c87fcc7d686cff5482734541020c866bfc8e73a8382be
+DIST dd8d1a8f222f.tar.gz 131459 SHA256 a360299dd869d612b77a016967678716cb03dfddd0f484944a1619fda5fb6092 SHA512 ab827f6afc708b8a51ed523b2ea9ab42d57c926c9ffdfd22d4011c8209a89234855f861c72db04fdf3cbce71a6c175441fbba46e533e956bbc2e26521983d81d WHIRLPOOL 701ad8b553961f77ae4ed1725958572a0f8a2a94b92eade18dfad58848535a0f89ef2d0cf5b8b4bcc2f259fab02905750fc6789f1ef61d8c6a17a5c5ee9e6658
+DIST e0739a8783d1.tar.gz 2312385 SHA256 85170ef7a68ef8e2895edffd9a4209f78b43887e8c782bebfe14997d06619bdb SHA512 4d177b493b87cc5b2c92c85a4f035d7227743af2249c549f2dee2137b93a2f599d62e616e3a0a4f24f84abf26895e33fdbf6d3994118194f4a5f3cb1a002e157 WHIRLPOOL 72c61404b7d85142078020b42d20d4c5b0e0a77eb2fd8dcb49056f002706aba78e0da698db500eb88fa7a5ad5c57a223b2ea8422f5a04bd289e1a250503d2354
+DIST icedtea-2.3.6.tar.gz 5048411 SHA256 f55f2f2e5cdfa8b0429eaa56b4ecba7d63c701e867dbb636883c03cd8e64f4f9 SHA512 5484a79c80c3901f783a3a129e7a098d21ffed5a73bf8d3e300a7002d6a5c67e1d1b9ae1adc52de052dbde0757d7edbf9ebf101ac6f9dfcdb37378ceb5b23522 WHIRLPOOL 9c18db778810960fc5ed107e42f7d1236391e518a2ecfc6390693220c54950a04cf64f3faa41dfc28ab708cb87921cee7e873c71ffa2835b6c1476b34c2efd4a
+DIST icedtea6-1.12.2.tar.gz 6632211 SHA256 897a8834b8ddd6891f0eef46c0f799d11cbecf168c4383cfb26d0dad80328794 SHA512 9e219e3b9a87c9073a4759edcd1f416246085f755c7c9a3faf17cfcfed8a55b39e25511a2cd7d4526791bdd4d88063343b15391a6ee85a2b715c0cf0415e6ef8 WHIRLPOOL b97ee2c5a1168cc76299be468a3d11bba0ae31f69e0ea55745e60c0abcd195893e99ffa3408ea89385959d5d4f939a1fa77b1b73e8a1046effa607d512460c0f
 DIST jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz 298435 SHA256 bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 SHA512 fa3428d8997f9696cce4fa32c9de677ef193bc12236ef8b431af647b57d26725f4a3019abc87ade0cf10c7d6a745c18eb78e8e126d6842e788c8cefcbd2b006d WHIRLPOOL d1ca7dc677b7abbd600262f30c2c3774f502ef661f3dca60d4664c87b50b9a90c808e106f607a1dde7b3f4cf44a7a4a9e647877a2cc3332866b6b2bd34eb2a2a
-DIST jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz 294537 SHA256 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d SHA512 8b479a23f4c2eb16100bb0745452c652849f8e18912756e2d9f8ac9cd395f4bcf89af89d6feda25c8ec41cb90b7f17bebe646637234ed360c65da2a45dbbac04 WHIRLPOOL b9ba7a0c73e16245c109f983435f00a9349c747cc5b5ef4592b8aaf7efc95af0992d9c897530a12e886e7f20687a290f70f3cb27529f1661bc37d76d00f2b2af
-DIST jaxp144_03.zip 5964999 SHA256 c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012 SHA512 fe65d396d0a57bc2b5dd2d8b00b0ecea860d4e5a5c9cb489bc5b9d7abd90861dedd26088184de93807646277c23d3712e8af79e56251f079ef22ed5a3b8f9a90 WHIRLPOOL 16ebcc9715ca221b7a6cc802367b33b74636bf7fe06035df798d47a6de1ec8ab370027fa17b37e6e5f4dd1a1059a4f8ffd236a4c969594d9a7479b198a6928f4
 DIST jaxp144_04.zip 5976385 SHA256 490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c SHA512 9090d37f62f57d3dd8fb5981e3ce4a1ae87f1ef19abdb9df4775df1a48419cd16016c025a65516cfe3329885ac164cc45e4204dbc8d03239d368ebc962c824a4 WHIRLPOOL 6646fc6cfc83fbc26aef79cc219e008ee28fe4cf649ec4fc0e5bff045dd76b737c1036631acc9439137a50c2ee33dc7534b2de914877d1b695a3741ca3e6b1c8
 DIST jdk6-jaf-b20.zip 71243 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 SHA512 22fef9e0fdde82f141151d426d26316d7c23fd4cc2132ef191f38ea9420ebb3126670b0456ab4de83896307eab48bab0c46aaf0485f39e89cb57dac3215d499a WHIRLPOOL 2b02e883c7a2341ce927f402a9abc5a632a6718f713fbaa5c65133a0ac81a1a58a317b7e2028c309196805dc43146c591852c05144c64f2428938cb3ec4972d2
 DIST jdk6-jaxws2_1_6-2011_06_13.zip 5512710 SHA256 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3 SHA512 643266da495f239aca1a08ba85af337e5ab50e5b859bffbccab64cf1c4099cae641d9741a20ca59c599c1285266a79489dec190d7fb15daa88c82b69ce97dbd6 WHIRLPOOL cbd0614060d887ce5e1ee6aefaa213265ee45ae11b3f0f90eef0cfa5ee5db1c35d8209bf1d2dab6f5966af22ab14312891081cfa6ca4a11de92f272f33a2ea20
-DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227 SHA512 a965efa2fbe95a32988f78f1e51c42321ff42c1e631d5062aff204ba42839d6e05455f1ae039540e38ec947b50a635984cd3302eb09e81962575510309374e05 WHIRLPOOL 2dd759c4d8a23f0eb66bb28e1b48842fa3984d9796833bbbb6a3305a49d9cb1f2ce19b59c93b9f2a33d679559bf893fd62b4f831aa76bb053351e219639d9286
 DIST openjdk-6-src-b27-26_oct_2012.tar.gz 45789350 SHA256 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 SHA512 4198f11b2f49c9bc5ffbeadf2d0d87dfa413a918d49faff3a043266bf4a2fa99579fba3c6d75164d87e88b8fc5c97c3c1527560eb25c55cdd42ad813c8e175e8 WHIRLPOOL 5038258710f2c0eac1a5a1957629998d931d49a6145450485b84e21988d8fdfa5127dc0852067319fb2ac054f621ec511c0d8e01961943c7e4a223049317b894
--- a/dev-java/icedtea/files/icedtea-6-pass_javac_memory_args_to_vm.patch
+++ b/dev-java/icedtea/files/icedtea-6-pass_javac_memory_args_to_vm.patch
@ -1,99 +0,0 @@
-# HG changeset patch
-# User Andrew John Hughes <ahughes@redhat.com>
-# Date 1336602703 -3600
-# Node ID fe14de44c8a8961a9ebc7f9d6a896dea26fa8afb
-# Parent  643fb6254e8086111966e01877d19a0deff6dceb
-Allow builds where the memory limit of the VM needs to be increased to run javac.
-
-2012-05-09  Andrew John Hughes  <ahughes@redhat.com>
-
-	* Makefile.am:
-	(MEMORY_LIMIT): Always set this.
-	* javac.in:
-	Split out '-J' prefixed options and pass them
-	to the VM rather than ecj.  Filter out
-	'-J-Xbootclasspath/p:', which makes no sense
-	as there's nothing to prepend, and confuses
-	the VM.
-
-diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -89,6 +89,7 @@
- 	$(SHARE)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java
- 
- # Flags
-+MEMORY_LIMIT = -J-Xmx1024m
- IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
- IT_JAVAC_SETTINGS=-g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
- IT_LANGUAGE_SOURCE_VERSION=6
-@@ -120,15 +121,6 @@
- PULSE_JAVA_CLEAN_TARGET = clean-pulse-java
- endif
- 
-# FIXME: This should not depend on bootstrapping
-# but on whether MEMORY_LIMIT is accepted
-# as an argument to javac
-if BOOTSTRAPPING
-  MEMORY_LIMIT =
-else
-  MEMORY_LIMIT = -J-Xmx1024m
-endif
-
- if ENABLE_CACAO
-   ICEDTEA_BUILD_TARGET=jdk_only
-   ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
-diff --git a/javac.in b/javac.in
--- a/javac.in
-+++ b/javac.in
-@@ -1,7 +1,7 @@
- #!/usr/bin/perl -w
- use strict;
- use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
-use constant STRIP_ARGS => qw(-Werror -implicit:none);
-+use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
- 
- my $ECJ_WARNINGS="-nowarn";
- 
-@@ -31,24 +31,34 @@
- 	splice @new_args, $_, 1 for @indices;
-     }
- 
-    return @new_args;
-+    return \@new_args;
-+}
-+
-+sub split_vm_args
-+{
-+    my @new_args = @{$_[0]};
-+
-+    my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
-+    my @javac_args = grep $_ !~ /^-J/, @new_args;
-+
-+    return (\@vm_args, \@javac_args);
- }
- 
- if ( -e "@abs_top_builddir@/native-ecj" )
- {
-    my @ecj_args = gen_ecj_opts( \@ARGV );
-    exec '@abs_top_builddir@/native-ecj', @ecj_parms, @ecj_args ;
-+    my $ecj_args = gen_ecj_opts( \@ARGV );
-+    exec '@abs_top_builddir@/native-ecj', @ecj_parms, @$ecj_args ;
- }
- elsif ( -e "@ECJ_JAR@" )
- {
-    my @ecj_args = gen_ecj_opts( \@ARGV );
-+    my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
-     my @CLASSPATH = ('@ECJ_JAR@');
-     push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
-     $ENV{"CLASSPATH"} = join ':', @CLASSPATH;
-    exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @ecj_args;
-+    exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
- }
- else
- {
-    my @ecj_args = gen_ecj_opts( \@ARGV );
-    exec '@ECJ@', @ecj_parms, @ecj_args ;
-+    my $ecj_args = gen_ecj_opts( \@ARGV );
-+    exec '@ECJ@', @ecj_parms, @$ecj_args ;
- }
--- a/dev-java/icedtea/files/icedtea-6.1.12.0-parallel-unpack.patch
+++ b/dev-java/icedtea/files/icedtea-6.1.12.0-parallel-unpack.patch
@ -1,26 +0,0 @@
-Author: Ralph Sennhauser <sera@gentoo.org>
-
-Fix parallel unpacking #453608
-
-diff --git a/Makefile.am b/Makefile.am
-index 48029bc..34882a7 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -1099,7 +1099,7 @@ clean-extract-openjdk:
- 	rm -f stamps/patch-fsg.stamp
- 	rm -f stamps/patch.stamp
- 
-stamps/extract-cacao.stamp:
-+stamps/extract-cacao.stamp: stamps/download-cacao.stamp
- if BUILD_CACAO
- if !USE_SYSTEM_CACAO
- if USE_ALT_CACAO_SRC_DIR
-@@ -1124,7 +1124,7 @@ endif
- 	mkdir -p stamps
- 	touch $@
- 
-stamps/extract-jamvm.stamp:
-+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
- if BUILD_JAMVM
- 	set -e ; \
- 	if ! test -d jamvm ; \
--- a/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
+++ b/dev-java/icedtea/files/icedtea-6_pax_kernel_support.patch
@ -1,163 +0,0 @@
-Author: Ralph Sennhaser <sera@gentoo.org>
-
-The idea is to apply the pax markings before using a freshly built jdk. Be it
-for running tests or building additonal vms or after bootstrap to build the
-final jdk.
-
-There are currently two types of pax markings with the userspace utilities
-chpax and paxctl. Both types of pax marking are base on modifing the ELFs. A
-third type based on xattrs is in development.
-
-diff --git a/Makefile.am b/Makefile.am
-index 82ef261..e17fa5f 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -421,8 +421,10 @@ else
- ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
-if HAS_PAX
-ICEDTEA_PATCHES += patches/no-test_gamma.patch
-+if WITH_PAX
-+ICEDTEA_PATCHES += \
-+	patches/no-test_gamma.patch \
-+	patches/pax-mark-rmic-java.patch
- endif
- 
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-@@ -450,7 +450,7 @@ ICEDTEA_ECJ_PATCHES += patches/ecj/cp40188-opengl.patch
- endif
- endif
- 
-if !HAS_PAX
-+if !WITH_PAX
- ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch
- endif
- 
-@@ -1359,6 +1359,7 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
- 	  $(ICEDTEA_ENV) \
- 	  -C openjdk \
- 	  $(ICEDTEA_BUILD_TARGET)
-+	$(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
- 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
- 	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
- 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-@@ -1586,6 +1587,7 @@ stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
- 	  $(ICEDTEA_ENV_ECJ) \
- 	  -C openjdk-ecj/ \
- 	  $(ICEDTEA_BUILD_TARGET)
-+	$(abs_top_builddir)/pax-mark-vm $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
- 	@echo "ecj-poured IcedTea is served:" \
- 	  $(ECJ_BUILD_OUTPUT_DIR)
- 	mkdir -p stamps
-diff --git a/acinclude.m4 b/acinclude.m4
-index 503131c..e80b209 100644
--- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -1677,3 +1677,49 @@ AM_CONDITIONAL([CP39408_JAVAH], test x"${it_cv_cp39408_javah}" = "xyes")
- AM_CONDITIONAL([CP40188_JAVAH], test x"${it_cv_cp40188_javah}" = "xyes")
- AC_PROVIDE([$0])dnl
- ])
-+
-+AC_DEFUN_ONCE([IT_WITH_PAX],
-+[
-+  AC_MSG_CHECKING([for pax utility to use])
-+  AC_ARG_WITH([pax],
-+              [AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
-+  [
-+    PAX_COMMAND=${withval}
-+    if test "x${PAX_COMMAND}" = "xno"; then
-+      PAX_COMMAND="not specified"
-+    fi
-+  ],
-+  [ 
-+    PAX_COMMAND="not specified"
-+  ])
-+  case "x${PAX_COMMAND}" in
-+    xchpax)
-+      case "${host_cpu}" in
-+        i?86)
-+          PAX_COMMAND_ARGS="-msp"
-+          ;;
-+        *)
-+          PAX_COMMAND_ARGS="-m"
-+          ;;
-+      esac
-+      ;;
-+    xpaxctl)
-+      case "${host_cpu}" in
-+        i?86)
-+          PAX_COMMAND_ARGS="-msp"
-+          ;;
-+        *)
-+          PAX_COMMAND_ARGS="-m"
-+          ;;
-+      esac
-+      ;;
-+    *)
-+      PAX_COMMAND="not specified"
-+      PAX_COMMAND_ARGS="not specified"
-+      ;;
-+  esac
-+  AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
-+  AC_MSG_RESULT(${PAX_COMMAND})
-+  AC_SUBST(PAX_COMMAND)
-+  AC_SUBST(PAX_COMMAND_ARGS)
-+])
-diff --git a/configure.ac b/configure.ac
-index 580840e..f37ef68 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -51,7 +51,6 @@ IT_CHECK_GCC_VERSION
- IT_CHECK_NUMBER_OF_PARALLEL_JOBS
- IT_CP_SUPPORTS_REFLINK
- IT_CAN_HARDLINK_TO_SOURCE_TREE
-IT_CHECK_FOR_PAX
- IT_LOCATE_NSS
- 
- # Use xvfb-run if found to run gui tests (check-jdk).
-@@ -189,6 +188,9 @@ IT_WITH_TZDATA_DIR
- IT_GETDTDTYPE_CHECK
- IT_JAVAH
- 
-+IT_WITH_PAX
-+AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
-+
- dnl pkgconfig cannot be used to find these headers and libraries.
- AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
- 	,[AC_MSG_ERROR("CUPS headers were not found -
-diff --git a/pax-mark-vm.in b/pax-mark-vm.in
-new file mode 100644
-index 0000000..bdff735
--- /dev/null
-+++ b/pax-mark-vm.in
-@@ -0,0 +1,13 @@
-+#!/bin/sh
-+
-+# Taken from Gentoo's pax-utils.eclass
-+list_paxables() {
-+       file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//'
-+}
-+
-+if test "@PAX_COMMAND@" != "not specified"; then
-+       for paxable in `list_paxables "${1}"/bin/* "${1}"/jre/bin/*`; do
-+               echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}"
-+               @PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
-+       done
-+fi
-diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
-new file mode 100644
-index 0000000..ad80f3a
--- /dev/null
-+++ b/patches/pax-mark-rmic-java.patch
-@@ -0,0 +1,10 @@
-+--- openjdk/jdk/make/com/sun/jmx/Makefile
-++++ openjdk/jdk/make/com/sun/jmx/Makefile
-+@@ -119,6 +119,7 @@
-+ 
-+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-+ 	$(prep-target)
-++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
-+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
-+                 -d $(CLASSDESTDIR)              \
-+                 -v1.2                           \
--- a/dev-java/icedtea/files/icedtea-7.2.3.2-pax_mark_rmic_java.patch
+++ b/dev-java/icedtea/files/icedtea-7.2.3.2-pax_mark_rmic_java.patch
@ -1,31 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 49d8bc4..85ac971 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
- if WITH_PAX
-ICEDTEA_PATCHES += patches/test_gamma.patch
-+ICEDTEA_PATCHES += \
-+	patches/test_gamma.patch \
-+	patches/pax-mark-rmic-java.patch
- endif
- 
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
-new file mode 100644
-index 0000000..ad80f3a
--- /dev/null
-+++ b/patches/pax-mark-rmic-java.patch
-@@ -0,0 +1,10 @@
-+--- openjdk/jdk/make/com/sun/jmx/Makefile
-++++ openjdk/jdk/make/com/sun/jmx/Makefile
-+@@ -119,6 +119,7 @@
-+ 
-+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-+ 	$(prep-target)
-++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
-+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
-+                 -d $(CLASSDESTDIR)              \
-+                 -v1.2                           \
--- a/dev-java/icedtea/files/icedtea-7.2.3.3-pax_mark_rmic_java.patch
+++ b/dev-java/icedtea/files/icedtea-7.2.3.3-pax_mark_rmic_java.patch
@ -1,31 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 49d8bc4..85ac971 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -277,7 +277,9 @@ ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
- endif
- 
- if WITH_PAX
-ICEDTEA_PATCHES += patches/test_gamma.patch
-+ICEDTEA_PATCHES += \
-+	patches/test_gamma.patch \
-+	patches/pax-mark-rmic-java.patch
- endif
- 
- ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
-diff --git a/patches/pax-mark-rmic-java.patch b/patches/pax-mark-rmic-java.patch
-new file mode 100644
-index 0000000..ad80f3a
--- /dev/null
-+++ b/patches/pax-mark-rmic-java.patch
-@@ -0,0 +1,10 @@
-+--- openjdk/jdk/make/com/sun/jmx/Makefile
-++++ openjdk/jdk/make/com/sun/jmx/Makefile
-+@@ -119,6 +119,7 @@
-+ 
-+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
-+ 	$(prep-target)
-++	"$(TOPDIR)"/../../pax-mark-vm "$(OUTPUTDIR)"
-+ 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
-+                 -d $(CLASSDESTDIR)              \
-+                 -v1.2                           \
--- a/dev-java/icedtea/files/icedtea-7.2.3.4-parallel-unpack.patch
+++ b/dev-java/icedtea/files/icedtea-7.2.3.4-parallel-unpack.patch
@ -1,17 +0,0 @@
-Author: Ralph Sennhauser <sera@gentoo.org>
-
-Fix parallel unpacking #453608
-
-diff --git a/Makefile.am b/Makefile.am
-index 3f96d92..714cefa 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -1289,7 +1289,7 @@ endif
- clean-extract-cacao: clean-cacao
- 	rm -f stamps/extract-cacao.stamp
- 
-stamps/extract-jamvm.stamp:
-+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
- if BUILD_JAMVM
- 	set -e ; \
- 	if ! test -d jamvm ; \
--- a/dev-java/icedtea/icedtea-6.1.11.5.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.11.5.ebuild
@ -1,342 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.5.ebuild,v 1.2 2013/01/23 17:15:27 sera Exp $
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="4"
-
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-OPENJDK_BUILD="24"
-OPENJDK_DATE="14_nov_2011"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-JAXP_TARBALL="jaxp144_03.zip"
-JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
-JAF_TARBALL="jdk6-jaf-b20.zip"
-CACAO_TARBALL="cff92704c4e0.tar.gz"
-JAMVM_TARBALL="jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-	http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="6"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	dev-libs/glib
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	>=media-libs/libpng-1.2
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea6
-	X? (
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			!ppc? ( !ppc64? ( media-fonts/lklug ) )
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# !eclipse-ecj-3.7 - bug #392587
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.1
-	dev-java/ant-nodeps
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/lsb-release
-	${X_DEPEND}
-	jbootstrap? (
-		|| ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj )
-	)
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:6 )
-	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${PN}-${SLOT}_pax_kernel_support.patch #389751 #422525
-	epatch "${FILESDIR}"/${PN}-${SLOT}-pass_javac_memory_args_to_vm.patch
-	eautoreconf
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-	local config bootstrap enable_cacao
-	local vm=$(java-pkg_get-current-vm)
-
-	# IcedTea6 can't be built using IcedTea7; its class files are too new
-	# Whether to bootstrap
-	bootstrap="disable"
-	if use jbootstrap; then
-		if bootstrap_impossible "${vm}"; then
-			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
-		else
-			bootstrap="enable"
-		fi
-	fi
-
-	if has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		bootstrap="enable"
-	fi
-
-	config="${config} --${bootstrap}-bootstrap"
-
-	if [[ ${bootstrap} == enable ]]; then
-		# icedtea-6 javac wrapper requires to always have ecj if bootstrapping #392337
-		local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)"
-		# Don't use eclipse-ecj-3.7 #392587
-		local ecj_all=( "${EPREFIX}"/usr/share/{eclipse-ecj,ecj-gcj}-* )
-		ecj_all=( "${ecj_all[@]/*eclipse-ecj-3.7*/}" )
-		if ! has "${ecj_jar%/lib/ecj.jar}" "${ecj_all[@]}"; then
-			ecj_jar="${ecj_jar%/lib/ecj.jar}"
-			ewarn "${ecj_jar##*/} set as system ecj, can't use for bootstrap"
-			ewarn "Found usable: ${ecj_all[@]##*/}"
-			ewarn "using ${ecj_all##*/} instead"
-			ecj_jar="${ecj_all}"/lib/ecj.jar
-		fi
-		config="${config} --with-ecj-jar=${ecj_jar}"
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	case "${ARCH}" in
-		amd64|sparc|x86)
-			if use cacao; then
-				ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-				ewarn 'If so, please rebuild with USE="-cacao"'
-				config+=" --enable-cacao"
-			fi
-			;;
-		arm)
-			config+=" --enable-jamvm" #IT1266
-			replace-flags -Os -O2 #BGO453612 #IT1267
-			;;
-		*)
-			config+=" --enable-cacao"
-			;;
-	esac
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="ant-nodeps"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS THANKYOU
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
-		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
-		elog "If you had icedtea6 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
--- a/dev-java/icedtea/icedtea-6.1.12.0.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.12.0.ebuild
@ -1,320 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.0.ebuild,v 1.3 2013/02/05 07:33:54 zerochaos Exp $
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="4"
-
-inherit autotools eutils java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
-
-ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
-OPENJDK_BUILD="27"
-OPENJDK_DATE="26_oct_2012"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-JAXP_TARBALL="jaxp144_04.zip"
-JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
-JAF_TARBALL="jdk6-jaf-b20.zip"
-# Download cacao and jamvm regardless for use with EXTRA_ECONF
-CACAO_TARBALL="68fe50ac34ec.tar.gz"
-JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
-	http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-	http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
-	http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
-	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
-	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="6"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap +nsplugin
-	+nss pax_kernel pulseaudio +source systemtap test +webstart"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	dev-libs/glib
-	>=media-libs/freetype-2.3.5
-	>=x11-libs/gtk+-2.8:2
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3"
-X_DEPEND="
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2
-	>=x11-libs/libXp-1.0.0
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.1.1
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-COMMON_DEP="
-	>=media-libs/giflib-4.1.6
-	>=media-libs/libpng-1.2
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg
-	javascript? ( dev-java/rhino:1.6 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	systemtap? ( >=dev-util/systemtap-1 )"
-
-# media-fonts/lklug needs ppc ppc64 keywords
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea6
-	X? (
-		${X_COMMON_DEP}
-		media-fonts/dejavu
-		cjk? (
-			media-fonts/arphicfonts
-			media-fonts/baekmuk-fonts
-			!ppc? ( !ppc64? ( media-fonts/lklug ) )
-			media-fonts/lohit-fonts
-			media-fonts/sazanami
-		)
-	)
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )"
-
-# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# !eclipse-ecj-3.7 - bug #392587
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:6
-		dev-java/icedtea:6
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	>=dev-java/ant-core-1.8.1
-	dev-java/ant-nodeps
-	dev-lang/perl
-	>=dev-libs/libxslt-1.1.26
-	dev-libs/openssl
-	virtual/pkgconfig
-	sys-apps/lsb-release
-	${X_DEPEND}
-	pax_kernel? ( sys-apps/paxctl )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:6 )
-	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
-
-S="${WORKDIR}"/${ICEDTEA_PKG}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
-		gcj-jdk"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-java_prepare() {
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${P}-parallel-unpack.patch
-	eautoreconf
-}
-
-bootstrap_impossible() {
-	# Fill this according to testing what works and what not
-	has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
-}
-
-src_configure() {
-	local config bootstrap enable_cacao
-	local vm=$(java-pkg_get-current-vm)
-
-	# IcedTea6 can't be built using IcedTea7; its class files are too new
-	# Whether to bootstrap
-	bootstrap="disable"
-	if use jbootstrap; then
-		if bootstrap_impossible "${vm}"; then
-			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
-		else
-			bootstrap="enable"
-		fi
-	fi
-
-	if has "${vm}" gcj-jdk; then
-		# gcj-jdk ensures ecj is present.
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		bootstrap="enable"
-	fi
-
-	config="${config} --${bootstrap}-bootstrap"
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use CACAO
-	if ! has "${ARCH}" amd64 sparc x86; then
-		enable_cacao=yes
-	elif use cacao; then
-		ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-		ewarn 'If so, please rebuild with USE="-cacao"'
-		enable_cacao=yes
-	fi
-
-	if [[ ${enable_cacao} ]]; then
-		config="${config} --enable-cacao"
-	fi
-
-	# OpenJDK-specific parallelism support. Bug #389791, #337827
-	# Implementation modified from waf-utils.eclass
-	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
-	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
-	config="${config} --with-parallel-jobs=${procs}";
-	einfo "Configuring using --with-parallel-jobs=${procs}"
-
-	if use javascript ; then
-		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
-	else
-		config="${config} --without-rhino"
-	fi
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		--disable-downloading \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nss) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable systemtap) \
-		$(use_with pax_kernel pax paxctl)
-}
-
-src_compile() {
-	# Would use GENTOO_VM otherwise.
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Load the least that's needed to avoid possible classpath collisions.
-	export ANT_TASKS="ant-nodeps"
-
-	emake
-}
-
-src_test() {
-	# Use Xvfb for tests
-	unset DISPLAY
-
-	Xemake check
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}/${dest}"
-	dodir "${dest}"
-
-	dodoc README NEWS AUTHORS THANKYOU
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	cd openjdk.build/j2sdk-image || die
-
-	# Ensures HeadlessGraphicsEnvironment is used.
-	if ! use X; then
-		rm -r jre/lib/$(get_system_arch)/xawt || die
-	fi
-
-	# Don't hide classes
-	rm lib/ct.sym || die
-
-	#402507
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
-
-	if use doc; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die
-	fi
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	if use source; then
-		cp src.zip "${ddest}" || die
-	fi
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# Needs to be done before generating cacerts
-	java-vm_set-pax-markings "${ddest}"
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	# Bug 390663
-	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
-	eprefixify "${T}"/fontconfig.Gentoo.properties
-	insinto "${dest}"/jre/lib
-	doins "${T}"/fontconfig.Gentoo.properties
-
-	set_java_env "${FILESDIR}/icedtea.env"
-	if ! use X || ! use alsa || ! use cups; then
-		java-vm_revdep-mask "${dest}"
-	fi
-}
-
-pkg_preinst() {
-	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
-		# portage would preserve the symlink otherwise, related to bug #384397
-		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
-		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
-		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
-		elog "If you had icedtea6 as system VM, the change should be automatic, however"
-		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
-		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
-	fi
-}
--- a/dev-java/icedtea/icedtea-6.1.12.2.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.12.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/dev-java/icedtea/icedtea-6.1.12.1.ebuild,v 1.1 2013/02/11 05:51:50 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.2.ebuild,v 1.1 2013/02/13 18:56:54 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)

 # *********************************************************
--- a/dev-java/icedtea/icedtea-7.2.3.6.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.3.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/dev-java/icedtea/icedtea-7.2.3.4.ebuild,v 1.3 2013/02/01 09:12:46 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.6.ebuild,v 1.1 2013/02/13 18:56:54 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)

 # *********************************************************
@ -9,18 +9,18 @@

 EAPI="4"

-inherit autotools eutils java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
+inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic

 ICEDTEA_VER=$(get_version_component_range 2-)
 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-CORBA_TARBALL="dc9234e25ab0.tar.gz"
-JAXP_TARBALL="aa3654afea12.tar.gz"
-JAXWS_TARBALL="7182233cc27e.tar.gz"
-JDK_TARBALL="96d4f04f2b7c.tar.gz"
-LANGTOOLS_TARBALL="946195011b30.tar.gz"
-OPENJDK_TARBALL="8bd8e70d4a03.tar.gz"
-HOTSPOT_TARBALL="beecf0b9e760.tar.gz"
+CORBA_TARBALL="97a8b625f6e9.tar.gz"
+JAXP_TARBALL="d7feafb8427b.tar.gz"
+JAXWS_TARBALL="b900024eb4ba.tar.gz"
+JDK_TARBALL="6bb01322bb5a.tar.gz"
+LANGTOOLS_TARBALL="e0739a8783d1.tar.gz"
+OPENJDK_TARBALL="dd8d1a8f222f.tar.gz"
+HOTSPOT_TARBALL="bc0de5a0ece2.tar.gz"
 CACAO_TARBALL="a567bcb7f589.tar.gz"
 JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"

@ -156,9 +156,6 @@ java_prepare() {

 	# icedtea doesn't like some locales. #330433 #389717
 	export LANG="C" LC_ALL="C"
-
-	epatch "${FILESDIR}"/${P}-parallel-unpack.patch
-	eautoreconf
 }

 bootstrap_impossible() {
@ -191,6 +188,7 @@ src_configure() {
 	config="${config} --${bootstrap}-bootstrap"

 	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use JamVM as it's the only possibility right now
 	case "${ARCH}" in
 		amd64|sparc|x86)
 			;;
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@ -1,2 +1,3 @@
 DIST tomcat-native-1.1.23-src.tar.gz 258558 SHA256 944352cbe70d6a9fafaa462ef32792dc15d11bfa2682f48abe6300af60661e92 SHA512 46e0c0c7e9b26d55680e8ce8ea01d2551a31135db5fae43de9586ccdf242c566032089a0bda2e7eb86b5286cf0dc679bc2ca62e1ebf172e4cb8313c84244b8d5 WHIRLPOOL e1cb52f005a2bac1fd191f5abada559267572d21d364f472c27c28ae4682fb1f5117a33425153fbe73e63e720515e50bfed263315376d086394a627b05cec337
 DIST tomcat-native-1.1.24-src.tar.gz 261742 SHA256 0377849f42e32eaa6a8feaa639fa2d209dd4e34a3503d56a579b014aa2d5b349 SHA512 2082d0d40d345e4e11c54385fc192f3c645f08b9a7e7c2698301caf061ef0ad96527a24f49ef2468ce44b54b21791ca3153f83adf255da01f496fa6516e672ff WHIRLPOOL 0b7d52cccb9fbe47faa14a0cde02f5beb5a5ace644c6a7319a4e770109698e9ec704242292b40ca3b01d6d1234a17dc079a647b36002cce7b3c613c90f36a5e6
+DIST tomcat-native-1.1.27-src.tar.gz 288166 SHA256 7f78e71060dc029f9005490080babc45a2b702ea54263c440c52a9a7c02609e4 SHA512 fe755cf2c24d689bf700d999574eccdd622f8e890a3cd2ec67101fef5fece3915eea4b13762a7c93babff0011c00876210a45420e811ec2349a2cb992cff4d29 WHIRLPOOL 967be2ae27df16a4ce2a82ae7a6d2e739549f1e46612602c332c38fb53c245fffbe0688e865b1f038f9cbe712e50e3e1161390422ca14abf8410923b7aa888ef
--- a/dev-java/tomcat-native/tomcat-native-1.1.27.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.1.27.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-native/tomcat-native-1.1.27.ebuild,v 1.1 2013/02/13 09:30:08 fordfrog Exp $
+
+EAPI="2"
+
+inherit base eutils java-pkg-2
+
+DESCRIPTION="Native APR library for Tomcat"
+
+SLOT="0"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+IUSE=""
+
+RDEPEND="=dev-libs/apr-1*
+	dev-libs/openssl
+	>=virtual/jre-1.5"
+
+DEPEND=">=virtual/jdk-1.5
+	${RDEPEND}"
+
+S=${WORKDIR}/${P}-src/jni/native
+
+src_configure(){
+	econf --with-apr=/usr/bin/apr-1-config  \
+		--with-ssl=/usr || die "Could not configure native sources"
+}
+
+src_compile() {
+	base_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
+}
+
+pkg_postinst() {
+	elog
+	elog " APR should be available with Tomcat, for more information"
+	elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html"
+	elog
+	elog " Please report any bugs to http://bugs.gentoo.org/"
+	elog
+}
--- a/dev-lang/R/R-2.15.2-r2.ebuild
+++ b/dev-lang/R/R-2.15.2-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-lang/R/R-2.15.2-r1.ebuild,v 1.2 2013/01/29 18:27:44 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.15.2-r2.ebuild,v 1.1 2013/02/13 19:16:31 calchan Exp $

 EAPI=5

@ -48,7 +48,7 @@ RDEPEND="${CDEPEND}

 RESTRICT="minimal? ( test )"

-R_DIR="${EROOT}/usr/$(get_libdir)/${PN}"
+R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"

 pkg_setup() {
 	if use openmp; then
@ -122,10 +122,10 @@ src_prepare() {
 				configure.ac || die
 			# sort of "undo" 2.14.1-rmath-shared.patch
 			sed -i \
-				-e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
+				-e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
 				src/nmath/standalone/Makefile.in || die
 		else
-			append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
+			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
 		fi
 	fi
 	AT_M4DIR=m4 eaclocal
--- a/dev-lang/ghc/files/terminfo-0.3.2.5-tinfo.patch
+++ b/dev-lang/ghc/files/terminfo-0.3.2.5-tinfo.patch
@ -0,0 +1,25 @@
+http://bugs.gentoo.org/454216
+
+Mon Jan  7 16:34:47 FET 2013  Judah Jacobson <judah.jacobson@gmail.com>
+  * Search for terminfo in libtinfo; fixes GHC #7281.
+  
+  Patch from Paul Johnson.
+diff -rN -u old-terminfo/configure.ac new-terminfo/configure.ac
+--- old-terminfo/configure.ac	2013-02-14 00:16:11.816111434 +0300
+++ new-terminfo/configure.ac	2013-02-14 00:16:11.819111434 +0300
+@@ -39,10 +39,11 @@
+     TERMINFO_INCLUDES="$CursesIncludes term.h"
+ fi
+ 
+-AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw,
+-  [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
+-    [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
+-      HaveLibCurses=NO; LibCurses=not-installed)])])
+AC_CHECK_LIB(tinfo, setupterm, HaveLibCurses=YES; LibCurses=tinfo,
+  [AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw,
+    [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
+      [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
+        HaveLibCurses=NO; LibCurses=not-installed)])])])
+ 
+ if test "x$HaveLibCurses" = "xNO" ; then
+     AC_MSG_FAILURE([curses library not found, so this package cannot be built])
--- a/dev-lang/ghc/ghc-7.4.2.ebuild
+++ b/dev-lang/ghc/ghc-7.4.2.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-lang/ghc/ghc-7.4.2.ebuild,v 1.1 2012/11/14 09:34:39 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.2.ebuild,v 1.2 2013/02/13 21:46:44 slyfox Exp $

 # Brief explanation of the bootstrap logic:
 #
@ -375,6 +375,11 @@ src_prepare() {
 			sed -i -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' utils/haddock/doc/configure.ac || die
 		fi

+		cd "${S}"/libraries/terminfo
+		# bug #454216
+		epatch "${FILESDIR}"/terminfo-0.3.2.5-tinfo.patch
+
+		cd "${S}"
 		# as we have changed the build system
 		eautoreconf
 	fi
--- a/dev-lang/icc/icc-13.0.0.079.ebuild
+++ b/dev-lang/icc/icc-13.0.0.079.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-lang/icc/icc-13.0.0.079.ebuild,v 1.1 2012/09/16 19:17:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-13.0.0.079.ebuild,v 1.2 2013/02/14 08:15:58 jlec Exp $

 EAPI=4

@ -15,6 +15,7 @@ DESCRIPTION="Intel C/C++ Compiler"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"

 IUSE="eclipse"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"

 DEPEND="
 	eclipse? ( dev-util/eclipse-sdk )"
--- a/dev-lang/icc/icc-13.0.1.117.ebuild
+++ b/dev-lang/icc/icc-13.0.1.117.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-lang/icc/icc-13.0.1.117.ebuild,v 1.1 2012/12/10 19:35:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-13.0.1.117.ebuild,v 1.2 2013/02/14 08:15:58 jlec Exp $

 EAPI=4

@ -15,6 +15,7 @@ DESCRIPTION="Intel C/C++ Compiler"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"

 IUSE="eclipse"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"

 DEPEND="
 	eclipse? ( dev-util/eclipse-sdk )"
--- a/dev-lang/idb/idb-13.0.0.079.ebuild
+++ b/dev-lang/idb/idb-13.0.0.079.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-lang/idb/idb-13.0.0.079.ebuild,v 1.1 2012/10/09 12:13:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/idb/idb-13.0.0.079.ebuild,v 1.2 2013/02/14 10:33:41 jlec Exp $

 EAPI=4
 INTEL_DPN=parallel_studio_xe
@ -14,6 +14,7 @@ DESCRIPTION="Intel C/C++/FORTRAN debugger"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"

 IUSE="eclipse"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"

 DEPEND="~dev-libs/intel-common-${PV}[compiler]"
 RDEPEND="${DEPEND}
--- a/dev-lang/idb/idb-13.0.1.117-r1.ebuild
+++ b/dev-lang/idb/idb-13.0.1.117-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/dev-lang/idb/idb-13.0.1.117-r1.ebuild,v 1.1 2012/12/10 21:16:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/idb/idb-13.0.1.117-r1.ebuild,v 1.2 2013/02/14 10:33:41 jlec Exp $

 EAPI=4

@ -15,6 +15,7 @@ DESCRIPTION="Intel C/C++/FORTRAN debugger"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"

 IUSE="eclipse"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"

 DEPEND="~dev-libs/intel-common-${PV}[compiler]"
 RDEPEND="${DEPEND}
--- a/dev-lang/ifc/ifc-13.0.0.079-r1.ebuild
+++ b/dev-lang/ifc/ifc-13.0.0.079-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/dev-lang/ifc/ifc-13.0.0.079-r1.ebuild,v 1.1 2012/09/20 21:13:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-13.0.0.079-r1.ebuild,v 1.2 2013/02/14 08:14:08 jlec Exp $

 EAPI=4

@ -15,6 +15,7 @@ DESCRIPTION="Intel FORTRAN Compiler"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"

 IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"

 RDEPEND="~dev-libs/intel-common-${PV}[compiler]"
 DEPEND="${RDEPEND}"
--- a/dev-lang/ifc/ifc-13.0.1.117.ebuild
+++ b/dev-lang/ifc/ifc-13.0.1.117.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-lang/ifc/ifc-13.0.1.117.ebuild,v 1.1 2012/12/10 19:35:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-13.0.1.117.ebuild,v 1.2 2013/02/14 08:14:09 jlec Exp $

 EAPI=4

@ -15,6 +15,7 @@ DESCRIPTION="Intel FORTRAN Compiler"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"

 IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"

 RDEPEND="~dev-libs/intel-common-${PV}[compiler]"
 DEPEND="${RDEPEND}"
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@ -1,14 +1,10 @@
 DIST pl-6.2.5.tar.gz 14404112 SHA256 0613e40ebfe7329e542a042587f2e593a74f5710dbbfcf1e116ddba1e6c35167 SHA512 a61084b3f501874bcd44633ab351c01d2e92941e26e5ff9b95b76bf94c7f459e4217f12e5dad21b7b0b6a2ddb821e205f40351d6602eb80414b119e32da373eb WHIRLPOOL 0fe91154a01160c9ba3519c722cfce4e09a5b4c1fd7319563ff1b696fd74ef300b978416f14dfbed9669e5c24f97be4709181a9029029ad08a068a32c1658bb6
 DIST pl-6.2.6.tar.gz 14407455 SHA256 9412f0753a61c30dbcf1afac01fe7c9168002854709e00e09c21f959e1232146 SHA512 0bd8b057241c284e5530965236ac79895153f7ff4b42d72dea67f4c1296f0319c0ed7db363bb17a099686c1742ade4ad06d8f916637ff70f84e2c00d6c122b52 WHIRLPOOL ac5b0ba0fbfab919ebfd00cc01977e82973c23522f6a601416b4fdcfdddb1f902ab87016058aaa1d62533dea512b8f931f440433814e8cb3e0f8b66f7139204e
 DIST pl-6.3.10.tar.gz 14544771 SHA256 cd22db0acd78a4bd60265e946bd7593f499dfa7e533af29c5fae987fa7cf0ce7 SHA512 7931e28f931c5b392019a964bcbcfc3c536aff6b82d94b7f110f66f3ad8d9a65ff422937278fc148d52d830bcdfad7e2fa54a57227eb8310dba6d4c100d3ac61 WHIRLPOOL dfb5daf494965f7e75f9a8772b8fa2e76a85a35e0fd7bb31354dd21a5391adb13e758edd0933ddbaf031effa1d13902c0d21ecada789b43849cdfc552ee55f9f
-DIST pl-6.3.6.tar.gz 14492653 SHA256 0020d2aaff1c47bb2487c6053f231ca7070d97317f2d55993c3263fa2975a88a SHA512 b6179e813c63bba215578f53169890b484477fb7e5efd1be8247afc47c1fe03839dbdd13a21d9a4c96d4b395e813181b4e682e2cb161c47ab4e22f637192f5b8 WHIRLPOOL f792bfa371404d92930b6bec8061adc31b16f0518f0e02bc7584ca843e50785b9d6c0312c8a64c9192145a83150e0744b0b17d3be46008b3babf4713596ae4f6
-DIST pl-6.3.7.tar.gz 14492539 SHA256 1c4c9f79b54f609ee329104112519485b189bf604afd235fb3854e1aeeccb13f SHA512 dd76d368973a7cf1ca104412fb070ab9576ed97d9472ae42309d5ea25dc52f27dac330fd351ccccd35b2090cc26189d472f2d1929563a3689e40e744673f9b3f WHIRLPOOL 0c62732fb44ee6b476c9175ad0a1a49fa403b753e07647e13bbf9caff3de097e78081181119b9d5b06ecbb8bfd243d9de7012766370a2f6c40b1c2aacd5a71ac
-DIST pl-6.3.8.tar.gz 14522563 SHA256 5c8aac30fd9f812827164b9a4c3b08de69d4d074a65e980f6f4e4ea580bb77ae SHA512 301abeee6432d7880fec0a7d211dd61c6f3ffa917187dc82f0c75e0d919e71f6dd5ba67b1b4b7ca68f1046dba6f3b9249c89174c079d1a2eee911e65e7c00422 WHIRLPOOL bbd42db2a47d5433e34b1bfe358765e15631d0cee08f92508ac5b2817d48f4de5c6e4137cc43ceaf3e8657f40944c9c6ccac0007594e4b155a93f6ec05c09446
+DIST pl-6.3.11.tar.gz 14537455 SHA256 851720e4bd432bd4a0355c2082749d4b5b59d038a34cfbaadccfb447a91e017e SHA512 6bdded3fef3c091316397aa06eacf56a555872ff7d3bc730b2e2cb3f4722fd9067714278e1aced131f14d0d392370a4580e80caacb11168bc46c42520e60bb94 WHIRLPOOL b318dc22a88209e2bb71598f91334ec66dc6192bd2723ba1589cdabfb11c769144a02d878b663f7794a0afbf08e1d3b5c913361acfca6d7a89a8d088f188d570
 DIST pl-6.3.9.tar.gz 14544131 SHA256 d0cbcb7fea6795d46f5447243800ed5a7509522442bf88e77ff802b9594f79ea SHA512 40fc854806fa4b6de90925c5e4878a1f2cc2f3de47fd7a355d65264a6e86bb21a619eaa0263d9bde05d4fd8676dcac8928acb975251f78699bd8941744547762 WHIRLPOOL 05268e6dc837e59f2757579ad113aae8e18f8798604b8c2e0fa0a2a5510aa0117ea04d6f732f3bee53c493805318a3e8b07c7df9dec46cbf70ebe84f2effaedb
 DIST swi-prolog-6.2.5-gentoo-patchset-1.tar.gz 2692 SHA256 c4e59e4240effb3383465997020e4056e5967aa4f9bcf0b010a564d1f49bbd71 SHA512 2f31fae8df581931bee3b38bee1687f9fb12567a9f267a01eba5dd011377cea05b3249df942c4b719bb0c2f7cfb86c5665794948083c3090a6854b04fb25ac4e WHIRLPOOL 49685d66ee2ec6ad4a654356bb6d290d8bd81e79c42241786c235d610493b78583cfb2c44be4b20ba49f49891d9da69b90bf5b5c0f9fc59f272c20ff6475c204
 DIST swi-prolog-6.2.6-gentoo-patchset-0.tar.gz 2701 SHA256 9ab62cb8b19816af66adb4b52344ca59449210a6413c08c9edaf4e3fa5cdf3ad SHA512 a0c5961fd3ceb1e8ee59be6a03bd801fa95ecede3eba41d9b66682e39095e532207e87029c13aaa0e8cb90c03e96e6e41889e433b3627df9b864adad9f45851b WHIRLPOOL eafe59ebc256ccef608b635cf8559866e38f0c52667dac96f984ce1fe195de636176fa8f9653d882a87b6619dd56e0019c01efbd413bfbcb48d457dcfb46fac6
 DIST swi-prolog-6.3.10-gentoo-patchset-0.tar.gz 1908 SHA256 1345c9154afe1aba367d58daf9ebc83b21fe97d0022070be0c30f28c5533eb2d SHA512 27ebf0c96adf15fee764686897b6e346f3da823c59a8a2ef85ecc249b92cf431be2a17b1e83329bf100e419d46741fa47a6324d39ac3f5067536f206ab424d71 WHIRLPOOL 3d9318a5c65be61ed4f0a9d09cab0c17cce13c8ac7b48e791c5c6a87b214f0d4ea4edcd517a7bbb2334be90c6f58d56565ff9dd40e8571103ae9efe7a210922d
-DIST swi-prolog-6.3.6-gentoo-patchset-0.tar.gz 1920 SHA256 1e31ddd82e611cce1299252e67c8c764d5c0d189e7f2586e5fd45bd02f100bbc SHA512 8b562c9f80ff6f8f6fa34596d0444d2ea559ef7d1e46b0080594b99513f8a224416ad2e395aee9245076cc1e8ce8722730488c03e513339acb690b314b60da0a WHIRLPOOL e5bcf46be03074668644fceeaee4901e0861f5bc5a531b9fb4bd10322910eb83f47a5870c6d5359b778ed1a96d423aa16e223cd252496e19581946efc0ac1bed
-DIST swi-prolog-6.3.7-gentoo-patchset-0.tar.gz 1912 SHA256 19cfbe7e9d9ad5e3eff777552fa46e9abc4b152e98391188b83e420b75bb74a3 SHA512 3f523a7379606158e2650ef07096fd18b1996d903b176ddcaea2b2ac6b9bb8b41b2037b9cafae2eb8b513a5ea92e07d03142f37a04f172c0eeb3af98e5945a48 WHIRLPOOL 500fc258311fd1e221b2865932f157507926e3af628e2bf0ed80184ced982df3dc4b77627d340c2d69a1e304e6745f17a0d83bb23f07feb3ad5ee027d7f168bd
-DIST swi-prolog-6.3.8-gentoo-patchset-0.tar.gz 1918 SHA256 cffbae368d418388a0c61f020429a8a0315f1beded7712d7e0181a2231577be8 SHA512 1dcdb0d6cc3b0b1642c2495585c8b457d94c2055d621843ad813aff6b5605577b7405c2ac0b6edff5a1e78b2c5da851243ea72a516b46dc79d3cbfe84a249d0d WHIRLPOOL 471b8188ee4031fff3e476480cd5185b96414cf84a0fb3e45bea1e645c28d77da46d64d0c9e3a3340f0c581499bc7990e3a8b761f94c7851436c08d1d820f50f
+DIST swi-prolog-6.3.11-gentoo-patchset-0.tar.gz 1917 SHA256 ce63fb05ee0c4e05dd65ac44f2cb04e9a6d1090a328d9ef370717abc7cac9c12 SHA512 e3cf42c66531ed175d39f9b2fdfad8cdcaab4077a3463440dc82fb37c1e88e798a55847ac2ca257b17a59195445bd0b2a0cfedc164da929b26c44fd81e079007 WHIRLPOOL 25643467f8edaa46b6f7029f09e16ba8049d02b3c140efea69e09af98915f3be2ee3513aea2c531f30762cdc58c6bb079791d872b35f7399621ba96e9a26aee5
 DIST swi-prolog-6.3.9-gentoo-patchset-0.tar.gz 1909 SHA256 4681421bc449c55fc75229de94dd63bb3f2a9f5ad3f17904d818b6b675441180 SHA512 a9bdc3d53ba42077ba827461da37260945ae43719aa38951bc5d6d8e45068e0e20cd05b07cbe9acc3b2faa74f00d8c50dc3ae010d33e9320c5c456b9188d5b9b WHIRLPOOL 35f261950f4e55a2a18981152be970682c530979a7791cbe5943eba02c61318d66b77529768c1313c325fc4f6a6eddee0b577d782c18f2e65b0132b1046615c8
--- a/dev-lang/swi-prolog/swi-prolog-6.3.11.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.3.11.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/swi-prolog/swi-prolog-6.3.8.ebuild,v 1.1 2013/01/16 13:54:36 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.3.11.ebuild,v 1.1 2013/02/13 09:32:32 keri Exp $

 EAPI=4

--- a/dev-lang/swi-prolog/swi-prolog-6.3.6.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.3.6.ebuild
@ -1,125 +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/swi-prolog/swi-prolog-6.3.6.ebuild,v 1.1 2013/01/07 14:53:10 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="archive debug doc gmp hardened java minimal odbc readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages"
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages"
-		emake
-	fi
-}
-
-src_test() {
-	cd "${S}/src"
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages"
-		emake check
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
--- a/dev-lang/swi-prolog/swi-prolog-6.3.7.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.3.7.ebuild
@ -1,125 +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/swi-prolog/swi-prolog-6.3.7.ebuild,v 1.1 2013/01/07 14:53:10 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="archive debug doc gmp hardened java minimal odbc readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages"
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages"
-		emake
-	fi
-}
-
-src_test() {
-	cd "${S}/src"
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages"
-		emake check
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
--- a/dev-lang/swig/swig-2.0.9.ebuild
+++ b/dev-lang/swig/swig-2.0.9.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/swig/swig-2.0.9.ebuild,v 1.9 2013/02/12 20:19:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-2.0.9.ebuild,v 1.10 2013/02/14 05:48:55 jer Exp $

 EAPI=4

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

 LICENSE="GPL-3+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ccache doc pcre"
 RESTRICT="test"

--- 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.9 2013/02/12 20:24:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.13-r1.ebuild,v 1.10 2013/02/14 05:46:18 jer 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/tk-8.5.13-r1.ebuild
+++ b/dev-lang/tk/tk-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/tk/tk-8.5.13-r1.ebuild,v 1.8 2013/02/12 20:24:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13-r1.ebuild,v 1.9 2013/02/14 05:47:19 jer 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 ~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"
+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="
--- a/dev-libs/UTF8Strings/Manifest
+++ b/dev-libs/UTF8Strings/Manifest
@ -1 +1,2 @@
+DIST UTF8Strings-1.12.0.tar.bz2 6616 SHA256 7acf9b0123dd0178a0bb06218895fec3e8ff4679d03688efddb9625696999df8 SHA512 db1eda28481ad38c37d48a297924957efe310d15177437ab4923881e4a98bec52005fdb9d841824806604224cc94211d506636d471c535ba0d3a9330bfd6543a WHIRLPOOL c624ec2cf6342a388f1e9fc1c600fafb9997a20151c97ff26a776e1fcd7e507a3c2ac35670c169f7755f82f9c5d7c64079f61d48e2467ca2e0fdaa09e72a8724
 DIST UTF8Strings-1.9.tar.bz2 5708 SHA256 7933b8a56fc83da34a49f0da67c056eb0340d20b544aa403ed2c5a076c72a054 SHA512 9d965a05fdd21109f14ca2b72a2c03484230f2824063beb676eda6eb022df0289c7596af0dbaa8732dc05b884a4cba695471dc47769c91792fee5ea3aafc398a WHIRLPOOL 7cc2bc5457c32bd00bc9a1932d9f5d16d3cf818ccb9b1b4556d19146243fac4697c28b82cbc155cd106c1b969699488417ad1b151529bd487028b2dfb4407d4d
--- a/dev-libs/UTF8Strings/UTF8Strings-1.12.0.ebuild
+++ b/dev-libs/UTF8Strings/UTF8Strings-1.12.0.ebuild
@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/UTF8Strings/UTF8Strings-1.12.0.ebuild,v 1.1 2013/02/13 22:36:57 tomwij Exp $
+
+inherit cmake-utils
+
+DESCRIPTION="C++ library that provides ability to work natively with UTF8 strings in a very simple way."
+HOMEPAGE="http://grigory.info/${PN}.About.html"
+SRC_URI="http://grigory.info/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
--- a/dev-libs/intel-common/intel-common-13.0.0.079-r1.ebuild
+++ b/dev-libs/intel-common/intel-common-13.0.0.079-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/dev-libs/intel-common/intel-common-13.0.0.079-r1.ebuild,v 1.1 2012/10/28 15:29:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/intel-common/intel-common-13.0.0.079-r1.ebuild,v 1.2 2013/02/14 08:11:29 jlec Exp $

 EAPI=4

@ -15,6 +15,7 @@ DESCRIPTION="Common libraries and utilities needed for Intel compilers and libra
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"

 IUSE="+compiler"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"

 CHECKREQS_DISK_BUILD=325M

--- a/dev-libs/intel-common/intel-common-13.0.0.079.ebuild
+++ b/dev-libs/intel-common/intel-common-13.0.0.079.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/intel-common/intel-common-13.0.0.079.ebuild,v 1.2 2012/09/20 13:19:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/intel-common/intel-common-13.0.0.079.ebuild,v 1.3 2013/02/14 08:11:29 jlec Exp $

 EAPI=4

@ -15,6 +15,7 @@ DESCRIPTION="Common libraries and utilities needed for Intel compilers and libra
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"

 IUSE="+compiler"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"

 CHECKREQS_DISK_BUILD=325M

--- a/dev-libs/intel-common/intel-common-13.0.1.117.ebuild
+++ b/dev-libs/intel-common/intel-common-13.0.1.117.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/intel-common/intel-common-13.0.1.117.ebuild,v 1.2 2012/12/10 21:15:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/intel-common/intel-common-13.0.1.117.ebuild,v 1.3 2013/02/14 08:11:29 jlec Exp $

 EAPI=4

@ -15,6 +15,7 @@ DESCRIPTION="Common libraries and utilities needed for Intel compilers and libra
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/"

 IUSE="+compiler"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"

 CHECKREQS_DISK_BUILD=325M

--- a/dev-libs/libotf/libotf-0.9.13.ebuild
+++ b/dev-libs/libotf/libotf-0.9.13.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/libotf/libotf-0.9.13.ebuild,v 1.2 2012/11/30 08:31:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/libotf-0.9.13.ebuild,v 1.4 2013/02/13 16:47:37 ago Exp $

 EAPI=5
 inherit autotools eutils
@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"

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

 RDEPEND=">=media-libs/freetype-2.4.9
--- a/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild
@ -1,208 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r1.ebuild,v 1.2 2012/12/27 04:20:42 pesa Exp $
-
-EAPI=5
-
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit eutils qt4-r2 python toolchain-funcs
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-
-if [[ ${PV} == *_pre* ]]; then
-	MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
-	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
-else
-	MY_P="PyQt-x11-gpl-${PV}"
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="X dbus debug declarative doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
-REQUIRED_USE="
-	declarative? ( X )
-	help? ( X )
-	multimedia? ( X )
-	opengl? ( X )
-	phonon? ( X )
-	scripttools? ( X script )
-	sql? ( X )
-	svg? ( X )
-	webkit? ( X )
-"
-
-# Minimal supported version of Qt.
-QT_PV="4.8.0:4"
-
-RDEPEND="
-	>=dev-python/sip-4.14.2:=
-	>=x11-libs/qt-core-${QT_PV}
-	X? (
-		>=x11-libs/qt-gui-${QT_PV}[dbus?]
-		>=x11-libs/qt-test-${QT_PV}
-	)
-	dbus? (
-		>=dev-python/dbus-python-0.80
-		>=x11-libs/qt-dbus-${QT_PV}
-	)
-	declarative? ( >=x11-libs/qt-declarative-${QT_PV} )
-	help? ( >=x11-libs/qt-assistant-${QT_PV} )
-	multimedia? ( >=x11-libs/qt-multimedia-${QT_PV} )
-	opengl? ( >=x11-libs/qt-opengl-${QT_PV} )
-	phonon? (
-		kde? ( media-libs/phonon )
-		!kde? ( || ( >=x11-libs/qt-phonon-${QT_PV} media-libs/phonon ) )
-	)
-	script? ( >=x11-libs/qt-script-${QT_PV} )
-	sql? ( >=x11-libs/qt-sql-${QT_PV} )
-	svg? ( >=x11-libs/qt-svg-${QT_PV} )
-	webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4")
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# Support qreal on arm architecture (bug 322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	# Use proper include directory for phonon.
-	sed -i -e "s:^\s\+generate_code(\"phonon\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
-		configure.py || die
-
-	if ! use dbus; then
-		sed -i -e 's/^\(\s\+\)check_dbus()/\1pass/' configure.py || die
-	fi
-
-	python_copy_sources
-
-	preparation() {
-		if [[ $(python_get_version -l --major) == 3 ]]; then
-			rm -fr pyuic/uic/port_v2
-		else
-			rm -fr pyuic/uic/port_v3
-		fi
-	}
-	python_execute_function -s preparation
-}
-
-pyqt4_use_enable() {
-	use $1 && echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"$(PYTHON)" configure.py
-			--confirm-license
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="${EPREFIX}$(python_get_sitedir)"
-			--sipdir="${EPREFIX}/usr/share/sip"
-			--assume-shared
-			--no-timestamp
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtXml
-			$(pyqt4_use_enable X QtDesigner) $(use X || echo --no-designer-plugin)
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtTest)
-			$(pyqt4_use_enable dbus QtDBus)
-			$(pyqt4_use_enable declarative)
-			$(pyqt4_use_enable help)
-			$(pyqt4_use_enable multimedia)
-			$(pyqt4_use_enable opengl QtOpenGL)
-			$(pyqt4_use_enable phonon phonon)
-			$(pyqt4_use_enable script)
-			$(pyqt4_use_enable scripttools QtScriptTools)
-			$(pyqt4_use_enable sql)
-			$(pyqt4_use_enable svg)
-			$(pyqt4_use_enable webkit QtWebKit)
-			$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		local mod
-		for mod in QtCore \
-				$(use X && echo QtDesigner QtGui) \
-				$(use dbus && echo QtDBus) \
-				$(use declarative && echo QtDeclarative) \
-				$(use opengl && echo QtOpenGL); do
-			# Run eqmake4 inside the qpy subdirectories to respect
-			# CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping.
-			pushd qpy/${mod} > /dev/null || return
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || return
-
-			# Fix insecure runpaths.
-			sed -i -e "/^LFLAGS\s*=/ s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \
-				${mod}/Makefile || die "Failed to fix rpath for ${mod}"
-		done
-
-		# Avoid stripping of libpythonplugin.so.
-		if use X; then
-			pushd designer > /dev/null || return
-			eqmake4 python.pro
-			popd > /dev/null || return
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
-		emake DESTDIR="${T}/images/${PYTHON_ABI}" INSTALL_ROOT="${T}/images/${PYTHON_ABI}" install
-	}
-	python_execute_function -s installation
-	python_merge_intermediate_installation_images "${T}/images"
-
-	dodoc NEWS THANKS
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-}
-
-pkg_postrm() {
-	python_mod_cleanup PyQt4
-}
--- a/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.6-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/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.2 2013/02/04 16:22:32 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.3 2013/02/13 08:52:33 pesa Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@ -106,7 +106,7 @@ src_configure() {
 			"${PYTHON}" configure.py
 			--confirm-license
 			--bindir="${EPREFIX}/usr/bin"
-			--destdir="${EPREFIX}$(python_get_sitedir)"
+			--destdir="$(python_get_sitedir)"
 			--sipdir="${EPREFIX}/usr/share/sip"
 			--assume-shared
 			--no-timestamp
--- a/dev-python/PyQt4/PyQt4-4.9.6.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.6.ebuild
@ -1,214 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6.ebuild,v 1.1 2012/12/10 11:20:38 pesa Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit eutils toolchain-funcs qt4-r2 python
-
-# Minimal supported version of Qt.
-QT_VER="4.7.2"
-
-DESCRIPTION="Python bindings for the Qt toolkit"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
-
-if [[ ${PV} == *_pre* ]]; then
-	MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
-	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
-else
-	MY_P="PyQt-x11-gpl-${PV}"
-	SRC_URI="mirror://sourceforge/pyqt/${PN}/PyQt-${PV}/${MY_P}.tar.gz"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
-
-REQUIRED_USE="
-	assistant? ( X )
-	declarative? ( X )
-	multimedia? ( X )
-	opengl? ( X )
-	phonon? ( X )
-	sql? ( X )
-	svg? ( X )
-	webkit? ( X )
-"
-
-RDEPEND="
-	>=dev-python/sip-4.14.2
-	>=x11-libs/qt-core-${QT_VER}:4
-	>=x11-libs/qt-script-${QT_VER}:4
-	X? (
-		>=x11-libs/qt-gui-${QT_VER}:4[dbus?]
-		>=x11-libs/qt-test-${QT_VER}:4
-	)
-	assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 )
-	dbus? (
-		>=dev-python/dbus-python-0.80
-		>=x11-libs/qt-dbus-${QT_VER}:4
-	)
-	declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 )
-	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
-	opengl? (
-		>=x11-libs/qt-opengl-${QT_VER}:4
-		|| ( >=x11-libs/qt-opengl-4.8.0:4 <x11-libs/qt-opengl-4.8.0:4[-egl] )
-	)
-	phonon? (
-		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) )
-		kde? ( media-libs/phonon )
-	)
-	sql? ( >=x11-libs/qt-sql-${QT_VER}:4 )
-	svg? ( >=x11-libs/qt-svg-${QT_VER}:4 )
-	webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 )
-	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )
-"
-DEPEND="${RDEPEND}
-	dbus? ( virtual/pkgconfig )
-"
-
-S=${WORKDIR}/${MY_P}
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4")
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# Support qreal on arm architecture (bug 322349).
-	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
-
-	# Use proper include directory for phonon.
-	sed -i -e "s:^\s\+generate_code(\"phonon\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
-		configure.py || die
-
-	if ! use dbus; then
-		sed -i -e 's/^\(\s\+\)check_dbus()/\1pass/' configure.py || die
-	fi
-
-	python_copy_sources
-
-	preparation() {
-		if [[ $(python_get_version -l --major) == 3 ]]; then
-			rm -fr pyuic/uic/port_v2
-		else
-			rm -fr pyuic/uic/port_v3
-		fi
-	}
-	python_execute_function -s preparation
-}
-
-pyqt4_use_enable() {
-	use $1 && echo "--enable=${2:-$1}"
-}
-
-src_configure() {
-	configuration() {
-		local myconf=(
-			"$(PYTHON)" configure.py
-			--confirm-license
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="${EPREFIX}$(python_get_sitedir)"
-			--sipdir="${EPREFIX}/usr/share/sip"
-			--assume-shared
-			--no-timestamp
-			--qsci-api
-			$(use debug && echo --debug)
-			--enable=QtCore
-			--enable=QtNetwork
-			--enable=QtScript
-			--enable=QtXml
-			$(pyqt4_use_enable X QtGui)
-			$(pyqt4_use_enable X QtDesigner) $(use X || echo --no-designer-plugin)
-			$(pyqt4_use_enable X QtScriptTools)
-			$(pyqt4_use_enable X QtTest)
-			$(pyqt4_use_enable assistant QtHelp)
-			$(pyqt4_use_enable dbus QtDBus)
-			$(pyqt4_use_enable declarative QtDeclarative)
-			$(pyqt4_use_enable multimedia QtMultimedia)
-			$(pyqt4_use_enable opengl QtOpenGL)
-			$(pyqt4_use_enable phonon)
-			$(pyqt4_use_enable sql QtSql)
-			$(pyqt4_use_enable svg QtSvg)
-			$(pyqt4_use_enable webkit QtWebKit)
-			$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		local mod
-		for mod in QtCore \
-				$(use X && echo QtDesigner QtGui) \
-				$(use dbus && echo QtDBus) \
-				$(use declarative && echo QtDeclarative) \
-				$(use opengl && echo QtOpenGL); do
-			# Run eqmake4 inside the qpy subdirectories to respect
-			# CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping.
-			pushd qpy/${mod} > /dev/null || return
-			eqmake4 $(ls w_qpy*.pro)
-			popd > /dev/null || return
-
-			# Fix insecure runpaths.
-			sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \
-				-i ${mod}/Makefile || die "Failed to fix rpath for ${mod}"
-		done
-
-		# Avoid stripping of libpythonplugin.so.
-		if use X; then
-			pushd designer > /dev/null || return
-			eqmake4 python.pro
-			popd > /dev/null || return
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_install() {
-	installation() {
-		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
-		emake DESTDIR="${T}/images/${PYTHON_ABI}" INSTALL_ROOT="${T}/images/${PYTHON_ABI}" install
-	}
-	python_execute_function -s installation
-	python_merge_intermediate_installation_images "${T}/images"
-
-	dodoc NEWS THANKS
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize PyQt4
-
-	ewarn "When updating dev-python/PyQt4, you usually need to rebuild packages that depend on it,"
-	ewarn "such as dev-python/qscintilla-python and kde-base/pykde4. If you have app-portage/gentoolkit"
-	ewarn "installed, you can find these packages with \`equery d dev-python/PyQt4\`."
-}
-
-pkg_postrm() {
-	python_mod_cleanup PyQt4
-}
--- a/dev-python/assets/assets-0.1.1-r1.ebuild
+++ b/dev-python/assets/assets-0.1.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/dev-python/assets/assets-0.1.1-r1.ebuild,v 1.1 2013/02/12 01:25:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/assets/assets-0.1.1-r1.ebuild,v 1.2 2013/02/13 07:53:49 maksbotan Exp $

 EAPI=5

@ -9,8 +9,8 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 inherit distutils-r1

 DESCRIPTION="Cache-friendly asset management via content-hash-naming"
-HOMEPAGE="http://jderose.fedorapeople.org/assets"
-SRC_URI="http://jderose.fedorapeople.org/${PN}/${PV}/${P}.tar.gz"
+HOMEPAGE="https://launchpad.net/web-assets"
+SRC_URI="https://launchpad.net/web-assets/trunk/${PV}/+download/${P}.tar.gz"

 LICENSE="LGPL-3"
 SLOT="0"
--- a/dev-python/assets/assets-0.1.1.ebuild
+++ b/dev-python/assets/assets-0.1.1.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/assets/assets-0.1.1.ebuild,v 1.2 2011/10/30 16:43:38 maksbotan Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-DESCRIPTION="Cache-friendly asset management via content-hash-naming"
-HOMEPAGE="http://jderose.fedorapeople.org/assets"
-SRC_URI="http://jderose.fedorapeople.org/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-DOCS="README TODO AUTHORS"
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@ -1,2 +1,3 @@
 DIST gevent-0.13.7.tar.gz 288284 SHA256 0754f141d2889fa861918eb75482b9572763bd661479bbfc73a8c250f4eab6c5 SHA512 e53d1cea049519f4696a988625ddcd42bf935af7ca2644baeaca37f315665b5950ddb119ff9143f02db6907b6b562c42dbce73e247816ca57405334da369a36a WHIRLPOOL f79db3d07e054be2b93b27736bfbdc0867af1173608192a2db59ec1478de8d2a9099394f47926b14aee4aef29f0ae31edcddfab3d52ae7db7157a07bf5eca6f5
 DIST gevent-1.0b2.tar.gz 1033734 SHA256 b77ab611d09e36fcd992809d115f82e0b41151d18ff925235569d4fb57724b59 SHA512 921be2724acd64f1516e93d42775aea039591d750682f3d59bf9a78095b042b5f9ecaff94742062f121cbacba0827820726895c8353f0d1b68d5456aeed7df80 WHIRLPOOL cb97b1d11e52151ade71dab682656feda0c4726e30fdef7ff655dac16fb72245ebed333482c094c8ff4c7a8e8eb27b2ee28ff25b1395a8d2721dc2cc47d7efae
+DIST gevent-1.0rc2.tar.gz 1390008 SHA256 620b071f5aaf8203fc86d2b49b1f9227cabc30e2cef6dfe064233e2d4ced3fda SHA512 f0a3890e19ef1e13029a6427b99b4614db9fa1c3ae05dd522c47c47e8fb6045367ec8d70e859a9721ed8f6f858b7df835fb9c298e53ca6f1eb80a0e2f771ef43 WHIRLPOOL 383f708e0082ebcc562d4c16b8b712827a0879985cb90ccc2030d586195151f7abbab8c04e0af72a8296fe8084da97442de735eea63019e89d9833158c093941
--- a/dev-python/gevent/gevent-1.0_rc2.ebuild
+++ b/dev-python/gevent/gevent-1.0_rc2.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gevent/gevent-1.0_rc2.ebuild,v 1.1 2013/02/14 06:17:26 radhermit Exp $
+
+EAPI=5
+
+# py2.5 needs http://pypi.python.org/pypi/ssl
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="ssl"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python networking library that uses greenlet to provide synchronous API"
+HOMEPAGE="http://gevent.org/ http://pypi.python.org/pypi/gevent/"
+SRC_URI="mirror://github/SiteSupport/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/libev
+	net-dns/c-ares
+	dev-python/greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	rm -rf {libev,c-ares}
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	cd greentest || die
+	"${PYTHON}" testrunner.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+
+	dodoc changelog.rst
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
--- a/dev-python/h5py/h5py-2.1.1-r1.ebuild
+++ b/dev-python/h5py/h5py-2.1.1-r1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/h5py/h5py-2.1.1-r1.ebuild,v 1.1 2013/02/13 20:44:31 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="A simple Python interface to HDF5 files"
+HOMEPAGE="http://h5py.alfven.org/ http://code.google.com/p/h5py/ http://pypi.python.org/pypi/h5py"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	sci-libs/hdf5
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( virtual/python-unittest2[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	append-cflags -fno-strict-aliasing
+}
--- a/dev-python/h5py/metadata.xml
+++ b/dev-python/h5py/metadata.xml
@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<herd>sci</herd>
-	<longdescription lang="en">HDF5 for Python (h5py) is a general-purpose simple Python interface to the
+  <herd>python</herd>
+  <herd>sci</herd>
+  <longdescription lang="en">HDF5 for Python (h5py) is a general-purpose simple Python interface to the
  Hierarchical Data Format library, version 5. Existing Python and
  Numpy concepts are used for the interface. Almost all HDF5 features
  are available from Python, including things like compound datatypes
  (as used with Numpy recarray types), HDF5 attributes, hyperslab and
  point-based I/O, and more recent features in HDF 1.8 like resizable
  datasets and recursive iteration over entire files. </longdescription>
-	<upstream>
-		<remote-id type="google-code">h5py</remote-id>
-	</upstream>
+  <upstream>
+    <remote-id type="google-code">h5py</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/dev-python/pyqwt/metadata.xml
+++ b/dev-python/pyqwt/metadata.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>qt</herd>
-<longdescription lang="en">
+  <herd>python</herd>
+  <herd>qt</herd>
+  <longdescription lang="en">
  PyQwt is a set of Python bindings for the Qwt  C++ class library which
  extends the Qt framework with widgets for scientific and engineering
  applications. It provides a widget to plot 2-dimensional data and
--- a/Show More
+++ b/Show More