diff --git a/app-admin/apg/apg-2.3.0b-r5.ebuild b/app-admin/apg/apg-2.3.0b-r5.ebuild
index 88ba067554c2..61c1fd29e95a 100644
--- a/app-admin/apg/apg-2.3.0b-r5.ebuild
+++ b/app-admin/apg/apg-2.3.0b-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.3.0b-r5.ebuild,v 1.7 2011/05/25 18:39:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apg/apg-2.3.0b-r5.ebuild,v 1.8 2012/05/27 18:09:40 mattst88 Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 hppa ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cracklib"
 
 DEPEND="cracklib? ( sys-libs/cracklib )"
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest
index 91b9a3b6abf3..37b3797c412a 100644
--- a/app-admin/hardinfo/Manifest
+++ b/app-admin/hardinfo/Manifest
@@ -1 +1,2 @@
 DIST hardinfo-0.5.1.tar.bz2 246924 RMD160 ef0c91fa8c0c032cf74a96e045e4823f7fe3b81e SHA1 983f0445aa60e02156bc5a5eaedeffb30b8e4d64 SHA256 a0df6c0d7c92a7d20710b8eb551197398a965aaae053782b89a32a160b731b7a
+DIST hardinfo-0.5.2_pre20120527.tar.xz 278524 RMD160 616cc14b45811b3fd6bcadddeaab36747f480f27 SHA1 af18c1acd4e7f6d93f37caf978d1f30acc19e842 SHA256 d01f1a59b2911f54e0aaea178c0c600f2505abafd0a46c54e80e9aa0fec2db56
diff --git a/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch b/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch
new file mode 100644
index 000000000000..76718a38ebd8
--- /dev/null
+++ b/app-admin/hardinfo/files/hardinfo-0.5.2_pre20120527-build.patch
@@ -0,0 +1,53 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat May 26 01:30:39 UTC 2012
+Subject: build system
+
+use GNUInstallDirs and respect lib suffix
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -3,6 +3,8 @@
+ 
+ set(HARDINFO_VERSION "0.5.2pre")
+ 
++include(GNUInstallDirs)
++
+ if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
+ 	set(HARDINFO_DEBUG 1)
+ endif()
+@@ -179,8 +181,8 @@
+ configure_file(hardinfo.desktop.cmake ${CMAKE_BINARY_DIR}/hardinfo.desktop @ONLY)
+ 
+ install(TARGETS hardinfo ${HARDINFO_MODULES}
+-	RUNTIME DESTINATION bin
+-	LIBRARY DESTINATION lib/hardinfo/modules
++	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/hardinfo/modules
+ 	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ )
+ install(FILES ${CMAKE_BINARY_DIR}/hardinfo.desktop
+@@ -201,4 +203,4 @@
+ 	PATTERN "*.{hlp,png}"
+ 	PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+ )
+-	
+\ No newline at end of file
++	
+--- config.h.cmake
++++ config.h.cmake
+@@ -10,7 +10,7 @@
+ #define HOSTNAME		""
+ #define ARCH_@HARDINFO_ARCH@
+ 
+-#define LIBPREFIX		"@CMAKE_INSTALL_PREFIX@/lib/hardinfo"
++#define LIBPREFIX		"@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/hardinfo"
+ #define PREFIX			"@CMAKE_INSTALL_PREFIX@/share/hardinfo"
+ 
+ #cmakedefine LIBSOUP_FOUND
+@@ -32,4 +32,4 @@
+ #define ENABLE_BINRELOC 1
+ #define HAS_LINUX_WE 1
+ 
+-#endif	/* __CONFIG_H__ */
+\ No newline at end of file
++#endif	/* __CONFIG_H__ */
diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild
new file mode 100644
index 000000000000..25550b8fe1e3
--- /dev/null
+++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hardinfo/hardinfo-0.5.2_pre20120527.ebuild,v 1.2 2012/05/27 13:43:02 hasufell Exp $
+
+EAPI=4
+
+inherit cmake-utils eutils multilib
+
+DESCRIPTION="A system information and benchmark tool for Linux systems"
+HOMEPAGE="http://hardinfo.berlios.de/"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+
+	sed \
+		-e 's/g_build_filename(prefix, "lib"/g_build_filename(prefix, "'$(get_libdir)'"/' \
+		-i hardinfo/binreloc.c || die
+}
diff --git a/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild b/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild
index a57e118f2b1e..ffdeccb098f6 100644
--- a/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild,v 1.1 2012/05/19 11:56:23 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild,v 1.2 2012/05/27 23:26:37 mattst88 Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="connman cron doc +introspection networkmanager nsplugin pm-utils +policykit entropy static-libs test udev"
 
 CDEPEND="connman? ( net-misc/connman )
diff --git a/app-crypt/seahorse/seahorse-3.2.2.ebuild b/app-crypt/seahorse/seahorse-3.2.2.ebuild
index 7b129600916a..e93aca80abb7 100644
--- a/app-crypt/seahorse/seahorse-3.2.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.2.2.ebuild,v 1.2 2012/05/03 20:36:57 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.2.2.ebuild,v 1.3 2012/05/28 00:56:02 mattst88 Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="avahi debug doc ldap test"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.10:2
diff --git a/app-emacs/tuareg-mode/Manifest b/app-emacs/tuareg-mode/Manifest
index ce411d608752..d059cb30ef08 100644
--- a/app-emacs/tuareg-mode/Manifest
+++ b/app-emacs/tuareg-mode/Manifest
@@ -1,3 +1,4 @@
 DIST tuareg-mode-1.45.6.tar.bz2 46822 RMD160 cd99520a8b6940198b2db9a2cb9abeee309f8514 SHA1 ee557fc003537a2eed8c351fcb50cf52e8926c48 SHA256 2f22834259a6b0c065a6528a519eda3d0164a9bf2de8a5f7c041d6a91777261b
 DIST tuareg-mode-2.0.1.tgz 64555 RMD160 0af590e17b330be6638fae70135695dd4412a531 SHA1 e5e2fb5c7ac1d180109d693e0bc0b32ad34f3289 SHA256 d368fdd9c4a847572adb1f21a5b205ec527209c7b6524fc1e7f2ea848d525e13
 DIST tuareg-mode-2.0.4.tgz 64855 RMD160 9ea738210316ac9dd1903d3937fc961ae8277e24 SHA1 4b8c0812771df036378a028d798b5396d6542a0a SHA256 35ec56ac5f1380e99ca4db1d5dcecaf3c8f799e17ab1349729dc6305613361ff
+DIST tuareg-mode-2.0.6.tgz 54916 RMD160 6229c3c4516f48edf1d3674ddf6d4598415288db SHA1 8cddbba69c4b73a3a9f2e352e4bc1f72b19a34b2 SHA256 ea79ac24623b82ab8047345f8504abca557a537e639d16ce1ac3e5b27f5b1189
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.0.6.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.0.6.ebuild
new file mode 100644
index 000000000000..49b0de3291fe
--- /dev/null
+++ b/app-emacs/tuareg-mode/tuareg-mode-2.0.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/tuareg-mode/tuareg-mode-2.0.6.ebuild,v 1.1 2012/05/27 15:41:00 ulm Exp $
+
+EAPI=4
+
+inherit elisp
+
+DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
+HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/882/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/tuareg-${PV}"
+ELISP_REMOVE="tuareg-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README"
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r1.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r1.ebuild
new file mode 100644
index 000000000000..ad65df3674fb
--- /dev/null
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20120520-r1.ebuild,v 1.1 2012/05/27 17:58:29 pacho Exp $
+
+EAPI="4"
+
+inherit emul-linux-x86
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 as-is gsm public-domain"
+KEYWORDS="-* ~amd64"
+IUSE="alsa pulseaudio"
+
+RDEPEND="pulseaudio? ( media-sound/pulseaudio )
+	~app-emulation/emul-linux-x86-baselibs-${PV}
+	~app-emulation/emul-linux-x86-medialibs-${PV}"
+
+QA_DT_HASH="usr/lib32/.*"
+
+src_prepare() {
+	_ALLOWED="${S}/etc/env.d"
+	use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
+	ALLOWED="(${_ALLOWED})"
+
+	emul-linux-x86_src_prepare
+
+	if use alsa; then
+		mv -f "${S}"/usr/bin/aoss{,32} || die
+	fi
+
+	# libs without the rest of pulseaudio cause problems, bug 302003
+	# See bug 416751 to understand this way to disable pulseaudio
+	if ! use pulseaudio; then
+		chmod a-r "${S}"/usr/lib32/libpulse{,-simple}.so.* || die
+	fi
+}
diff --git a/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild b/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
index 2b3d10bcabf6..746b07d53e95 100644
--- a/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
+++ b/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild,v 1.9 2012/05/25 17:29:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild,v 1.10 2012/05/27 22:11:15 josejx Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~signals/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd"
 IUSE="geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes
 	skyhook yahoo-geo"
 
diff --git a/app-office/calligra-l10n/Manifest b/app-office/calligra-l10n/Manifest
index 8df864b2920f..c3ee9f68f1cd 100644
--- a/app-office/calligra-l10n/Manifest
+++ b/app-office/calligra-l10n/Manifest
@@ -1,52 +1,26 @@
-DIST calligra-l10n-ca-2.4.0.tar.bz2 570736 RMD160 15588839f08061bfee2ab53d2da36de9e3779263 SHA1 81915385c3cfe91822e0795573f06fce696570a5 SHA256 3ae4f0a5b04e1b30c995d14f8f96fac9bc1b775e675c1523df2591b2d0a773b5
 DIST calligra-l10n-ca-2.4.1.tar.bz2 445839 RMD160 6808ee093919f2775d8fa67a7573d9a3a84a0c05 SHA1 c80dd3ab66288af837d751aea295fad6b79173fd SHA256 e91358b9c7370a252fc17aca8c04d5aae1e21949eecdf11b29ce099f7a0e15fa
-DIST calligra-l10n-ca@valencia-2.4.0.tar.bz2 373669 RMD160 f1eae3daefdc2d6f606ea492a39b8460051f7242 SHA1 fd5e2a7ac5202d6197624237af3aa29718380fd6 SHA256 2333d508b098cfeafa5f92e0ea858a0a6798361f408d8476e23f759eb0998843
 DIST calligra-l10n-ca@valencia-2.4.1.tar.bz2 272051 RMD160 8bf42feb86db2f2f66ac382c877bc20ad52987e2 SHA1 6da2ec3b13c5c76ec3779029298eed4c1d5dbc04 SHA256 47ffb1182e24f103d5ea2d458c247abe7e717e6d3030a2ec659766ef4338d55d
-DIST calligra-l10n-cs-2.4.0.tar.bz2 348422 RMD160 8cc4ee8160c44483b95b0b5ebab80567affc1f8c SHA1 33a09a399dbaa5d64c8e15935efafeca4dbef25f SHA256 47368486d0f91c6f14429fba929c55367476dbbd8878a4bd663cad4743302836
 DIST calligra-l10n-cs-2.4.1.tar.bz2 348465 RMD160 c1c87dfc56156ce1e3e33c119a1394e8a44cd386 SHA1 6ad3988a7b5ad42afffbb7b3e6754a2a15593c61 SHA256 66b39dba1035791ca3f384a345917a1a75c1f3d18d05f9e1418c31f4583f7df5
-DIST calligra-l10n-da-2.4.0.tar.bz2 547503 RMD160 180b651a8141a023f9547b6cd43b27dd77e4e5e8 SHA1 896775fe6869bfcce1565af5c4bba7cb52486aed SHA256 7f3707dad31d4d916da00231149a8b28198ebdafd53a2b9cdc5d8881c1095433
 DIST calligra-l10n-da-2.4.1.tar.bz2 547245 RMD160 4f0b8b00bed56d9293d729ff66ea2792919d4569 SHA1 925a0e32c9298abecb8518afd139674365d2b5b5 SHA256 7ff2f6120bd8ac686495ef9471cd212a0ff02b5bc96fe8d2b3323a3c1d75b096
-DIST calligra-l10n-de-2.4.0.tar.bz2 708479 RMD160 ae9b20a583384fe9d66559b81410b6cba7055d98 SHA1 c02c798576c0e100cf675ae612aca62090e71e88 SHA256 97cb0cc2c21e271a82434e26ddaea5a2762c755657cf6e1e76309119bcd9bfa1
 DIST calligra-l10n-de-2.4.1.tar.bz2 717222 RMD160 3d1f191669894b90b53e02330ed0deae6db9b5a7 SHA1 28fac826898d1af82e89c1312bfc4f6b7b7134c1 SHA256 1bdbe3886f907edf1bd590baef5d38f4bf35a6d07b687c078cd5e8156c8fe773
-DIST calligra-l10n-el-2.4.0.tar.bz2 418604 RMD160 d9f1f29c72f8f77a10928c81547686651deaa198 SHA1 1a067e1a37f713e1909fd4b7870fc43d3b754c3f SHA256 20ee3e5e3ec5f469427052fc0ab15c4196c62cfe1cba99876ede3fa975e09d94
 DIST calligra-l10n-el-2.4.1.tar.bz2 418084 RMD160 bde144c28c695d4e79ecfd3d3724b5a03cb442ca SHA1 b3af9583ad89413b40757875b608c960975084ad SHA256 0d8632a70cee7c4b4772662862edca9bc031c2e9dddce834d6cfc3ef1af8c000
-DIST calligra-l10n-en_GB-2.4.0.tar.bz2 391663 RMD160 d24b10e221b560ceec88dec236fcf574220a8f78 SHA1 ddfa151543755099fb9377245ce85a9d1627a534 SHA256 932922410d573e1df184114029ceeb23582390c427146fda60017c414644b656
 DIST calligra-l10n-en_GB-2.4.1.tar.bz2 391616 RMD160 52d7318df610c5bbc1d4046e2ce8ed13ce2ec890 SHA1 a6a17ea973fdcf8c7b97cb9746c94c956e1b5f77 SHA256 c6ff94d764e2e8d25e2e82eb2238f53f010009a4372af7e6c71d73d0b68d08f9
-DIST calligra-l10n-es-2.4.0.tar.bz2 4387963 RMD160 a1a3c83c6dc4bcedab661c0a9178c5f8333a08b4 SHA1 8a5c0cbf79a9f516e832c206c120aceddc407091 SHA256 46de265b932e739c213a4bf8da41f97d17a0a2d487953d700981adea88168704
 DIST calligra-l10n-es-2.4.1.tar.bz2 4379808 RMD160 ec77d4422d6d824221a6bcd28aae121651bc7ebf SHA1 889ac2aa840615872bf55d069f7e617704872a5f SHA256 d7bf511c489a1c5295550d596a180e57528bfef24d4ee5da976b53971ee58055
-DIST calligra-l10n-et-2.4.0.tar.bz2 687791 RMD160 da6d98d00ae2e613831ef31727e29466fe9f17f7 SHA1 019d43b9d6507fd40c5bca45d66adc99a46a9ae7 SHA256 59631532e5d3db624f4c77ccf3cd341d68fdb0e7bb5df26858d6ed72d2f8f7db
 DIST calligra-l10n-et-2.4.1.tar.bz2 686462 RMD160 4ffb7ad12c2172c2a6b6e259aa89190687fbc910 SHA1 45a05296ce9bf067430b0cfb48efb64f9c093cd9 SHA256 9ae5f5a72448043ec5531abad4b62e5e7debcc79ae11649b73fede4653c500a4
-DIST calligra-l10n-fi-2.4.0.tar.bz2 395525 RMD160 966cbc0ffffc89e03e1589b187c16f6136bed690 SHA1 2e6c2820ef06fc498b579075a903699ad8721c63 SHA256 4d38cfbfb4954082efe27cd26454d86f73093983f9803c369e2173d81436d78f
 DIST calligra-l10n-fi-2.4.1.tar.bz2 404655 RMD160 357f95edec3a302338346ebd55502342d49a424b SHA1 bf6e9daed60c81e89681741cea131c6d2bde9467 SHA256 be8938bbea19794e55ba2d980084780a69fc7d3aa8a62a68af6a9257fbb865c9
-DIST calligra-l10n-fr-2.4.0.tar.bz2 5612643 RMD160 2e565893310671fa094514cef67460434d044092 SHA1 085d1fa841e93fee0daf938988c5a0f4441d0540 SHA256 5e79438727b5711ba5b6a3936a24b2a4c88aaf9f6110f1cc7c4b794b2bb127be
 DIST calligra-l10n-fr-2.4.1.tar.bz2 5612296 RMD160 39afbdcd2d59d0e98c795a0a975bc965f6398a4e SHA1 b5549206def719a2d7afd4d4332c62b33dc88913 SHA256 6c86b8e69f4bec22e27e50b23f68459715138d922d850ccbff7cd0dca09a692d
-DIST calligra-l10n-hu-2.4.0.tar.bz2 447663 RMD160 cac1b2975166cb98153395f0f595b1cb8c1d6de5 SHA1 7d0d828e46939c1138c04ea44cdf0208f6b3ab51 SHA256 177a37f2cb1e8946f5c009746b2d62f40590dd56bccecae5d9a9c53c8a88a01a
 DIST calligra-l10n-hu-2.4.1.tar.bz2 447794 RMD160 e4bf3f907496fa4f9df924523ef9a7a4d1c78e37 SHA1 f0c865d090d0ad0a1e36bc6cdb19496d2872371b SHA256 c9825c7068eff7576ec90ebd3ef2a6c658c00d0f97a7e0e18db28db0b488087b
-DIST calligra-l10n-it-2.4.0.tar.bz2 626216 RMD160 97f3abdacbec18b27b155968207891bfb96a1412 SHA1 9d2c7506bad8b700285f695a7a2f836d07d0f253 SHA256 602675c88175f3b1f2a47e5c6d1871d222a60c302e776e7375024cdfbe859975
 DIST calligra-l10n-it-2.4.1.tar.bz2 626451 RMD160 2b8790361f9791d2919535447bb80deac7ee5652 SHA1 70bed20680b80d99acddf68c91ce5772c450517d SHA256 d19e62093c887c099de85abaa867b62efeef7fe4b02eb241ce2c7f5d8cdb24cb
-DIST calligra-l10n-kk-2.4.0.tar.bz2 405417 RMD160 0f83c6eaf4916319b9f7b80df70dc3c22df9cb00 SHA1 882e7b381d12fd89803a872656f8b4afaaf40f19 SHA256 522c553c9c20abc45f2120316f4e1ac48fec50c591928e911ab31d395cb9ab4f
 DIST calligra-l10n-kk-2.4.1.tar.bz2 405347 RMD160 f3052b520d644e7da0de16e7f92eb9f5a0a01495 SHA1 08f8e5a6d977278a27367ef306d47508774ff4b2 SHA256 11c9635ea1cb1c02dbb914d713df965252da78d6eb213d266293a51eee52e31a
-DIST calligra-l10n-nb-2.4.0.tar.bz2 367160 RMD160 85e66407ad5c2e1a35384a404c8e3c7341fa1c93 SHA1 c4bf514b578038b613cf509bb566d1789e76f07e SHA256 5331d0ecc220bfbe2eb2059b3cea09721be8705d839e2c9f42e67bf7ee335f20
 DIST calligra-l10n-nb-2.4.1.tar.bz2 367089 RMD160 5842220708fd2c0f81406697f185291a50447658 SHA1 064d2b8be1d551dd62197d64ab006cbbc6b0b563 SHA256 c7ec9e41c3f0bcef23dcf38dc5d6ee6ff796f91eaf7c466a61f68a84d262cfc5
-DIST calligra-l10n-nds-2.4.0.tar.bz2 413495 RMD160 6778fa40522883999edfcd48986a87b858f7ffaa SHA1 9e3dfe58619a112d3df5066bf105da3b02503721 SHA256 edb1c067a9f1cde256523197aad1ec52adbd79fd9a3ae58921b693307ca4d1f9
 DIST calligra-l10n-nds-2.4.1.tar.bz2 413675 RMD160 ccaa5f4d5ed395e71e3407dec87b4c50daf1f1f9 SHA1 69c38219b76e24370f01c3138518708be0d2333e SHA256 a870724d97992877c32b98f56a31f0d6d504affd8668f61eb78ecf1e1c80280d
-DIST calligra-l10n-nl-2.4.0.tar.bz2 3101104 RMD160 8749eea191d7cba73dd7bd4ac86572ba786976f7 SHA1 2f0349f3d78906cce50e54e6fdf907d2c633bbc5 SHA256 b97f23ce76bc969db909db5351ac0c0e798bf0e910c4f9dafb7bd98777481384
 DIST calligra-l10n-nl-2.4.1.tar.bz2 3101210 RMD160 4381586f0bcd13230c300178cf4d1c59e371a72b SHA1 785d393e2159090e43f4d446971f5ca35fa98ead SHA256 0925debb77f789fda3cdbf3f5eecbc5a9fd7bef5a1d820bc12d190f6a3f6a751
-DIST calligra-l10n-pl-2.4.0.tar.bz2 430415 RMD160 5acb0f2957a8d632ab033a01dce0ae7e49ebdc95 SHA1 f3856e8e4ec45d97ef806e3e017443522437b7d4 SHA256 0c587e82cdd77af168de70a5d687f7e4e87d778a814ab7aca70195e5860909be
 DIST calligra-l10n-pl-2.4.1.tar.bz2 430451 RMD160 e66040cc785568b38be1b2c8a21e6735f7ccb63b SHA1 34fe40f2cca6a607755cdf4aeae67c7cf67ff5cc SHA256 4c6994bbca6741c039960a388a2ae1ae491f02430b5b4d84dfff47997b9d6fe8
-DIST calligra-l10n-pt-2.4.0.tar.bz2 661740 RMD160 462f9b1f7627ad8aaec98f60d7a59cb592195788 SHA1 97d4175e00244627544f2c7c9ff705ed4c2f4cb6 SHA256 f3e3a6b9810632424a1f8ecb3210151ea4cef1f1a056c47d3f786856ae7238d4
 DIST calligra-l10n-pt-2.4.1.tar.bz2 661702 RMD160 e7393b6c305fc01ffb58857fb8ee3c35fa33bd5e SHA1 692fe295df06b7d35baac97b51c9edaa7a47a6a2 SHA256 b86800b4775943d8e8c55874bb54f956ecdbe7932871ff12c8788a33cb61529f
-DIST calligra-l10n-pt_BR-2.4.0.tar.bz2 732893 RMD160 e99370510590a9f5f756aaada00cc158061d727e SHA1 2f95778abd0d3cc9b7e57b31078630a5e6f7d996 SHA256 048ec11b6264fb18f73ba8ce21fee767be0969a94dd7e0053689d3c74e04a398
 DIST calligra-l10n-pt_BR-2.4.1.tar.bz2 740021 RMD160 7da5bc5803c23632578cbe97272f2d75eab04688 SHA1 e036fc7d5cf6f872200fdd32b1699ef99cb436ed SHA256 9f9886a2af809e1cd19a89d806e78e241341565b78c25e874d61b2198c9c4fc5
-DIST calligra-l10n-ru-2.4.0.tar.bz2 581891 RMD160 490512a54f3b4eb0247f57128cdbb38770ff7ab7 SHA1 344279b09f6652ccf6a4d60f794787d275f5b423 SHA256 1d8fd66c6db513a5b060eff1834cb39f7c450a90886a124042e19f8b54d19721
 DIST calligra-l10n-ru-2.4.1.tar.bz2 582180 RMD160 fdc249e2ad8735dfb3c0f73585340e79123f7c31 SHA1 6ed334c95bae2bafbe197348ffec33a6368612d2 SHA256 8bcb3589cb47c39d723f3403d178ab408ebf07572f58f96d9e917293aa09fb91
-DIST calligra-l10n-sk-2.4.0.tar.bz2 367283 RMD160 dd4850a638372faddaeeee65b103ec4e450ff065 SHA1 f6e1af056e00fe0b4030d30195aa2816340615e3 SHA256 f4838375a9f00b054637a3b51521d35d70c2929de62d3ca775f0d1fb6d3abb19
 DIST calligra-l10n-sk-2.4.1.tar.bz2 367375 RMD160 7a81f6b2cc57db0c66b2754d8bb788b620e2edeb SHA1 04a24876644e9064515fbc7648dc2cb58a743de0 SHA256 c50c19c00a30e8105fcf3664ebeb8873c16dad078ed2272589040801f07db5eb
-DIST calligra-l10n-sv-2.4.0.tar.bz2 2047224 RMD160 16297c4403a308cf456ef4c378dce2f0d3a47050 SHA1 8151a48f8b1cb4c0c86754b36b90d624121a2886 SHA256 cd648e8c81ff7de17c770416735f5e3a36b54ba526d6c6a34caa16db395fc388
 DIST calligra-l10n-sv-2.4.1.tar.bz2 2047139 RMD160 5aa92135df6b6839fbcb4b2581eab03c97fe5159 SHA1 349ffc026eaa91804b38f07b485c697e70d98ae6 SHA256 90cda0ea4b307009d33ea1a69e3c31a47fc597b226d0a405d3021f025258d3ac
-DIST calligra-l10n-uk-2.4.0.tar.bz2 2126376 RMD160 548b09578d4d8fd4136e3e3a966a0a635072f27d SHA1 ebb1a885a15ad040bce4a7cc52fb1801d5410886 SHA256 8470becd0dcb97f6f81ef88a0be9aec43b8cd3bd53002a3cc0e2f61e5baf9fd9
 DIST calligra-l10n-uk-2.4.1.tar.bz2 2126067 RMD160 c13c86e901bf9aa995ff9d43862b0918373498a9 SHA1 a4e04b541dfc0645dc158e60156b42aa60b29716 SHA256 f8d0641484383cca74180862e8ea87f173d2b2a930f3a389d4676bf4f15460bd
-DIST calligra-l10n-zh_CN-2.4.0.tar.bz2 346212 RMD160 bf50948c022ce2804f7278918c37f02c4abea632 SHA1 da1d143196c02650548508381ff535b705140a98 SHA256 d0d023bf2811c0f45d40489f56d7cd774b8dcf241d7196ad0f8f120214841134
 DIST calligra-l10n-zh_CN-2.4.1.tar.bz2 346321 RMD160 6b55670d5469c284a4f8b35b0f56cb8d6dfca86d SHA1 2635cc9cad771e550a55f54da1fc3c34cc94c652 SHA256 a64c051bf3388eb6c7b863d6dbe0a40c3ae0934acd8b9bd10519fe2e4fa8f49d
-DIST calligra-l10n-zh_TW-2.4.0.tar.bz2 386218 RMD160 899d2daf02fcdecef9f6d9a86cf6163dec5ae90a SHA1 5e217abb640555e89929b7922d61abc2ba9e90b3 SHA256 b637b490c1d917f5d325806d92000def98d434c5d902b51babfc09fe4af17026
 DIST calligra-l10n-zh_TW-2.4.1.tar.bz2 386393 RMD160 839342417ff79bcda503ed048e2e956fa1dab929 SHA1 c4386d1fc6a35be3b41d4e49b37cec7a2c27c8e4 SHA256 f5763e13aac69659f1379a2e51f565791ee07d32a2df30c724415e4be0704ecd
diff --git a/app-office/calligra-l10n/calligra-l10n-2.4.0.ebuild b/app-office/calligra-l10n/calligra-l10n-2.4.0.ebuild
deleted file mode 100644
index af86229120d5..000000000000
--- a/app-office/calligra-l10n/calligra-l10n-2.4.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.4.0.ebuild,v 1.1 2012/04/06 19:02:48 dilfridge Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="Calligra localization package"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-DEPEND="sys-devel/gettext"
-RDEPEND=""
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-MY_LANGS="ca ca@valencia cs da de el en_GB es et fi fr hu it kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
-URI_BASE="mirror://kde/stable/${PN/-l10n/}-${PV}/${PN}/"
-SRC_URI=""
-SLOT="4"
-
-for MY_LANG in ${MY_LANGS} ; do
-	IUSE="${IUSE} linguas_${MY_LANG}"
-	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${PN}-${MY_LANG}-${PV}.tar.bz2 )"
-done
-unset MY_LANG
-
-S="${WORKDIR}"
-
-src_unpack() {
-	local lng dir
-	if [[ -z ${A} ]]; then
-		elog
-		elog "You either have the LINGUAS variable unset, or it only"
-		elog "contains languages not supported by ${P}."
-		elog "You won't have any additional language support."
-		elog
-		elog "${P} supports these language codes:"
-		elog "${MY_LANGS}"
-		elog
-	fi
-
-	[[ -n ${A} ]] && unpack ${A}
-	cd "${S}"
-
-	# add all linguas to cmake
-	if [[ -n ${A} ]]; then
-		for lng in ${MY_LANGS}; do
-			dir="${PN}-${lng}-${PV}"
-			if [[ -d "${dir}" ]] ; then
-				echo "add_subdirectory( ${dir} )" >> "${S}"/CMakeLists.txt
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_MESSAGES=ON -DBUILD_DATA=ON
-		$(cmake-utils_use_build doc)
-	)
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_configure
-}
-
-src_compile() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_compile
-}
-
-src_test() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_test
-}
-
-src_install() {
-	[[ -e "${S}"/CMakeLists.txt ]] && kde4-base_src_install
-}
diff --git a/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild b/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild
index f05000ac71a2..369dd595b530 100644
--- a/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild
+++ b/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild,v 1.1 2012/04/26 22:36:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.4.1.ebuild,v 1.2 2012/05/27 16:48:20 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 DEPEND="sys-devel/gettext"
 RDEPEND=""
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 MY_LANGS="ca ca@valencia cs da de el en_GB es et fi fr hu it kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 77a8a162cb13..9e70698dd4c8 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1,3 @@
-DIST calligra-2.4.0.tar.bz2 123325347 RMD160 840efd6c7ff82b246950de591b9af762d37f9a95 SHA1 6026f4ddcf4bf647ea13dfb477233df472a5c007 SHA256 7c8cd1ec8cd2b26d5544f3b5a283052c5cd82f212749475b91cc340f7e4029b0
 DIST calligra-2.4.1.tar.bz2 119301573 RMD160 5cb241ab46c6e064a05e39436da81f2a2a8df71f SHA1 f5be221d50088ac4537931811272392846cd7363 SHA256 59a5421484ec71bfc3db6351d44a88b22dd164a5ff8cd225b67ac2eb835774a3
+DIST calligra-2.4.2.tar.bz2 119318136 RMD160 e884a4e68ea65d24166f3992488413283894c3d8 SHA1 d44a6b321b0b90122b86e074785546f4a2b0d066 SHA256 0f6b87a013601008f1198791bf743143c60b3aba26e2729c085aa98372459193
+DIST calligra-2.4.90.tar.bz2 119019409 RMD160 9ebfe42df70b6a0800300a039816aeed28592f5b SHA1 b9032d10cc0a2acf68c4629e592d72ed949ad7c0 SHA256 9160c6911be849ca5da36eb3c8a09b210e083e1ca05a842a0fb1978c05adebce
diff --git a/app-office/calligra/calligra-2.4.1.ebuild b/app-office/calligra/calligra-2.4.1.ebuild
index dfb0a802f974..d5dbba68c6ef 100644
--- a/app-office/calligra/calligra-2.4.1.ebuild
+++ b/app-office/calligra/calligra-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.1.ebuild,v 1.2 2012/05/02 21:59:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.1.ebuild,v 1.5 2012/05/27 22:44:56 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.calligra.org/"
 
 LICENSE="GPL-2"
 SLOT="4"
-[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
+[[ ${PV} == *9999 ]] || KEYWORDS="amd64 x86"
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
@@ -83,7 +83,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
 	lcms? ( media-libs/lcms:2 )
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
diff --git a/app-office/calligra/calligra-2.4.0-r1.ebuild b/app-office/calligra/calligra-2.4.2.ebuild
similarity index 97%
rename from app-office/calligra/calligra-2.4.0-r1.ebuild
rename to app-office/calligra/calligra-2.4.2.ebuild
index 3a29866a14dc..243573b8e186 100644
--- a/app-office/calligra/calligra-2.4.0-r1.ebuild
+++ b/app-office/calligra/calligra-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.0-r1.ebuild,v 1.5 2012/05/02 21:59:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.2.ebuild,v 1.2 2012/05/27 22:44:56 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -83,7 +83,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
 	lcms? ( media-libs/lcms:2 )
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
@@ -117,8 +117,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-2.4.0-rdf.patch" )
-
 RESTRICT=test
 # bug 394273
 
diff --git a/app-office/calligra/calligra-2.4.9999.ebuild b/app-office/calligra/calligra-2.4.49.9999.ebuild
similarity index 97%
rename from app-office/calligra/calligra-2.4.9999.ebuild
rename to app-office/calligra/calligra-2.4.49.9999.ebuild
index 6753f66aeec8..3b580f7cbcee 100644
--- a/app-office/calligra/calligra-2.4.9999.ebuild
+++ b/app-office/calligra/calligra-2.4.49.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.9999.ebuild,v 1.8 2012/05/02 21:59:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.49.9999.ebuild,v 1.2 2012/05/27 22:44:56 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -83,7 +83,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
 	lcms? ( media-libs/lcms:2 )
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
@@ -117,8 +117,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-2.4.0-rdf.patch" )
-
 RESTRICT=test
 # bug 394273
 
diff --git a/app-office/calligra/calligra-2.4.90.ebuild b/app-office/calligra/calligra-2.4.90.ebuild
new file mode 100644
index 000000000000..611e5cf1d427
--- /dev/null
+++ b/app-office/calligra/calligra-2.4.90.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.90.ebuild,v 1.3 2012/05/28 00:12:22 mr_bones_ Exp $
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=4
+
+KDE_SCM=git
+KDE_MINIMAL=4.6.4
+QT_MINIMAL=4.8.1
+OPENGL_REQUIRED=optional
+
+KDE_HANDBOOK=optional
+
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit kde4-base
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra.org/"
+
+case ${PV} in
+	2.[456789].[789]?)
+		# beta or rc releases
+		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2" ;;
+	2.[456789].?)
+		# stable releases
+		SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2" ;;
+	2.[456789].9999)
+		# stable branch live ebuild
+		SRC_URI="" ;;
+	9999)
+		# master branch live ebuild
+		SRC_URI="" ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="4"
+
+[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
+
+IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
++pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
+word-perfect xbase +xml +xslt"
+
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="kexi words flow plan stage sheets krita karbon braindump"
+for cal_ft in ${CAL_FTS}; do
+	IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+	calligra_features_kexi? ( calligra_features_sheets )
+	calligra_features_words? ( calligra_features_sheets )
+	calligra_features_krita? ( eigen exif lcms )
+	calligra_features_plan? ( kdepim semantic-desktop )
+	calligra_features_sheets? ( eigen )
+	test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+	!app-office/karbon
+	!app-office/kexi
+	!app-office/koffice-data
+	!app-office/koffice-l10n
+	!app-office/koffice-libs
+	!app-office/koffice-meta
+	!app-office/kplato
+	!app-office/kpresenter
+	!app-office/krita
+	!app-office/kspread
+	!app-office/kword
+	dev-lang/perl
+	dev-libs/boost
+	dev-libs/libxml2
+	$(add_kdebase_dep knewstuff)
+	media-libs/libpng
+	sys-libs/zlib
+	>=x11-libs/qt-gui-4.8.1-r1
+	attica? ( dev-libs/libattica )
+	crypt? ( app-crypt/qca:2 )
+	eigen? ( dev-cpp/eigen:2 )
+	exif? ( media-gfx/exiv2 )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	gif? ( media-libs/giflib )
+	glew? ( media-libs/glew )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl )
+	iconv? ( virtual/libiconv )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
+	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
+	lcms? ( media-libs/lcms:2 )
+	marble? ( $(add_kdebase_dep marble) )
+	mysql? ( virtual/mysql )
+	okular? ( $(add_kdebase_dep okular) )
+	openctl? ( >=media-libs/opengtl-0.9.15 )
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler
+		media-gfx/pstoedit
+	)
+	postgres? (
+		dev-db/postgresql-base
+		dev-libs/libpqxx
+	)
+	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
+	ssl? ( dev-libs/openssl )
+	sybase? ( dev-db/freetds )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+	word-perfect? (
+		app-text/libwpd
+		app-text/libwps
+		app-text/libwpg
+	)
+	xbase? ( dev-db/xbase )
+	xslt? ( dev-libs/libxslt )
+	calligra_features_kexi? (
+		>=dev-db/sqlite-3.7.9:3[extensions]
+		dev-libs/icu
+	)
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT=test
+# bug 394273
+
+src_configure() {
+	local cal_ft
+
+	# first write out things we want to hard-enable
+	local mycmakeargs=(
+		"-DIHAVEPATCHEDQT=ON"
+		"-DWITH_Boost=ON"
+		"-DWITH_LibXml2=ON"
+		"-DWITH_PNG=ON"
+		"-DWITH_ZLIB=ON"
+		"-DGHNS=ON"
+		"-DWITH_X11=ON"
+		"-DWITH_Qt4=ON"
+		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
+		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
+		"-DWITH_LCMS=OFF"            # we use lcms:2
+		"-DCREATIVEONLY=OFF"
+		"-DWITH_TINY=OFF"
+		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fontconfig Fontconfig)
+		$(cmake-utils_use_with freetds FreeTDS)
+		$(cmake-utils_use_with gif GIF2)
+		$(cmake-utils_use_with glew GLEW)
+		$(cmake-utils_use_with glib GLIB2)
+		$(cmake-utils_use_with glib GObject)
+		$(cmake-utils_use_with gsf LIBGSF)
+		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with iconv Iconv)
+		$(cmake-utils_use_with jpeg JPEG)
+		$(cmake-utils_use_with jpeg2k OpenJPEG)
+		$(cmake-utils_use_with kdcraw Kdcraw)
+		$(cmake-utils_use_with kdepim KdepimLibs)
+		$(cmake-utils_use_with lcms LCMS2)
+		$(cmake-utils_use_with marble Marble)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with openctl OpenCTL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with postgres PostgreSQL)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use semantic-desktop NEPOMUK)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with sybase FreeTDS)
+		$(cmake-utils_use_with tiff TIFF)
+		$(cmake-utils_use_with threads Threads)
+		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with word-perfect WPD)
+		$(cmake-utils_use_with word-perfect WPG)
+		$(cmake-utils_use_with xbase XBase)
+		$(cmake-utils_use_with xslt LibXslt)
+		$(cmake-utils_use_build mso libmsooxml)
+	)
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+	done
+	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
+
+	# filters
+
+	kde4-base_src_configure
+}
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 5b3aefa73230..d2dc3fc44445 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.18 2012/05/02 21:59:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.21 2012/05/28 00:12:22 mr_bones_ Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -20,11 +20,27 @@ inherit kde4-base
 
 DESCRIPTION="KDE Office Suite"
 HOMEPAGE="http://www.calligra.org/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2"
+
+case ${PV} in
+	2.[456789].[789]?)
+		# beta or rc releases
+		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2" ;;
+	2.[456789].?)
+		# stable releases
+		SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2" ;;
+	2.[456789].9999)
+		# stable branch live ebuild
+		SRC_URI="" ;;
+	9999)
+		# master branch live ebuild
+		SRC_URI="" ;;
+esac
 
 LICENSE="GPL-2"
 SLOT="4"
+
 [[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
+
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
 +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
@@ -81,7 +97,7 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
 	lcms? ( media-libs/lcms:2 )
 	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
@@ -136,8 +152,9 @@ src_configure() {
 
 	# default disablers
 	mycmakeargs+=(
-		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
-		"-DWITH_LCMS=OFF" # we use lcms:2
+		"-DBUILD_mobile=OFF"         # we dont support mobile gui, maybe arm could
+		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
+		"-DWITH_LCMS=OFF"            # we use lcms:2
 		"-DCREATIVEONLY=OFF"
 		"-DWITH_TINY=OFF"
 		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
diff --git a/app-office/calligra/files/calligra-2.4.0-rdf.patch b/app-office/calligra/files/calligra-2.4.0-rdf.patch
deleted file mode 100644
index eb5566007902..000000000000
--- a/app-office/calligra/files/calligra-2.4.0-rdf.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From c34af29f458a35b6cf0fbec8574425516be62859 Mon Sep 17 00:00:00 2001
-From: Boudewijn Rempt <boud@valdyas.org>
-Date: Sun, 8 Apr 2012 12:21:50 +0200
-Subject: [PATCH] Hide rdf in more places
-
-We shouldn't use KoDocumentRdf unless hedged with SHOULD_BUILD_RDF
-
-Ok to backport?
----
- libs/main/KoDocument.cpp           |    2 +-
- libs/main/KoDocument.h             |    2 +-
- libs/main/KoDocumentInfoDlg.cpp    |    8 +++++---
- libs/main/KoDocumentInfoDlg.h      |    4 ++--
- words/part/KWOdfLoader.cpp         |    3 ++-
- words/part/KWView.cpp              |    6 +++---
- words/part/dockers/KWRdfDocker.cpp |    6 +++---
- 7 files changed, 17 insertions(+), 14 deletions(-)
-
-diff --git a/libs/main/KoDocument.cpp b/libs/main/KoDocument.cpp
-index 2fedde7..775c2c6 100644
---- a/libs/main/KoDocument.cpp
-+++ b/libs/main/KoDocument.cpp
-@@ -812,7 +812,7 @@ KoDocumentInfo *KoDocument::documentInfo() const
-     return d->docInfo;
- }
- 
--KoDocumentRdf *KoDocument::documentRdf() const
-+KoDocumentRdfBase *KoDocument::documentRdf() const
- {
- #ifdef SHOULD_BUILD_RDF
-     if (d->docRdf && d->docRdf->model()) {
-diff --git a/libs/main/KoDocument.h b/libs/main/KoDocument.h
-index d69e15c..7cc8cd5 100644
---- a/libs/main/KoDocument.h
-+++ b/libs/main/KoDocument.h
-@@ -595,7 +595,7 @@ public:
-      * the RDF system and needs full access to the KoDocumentRdf object.
-      * @see KoDocumentRdf
-      */
--    KoDocumentRdf *documentRdf() const;
-+    KoDocumentRdfBase *documentRdf() const;
- 
-     /**
-      * Replace the current rdf document with the given rdf document. The existing RDF document
-diff --git a/libs/main/KoDocumentInfoDlg.cpp b/libs/main/KoDocumentInfoDlg.cpp
-index 23ae08e..1781e34 100644
---- a/libs/main/KoDocumentInfoDlg.cpp
-+++ b/libs/main/KoDocumentInfoDlg.cpp
-@@ -26,8 +26,10 @@
- #include "KoDocumentInfo.h"
- #include "KoDocument.h"
- #include "KoMainWindow.h"
-+
- #include "rdf/KoDocumentRdfEditWidgetBase.h"
- #ifdef SHOULD_BUILD_RDF
-+#include "rdf/KoDocumentRdf.h"
- #include "rdf/KoDocumentRdfEditWidget.h"
- #endif
- 
-@@ -68,7 +70,7 @@ public:
-     QList<KPageWidgetItem*> m_pages;
-     Ui::KoDocumentInfoAboutWidget* m_aboutUi;
-     Ui::KoDocumentInfoAuthorWidget* m_authorUi;
--    KoDocumentRdf* m_rdf;
-+    KoDocumentRdfBase* m_rdf;
- #ifdef SHOULD_BUILD_RDF
-     KoDocumentRdfEditWidget* m_rdfEditWidget;
- #else
-@@ -80,7 +82,7 @@ public:
- };
- 
- 
--KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo, KoDocumentRdf* docRdf)
-+KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo, KoDocumentRdfBase* docRdf)
-         : KPageDialog(parent)
-         , d(new KoDocumentInfoDlgPrivate)
- {
-@@ -136,7 +138,7 @@ KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo, K
-         d->m_rdfEditWidget = 0;
- 
- #ifdef SHOULD_BUILD_RDF
--        d->m_rdfEditWidget = new KoDocumentRdfEditWidget(this, d->m_rdf);
-+        d->m_rdfEditWidget = new KoDocumentRdfEditWidget(this, (KoDocumentRdf*)d->m_rdf);
-         page = new KPageWidgetItem(d->m_rdfEditWidget->widget(), i18n("Rdf"));
-         page->setHeader(i18n("Rdf"));
-         page->setIcon(KIcon("text-rdf"));
-diff --git a/libs/main/KoDocumentInfoDlg.h b/libs/main/KoDocumentInfoDlg.h
-index 9d3e6eb..733f126 100644
---- a/libs/main/KoDocumentInfoDlg.h
-+++ b/libs/main/KoDocumentInfoDlg.h
-@@ -24,7 +24,7 @@
- #include <kpagedialog.h>
- 
- class KoDocumentInfo;
--class KoDocumentRdf;
-+class KoDocumentRdfBase;
- class KPageWidgetItem;
- 
- /**
-@@ -55,7 +55,7 @@ public:
-      * @param parent a pointer to the parent widget
-      * @param docInfo a pointer to the shown KoDocumentInfo
-      */
--    KoDocumentInfoDlg(QWidget *parent, KoDocumentInfo* docInfo, KoDocumentRdf* docRdf = 0);
-+    KoDocumentInfoDlg(QWidget *parent, KoDocumentInfo* docInfo, KoDocumentRdfBase* docRdf = 0);
- 
-     /** The destructor */
-     virtual ~KoDocumentInfoDlg();
-diff --git a/words/part/KWOdfLoader.cpp b/words/part/KWOdfLoader.cpp
-index 9900102..238c7fe 100644
---- a/words/part/KWOdfLoader.cpp
-+++ b/words/part/KWOdfLoader.cpp
-@@ -46,8 +46,9 @@
- #include <KoProgressUpdater.h>
- #include <KoVariableManager.h>
- #include <KoInlineTextObjectManager.h>
-+#ifdef SHOULD_BUILD_RDF
- #include <KoDocumentRdf.h>
--
-+#endif
- // KDE + Qt includes
- #include <QTextCursor>
- #include <KDebug>
-diff --git a/words/part/KWView.cpp b/words/part/KWView.cpp
-index 0ac5285..53f7da5 100644
---- a/words/part/KWView.cpp
-+++ b/words/part/KWView.cpp
-@@ -163,7 +163,7 @@ KWView::KWView(const QString &viewMode, KWDocument *document, QWidget *parent)
-     connect(m_zoomController, SIGNAL(zoomChanged(KoZoomMode::Mode, qreal)), this, SLOT(zoomChanged(KoZoomMode::Mode, qreal)));
- 
- #ifdef SHOULD_BUILD_RDF
--    if (KoDocumentRdf *rdf = m_document->documentRdf()) {
-+    if (KoDocumentRdf *rdf = dynamic_cast<KoDocumentRdf*>(m_document->documentRdf())) {
-         connect(rdf, SIGNAL(semanticObjectViewSiteUpdated(KoRdfSemanticItem*, const QString&)),
-                 this, SLOT(semanticObjectViewSiteUpdated(KoRdfSemanticItem*, const QString&)));
-     }
-@@ -303,7 +303,7 @@ void KWView::setupActions()
-     action->setWhatsThis(i18n("Stylesheets are used to format contact, event, and location information which is stored in Rdf"));
-     connect(action, SIGNAL(triggered()), this, SLOT(editSemanticStylesheets()));
- 
--    if (KoDocumentRdf* rdf = m_document->documentRdf()) {
-+    if (KoDocumentRdf* rdf = dynamic_cast<KoDocumentRdf*>(m_document->documentRdf())) {
-         KAction* createRef = rdf->createInsertSemanticObjectReferenceAction(canvasBase());
-         actionCollection()->addAction("insert_semanticobject_ref", createRef);
-         KActionMenu *subMenu = new KActionMenu(i18n("Create"), this);
-@@ -708,7 +708,7 @@ void KWView::pageSettingsDialogFinished()
- void KWView::editSemanticStylesheets()
- {
- #ifdef SHOULD_BUILD_RDF
--    if (KoDocumentRdf *rdf = m_document->documentRdf()) {
-+    if (KoDocumentRdf *rdf = dynamic_cast<KoDocumentRdf*>(m_document->documentRdf())) {
-         KoSemanticStylesheetsEditor *dia = new KoSemanticStylesheetsEditor(this, rdf);
-         dia->show();
-         // TODO this leaks memory
-diff --git a/words/part/dockers/KWRdfDocker.cpp b/words/part/dockers/KWRdfDocker.cpp
-index 0fbf85b..969977b 100644
---- a/words/part/dockers/KWRdfDocker.cpp
-+++ b/words/part/dockers/KWRdfDocker.cpp
-@@ -93,8 +93,8 @@ void KWRdfDocker::setCanvas(KoCanvasBase *canvas)
-         }
-         
-         m_document = newDoc;
--        widgetDocker.semanticView->setDocumentRdf(m_document->documentRdf());
--        connect(m_document->documentRdf(), SIGNAL(semanticObjectAdded(KoRdfSemanticItem*)),
-+        widgetDocker.semanticView->setDocumentRdf(static_cast<KoDocumentRdf*>(m_document->documentRdf()));
-+        connect(static_cast<KoDocumentRdf*>(m_document->documentRdf()), SIGNAL(semanticObjectAdded(KoRdfSemanticItem*)),
-                 this, SLOT(semanticObjectAdded(KoRdfSemanticItem*)));
-         connect(m_document->documentRdf(), SIGNAL(semanticObjectUpdated(KoRdfSemanticItem*)),
-                 this, SLOT(semanticObjectUpdated(KoRdfSemanticItem*)));
-@@ -168,7 +168,7 @@ void KWRdfDocker::updateData()
- 
-     // TODO try to get rid of 'editor' here by remembering the position in the resourceChanged()
-     KoTextEditor *editor = KoTextEditor::getTextEditorFromCanvas(m_canvas);
--    KoDocumentRdf *rdf = m_document->documentRdf();
-+    KoDocumentRdf *rdf = dynamic_cast<KoDocumentRdf*>(m_document->documentRdf());
-     if (editor && rdf)
-     {
-         //kDebug(30015) << "m_lastCursorPosition:" << m_lastCursorPosition;
--- 
-1.7.9.2
-
diff --git a/app-office/libreoffice/files/generate_libreoffice_package.sh b/app-office/libreoffice/files/generate_libreoffice_package.sh
index 97aa1d0c2d59..760905ddae35 100644
--- a/app-office/libreoffice/files/generate_libreoffice_package.sh
+++ b/app-office/libreoffice/files/generate_libreoffice_package.sh
@@ -1,14 +1,21 @@
 #!/bin/bash
 
+# important: you need to use the most general CFLAGS to build the packages
+# recommendation: 
+#  * for x86  : CFLAGS="-march=i586 -mtune=generic -O2 -pipe -g"
+#  * for amd64: CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -g"
+
 die() {
 	echo "${1}"
 	exit 1
 }
 
-VERSION="3.4.5.2"
+VERSION="3.5.2.2"
+
+BINRELEASE="-r1"
 
 # first the default subset of useflags
-IUSES_BASE="bash-completion binfilter branding dbus graphite gstreamer gtk python templates webdav odk"
+IUSES_BASE="bash-completion binfilter branding cups dbus graphite gstreamer gtk nsplugin python vba webdav xmlsec -aqua -jemalloc -mysql -nlpsolver -odk -opengl -pdfimport -postgres -svg"
 
 # now for the options
 IUSES_J="java"
@@ -25,38 +32,67 @@ echo "Base"
 echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_NG} ${IUSES_NK}" > /etc/portage/package.use/libreo
 emerge -v =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-${VERSION}.tbz2  || die "Copying package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
 
 echo "Base - java"
 echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_NG} ${IUSES_NK}" > /etc/portage/package.use/libreo
 emerge -v =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-java-${VERSION}.tbz2  || die "Copying package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-java-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
 
 # kde flavor
 echo "KDE"
 echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_NG} ${IUSES_K}" > /etc/portage/package.use/libreo
 emerge -v =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-${VERSION}.tbz2  || die "Copying package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
 
 echo "KDE - java"
 echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_NG} ${IUSES_K}" > /etc/portage/package.use/libreo
 emerge -v =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-java-${VERSION}.tbz2  || die "Copying package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-java-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
 
 # gnome flavor
 echo "Gnome"
 echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_G} ${IUSES_NK}" > /etc/portage/package.use/libreo
 emerge -v =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-${VERSION}.tbz2  || die "Copying package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
 
 echo "Gnome -java"
 echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_G} ${IUSES_NK}" > /etc/portage/package.use/libreo
 emerge -v =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-java-${VERSION}.tbz2  || die "Copying package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-java-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
+
+
+for name in ./libreoffice-*-${VERSION}${BINRELEASE}.tbz2 ; do 
+
+  BN=`basename $name .tbz2`
+
+  rm -rf tmp.lo
+  mkdir -vp tmp.lo/p1 tmp.lo/p2
+  cd tmp.lo/p1
+
+  echo "Unpacking complete archive $BN.tbz2"
+  tar xfvjp ../../$BN.tbz2
+
+  echo "Moving debug info"
+  mkdir -vp ../p2/usr/lib
+  mv -v usr/lib/debug ../p2/usr/lib/
+
+  echo "Re-packing program"
+  tar cfvJ ../../bin-$BN.tar.xz --owner root --group root ./*
+
+  echo "Re-packing debug info"
+  cd ../p2
+  tar cfvJ ../../debug-$BN.tar.xz --owner root --group root ./*
+
+  echo "Removing unpacked files"
+  cd ../..
+  rm -rf tmp.lo
 
+  echo "Done with $BN.tbz2"
 
+done
diff --git a/app-office/openerp-server/Manifest b/app-office/openerp-server/Manifest
index 2d1ee2921e5b..8d98537d18d1 100644
--- a/app-office/openerp-server/Manifest
+++ b/app-office/openerp-server/Manifest
@@ -1,2 +1,3 @@
 DIST openerp-server-5.0.15.tar.gz 10529558 RMD160 11679778890aefb05182a41981750ea5d011d83b SHA1 45ecc01e826f8c10b7de97d155492a4dcff8026a SHA256 021dd27f352e1c92c0912d8b50f05cfcee39052551a2c6d90ee1677f4e361504
+DIST openerp-server-5.0.16.tar.gz 10515061 RMD160 2d4cfe890e9ac2b1c0683e34cfbf2f1f7747140b SHA1 f3643ba457ee0b0a23f544ac8514e45c5dc9a307 SHA256 431ed9f709204e43a48a9ba4468884ec935deacd1558562b1dd6f373d121c57b
 DIST openerp-server-5.0.6.tar.gz 8733610 RMD160 1feffe5db442d503744fcf2e8c7eacf8b9fe670e SHA1 8f9a180d560c3d0f612663f09348923a22644c0d SHA256 5812b3199e2ecc473a265af0fc33626079351f3d119281e84df4edba5b5a0df4
diff --git a/app-office/openerp-server/files/openerp-server b/app-office/openerp-server/files/openerp-server
index 724192b62649..d02c66c45199 100755
--- a/app-office/openerp-server/files/openerp-server
+++ b/app-office/openerp-server/files/openerp-server
@@ -10,7 +10,7 @@ depend() {
 start() {
 	ebegin "Starting openerp-server"
 	PYTHONDIR=$(python -c 'from distutils.sysconfig import get_config_var; print(get_config_var("LIBP"))')
-	start-stop-daemon --start --quiet --pidfile "${PIDFILE}" --exec /usr/bin/python2.6 --startas /usr/bin/python \
+	start-stop-daemon --start --quiet --pidfile "${PIDFILE}" --exec /usr/bin/python --startas /usr/bin/python \
 		--chuid "${USER}" --chdir "${PYTHONDIR}/site-packages/openerp-server/" --background -- "openerp-server.py" ${DAEMON_OPTS}
 	eend $?
 }
diff --git a/app-office/openerp-server/openerp-server-5.0.16.ebuild b/app-office/openerp-server/openerp-server-5.0.16.ebuild
new file mode 100644
index 000000000000..815a2191465a
--- /dev/null
+++ b/app-office/openerp-server/openerp-server-5.0.16.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openerp-server/openerp-server-5.0.16.ebuild,v 1.1 2012/05/27 09:36:59 elvanor Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils distutils
+
+DESCRIPTION="Open Source ERP & CRM"
+HOMEPAGE="http://www.openerp.com/"
+SRC_URI="http://www.openerp.com/download/stable/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-db/postgresql-server
+	dev-python/egenix-mx-base
+	dev-python/lxml
+	dev-python/psycopg
+	dev-python/pychart
+	dev-python/pytz
+	dev-python/pyxml
+	dev-python/pyopenssl
+	dev-python/reportlab
+	media-gfx/pydot
+	dev-libs/libxslt[python]
+	dev-libs/libxml2[python]"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+OPENERP_USER="openerp"
+OPENERP_GROUP="openerp"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_install() {
+	distutils_src_install
+
+	doinitd "${FILESDIR}/${PN}"
+	newconfd "${FILESDIR}/openerp-server-confd" "${PN}"
+	keepdir /var/run/openerp
+	keepdir /var/log/openerp
+
+	rm "${D}/usr/bin/openerp-server"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openerp-server.logrotate openerp-server || die
+	dodir /etc/openerp
+	insinto /etc/openerp
+	newins "${FILESDIR}"/openerp-server.cfg openerp-server.cfg || die
+}
+
+pkg_preinst() {
+	enewgroup ${OPENERP_GROUP}
+	enewuser ${OPENERP_USER} -1 -1 -1 ${OPENERP_GROUP}
+
+	fowners ${OPENERP_USER}:${OPENERP_GROUP} /var/run/openerp
+	fowners ${OPENERP_USER}:${OPENERP_GROUP} /var/log/openerp
+}
+
+pkg_postinst() {
+	elog "In order to setup the initial database, run:"
+	elog " emerge --config =${CATEGORY}/${PF}"
+	elog "Be sure the database is started before"
+}
+
+pquery() {
+	psql -q -At -U postgres -d template1 -c "$@"
+}
+
+pkg_config() {
+	einfo "In the following, the 'postgres' user will be used."
+	if ! pquery "SELECT usename FROM pg_user WHERE usename = '${OPENERP_USER}'" | grep -q ${OPENERP_USER}; then
+		ebegin "Creating database user ${OPENERP_USER}"
+		createuser --username=postgres --createdb --no-adduser ${OPENERP_USER}
+		eend $? || die "Failed to create database user"
+	fi
+}
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index 5c44209ef494..0292b131bc03 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,2 +1 @@
-DIST tree-1.5.3.tgz 34494 RMD160 72ca2be3ea05bd18819973ad0dfc60a3b9247d90 SHA1 329e05e500754109ff1f648c14924d8cac42c6ea SHA256 1128755ea9455615188212bb04319cf103114fb78f687aa887ce29ef184ffb8d
 DIST tree-1.6.0.tgz 42706 RMD160 d0e89f49fa902c7a72056d1a4ef826ddfee6be15 SHA1 350f851f68859a011668362dd0e7ee81fd1b713a SHA256 4dc470a74880338b01da41701d8db90d0fb178877e526d385931a007d68d7591
diff --git a/app-text/tree/files/tree.bashcomp b/app-text/tree/files/tree.bashcomp
index b5da3ee5c6bb..5c81b10158ec 100644
--- a/app-text/tree/files/tree.bashcomp
+++ b/app-text/tree/files/tree.bashcomp
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tree/files/tree.bashcomp,v 1.1 2005/08/30 14:15:49 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tree/files/tree.bashcomp,v 1.2 2012/05/27 23:17:52 mr_bones_ Exp $
 
 # bash command-line completion for tree
 # Author: Aaron Walker <ka0ttic@gentoo.org>
@@ -15,7 +15,7 @@ _tree() {
     --dirsfirst --charset --help"
 
     if [[ ${cur} == -* ]] ; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+        COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
         return 0
     fi
 
@@ -23,10 +23,10 @@ _tree() {
         -L|-P|-I|-H|-T|--charset|--help)
             ;;
         -o)
-            COMPREPLY=( $(compgen -f -- ${cur}) )
+	    _filedir
             ;;
         *)
-            COMPREPLY=( $(compgen -d -- ${cur}) )
+	    _filedir -d
             ;;
     esac
 }
diff --git a/app-text/tree/tree-1.5.3.ebuild b/app-text/tree/tree-1.5.3.ebuild
deleted file mode 100644
index c682f9cddd95..000000000000
--- a/app-text/tree/tree-1.5.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.5.3.ebuild,v 1.10 2011/07/21 16:32:32 mr_bones_ Exp $
-
-EAPI=2
-inherit toolchain-funcs flag-o-matic bash-completion
-
-DESCRIPTION="Lists directories recursively, and produces an indented listing of files."
-HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
-SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-src_prepare() {
-	sed -i \
-		-e 's:LINUX:__linux__:' tree.c \
-		|| die "sed failed"
-}
-
-src_compile() {
-	append-lfs-flags
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		XOBJS="$(use elibc_uclibc && echo strverscmp.o)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dobin tree || die "dobin failed"
-	doman man/tree.1 || die
-	dodoc CHANGES README* || die
-	dobashcompletion "${FILESDIR}"/${PN}.bashcomp
-}
diff --git a/app-text/tree/tree-1.6.0-r1.ebuild b/app-text/tree/tree-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..2b9a17aab493
--- /dev/null
+++ b/app-text/tree/tree-1.6.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild,v 1.1 2012/05/27 23:17:52 mr_bones_ Exp $
+
+EAPI=4
+inherit toolchain-funcs flag-o-matic bash-completion-r1
+
+DESCRIPTION="Lists directories recursively, and produces an indented listing of files."
+HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
+SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
+~sparc ~x86"
+IUSE=""
+
+src_prepare() {
+	sed -i \
+		-e 's:LINUX:__linux__:' tree.c \
+		|| die "sed failed"
+	mv doc/tree.1.fr doc/tree.fr.1
+}
+
+src_compile() {
+	append-lfs-flags
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		XOBJS="$(use elibc_uclibc && echo strverscmp.o)"
+}
+
+src_install() {
+	dobin tree
+	doman doc/tree*.1
+	dodoc CHANGES README*
+	newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
+}
diff --git a/app-text/ttf2pk2/ttf2pk2-1.5_p20120525.ebuild b/app-text/ttf2pk2/ttf2pk2-1.5_p20120525.ebuild
index 5c0017c0c0d4..ad01e5b2d854 100644
--- a/app-text/ttf2pk2/ttf2pk2-1.5_p20120525.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-1.5_p20120525.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pk2/ttf2pk2-1.5_p20120525.ebuild,v 1.1 2012/05/26 19:40:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ttf2pk2/ttf2pk2-1.5_p20120525.ebuild,v 1.4 2012/05/27 19:51:01 aballier Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
@@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/kpathsea-6.0.1_p20110627
 		!media-libs/freetype:1
 		!=dev-texlive/texlive-langcjk-2011*[source]"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
 
diff --git a/dev-cpp/libassa/libassa-3.5.1.ebuild b/dev-cpp/libassa/libassa-3.5.1.ebuild
index 9608514fa9f5..ef3af8f015ad 100644
--- a/dev-cpp/libassa/libassa-3.5.1.ebuild
+++ b/dev-cpp/libassa/libassa-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/libassa-3.5.1.ebuild,v 1.2 2012/05/26 20:32:44 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/libassa-3.5.1.ebuild,v 1.4 2012/05/27 07:29:17 angelos Exp $
 
 EAPI=4
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="net-libs/libtirpc"
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 345c3cbfb4da..ebf6d4688c0c 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -4,6 +4,7 @@ DIST postgresql-9.0.7.tar.bz2 14977437 RMD160 80a8c91233462515914aeb5c15cf63b719
 DIST postgresql-9.1.3.tar.bz2 15582454 RMD160 84eb235c090083b78e6a2facf3d7bc534395db8b SHA1 1cf3044415df807c08bb8ad8e40e24e8d375cf34 SHA256 7a79800a624031c1d9bc9cdce73cb40050100ac50a82050cbf7bbbd16ac4d5d5
 DIST postgresql-9.2beta1.tar.bz2 15908141 RMD160 a70e7fe588ca57a08a1ce4593841bf735d69587c SHA1 651195df830777c952e3484fff51366ef0b95151 SHA256 05651ec88af03cc5cec08b091f2381fe8ebdaa87dbc6d193414ff2400084a838
 DIST postgresql-initscript-2.1.tbz2 2603 RMD160 033f7189df6132b8bcca378e000bd2b705463b72 SHA1 4125c76d102ea78cb5cebd4a13021930f131ae02 SHA256 42ee83d0bfd1e1733bbc191b065bc70b2b5966f743f692e5133f6c676c8b1c24
+DIST postgresql-initscript-2.2.tbz2 2603 RMD160 f46f4a2f905a6ab8821cdbc895c21d8e4b0fc158 SHA1 801545844009fb56eee67d82a370e039c3bca48b SHA256 033bd93833003b9176e1e3788290e0753b668e17182383f6ae4083ef05ce363b
 DIST postgresql-patches-8.3-r2.tbz2 5501 RMD160 ffd2661f5a4832917d4c28b5a231b6467c04146f SHA1 7514b558a7c6f34d7491bd500fd8c74510d9f0d0 SHA256 adae4c048745de04fd44f0408e8ab85aa5cae283cb3ddc2962e0379905cca73f
 DIST postgresql-patches-8.4-r2.tbz2 4822 RMD160 cf1ef4d046653c571e9059c6b27dcd5d1b504b26 SHA1 0fb36f6c8d9bb54b1528acd1821f76619f297403 SHA256 9920097ff5243df28788a6f3bdf6cdad38e6c42885f38da84b0f2c8c242954d7
 DIST postgresql-patches-9.0-r3.tbz2 4503 RMD160 05d4167c3a48a432ab79cb57fee5e4661d229cc6 SHA1 04d4a820415304ddb27078a75669289647192048 SHA256 2d454575423f0e56f23d540fbc865309d0bee3f80e5e05a7e1d793a7e70763cf
diff --git a/dev-db/postgresql-server/postgresql-server-9.2.0_beta1.ebuild b/dev-db/postgresql-server/postgresql-server-9.2.0_beta1-r1.ebuild
similarity index 98%
rename from dev-db/postgresql-server/postgresql-server-9.2.0_beta1.ebuild
rename to dev-db/postgresql-server/postgresql-server-9.2.0_beta1-r1.ebuild
index 8ac3b6f4f357..d07d307619ea 100644
--- a/dev-db/postgresql-server/postgresql-server-9.2.0_beta1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-9.2.0_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.0_beta1.ebuild,v 1.1 2012/05/23 14:42:52 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.2.0_beta1-r1.ebuild,v 1.1 2012/05/27 15:07:14 titanofold Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -18,7 +18,7 @@ MY_FILE_PV="${SLOT}$(get_version_component_range 4)"
 S="${WORKDIR}/postgresql-${MY_FILE_PV}"
 SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_FILE_PV}.tar.bz2
 		 http://dev.gentoo.org/~titanofold/postgresql-patches-${MY_FILE_PV}.tbz2
-		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2"
+		 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.2.tbz2"
 
 # Comment the following four lines when a beta or rc.
 #S="${WORKDIR}/postgresql-${PV}"
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 8a6b97f4411e..1831dfce9fe4 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1 +1,2 @@
 DIST irrlicht-1.7.2.zip 24603866 RMD160 066a2a664cced9ba92c2dd0337f7ca779bad8b75 SHA1 2f064cb4c712e1d7aca90a116485b5b166ae6218 SHA256 be1de9a850a94eaa5cc57a6014de5ab5304a364d45ce504315b5442be3e0d01d
+DIST irrlicht-1.7.3.zip 16344294 RMD160 ca4624418349740d46affbf7059d124be27f3d5e SHA1 e97aeceae964c369a194eca6b330d284a1ba8f34 SHA256 7230c1210a169944f815a79a975fabf2c0db0d3181dd62345b9fac9095ae026d
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.3-config.patch b/dev-games/irrlicht/files/irrlicht-1.7.3-config.patch
new file mode 100644
index 000000000000..da553ed8ab58
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.3-config.patch
@@ -0,0 +1,29 @@
+--- include/IrrCompileConfig.h.old
++++ include/IrrCompileConfig.h
+@@ -176,7 +176,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
++//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ 
+ 
+ //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
+@@ -187,7 +187,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
++//#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+ 
+ 
+ //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
+@@ -348,7 +348,7 @@
+ /** If this is commented out, Irrlicht will try to compile using the zlib
+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
+ defined. */
+-#define _IRR_USE_NON_SYSTEM_ZLIB_
++//#define _IRR_USE_NON_SYSTEM_ZLIB_
+ //! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives
+ #define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
+ //! Define _IRR_COMPILE_WITH_BZIP2_ if you want to support bzip2 compressed zip archives
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.3-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.7.3-demoMake.patch
new file mode 100644
index 000000000000..a8f4aace8d0a
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.3-demoMake.patch
@@ -0,0 +1,572 @@
+--- examples/Demo/Makefile
++++ examples/Demo/Makefile
+@@ -2,7 +2,7 @@
+ Target = Demo
+ Sources = CDemo.cpp CMainMenu.cpp main.cpp
+ 
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -Wall -O3 -ffast-math
+ 
+ ifeq ($(HOSTTYPE), x86_64)
+@@ -13,7 +13,7 @@
+ 
+ # target specific settings
+ all_linux: SYSTEM=Linux
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lpng -ljpeg
+ 
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lglu32 -lm
+--- examples/14.Win32Window/Makefile
++++ examples/14.Win32Window/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/12.TerrainRendering/Makefile
++++ examples/12.TerrainRendering/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/11.PerPixelLighting/Makefile
++++ examples/11.PerPixelLighting/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/08.SpecialFX/Makefile
++++ examples/08.SpecialFX/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/06.2DGraphics/Makefile
++++ examples/06.2DGraphics/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/04.Movement/Makefile
++++ examples/04.Movement/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,14 +17,14 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/16.Quake3MapShader/Makefile
++++ examples/16.Quake3MapShader/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/15.LoadIrrFile/Makefile
++++ examples/15.LoadIrrFile/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/02.Quake3Map/Makefile
++++ examples/02.Quake3Map/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,7 +17,7 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht
+ static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm
+@@ -25,7 +25,7 @@
+ static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc
+ static_win32 all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32 static_win32:
+ 	$(warning Building...)
+--- examples/19.MouseAndJoystick/Makefile
++++ examples/19.MouseAndJoystick/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ #CXXFLAGS = -O3 -ffast-math
+ CXXFLAGS = -g -Wall
+ 
+@@ -17,14 +17,14 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/13.RenderToTexture/Makefile
++++ examples/13.RenderToTexture/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/10.Shaders/Makefile
++++ examples/10.Shaders/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/09.Meshviewer/Makefile
++++ examples/09.Meshviewer/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/21.Quake3Explorer/Makefile
++++ examples/21.Quake3Explorer/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp sound.cpp q3factory.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ #CXXFLAGS = -O3 -ffast-math
+ CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/03.CustomSceneNode/Makefile
++++ examples/03.CustomSceneNode/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/20.ManagedLights/Makefile
++++ examples/20.ManagedLights/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ #CXXFLAGS = -O3 -ffast-math
+ CXXFLAGS = -g -Wall
+ 
+@@ -17,14 +17,14 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/05.UserInterface/Makefile
++++ examples/05.UserInterface/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/01.HelloWorld/Makefile
++++ examples/01.HelloWorld/Makefile
+@@ -7,9 +7,9 @@
+ # List of source files, separated by spaces
+ Sources := main.cpp
+ # Path to Irrlicht directory, should contain include/ and lib/
+-IrrlichtHome := ../..
++IrrlichtHome := /usr
+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
+-BinPath = ../../bin/$(SYSTEM)
++BinPath = ../../bin
+ 
+ # general compiler settings (might need to be set when compiling the lib, too)
+ # preprocessor flags, e.g. defines and include paths
+@@ -24,7 +24,7 @@
+ #no changes necessary below this line
+ ####
+ 
+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
++CPPFLAGS = -I/usr/include/irrlicht $(USERCPPFLAGS)
+ CXXFLAGS = $(USERCXXFLAGS)
+ LDFLAGS = $(USERLDFLAGS)
+ 
+@@ -32,8 +32,8 @@
+ all: all_linux
+ 
+ # target specific settings
+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11
++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht
++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lpng -ljpeg
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32 static_win32: SUF=.exe
+--- examples/18.SplitScreen/Makefile
++++ examples/18.SplitScreen/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
+--- examples/07.Collision/Makefile
++++ examples/07.Collision/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp
+ 
+ # general compiler settings
+-CPPFLAGS = -I../../include -I/usr/X11R6/include
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+ #CXXFLAGS = -g -Wall
+ 
+@@ -17,13 +17,13 @@
+ endif
+ 
+ # target specific settings
+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11
++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux
+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm
+ all_win32 clean_win32: SYSTEM=Win32-gcc
+ all_win32 clean_win32: SUF=.exe
+ # name of the binary - only valid for targets which set SYSTEM
+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)
++DESTPATH = ../../bin/$(Target)$(SUF)
+ 
+ all_linux all_win32:
+ 	$(warning Building...)
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.3-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.7.3-gentoo.patch
new file mode 100644
index 000000000000..e23c98f243ae
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.3-gentoo.patch
@@ -0,0 +1,46 @@
+--- irrlicht-1.7.2.orig/source/Irrlicht/CImageLoaderPNG.cpp
++++ irrlicht-1.7.2/source/Irrlicht/CImageLoaderPNG.cpp
+@@ -162,7 +162,7 @@
+ 	if (BitDepth < 8)
+ 	{
+ 		if (ColorType==PNG_COLOR_TYPE_GRAY || ColorType==PNG_COLOR_TYPE_GRAY_ALPHA)
+-			png_set_gray_1_2_4_to_8(png_ptr);
++			png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 		else
+ 			png_set_packing(png_ptr);
+ 	}
+--- irrlicht-1.7.2.orig/source/Irrlicht/Makefile
++++ irrlicht-1.7.2/source/Irrlicht/Makefile
+@@ -39,11 +39,7 @@
+ IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o
+ IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o
+ IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o
+-ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
+-JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o
+-LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o
+ LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o
+-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o
+ 
+ # Next variable is for additional scene nodes etc. of customized Irrlicht versions
+ EXTRAOBJ =
+@@ -54,18 +50,16 @@
+ 
+ ###############
+ #Compiler flags
+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
++CXXINCS = -I../../include
+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
+ CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
+ ifndef NDEBUG
+ CXXFLAGS += -g -D_DEBUG
+-else
+-CXXFLAGS += -fexpensive-optimizations -O3
+ endif
+ ifdef PROFILE
+ CXXFLAGS += -pg
+ endif
+-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
++CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+ 
+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC
+ sharedlib sharedlib_osx: CFLAGS += -fPIC
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.3-libpng15.patch b/dev-games/irrlicht/files/irrlicht-1.7.3-libpng15.patch
new file mode 100644
index 000000000000..a1426bf2907b
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.3-libpng15.patch
@@ -0,0 +1,40 @@
+--- source/Irrlicht/CImageLoaderPNG.cpp
++++ source/Irrlicht/CImageLoaderPNG.cpp
+@@ -28,7 +28,7 @@
+ static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
+ {
+ 	os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
+-	longjmp(png_ptr->jmpbuf, 1);
++	longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ 
+ // PNG function for file reading
+@@ -37,7 +37,7 @@
+ 	png_size_t check;
+ 
+ 	// changed by zola {
+-	io::IReadFile* file=(io::IReadFile*)png_ptr->io_ptr;
++	io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr);
+ 	check=(png_size_t) file->read((void*)data,(u32)length);
+ 	// }
+ 
+--- source/Irrlicht/CImageWriterPNG.cpp
++++ source/Irrlicht/CImageWriterPNG.cpp
+@@ -35,7 +35,7 @@
+ static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
+ {
+ 	os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
+-	longjmp(png_ptr->jmpbuf, 1);
++	longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ 
+ // PNG function for file writing
+@@ -43,7 +43,7 @@
+ {
+ 	png_size_t check;
+ 
+-	io::IWriteFile* file=(io::IWriteFile*)png_ptr->io_ptr;
++	io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr);
+ 	check=(png_size_t) file->write((const void*)data,(u32)length);
+ 
+ 	if (check != length)
diff --git a/dev-games/irrlicht/irrlicht-1.7.3.ebuild b/dev-games/irrlicht/irrlicht-1.7.3.ebuild
new file mode 100644
index 000000000000..4cd3371ae169
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.7.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.7.3.ebuild,v 1.1 2012/05/27 22:11:36 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="open source high performance realtime 3D engine written in C++"
+HOMEPAGE="http://irrlicht.sourceforge.net/"
+SRC_URI="mirror://sourceforge/irrlicht/${P}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="virtual/jpeg
+	media-libs/libpng
+	app-arch/bzip2
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-proto/xproto
+	x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/${P}/source/Irrlicht
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	cd ../..
+	edos2unix include/IrrCompileConfig.h
+	epatch \
+		"${FILESDIR}"/${P}-config.patch \
+		"${FILESDIR}"/${P}-demoMake.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+
+	sed -i \
+		-e 's:\.\./\.\./media:../media:g' \
+		$(grep -rl '\.\./\.\./media' examples) \
+		|| die 'sed failed'
+}
+
+src_compile() {
+	tc-export CXX CC AR
+	emake sharedlib staticlib || die "emake failed"
+}
+
+src_install() {
+	cd ../..
+	dolib.a lib/Linux/libIrrlicht.a || die
+	dolib.so lib/Linux/libIrrlicht.so* || die
+	insinto /usr/include/${PN}
+	doins include/* || die
+	dodoc changes.txt readme.txt
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples media || die
+	fi
+}
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild
index a39ca41f266e..0a02654d04f1 100644
--- a/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild
+++ b/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild,v 1.7 2012/05/25 11:21:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild,v 1.8 2012/05/27 21:26:45 sera Exp $
 
 EAPI="4"
 
@@ -19,13 +19,13 @@ DESCRIPTION="Formerly Ant's optional tasks w/o external deps, now compat empty j
 KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND=""
+DEPEND=">=virtual/jdk-1.4" #jar
 RDEPEND=""
 
 src_compile() {
 	# the classes were moved to ant-core in 1.8.2, this is just for compatibility
 	mkdir -p build/lib/empty && cd build/lib/empty || die
-	jar -cf ../${PN}.jar .
+	jar -cf ../${PN}.jar . || die
 }
 
 src_postinst() {
diff --git a/dev-java/jcharts/jcharts-0.7.5-r2.ebuild b/dev-java/jcharts/jcharts-0.7.5-r2.ebuild
new file mode 100644
index 000000000000..beefda530774
--- /dev/null
+++ b/dev-java/jcharts/jcharts-0.7.5-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcharts/jcharts-0.7.5-r2.ebuild,v 1.1 2012/05/27 20:11:25 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="jCharts-${PV}"
+DESCRIPTION="jCharts is a 100% Java based charting utility that outputs a variety of charts"
+HOMEPAGE="http://jcharts.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# tests need X11
+RESTRICT=test
+
+# depends on com.sun.image.codec.jpeg which was removed in java 1.7 #180437
+COMMON_DEP="
+	dev-java/batik:1.7
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${COMMON_DEP}
+	|| ( virtual/jre:1.6 virtual/jre:1.5 virtual/jre:1.4 )"
+DEPEND="${COMMON_DEP}
+	|| ( virtual/jdk:1.6 virtual/jdk:1.5 virtual/jdk:1.4 )
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	rm -v *.{jar,war} lib/*.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_BUILD_XML="build/build.xml"
+EANT_GENTOO_CLASSPATH="batik-1.7,servlet-api-3.0"
+EANT_DOC_TARGET="javadocs"
+
+#src_test() {
+#	java-pkg-2_src_test
+#}
+
+src_install() {
+	java-pkg_newjar build/*.jar
+	dohtml docs/*.html
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use source && java-pkg_dosrc src/org
+	use examples && java-pkg_doexamples demo
+}
diff --git a/dev-java/netbeans-java/netbeans-java-7.0.1-r2.ebuild b/dev-java/netbeans-java/netbeans-java-7.0.1-r2.ebuild
new file mode 100644
index 000000000000..4e1c45f0b2f5
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-7.0.1-r2.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.0.1-r2.ebuild,v 1.1 2012/05/27 16:10:38 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="7.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-${SLOT}-build.xml-r1.patch.bz2
+	http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip
+	http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip
+	http://hg.netbeans.org/binaries/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar
+	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar
+	http://hg.netbeans.org/binaries/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar
+	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
+	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
+	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
+	http://hg.netbeans.org/binaries/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar
+	http://hg.netbeans.org/binaries/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar
+	http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
+	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
+	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar
+	http://hg.netbeans.org/binaries/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/appframework:0
+	dev-java/beansbinding:0
+	dev-java/cglib:2.2
+	dev-java/jdom:1.0
+	dev-java/swing-worker:0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	dev-java/asm:2.2
+	dev-java/cglib:2.1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/ehcache:1.2
+	dev-java/fastinfoset:0
+	dev-java/javassist:3
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jsr250:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/jtidy:0
+	>=dev-java/maven-bin-3.0.3:3.0
+	dev-java/saaj:0
+	dev-java/stax-ex:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-7.0-build.xml-r1.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip o.apache.tools.ant.module/external/ant-libs-1.8.2.zip || die
+	ln -s "${DISTDIR}"/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip maven.embedder/external/apache-maven-3.0.3-bin.zip || die
+	ln -s "${DISTDIR}"/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip swingapp/external/appframework-1.0.3-doc.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar j2ee.eclipselink/external/eclipselink-2.2.0.jar || die
+	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar j2ee.eclipselink/external/eclipselink-javax.persistence-2.0.jar || die
+	ln -s "${DISTDIR}"/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.2.0.jar || die
+	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
+	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
+	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
+	ln -s "${DISTDIR}"/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar maven.indexer/external/indexer-artifact-4.1.0.jar || die
+	ln -s "${DISTDIR}"/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar maven.indexer/external/indexer-core-4.1.0.jar || die
+	ln -s "${DISTDIR}"/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
+	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
+	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar libs.springframework/external/spring-2.5.6.SEC01.jar || die
+	ln -s "${DISTDIR}"/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip libs.springframework/external/spring-framework-3.0.2.RELEASE.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-7.0-build.xml-r1.patch
+	sed -i "s%../o.jdesktop.layout/external%\${netbeans.dest.dir}/\${nb.cluster.platform.dir}/modules/ext%" java.examples/build.xml
+
+	# Support for custom patches
+	if [ -n "${NETBEANS70_PATCHES_DIR}" -a -d "${NETBEANS70_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS70_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+	java-pkg_jar-from --into swingapp/external appframework appframework.jar appframework-1.0.3.jar
+	java-pkg_jar-from --into swingapp/external swing-worker swing-worker.jar swing-worker-1.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven || die
+	dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
+
+	insinto ${INSTALL_DIR}/ant
+	dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
+	dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
+	doins -r ant/extra
+	dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
+	doins -r ant/nblib
+	dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
+	local vertasks=$(ls -d /usr/share/ant/tasks-*)
+	dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm appframework-1.0.3.jar && dosym /usr/share/appframework/lib/appframework.jar ${instdir}/appframework-1.0.3.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	# javac-api-nb-7.0-b07.jar
+	# javac-impl-nb-7.0-b07.jar
+	# org-netbeans-modules-java-j2seplatform-probe.jar
+	rm swing-worker-1.1.jar && dosym /usr/share/swing-worker/lib/swing-worker.jar ${instdir}/swing-worker-1.1.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# dir: eclipselink
+	# eclipselink-javax.persistence-2.0.jar
+	# eclipselink-jpa-modelgen-2.2.0.jar
+	# eclipselink-2.2.0.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
+	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
+	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
+	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
+	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
+	# ejb3-persistence.jar
+	# hibernate-annotations.jar
+	# hibernate-commons-annotations.jar
+	# hibernate-entitymanager.jar
+	# hibernate-tools.jar
+	# hibernate3.jar
+	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
+	# jdbc2_0-stdext.jar
+	rm jta.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jta.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	# gmbal-api-only.jar
+	# http.jar
+	# jaxws-rt.jar
+	# jaxws-tools.jar
+	# management-api.jar
+	# mimepull.jar
+	# policy.jar
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
+	# woodstox.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jaxws-api.jar
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	# indexer-artifact-3.1.0.jar
+	# indexer-core-3.1.0.jar
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	# maven-dependency-tree-1.2.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-2.5.6.SEC01.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-aop-3.0.2.RELEASE.jar
+	# spring-asm-3.0.2.RELEASE.jar
+	# spring-aspects-3.0.2.RELEASE.jar
+	# spring-beans-3.0.2.RELEASE.jar
+	# spring-context-support-3.0.2.RELEASE.jar
+	# spring-context-3.0.2.RELEASE.jar
+	# spring-core-3.0.2.RELEASE.jar
+	# spring-expression-3.0.2.RELEASE.jar
+	# spring-instrument-tomcat-3.0.2.RELEASE.jar
+	# spring-instrument-3.0.2.RELEASE.jar
+	# spring-jdbc-3.0.2.RELEASE.jar
+	# spring-jms-3.0.2.RELEASE.jar
+	# spring-orm-3.0.2.RELEASE.jar
+	# spring-oxm-3.0.2.RELEASE.jar
+	# spring-struts-3.0.2.RELEASE.jar
+	# spring-test-3.0.2.RELEASE.jar
+	# spring-tx-3.0.2.RELEASE.jar
+	# spring-webmvc-portlet-3.0.2.RELEASE.jar
+	# spring-webmvc-3.0.2.RELEASE.jar
+	# spring-web-3.0.2.RELEASE.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/toplink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# toplink-essentials-agent.jar
+	# toplink-essentials.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
+
+pkg_postinst() {
+	elog "Note that if you change your version of ant, you have to re-emerge"
+	elog "this package to get updated the link to ant tasks of that specific"
+	elog "version."
+}
diff --git a/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild b/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild
new file mode 100644
index 000000000000..8a34dff8491e
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild
@@ -0,0 +1,318 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-java/netbeans-java-7.1.2-r1.ebuild,v 1.1 2012/05/27 16:10:38 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Java Cluster"
+HOMEPAGE="http://netbeans.org/projects/java"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+	http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+	http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip
+	http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip
+	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar
+	http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar
+	http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar
+	http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar
+	http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip
+	http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar
+	http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar
+	http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar
+	http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar
+	http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip
+	http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip
+	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar
+	http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar
+	http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar
+	http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-websvccommon-${PV}
+	dev-java/beansbinding:0
+	dev-java/cglib:2.2
+	dev-java/jdom:1.0"
+DEPEND="virtual/jdk:1.6
+	app-arch/unzip
+	${CDEPEND}
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	dev-java/absolutelayout:0
+	dev-java/antlr:0[java]
+	dev-java/asm:2.2
+	dev-java/cglib:2.1
+	dev-java/commons-collections:0
+	dev-java/dom4j:1
+	dev-java/ehcache:1.2
+	dev-java/fastinfoset:0
+	dev-java/javassist:3
+	dev-java/jsr67:0
+	dev-java/jsr181:0
+	dev-java/jsr250:0
+	dev-java/glassfish-transaction-api:0
+	dev-java/jtidy:0
+	dev-java/saaj:0
+	dev-java/stax-ex:0
+	dev-java/xmlstreambuffer:0"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+pkg_pretend() {
+	local die_now=""
+
+	if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
+		eerror "Please remove following symlinks and run emerge again:"
+		find /usr/share/netbeans-java-${SLOT}/ant -type l
+		die_now="1"
+	fi
+
+	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
+		if [ -z "${die_now}" ]; then
+			eerror "Please remove following symlinks and run emerge again:"
+		fi
+
+		echo "/usr/share/netbeans-java-${SLOT}/maven"
+		die_now="1"
+	fi
+
+	if [ -n "${die_now}" ]; then
+		die "Symlinks exist"
+	fi
+}
+
+src_unpack() {
+	unpack $(basename ${SOURCE_URL})
+
+	einfo "Deleting bundled jars..."
+	find -name "*.jar" -type f -delete
+
+	unpack netbeans-9999-r1-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip o.apache.tools.ant.module/external/ant-libs-1.8.3.zip || die
+	ln -s "${DISTDIR}"/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip maven.embedder/external/apache-maven-3.0.4-bin.zip || die
+	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
+	ln -s "${DISTDIR}"/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar j2ee.eclipselink/external/eclipselink-2.3.0.jar || die
+	ln -s "${DISTDIR}"/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar j2ee.eclipselinkmodelgen/external/eclipselink-jpa-modelgen-2.3.0.jar || die
+	ln -s "${DISTDIR}"/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar j2ee.toplinklib/external/glassfish-persistence-v2-build-58g.jar || die
+	ln -s "${DISTDIR}"/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar j2ee.toplinklib/external/glassfish-persistence-v2ur1-build-09d.jar || die
+	ln -s "${DISTDIR}"/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip hibernatelib/external/hibernate-3.2.5-lib.zip || die
+	ln -s "${DISTDIR}"/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar maven.indexer/external/indexer-artifact-4.1.2.jar || die
+	ln -s "${DISTDIR}"/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar maven.indexer/external/indexer-core-4.1.2.jar || die
+	ln -s "${DISTDIR}"/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar libs.javacapi/external/javac-api-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar libs.javacimpl/external/javac-impl-nb-7.0-b07.jar || die
+	ln -s "${DISTDIR}"/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar j2ee.eclipselink/external/javax.persistence-2.0.jar || die
+	ln -s "${DISTDIR}"/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip websvc.jaxws21/external/jaxws-2.2.zip || die
+	ln -s "${DISTDIR}"/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip websvc.jaxws21api/external/jaxws-2.2-api.zip || die
+	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
+	ln -s "${DISTDIR}"/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar maven.embedder/external/maven-dependency-tree-1.2.jar || die
+	ln -s "${DISTDIR}"/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_1.0.0.jar || die
+	ln -s "${DISTDIR}"/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar libs.springframework/external/spring-2.5.6.SEC03.jar || die
+	ln -s "${DISTDIR}"/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip libs.springframework/external/spring-framework-3.0.6.RELEASE.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r1-build.xml.patch
+
+	# Support for custom patches
+	if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+		local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+		if [ -n "${files}" ] ; then
+			einfo "Applying custom patches:"
+
+			for file in ${files} ; do
+				epatch "${file}"
+			done
+		fi
+	fi
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.cglib/external cglib-2.2 cglib.jar cglib-2.2.jar
+	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.10.jar
+	java-pkg_jar-from --into maven.embedder/external jdom-1.0 jdom.jar jdom-1.0.jar
+	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
+	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.websvccommon.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	pushd nbbuild/netbeans/java >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	#rm -fr "${D}"/${INSTALL_DIR}/ant/* || die
+	#rm -fr "${D}"/${INSTALL_DIR}/maven || die
+	#dosym /usr/share/maven-bin-3.0 ${INSTALL_DIR}/maven
+	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
+	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
+
+	#insinto ${INSTALL_DIR}/ant
+	#dosym /usr/share/ant/bin ${INSTALL_DIR}/ant/bin
+	#dosym /usr/share/ant/etc ${INSTALL_DIR}/ant/etc
+	#doins -r ant/extra
+	#dosym /usr/share/ant/lib ${INSTALL_DIR}/ant/lib
+	#doins -r ant/nblib
+	#dosym /usr/share/ant/tasks ${INSTALL_DIR}/ant/tasks
+	#local vertasks=$(ls -d /usr/share/ant/tasks-*)
+	#dosym ${vertasks} ${INSTALL_DIR}/ant/$(basename ${vertasks}) # it would be better if ant would have tasks-current dir
+
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm AbsoluteLayout.jar  && dosym /usr/share/absolutelayout/lib/absolutelayout.jar ${instdir}/AbsoluteLayout.jar || die
+	rm beansbinding-1.2.1.jar && dosym /usr/share/beansbinding/lib/beansbinding.jar ${instdir}/beansbinding-1.2.1.jar || die
+	rm cglib-2.2.jar && dosym /usr/share/cglib-2.2/lib/cglib.jar ${instdir}/cglib-2.2.jar || die
+	# javac-api-nb-7.0-b07.jar
+	# javac-impl-nb-7.0-b07.jar
+	# org-netbeans-modules-java-j2seplatform-probe.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/eclipselink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# dir: eclipselink
+	# eclipselink-javax.persistence-2.0.jar
+	# eclipselink-jpa-modelgen-2.2.0.jar
+	# eclipselink-2.2.0.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/hibernate
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm antlr-2.7.6.jar && dosym /usr/share/antlr/lib/antlr.jar ${instdir}/antlr-2.7.6.jar || die
+	rm asm-attrs.jar && dosym /usr/share/asm-2.2/lib/asm-attrs.jar ${instdir}/asm-attrs.jar || die
+	rm asm.jar && dosym /usr/share/asm-2.2/lib/asm.jar ${instdir}/asm.jar || die
+	rm cglib-2.1.3.jar && dosym /usr/share/cglib-2.1/lib/cglib.jar ${instdir}/cglib-2.1.3.jar || die
+	rm commons-collections-2.1.1.jar && dosym /usr/share/commons-collections/lib/commons-collections.jar ${instdir}/commons-collections-2.1.1.jar || die
+	rm dom4j-1.6.1.jar && dosym /usr/share/dom4j-1/lib/dom4j.jar ${instdir}/dom4j-1.6.1.jar || die
+	rm ehcache-1.2.3.jar && dosym /usr/share/ehcache-1.2/lib/ehcache.jar ${instdir}/ehcache-1.2.3.jar || die
+	# ejb3-persistence.jar
+	# hibernate-annotations.jar
+	# hibernate-commons-annotations.jar
+	# hibernate-entitymanager.jar
+	# hibernate-tools.jar
+	# hibernate3.jar
+	rm javassist.jar && dosym /usr/share/javassist-3/lib/javassist.jar ${instdir}/javassist.jar || die
+	# jdbc2_0-stdext.jar
+	rm jta.jar && dosym /usr/share/glassfish-transaction-api/lib/jta.jar ${instdir}/jta.jar || die
+	rm jtidy-r8-20060801.jar && dosym /usr/share/jtidy/lib/Tidy.jar ${instdir}/jtidy-r8-20060801.jar || die
+	popd >/dev/null || die
+
+	local instdir=/${INSTALL_DIR}/modules/ext/jaxws22
+	pushd "${D}"/${instdir} >/dev/null || die
+	rm FastInfoset.jar && dosym /usr/share/fastinfoset/lib/fastinfoset.jar ${instdir}/FastInfoset.jar || die
+	# gmbal-api-only.jar
+	# http.jar
+	# jaxws-rt.jar
+	# jaxws-tools.jar
+	# management-api.jar
+	# mimepull.jar
+	# policy.jar
+	rm saaj-impl.jar && dosym /usr/share/saaj/lib/saaj.jar ${instdir}/saaj-impl.jar || die
+	rm stax-ex.jar && dosym /usr/share/stax-ex/lib/stax-ex.jar ${instdir}/stax-ex.jar || die
+	rm streambuffer.jar && dosym /usr/share/xmlstreambuffer/lib/streambuffer.jar ${instdir}/streambuffer.jar || die
+	# woodstox.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/jaxws22/api
+	pushd "${D}"/${instdir} >/dev/null || die
+	# jaxws-api.jar
+	rm jsr181-api.jar && dosym /usr/share/jsr181/lib/jsr181.jar ${instdir}/jsr181-api.jar || die
+	rm jsr250-api.jar && dosym /usr/share/jsr250/lib/jsr250.jar ${instdir}/jsr250-api.jar || die
+	rm saaj-api.jar && dosym /usr/share/jsr67/lib/jsr67.jar ${instdir}/saaj-api.jar || die
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/maven
+	pushd "${D}"/${instdir} >/dev/null || die
+	# indexer-artifact-4.1.1.jar
+	# indexer-core-4.1.1.jar
+	rm jdom-1.0.jar && dosym /usr/share/jdom-1.0/lib/jdom.jar ${instdir}/jdom-1.0.jar || die
+	# maven-dependency-tree-1.2.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-2.5.6.SEC01.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/spring-3.0
+	pushd "${D}"/${instdir} >/dev/null || die
+	# spring-aop-3.0.2.RELEASE.jar
+	# spring-asm-3.0.2.RELEASE.jar
+	# spring-aspects-3.0.2.RELEASE.jar
+	# spring-beans-3.0.2.RELEASE.jar
+	# spring-context-support-3.0.2.RELEASE.jar
+	# spring-context-3.0.2.RELEASE.jar
+	# spring-core-3.0.2.RELEASE.jar
+	# spring-expression-3.0.2.RELEASE.jar
+	# spring-instrument-tomcat-3.0.2.RELEASE.jar
+	# spring-instrument-3.0.2.RELEASE.jar
+	# spring-jdbc-3.0.2.RELEASE.jar
+	# spring-jms-3.0.2.RELEASE.jar
+	# spring-orm-3.0.2.RELEASE.jar
+	# spring-oxm-3.0.2.RELEASE.jar
+	# spring-struts-3.0.2.RELEASE.jar
+	# spring-test-3.0.2.RELEASE.jar
+	# spring-tx-3.0.2.RELEASE.jar
+	# spring-webmvc-portlet-3.0.2.RELEASE.jar
+	# spring-webmvc-3.0.2.RELEASE.jar
+	# spring-web-3.0.2.RELEASE.jar
+	popd >/dev/null || die
+
+	local instdir=${INSTALL_DIR}/modules/ext/toplink
+	pushd "${D}"/${instdir} >/dev/null || die
+	# toplink-essentials-agent.jar
+	# toplink-essentials.jar
+	popd >/dev/null || die
+
+	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
+}
diff --git a/dev-lang/ruby/ruby-1.9.3_p125.ebuild b/dev-lang/ruby/ruby-1.9.3_p125.ebuild
index aceb27ade2ae..4b51a2c51c5a 100644
--- a/dev-lang/ruby/ruby-1.9.3_p125.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p125.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p125.ebuild,v 1.3 2012/05/20 20:56:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p125.ebuild,v 1.4 2012/05/27 17:54:00 maekke Exp $
 
 EAPI=2
 
@@ -34,7 +34,7 @@ SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
 		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
 
 LICENSE="|| ( Ruby BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml" #libedit
 
 # libedit support is removed everywhere because of this upstream bug:
diff --git a/dev-libs/argtable/Manifest b/dev-libs/argtable/Manifest
index 8c5773cca073..b1a90f85c1c4 100644
--- a/dev-libs/argtable/Manifest
+++ b/dev-libs/argtable/Manifest
@@ -1,2 +1 @@
-DIST argtable2-12.tar.gz 3358604 RMD160 ffdd88fd4e96f3a71fa408329690cdf4981e3600 SHA1 29857965b6849332cd862ca934cee11228673994 SHA256 40c13da72b48717afcf94d4c53909b768587b44b4dab84f38bd5c69c7667c693
 DIST argtable2-13.tar.gz 3326444 RMD160 61d82358dac5996efd9bdb46909f7c39c6f68b07 SHA1 bce828c64c35e16f4c3f8e1f355e4a2a97fe3289 SHA256 8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf
diff --git a/dev-libs/argtable/argtable-2.12.ebuild b/dev-libs/argtable/argtable-2.12.ebuild
deleted file mode 100644
index 1b62d2a4029e..000000000000
--- a/dev-libs/argtable/argtable-2.12.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/argtable/argtable-2.12.ebuild,v 1.7 2011/08/13 07:33:31 xarthisius Exp $
-
-inherit versionator
-
-DESCRIPTION="An ANSI C library for parsing GNU-style command-line options with minimal fuss"
-HOMEPAGE="http://argtable.sourceforge.net/"
-
-MY_PV="$(replace_version_separator 1 '-')"
-MY_P=${PN}${MY_PV}
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc debug examples"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf $(use_enable debug)
-	emake || die "build failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rm -rf "${D}"/usr/share/doc/${PN}2/
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	if use doc ; then
-		cd "${S}/doc"
-		dohtml *.html *.gif
-		dodoc *.pdf *.ps
-	fi
-
-	if use examples ; then
-		cd "${S}/example"
-		docinto examples
-		dodoc Makefile *.[ch] README.txt
-	fi
-}
diff --git a/dev-libs/gjs/gjs-1.32.0.ebuild b/dev-libs/gjs/gjs-1.32.0.ebuild
index 40f337c7dea2..7bec3acd4f01 100644
--- a/dev-libs/gjs/gjs-1.32.0.ebuild
+++ b/dev-libs/gjs/gjs-1.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.32.0.ebuild,v 1.2 2012/05/04 18:35:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gjs/gjs-1.32.0.ebuild,v 1.3 2012/05/28 00:19:48 mattst88 Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ HOMEPAGE="http://live.gnome.org/Gjs"
 LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
 SLOT="0"
 IUSE="examples test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 
 RDEPEND=">=dev-libs/glib-2.31:2
 	>=dev-libs/gobject-introspection-1.31.22
diff --git a/dev-libs/libevent/libevent-2.0.18.ebuild b/dev-libs/libevent/libevent-2.0.18.ebuild
index 2d189445386f..c1a6f7e11e87 100644
--- a/dev-libs/libevent/libevent-2.0.18.ebuild
+++ b/dev-libs/libevent/libevent-2.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.18.ebuild,v 1.8 2012/05/23 13:02:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.18.ebuild,v 1.9 2012/05/27 12:45:59 maekke Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+ssl static-libs test"
 
 DEPEND="ssl? ( dev-libs/openssl )"
diff --git a/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild b/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild
index b0a20821d3e6..763d2643ea87 100644
--- a/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild,v 1.2 2012/05/26 16:10:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.8.0-r1.ebuild,v 1.3 2012/05/27 15:17:17 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples icu ipv6 lzma python readline static-libs test"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/libyaml/libyaml-0.1.4.ebuild b/dev-libs/libyaml/libyaml-0.1.4.ebuild
index cc53c4e8b779..643b86d6f35a 100644
--- a/dev-libs/libyaml/libyaml-0.1.4.ebuild
+++ b/dev-libs/libyaml/libyaml-0.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.4.ebuild,v 1.2 2011/12/29 17:07:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.4.ebuild,v 1.3 2012/05/27 12:54:50 maekke Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples test static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/mock/mock-0.8.0.ebuild b/dev-python/mock/mock-0.8.0.ebuild
index 2238f9010e55..6ac2d89f74b1 100644
--- a/dev-python/mock/mock-0.8.0.ebuild
+++ b/dev-python/mock/mock-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-0.8.0.ebuild,v 1.5 2012/05/23 13:13:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mock/mock-0.8.0.ebuild,v 1.6 2012/05/27 12:54:48 maekke Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos"
 IUSE="doc test"
 
 # dev-python/unittest2 is not required with Python >=3.2.
diff --git a/dev-python/munkres/Manifest b/dev-python/munkres/Manifest
new file mode 100644
index 000000000000..900a2087a89e
--- /dev/null
+++ b/dev-python/munkres/Manifest
@@ -0,0 +1 @@
+DIST munkres-1.0.5.4.tar.gz 43050 RMD160 728695026eaa9287224353d5f392e82b8d4e6e3d SHA1 d81de77cde326497f6752e4993f0aa93e6f1201c SHA256 105adad30659dbdf82815d3e12a74d4c01a3e0741d5ccbce194ee2ad4e5338d2
diff --git a/dev-python/munkres/metadata.xml b/dev-python/munkres/metadata.xml
new file mode 100644
index 000000000000..d2ef6dcfa21d
--- /dev/null
+++ b/dev-python/munkres/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>sochotnicky@gentoo.org</email>
+		<name>Stanislav Ochotnicky</name>
+	</maintainer>
+	<longdescription lang="en">The Munkres module provides an implementation of the Munkres algorithm (also called the Hungarian algorithm or the Kuhn-Munkres algorithm), useful for solving the Assignment Problem.
+	</longdescription>
+</pkgmetadata>
+
diff --git a/dev-python/munkres/munkres-1.0.5.4.ebuild b/dev-python/munkres/munkres-1.0.5.4.ebuild
new file mode 100644
index 000000000000..167b2f6668e7
--- /dev/null
+++ b/dev-python/munkres/munkres-1.0.5.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/munkres/munkres-1.0.5.4.ebuild,v 1.1 2012/05/27 20:39:31 sochotnicky Exp $
+
+EAPI=4
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Module implementing munkres algorithm for the Assignment Problem"
+HOMEPAGE="http://pypi.python.org/pypi/munkres/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/py/py-1.4.7.ebuild b/dev-python/py/py-1.4.7.ebuild
index ad0146d3da5c..bf30bb21b603 100644
--- a/dev-python/py/py-1.4.7.ebuild
+++ b/dev-python/py/py-1.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.7.ebuild,v 1.6 2012/05/23 13:18:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.7.ebuild,v 1.7 2012/05/27 13:19:43 maekke Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND="app-arch/unzip
diff --git a/dev-python/pycrypto/pycrypto-2.6.ebuild b/dev-python/pycrypto/pycrypto-2.6.ebuild
index 4158a621785a..d667233dbb1f 100644
--- a/dev-python/pycrypto/pycrypto-2.6.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6.ebuild,v 1.4 2012/05/26 19:42:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6.ebuild,v 1.5 2012/05/27 14:19:07 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
 
 LICENSE="PSF-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp"
 
 RDEPEND="gmp? ( dev-libs/gmp )"
diff --git a/dev-python/pyparsing/pyparsing-1.5.6.ebuild b/dev-python/pyparsing/pyparsing-1.5.6.ebuild
index 4e125061b03a..7f3b69170fa7 100644
--- a/dev-python/pyparsing/pyparsing-1.5.6.ebuild
+++ b/dev-python/pyparsing/pyparsing-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.6.ebuild,v 1.9 2012/05/23 13:14:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.5.6.ebuild,v 1.10 2012/05/27 13:04:50 maekke Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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="doc examples"
 
 DEPEND=""
diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index cff86e290b8f..a896a0dee7e9 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,3 +1,4 @@
 DIST Scrapy-0.14.1.tar.gz 719187 RMD160 015baca21f34c65e900d839d5ab464325503e8ed SHA1 20a77fb067e8d79d0060c83454dd12047e5999d8 SHA256 a95b00d0b7e3eaa895a9773001905637f3702edc3089cea100b74ee346a83edb
 DIST Scrapy-0.14.2.tar.gz 719256 RMD160 1324497be82b7dc09c6e5b54944c5359e09e626e SHA1 ce8fde29ff066dacf2cc9e6ec8c0e7c986fd7e69 SHA256 66fe66681421446f63703bcae680ea10d745d320ce262d3128cbae3b474b1eed
 DIST Scrapy-0.14.3.tar.gz 716257 RMD160 7eb62710cd32249ed7c0af3b0a7e789c71c6ac6a SHA1 c948f2290d52f51d74732ffacd6a6afab1aca3ed SHA256 fd42e2a9e93f1741f24032d3a1a45c5660ce942a1e829c4d481d8ff9f287518a
+DIST Scrapy-0.14.4.tar.gz 726253 RMD160 34ad6566f726379c7f07476e0d8d1c5528ecff2d SHA1 927ead539873f04aba36ff01f784b270501e44f0 SHA256 8de12ac37136524ad2fb0d83db10736b03b1d445b6d4c492c053bec78f3d42e6
diff --git a/dev-python/scrapy/scrapy-0.14.4.ebuild b/dev-python/scrapy/scrapy-0.14.4.ebuild
new file mode 100644
index 000000000000..f1958753d8f1
--- /dev/null
+++ b/dev-python/scrapy/scrapy-0.14.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.14.4.ebuild,v 1.2 2012/05/28 00:12:51 mr_bones_ Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-pypy-*"
+PYTHON_TESTS_RESTRICTED_ABIS="2.5"
+inherit distutils
+
+MY_PN="Scrapy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A high-level Python Screen Scraping framework"
+HOMEPAGE="http://scrapy.org http://pypi.python.org/pypi/Scrapy/"
+SRC_URI="mirror://pypi/S/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boto doc examples ibl test ssl"
+PYTHON_MODNAME="scrapy scrapyd"
+
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-python/django
+		net-ftp/vsftpd
+	)"
+RDEPEND="dev-libs/libxml2[python]
+	boto? ( dev-python/boto )
+	dev-python/imaging
+	dev-python/lxml
+	ibl? ( dev-python/numpy )
+	ssl? ( dev-python/pyopenssl )
+	dev-python/setuptools
+	dev-python/simplejson
+	dev-python/twisted
+	dev-python/twisted-conch
+	dev-python/twisted-mail
+	dev-python/twisted-web
+	>=dev-python/w3lib-1.1"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		emake -C docs html || die "emake html failed"
+	fi
+}
+
+src_test() {
+	testing() {
+		# PYTHOPATH should be build-$PYTHON_ABI/lib, but causes a test fail.
+		# Not all content is copied across to build-$PYTHON_ABI/lib, and
+		# PYTHONPATH again requires an abs path.
+		echo PYTHONPATH="${PWD}" bin/runtests.sh
+		PYTHONPATH="${PWD}"/ bin/runtests.sh
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		dohtml -r "${S}"/docs/build/html/
+	fi
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins -r "${S}"/examples/*
+	fi
+}
diff --git a/dev-python/simplejson/simplejson-2.5.0.ebuild b/dev-python/simplejson/simplejson-2.5.0.ebuild
index f8fb23789717..9c2144b55cd8 100644
--- a/dev-python/simplejson/simplejson-2.5.0.ebuild
+++ b/dev-python/simplejson/simplejson-2.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-2.5.0.ebuild,v 1.3 2012/05/18 05:51:18 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-2.5.0.ebuild,v 1.4 2012/05/27 13:08:36 maekke Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
new file mode 100644
index 000000000000..c82a24ed0a47
--- /dev/null
+++ b/dev-python/unidecode/Manifest
@@ -0,0 +1 @@
+DIST Unidecode-0.04.9.tar.gz 196659 RMD160 8ca1c7bb80dcb313b93d3bb6d47576c106e7a14e SHA1 c705b71ea08978012b5800f038b1de1a3ba81426 SHA256 95df723427e7e1872349e2c3aef54c77c1df48fa57563d050bf56f43ba1d4d14
diff --git a/dev-python/unidecode/metadata.xml b/dev-python/unidecode/metadata.xml
new file mode 100644
index 000000000000..ff4ebe228458
--- /dev/null
+++ b/dev-python/unidecode/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>sochotnicky@gentoo.org</email>
+		<name>Stanislav Ochotnicky</name>
+	</maintainer>
+	<longdescription lang="en">
+This is a Python port of Text::Unidecode Perl module
+
+It often happens that you have text data in Unicode, but you need to represent it in ASCII. For example when integrating with legacy code that doesn't support Unicode, or for ease of entry of non-Roman names on a US keyboard, or when constructing ASCII machine identifiers from human-readable Unicode strings that should still be somewhat intelligeble (a popular example of this is when making an URL slug from an article title).
+
+In most of these examples you could represent Unicode characters as "???" or "\15BA\15A0\1610", to mention two extreme cases. But that's nearly useless to someone who actually wants to read what the text says.
+
+What Unidecode provides is a middle road: function unidecode() takes Unicode data and tries to represent it in ASCII characters (i.e., the universally displayable characters between 0x00 and 0x7F), where the compromises taken when mapping between two character sets are chosen to be near what a human with a US keyboard would choose.
+
+Note that this module generally produces better results than simply stripping accents from characters (which can be done in Python with built-in functions). It is based on hand-tuned character mappings that for example also contain ASCII approximations for symbols and non-Latin alphabets.
+	</longdescription>
+</pkgmetadata>
+
diff --git a/dev-python/unidecode/unidecode-0.04.9.ebuild b/dev-python/unidecode/unidecode-0.04.9.ebuild
new file mode 100644
index 000000000000..3224add90f9c
--- /dev/null
+++ b/dev-python/unidecode/unidecode-0.04.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unidecode/unidecode-0.04.9.ebuild,v 1.2 2012/05/27 21:41:18 sochotnicky Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS=""
+
+inherit distutils
+
+S="${WORKDIR}/Unidecode-${PV}"
+
+DESCRIPTION="Module providing ASCII transliterations of Unicode text"
+HOMEPAGE="http://pypi.python.org/pypi/Unidecode"
+SRC_URI="mirror://pypi/U/Unidecode/Unidecode-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-ruby/builder/builder-2.1.2-r1.ebuild b/dev-ruby/builder/builder-2.1.2-r1.ebuild
index 46e4d8dc10ca..2d24fb5dc803 100644
--- a/dev-ruby/builder/builder-2.1.2-r1.ebuild
+++ b/dev-ruby/builder/builder-2.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r1.ebuild,v 1.20 2011/03/07 12:04:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-2.1.2-r1.ebuild,v 1.21 2012/05/27 17:34:43 maekke Exp $
 
 EAPI=2
 USE_RUBY="ruby18 jruby"
@@ -18,7 +18,7 @@ SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
diff --git a/dev-ruby/hoe/hoe-2.12.5.ebuild b/dev-ruby/hoe/hoe-2.12.5.ebuild
index 3e9678da97c0..39d7e7dbfb16 100644
--- a/dev-ruby/hoe/hoe-2.12.5.ebuild
+++ b/dev-ruby/hoe/hoe-2.12.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.12.5.ebuild,v 1.3 2012/05/26 09:40:24 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/hoe/hoe-2.12.5.ebuild,v 1.4 2012/05/27 14:48:20 maekke Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -19,7 +19,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/json/json-1.5.4-r1.ebuild b/dev-ruby/json/json-1.5.4-r1.ebuild
index bf4c1238345a..139012919691 100644
--- a/dev-ruby/json/json-1.5.4-r1.ebuild
+++ b/dev-ruby/json/json-1.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.5.4-r1.ebuild,v 1.2 2012/05/20 21:01:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.5.4-r1.ebuild,v 1.3 2012/05/27 13:54:34 maekke Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 jruby ruby19"
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension."
 HOMEPAGE="http://json.rubyforge.org/"
 LICENSE="|| ( Ruby GPL-2 )"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/minitest/minitest-2.8.1.ebuild b/dev-ruby/minitest/minitest-2.8.1.ebuild
index 90cac5d2309f..8322a24777cd 100644
--- a/dev-ruby/minitest/minitest-2.8.1.ebuild
+++ b/dev-ruby/minitest/minitest-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-2.8.1.ebuild,v 1.3 2012/05/20 21:01:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-2.8.1.ebuild,v 1.4 2012/05/27 14:51:19 maekke Exp $
 
 EAPI=2
 # jruby → tests fail, reported upstream
@@ -19,7 +19,7 @@ HOMEPAGE="http://rubyforge.org/projects/bfts"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/racc/racc-1.4.6-r1.ebuild b/dev-ruby/racc/racc-1.4.6-r1.ebuild
index 1207dc7a9daf..79ddf7bcec54 100644
--- a/dev-ruby/racc/racc-1.4.6-r1.ebuild
+++ b/dev-ruby/racc/racc-1.4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.6-r1.ebuild,v 1.5 2012/05/26 10:08:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.6-r1.ebuild,v 1.6 2012/05/27 17:45:54 maekke Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.loveruby.net/en/racc.html"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "dev-ruby/rake test? ( virtual/ruby-test-unit )"
diff --git a/dev-ruby/rake/rake-0.8.7-r6.ebuild b/dev-ruby/rake/rake-0.8.7-r6.ebuild
index ca63f94bd138..9d9d0940c166 100644
--- a/dev-ruby/rake/rake-0.8.7-r6.ebuild
+++ b/dev-ruby/rake/rake-0.8.7-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/rake-0.8.7-r6.ebuild,v 1.5 2012/05/20 21:00:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/rake-0.8.7-r6.ebuild,v 1.6 2012/05/27 13:47:02 maekke Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -16,7 +16,7 @@ SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bash-completion doc"
 
 #ruby_add_bdepend test dev-ruby/flexmock
diff --git a/dev-ruby/rdoc/rdoc-3.12.ebuild b/dev-ruby/rdoc/rdoc-3.12.ebuild
index 3cc28e3da0de..514067dc4112 100644
--- a/dev-ruby/rdoc/rdoc-3.12.ebuild
+++ b/dev-ruby/rdoc/rdoc-3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-3.12.ebuild,v 1.5 2012/05/20 21:03:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-3.12.ebuild,v 1.6 2012/05/27 17:50:43 maekke Exp $
 
 EAPI=3
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/rdoc/rdoc/"
 
 LICENSE="Ruby MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~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 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index a805797a5d65..69ae38f154c8 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1 +1,2 @@
+DIST gettext-2.2.0.gem 169472 RMD160 b244912f12c48df505b869e85d17dd040f31e2eb SHA1 e946ac8dd750d3dc9c317950b1a4b683885c418b SHA256 3c687dffd0046c6cbf0b066feb9c5236905f30949af389eba1d3f420b6ff6532
 DIST ruby-gettext-2.1.0_p20100728.tar.bz2 139060 RMD160 59571e534b57309e0c5a24bc8814871dd3352c10 SHA1 0d5a7970c4392335865277515556a2a8e7e39ce6 SHA256 ba6656321ac6ed549afc5271e7e4911097852b136c4bebc96cdd771726fcbf2f
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-2.2.0.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-2.2.0.ebuild
new file mode 100644
index 000000000000..cde5cb7a3f69
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-2.2.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gettext/ruby-gettext-2.2.0.ebuild,v 1.1 2012/05/27 06:46:38 graaff Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ruby19 jruby ree18"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_TASK_DOC="yard"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="http://www.yotabanana.com/hiki/ruby-gettext.html"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+IUSE="doc test"
+SLOT="0"
+LICENSE="Ruby"
+
+ruby_add_rdepend ">=dev-ruby/locale-2.0.5"
+
+RDEPEND="${RDEPEND}
+	sys-devel/gettext"
+DEPEND="${DEPEND}
+	sys-devel/gettext"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+ruby_add_bdepend "test? ( || ( virtual/ruby-test-unit dev-ruby/test-unit:2 ) )"
+
+all_ruby_prepare() {
+	# Add missing require on yard.
+	sed -i -e '19i require "yard"' Rakefile || die
+}
+
+each_ruby_test() {
+	# Upstream tries to daisy-chain rake calls but they fail badly
+	# with our setup, so run it manually.
+	${RUBY} -C test -S rake test || die "tests failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r samples
+}
diff --git a/dev-ruby/rubyforge/rubyforge-2.0.4-r2.ebuild b/dev-ruby/rubyforge/rubyforge-2.0.4-r2.ebuild
index 97e1d1fdf54d..34f6e8875782 100644
--- a/dev-ruby/rubyforge/rubyforge-2.0.4-r2.ebuild
+++ b/dev-ruby/rubyforge/rubyforge-2.0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyforge/rubyforge-2.0.4-r2.ebuild,v 1.5 2012/05/20 21:02:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyforge/rubyforge-2.0.4-r2.ebuild,v 1.6 2012/05/27 14:45:19 maekke Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://codeforpeople.rubyforge.org/rubyforge/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend '>=dev-ruby/json-1.1.7'
diff --git a/dev-ruby/rubygems/rubygems-1.8.24.ebuild b/dev-ruby/rubygems/rubygems-1.8.24.ebuild
index ddd46389341b..8b1e08e28049 100644
--- a/dev-ruby/rubygems/rubygems-1.8.24.ebuild
+++ b/dev-ruby/rubygems/rubygems-1.8.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.8.24.ebuild,v 1.2 2012/05/20 20:57:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.8.24.ebuild,v 1.3 2012/05/27 17:39:39 maekke Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ LICENSE="|| ( Ruby MIT )"
 
 SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
 
diff --git a/dev-util/dialog/dialog-1.1.20120215.ebuild b/dev-util/dialog/dialog-1.1.20120215.ebuild
index 3fcd214e1515..46d47e3963fc 100644
--- a/dev-util/dialog/dialog-1.1.20120215.ebuild
+++ b/dev-util/dialog/dialog-1.1.20120215.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20120215.ebuild,v 1.4 2012/05/26 20:30:06 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-1.1.20120215.ebuild,v 1.5 2012/05/27 08:37:09 hwoarang Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
index e15ea0b8618d..fa197ccaf951 100644
--- a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
+++ b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild,v 1.3 2012/05/26 16:09:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild,v 1.4 2012/05/27 15:16:25 jer Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/dev-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild
index 8e6b07c00ba1..cdf426f00aa4 100644
--- a/dev-util/ragel/ragel-6.7-r1.ebuild
+++ b/dev-util/ragel/ragel-6.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ragel-6.7-r1.ebuild,v 1.1 2012/05/22 23:41:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ragel/ragel-6.7-r1.ebuild,v 1.2 2012/05/27 13:12:56 maekke Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="vim-syntax"
 
 DEPEND=""
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index c667d180899b..b3294af83c0e 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -1 +1,2 @@
 DIST stratagus_2.2.5.5.orig.tar.gz 976972 RMD160 371ded2944db34b930a337ed5a08eca32f772541 SHA1 c7b9ac70c96289ba964919fa9add93e93c879b0d SHA256 e0c8fe592ee3ad0c5806937aa950aad39019780de5344987366fe76901377285
+DIST stratagus_2.2.6.orig.tar.gz 921369 RMD160 6143371de078dbff88ceb81df0ba6540c342e444 SHA1 aebd554418b88ccda63b6e82555ee01bbfe0a88a SHA256 d3678b75aa49e211d6cf5654d6b1b9bb451df9205a28d4ce98ed3459e3f1258c
diff --git a/games-engines/stratagus/files/stratagus-2.2.6-build.patch b/games-engines/stratagus/files/stratagus-2.2.6-build.patch
new file mode 100644
index 000000000000..348c1145636b
--- /dev/null
+++ b/games-engines/stratagus/files/stratagus-2.2.6-build.patch
@@ -0,0 +1,75 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun May 20 17:02:54 UTC 2012
+Subject: build-system
+
+respect system LDFLAGS
+make install paths modifiable
+
+included upstream: https://bazaar.launchpad.net/~stratagus/stratagus/trunk/revision/8279
+also merged: https://bazaar.launchpad.net/~stratagus/stratagus/trunk/revision/8061
+
+--- stratagus_2.2.6.orig/CMakeLists.txt
++++ stratagus_2.2.6.orig/CMakeLists.txt
+@@ -587,6 +587,12 @@
+ 	set(ENABLE_TOUCHSCREEN ON)
+ endif()
+ 
++# Stratagus needs to have char by default signed
++# No idea how to tell this to other compilers
++if(CMAKE_COMPILER_IS_GNUCXX)
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char")
++endif()
++
+ check_function_exists("strcasestr" HAVE_STRCASESTR)
+ check_function_exists("strnlen" HAVE_STRNLEN)
+ 
+@@ -602,9 +608,7 @@
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+ 
+ if(ENABLE_STRIP)
+-	set(CMAKE_EXE_LINKER_FLAGS "-s")
+-else()
+-	set(CMAKE_EXE_LINKER_FLAGS "")
++	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s")
+ endif()
+ 
+ # Print compile info
+@@ -836,15 +840,22 @@
+ 
+ ########### install files ###############
+ 
+-install(TARGETS stratagus DESTINATION games)
+-install(TARGETS png2stratagus DESTINATION bin)
++# install paths
++set(BINDIR "bin" CACHE PATH "Where to install binaries")
++set(SBINDIR "sbin" CACHE PATH "Where to install metaserver binary")
++set(DOCDIR "share/doc/stratagus" CACHE STRING "Sets the doc directory to a non-default location.")
++set(MANDIR "share/man/man6" CACHE STRING "Sets the man directory to a non-default location.")
++set(STRATAGUS_HEADERS "include" CACHE STRING "Where to install stratagus headers.")
++
++install(TARGETS stratagus DESTINATION ${BINDIR})
++install(TARGETS png2stratagus DESTINATION ${BINDIR})
+ 
+ if(SQLITE_FOUND)
+-	install(TARGETS metaserver DESTINATION sbin)
++	install(TARGETS metaserver DESTINATION ${SBINDIR})
+ endif()
+ 
+ if(ENABLE_DOC AND DOXYGEN_FOUND)
+-	install(FILES doc/stratagus.6 DESTINATION share/man/man6)
++	install(FILES doc/stratagus.6 DESTINATION ${MANDIR})
+ 	install(FILES
+ 		doc/development.html
+ 		doc/faq.html
+@@ -858,9 +869,9 @@
+ 		doc/README-SDL.txt
+ 		DESTINATION share/doc/stratagus
+ 	)
+-	install(DIRECTORY doc/graphics doc/scripts ${CMAKE_CURRENT_BINARY_DIR}/doxygen DESTINATION share/doc/stratagus)
++	install(DIRECTORY doc/graphics doc/scripts ${CMAKE_CURRENT_BINARY_DIR}/doxygen DESTINATION ${DOCDIR})
+ endif(ENABLE_DOC AND DOXYGEN_FOUND)
+ 
+ if(ENABLE_DEV)
+-	install(FILES ${gameheaders_HDRS} DESTINATION include)
++	install(FILES ${gameheaders_HDRS} DESTINATION ${STRATAGUS_HEADERS})
+ endif()
diff --git a/games-engines/stratagus/stratagus-2.2.6.ebuild b/games-engines/stratagus/stratagus-2.2.6.ebuild
new file mode 100644
index 000000000000..3b1688d077d9
--- /dev/null
+++ b/games-engines/stratagus/stratagus-2.2.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.6.ebuild,v 1.1 2012/05/27 20:24:24 hasufell Exp $
+
+EAPI=2
+inherit cmake-utils eutils games
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="http://stratagus.sourceforge.net/"
+SRC_URI="http://launchpad.net/stratagus/trunk/${PV}/+download/stratagus_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc mikmod mng theora vorbis"
+
+RDEPEND="x11-libs/libX11
+	virtual/opengl
+	dev-db/sqlite:3
+	>=dev-lang/lua-5
+	dev-lua/toluapp
+	media-libs/libpng:0
+	media-libs/libsdl[audio,opengl,video]
+	bzip2? ( app-arch/bzip2 )
+	mikmod? ( media-libs/libmikmod )
+	mng? ( media-libs/libmng )
+	theora? ( media-libs/libtheora media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${PN}_${PV}.orig
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINDIR="${GAMES_BINDIR}"
+		-DSBINDIR="${GAMES_BINDIR}"
+		$(cmake-utils_use_with bzip2)
+		$(cmake-utils_use_with debug)
+		$(cmake-utils_use_enable doc)
+		$(cmake-utils_use_with mikmod)
+		$(cmake-utils_use_with mng)
+		$(cmake-utils_use_with theora)
+		$(cmake-utils_use_with vorbis oggvorbis)
+		-DENABLE_DEV=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	prepalldocs
+	prepgamesdirs
+}
diff --git a/games-mud/tf/files/tf-50_beta8-pcre.patch b/games-mud/tf/files/tf-50_beta8-pcre.patch
new file mode 100644
index 000000000000..4ff5e44db91b
--- /dev/null
+++ b/games-mud/tf/files/tf-50_beta8-pcre.patch
@@ -0,0 +1,61 @@
+From f61b5859d69c2d99264182f60f5ae1e430812b59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
+Date: Fri, 10 Feb 2012 13:55:46 +0100
+Subject: [PATCH] Fix build with PCRE-8.30+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch fixes build with the latest PCRE release which removes some
+obsolete code tinyfugue still uses, namely pcre_info().
+
+Signed-off-by: Petr Šabata <contyk@redhat.com>
+---
+ src/macro.c   |    3 ++-
+ src/pattern.c |    2 +-
+ src/pattern.h |    2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/macro.c b/src/macro.c
+index ac28fc9..b492717 100644
+--- a/src/macro.c
++++ b/src/macro.c
+@@ -893,7 +893,8 @@ static int complete_macro(Macro *spec, unsigned int hash, int num,
+     }
+     spec->attr &= ~F_NONE;
+     if (spec->nsubattr) {
+-	int n = pcre_info(spec->trig.ri->re, NULL, NULL);
++	int n;
++	pcre_fullinfo(spec->trig.ri->re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+ 	for (i = 0; i < spec->nsubattr; i++) {
+ 	    spec->subattr[i].attr &= ~F_NONE;
+ 	    if (spec->subattr[i].subexp > n) {
+diff --git a/src/pattern.c b/src/pattern.c
+index 047a44a..a7228ff 100644
+--- a/src/pattern.c
++++ b/src/pattern.c
+@@ -151,7 +151,7 @@ static RegInfo *tf_reg_compile_fl(const char *pattern, int optimize,
+ 	    emsg ? emsg : "unknown error");
+ 	goto tf_reg_compile_error;
+     }
+-    n = pcre_info(ri->re, NULL, NULL);
++    pcre_fullinfo(ri->re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+     if (n < 0) goto tf_reg_compile_error;
+     ri->ovecsize = 3 * (n + 1);
+     ri->ovector = dmalloc(NULL, sizeof(int) * ri->ovecsize, file, line);
+diff --git a/src/pattern.h b/src/pattern.h
+index 1eec0f9..cbe9af9 100644
+--- a/src/pattern.h
++++ b/src/pattern.h
+@@ -10,7 +10,7 @@
+ #ifndef PATTERN_H
+ #define PATTERN_H
+ 
+-#include "pcre-2.08/pcre.h"
++#include <pcre.h>
+ 
+ typedef struct RegInfo {
+     pcre *re;
+-- 
+1.7.7.6
+
diff --git a/games-mud/tf/tf-50_beta8-r1.ebuild b/games-mud/tf/tf-50_beta8-r1.ebuild
index 7009c09e8768..ec74f40817a2 100644
--- a/games-mud/tf/tf-50_beta8-r1.ebuild
+++ b/games-mud/tf/tf-50_beta8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/tf-50_beta8-r1.ebuild,v 1.2 2011/10/01 03:19:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/tf-50_beta8-r1.ebuild,v 1.3 2012/05/27 21:09:58 mr_bones_ Exp $
 EAPI=2
 
 inherit games
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${DISTDIR}"/tf-all*patch.txt )
+PATCHES=( "${DISTDIR}"/tf-all*patch.txt "${FILESDIR}"/${P}-pcre.patch )
 
 src_configure() {
 	STRIP=: egamesconf \
diff --git a/games-strategy/uqm/uqm-0.7.0-r1.ebuild b/games-strategy/uqm/uqm-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..5ff0c2b6de53
--- /dev/null
+++ b/games-strategy/uqm/uqm-0.7.0-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.7.0-r1.ebuild,v 1.1 2012/05/28 02:45:04 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils multilib games
+
+DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
+HOMEPAGE="http://sc2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
+	mirror://sourceforge/sc2/${P}-content.uqm
+	music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm )
+	voice? ( mirror://sourceforge/sc2/${P}-voice.uqm )
+	remix? ( mirror://sourceforge/sc2/${PN}-remix-pack1.zip \
+		mirror://sourceforge/sc2/${PN}-remix-pack2.zip \
+		mirror://sourceforge/sc2/${PN}-remix-pack3.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="music opengl remix voice"
+
+RDEPEND="media-libs/libvorbis
+	virtual/jpeg
+	>=media-libs/libpng-1.4
+	media-libs/libsdl
+	media-libs/sdl-image
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/libmikmod"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+src_unpack() {
+	unpack ${P}-source.tgz
+}
+
+src_prepare() {
+	local myopengl
+
+	# Because the new 0.6.* source archives have
+	# everything in a subdir called "sc2". This,
+	# I have found, is the simplest way to get
+	# around that problem. (That doesn't change
+	# the fact that the rest of this ebuild is
+	# very nasty. I was not able to clean it up.)
+	mv ./sc2/* ./
+
+	use opengl \
+		&& myopengl=opengl \
+		|| myopengl=pure
+
+	cat <<-EOF > config.state
+	CHOICE_debug_VALUE='nodebug'
+	CHOICE_graphics_VALUE='${myopengl}'
+	CHOICE_sound_VALUE='mixsdl'
+	CHOICE_accel_VALUE='plainc'
+	INPUT_install_prefix_VALUE='${GAMES_PREFIX}'
+	INPUT_install_bindir_VALUE='\$prefix/bin'
+	INPUT_install_libdir_VALUE='\$prefix/lib'
+	INPUT_install_sharedir_VALUE='${GAMES_DATADIR}/'
+	EOF
+
+	# Take out the read so we can be non-interactive.
+	sed -i \
+		-e '/read CHOICE/d' build/unix/menu_functions \
+		|| die "sed menu_functions failed"
+
+	# support the user's CFLAGS.
+	sed -i \
+		-e "s/-O3/${CFLAGS}/" build/unix/build.config \
+		|| die "sed build.config failed"
+
+	sed -i \
+		-e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" build/unix/uqm-wrapper.in \
+		|| die "sed uqm-wrapper.in failed"
+}
+
+src_compile() {
+	./build.sh uqm || die "build failed"
+}
+
+src_install() {
+	# Using the included install scripts seems quite painful.
+	# This manual install is totally fragile but maybe they'll
+	# use a sane build system for the next release.
+	newgamesbin uqm-wrapper uqm || die "newgamesbin failed"
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe uqm || die "doexe failed"
+
+	insinto "${GAMES_DATADIR}"/${PN}/content/packages
+	doins "${DISTDIR}"/${P}-content.uqm || die "doins failed"
+	echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version \
+		|| die "creating version file failed"
+
+	insinto "${GAMES_DATADIR}"/${PN}/content/addons
+	if use music; then
+		doins "${DISTDIR}"/${P}-3domusic.uqm || die "doins failed"
+	fi
+
+	if use voice; then
+		doins "${DISTDIR}"/${P}-voice.uqm || die "doins failed"
+	fi
+
+	if use remix; then
+		insinto "${GAMES_DATADIR}"/${PN}/content/addons/uqmremix
+		doins "${DISTDIR}"/${PN}-remix-pack{1,2,3}.zip || die "doins failed"
+	fi
+
+	dodoc AUTHORS ChangeLog Contributing README WhatsNew doc/users/manual.txt
+	docinto devel
+	dodoc doc/devel/[!n]*
+	docinto devel/netplay
+	dodoc doc/devel/netplay/*
+	make_desktop_entry uqm "The Ur-Quan Masters"
+	prepgamesdirs
+
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	if use remix ; then
+		echo
+		elog "To hear all the remixed music made by the The Ur-Quan Masters"
+		elog "project's Precursors Team instead of the original ones,"
+		elog "start the game with:"
+		elog "    --addon uqmremix"
+		echo
+	fi
+}
diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
index aefaf8c3ce0b..2c07cae7c448 100644
--- a/games-strategy/wargus/Manifest
+++ b/games-strategy/wargus/Manifest
@@ -1,2 +1,3 @@
 DIST wargus.png 7561 RMD160 b8ce62f3a60045b8b32a0f459df1849496d2402e SHA1 eb14c74b682fdeb6014f5951a56c7f66ede79f23 SHA256 f8190a41f5131c45c76cb6d91c97e7fcf48c4fcd26cb231802c224c7e19ac0bd
 DIST wargus_2.2.5.5.orig.tar.gz 3605444 RMD160 3da58129f9a3221e306afe019655072fa25e230a SHA1 a34511c50d1f0ac838558780daa790f7585113d1 SHA256 561d0ac5e88abcd5663fca1f7793ee20739aa0d641420bf0a6b7424ebd4ab14f
+DIST wargus_2.2.6.orig.tar.gz 3655036 RMD160 4319b1a658e460687257bf1f9bba75fe9c4d8167 SHA1 2373af8f23f14056f56065e5cfdc7a1ebf9665b7 SHA256 88c300661836d6eb6f5c7859ef8ba292455a5cf3dae274e2b6ac9bc3497622fe
diff --git a/games-strategy/wargus/files/wargus-2.2.6-build.patch b/games-strategy/wargus/files/wargus-2.2.6-build.patch
new file mode 100644
index 000000000000..4825b341e646
--- /dev/null
+++ b/games-strategy/wargus/files/wargus-2.2.6-build.patch
@@ -0,0 +1,77 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun May 27 18:28:48 UTC 2012
+Subject: build system
+
+make paths modifiable
+respect LDFLAGs
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -30,6 +30,13 @@
+ cmake_minimum_required(VERSION 2.6)
+ set(WARGUS_VERSION 2.2.6)
+ 
++########### PATH OPTIONS ###############
++set(BINDIR "bin" CACHE PATH "Where to install binaries")
++set(SHAREDIR "share/games/stratagus/wargus" CACHE PATH "Where to install data files")
++set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "Sets the root of data directories to a non-default location")
++set(ICONDIR "${DATAROOTDIR}/pixmaps" CACHE PATH "Sets the icon directory for desktop entry to a non-default location.")
++set(DESKTOPDIR "${DATAROOTDIR}/applications" CACHE PATH "Sets the desktop file directory for desktop entry to a non-default location.")
++
+ # Wargus sources
+ 
+ set(pudconvert_SRCS
+@@ -154,8 +161,13 @@
+ endif()
+ 
+ if (NOT WIN32 AND NOT MAEMO)
+-	add_definitions(-DDATA_PATH="${CMAKE_INSTALL_PREFIX}/share/games/stratagus/wargus")
+-	add_definitions(-DSCRIPTS_PATH="${CMAKE_INSTALL_PREFIX}/share/games/stratagus/wargus")
++	if(NOT IS_ABSOLUTE "${SHAREDIR}")
++		set(var "${CMAKE_INSTALL_PREFIX}/${SHAREDIR}")
++	else()
++		set(var "${SHAREDIR}")
++	endif()
++	add_definitions(-DDATA_PATH="${var}")
++	add_definitions(-DSCRIPTS_PATH="${var}")
+ 	add_definitions(-DSTRATAGUS_BIN="${STRATAGUS}")
+ endif()
+ 
+@@ -169,9 +181,7 @@
+ endif()
+ 
+ if(ENABLE_STRIP)
+-	set(CMAKE_EXE_LINKER_FLAGS "-s")
+-else()
+-	set(CMAKE_EXE_LINKER_FLAGS "")
++	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s")
+ endif()
+ 
+ # Compile Wargus
+@@ -232,16 +242,16 @@
+ 
+ ########### install files ###############
+ 
+-install(TARGETS wargus DESTINATION games)
+-install(TARGETS pudconvert wartool DESTINATION bin)
+-install(FILES wargus.png DESTINATION share/pixmaps)
+-install(FILES wargus.desktop DESTINATION share/applications)
+-
+-install(DIRECTORY campaigns maps scripts DESTINATION share/games/stratagus/wargus)
+-install(FILES contrib/red_cross.png DESTINATION share/games/stratagus/wargus/graphics/missiles)
+-install(FILES contrib/cross.png DESTINATION share/games/stratagus/wargus/graphics/ui/cursors)
+-install(FILES contrib/food.png contrib/health.png contrib/health2.png contrib/mana.png contrib/mana2.png contrib/ore,stone,coal.png contrib/score.png DESTINATION share/games/stratagus/wargus/graphics/ui)
++install(TARGETS wargus DESTINATION ${BINDIR})
++install(TARGETS pudconvert wartool DESTINATION ${BINDIR})
++install(FILES wargus.png DESTINATION ${ICONDIR})
++install(FILES wargus.desktop DESTINATION ${DESKTOPDIR})
++
++install(DIRECTORY campaigns maps scripts DESTINATION ${SHAREDIR})
++install(FILES contrib/red_cross.png DESTINATION ${SHAREDIR}/graphics/missiles)
++install(FILES contrib/cross.png DESTINATION ${SHAREDIR}/graphics/ui/cursors)
++install(FILES contrib/food.png contrib/health.png contrib/health2.png contrib/mana.png contrib/mana2.png contrib/ore,stone,coal.png contrib/score.png DESTINATION ${SHAREDIR}/graphics/ui)
+ 
+ if(MAEMO)
+-	install(TARGETS warextract DESTINATION bin)
++	install(TARGETS warextract DESTINATION ${BINDIR})
+ endif()
diff --git a/games-strategy/wargus/wargus-2.2.6.ebuild b/games-strategy/wargus/wargus-2.2.6.ebuild
new file mode 100644
index 000000000000..f35ee731d5dc
--- /dev/null
+++ b/games-strategy/wargus/wargus-2.2.6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wargus/wargus-2.2.6.ebuild,v 1.3 2012/05/27 23:01:31 hasufell Exp $
+
+EAPI=2
+inherit eutils cdrom cmake-utils gnome2-utils games
+
+DESCRIPTION="Warcraft II for the Stratagus game engine (Needs WC2 DOS CD)"
+HOMEPAGE="http://wargus.sourceforge.net/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=games-engines/stratagus-${PV}*[theora]
+	media-libs/freetype
+	media-libs/libpng:0
+	sys-libs/zlib
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	media-sound/timidity++
+	media-video/ffmpeg2theora
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}_${PV}.orig
+
+src_prepare() {
+	cdrom_get_cds data/rezdat.war
+	epatch "${FILESDIR}/${PN}-2.2.5.5-libpng.patch" \
+		"${FILESDIR}/${P}-build.patch"
+
+	sed \
+		-e "/^Exec/s#/usr/games/wargus#${GAMES_BINDIR}/wargus#" \
+		-i wargus.desktop || die "fixing desktop file failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINDIR="${GAMES_BINDIR}"
+		-DSTRATAGUS="${GAMES_BINDIR}"/stratagus
+		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local dir=${GAMES_DATADIR}/stratagus/${PN}
+
+	"${D}"/usr/games/bin/wartool -m -v "${CDROM_ROOT}"/data "${D}/${dir}" \
+		|| die "Failed to extract data"
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	elog "Enabling OpenGL ingame seems to cause segfaults/crashes."
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.2.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.3.ebuild
index 894b57da8035..38e903aed2e7 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.2.3.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.3.ebuild,v 1.1 2012/05/25 08:15:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.3.ebuild,v 1.2 2012/05/27 23:14:36 mattst88 Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="2"
 IUSE="+cheese +colord +cups +gnome-online-accounts +networkmanager +socialweb"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
 # XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
diff --git a/gnome-base/gnome-js-common/gnome-js-common-0.1.2.ebuild b/gnome-base/gnome-js-common/gnome-js-common-0.1.2.ebuild
index 876027bccaee..b049cd6627ac 100644
--- a/gnome-base/gnome-js-common/gnome-js-common-0.1.2.ebuild
+++ b/gnome-base/gnome-js-common/gnome-js-common-0.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-js-common/gnome-js-common-0.1.2.ebuild,v 1.2 2012/05/05 05:38:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-js-common/gnome-js-common-0.1.2.ebuild,v 1.3 2012/05/28 01:09:50 mattst88 Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ HOMEPAGE="http://gnome.org/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.3.ebuild
index 6cfe72b5aae6..c5414b1c081d 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.3.ebuild,v 1.2 2012/05/05 05:38:09 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.3.ebuild,v 1.3 2012/05/27 17:56:06 mattst88 Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard +udev"
 
 # Latest gsettings-desktop-schemas is needed due to commit e8d1de92
diff --git a/media-fonts/cm-unicode/cm-unicode-0.7.0.ebuild b/media-fonts/cm-unicode/cm-unicode-0.7.0.ebuild
index 75795dc295bb..650898d49ddb 100644
--- a/media-fonts/cm-unicode/cm-unicode-0.7.0.ebuild
+++ b/media-fonts/cm-unicode/cm-unicode-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/cm-unicode/cm-unicode-0.7.0.ebuild,v 1.1 2011/02/21 18:14:24 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/cm-unicode/cm-unicode-0.7.0.ebuild,v 1.2 2012/05/27 13:18:06 yngwin Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-ttf.tar.xz"
 
 LICENSE="OFL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/media-fonts/droid/Manifest b/media-fonts/droid/Manifest
index 8790fbc18ded..86494724a071 100644
--- a/media-fonts/droid/Manifest
+++ b/media-fonts/droid/Manifest
@@ -1,4 +1,3 @@
 DIST DroidSansMonoDotted-112_p1.ttf.bz2 74649 RMD160 db2b67b0a85fef7ad262bf3ed57701bd0a38e1aa SHA1 67a6136f5314c5e8469311701c43dd25dc06f680 SHA256 78e4d9a5adb9cf525ed9e76f9691df8506242710a13d21bf2538a96b781a7ffa
 DIST DroidSansMonoSlashed-112_p1.ttf.bz2 74632 RMD160 62f7e80a1a596c2dd5ceea96360edb2477e0fe6d SHA1 88b605da43e91f7d4329e2a79324cc6f71afb5cd SHA256 75da778420bd26d10cc42cab8152d4ce5fb4b86fa34237e361a1782d4e60577b
-DIST droid-112_p1.tar.gz 2789311 RMD160 264b3df31e579edf70f740c5121aefc0bc5b9f7a SHA1 4ac0164ac9cde471c39bfbf0cc9ccc517bedc56e SHA256 d92661dc57eb2a024bb3b861c88857411a730e59d26791e495f6a1ffac5d13cb
 DIST droid-113-r1.tar.bz2 4227725 RMD160 6c65e08e519d0f68be3a4007d55ce6cd4a556647 SHA1 bae438b0b18517a765084be5c3ee914954fd03ae SHA256 fec9b33203abbc2a5f62a44086de4998dce69649bd78c873e6fd44d1b7d1656e
diff --git a/media-fonts/droid/droid-112_p1.ebuild b/media-fonts/droid/droid-112_p1.ebuild
deleted file mode 100644
index 7501b5e81d93..000000000000
--- a/media-fonts/droid/droid-112_p1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/droid-112_p1.ebuild,v 1.4 2009/09/27 09:39:54 volkmar Exp $
-
-inherit font
-
-# $PV is a build number, use fontforge to find it out. 112 was taken from:
-# http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts;hb=HEAD
-DESCRIPTION="Font family from Google's Android project"
-HOMEPAGE="http://code.google.com/android/RELEASENOTES.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-FONT_S=${WORKDIR}/${PN}
-FONT_SUFFIX="ttf"
-
-RDEPEND=""
-DEPEND=""
diff --git a/media-fonts/droid/droid-113-r2.ebuild b/media-fonts/droid/droid-113-r2.ebuild
new file mode 100644
index 000000000000..d14f9215954b
--- /dev/null
+++ b/media-fonts/droid/droid-113-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/droid-113-r2.ebuild,v 1.1 2012/05/27 13:01:14 yngwin Exp $
+
+EAPI=4
+
+inherit font
+
+MY_PN="${PN/d/D}"
+
+# $PV is a build number, use fontforge to find it out. 113 was taken from:
+# http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts;hb=HEAD
+DESCRIPTION="Font family from Google's Android project"
+HOMEPAGE="http://code.google.com/android/RELEASENOTES.html http://www.cosmix.org/software/"
+SRC_URI="mirror://gentoo/${P}-r1.tar.bz2
+	mirror://gentoo/${MY_PN}SansMonoSlashed-112_p1.ttf.bz2
+	mirror://gentoo/${MY_PN}SansMonoDotted-112_p1.ttf.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
+FONT_CONF=(
+	"${FILESDIR}/59-google-droid-sans-mono.conf"
+	"${FILESDIR}/59-google-droid-sans.conf"
+	"${FILESDIR}/59-google-droid-serif.conf"
+)
+
+src_prepare() {
+	mv "${WORKDIR}/${MY_PN}SansMonoSlashed-112_p1.ttf" \
+		"${S}/${MY_PN}SansMonoSlashed.ttf"
+	mv "${WORKDIR}/${MY_PN}SansMonoDotted-112_p1.ttf" \
+		"${S}/${MY_PN}SansMonoDotted.ttf"
+}
diff --git a/media-fonts/droid/files/59-google-droid-sans-mono.conf b/media-fonts/droid/files/59-google-droid-sans-mono.conf
new file mode 100644
index 000000000000..1cf8bbc1602b
--- /dev/null
+++ b/media-fonts/droid/files/59-google-droid-sans-mono.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Droid Sans Mono</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Sans Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/media-fonts/droid/files/59-google-droid-sans.conf b/media-fonts/droid/files/59-google-droid-sans.conf
new file mode 100644
index 000000000000..80ba66cde815
--- /dev/null
+++ b/media-fonts/droid/files/59-google-droid-sans.conf
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Sans</string>
+    </test>
+    <edit name="fontversion">
+      <int>7</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Sans Hebrew</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>6</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Sans Arabic</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>5</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Sans Thai</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>4</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="lang" compare="not_eq">
+      <string>zh-cn</string>
+      <string>zh-sg</string>
+      <string>zh-hk</string>
+      <string>zh-tw</string>
+      <string>zh</string>
+    </test>
+    <test name="family">
+      <string>Droid Sans Japanese</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>3</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Sans Fallback</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>2</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="lang">
+      <string>zh-cn</string>
+      <string>zh-sg</string>
+      <string>zh-hk</string>
+      <string>zh-tw</string>
+      <string>zh</string>
+    </test>
+    <test name="family">
+      <string>Droid Sans Japanese</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>1</int>
+    </edit>
+  </match>
+  <alias binding="same">
+    <family>Droid Sans Arabic</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Hebrew</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Japanese</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Thai</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Fallback</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Droid Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/media-fonts/droid/files/59-google-droid-serif.conf b/media-fonts/droid/files/59-google-droid-serif.conf
new file mode 100644
index 000000000000..f56b5ed51b4c
--- /dev/null
+++ b/media-fonts/droid/files/59-google-droid-serif.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Droid Serif</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/media-fonts/mgopen/Manifest b/media-fonts/mgopen/Manifest
index e10fca795a2c..ddd7e5ce1467 100644
--- a/media-fonts/mgopen/Manifest
+++ b/media-fonts/mgopen/Manifest
@@ -1,2 +1 @@
-DIST MgOpen-20080519.tar.gz 891086 RMD160 e54c93d8b3649046fafa9189d81e84b7d44a76e5 SHA1 96afebb455caac31a99f3b524789901768c69820 SHA256 9f94c07438152816479d0577694942c902e1219006c371e4b2797236109f0f41
 DIST mgopen-1.1.tar.gz 892402 RMD160 15fc396a74e4fd65b6f47db36dc65e5e7822280d SHA1 31a9a803ad88fbedf54c5fabf3fbd39561f6a026 SHA256 1a426b19b0aa452d6f8e5b85ab6cde3a3ecc1d8d64ff830682e806df336fe095
diff --git a/media-fonts/mgopen/mgopen-1.0.ebuild b/media-fonts/mgopen/mgopen-1.0.ebuild
deleted file mode 100644
index 1225644cbe1a..000000000000
--- a/media-fonts/mgopen/mgopen-1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mgopen/mgopen-1.0.ebuild,v 1.3 2009/09/29 00:11:30 dirtyepic Exp $
-
-inherit font
-
-DISTDATE="20080519"
-
-DESCRIPTION="Magenta MgOpen Typeface Collection for Modern Greek."
-HOMEPAGE="http://www.zvr.gr/typo/mgopen/index"
-# unversioned distfile.  mirror locally.
-SRC_URI="mirror://gentoo/MgOpen-${DISTDATE}.tar.gz"
-
-LICENSE="MagentaMgOpen"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-FONT_S=${S}
-
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/mgopen/mgopen-1.1.ebuild b/media-fonts/mgopen/mgopen-1.1.ebuild
index c26009aef170..00450152249c 100644
--- a/media-fonts/mgopen/mgopen-1.1.ebuild
+++ b/media-fonts/mgopen/mgopen-1.1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mgopen/mgopen-1.1.ebuild,v 1.2 2009/09/29 00:11:30 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mgopen/mgopen-1.1.ebuild,v 1.4 2012/05/27 12:08:45 yngwin Exp $
 
 inherit font
 
-DESCRIPTION="Magenta MgOpen Typeface Collection for Modern Greek."
-HOMEPAGE="http://www.zvr.gr/typo/mgopen/index"
+DESCRIPTION="Magenta MgOpen typeface collection for Modern Greek"
+HOMEPAGE="http://www.ellak.gr/pub/fonts/mgopen/index.en.html"
 # mirrored from debian tarball
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="MagentaMgOpen"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 FONT_S=${S}
diff --git a/media-fonts/sil-abyssinica/sil-abyssinica-1.200.ebuild b/media-fonts/sil-abyssinica/sil-abyssinica-1.200.ebuild
index 5b8e33a69993..54b0a0ce09b6 100644
--- a/media-fonts/sil-abyssinica/sil-abyssinica-1.200.ebuild
+++ b/media-fonts/sil-abyssinica/sil-abyssinica-1.200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-abyssinica/sil-abyssinica-1.200.ebuild,v 1.2 2012/01/07 23:06:45 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-abyssinica/sil-abyssinica-1.200.ebuild,v 1.3 2012/05/27 12:21:12 yngwin Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_PN}${PV}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-arabicfonts/Manifest b/media-fonts/sil-arabicfonts/Manifest
index 774b6e18cc8d..9f952ee859b6 100644
--- a/media-fonts/sil-arabicfonts/Manifest
+++ b/media-fonts/sil-arabicfonts/Manifest
@@ -1,3 +1,2 @@
 DIST LateefRegOT_1.001.zip 121996 RMD160 c6ba409f4564c36038e65549e24990c896484482 SHA1 376e9c645a43e9e11093f4e2558f871fbad08d14 SHA256 ca3f84555007975d69c18f3d958f6a1a1c79c5b550c13d168d600e07efac1c09
 DIST ScheherazadeRegOT-1.005.zip 125091 RMD160 731313d9b80895067477cad72e2a3494380f95a5 SHA1 f3f42177ce4393b1403c1d40840880752e7b7415 SHA256 5d621578fb946473492c3bd1f1a59fe55080dd7949e3bf28af01fa4fe2859e8b
-DIST ttf-sil-arabicfonts-1.0.tgz 217036 RMD160 957e02b738d92f39471b1eb7c2d5347582e4e0f9 SHA1 522bd731a13795b852a1639779d8a49e8c9d47bf SHA256 7b65a311ccfa7eca824b6a3d5b4cd72f9669e7425b9a5edf57a9c0a3b446d888
diff --git a/media-fonts/sil-arabicfonts/sil-arabicfonts-1.0.ebuild b/media-fonts/sil-arabicfonts/sil-arabicfonts-1.0.ebuild
deleted file mode 100644
index 06a60686f2a0..000000000000
--- a/media-fonts/sil-arabicfonts/sil-arabicfonts-1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-arabicfonts/sil-arabicfonts-1.0.ebuild,v 1.2 2008/05/19 02:34:43 dirtyepic Exp $
-
-inherit font
-
-DESCRIPTION="SIL Opentype Unicode fonts for Arabic Languages"
-HOMEPAGE="http://scripts.sil.org/ArabicFonts"
-SRC_URI="mirror://gentoo/ttf-${PN}-${PV}.tgz"
-
-LICENSE="SIL-freeware"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DOCS=""
-FONT_SUFFIX="ttf"
-S="${WORKDIR}/ttf-${P}"
-FONT_S="${S}"
diff --git a/media-fonts/sil-arabicfonts/sil-arabicfonts-1.005.ebuild b/media-fonts/sil-arabicfonts/sil-arabicfonts-1.005.ebuild
index 3902d3a1709a..66a704b618f0 100644
--- a/media-fonts/sil-arabicfonts/sil-arabicfonts-1.005.ebuild
+++ b/media-fonts/sil-arabicfonts/sil-arabicfonts-1.005.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-arabicfonts/sil-arabicfonts-1.005.ebuild,v 1.1 2012/01/07 23:03:12 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-arabicfonts/sil-arabicfonts-1.005.ebuild,v 1.2 2012/05/27 12:25:12 yngwin Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/ScheherazadeRegOT-1.005.zip
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
 DEPEND="app-arch/unzip"
 RDEPEND=""
diff --git a/media-fonts/sil-charis/Manifest b/media-fonts/sil-charis/Manifest
index 848fc66f04ef..7eb253af2cf7 100644
--- a/media-fonts/sil-charis/Manifest
+++ b/media-fonts/sil-charis/Manifest
@@ -1,4 +1,2 @@
 DIST CharisSIL-4.110.zip 3435758 RMD160 4221bdbf201f79d4ffc07a44a89bc1b702313249 SHA1 ab14a91efb5895e3e4c93e824dd812811fbef413 SHA256 97bf74d1bb8301e7688abf1481515920a84d47e3d325ce3eb0d8ee9a16cb3264
-DIST CharisSIL4.106.zip 2134757 RMD160 7b8731149bf7e9709a45c40edf5b59398caa186f SHA1 0ed48cfbdb77567209c61c1ce7da251fab3b6854 SHA256 8902f6091fac3d96a50a1d7250f73ddeba4a1f93055632c87338e500e87055d8
 DIST CharisSILCompact-4.110.zip 3384203 RMD160 0c65b8dc3dabdf6c3b2e44907431803162417094 SHA1 844b0ed20449e736b1fdb8ac7f0d35dac049c075 SHA256 d75c6a2fe6f0820c23b76ae5d5f193090f71d32dfbfbaacda6b90a3de9f73c95
-DIST CharisSILCompact4.106.zip 2100279 RMD160 7017d36c9f3eda39763e806b77049238e102aaec SHA1 3d6f4a0b716c834fa5236762c0fc0ec20517311a SHA256 3077ee781492194c7f2309b8591d9f9d2631ba7d9a49a8cc9c00394da512ade4
diff --git a/media-fonts/sil-charis/sil-charis-4.106.ebuild b/media-fonts/sil-charis/sil-charis-4.106.ebuild
deleted file mode 100644
index 1fc7172b9c74..000000000000
--- a/media-fonts/sil-charis/sil-charis-4.106.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-charis/sil-charis-4.106.ebuild,v 1.7 2011/05/25 16:48:57 flameeyes Exp $
-
-EAPI=2
-
-inherit font
-
-MY_PN="CharisSIL"
-
-DESCRIPTION="SIL Charis - SIL fonts for Roman and Cyrillic languages"
-HOMEPAGE="http://scripts.sil.org/CharisSILfont"
-SRC_URI="http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=CharisSIL4.106b.zip&filename=CharisSIL4.106.zip -> CharisSIL4.106.zip
-	compact? ( http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=CharisSILCompact4.106.zip&filename=CharisSILCompact4.106.zip -> CharisSILCompact4.106.zip )"
-
-LICENSE="OFL"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="doc +compact"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-DOCS="OFL-FAQ.txt"
-
-src_unpack() {
-	unpack ${A}
-	if use compact; then
-		mv "${MY_PN}Compact/"*.ttf "${MY_PN}" || die "mv ${WORKDIR}/${MY_PN}Compact/*.ttf ${WORKDIR}/${MY_PN} failed"
-	fi
-}
-
-src_install() {
-	font_src_install
-	use doc && dodoc *.pdf
-}
diff --git a/media-fonts/sil-charis/sil-charis-4.110.ebuild b/media-fonts/sil-charis/sil-charis-4.110.ebuild
index 7b82676198a2..8f7c09c0095c 100644
--- a/media-fonts/sil-charis/sil-charis-4.110.ebuild
+++ b/media-fonts/sil-charis/sil-charis-4.110.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-charis/sil-charis-4.110.ebuild,v 1.1 2012/01/07 23:34:55 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-charis/sil-charis-4.110.ebuild,v 1.2 2012/05/27 12:28:17 yngwin Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="compact doc"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-galatia/Manifest b/media-fonts/sil-galatia/Manifest
index e3bdce0b9c84..3615adccadfb 100644
--- a/media-fonts/sil-galatia/Manifest
+++ b/media-fonts/sil-galatia/Manifest
@@ -1,2 +1 @@
 DIST GalSIL21.zip 158917 RMD160 a9f8c7fdc6501d0d5187d3b98fa420f04fb16373 SHA1 21d3952b39f442f16b9630b2d7cd84ba144cf0db SHA256 0d0a34646a18267c5147ee01448268098ebb00c4563eb6e9260037f2d171aa92
-DIST ttf-sil-galatia-2.01.tgz 1311242 RMD160 791ecaed2d2aa32be61db84a3fc4ad0854580ab0 SHA1 0de186358b7b6e8064a6cc53b529a1f13faecb85 SHA256 8002f06bba5f5ce82e5fb2714b8e2f52845eeed546995a8e6560edfc585bb6fd
diff --git a/media-fonts/sil-galatia/sil-galatia-2.01.ebuild b/media-fonts/sil-galatia/sil-galatia-2.01.ebuild
deleted file mode 100644
index aff914288dd1..000000000000
--- a/media-fonts/sil-galatia/sil-galatia-2.01.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-galatia/sil-galatia-2.01.ebuild,v 1.6 2009/09/27 10:12:45 volkmar Exp $
-
-inherit font
-
-DESCRIPTION="The Galatia SIL Greek Unicode Fonts package"
-HOMEPAGE="http://scripts.sil.org/SILgrkuni"
-SRC_URI="mirror://gentoo/ttf-${P}.tgz"
-
-LICENSE="SIL-freeware"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-DOCS="GalatiaTest.txt"
-FONT_SUFFIX="ttf"
-
-S="${WORKDIR}/ttf-${P}"
-FONT_S="${S}"
-
-src_install() {
-	font_src_install
-	use doc && dodoc *.pdf
-}
diff --git a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
index 8fd60d559ce0..deb9eaa6512f 100644
--- a/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
+++ b/media-fonts/sil-galatia/sil-galatia-2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-galatia/sil-galatia-2.1.ebuild,v 1.2 2011/06/14 10:59:03 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-galatia/sil-galatia-2.1.ebuild,v 1.3 2012/05/27 12:32:35 yngwin Exp $
 
 inherit font
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-gentium/Manifest b/media-fonts/sil-gentium/Manifest
index 92d2e1555e9f..1cfaebd73467 100644
--- a/media-fonts/sil-gentium/Manifest
+++ b/media-fonts/sil-gentium/Manifest
@@ -1,3 +1,2 @@
 DIST GentiumPlus-1.508.zip 1986418 RMD160 de6b04c621f34302d2a902b25cd25bf74dabb644 SHA1 1e4e9353da9a032bae7fa1533221aa81a4d09e14 SHA256 cbdc25aaa0a1fda3cab800fe1c393093cedd94b88263d9313c162dc48fceabc2
 DIST GentiumPlusCompact-1.508.zip 1957129 RMD160 3eadcf422548a631a733ba6789c54cd176612c1a SHA1 fa7f3e6744fa2528b19a2264079d700c41226998 SHA256 feb9a6149dc60feff9eab2c5f5bdd96aca3db41926e6d51d56fb61b5cfaaad99
-DIST ttf-sil-gentium-1.02.tar.gz 2334185 RMD160 3e21542903c828b9109e8635fad26da61f7f7ed4 SHA1 7d3d8bf2b8bd62629c027114f79406f7f4b57986 SHA256 4746c04c9a4ad9e0788a38e0a2f81919a630d8070ceabc89f156b6d41d8ceb37
diff --git a/media-fonts/sil-gentium/sil-gentium-1.0.2.ebuild b/media-fonts/sil-gentium/sil-gentium-1.0.2.ebuild
deleted file mode 100644
index 802c67435cd1..000000000000
--- a/media-fonts/sil-gentium/sil-gentium-1.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-gentium/sil-gentium-1.0.2.ebuild,v 1.6 2011/06/14 18:02:07 grobian Exp $
-
-inherit font versionator
-
-MY_P="ttf-${PN}-$(delete_version_separator 2)"
-
-DESCRIPTION="SIL Gentium Unicode font for Latin and Greek languages."
-HOMEPAGE="http://scripts.sil.org/gentium"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="OFL"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-DOCS="FONTLOG GENTIUM-FAQ QUOTES OFL-FAQ"
-FONT_SUFFIX="ttf"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
-
-src_install() {
-	font_src_install
-	use doc && dodoc *.pdf
-}
diff --git a/media-fonts/sil-gentium/sil-gentium-1.508.ebuild b/media-fonts/sil-gentium/sil-gentium-1.508.ebuild
index 7baca96149e1..16d0e33fcc65 100644
--- a/media-fonts/sil-gentium/sil-gentium-1.508.ebuild
+++ b/media-fonts/sil-gentium/sil-gentium-1.508.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-gentium/sil-gentium-1.508.ebuild,v 1.1 2012/01/08 00:23:11 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-gentium/sil-gentium-1.508.ebuild,v 1.2 2012/05/27 12:38:20 yngwin Exp $
 
 EAPI="4"
 
@@ -8,14 +8,14 @@ inherit font
 
 MY_PN="GentiumPlus"
 
-DESCRIPTION="SIL Gentium Plus unicode font for Latin and Greek languages."
+DESCRIPTION="SIL Gentium Plus unicode font for Latin and Greek languages"
 HOMEPAGE="http://scripts.sil.org/gentium"
 SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip
 	compact? ( mirror://gentoo/${MY_PN}Compact-${PV}.zip )"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE="compact doc"
 
 DEPEND="app-arch/unzip"
diff --git a/media-fonts/sil-padauk/Manifest b/media-fonts/sil-padauk/Manifest
index 2ad02222b9eb..7c035b3ec3e2 100644
--- a/media-fonts/sil-padauk/Manifest
+++ b/media-fonts/sil-padauk/Manifest
@@ -1,2 +1 @@
 DIST padauk-2.8.zip 556033 RMD160 fcf39706f77f60e3e4750060494f9880d5385db6 SHA1 d7d7b72852c19446b95cae3ab45ec178bef7fa9d SHA256 c92049f10a0bfbeeb369ae6e252e6a9d557a6dbb6e8bb51858abd3d41887dc3c
-DIST ttf-sil-padauk-2.4.tar.gz 861327 RMD160 9cc6779024cd3eb649e81ab1ffb6435e9d1d0b50 SHA1 5421976e6ff228e3dc864be8deee888566f60e50 SHA256 c8099576794b43fb75f0e8dc131031051412bf99e0d1de4ccf99a519204950fd
diff --git a/media-fonts/sil-padauk/sil-padauk-2.4.ebuild b/media-fonts/sil-padauk/sil-padauk-2.4.ebuild
deleted file mode 100644
index 67505f338ab8..000000000000
--- a/media-fonts/sil-padauk/sil-padauk-2.4.ebuild
+++ /dev/null
@@ -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/media-fonts/sil-padauk/sil-padauk-2.4.ebuild,v 1.8 2012/01/08 00:37:42 dirtyepic Exp $
-
-inherit font
-
-DESCRIPTION="SIL Padauk - SIL fonts for Myanmar"
-HOMEPAGE="http://scripts.sil.org/padauk"
-SRC_URI="mirror://gentoo/ttf-${P}.tar.gz"
-
-LICENSE="OFL"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-FONT_S=${S}
-FONT_SUFFIX="ttf"
-DOCS="doc/FONTLOG.txt"
diff --git a/media-fonts/sil-padauk/sil-padauk-2.8.ebuild b/media-fonts/sil-padauk/sil-padauk-2.8.ebuild
index 7dff50cea1fc..ccae666322f9 100644
--- a/media-fonts/sil-padauk/sil-padauk-2.8.ebuild
+++ b/media-fonts/sil-padauk/sil-padauk-2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-padauk/sil-padauk-2.8.ebuild,v 1.1 2012/01/08 00:37:42 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/sil-padauk/sil-padauk-2.8.ebuild,v 1.2 2012/05/27 12:40:54 yngwin Exp $
 
 EAPI="4"
 
@@ -8,13 +8,13 @@ inherit font
 
 MY_PN="padauk"
 
-DESCRIPTION="SIL Padauk - SIL fonts for Myanmar script"
+DESCRIPTION="SIL fonts for Myanmar script"
 HOMEPAGE="http://scripts.sil.org/padauk"
 SRC_URI="mirror://gentoo/${MY_PN}-${PV}.zip"
 
 LICENSE="OFL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-libs/libmpd/Manifest b/media-libs/libmpd/Manifest
index 2271f80769c4..c520be94636b 100644
--- a/media-libs/libmpd/Manifest
+++ b/media-libs/libmpd/Manifest
@@ -1,2 +1 @@
-DIST libmpd-0.20.0.tar.gz 363996 RMD160 d4462aa0fdc01f985f35f7eeaec4b2173b933a91 SHA1 cb7c9b5dff0e7f560a75d1904a97f316347e7d7b SHA256 7205b01b007b2ef06f19aacca26fec2673b730f1a9b6c2ce0ed6728c9ac67723
 DIST libmpd-11.8.17.tar.gz 365015 RMD160 41abd2b931ce8dc73da7cdee794014c5b9cae6b6 SHA1 df129f15061662a6fec1b2ce19f9dbc8b7a7d1ba SHA256 fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83
diff --git a/media-libs/libmpd/libmpd-0.20.0-r1.ebuild b/media-libs/libmpd/libmpd-0.20.0-r1.ebuild
deleted file mode 100644
index a473237ae4c7..000000000000
--- a/media-libs/libmpd/libmpd-0.20.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpd/libmpd-0.20.0-r1.ebuild,v 1.6 2012/05/05 08:02:30 jdhore Exp $
-
-EAPI=3
-inherit eutils
-
-DESCRIPTION="A library handling connections to a MPD server"
-HOMEPAGE="http://gmpc.wikia.com/wiki/Libmpd"
-SRC_URI="http://download.sarine.nl/Programs/gmpc/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/glib-2.16:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-overflow.patch"
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-	find "${ED}" -name "*.la" -delete || die "failed to delete .la files"
-}
diff --git a/media-libs/opengtl/Manifest b/media-libs/opengtl/Manifest
index 6da917ea2cfe..7fa4c39736b5 100644
--- a/media-libs/opengtl/Manifest
+++ b/media-libs/opengtl/Manifest
@@ -1,3 +1,2 @@
-DIST OpenGTL-0.9.15.1.tar.bz2 496181 RMD160 b161177daa57b104f45cfa3eafcc91b2203a60aa SHA1 ddd25b1f5eb11ae0b438c67d5a2a73481e919a0a SHA256 7ee13c09b0a0d7099367b713fce5a3a14cf72865bf6169ebc39ec4958c445028
 DIST OpenGTL-0.9.15.2.tar.bz2 495966 RMD160 e77ba56b0dfe92361724aae02c5817248355b52d SHA1 b6beea4086a0907dcdb326d421d253f368689b45 SHA256 306427f2814439703f13b6ee17092c466172c4df57cdb896b6e5eadfa1154ae2
 DIST OpenGTL-0.9.16.tar.bz2 533833 RMD160 77cac5891ff5c620092c815d80681373cf3d9145 SHA1 3cfe4a08e5778c13f7e74dfc822adb68f97ad048 SHA256 81e81a53eeeb07e9e6a6ecfd0d960c10453fedc041ab7d885e66ee3053757107
diff --git a/media-libs/opengtl/opengtl-0.9.15.1.ebuild b/media-libs/opengtl/opengtl-0.9.15.1.ebuild
deleted file mode 100644
index 64aa1b342d37..000000000000
--- a/media-libs/opengtl/opengtl-0.9.15.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.15.1.ebuild,v 1.2 2012/01/11 18:51:42 johu Exp $
-
-EAPI=4
-
-MY_P="OpenGTL-${PV}"
-
-inherit cmake-utils
-
-DESCRIPTION="Collection of libraries for graphics transformation algorithms"
-HOMEPAGE="http://opengtl.org/"
-SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-RDEPEND="
-	media-libs/libpng
-	<sys-devel/llvm-3.0
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/lcov )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use debug OPENGTL_ENABLE_DEBUG_OUTPUT)
-		$(cmake-utils_use test OPENGTL_BUILD_TESTS)
-		$(cmake-utils_use test OPENGTL_CODE_COVERAGE)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newdoc OpenShiva/doc/reference/region.pdf OpenShiva.pdf
-}
diff --git a/media-libs/opengtl/opengtl-0.9.15.2.ebuild b/media-libs/opengtl/opengtl-0.9.15.2.ebuild
index 5dbeea5d686c..d4153505dc83 100644
--- a/media-libs/opengtl/opengtl-0.9.15.2.ebuild
+++ b/media-libs/opengtl/opengtl-0.9.15.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.15.2.ebuild,v 1.2 2012/05/20 15:06:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.15.2.ebuild,v 1.3 2012/05/27 16:24:45 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug test"
 
 RDEPEND="
diff --git a/media-libs/portaudio/portaudio-19_pre20110326.ebuild b/media-libs/portaudio/portaudio-19_pre20110326.ebuild
index bb17e1aef65f..ed622d67161b 100644
--- a/media-libs/portaudio/portaudio-19_pre20110326.ebuild
+++ b/media-libs/portaudio/portaudio-19_pre20110326.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/portaudio-19_pre20110326.ebuild,v 1.6 2012/05/23 13:04:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/portaudio/portaudio-19_pre20110326.ebuild,v 1.7 2012/05/27 13:44:33 maekke Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.portaudio.com/archives/${MY_P}.tgz"
 
 LICENSE="as-is"
 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="alsa +cxx debug jack oss static-libs"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index d84bd231efe5..88155aafc2e2 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -2,6 +2,5 @@ DIST audacious-plugins-2.4.4.tgz 3425914 RMD160 d8ec95fb678efcb9acd17e77b890d4c6
 DIST audacious-plugins-2.5.4.tar.gz 3500309 RMD160 a2cf4b9407492758c7ee9b858c7c75b9d906c524 SHA1 8aedcc58c3b5a9415345374014d809ccb9a7541a SHA256 149fd27f476670d8ab3b8e9beaad9ab9de5955c8cbec70bf27e26446168148d8
 DIST audacious-plugins-3.1.1.tar.bz2 2167856 RMD160 8c0fca652b08884809271afb401990cda7c24eaf SHA1 49cdae9eedd99cfc2ce7455498ee2ec6c9ff6f20 SHA256 dd85e982a49a2794041a391aba3d12a12505338b2c9623b60f16842ae89215ad
 DIST audacious-plugins-3.1.tar.bz2 2156993 RMD160 b62f8724a7babb53d4e2d70fb91edda0e42f82d7 SHA1 0c89d5a74bb562c38be36d38537d15c3374feb76 SHA256 2d1e9b229b83e4ab2a2065e7116d0d36e774d73146d2cb63162ca880770d7ca8
-DIST audacious-plugins-3.2.1.tar.bz2 1978406 RMD160 705043684ddddd21ba120c4168f1d76ca8a36fb7 SHA1 7957f545a2c050ba2d7b1fb9cf53fe77bf5f853c SHA256 5b7d3e52f6b8903bc01ae15651817e990d3348ae6b9734767f354eb2dbfc8c2d
 DIST audacious-plugins-3.2.2.tar.bz2 1898457 RMD160 76c027177820124e3efec6eaef87dc5aad6991ea SHA1 4518a6fdcba0c1b496e048b45ce5d87a46326c9b SHA256 c637e6770ed41ec0e885f210944234326090d9cecf0547e2545fff09bc25b7fc
-DIST audacious-plugins-3.2.tar.bz2 1978199 RMD160 95d08f3459b5de79eb0fff5123f492dd6dc8dc98 SHA1 49cc0a05fddef8b1730f08d0a0bf9e4797cd393d SHA256 5f600bf8068bdfd306b5230c333f45d5c012dd71728a7b250fe839956ee09904
+DIST audacious-plugins-3.2.3.tar.bz2 1921236 RMD160 23876b0a7c917448fd5597d56f312a89942fc37f SHA1 87a795c4ecf645ad36ffe7bb3a7b5691e0316f71 SHA256 bba70fbbb4fa7d1f40de4d96265069b6faf23233cbf544cb2882f7c709c9d2da
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.2.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.2.1.ebuild
deleted file mode 100644
index fa673b3800f3..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.2.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.2.1.ebuild,v 1.3 2012/05/16 13:05:18 scarabeus Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome +gtk gtk3 ipv6 jack
-lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile vorbis wavpack"
-
-RDEPEND="app-arch/unzip
-	>=dev-libs/dbus-glib-0.60
-	dev-libs/libxml2:2
-	media-libs/libmodplug
-	>=media-sound/audacious-3.2.1
-	>=net-libs/neon-0.26.4
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	aac? ( >=media-libs/faad2-2.7 )
-	adplug? ( >=dev-cpp/libbinio-1.4 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( >=media-libs/libcddb-1.2.1
-		>=dev-libs/libcdio-0.79-r1 )
-	cue? ( media-libs/libcue )
-	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
-	flac? ( >=media-libs/libvorbis-1.0
-		>=media-libs/flac-1.2.1-r1 )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-libs/bio2jack-0.4
-		media-sound/jack-audio-connection-kit )
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate )
-	mms? ( >=media-libs/libmms-0.3 )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	vorbis? ( >=media-libs/libvorbis-1.2.0
-		  >=media-libs/libogg-1.1.3 )
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )
-	virtual/pkgconfig"
-
-REQUIRED_USE="^^ ( gtk gtk3 )"
-
-mp3_warning() {
-	if ! use mp3 ; then
-		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-	fi
-}
-
-src_configure() {
-	mp3_warning
-
-	econf \
-		--enable-modplug \
-		--enable-neon \
-		$(use_enable adplug) \
-		$(use_enable aac) \
-		$(use_enable alsa) \
-		$(use_enable alsa amidiplug-alsa) \
-		$(use_enable bs2b) \
-		$(use_enable cdda cdaudio) \
-		$(use_enable cue) \
-		$(use_enable ffmpeg ffaudio) \
-		$(use_enable flac flacng) \
-		$(use_enable fluidsynth amidiplug-flsyn) \
-		$(use_enable flac filewriter_flac) \
-		$(use_enable gtk3) \
-		$(use_enable ipv6) \
-		$(use_enable jack) \
-		$(use_enable gnome gnomeshortcuts) \
-		$(use_enable lame filewriter_mp3) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate resample) \
-		$(use_enable mms) \
-		$(use_enable mp3) \
-		$(use_enable midi amidiplug) \
-		$(use_enable mtp mtp_up) \
-		$(use_enable nls) \
-		$(use_enable oss) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable scrobbler) \
-		$(use_enable sid) \
-		$(use_enable sndfile) \
-		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
-		$(use_enable wavpack)
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild
similarity index 90%
rename from media-plugins/audacious-plugins/audacious-plugins-3.2.ebuild
rename to media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild
index e21f49e035ba..283c0458a661 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.2.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.2.ebuild,v 1.4 2012/05/16 13:05:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.2.3.ebuild,v 1.1 2012/05/27 21:02:42 jdhore Exp $
 
 EAPI=4
 
-inherit eutils flag-o-matic
-
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
@@ -16,13 +14,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome +gtk gtk3 ipv6 jack
-lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile vorbis wavpack"
+lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
 
 RDEPEND="app-arch/unzip
 	>=dev-libs/dbus-glib-0.60
 	dev-libs/libxml2:2
 	media-libs/libmodplug
-	>=media-sound/audacious-3.2
+	>=media-sound/audacious-3.2.3
 	>=net-libs/neon-0.26.4
 	gtk? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
@@ -47,6 +45,7 @@ RDEPEND="app-arch/unzip
 	mtp? ( media-libs/libmtp )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
 	scrobbler? ( net-misc/curl )
+	sdl? ( media-libs/libsdl[audio] )
 	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
 	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
 	vorbis? ( >=media-libs/libvorbis-1.2.0
@@ -59,6 +58,8 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="^^ ( gtk gtk3 )"
 
+DOCS="AUTHORS"
+
 mp3_warning() {
 	if ! use mp3 ; then
 		ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
@@ -97,18 +98,9 @@ src_configure() {
 		$(use_enable oss) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable scrobbler) \
+		$(use_enable sdl sdlout) \
 		$(use_enable sid) \
 		$(use_enable sndfile) \
 		$(use_enable vorbis) \
-		$(use_enable vorbis filewriter_vorbis) \
 		$(use_enable wavpack)
 }
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}
diff --git a/media-plugins/gmpc-albumview/Manifest b/media-plugins/gmpc-albumview/Manifest
index 1b174632ed3a..5789ea690946 100644
--- a/media-plugins/gmpc-albumview/Manifest
+++ b/media-plugins/gmpc-albumview/Manifest
@@ -1,2 +1 @@
-DIST gmpc-albumview-0.20.0.tar.gz 443167 RMD160 ffc8936113f52bd76905a4296a93a8ca99c28293 SHA1 8f8e806d19bfdf4d4a6175216a0db4ccbb8f89cc SHA256 7e5efa43338526c15beca0c13930f5e9358544f11ca03441b4a0cb1321a6b0e9
 DIST gmpc-albumview-11.8.16.tar.gz 438771 RMD160 755bbc568f94ccf041e1ac888d4a22a9c6a26abb SHA1 62240fd85458b34ab408b545a26d5bf95c18bbae SHA256 1da7b162571e0cdb95b9b825a5b3dee6bc3021bda2f3091d7f7990e4c1de46cb
diff --git a/media-plugins/gmpc-albumview/gmpc-albumview-0.20.0.ebuild b/media-plugins/gmpc-albumview/gmpc-albumview-0.20.0.ebuild
deleted file mode 100644
index 53430bfd8d4b..000000000000
--- a/media-plugins/gmpc-albumview/gmpc-albumview-0.20.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gmpc-albumview/gmpc-albumview-0.20.0.ebuild,v 1.3 2012/05/05 08:27:20 jdhore Exp $
-
-EAPI=4
-
-DESCRIPTION="This plugin shows your music collection in albums"
-HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_ALBUMVIEW"
-SRC_URI="http://download.sarine.nl/Programs/gmpc/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=media-sound/gmpc-${PV}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-plugins/gmpc-awn/Manifest b/media-plugins/gmpc-awn/Manifest
index 811b093638f0..f51930255e7b 100644
--- a/media-plugins/gmpc-awn/Manifest
+++ b/media-plugins/gmpc-awn/Manifest
@@ -1,2 +1 @@
-DIST gmpc-awn-0.20.0.tar.gz 302220 RMD160 c6de80a30eecc3f2c5b43dad51a1b726e8627e69 SHA1 4c5614db1453c3bf3cb509a778b8a7c4408b6432 SHA256 73eb8270556826c4e9deb039aafcc8b887722562851ed147d34abc5d2f511eaa
 DIST gmpc-awn-11.8.16.tar.gz 303112 RMD160 872b0684f0709f49d113acd782b2676725cc06fc SHA1 0e36b50ea200d57a1b200fc0408714da78b77c93 SHA256 e5fe79e23094169bf49d57c8de2a3428a6a25f96cea63254f73b88d153093f7c
diff --git a/media-plugins/gmpc-awn/gmpc-awn-0.20.0.ebuild b/media-plugins/gmpc-awn/gmpc-awn-0.20.0.ebuild
deleted file mode 100644
index 0ea8fba65248..000000000000
--- a/media-plugins/gmpc-awn/gmpc-awn-0.20.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gmpc-awn/gmpc-awn-0.20.0.ebuild,v 1.4 2012/05/21 19:08:03 xarthisius Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="This plugin integrates GMPC with the Avant Window Navigator"
-HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_AWN"
-SRC_URI="http://download.sarine.nl/Programs/gmpc/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=media-sound/gmpc-${PV}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-multilib.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild b/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild
index db7b4a595f4e..79fc1bfa7478 100644
--- a/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild
+++ b/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild,v 1.5 2012/05/21 19:08:03 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gmpc-awn/gmpc-awn-11.8.16.ebuild,v 1.6 2012/05/27 07:58:25 angelos Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
 
-RDEPEND=">=media-sound/gmpc-${PV}"
+RDEPEND=">=media-sound/gmpc-${PV}
+	dev-libs/dbus-glib"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( dev-util/intltool
diff --git a/media-plugins/gmpc-jamendo/Manifest b/media-plugins/gmpc-jamendo/Manifest
index 3adcea66c4f9..5cd28dab357b 100644
--- a/media-plugins/gmpc-jamendo/Manifest
+++ b/media-plugins/gmpc-jamendo/Manifest
@@ -1,2 +1 @@
-DIST gmpc-jamendo-0.20.0.tar.gz 330732 RMD160 47d491ac7fedd5f6bb7cdc64a7ded8d57081f1ae SHA1 0d053e7cbd49f72504f85d6291124d96f1940b06 SHA256 942609d04c2f158adc75a4d4db4e0206a5fca5c7f9b5f2dc7c32b9cc1ca05f20
 DIST gmpc-jamendo-11.8.16.tar.gz 328998 RMD160 4752e709db6ed161d5dd2bfe27e86615e6e9f199 SHA1 28c1bb336762740352f84a7710be51d259301324 SHA256 a2ab1e099a933b984517d448fd70e25554caa371e164ff31a53a3cf10a2a2635
diff --git a/media-plugins/gmpc-jamendo/gmpc-jamendo-0.20.0.ebuild b/media-plugins/gmpc-jamendo/gmpc-jamendo-0.20.0.ebuild
deleted file mode 100644
index decae6f53e50..000000000000
--- a/media-plugins/gmpc-jamendo/gmpc-jamendo-0.20.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gmpc-jamendo/gmpc-jamendo-0.20.0.ebuild,v 1.5 2012/05/05 08:27:17 jdhore Exp $
-
-EAPI=3
-
-DESCRIPTION="Plugin allows you to browse and preview music available on jamendo."
-HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_JAMENDO"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=media-sound/gmpc-${PV}
-	>=media-libs/libmpd-0.15.98
-	dev-db/sqlite:3
-	sys-libs/zlib
-	>=dev-libs/libxml2-2.6
-	>=x11-libs/gtk+-2.4:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gob
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-plugins/gmpc-lyricwiki/Manifest b/media-plugins/gmpc-lyricwiki/Manifest
index b3791a50539f..31228876fb8f 100644
--- a/media-plugins/gmpc-lyricwiki/Manifest
+++ b/media-plugins/gmpc-lyricwiki/Manifest
@@ -1,2 +1 @@
-DIST gmpc-lyricwiki-0.20.0.tar.gz 305243 RMD160 aad76590ccde69b76354915ed283023eba5a4fb2 SHA1 d78e86360e8dccd7af2e483c383d66df0ef74e2d SHA256 c28aba7934a571da5d958f99ee1fd6c155c7d65e14672d112eca4d64814abfc6
 DIST gmpc-lyricwiki-11.8.16.tar.gz 306508 RMD160 b62e87a90e155f139b1941feb74905afd748cb4b SHA1 0ba5b58c01f22d2e096186bf9f888358b21d4a44 SHA256 bb00e806d3cb55b0e3b5e3d18ad5fbd4bfc93e241a4684b70e3bfa5690f11709
diff --git a/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-0.20.0.ebuild b/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-0.20.0.ebuild
deleted file mode 100644
index 4f8043c7a188..000000000000
--- a/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-0.20.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gmpc-lyricwiki/gmpc-lyricwiki-0.20.0.ebuild,v 1.6 2012/05/05 08:27:18 jdhore Exp $
-
-EAPI=3
-
-DESCRIPTION="This plugin uses lyricwiki to fetch lyrics"
-HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LYRICWIKI"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls"
-
-RDEPEND=">=media-sound/gmpc-${PV}
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-plugins/gmpc-mmkeys/Manifest b/media-plugins/gmpc-mmkeys/Manifest
index e04d5b8272f7..d7c83eda30e6 100644
--- a/media-plugins/gmpc-mmkeys/Manifest
+++ b/media-plugins/gmpc-mmkeys/Manifest
@@ -1,2 +1 @@
-DIST gmpc-mmkeys-0.20.0.tar.gz 304883 RMD160 abaa9a9ef17d046eacff4e81033bd44316d682db SHA1 bb59c9ba8fbf98f1a6910c82f49e4d9b24b84c65 SHA256 4e8276ec757e0d2a4a393be25c68e9e16aee8c32c6993c51220346820e3b05fc
 DIST gmpc-mmkeys-11.8.16.tar.gz 306983 RMD160 667b712c4606cf576930c1abc5d1c3de6ce5bfd9 SHA1 03e6e2ca8a86bb4a8826cb19543a026b084242d3 SHA256 708a0ca30a424b8dacfe574bdcf18c147f9a3be7366faa2466525cf7b5936f2f
diff --git a/media-plugins/gmpc-mmkeys/gmpc-mmkeys-0.20.0.ebuild b/media-plugins/gmpc-mmkeys/gmpc-mmkeys-0.20.0.ebuild
deleted file mode 100644
index eadd7c5cb401..000000000000
--- a/media-plugins/gmpc-mmkeys/gmpc-mmkeys-0.20.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gmpc-mmkeys/gmpc-mmkeys-0.20.0.ebuild,v 1.4 2012/05/05 08:27:17 jdhore Exp $
-
-EAPI=4
-
-DESCRIPTION="Bind multimedia keys via gnome settings daemon"
-HOMEPAGE="http://gmpc.wikia.com/wiki/Plugins"
-SRC_URI="http://download.sarine.nl/Programs/gmpc/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/dbus-glib
-	>=media-sound/gmpc-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/vala:0.10
-	virtual/pkgconfig"
-
-src_configure() {
-	VALAC=$(type -p valac-0.10) \
-		econf --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-plugins/gmpc-tagedit/Manifest b/media-plugins/gmpc-tagedit/Manifest
index 01a91c6d98da..df5356336d58 100644
--- a/media-plugins/gmpc-tagedit/Manifest
+++ b/media-plugins/gmpc-tagedit/Manifest
@@ -1,2 +1 @@
-DIST gmpc-tagedit-0.20.0.tar.gz 309837 RMD160 c081cd04649b5a043a47b9e8f3461fcd7265ccb8 SHA1 e074c9efde0996e5864867277ea32224a580121e SHA256 7a4eba7c632040ce6410962b8b579af8f54b703b940610d847e5285cfe892f6a
 DIST gmpc-tagedit-11.8.16.tar.gz 311089 RMD160 1a40d20bb3c8710e1f0202f5df118490a890a3d1 SHA1 a704e2ce6ab5b0faee6efdc892dc946ba077fa61 SHA256 127be98ffabb56c9d629218e4158bcb1632e9333ac48c218bbec9543803799d6
diff --git a/media-plugins/gmpc-tagedit/gmpc-tagedit-0.20.0.ebuild b/media-plugins/gmpc-tagedit/gmpc-tagedit-0.20.0.ebuild
deleted file mode 100644
index 675a1a44687b..000000000000
--- a/media-plugins/gmpc-tagedit/gmpc-tagedit-0.20.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gmpc-tagedit/gmpc-tagedit-0.20.0.ebuild,v 1.5 2012/05/05 08:27:16 jdhore Exp $
-
-EAPI=3
-
-DESCRIPTION="This plugin allows you to edit tags in your library"
-HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_TAGEDIT"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=media-sound/gmpc-${PV}
-	media-libs/taglib
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/gob
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-plugins/gmpc-wikipedia/Manifest b/media-plugins/gmpc-wikipedia/Manifest
index 6514ef14cbcf..9c321c2b12b1 100644
--- a/media-plugins/gmpc-wikipedia/Manifest
+++ b/media-plugins/gmpc-wikipedia/Manifest
@@ -1,2 +1 @@
-DIST gmpc-wikipedia-0.20.0.tar.gz 311098 RMD160 26cd121e212bf157339a6a6dc2ff87da1dec9209 SHA1 af4d8cf7e785293c78610a75bf6842fcf15f14eb SHA256 81bea5cc7407ecf0b8ff53eeef6f579e25cbea4ee8b0c4fe376e6778fefae63d
 DIST gmpc-wikipedia-11.8.16.tar.gz 310015 RMD160 d2966cdc54860845ab5808665bdf5d5b707597ed SHA1 c860e7c5614362f8cd8bf3cff820032cb1a41691 SHA256 1a2456469d1f487d9c5c88a439c3d67ae1ec6cf3879dd790ae66b234744fee44
diff --git a/media-plugins/gmpc-wikipedia/gmpc-wikipedia-0.20.0.ebuild b/media-plugins/gmpc-wikipedia/gmpc-wikipedia-0.20.0.ebuild
deleted file mode 100644
index f2607066b4ca..000000000000
--- a/media-plugins/gmpc-wikipedia/gmpc-wikipedia-0.20.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gmpc-wikipedia/gmpc-wikipedia-0.20.0.ebuild,v 1.6 2012/05/05 08:27:20 jdhore Exp $
-
-EAPI=3
-
-DESCRIPTION="This plugin shows the Wikipedia article about the currently playing artist"
-HOMEPAGE="http://gmpc.wikia.com/wiki/GMPC_PLUGIN_WIKIPEDIA"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=media-sound/gmpc-${PV}
-	dev-libs/libxml2:2
-	net-libs/webkit-gtk:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-sound/ario/Manifest b/media-sound/ario/Manifest
index b58320d6b710..8473be23e2df 100644
--- a/media-sound/ario/Manifest
+++ b/media-sound/ario/Manifest
@@ -1,2 +1 @@
 DIST ario-1.5.1.tar.gz 1135444 RMD160 dfc819cf46a80e822aa3b654c334d8cbaddb3b9d SHA1 99c1ae6318a596cd27ac3c38ad25bc716527a94d SHA256 0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e
-DIST ario-1.5.tar.gz 1119387 RMD160 74701aaae0c5413958675fde837ea04640113d9a SHA1 45996e16056046ce49f132dd675031b47b571735 SHA256 0de4885f3c133cc3af2fd506d19780d9fa8c1e7b8a6413b0c2153b30b73c9725
diff --git a/media-sound/ario/ario-1.5.1.ebuild b/media-sound/ario/ario-1.5.1.ebuild
index 5f7e6e7d96eb..d95a3a845cef 100644
--- a/media-sound/ario/ario-1.5.1.ebuild
+++ b/media-sound/ario/ario-1.5.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ario-1.5.1.ebuild,v 1.5 2012/05/21 09:51:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ario-1.5.1.ebuild,v 1.7 2012/05/27 17:38:58 angelos Exp $
 
 EAPI=4
 GNOME2_LA_PUNT=yes
+PYTHON_DEPEND="python? 2"
 
-inherit gnome2
+inherit gnome2 python
 
 DESCRIPTION="a GTK2 MPD (Music Player Daemon) client inspired by Rythmbox"
 HOMEPAGE="http://ario-player.sourceforge.net"
@@ -37,6 +38,11 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS )
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-single-includes.patch
 }
diff --git a/media-sound/ario/ario-1.5.ebuild b/media-sound/ario/ario-1.5.ebuild
deleted file mode 100644
index cc775e080f75..000000000000
--- a/media-sound/ario/ario-1.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ario-1.5.ebuild,v 1.6 2012/05/05 08:05:30 mgorny Exp $
-
-EAPI=2
-inherit eutils gnome2-utils
-
-DESCRIPTION="a GTK2 MPD (Music Player Daemon) client inspired by Rythmbox"
-HOMEPAGE="http://ario-player.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}-player/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="audioscrobbler dbus debug +idle libnotify nls python taglib zeroconf"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	dev-libs/libunique:1
-	dev-libs/libxml2:2
-	media-libs/libmpdclient
-	net-misc/curl
-	net-libs/gnutls
-	>=x11-libs/gtk+-2.16:2
-	audioscrobbler? ( net-libs/libsoup:2.4 )
-	dbus? ( dev-libs/dbus-glib )
-	libnotify? ( x11-libs/libnotify )
-	python? ( dev-python/pygtk:2
-		dev-python/pygobject:2 )
-	taglib? ( media-libs/taglib )
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		--disable-xmms2 \
-		--enable-libmpdclient2 \
-		--enable-search \
-		--enable-playlists \
-		--disable-deprecations \
-		$(use_enable audioscrobbler) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable idle mpdidle) \
-		$(use_enable libnotify notify) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable taglib) \
-		$(use_enable zeroconf avahi)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	find "${D}" -name '*.la' -exec rm -f '{}' +
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 4071d098eab1..177c9ede3c9e 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -2,7 +2,6 @@ DIST audacious-2.4.4.tgz 1344519 RMD160 75c960b158b3b6367cca4a7da65d98d8a35a13d9
 DIST audacious-2.5.4.tar.gz 1221134 RMD160 40c4482a0ed35c76e214180cf5c3a308b4d83d7a SHA1 6374b09690fba540b82f7fbaa9a4d763c5ea7d79 SHA256 47bc36010e84c2c9638537a42a8451743d55a699bf85c614f3b913596f6e2fcd
 DIST audacious-3.1.1.tar.bz2 766551 RMD160 2eea3bf3ca730636ab436d71c6ec90ed513af97f SHA1 fa5629d68ac1b12d563e8c0b4be083dea7c7924c SHA256 50e229579a0ee06e88d2b123c8db6b373db73e87898e8b4843a1bd02e3cab8ac
 DIST audacious-3.1.tar.bz2 793321 RMD160 6e4ccf241c6f1ad17da84c373f30b2176f05462c SHA1 f87bba07c1abc8bfe60a21c3bcef3359856529d7 SHA256 306db180cd269b072cfb23551b4139cd2af28d8afb6699836ad82aa3bcec3a46
-DIST audacious-3.2.1.tar.bz2 719809 RMD160 a4917d57c17d6a88d4e3d2c3dab18bfba28aa82f SHA1 9183aef4d805d44b4aa456563aec7f104da97546 SHA256 064a8d2887a0f92a1637df9d71b8eefa8064199c04eccfaac725f840cff6eac3
 DIST audacious-3.2.2.tar.bz2 675192 RMD160 1f6a268613455f07bd209f0488aa0f2dbaf7b5b4 SHA1 50d2ef08d3dd48c2efb194a9fdf216fa4f8afd24 SHA256 c69c20e48c2ed330a0ffb55f3a648b50323406e2a15ca407e3291f83e57042ee
-DIST audacious-3.2.tar.bz2 728063 RMD160 25f054ee0eb11bb74d3b8fe77038ea438f93e604 SHA1 3ebc4dcdcf5da960ba400078023e167e02105e84 SHA256 f18d2a28e8e5ff06d1528cdbd7be11fc1e5c78687258a7c57a28d36b8f29bcb6
+DIST audacious-3.2.3.tar.bz2 695917 RMD160 e29b42df08138ed1e4fcbab8324bf7683c4e26dc SHA1 23be0fcb0a7d5ec2bc4d4fee436e77f2138903ef SHA256 aea8ad2f4da80fb58cf8b0e880585ab49ac42e8a02247c364ea29ccca5572bae
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 RMD160 11439cbebf8c6dc5745c8593a79e88303d094544 SHA1 e97ebbf204e0d1b150265f9e67f0ed54d779e110 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1
diff --git a/media-sound/audacious/audacious-3.2.1.ebuild b/media-sound/audacious/audacious-3.2.1.ebuild
deleted file mode 100644
index da014db7dc1a..000000000000
--- a/media-sound/audacious/audacious-3.2.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.2.1.ebuild,v 1.2 2012/05/05 08:11:04 mgorny Exp $
-
-EAPI=4
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="chardet +gtk gtk3 nls session"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.16
-	dev-libs/libxml2
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
-	gtk? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	session? ( x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	chardet? ( >=app-i18n/libguess-1.1 )
-	nls? ( dev-util/intltool )"
-
-PDEPEND=">=media-plugins/audacious-plugins-3.2.1"
-REQUIRED_USE="^^ ( gtk gtk3 )"
-
-src_configure() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	# Use of GTK+2 causes plugin build failures, bug #384185
-	econf \
-		--enable-dbus \
-		$(use_enable gtk3) \
-		$(use_enable chardet) \
-		$(use_enable nls) \
-		$(use_enable session sm)
-}
-
-src_install() {
-	default
-	dodoc AUTHORS README
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.2.ebuild b/media-sound/audacious/audacious-3.2.3.ebuild
similarity index 91%
rename from media-sound/audacious/audacious-3.2.ebuild
rename to media-sound/audacious/audacious-3.2.3.ebuild
index cc8536a55fca..93cf15410754 100644
--- a/media-sound/audacious/audacious-3.2.ebuild
+++ b/media-sound/audacious/audacious-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.2.ebuild,v 1.2 2012/05/05 08:11:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacious/audacious-3.2.3.ebuild,v 1.1 2012/05/27 21:00:17 jdhore Exp $
 
 EAPI=4
 inherit eutils
@@ -31,9 +31,13 @@ DEPEND="${RDEPEND}
 	chardet? ( >=app-i18n/libguess-1.1 )
 	nls? ( dev-util/intltool )"
 
-PDEPEND=">=media-plugins/audacious-plugins-3.2"
+PDEPEND=">=media-plugins/audacious-plugins-3.2.3"
 REQUIRED_USE="^^ ( gtk gtk3 )"
 
+src_prepare() {
+	epatch "$FILESDIR"/${P}-fix-mutex.patch
+}
+
 src_configure() {
 	# D-Bus is a mandatory dependency, remote control,
 	# session management and some plugins depend on this.
diff --git a/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch b/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch
new file mode 100644
index 000000000000..3fb209196f83
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch
@@ -0,0 +1,89 @@
+commit b53935921298b8164f80454c2016bd40de29704b
+Author: John Lindgren <john.lindgren@aol.com>
+Date:   Sat May 26 11:55:42 2012 -0400
+
+    Fix violation of mutex locking order (playback then playlist). Found by Helgrind.
+
+diff --git a/src/audacious/playlist-new.c b/src/audacious/playlist-new.c
+index 6407f64..596fbaa 100644
+--- a/src/audacious/playlist-new.c
++++ b/src/audacious/playlist-new.c
+@@ -822,6 +822,7 @@ void playlist_reorder (int from, int to, int count)
+ 
+ void playlist_delete (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -969,6 +970,7 @@ int playlist_get_active (void)
+ 
+ void playlist_set_playing (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing ())
+         playback_stop ();
+ 
+@@ -1112,6 +1114,7 @@ void playlist_entry_insert_batch_raw (int playlist_num, int at,
+ 
+ void playlist_entry_delete (int playlist_num, int at, int number)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing () &&
+      playlist_get_position (playlist_num) >= at && playlist_get_position
+      (playlist_num) < at + number)
+@@ -1225,6 +1228,7 @@ int playlist_entry_get_length (int playlist_num, int entry_num, bool_t fast)
+ 
+ void playlist_set_position (int playlist_num, int entry_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -1423,6 +1427,7 @@ int playlist_shift (int playlist_num, int entry_num, int distance)
+ 
+ void playlist_delete_selected (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing () &&
+      playlist_get_position (playlist_num) >= 0 && playlist_entry_get_selected
+      (playlist_num, playlist_get_position (playlist_num)))
+@@ -2023,6 +2028,7 @@ static bool_t shuffle_prev (Playlist * playlist)
+ 
+ bool_t playlist_prev_song (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -2110,6 +2116,7 @@ static void shuffle_reset (Playlist * playlist)
+ 
+ bool_t playlist_next_song (int playlist_num, bool_t repeat)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -2253,6 +2260,11 @@ int playback_entry_get_end_time (void)
+ 
+ void playlist_save_state (void)
+ {
++    /* get playback state before locking playlists */
++    resume_state = playback_get_playing () ? (playback_get_paused () ?
++     RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
++    resume_time = playback_get_playing () ? playback_get_time () : 0;
++
+     ENTER;
+ 
+     char * path = g_strdup_printf ("%s/" STATE_FILE, get_path (AUD_PATH_USER_DIR));
+@@ -2261,10 +2273,6 @@ void playlist_save_state (void)
+     if (! handle)
+         LEAVE_RET_VOID;
+ 
+-    resume_state = playback_get_playing () ? (playback_get_paused () ?
+-     RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
+-    resume_time = playback_get_playing () ? playback_get_time () : 0;
+-
+     fprintf (handle, "resume-state %d\n", resume_state);
+     fprintf (handle, "resume-time %d\n", resume_time);
+ 
diff --git a/media-sound/audio-entropyd/audio-entropyd-2.0.3.ebuild b/media-sound/audio-entropyd/audio-entropyd-2.0.3.ebuild
index 27275cd1a2ef..f2e68f930f02 100644
--- a/media-sound/audio-entropyd/audio-entropyd-2.0.3.ebuild
+++ b/media-sound/audio-entropyd/audio-entropyd-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/audio-entropyd-2.0.3.ebuild,v 1.2 2012/05/13 10:45:27 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audio-entropyd/audio-entropyd-2.0.3.ebuild,v 1.3 2012/05/27 14:47:53 ago Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/aed/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-entropyd )
diff --git a/media-sound/gmpc/Manifest b/media-sound/gmpc/Manifest
index 322dbc3a28fe..3d9cd63f8a9a 100644
--- a/media-sound/gmpc/Manifest
+++ b/media-sound/gmpc/Manifest
@@ -1,2 +1 @@
-DIST gmpc-0.20.0.tar.gz 3093720 RMD160 fd1278dbec1eb7ca2efd1e0545b0e37ff1fad34f SHA1 3b160bb1e196760b0148faa6493c66083e1fe53d SHA256 d9b8bd23e86acc74049d2ceb5e06db8c62b43e7e5bd166ac8348eae133b9de81
 DIST gmpc-11.8.16.tar.gz 7082909 RMD160 b11662d4b01790a06fe586ab2fa20161d37ecbc5 SHA1 f61845cb8d9a1c1970ecb65565bd4eefc73b0c0a SHA256 a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
diff --git a/media-sound/gmpc/gmpc-0.20.0.ebuild b/media-sound/gmpc/gmpc-0.20.0.ebuild
deleted file mode 100644
index 03c19c076fff..000000000000
--- a/media-sound/gmpc/gmpc-0.20.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-0.20.0.ebuild,v 1.13 2012/05/05 09:02:18 mgorny Exp $
-
-EAPI=2
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="A GTK+2 client for the Music Player Daemon"
-HOMEPAGE="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
-SRC_URI="http://download.sarine.nl/Programs/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls xspf"
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.12:2
-	x11-libs/libsexy
-	>=gnome-base/libglade-2
-	>=media-libs/libmpd-0.19.2
-	net-libs/libsoup:2.4
-	dev-db/sqlite:3
-	xspf? ( >=media-libs/libxspf-1.2 )"
-DEPEND="${RDEPEND}
-	dev-lang/vala:0.10
-	>=dev-util/gob-2.0.17
-	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-	eautoreconf
-}
-
-src_configure() {
-	VALAC=$(type -p valac-0.10) \
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		$(use_enable xspf libxspf) \
-		--disable-libspiff \
-		--enable-system-libsexy
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/gmpc/gmpc-11.8.16.ebuild b/media-sound/gmpc/gmpc-11.8.16.ebuild
index b738fd239d97..b91a7725c747 100644
--- a/media-sound/gmpc/gmpc-11.8.16.ebuild
+++ b/media-sound/gmpc/gmpc-11.8.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-11.8.16.ebuild,v 1.7 2012/05/05 09:02:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gmpc/gmpc-11.8.16.ebuild,v 1.8 2012/05/27 07:51:26 angelos Exp $
 
 EAPI=4
 inherit gnome2-utils
@@ -21,6 +21,7 @@ RDEPEND="dev-db/sqlite:3
 	net-libs/libsoup:2.4
 	>=x11-libs/gtk+-2.18:2
 	x11-libs/libX11
+	x11-themes/hicolor-icon-theme
 	unique? ( dev-libs/libunique:1 )
 	xspf? ( >=media-libs/libxspf-1.2 )"
 DEPEND="${RDEPEND}
diff --git a/media-sound/mpc/mpc-0.22.ebuild b/media-sound/mpc/mpc-0.22.ebuild
index 05f5ba855c39..977be5dad050 100644
--- a/media-sound/mpc/mpc-0.22.ebuild
+++ b/media-sound/mpc/mpc-0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/mpc-0.22.ebuild,v 1.2 2012/05/05 08:38:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpc/mpc-0.22.ebuild,v 1.3 2012/05/27 14:48:24 ago Exp $
 
 EAPI=4
 inherit bash-completion-r1
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="iconv"
 
 RDEPEND=">=media-libs/libmpdclient-2.2
diff --git a/media-sound/mpd/mpd-0.16.8.ebuild b/media-sound/mpd/mpd-0.16.8.ebuild
index 32349a32305d..082778b0f6c0 100644
--- a/media-sound/mpd/mpd-0.16.8.ebuild
+++ b/media-sound/mpd/mpd-0.16.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.8.ebuild,v 1.3 2012/05/22 15:44:38 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.8.ebuild,v 1.4 2012/05/27 07:44:46 angelos Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib systemd
@@ -26,7 +26,8 @@ REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio )
 RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	dev-libs/glib:2
 	aac? ( media-libs/faad2 )
-	alsa? ( media-sound/alsa-utils )
+	alsa? ( media-sound/alsa-utils
+		media-libs/alsa-lib )
 	ao? ( media-libs/libao[alsa?,pulseaudio?] )
 	audiofile? ( media-libs/audiofile )
 	bzip2? ( app-arch/bzip2 )
diff --git a/media-sound/ncmpc/ncmpc-0.20.ebuild b/media-sound/ncmpc/ncmpc-0.20.ebuild
index 670c6e58a6e8..69c891aa3b13 100644
--- a/media-sound/ncmpc/ncmpc-0.20.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.20.ebuild,v 1.2 2012/05/05 08:44:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.20.ebuild,v 1.3 2012/05/27 14:48:50 ago Exp $
 
 EAPI=4
 inherit multilib
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.sourceforge.net/musicpd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="artist-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/media-sound/scmpc/Manifest b/media-sound/scmpc/Manifest
index 5c975944ad8c..2b9806652cc2 100644
--- a/media-sound/scmpc/Manifest
+++ b/media-sound/scmpc/Manifest
@@ -1,2 +1 @@
-DIST scmpc-0.2.2.tar.bz2 72561 RMD160 b5aab6b72fff1910c8e245fa801ed788bd98eece SHA1 4105ef32f543c4babc20bf1569ca00426c7128fe SHA256 38d5992abd0b4ee55f9c7e40e979c56e90c685216e9b61fc8675e2ddece562de
 DIST scmpc-0.3.1.tar.bz2 89287 RMD160 ff33da35e657bbc7aed54888626175ab01db329b SHA1 6f666a4b03f354c8b2d95e57d49b3e4fcf5df996 SHA256 a7c171686ffe5dd15fd38f8fdcaf3d162076e02900557ec1eb96b59f16b1f557
diff --git a/media-sound/scmpc/scmpc-0.2.2.ebuild b/media-sound/scmpc/scmpc-0.2.2.ebuild
deleted file mode 100644
index 5165a9b2d8a9..000000000000
--- a/media-sound/scmpc/scmpc-0.2.2.ebuild
+++ /dev/null
@@ -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/media-sound/scmpc/scmpc-0.2.2.ebuild,v 1.9 2012/05/05 08:49:46 mgorny Exp $
-
-DESCRIPTION="a client for MPD which submits your tracks to last.fm"
-HOMEPAGE="http://cmende.github.com/scmpc/"
-SRC_URI="mirror://github/cmende/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="net-misc/curl
-	dev-libs/argtable
-	dev-libs/confuse
-	dev-libs/libdaemon"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	newinitd "${FILESDIR}/scmpc.init" ${PN}
-}
diff --git a/media-video/ushare/files/04_all_ushare_upnp_build_fix.patch b/media-video/ushare/files/04_all_ushare_upnp_build_fix.patch
new file mode 100644
index 000000000000..c3ec37a324c5
--- /dev/null
+++ b/media-video/ushare/files/04_all_ushare_upnp_build_fix.patch
@@ -0,0 +1,156 @@
+diff -wbBur ushare-1.1a/src/http.c ushare-1.1a.my/src/http.c
+--- ushare-1.1a/src/http.c	2007-12-09 13:03:36.000000000 +0000
++++ ushare-1.1a.my/src/http.c	2010-10-29 11:13:07.000000000 +0000
+@@ -77,8 +77,7 @@
+   info->content_type = ixmlCloneDOMString (content_type);
+ }
+ 
+-static int
+-http_get_info (const char *filename, struct File_Info *info)
++int http_get_info (const char *filename, struct File_Info *info)
+ {
+   extern struct ushare_t *ut;
+   struct upnp_entry_t *entry = NULL;
+@@ -197,8 +196,7 @@
+   return ((UpnpWebFileHandle) file);
+ }
+ 
+-static UpnpWebFileHandle
+-http_open (const char *filename, enum UpnpOpenFileMode mode)
++UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode)
+ {
+   extern struct ushare_t *ut;
+   struct upnp_entry_t *entry = NULL;
+@@ -251,8 +249,7 @@
+   return ((UpnpWebFileHandle) file);
+ }
+ 
+-static int
+-http_read (UpnpWebFileHandle fh, char *buf, size_t buflen)
++int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen)
+ {
+   struct web_file_t *file = (struct web_file_t *) fh;
+   ssize_t len = -1;
+@@ -286,8 +283,7 @@
+   return len;
+ }
+ 
+-static int
+-http_write (UpnpWebFileHandle fh __attribute__((unused)),
++int http_write (UpnpWebFileHandle fh __attribute__((unused)),
+             char *buf __attribute__((unused)),
+             size_t buflen __attribute__((unused)))
+ {
+@@ -296,8 +292,7 @@
+   return 0;
+ }
+ 
+-static int
+-http_seek (UpnpWebFileHandle fh, off_t offset, int origin)
++int http_seek (UpnpWebFileHandle fh, off_t offset, int origin)
+ {
+   struct web_file_t *file = (struct web_file_t *) fh;
+   off_t newpos = -1;
+@@ -371,8 +366,7 @@
+   return 0;
+ }
+ 
+-static int
+-http_close (UpnpWebFileHandle fh)
++int http_close (UpnpWebFileHandle fh)
+ {
+   struct web_file_t *file = (struct web_file_t *) fh;
+ 
+@@ -402,13 +396,3 @@
+ 
+   return 0;
+ }
+-
+-struct UpnpVirtualDirCallbacks virtual_dir_callbacks =
+-  {
+-    http_get_info,
+-    http_open,
+-    http_read,
+-    http_write,
+-    http_seek,
+-    http_close
+-  };
+diff -wbBur ushare-1.1a/src/http.h ushare-1.1a.my/src/http.h
+--- ushare-1.1a/src/http.h	2007-12-09 13:03:36.000000000 +0000
++++ ushare-1.1a.my/src/http.h	2010-10-29 11:13:11.000000000 +0000
+@@ -25,6 +25,13 @@
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+-struct UpnpVirtualDirCallbacks virtual_dir_callbacks;
++int http_close (UpnpWebFileHandle fh);
++int http_write (UpnpWebFileHandle fh __attribute__((unused)),
++            char *buf __attribute__((unused)),
++            size_t buflen __attribute__((unused)));
++int http_seek (UpnpWebFileHandle fh, off_t offset, int origin);
++UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode);
++int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen);
++int http_get_info (const char *filename, struct File_Info *info);
+ 
+ #endif /* _HTTP_H_ */
+diff -wbBur ushare-1.1a/src/ushare.c ushare-1.1a.my/src/ushare.c
+--- ushare-1.1a/src/ushare.c	2007-12-09 13:03:36.000000000 +0000
++++ ushare-1.1a.my/src/ushare.c	2010-10-29 11:17:45.000000000 +0000
+@@ -188,7 +188,7 @@
+   if (strcmp (request->DevUDN + 5, ut->udn))
+     return;
+ 
+-  ip = request->CtrlPtIPAddr.s_addr;
++  ip = (*(struct sockaddr_in*)&request->CtrlPtIPAddr).sin_addr.s_addr;
+   ip = ntohl (ip);
+   sprintf (val, "%d.%d.%d.%d",
+            (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF);
+@@ -348,7 +348,47 @@
+ 
+   UpnpEnableWebserver (TRUE);
+ 
+-  res = UpnpSetVirtualDirCallbacks (&virtual_dir_callbacks);
++  res = UpnpVirtualDir_set_WriteCallback(http_write);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_GetInfoCallback(http_get_info);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_ReadCallback(http_read);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_OpenCallback(http_open);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_SeekCallback(http_seek);
++  if (res != UPNP_E_SUCCESS)
++  {
++    log_error (_("Cannot set virtual directory callbacks\n"));
++    free (description);
++    return -1;
++  }
++
++  res = UpnpVirtualDir_set_CloseCallback(http_close);
+   if (res != UPNP_E_SUCCESS)
+   {
+     log_error (_("Cannot set virtual directory callbacks\n"));
diff --git a/media-video/ushare/files/05_all_missing_headers.patch b/media-video/ushare/files/05_all_missing_headers.patch
new file mode 100644
index 000000000000..0d2f0e8faff9
--- /dev/null
+++ b/media-video/ushare/files/05_all_missing_headers.patch
@@ -0,0 +1,59 @@
+diff -uNr ushare-1.1a.a/src/cds.c ushare-1.1a.b/src/cds.c
+--- ushare-1.1a.a/src/cds.c	2007-12-09 08:03:36.000000000 -0500
++++ ushare-1.1a.b/src/cds.c	2012-05-27 11:28:42.000000000 -0400
+@@ -19,7 +19,9 @@
+  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
++#include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+diff -uNr ushare-1.1a.a/src/cms.c ushare-1.1a.b/src/cms.c
+--- ushare-1.1a.a/src/cms.c	2007-12-09 08:03:36.000000000 -0500
++++ ushare-1.1a.b/src/cms.c	2012-05-27 11:25:03.000000000 -0400
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
+diff -uNr ushare-1.1a.a/src/http.c ushare-1.1a.b/src/http.c
+--- ushare-1.1a.a/src/http.c	2012-05-27 11:23:32.000000000 -0400
++++ ushare-1.1a.b/src/http.c	2012-05-27 11:25:13.000000000 -0400
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <errno.h>
+ 
+diff -uNr ushare-1.1a.a/src/presentation.c ushare-1.1a.b/src/presentation.c
+--- ushare-1.1a.a/src/presentation.c	2007-12-09 08:03:36.000000000 -0500
++++ ushare-1.1a.b/src/presentation.c	2012-05-27 11:30:08.000000000 -0400
+@@ -18,7 +18,9 @@
+  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  */
+ 
++#include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #if HAVE_LANGINFO_CODESET
+ # include <langinfo.h>
+diff -uNr ushare-1.1a.a/src/services.c ushare-1.1a.b/src/services.c
+--- ushare-1.1a.a/src/services.c	2007-12-09 08:03:36.000000000 -0500
++++ ushare-1.1a.b/src/services.c	2012-05-27 11:25:26.000000000 -0400
+@@ -20,6 +20,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <string.h>
+ #include <upnp/upnp.h>
+ #include <upnp/upnptools.h>
+ 
diff --git a/media-video/ushare/ushare-1.1a-r3.ebuild b/media-video/ushare/ushare-1.1a-r3.ebuild
new file mode 100644
index 000000000000..c89cdcf91e8e
--- /dev/null
+++ b/media-video/ushare/ushare-1.1a-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a-r3.ebuild,v 1.1 2012/05/27 16:45:02 xmw Exp $
+
+EAPI=4
+inherit eutils multilib
+
+DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
+HOMEPAGE="http://ushare.geexbox.org/"
+SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dlna nls"
+
+RDEPEND=">=net-libs/libupnp-1.6.14
+	dlna? ( >=media-libs/libdlna-0.2.4 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" \
+		EPATCH_OPTS="-p1" epatch
+}
+
+src_configure() {
+	local myconf
+	myconf="--prefix=/usr --disable-sysconf --disable-strip $(use_enable dlna)"
+	# nls can only be disabled, on by default.
+	use nls || myconf="${myconf} --disable-nls"
+
+	# I can't use econf
+	# --host is not implemented in ./configure file
+	./configure ${myconf} || die "./configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doman src/ushare.1
+	newconfd "${FILESDIR}"/ushare.conf.d ushare
+	newinitd "${FILESDIR}"/ushare.init.d ushare
+	dodoc NEWS README TODO THANKS AUTHORS
+}
+
+pkg_postinst() {
+	enewuser ushare
+	elog "Please edit /etc/conf.d/ushare to set the shared directories"
+	elog "and other important settings. Check system log if ushare is"
+	elog "not booting."
+}
diff --git a/metadata/cache/app-admin/apg-2.3.0b-r5 b/metadata/cache/app-admin/apg-2.3.0b-r5
index 32e07e46533e..1272cdec9bcd 100644
--- a/metadata/cache/app-admin/apg-2.3.0b-r5
+++ b/metadata/cache/app-admin/apg-2.3.0b-r5
@@ -6,7 +6,7 @@ http://www.adel.nursat.kz/apg/download/apg-2.3.0b.tar.gz
 http://www.adel.nursat.kz/apg/
 as-is
 Another Password Generator
-amd64 hppa ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+~alpha amd64 hppa ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
 eutils multilib toolchain-funcs user
 cracklib
 
diff --git a/metadata/cache/app-admin/hardinfo-0.5.2_pre20120527 b/metadata/cache/app-admin/hardinfo-0.5.2_pre20120527
new file mode 100644
index 000000000000..e9104e3ef1ec
--- /dev/null
+++ b/metadata/cache/app-admin/hardinfo-0.5.2_pre20120527
@@ -0,0 +1,22 @@
+dev-libs/glib:2 net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-libs/glib:2 net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango
+0
+http://dev.gentoo.org/~hasufell/distfiles/hardinfo-0.5.2_pre20120527.tar.xz
+
+http://hardinfo.berlios.de/
+GPL-2
+A system information and benchmark tool for Linux systems
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/app-admin/packagekit-base-0.7.4 b/metadata/cache/app-admin/packagekit-base-0.7.4
index e004d0058acf..e3e9f9798e32 100644
--- a/metadata/cache/app-admin/packagekit-base-0.7.4
+++ b/metadata/cache/app-admin/packagekit-base-0.7.4
@@ -6,7 +6,7 @@ test
 http://www.packagekit.org/
 GPL-2
 Manage packages in a secure way using a cross-distro and cross-architecture API
-~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
 bash-completion-r1 eutils multilib nsplugins python toolchain-funcs user
 connman cron doc +introspection networkmanager nsplugin pm-utils +policykit entropy static-libs test udev linguas_as linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_fi linguas_fr linguas_gu linguas_he linguas_hi linguas_hu linguas_it linguas_ja linguas_kn linguas_ko linguas_ml linguas_mr linguas_ms linguas_nb linguas_nl linguas_or linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
 
diff --git a/metadata/cache/app-crypt/seahorse-3.2.2 b/metadata/cache/app-crypt/seahorse-3.2.2
index 45b04a48413e..2a4cee136b7d 100644
--- a/metadata/cache/app-crypt/seahorse-3.2.2
+++ b/metadata/cache/app-crypt/seahorse-3.2.2
@@ -6,7 +6,7 @@ mirror://gnome/sources/seahorse/3.2/seahorse-3.2.2.tar.xz
 http://www.gnome.org/projects/seahorse/index.html
 GPL-2
 A GNOME application for managing encryption keys
-~amd64 ~x86 ~x86-fbsd
+~alpha ~amd64 ~x86 ~x86-fbsd
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
 avahi debug doc ldap test debug
 
diff --git a/metadata/cache/app-emacs/tuareg-mode-2.0.6 b/metadata/cache/app-emacs/tuareg-mode-2.0.6
new file mode 100644
index 000000000000..970c11311afd
--- /dev/null
+++ b/metadata/cache/app-emacs/tuareg-mode-2.0.6
@@ -0,0 +1,22 @@
+>=virtual/emacs-21
+>=virtual/emacs-21
+0
+http://forge.ocamlcore.org/frs/download.php/882/tuareg-mode-2.0.6.tgz
+
+http://forge.ocamlcore.org/projects/tuareg/
+GPL-2
+An Objective Caml/Camllight mode for Emacs
+~amd64 ~ppc ~x86 ~x86-fbsd
+elisp elisp-common eutils multilib toolchain-funcs user
+
+
+
+
+4
+
+compile configure install postinst postrm prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/app-emulation/emul-linux-x86-soundlibs-20120520-r1 b/metadata/cache/app-emulation/emul-linux-x86-soundlibs-20120520-r1
new file mode 100644
index 000000000000..89f6d205427a
--- /dev/null
+++ b/metadata/cache/app-emulation/emul-linux-x86-soundlibs-20120520-r1
@@ -0,0 +1,22 @@
+>=sys-apps/findutils-4.2.26
+pulseaudio? ( media-sound/pulseaudio ) ~app-emulation/emul-linux-x86-baselibs-20120520 ~app-emulation/emul-linux-x86-medialibs-20120520
+0
+http://dev.gentoo.org/~pacho/emul/emul-linux-x86-soundlibs-20120520.tar.xz
+strip
+http://dev.gentoo.org/~pacho/emul.html
+BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 as-is gsm public-domain
+Provides precompiled 32bit libraries
+-* ~amd64
+emul-linux-x86 eutils multilib toolchain-funcs user versionator
+alsa pulseaudio development
+
+
+
+4
+
+install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/app-misc/geoclue-0.12.0_p20110307 b/metadata/cache/app-misc/geoclue-0.12.0_p20110307
index aac9df42652e..c9e7f6b8531c 100644
--- a/metadata/cache/app-misc/geoclue-0.12.0_p20110307
+++ b/metadata/cache/app-misc/geoclue-0.12.0_p20110307
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~signals/geoclue-0.12.0_p20110307.tar.bz2
 http://freedesktop.org/wiki/Software/GeoClue
 LGPL-2
 A geoinformation D-Bus service
-amd64 ~arm x86 ~amd64-fbsd
+amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd
 autotools eutils libtool multilib toolchain-funcs user
 geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes skyhook yahoo-geo
 skyhook? ( networkmanager )
diff --git a/metadata/cache/app-office/calligra-2.4.0-r1 b/metadata/cache/app-office/calligra-2.4.0-r1
deleted file mode 100644
index 6d6bf6248a6e..000000000000
--- a/metadata/cache/app-office/calligra-2.4.0-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-4
-mirror://kde/stable/calligra-2.4.0/calligra-2.4.0.tar.bz2
-test
-http://www.calligra.org/
-GPL-2
-KDE Office Suite
-~amd64 ~x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
-calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/calligra-2.4.1 b/metadata/cache/app-office/calligra-2.4.1
index 155c01c377cd..173ffeaae4d4 100644
--- a/metadata/cache/app-office/calligra-2.4.1
+++ b/metadata/cache/app-office/calligra-2.4.1
@@ -1,12 +1,12 @@
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 4
 mirror://kde/stable/calligra-2.4.1/calligra-2.4.1.tar.bz2
 test
 http://www.calligra.org/
 GPL-2
 KDE Office Suite
-~amd64 ~x86
+amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
 attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
 calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
diff --git a/metadata/cache/app-office/calligra-2.4.2 b/metadata/cache/app-office/calligra-2.4.2
new file mode 100644
index 000000000000..d544d8056eb2
--- /dev/null
+++ b/metadata/cache/app-office/calligra-2.4.2
@@ -0,0 +1,22 @@
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+4
+mirror://kde/stable/calligra-2.4.2/calligra-2.4.2.tar.bz2
+test
+http://www.calligra.org/
+GPL-2
+KDE Office Suite
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
+attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
+calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/app-office/calligra-2.4.9999 b/metadata/cache/app-office/calligra-2.4.49.9999
similarity index 56%
rename from metadata/cache/app-office/calligra-2.4.9999
rename to metadata/cache/app-office/calligra-2.4.49.9999
index 3d7569a9031a..6a005b97f3fa 100644
--- a/metadata/cache/app-office/calligra-2.4.9999
+++ b/metadata/cache/app-office/calligra-2.4.49.9999
@@ -1,5 +1,5 @@
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 dev-vcs/git >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 dev-vcs/git >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 4
 
 test
diff --git a/metadata/cache/app-office/calligra-2.4.90 b/metadata/cache/app-office/calligra-2.4.90
new file mode 100644
index 000000000000..73ac98ef66e6
--- /dev/null
+++ b/metadata/cache/app-office/calligra-2.4.90
@@ -0,0 +1,22 @@
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+4
+mirror://kde/unstable/calligra-2.4.90/calligra-2.4.90.tar.bz2
+test
+http://www.calligra.org/
+GPL-2
+KDE Office Suite
+~amd64 ~x86
+base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
+attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
+calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/app-office/calligra-9999 b/metadata/cache/app-office/calligra-9999
index 3d7569a9031a..6a005b97f3fa 100644
--- a/metadata/cache/app-office/calligra-9999
+++ b/metadata/cache/app-office/calligra-9999
@@ -1,5 +1,5 @@
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 dev-vcs/git >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
-!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 dev-vcs/git >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 4
 
 test
diff --git a/metadata/cache/app-office/calligra-l10n-2.4.0 b/metadata/cache/app-office/calligra-l10n-2.4.0
deleted file mode 100644
index 33a27b28c2d6..000000000000
--- a/metadata/cache/app-office/calligra-l10n-2.4.0
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
->=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-4
-linguas_ca? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-ca-2.4.0.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-ca@valencia-2.4.0.tar.bz2 ) linguas_cs? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-cs-2.4.0.tar.bz2 ) linguas_da? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-da-2.4.0.tar.bz2 ) linguas_de? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-de-2.4.0.tar.bz2 ) linguas_el? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-el-2.4.0.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-en_GB-2.4.0.tar.bz2 ) linguas_es? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-es-2.4.0.tar.bz2 ) linguas_et? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-et-2.4.0.tar.bz2 ) linguas_fi? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-fi-2.4.0.tar.bz2 ) linguas_fr? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-fr-2.4.0.tar.bz2 ) linguas_hu? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-hu-2.4.0.tar.bz2 ) linguas_it? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-it-2.4.0.tar.bz2 ) linguas_kk? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-kk-2.4.0.tar.bz2 ) linguas_nb? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-nb-2.4.0.tar.bz2 ) linguas_nds? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-nds-2.4.0.tar.bz2 ) linguas_nl? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-nl-2.4.0.tar.bz2 ) linguas_pl? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-pl-2.4.0.tar.bz2 ) linguas_pt? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-pt-2.4.0.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-pt_BR-2.4.0.tar.bz2 ) linguas_ru? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-ru-2.4.0.tar.bz2 ) linguas_sk? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-sk-2.4.0.tar.bz2 ) linguas_sv? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-sv-2.4.0.tar.bz2 ) linguas_uk? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-uk-2.4.0.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-zh_CN-2.4.0.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-zh_TW-2.4.0.tar.bz2 )
-
-http://www.kde.org/
-GPL-2
-Calligra localization package
-~amd64 ~x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/calligra-l10n-2.4.1 b/metadata/cache/app-office/calligra-l10n-2.4.1
index 486290a3ae9a..8be1c87ddfa8 100644
--- a/metadata/cache/app-office/calligra-l10n-2.4.1
+++ b/metadata/cache/app-office/calligra-l10n-2.4.1
@@ -6,7 +6,7 @@ linguas_ca? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ca
 http://www.kde.org/
 GPL-2
 Calligra localization package
-~amd64 ~x86
+amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
 doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
 
diff --git a/metadata/cache/app-office/openerp-server-5.0.16 b/metadata/cache/app-office/openerp-server-5.0.16
new file mode 100644
index 000000000000..3e2ee0271108
--- /dev/null
+++ b/metadata/cache/app-office/openerp-server-5.0.16
@@ -0,0 +1,22 @@
+dev-db/postgresql-server dev-python/egenix-mx-base dev-python/lxml dev-python/psycopg dev-python/pychart dev-python/pytz dev-python/pyxml dev-python/pyopenssl dev-python/reportlab media-gfx/pydot dev-libs/libxslt[python] dev-libs/libxml2[python] =dev-lang/python-2*
+dev-db/postgresql-server dev-python/egenix-mx-base dev-python/lxml dev-python/psycopg dev-python/pychart dev-python/pytz dev-python/pyxml dev-python/pyopenssl dev-python/reportlab media-gfx/pydot dev-libs/libxslt[python] dev-libs/libxml2[python] =dev-lang/python-2*
+0
+http://www.openerp.com/download/stable/source/openerp-server-5.0.16.tar.gz
+
+http://www.openerp.com/
+GPL-2
+Open Source ERP & CRM
+~amd64 ~x86
+distutils eutils multilib python toolchain-funcs user
+
+
+
+
+3
+
+compile config install postinst postrm preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/app-text/tree-1.5.3 b/metadata/cache/app-text/tree-1.5.3
deleted file mode 100644
index 3899c0ac8793..000000000000
--- a/metadata/cache/app-text/tree-1.5.3
+++ /dev/null
@@ -1,22 +0,0 @@
-
-bash-completion? ( app-admin/eselect )
-0
-ftp://mama.indstate.edu/linux/tree/tree-1.5.3.tgz
-
-http://mama.indstate.edu/users/ice/tree/
-GPL-2
-Lists directories recursively, and produces an indented listing of files.
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-bash-completion eutils flag-o-matic multilib toolchain-funcs user
-bash-completion
-
-bash-completion? ( app-shells/bash-completion )
-
-2
-
-compile install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/app-text/tree-1.6.0-r1 b/metadata/cache/app-text/tree-1.6.0-r1
new file mode 100644
index 000000000000..6df78fafc3a0
--- /dev/null
+++ b/metadata/cache/app-text/tree-1.6.0-r1
@@ -0,0 +1,22 @@
+
+
+0
+ftp://mama.indstate.edu/linux/tree/tree-1.6.0.tgz
+
+http://mama.indstate.edu/users/ice/tree/
+GPL-2
+Lists directories recursively, and produces an indented listing of files.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+bash-completion-r1 eutils flag-o-matic multilib toolchain-funcs user
+
+
+
+
+4
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/app-text/ttf2pk2-1.5_p20120525 b/metadata/cache/app-text/ttf2pk2-1.5_p20120525
index b43a65ce80b1..fc6d03d50f7f 100644
--- a/metadata/cache/app-text/ttf2pk2-1.5_p20120525
+++ b/metadata/cache/app-text/ttf2pk2-1.5_p20120525
@@ -1,4 +1,4 @@
->=dev-libs/kpathsea-6.0.1_p20110627 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source] dev-util/pkgconfig
+>=dev-libs/kpathsea-6.0.1_p20110627 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source] virtual/pkgconfig
 >=dev-libs/kpathsea-6.0.1_p20110627 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source]
 0
 mirror://gentoo/texlive-20120525-source.tar.xz
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20120525-source.tar.xz
 http://tug.org/texlive/
 GPL-2
 Freetype 2 based TrueType font to TeX's PK format converter
-~amd64
+~amd64 ~x86 ~x86-fbsd
 
 
 
diff --git a/metadata/cache/dev-cpp/libassa-3.5.1 b/metadata/cache/dev-cpp/libassa-3.5.1
index 160c5978e82a..875536016eb6 100644
--- a/metadata/cache/dev-cpp/libassa-3.5.1
+++ b/metadata/cache/dev-cpp/libassa-3.5.1
@@ -6,7 +6,7 @@ mirror://sourceforge/libassa/libassa-3.5.1.tar.gz
 http://libassa.sourceforge.net/
 LGPL-2
 A networking library based on Adaptive Communication Patterns
-~amd64 ~x86
+amd64 x86
 eutils multilib toolchain-funcs user
 doc static-libs
 
diff --git a/metadata/cache/dev-db/postgresql-server-9.2.0_beta1 b/metadata/cache/dev-db/postgresql-server-9.2.0_beta1-r1
similarity index 99%
rename from metadata/cache/dev-db/postgresql-server-9.2.0_beta1
rename to metadata/cache/dev-db/postgresql-server-9.2.0_beta1-r1
index f68f07ec2306..53b53d23af03 100644
--- a/metadata/cache/dev-db/postgresql-server-9.2.0_beta1
+++ b/metadata/cache/dev-db/postgresql-server-9.2.0_beta1-r1
@@ -1,7 +1,7 @@
 ~dev-db/postgresql-base-9.2.0_beta1:9.2[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) sys-devel/flex xml? ( virtual/pkgconfig ) sys-devel/automake >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 ~dev-db/postgresql-base-9.2.0_beta1:9.2[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 9.2
-mirror://postgresql/source/v9.2.0beta1/postgresql-9.2beta1.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.2beta1.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2
+mirror://postgresql/source/v9.2.0beta1/postgresql-9.2beta1.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.2beta1.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.2.tbz2
 
 http://www.postgresql.org/
 POSTGRESQL
diff --git a/metadata/cache/dev-games/irrlicht-1.7.3 b/metadata/cache/dev-games/irrlicht-1.7.3
new file mode 100644
index 000000000000..ea89130d9e71
--- /dev/null
+++ b/metadata/cache/dev-games/irrlicht-1.7.3
@@ -0,0 +1,22 @@
+virtual/jpeg media-libs/libpng app-arch/bzip2 virtual/opengl x11-libs/libX11 app-arch/unzip x11-proto/xproto x11-proto/xf86vidmodeproto
+virtual/jpeg media-libs/libpng app-arch/bzip2 virtual/opengl x11-libs/libX11
+0
+mirror://sourceforge/irrlicht/irrlicht-1.7.3.zip
+
+http://irrlicht.sourceforge.net/
+ZLIB
+open source high performance realtime 3D engine written in C++
+~amd64 ~ppc ~x86
+eutils multilib toolchain-funcs user
+doc
+
+
+
+2
+
+compile install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-java/ant-nodeps-1.8.2 b/metadata/cache/dev-java/ant-nodeps-1.8.2
index aa82578d0d21..908571b80207 100644
--- a/metadata/cache/dev-java/ant-nodeps-1.8.2
+++ b/metadata/cache/dev-java/ant-nodeps-1.8.2
@@ -1,4 +1,4 @@
->=dev-java/java-config-2.1.9-r1 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 ~dev-java/ant-core-1.8.2 !dev-java/ant-tasks
+>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 ~dev-java/ant-core-1.8.2 !dev-java/ant-tasks
 >=dev-java/java-config-2.1.9-r1 ~dev-java/ant-core-1.8.2
 0
 mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
diff --git a/metadata/cache/dev-java/jcharts-0.7.5-r2 b/metadata/cache/dev-java/jcharts-0.7.5-r2
new file mode 100644
index 000000000000..391e58120c81
--- /dev/null
+++ b/metadata/cache/dev-java/jcharts-0.7.5-r2
@@ -0,0 +1,22 @@
+dev-java/batik:1.7 java-virtuals/servlet-api:3.0 || ( virtual/jdk:1.6 virtual/jdk:1.5 virtual/jdk:1.4 ) app-arch/unzip >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+dev-java/batik:1.7 java-virtuals/servlet-api:3.0 || ( virtual/jre:1.6 virtual/jre:1.5 virtual/jre:1.4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+0
+mirror://sourceforge/jcharts/jCharts-0.7.5.zip
+test
+http://jcharts.sourceforge.net/
+BSD
+jCharts is a 100% Java based charting utility that outputs a variety of charts
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD doc examples source elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-java-7.0.1-r2 b/metadata/cache/dev-java/netbeans-java-7.0.1-r2
new file mode 100644
index 000000000000..b5b6b0e79552
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-java-7.0.1-r2
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-platform-7.0.1 ~dev-java/netbeans-harness-7.0.1 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-websvccommon-7.0.1 dev-java/appframework:0 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/swing-worker:0 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.0.1 ~dev-java/netbeans-harness-7.0.1 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-websvccommon-7.0.1 dev-java/appframework:0 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/swing-worker:0 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/asm:2.2 dev-java/cglib:2.1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/ehcache:1.2 dev-java/fastinfoset:0 dev-java/javassist:3 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/jsr250:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 >=dev-java/maven-bin-3.0.3:3.0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
+7.0
+http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip http://hg.netbeans.org/binaries/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar http://hg.netbeans.org/binaries/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip http://hg.netbeans.org/binaries/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar http://hg.netbeans.org/binaries/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar http://hg.netbeans.org/binaries/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar http://hg.netbeans.org/binaries/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip
+
+http://netbeans.org/projects/java
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans Java Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install postinst preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/netbeans-java-7.1.2-r1 b/metadata/cache/dev-java/netbeans-java-7.1.2-r1
new file mode 100644
index 000000000000..86f1cd7a185a
--- /dev/null
+++ b/metadata/cache/dev-java/netbeans-java-7.1.2-r1
@@ -0,0 +1,22 @@
+virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/javahelp:0 dev-java/junit:4 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/asm:2.2 dev-java/cglib:2.1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/ehcache:1.2 dev-java/fastinfoset:0 dev-java/javassist:3 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/jsr250:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
+7.1
+http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip
+
+http://netbeans.org/projects/java
+|| ( CDDL GPL-2-with-linking-exception )
+Netbeans Java Cluster
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare pretend setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/ruby-1.9.3_p125 b/metadata/cache/dev-lang/ruby-1.9.3_p125
index dc68ed160069..096f08cb36b5 100644
--- a/metadata/cache/dev-lang/ruby-1.9.3_p125
+++ b/metadata/cache/dev-lang/ruby-1.9.3_p125
@@ -6,7 +6,7 @@ mirror://ruby/1.9/ruby-1.9.3-p125.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-
 http://www.ruby-lang.org/
 || ( Ruby BSD-2 )
 An object-oriented scripting language
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 autotools eutils flag-o-matic libtool multilib toolchain-funcs user versionator
 berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml
 
diff --git a/metadata/cache/dev-libs/argtable-2.12 b/metadata/cache/dev-libs/argtable-2.12
deleted file mode 100644
index 930500787a46..000000000000
--- a/metadata/cache/dev-libs/argtable-2.12
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-mirror://sourceforge/argtable/argtable2-12.tar.gz
-
-http://argtable.sourceforge.net/
-LGPL-2
-An ANSI C library for parsing GNU-style command-line options with minimal fuss
-amd64 x86
-eutils multilib toolchain-funcs user versionator
-doc debug examples
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/dev-libs/gjs-1.32.0 b/metadata/cache/dev-libs/gjs-1.32.0
index 1ce87268bfeb..c81aa91d6d1c 100644
--- a/metadata/cache/dev-libs/gjs-1.32.0
+++ b/metadata/cache/dev-libs/gjs-1.32.0
@@ -6,7 +6,7 @@ mirror://gnome/sources/gjs/1.32/gjs-1.32.0.tar.xz
 http://live.gnome.org/Gjs
 MIT MPL-1.1 LGPL-2 GPL-2
 Javascript bindings for GNOME
-~amd64 ~x86
+~alpha ~amd64 ~x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib pax-utils python toolchain-funcs user versionator virtualx
 examples test test
 
diff --git a/metadata/cache/dev-libs/libevent-2.0.18 b/metadata/cache/dev-libs/libevent-2.0.18
index f7cf4f240eca..f9fed56ba643 100644
--- a/metadata/cache/dev-libs/libevent-2.0.18
+++ b/metadata/cache/dev-libs/libevent-2.0.18
@@ -6,7 +6,7 @@ mirror://sourceforge/levent/files/libevent-2.0.18-stable.tar.gz
 http://monkey.org/~provos/libevent/
 BSD
 A library to execute a function when a specific event occurs on a file descriptor
-~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils libtool multilib toolchain-funcs user
 +ssl static-libs test
 
diff --git a/metadata/cache/dev-libs/libxml2-2.8.0-r1 b/metadata/cache/dev-libs/libxml2-2.8.0-r1
index 7d36eb77f4f9..632cc4e98e6e 100644
--- a/metadata/cache/dev-libs/libxml2-2.8.0-r1
+++ b/metadata/cache/dev-libs/libxml2-2.8.0-r1
@@ -6,7 +6,7 @@ ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz test? ( http://www.w3.org/XML/200
 http://www.xmlsoft.org/
 MIT
 Version 2 of the library to manipulate XML files
-~alpha ~amd64 ~arm ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 autotools eutils flag-o-matic libtool multilib prefix python toolchain-funcs user
 debug doc examples icu ipv6 lzma python readline static-libs test
 
diff --git a/metadata/cache/dev-libs/libyaml-0.1.4 b/metadata/cache/dev-libs/libyaml-0.1.4
index 763cee2ed92a..71d47bb48f3f 100644
--- a/metadata/cache/dev-libs/libyaml-0.1.4
+++ b/metadata/cache/dev-libs/libyaml-0.1.4
@@ -6,7 +6,7 @@ http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz
 http://pyyaml.org/wiki/LibYAML
 MIT
 YAML 1.1 parser and emitter written in C
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 eutils multilib toolchain-funcs user
 doc examples test static-libs
 
diff --git a/metadata/cache/dev-python/mock-0.8.0 b/metadata/cache/dev-python/mock-0.8.0
index 1cc2fcef89b8..5c1d8b83e87a 100644
--- a/metadata/cache/dev-python/mock-0.8.0
+++ b/metadata/cache/dev-python/mock-0.8.0
@@ -6,7 +6,7 @@ mirror://pypi/m/mock/mock-0.8.0.tar.gz
 http://www.voidspace.org.uk/python/mock/ http://pypi.python.org/pypi/mock
 BSD
 A Python Mocking and Patching Library for Testing
-~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos
+~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos
 distutils multilib python toolchain-funcs
 doc test test
 
diff --git a/metadata/cache/dev-python/munkres-1.0.5.4 b/metadata/cache/dev-python/munkres-1.0.5.4
new file mode 100644
index 000000000000..886616b7edec
--- /dev/null
+++ b/metadata/cache/dev-python/munkres-1.0.5.4
@@ -0,0 +1,22 @@
+dev-lang/python
+dev-lang/python
+0
+mirror://pypi/m/munkres/munkres-1.0.5.4.tar.gz
+
+http://pypi.python.org/pypi/munkres/
+BSD
+Module implementing munkres algorithm for the Assignment Problem
+~amd64
+distutils multilib python toolchain-funcs
+
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-python/py-1.4.7 b/metadata/cache/dev-python/py-1.4.7
index 3c55309cfca6..36db2c9682c8 100644
--- a/metadata/cache/dev-python/py-1.4.7
+++ b/metadata/cache/dev-python/py-1.4.7
@@ -6,7 +6,7 @@ mirror://pypi/p/py/py-1.4.7.zip
 http://pylib.org/ http://pypi.python.org/pypi/py
 MIT
 library with cross-python path, ini-parsing, io, code, log facilities
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos
 distutils multilib python toolchain-funcs
 test
 
diff --git a/metadata/cache/dev-python/pycrypto-2.6 b/metadata/cache/dev-python/pycrypto-2.6
index ae0fbadfd5bc..6af9faf6f273 100644
--- a/metadata/cache/dev-python/pycrypto-2.6
+++ b/metadata/cache/dev-python/pycrypto-2.6
@@ -6,7 +6,7 @@ http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz
 http://www.dlitz.net/software/pycrypto/ http://pypi.python.org/pypi/pycrypto
 PSF-2 public-domain
 Python Cryptography Toolkit
-~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 distutils multilib python toolchain-funcs
 doc +gmp
 
diff --git a/metadata/cache/dev-python/pyparsing-1.5.6 b/metadata/cache/dev-python/pyparsing-1.5.6
index e67e80b171ba..4869417b3a54 100644
--- a/metadata/cache/dev-python/pyparsing-1.5.6
+++ b/metadata/cache/dev-python/pyparsing-1.5.6
@@ -6,7 +6,7 @@ mirror://sourceforge/pyparsing/pyparsing-1.5.6.tar.gz
 http://pyparsing.wikispaces.com/ http://pypi.python.org/pypi/pyparsing
 MIT
 pyparsing is an easy-to-use Python module for text parsing
-~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
+~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
 distutils eutils multilib python toolchain-funcs user
 doc examples
 
diff --git a/metadata/cache/dev-python/scrapy-0.14.4 b/metadata/cache/dev-python/scrapy-0.14.4
new file mode 100644
index 000000000000..4bf19f5943e4
--- /dev/null
+++ b/metadata/cache/dev-python/scrapy-0.14.4
@@ -0,0 +1,22 @@
+dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/django net-ftp/vsftpd ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+dev-libs/libxml2[python] boto? ( dev-python/boto ) dev-python/imaging dev-python/lxml ibl? ( dev-python/numpy ) ssl? ( dev-python/pyopenssl ) dev-python/setuptools dev-python/simplejson dev-python/twisted dev-python/twisted-conch dev-python/twisted-mail dev-python/twisted-web >=dev-python/w3lib-1.1 =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+0
+mirror://pypi/S/Scrapy/Scrapy-0.14.4.tar.gz
+
+http://scrapy.org http://pypi.python.org/pypi/Scrapy/
+BSD-2
+A high-level Python Screen Scraping framework
+~amd64 ~x86
+distutils multilib python toolchain-funcs
+boto doc examples ibl test ssl
+
+
+
+4
+
+compile install postinst postrm prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-python/simplejson-2.5.0 b/metadata/cache/dev-python/simplejson-2.5.0
index d102d423d709..3df7bf110c7f 100644
--- a/metadata/cache/dev-python/simplejson-2.5.0
+++ b/metadata/cache/dev-python/simplejson-2.5.0
@@ -6,7 +6,7 @@ mirror://pypi/s/simplejson/simplejson-2.5.0.tar.gz
 http://undefined.org/python/#simplejson http://pypi.python.org/pypi/simplejson
 MIT
 Simple, fast, extensible JSON encoder/decoder for Python
-amd64 ~arm ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+amd64 arm ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 distutils multilib python toolchain-funcs
 
 
diff --git a/metadata/cache/dev-python/unidecode-0.04.9 b/metadata/cache/dev-python/unidecode-0.04.9
new file mode 100644
index 000000000000..448e7aa1f80f
--- /dev/null
+++ b/metadata/cache/dev-python/unidecode-0.04.9
@@ -0,0 +1,22 @@
+dev-lang/python
+dev-lang/python
+0
+mirror://pypi/U/Unidecode/Unidecode-0.04.9.tar.gz
+
+http://pypi.python.org/pypi/Unidecode
+GPL-2
+Module providing ASCII transliterations of Unicode text
+~amd64
+distutils multilib python toolchain-funcs
+
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/builder-2.1.2-r1 b/metadata/cache/dev-ruby/builder-2.1.2-r1
index df33444ed45b..ba4a621caef1 100644
--- a/metadata/cache/dev-ruby/builder-2.1.2-r1
+++ b/metadata/cache/dev-ruby/builder-2.1.2-r1
@@ -6,7 +6,7 @@ mirror://rubyforge/builder/builder-2.1.2.tgz
 http://rubyforge.org/projects/builder/
 MIT
 A builder to facilitate programatic generation of XML markup
-alpha amd64 ~arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+alpha amd64 arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_jruby doc doc test test
 
diff --git a/metadata/cache/dev-ruby/hoe-2.12.5 b/metadata/cache/dev-ruby/hoe-2.12.5
index f65a41ae69ac..12e747cfcf9e 100644
--- a/metadata/cache/dev-ruby/hoe-2.12.5
+++ b/metadata/cache/dev-ruby/hoe-2.12.5
@@ -6,7 +6,7 @@ mirror://rubygems/hoe-2.12.5.gem
 http://seattlerb.rubyforge.org/
 MIT
 Hoe extends rake to provide full project automation.
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
 
diff --git a/metadata/cache/dev-ruby/json-1.5.4-r1 b/metadata/cache/dev-ruby/json-1.5.4-r1
index 897f801e9167..ab26a5ee83b5 100644
--- a/metadata/cache/dev-ruby/json-1.5.4-r1
+++ b/metadata/cache/dev-ruby/json-1.5.4-r1
@@ -6,7 +6,7 @@ mirror://rubygems/json-1.5.4.gem
 http://json.rubyforge.org/
 || ( Ruby GPL-2 )
 A JSON implementation as a Ruby extension.
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby ruby_targets_ruby19 doc doc test test
 
diff --git a/metadata/cache/dev-ruby/minitest-2.8.1 b/metadata/cache/dev-ruby/minitest-2.8.1
index 7ba3c52c0c6d..c1bfb07c853f 100644
--- a/metadata/cache/dev-ruby/minitest-2.8.1
+++ b/metadata/cache/dev-ruby/minitest-2.8.1
@@ -6,7 +6,7 @@ mirror://rubygems/minitest-2.8.1.gem
 http://rubyforge.org/projects/bfts
 MIT
 minitest/unit is a small and fast replacement for ruby's huge and slow test/unit.
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
 
diff --git a/metadata/cache/dev-ruby/racc-1.4.6-r1 b/metadata/cache/dev-ruby/racc-1.4.6-r1
index 3a9b644daade..f2a13bc19ad0 100644
--- a/metadata/cache/dev-ruby/racc-1.4.6-r1
+++ b/metadata/cache/dev-ruby/racc-1.4.6-r1
@@ -6,7 +6,7 @@ mirror://rubygems/racc-1.4.6.gem
 http://www.loveruby.net/en/racc.html
 LGPL-2.1
 A LALR(1) parser generator for Ruby
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ree18 ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test test
 
diff --git a/metadata/cache/dev-ruby/rake-0.8.7-r6 b/metadata/cache/dev-ruby/rake-0.8.7-r6
index 635828f446b1..cfddc464e00d 100644
--- a/metadata/cache/dev-ruby/rake-0.8.7-r6
+++ b/metadata/cache/dev-ruby/rake-0.8.7-r6
@@ -6,7 +6,7 @@ test
 http://rake.rubyforge.org/
 MIT
 Make-like scripting in Ruby
-~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 bash-completion eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
 bash-completion doc bash-completion elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby test
 
diff --git a/metadata/cache/dev-ruby/rdoc-3.12 b/metadata/cache/dev-ruby/rdoc-3.12
index 19b0bdcd3c58..f4f51188ccec 100644
--- a/metadata/cache/dev-ruby/rdoc-3.12
+++ b/metadata/cache/dev-ruby/rdoc-3.12
@@ -6,7 +6,7 @@ mirror://rubygems/rdoc-3.12.gem
 https://github.com/rdoc/rdoc/
 Ruby MIT
 An extended version of the RDoc library from Ruby 1.8
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
 
diff --git a/metadata/cache/dev-ruby/ruby-gettext-2.2.0 b/metadata/cache/dev-ruby/ruby-gettext-2.2.0
new file mode 100644
index 000000000000..f1b8420fae92
--- /dev/null
+++ b/metadata/cache/dev-ruby/ruby-gettext-2.2.0
@@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/locale-2.0.5[ruby_targets_jruby] ) ruby_targets_ree18? ( >=dev-ruby/locale-2.0.5[ruby_targets_ree18] ) ) sys-devel/gettext ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/yard[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( || ( virtual/ruby-test-unit[ruby_targets_ruby18] dev-ruby/test-unit:2[ruby_targets_ruby18] ) ) ) ruby_targets_ruby19? ( test? ( || ( virtual/ruby-test-unit[ruby_targets_ruby19] dev-ruby/test-unit:2[ruby_targets_ruby19] ) ) ) ruby_targets_jruby? ( test? ( || ( virtual/ruby-test-unit[ruby_targets_jruby] dev-ruby/test-unit:2[ruby_targets_jruby] ) ) ) ruby_targets_ree18? ( test? ( || ( virtual/ruby-test-unit[ruby_targets_ree18] dev-ruby/test-unit:2[ruby_targets_ree18] ) ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/locale-2.0.5[ruby_targets_jruby] ) ruby_targets_ree18? ( >=dev-ruby/locale-2.0.5[ruby_targets_ree18] ) sys-devel/gettext ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+0
+mirror://rubygems/gettext-2.2.0.gem
+
+http://www.yotabanana.com/hiki/ruby-gettext.html
+Ruby
+Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package
+~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
+eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
+doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 doc doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-ruby/rubyforge-2.0.4-r2 b/metadata/cache/dev-ruby/rubyforge-2.0.4-r2
index a58540a37bac..67d20b5be431 100644
--- a/metadata/cache/dev-ruby/rubyforge-2.0.4-r2
+++ b/metadata/cache/dev-ruby/rubyforge-2.0.4-r2
@@ -6,7 +6,7 @@ mirror://rubygems/rubyforge-2.0.4.gem
 http://codeforpeople.rubyforge.org/rubyforge/
 MIT
 Simplistic script which automates a limited set of rubyforge operations
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator
 test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
 
diff --git a/metadata/cache/dev-ruby/rubygems-1.8.24 b/metadata/cache/dev-ruby/rubygems-1.8.24
index 85f73b1c25f3..96e6d582fc9f 100644
--- a/metadata/cache/dev-ruby/rubygems-1.8.24
+++ b/metadata/cache/dev-ruby/rubygems-1.8.24
@@ -6,7 +6,7 @@ mirror://rubyforge/rubygems/rubygems-1.8.24.tgz
 http://rubyforge.org/projects/rubygems/
 || ( Ruby MIT )
 Centralized Ruby extension management system
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib prefix ruby-ng toolchain-funcs user versionator
 server test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby
 || ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
diff --git a/metadata/cache/dev-util/dialog-1.1.20120215 b/metadata/cache/dev-util/dialog-1.1.20120215
index a4fe2e86aee6..2f902dbcb6c3 100644
--- a/metadata/cache/dev-util/dialog-1.1.20120215
+++ b/metadata/cache/dev-util/dialog-1.1.20120215
@@ -6,7 +6,7 @@ ftp://invisible-island.net/dialog/dialog-1.1-20120215.tgz
 http://invisible-island.net/dialog/dialog.html
 GPL-2
 tool to display dialog boxes from a shell
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 multilib toolchain-funcs
 examples minimal nls static-libs unicode
 
diff --git a/metadata/cache/dev-util/fix-la-relink-command-0.1.1 b/metadata/cache/dev-util/fix-la-relink-command-0.1.1
index 700c71cbd6cb..1a398d9b565a 100644
--- a/metadata/cache/dev-util/fix-la-relink-command-0.1.1
+++ b/metadata/cache/dev-util/fix-la-relink-command-0.1.1
@@ -6,7 +6,7 @@ http://dev.gentoo.org/~tetromino/distfiles/fix-la-relink-command/fix-la-relink-c
 http://dev.gentoo.org/~tetromino/distfiles/fix-la-relink-command
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Helps prevent .la files from relinking to libraries outside a build tree
-~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 
 
 
diff --git a/metadata/cache/dev-util/ragel-6.7-r1 b/metadata/cache/dev-util/ragel-6.7-r1
index f2f958ba160b..fb81f299463a 100644
--- a/metadata/cache/dev-util/ragel-6.7-r1
+++ b/metadata/cache/dev-util/ragel-6.7-r1
@@ -6,7 +6,7 @@ test
 http://www.complang.org/ragel/
 GPL-2
 Compiles finite state machines from regular languages into executable code.
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 autotools eutils libtool multilib toolchain-funcs user
 vim-syntax
 
diff --git a/metadata/cache/games-engines/stratagus-2.2.6 b/metadata/cache/games-engines/stratagus-2.2.6
new file mode 100644
index 000000000000..cda2fb1d93e9
--- /dev/null
+++ b/metadata/cache/games-engines/stratagus-2.2.6
@@ -0,0 +1,22 @@
+x11-libs/libX11 virtual/opengl dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) theora? ( media-libs/libtheora media-libs/libvorbis ) vorbis? ( media-libs/libvorbis ) doc? ( app-doc/doxygen ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+x11-libs/libX11 virtual/opengl dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) theora? ( media-libs/libtheora media-libs/libvorbis ) vorbis? ( media-libs/libvorbis )
+0
+http://launchpad.net/stratagus/trunk/2.2.6/+download/stratagus_2.2.6.orig.tar.gz
+
+http://stratagus.sourceforge.net/
+GPL-2
+A realtime strategy game engine
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic games multilib toolchain-funcs user
+bzip2 debug doc mikmod mng theora vorbis
+
+
+
+2
+
+compile configure install postinst preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/games-strategy/uqm-0.7.0-r1 b/metadata/cache/games-strategy/uqm-0.7.0-r1
new file mode 100644
index 000000000000..b624757983ca
--- /dev/null
+++ b/metadata/cache/games-strategy/uqm-0.7.0-r1
@@ -0,0 +1,22 @@
+media-libs/libvorbis virtual/jpeg >=media-libs/libpng-1.4 media-libs/libsdl media-libs/sdl-image media-libs/libogg media-libs/libvorbis media-libs/libmikmod app-arch/unzip
+media-libs/libvorbis virtual/jpeg >=media-libs/libpng-1.4 media-libs/libsdl media-libs/sdl-image media-libs/libogg media-libs/libvorbis media-libs/libmikmod
+0
+mirror://sourceforge/sc2/uqm-0.7.0-source.tgz mirror://sourceforge/sc2/uqm-0.7.0-content.uqm music? ( mirror://sourceforge/sc2/uqm-0.7.0-3domusic.uqm ) voice? ( mirror://sourceforge/sc2/uqm-0.7.0-voice.uqm ) remix? ( mirror://sourceforge/sc2/uqm-remix-pack1.zip mirror://sourceforge/sc2/uqm-remix-pack2.zip mirror://sourceforge/sc2/uqm-remix-pack3.zip )
+
+http://sc2.sourceforge.net/
+GPL-2
+The Ur-Quan Masters: Port of Star Control 2
+~amd64 ~ppc ~ppc64 ~x86
+base eutils games multilib toolchain-funcs user
+music opengl remix voice
+
+
+
+2
+
+compile configure install postinst preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/games-strategy/wargus-2.2.6 b/metadata/cache/games-strategy/wargus-2.2.6
new file mode 100644
index 000000000000..bb99f9a3b379
--- /dev/null
+++ b/metadata/cache/games-strategy/wargus-2.2.6
@@ -0,0 +1,22 @@
+=games-engines/stratagus-2.2.6*[theora] media-libs/freetype media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2 media-sound/timidity++ media-video/ffmpeg2theora virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
+=games-engines/stratagus-2.2.6*[theora] media-libs/freetype media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2
+0
+http://launchpad.net/wargus/trunk/2.2.6/+download/wargus_2.2.6.orig.tar.gz
+
+http://wargus.sourceforge.net/
+GPL-2
+Warcraft II for the Stratagus game engine (Needs WC2 DOS CD)
+~amd64 ~x86
+base cdrom cmake-utils eutils flag-o-matic games gnome2-utils multilib portability toolchain-funcs user
+
+
+
+
+2
+interactive
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/gnome-base/gnome-control-center-3.2.3 b/metadata/cache/gnome-base/gnome-control-center-3.2.3
index 69b566480b53..a1694c6f97eb 100644
--- a/metadata/cache/gnome-base/gnome-control-center-3.2.3
+++ b/metadata/cache/gnome-base/gnome-control-center-3.2.3
@@ -6,7 +6,7 @@ mirror://gnome/sources/gnome-control-center/3.2/gnome-control-center-3.2.3.tar.x
 http://www.gnome.org/
 GPL-2
 GNOME Desktop Configuration Tool
-~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+~alpha ~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
 +cheese +colord +cups +gnome-online-accounts +networkmanager +socialweb debug
 
diff --git a/metadata/cache/gnome-base/gnome-js-common-0.1.2 b/metadata/cache/gnome-base/gnome-js-common-0.1.2
index 28de20089efe..3bf6fd1b2bc7 100644
--- a/metadata/cache/gnome-base/gnome-js-common-0.1.2
+++ b/metadata/cache/gnome-base/gnome-js-common-0.1.2
@@ -6,7 +6,7 @@ mirror://gnome/sources/gnome-js-common/0.1/gnome-js-common-0.1.2.tar.bz2
 http://gnome.org/
 GPL-3
 GNOME JavaScript common modules and tests
-~amd64 ~x86
+~alpha ~amd64 ~x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
 
 
diff --git a/metadata/cache/gnome-base/gnome-settings-daemon-3.2.3 b/metadata/cache/gnome-base/gnome-settings-daemon-3.2.3
index aec56525369f..9a39ba5c6381 100644
--- a/metadata/cache/gnome-base/gnome-settings-daemon-3.2.3
+++ b/metadata/cache/gnome-base/gnome-settings-daemon-3.2.3
@@ -6,7 +6,7 @@ mirror://gnome/sources/gnome-settings-daemon/3.2/gnome-settings-daemon-3.2.3.tar
 http://www.gnome.org
 GPL-2
 Gnome Settings Daemon
-~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+~alpha ~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator virtualx
 +colord +cups debug packagekit policykit +short-touchpad-timeout smartcard +udev test
 
diff --git a/metadata/cache/media-fonts/cm-unicode-0.7.0 b/metadata/cache/media-fonts/cm-unicode-0.7.0
index df549e39ecb1..859e6dd2b1b6 100644
--- a/metadata/cache/media-fonts/cm-unicode-0.7.0
+++ b/metadata/cache/media-fonts/cm-unicode-0.7.0
@@ -6,7 +6,7 @@ mirror://sourceforge/cm-unicode/0.7.0/cm-unicode-0.7.0-ttf.tar.xz
 http://cm-unicode.sourceforge.net/
 OFL
 Computer Modern Unicode fonts
-~amd64 ~x86
+amd64 x86
 eutils font multilib toolchain-funcs user
 X
 
diff --git a/metadata/cache/media-fonts/droid-112_p1 b/metadata/cache/media-fonts/droid-112_p1
deleted file mode 100644
index 0d49a5385dd1..000000000000
--- a/metadata/cache/media-fonts/droid-112_p1
+++ /dev/null
@@ -1,22 +0,0 @@
-X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-
-0
-mirror://gentoo/droid-112_p1.tar.gz
-
-http://code.google.com/android/RELEASENOTES.html
-Apache-2.0
-Font family from Google's Android project
-amd64 ppc ppc64 x86
-eutils font multilib toolchain-funcs user
-X
-
-
-
-
-
-install postinst postrm setup
-
-
-
-
-
diff --git a/metadata/cache/media-fonts/droid-113-r2 b/metadata/cache/media-fonts/droid-113-r2
new file mode 100644
index 000000000000..12589a8ac9e4
--- /dev/null
+++ b/metadata/cache/media-fonts/droid-113-r2
@@ -0,0 +1,22 @@
+X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
+
+0
+mirror://gentoo/droid-113-r1.tar.bz2 mirror://gentoo/DroidSansMonoSlashed-112_p1.ttf.bz2 mirror://gentoo/DroidSansMonoDotted-112_p1.ttf.bz2
+
+http://code.google.com/android/RELEASENOTES.html http://www.cosmix.org/software/
+Apache-2.0
+Font family from Google's Android project
+~amd64 ~ppc ~ppc64 ~x86
+eutils font multilib toolchain-funcs user
+X
+
+
+
+4
+
+install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/media-fonts/mgopen-1.0 b/metadata/cache/media-fonts/mgopen-1.0
deleted file mode 100644
index 8b769759c948..000000000000
--- a/metadata/cache/media-fonts/mgopen-1.0
+++ /dev/null
@@ -1,22 +0,0 @@
-X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-
-0
-mirror://gentoo/MgOpen-20080519.tar.gz
-
-http://www.zvr.gr/typo/mgopen/index
-MagentaMgOpen
-Magenta MgOpen Typeface Collection for Modern Greek.
-~amd64 ~ppc ~x86
-eutils font multilib toolchain-funcs user
-X
-
-
-
-
-
-install postinst postrm setup
-
-
-
-
-
diff --git a/metadata/cache/media-fonts/mgopen-1.1 b/metadata/cache/media-fonts/mgopen-1.1
index df99ddd2e720..3bd03f5a8288 100644
--- a/metadata/cache/media-fonts/mgopen-1.1
+++ b/metadata/cache/media-fonts/mgopen-1.1
@@ -3,10 +3,10 @@ X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
 0
 mirror://gentoo/mgopen-1.1.tar.gz
 
-http://www.zvr.gr/typo/mgopen/index
+http://www.ellak.gr/pub/fonts/mgopen/index.en.html
 MagentaMgOpen
-Magenta MgOpen Typeface Collection for Modern Greek.
-~amd64 ~ppc ~x86
+Magenta MgOpen typeface collection for Modern Greek
+amd64 ppc x86
 eutils font multilib toolchain-funcs user
 X
 
diff --git a/metadata/cache/media-fonts/sil-abyssinica-1.200 b/metadata/cache/media-fonts/sil-abyssinica-1.200
index 4df8dddaa049..a8e351cd7dd7 100644
--- a/metadata/cache/media-fonts/sil-abyssinica-1.200
+++ b/metadata/cache/media-fonts/sil-abyssinica-1.200
@@ -6,7 +6,7 @@ mirror://gentoo/AbyssinicaSIL1.200.zip
 http://scripts.sil.org/AbyssinicaSIL
 OFL-1.1
 SIL Opentype Unicode fonts for Ethiopic languages
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos
 eutils font multilib toolchain-funcs user
 doc X
 
diff --git a/metadata/cache/media-fonts/sil-arabicfonts-1.0 b/metadata/cache/media-fonts/sil-arabicfonts-1.0
deleted file mode 100644
index b7910dce2a8a..000000000000
--- a/metadata/cache/media-fonts/sil-arabicfonts-1.0
+++ /dev/null
@@ -1,22 +0,0 @@
-X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-
-0
-mirror://gentoo/ttf-sil-arabicfonts-1.0.tgz
-
-http://scripts.sil.org/ArabicFonts
-SIL-freeware
-SIL Opentype Unicode fonts for Arabic Languages
-alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-eutils font multilib toolchain-funcs user
-X
-
-
-
-
-
-install postinst postrm setup
-
-
-
-
-
diff --git a/metadata/cache/media-fonts/sil-arabicfonts-1.005 b/metadata/cache/media-fonts/sil-arabicfonts-1.005
index 8cc685bfc0e5..9adc3857d4d2 100644
--- a/metadata/cache/media-fonts/sil-arabicfonts-1.005
+++ b/metadata/cache/media-fonts/sil-arabicfonts-1.005
@@ -6,7 +6,7 @@ mirror://gentoo/ScheherazadeRegOT-1.005.zip mirror://gentoo/LateefRegOT_1.001.zi
 http://scripts.sil.org/ArabicFonts
 OFL-1.1
 SIL Opentype Unicode fonts for Arabic Languages
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 eutils font multilib toolchain-funcs user
 X
 
diff --git a/metadata/cache/media-fonts/sil-charis-4.106 b/metadata/cache/media-fonts/sil-charis-4.106
deleted file mode 100644
index 209dc837120b..000000000000
--- a/metadata/cache/media-fonts/sil-charis-4.106
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-
-0
-http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=CharisSIL4.106b.zip&filename=CharisSIL4.106.zip -> CharisSIL4.106.zip compact? ( http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=CharisSILCompact4.106.zip&filename=CharisSILCompact4.106.zip -> CharisSILCompact4.106.zip )
-
-http://scripts.sil.org/CharisSILfont
-OFL
-SIL Charis - SIL fonts for Roman and Cyrillic languages
-alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-eutils font multilib toolchain-funcs user
-doc +compact X
-
-
-
-2
-
-install postinst postrm setup unpack
-
-
-
-
-
diff --git a/metadata/cache/media-fonts/sil-charis-4.110 b/metadata/cache/media-fonts/sil-charis-4.110
index 0427ba61851f..116e2bd18cd5 100644
--- a/metadata/cache/media-fonts/sil-charis-4.110
+++ b/metadata/cache/media-fonts/sil-charis-4.110
@@ -6,7 +6,7 @@ mirror://gentoo/CharisSIL-4.110.zip compact? ( mirror://gentoo/CharisSILCompact-
 http://scripts.sil.org/CharisSILfont
 OFL-1.1
 SIL Charis - SIL fonts for Roman and Cyrillic languages
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 eutils font multilib toolchain-funcs user
 compact doc X
 
diff --git a/metadata/cache/media-fonts/sil-galatia-2.01 b/metadata/cache/media-fonts/sil-galatia-2.01
deleted file mode 100644
index 4b587854684b..000000000000
--- a/metadata/cache/media-fonts/sil-galatia-2.01
+++ /dev/null
@@ -1,22 +0,0 @@
-X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-
-0
-mirror://gentoo/ttf-sil-galatia-2.01.tgz
-
-http://scripts.sil.org/SILgrkuni
-SIL-freeware
-The Galatia SIL Greek Unicode Fonts package
-alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-eutils font multilib toolchain-funcs user
-doc X
-
-
-
-
-
-install postinst postrm setup
-
-
-
-
-
diff --git a/metadata/cache/media-fonts/sil-galatia-2.1 b/metadata/cache/media-fonts/sil-galatia-2.1
index e14ff876d627..a8be93468f97 100644
--- a/metadata/cache/media-fonts/sil-galatia-2.1
+++ b/metadata/cache/media-fonts/sil-galatia-2.1
@@ -6,7 +6,7 @@ mirror://gentoo/GalSIL21.zip
 http://scripts.sil.org/SILgrkuni
 OFL-1.1
 The Galatia SIL Greek Unicode Fonts package
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 eutils font multilib toolchain-funcs user
 X
 
diff --git a/metadata/cache/media-fonts/sil-gentium-1.0.2 b/metadata/cache/media-fonts/sil-gentium-1.0.2
deleted file mode 100644
index 3afbb17bbad5..000000000000
--- a/metadata/cache/media-fonts/sil-gentium-1.0.2
+++ /dev/null
@@ -1,22 +0,0 @@
-X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-
-0
-mirror://gentoo/ttf-sil-gentium-1.02.tar.gz
-
-http://scripts.sil.org/gentium
-OFL
-SIL Gentium Unicode font for Latin and Greek languages.
-alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos
-eutils font multilib toolchain-funcs user versionator
-doc X
-
-
-
-
-
-install postinst postrm setup
-
-
-
-
-
diff --git a/metadata/cache/media-fonts/sil-gentium-1.508 b/metadata/cache/media-fonts/sil-gentium-1.508
index 5885a1a43aaf..cd713b2239cf 100644
--- a/metadata/cache/media-fonts/sil-gentium-1.508
+++ b/metadata/cache/media-fonts/sil-gentium-1.508
@@ -5,8 +5,8 @@ mirror://gentoo/GentiumPlus-1.508.zip compact? ( mirror://gentoo/GentiumPlusComp
 
 http://scripts.sil.org/gentium
 OFL-1.1
-SIL Gentium Plus unicode font for Latin and Greek languages.
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+SIL Gentium Plus unicode font for Latin and Greek languages
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos
 eutils font multilib toolchain-funcs user
 compact doc X
 
diff --git a/metadata/cache/media-fonts/sil-padauk-2.4 b/metadata/cache/media-fonts/sil-padauk-2.4
deleted file mode 100644
index ab716b4d6115..000000000000
--- a/metadata/cache/media-fonts/sil-padauk-2.4
+++ /dev/null
@@ -1,22 +0,0 @@
-X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-
-0
-mirror://gentoo/ttf-sil-padauk-2.4.tar.gz
-
-http://scripts.sil.org/padauk
-OFL
-SIL Padauk - SIL fonts for Myanmar
-alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-eutils font multilib toolchain-funcs user
-X
-
-
-
-
-
-install postinst postrm setup
-
-
-
-
-
diff --git a/metadata/cache/media-fonts/sil-padauk-2.8 b/metadata/cache/media-fonts/sil-padauk-2.8
index e850c6e320ee..2b1c8f8fa37d 100644
--- a/metadata/cache/media-fonts/sil-padauk-2.8
+++ b/metadata/cache/media-fonts/sil-padauk-2.8
@@ -5,8 +5,8 @@ mirror://gentoo/padauk-2.8.zip
 
 http://scripts.sil.org/padauk
 OFL
-SIL Padauk - SIL fonts for Myanmar script
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+SIL fonts for Myanmar script
+alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 eutils font multilib toolchain-funcs user
 X
 
diff --git a/metadata/cache/media-libs/libmpd-0.20.0-r1 b/metadata/cache/media-libs/libmpd-0.20.0-r1
deleted file mode 100644
index a4aea921d906..000000000000
--- a/metadata/cache/media-libs/libmpd-0.20.0-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.16:2 virtual/pkgconfig
->=dev-libs/glib-2.16:2
-0
-http://download.sarine.nl/Programs/gmpc/0.20.0/libmpd-0.20.0.tar.gz
-
-http://gmpc.wikia.com/wiki/Libmpd
-GPL-2
-A library handling connections to a MPD server
-amd64 ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux
-eutils multilib toolchain-funcs user
-static-libs
-
-
-
-3
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-libs/opengtl-0.9.15.1 b/metadata/cache/media-libs/opengtl-0.9.15.1
deleted file mode 100644
index aa424775f4b3..000000000000
--- a/metadata/cache/media-libs/opengtl-0.9.15.1
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/libpng <sys-devel/llvm-3.0 sys-libs/zlib test? ( dev-util/lcov ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-media-libs/libpng <sys-devel/llvm-3.0 sys-libs/zlib
-0
-http://download.opengtl.org/OpenGTL-0.9.15.1.tar.bz2
-
-http://opengtl.org/
-LGPL-2
-Collection of libraries for graphics transformation algorithms
-~amd64 ~x86
-base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
-debug test
-
-
-
-4
-
-compile configure install prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/media-libs/opengtl-0.9.15.2 b/metadata/cache/media-libs/opengtl-0.9.15.2
index 7a69264c5f89..26a83f42a55f 100644
--- a/metadata/cache/media-libs/opengtl-0.9.15.2
+++ b/metadata/cache/media-libs/opengtl-0.9.15.2
@@ -6,7 +6,7 @@ http://download.opengtl.org/OpenGTL-0.9.15.2.tar.bz2
 http://opengtl.org/
 LGPL-2
 Collection of libraries for graphics transformation algorithms
-amd64 ~x86
+amd64 x86
 base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
 debug test
 
diff --git a/metadata/cache/media-libs/portaudio-19_pre20110326 b/metadata/cache/media-libs/portaudio-19_pre20110326
index 6d376c4eec8d..1e7b4585d2cc 100644
--- a/metadata/cache/media-libs/portaudio-19_pre20110326
+++ b/metadata/cache/media-libs/portaudio-19_pre20110326
@@ -6,7 +6,7 @@ http://www.portaudio.com/archives/pa_stable_v19_20110326.tgz
 http://www.portaudio.com/
 as-is
 A free, cross-platform, open-source, audio I/O library
-~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux
+~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 libtool multilib toolchain-funcs
 alsa +cxx debug jack oss static-libs
 
diff --git a/metadata/cache/media-plugins/audacious-plugins-3.2 b/metadata/cache/media-plugins/audacious-plugins-3.2
deleted file mode 100644
index a513a642258e..000000000000
--- a/metadata/cache/media-plugins/audacious-plugins-3.2
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.2 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) nls? ( dev-util/intltool ) virtual/pkgconfig
-app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.2 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-0
-http://distfiles.audacious-media-player.org/audacious-plugins-3.2.tar.bz2
-
-http://audacious-media-player.org/
-GPL-2
-Audacious Player - Your music, your way, no exceptions
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
-eutils flag-o-matic multilib toolchain-funcs user
-aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome +gtk gtk3 ipv6 jack lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile vorbis wavpack
-^^ ( gtk gtk3 )
-
-
-4
-
-compile configure install
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/audacious-plugins-3.2.1 b/metadata/cache/media-plugins/audacious-plugins-3.2.3
similarity index 73%
rename from metadata/cache/media-plugins/audacious-plugins-3.2.1
rename to metadata/cache/media-plugins/audacious-plugins-3.2.3
index 41619c51e03b..a0ccf776ebb3 100644
--- a/metadata/cache/media-plugins/audacious-plugins-3.2.1
+++ b/metadata/cache/media-plugins/audacious-plugins-3.2.3
@@ -1,20 +1,20 @@
-app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.2.1 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) nls? ( dev-util/intltool ) virtual/pkgconfig
-app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.2.1 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.2.3 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl[audio] ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) nls? ( dev-util/intltool ) virtual/pkgconfig
+app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.2.3 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl[audio] ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
 0
-http://distfiles.audacious-media-player.org/audacious-plugins-3.2.1.tar.bz2
+http://distfiles.audacious-media-player.org/audacious-plugins-3.2.3.tar.bz2
 
 http://audacious-media-player.org/
 GPL-2
 Audacious Player - Your music, your way, no exceptions
 ~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
-eutils flag-o-matic multilib toolchain-funcs user
-aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome +gtk gtk3 ipv6 jack lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile vorbis wavpack
+
+aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome +gtk gtk3 ipv6 jack lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile vorbis wavpack
 ^^ ( gtk gtk3 )
 
 
 4
 
-compile configure install
+configure
 
 
 
diff --git a/metadata/cache/media-plugins/gmpc-albumview-0.20.0 b/metadata/cache/media-plugins/gmpc-albumview-0.20.0
deleted file mode 100644
index 3a29386e06ec..000000000000
--- a/metadata/cache/media-plugins/gmpc-albumview-0.20.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-sound/gmpc-0.20.0 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
->=media-sound/gmpc-0.20.0
-0
-http://download.sarine.nl/Programs/gmpc/0.20.0/gmpc-albumview-0.20.0.tar.gz
-
-http://gmpc.wikia.com/wiki/GMPC_PLUGIN_ALBUMVIEW
-LGPL-2
-This plugin shows your music collection in albums
-~amd64 ~x86
-
-nls
-
-
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/gmpc-awn-0.20.0 b/metadata/cache/media-plugins/gmpc-awn-0.20.0
deleted file mode 100644
index 1bcd37cba094..000000000000
--- a/metadata/cache/media-plugins/gmpc-awn-0.20.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-sound/gmpc-0.20.0 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=media-sound/gmpc-0.20.0
-0
-http://download.sarine.nl/Programs/gmpc/0.20.0/gmpc-awn-0.20.0.tar.gz
-
-http://gmpc.wikia.com/wiki/GMPC_PLUGIN_AWN
-GPL-2
-This plugin integrates GMPC with the Avant Window Navigator
-~amd64 ~x86
-autotools eutils libtool multilib toolchain-funcs user
-nls
-
-
-
-4
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/gmpc-awn-11.8.16 b/metadata/cache/media-plugins/gmpc-awn-11.8.16
index 894bc2f629e4..a13677ec564f 100644
--- a/metadata/cache/media-plugins/gmpc-awn-11.8.16
+++ b/metadata/cache/media-plugins/gmpc-awn-11.8.16
@@ -1,5 +1,5 @@
->=media-sound/gmpc-11.8.16 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=media-sound/gmpc-11.8.16
+>=media-sound/gmpc-11.8.16 dev-libs/dbus-glib virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-sound/gmpc-11.8.16 dev-libs/dbus-glib
 0
 http://download.sarine.nl/Programs/gmpc/11.8/gmpc-awn-11.8.16.tar.gz
 
diff --git a/metadata/cache/media-plugins/gmpc-jamendo-0.20.0 b/metadata/cache/media-plugins/gmpc-jamendo-0.20.0
deleted file mode 100644
index 43c4ef524287..000000000000
--- a/metadata/cache/media-plugins/gmpc-jamendo-0.20.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-sound/gmpc-0.20.0 >=media-libs/libmpd-0.15.98 dev-db/sqlite:3 sys-libs/zlib >=dev-libs/libxml2-2.6 >=x11-libs/gtk+-2.4:2 virtual/pkgconfig dev-util/gob nls? ( dev-util/intltool sys-devel/gettext )
->=media-sound/gmpc-0.20.0 >=media-libs/libmpd-0.15.98 dev-db/sqlite:3 sys-libs/zlib >=dev-libs/libxml2-2.6 >=x11-libs/gtk+-2.4:2
-0
-mirror://sourceforge/musicpd/gmpc-jamendo-0.20.0.tar.gz
-
-http://gmpc.wikia.com/wiki/GMPC_PLUGIN_JAMENDO
-GPL-2
-Plugin allows you to browse and preview music available on jamendo.
-amd64 x86
-
-nls
-
-
-
-3
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/gmpc-lyricwiki-0.20.0 b/metadata/cache/media-plugins/gmpc-lyricwiki-0.20.0
deleted file mode 100644
index d261fbe76bae..000000000000
--- a/metadata/cache/media-plugins/gmpc-lyricwiki-0.20.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-sound/gmpc-0.20.0 dev-libs/libxml2 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
->=media-sound/gmpc-0.20.0 dev-libs/libxml2
-0
-mirror://sourceforge/musicpd/gmpc-lyricwiki-0.20.0.tar.gz
-
-http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LYRICWIKI
-GPL-2
-This plugin uses lyricwiki to fetch lyrics
-amd64 ~ppc x86
-
-nls
-
-
-
-3
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/gmpc-mmkeys-0.20.0 b/metadata/cache/media-plugins/gmpc-mmkeys-0.20.0
deleted file mode 100644
index e1e3d4450736..000000000000
--- a/metadata/cache/media-plugins/gmpc-mmkeys-0.20.0
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/dbus-glib >=media-sound/gmpc-0.20.0 dev-lang/vala:0.10 virtual/pkgconfig
-dev-libs/dbus-glib >=media-sound/gmpc-0.20.0
-0
-http://download.sarine.nl/Programs/gmpc/0.20.0/gmpc-mmkeys-0.20.0.tar.gz
-
-http://gmpc.wikia.com/wiki/Plugins
-GPL-3
-Bind multimedia keys via gnome settings daemon
-~amd64 ~x86
-
-
-
-
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/gmpc-tagedit-0.20.0 b/metadata/cache/media-plugins/gmpc-tagedit-0.20.0
deleted file mode 100644
index 8757c417447a..000000000000
--- a/metadata/cache/media-plugins/gmpc-tagedit-0.20.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-sound/gmpc-0.20.0 media-libs/taglib dev-libs/libxml2 virtual/pkgconfig dev-util/gob nls? ( dev-util/intltool sys-devel/gettext )
->=media-sound/gmpc-0.20.0 media-libs/taglib dev-libs/libxml2
-0
-mirror://sourceforge/musicpd/gmpc-tagedit-0.20.0.tar.gz
-
-http://gmpc.wikia.com/wiki/GMPC_PLUGIN_TAGEDIT
-GPL-2
-This plugin allows you to edit tags in your library
-amd64 x86
-
-nls
-
-
-
-3
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/gmpc-wikipedia-0.20.0 b/metadata/cache/media-plugins/gmpc-wikipedia-0.20.0
deleted file mode 100644
index fc74f6ea80de..000000000000
--- a/metadata/cache/media-plugins/gmpc-wikipedia-0.20.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-sound/gmpc-0.20.0 dev-libs/libxml2:2 net-libs/webkit-gtk:2 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
->=media-sound/gmpc-0.20.0 dev-libs/libxml2:2 net-libs/webkit-gtk:2
-0
-mirror://sourceforge/musicpd/gmpc-wikipedia-0.20.0.tar.gz
-
-http://gmpc.wikia.com/wiki/GMPC_PLUGIN_WIKIPEDIA
-GPL-2
-This plugin shows the Wikipedia article about the currently playing artist
-amd64 x86
-
-nls
-
-
-
-3
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/media-sound/ario-1.5 b/metadata/cache/media-sound/ario-1.5
deleted file mode 100644
index 28926a136c4a..000000000000
--- a/metadata/cache/media-sound/ario-1.5
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.14:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi ) dev-util/intltool virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
->=dev-libs/glib-2.14:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi )
-0
-mirror://sourceforge/ario-player/ario-1.5.tar.gz
-
-http://ario-player.sourceforge.net
-GPL-2
-a GTK2 MPD (Music Player Daemon) client inspired by Rythmbox
-amd64 x86
-eutils gnome2-utils multilib toolchain-funcs user
-audioscrobbler dbus debug +idle libnotify nls python taglib zeroconf
-
-
-
-2
-
-configure install postinst postrm preinst prepare
-
-
-
-
-
diff --git a/metadata/cache/media-sound/ario-1.5.1 b/metadata/cache/media-sound/ario-1.5.1
index 70c3e57111a9..b27b6cc84d4c 100644
--- a/metadata/cache/media-sound/ario-1.5.1
+++ b/metadata/cache/media-sound/ario-1.5.1
@@ -1,5 +1,5 @@
->=dev-libs/glib-2.14:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi ) dev-util/intltool virtual/pkgconfig sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4
->=dev-libs/glib-2.14:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi )
+>=dev-libs/glib-2.14:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi ) dev-util/intltool virtual/pkgconfig sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
+>=dev-libs/glib-2.14:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi ) python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/ario-player/ario-1.5.1.tar.gz
 
@@ -7,14 +7,14 @@ http://ario-player.sourceforge.net
 GPL-2
 a GTK2 MPD (Music Player Daemon) client inspired by Rythmbox
 amd64 x86
-eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib python toolchain-funcs user versionator
 audioscrobbler dbus debug +idle libnotify nls python taglib zeroconf debug
 
 
 
 4
 
-compile configure install postinst postrm preinst prepare unpack
+compile configure install postinst postrm preinst prepare setup unpack
 
 
 
diff --git a/metadata/cache/media-sound/audacious-3.2 b/metadata/cache/media-sound/audacious-3.2
deleted file mode 100644
index a541aab16866..000000000000
--- a/metadata/cache/media-sound/audacious-3.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.16 dev-libs/libxml2 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) session? ( x11-libs/libSM ) virtual/pkgconfig chardet? ( >=app-i18n/libguess-1.1 ) nls? ( dev-util/intltool )
->=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.16 dev-libs/libxml2 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) session? ( x11-libs/libSM )
-0
-http://distfiles.audacious-media-player.org/audacious-3.2.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-
-http://audacious-media-player.org/
-GPL-2
-Audacious Player - Your music, your way, no exceptions
-~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
-eutils multilib toolchain-funcs user
-chardet +gtk gtk3 nls session
-^^ ( gtk gtk3 )
->=media-plugins/audacious-plugins-3.2
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/media-sound/audacious-3.2.1 b/metadata/cache/media-sound/audacious-3.2.3
similarity index 86%
rename from metadata/cache/media-sound/audacious-3.2.1
rename to metadata/cache/media-sound/audacious-3.2.3
index 1cfbcb82e238..c46eded4fae3 100644
--- a/metadata/cache/media-sound/audacious-3.2.1
+++ b/metadata/cache/media-sound/audacious-3.2.3
@@ -1,7 +1,7 @@
 >=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.16 dev-libs/libxml2 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) session? ( x11-libs/libSM ) virtual/pkgconfig chardet? ( >=app-i18n/libguess-1.1 ) nls? ( dev-util/intltool )
 >=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.16 dev-libs/libxml2 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) session? ( x11-libs/libSM )
 0
-http://distfiles.audacious-media-player.org/audacious-3.2.1.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
+http://distfiles.audacious-media-player.org/audacious-3.2.3.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
 
 http://audacious-media-player.org/
 GPL-2
@@ -10,11 +10,11 @@ Audacious Player - Your music, your way, no exceptions
 eutils multilib toolchain-funcs user
 chardet +gtk gtk3 nls session
 ^^ ( gtk gtk3 )
->=media-plugins/audacious-plugins-3.2.1
+>=media-plugins/audacious-plugins-3.2.3
 
 4
 
-configure install
+configure install prepare
 
 
 
diff --git a/metadata/cache/media-sound/audio-entropyd-2.0.3 b/metadata/cache/media-sound/audio-entropyd-2.0.3
index acf829694aff..3fb6913c6ccc 100644
--- a/metadata/cache/media-sound/audio-entropyd-2.0.3
+++ b/metadata/cache/media-sound/audio-entropyd-2.0.3
@@ -6,7 +6,7 @@ http://www.vanheusden.com/aed/audio-entropyd-2.0.3.tgz
 http://www.vanheusden.com/aed/
 GPL-2
 Audio-entropyd generates entropy-data for the /dev/random device.
-~amd64 ~ppc ~sparc ~x86
+amd64 ~ppc ~sparc ~x86
 eutils multilib toolchain-funcs user
 selinux
 
diff --git a/metadata/cache/media-sound/gmpc-0.20.0 b/metadata/cache/media-sound/gmpc-0.20.0
deleted file mode 100644
index e3e3d94637e4..000000000000
--- a/metadata/cache/media-sound/gmpc-0.20.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.12:2 x11-libs/libsexy >=gnome-base/libglade-2 >=media-libs/libmpd-0.19.2 net-libs/libsoup:2.4 dev-db/sqlite:3 xspf? ( >=media-libs/libxspf-1.2 ) dev-lang/vala:0.10 >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
->=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.12:2 x11-libs/libsexy >=gnome-base/libglade-2 >=media-libs/libmpd-0.19.2 net-libs/libsoup:2.4 dev-db/sqlite:3 xspf? ( >=media-libs/libxspf-1.2 )
-0
-http://download.sarine.nl/Programs/gmpc/0.20.0/gmpc-0.20.0.tar.gz
-
-http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client
-GPL-2
-A GTK+2 client for the Music Player Daemon
-amd64 ppc x86
-autotools eutils gnome2-utils libtool multilib toolchain-funcs user
-nls xspf
-
-
-
-2
-
-configure install postinst postrm preinst prepare
-
-
-
-
-
diff --git a/metadata/cache/media-sound/gmpc-11.8.16 b/metadata/cache/media-sound/gmpc-11.8.16
index 173025b824e7..2eea33b026ad 100644
--- a/metadata/cache/media-sound/gmpc-11.8.16
+++ b/metadata/cache/media-sound/gmpc-11.8.16
@@ -1,5 +1,5 @@
-dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 ) dev-lang/vala:0.12 >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) >=sys-apps/sed-4
-dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 )
+dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 ) dev-lang/vala:0.12 >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) >=sys-apps/sed-4
+dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 )
 0
 http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz
 
diff --git a/metadata/cache/media-sound/mpc-0.22 b/metadata/cache/media-sound/mpc-0.22
index 659b7b2933fb..b71b940c8bfe 100644
--- a/metadata/cache/media-sound/mpc-0.22
+++ b/metadata/cache/media-sound/mpc-0.22
@@ -6,7 +6,7 @@ mirror://sourceforge/musicpd/mpc-0.22.tar.bz2
 http://www.musicpd.org
 GPL-2
 A commandline client for Music Player Daemon (media-sound/mpd)
-~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 bash-completion-r1
 iconv
 
diff --git a/metadata/cache/media-sound/mpd-0.16.8 b/metadata/cache/media-sound/mpd-0.16.8
index b7d6a1997867..51f548810f91 100644
--- a/metadata/cache/media-sound/mpd-0.16.8
+++ b/metadata/cache/media-sound/mpd-0.16.8
@@ -1,5 +1,5 @@
-!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) alsa? ( media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio[-minimal] ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) virtual/pkgconfig !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
-!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) alsa? ( media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio[-minimal] ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib )
+!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) alsa? ( media-sound/alsa-utils media-libs/alsa-lib ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio[-minimal] ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) virtual/pkgconfig !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) alsa? ( media-sound/alsa-utils media-libs/alsa-lib ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio[-minimal] ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib )
 0
 mirror://sourceforge/musicpd/mpd-0.16.8.tar.bz2
 
diff --git a/metadata/cache/media-sound/ncmpc-0.20 b/metadata/cache/media-sound/ncmpc-0.20
index 287e637bf801..4b97acb38a43 100644
--- a/metadata/cache/media-sound/ncmpc-0.20
+++ b/metadata/cache/media-sound/ncmpc-0.20
@@ -6,7 +6,7 @@ http://downloads.sourceforge.net/musicpd/ncmpc-0.20.tar.bz2
 http://mpd.wikia.com/wiki/Client:Ncmpc
 GPL-2
 A ncurses client for the Music Player Daemon (MPD)
-~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 multilib toolchain-funcs
 artist-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen
 
diff --git a/metadata/cache/media-sound/scmpc-0.2.2 b/metadata/cache/media-sound/scmpc-0.2.2
deleted file mode 100644
index dc21aa96081a..000000000000
--- a/metadata/cache/media-sound/scmpc-0.2.2
+++ /dev/null
@@ -1,22 +0,0 @@
-net-misc/curl dev-libs/argtable dev-libs/confuse dev-libs/libdaemon virtual/pkgconfig
-net-misc/curl dev-libs/argtable dev-libs/confuse dev-libs/libdaemon
-0
-mirror://github/cmende/scmpc/scmpc-0.2.2.tar.bz2
-
-http://cmende.github.com/scmpc/
-GPL-2
-a client for MPD which submits your tracks to last.fm
-amd64 x86
-
-
-
-
-
-
-
-install
-
-
-
-
-
diff --git a/metadata/cache/media-video/ushare-1.1a-r3 b/metadata/cache/media-video/ushare-1.1a-r3
new file mode 100644
index 000000000000..73170f37e7de
--- /dev/null
+++ b/metadata/cache/media-video/ushare-1.1a-r3
@@ -0,0 +1,22 @@
+>=net-libs/libupnp-1.6.14 dlna? ( >=media-libs/libdlna-0.2.4 ) virtual/pkgconfig
+>=net-libs/libupnp-1.6.14 dlna? ( >=media-libs/libdlna-0.2.4 )
+0
+http://ushare.geexbox.org/releases/ushare-1.1a.tar.bz2
+
+http://ushare.geexbox.org/
+GPL-2
+uShare is a UPnP (TM) A/V & DLNA Media Server
+~amd64 ~x86
+eutils multilib toolchain-funcs user
+dlna nls
+
+
+
+4
+
+configure install postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/net-libs/libgsasl-1.6.1 b/metadata/cache/net-libs/libgsasl-1.6.1
index 10865046909e..47c00077dc37 100644
--- a/metadata/cache/net-libs/libgsasl-1.6.1
+++ b/metadata/cache/net-libs/libgsasl-1.6.1
@@ -6,7 +6,7 @@ mirror://gnu/gsasl/libgsasl-1.6.1.tar.gz
 http://www.gnu.org/software/gsasl/
 GPL-3 LGPL-3
 The GNU SASL library
-alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 autotools eutils libtool multilib toolchain-funcs user
 idn gcrypt kerberos nls static-libs
 
diff --git a/metadata/cache/net-libs/rest-0.7.12 b/metadata/cache/net-libs/rest-0.7.12
index fd3e7768bcc9..c2e1fa76c302 100644
--- a/metadata/cache/net-libs/rest-0.7.12
+++ b/metadata/cache/net-libs/rest-0.7.12
@@ -6,7 +6,7 @@ mirror://gnome/sources/rest/0.7/rest-0.7.12.tar.xz
 http://git.gnome.org/browse/librest
 LGPL-2.1
 Helper library for RESTful services
-amd64 x86
+~alpha amd64 x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator virtualx
 doc +gnome +introspection test test
 
diff --git a/metadata/cache/net-misc/italc-2.0.0 b/metadata/cache/net-misc/italc-2.0.0
new file mode 100644
index 000000000000..22c3e91dba40
--- /dev/null
+++ b/metadata/cache/net-misc/italc-2.0.0
@@ -0,0 +1,22 @@
+dev-libs/lzo sys-apps/tcp-wrappers virtual/jpeg sys-libs/zlib dev-libs/openssl x11-libs/qt-core x11-libs/qt-xmlpatterns x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-apps/xinput x11-libs/qt-gui:4 x11-proto/inputproto >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-libs/lzo sys-apps/tcp-wrappers virtual/jpeg sys-libs/zlib dev-libs/openssl x11-libs/qt-core x11-libs/qt-xmlpatterns x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-apps/xinput x11-libs/qt-gui:4
+0
+mirror://sourceforge/italc/italc-2.0.0.tar.bz2
+
+http://italc.sourceforge.net/
+GPL-2
+Intelligent Teaching And Learning with Computers (iTALC) supports working with computers in school
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib qt4-r2 toolchain-funcs user
+
+
+
+
+4
+interactive
+compile config configure install postinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/net-misc/mosh-1.2.0.95 b/metadata/cache/net-misc/mosh-1.2.1
similarity index 61%
rename from metadata/cache/net-misc/mosh-1.2.0.95
rename to metadata/cache/net-misc/mosh-1.2.1
index 6fe3f0091663..37d368df3d44 100644
--- a/metadata/cache/net-misc/mosh-1.2.0.95
+++ b/metadata/cache/net-misc/mosh-1.2.1
@@ -1,20 +1,20 @@
-dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig
 dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
 0
-mirror://gentoo/mosh-1.2.0.95.tar.gz
+https://github.com/downloads/keithw/mosh/mosh-1.2.1.tar.gz
 
 http://mosh.mit.edu
 GPL-3
 Mobile shell that supports roaming and intelligent local echo
 ~amd64 ~x86
-autotools eutils libtool multilib toolchain-funcs user
-+client examples +server +utempter
+
+bash-completion +client examples +server ufw +utempter
 || ( client server ) examples? ( client )
 
 
 4
 
-compile configure install prepare
+compile configure install test
 
 
 
diff --git a/metadata/cache/net-misc/openvpn-2.2.2 b/metadata/cache/net-misc/openvpn-2.2.2
index 399d70d28b1e..060a106e81c2 100644
--- a/metadata/cache/net-misc/openvpn-2.2.2
+++ b/metadata/cache/net-misc/openvpn-2.2.2
@@ -6,7 +6,7 @@ http://swupdate.openvpn.net/community/releases/openvpn-2.2.2.tar.gz
 http://openvpn.net/
 GPL-2
 OpenVPN is a robust and highly flexible tunneling application compatible with many OSes.
-~alpha amd64 ~arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+~alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 eutils flag-o-matic multilib toolchain-funcs user
 examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD
 
diff --git a/metadata/cache/net-nds/openldap-2.4.31-r1 b/metadata/cache/net-nds/openldap-2.4.31-r1
new file mode 100644
index 000000000000..4c3ae1b4e3b5
--- /dev/null
+++ b/metadata/cache/net-nds/openldap-2.4.31-r1
@@ -0,0 +1,22 @@
+sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
+0
+mirror://openldap/openldap-release/openldap-2.4.31.tgz mirror://gentoo/rfc2307bis.schema-20120525
+
+http://www.OpenLDAP.org/
+OPENLDAP
+LDAP suite of application and development tools
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+autotools db-use eutils flag-o-matic libtool multilib ssl-cert toolchain-funcs user versionator
+crypt icu samba slp tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux smbkrb5passwd kerberos -cxx ssl
+cxx? ( sasl )
+
+
+4
+
+compile configure install postinst preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/net-nntp/tin-2.0.0 b/metadata/cache/net-nntp/tin-2.0.0
index eb58c2d5effd..db2392c72f34 100644
--- a/metadata/cache/net-nntp/tin-2.0.0
+++ b/metadata/cache/net-nntp/tin-2.0.0
@@ -6,7 +6,7 @@ ftp://ftp.tin.org/pub/news/clients/tin/v2.0/tin-2.0.0.tar.bz2
 http://www.tin.org/
 GPL-2
 A threaded NNTP and spool based UseNet newsreader
-~amd64 ~arm ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+~amd64 arm ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 eutils multilib toolchain-funcs user versionator
 cancel-locks debug doc +etiquette evil forgery gpg idn ipv6 mime nls sasl socks5 spell unicode
 
diff --git a/metadata/cache/net-print/cups-pk-helper-0.2.2 b/metadata/cache/net-print/cups-pk-helper-0.2.2
index 478f03e25d4c..d7e98b1ed709 100644
--- a/metadata/cache/net-print/cups-pk-helper-0.2.2
+++ b/metadata/cache/net-print/cups-pk-helper-0.2.2
@@ -6,7 +6,7 @@ http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-0.2.2
 http://www.freedesktop.org/wiki/Software/cups-pk-helper
 GPL-2
 PolicyKit helper to configure cups with fine-grained privileges
-~amd64 ~arm ~x86
+~alpha ~amd64 ~arm ~x86
 
 
 
diff --git a/metadata/cache/net-zope/zope-interface-3.8.0 b/metadata/cache/net-zope/zope-interface-3.8.0
index 15e5fe800624..e32024a7c065 100644
--- a/metadata/cache/net-zope/zope-interface-3.8.0
+++ b/metadata/cache/net-zope/zope-interface-3.8.0
@@ -6,7 +6,7 @@ mirror://pypi/z/zope.interface/zope.interface-3.8.0.tar.gz
 http://pypi.python.org/pypi/zope.interface
 ZPL
 Interfaces for Python
-~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 distutils multilib python toolchain-funcs
 
 
diff --git a/metadata/cache/sci-electronics/qelectrotech-0.30_alpha b/metadata/cache/sci-electronics/qelectrotech-0.30_alpha
new file mode 100644
index 000000000000..d20675426c15
--- /dev/null
+++ b/metadata/cache/sci-electronics/qelectrotech-0.30_alpha
@@ -0,0 +1,22 @@
+x11-libs/qt-gui:4 x11-libs/qt-svg:4 doc? ( app-doc/doxygen )
+x11-libs/qt-gui:4 x11-libs/qt-svg:4
+0
+http://download.tuxfamily.org/qet/tags/20120513/qelectrotech-0.3a-src.tar.gz
+
+http://www.qt-apps.org/content/show.php?content=90198
+GPL-3
+Qt4 application to design electric diagrams
+~amd64 ~x86
+base eutils multilib qt4-r2 toolchain-funcs user versionator
+debug doc linguas_ar linguas_ca linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_hr linguas_it linguas_pl linguas_pt linguas_ro linguas_ru linguas_sl
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-geosciences/gtk-g-rays2-1.23 b/metadata/cache/sci-geosciences/gtk-g-rays2-1.23
deleted file mode 100644
index 328eacdae402..000000000000
--- a/metadata/cache/sci-geosciences/gtk-g-rays2-1.23
+++ /dev/null
@@ -1,22 +0,0 @@
-virtual/pkgconfig sys-devel/gettext doc? ( dev-libs/libxslt )
-gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/cairo
-0
-http://www.zen35309.zen.co.uk/gps/gtk-g-rays2-1.23.tar.bz2
-
-http://www.daria.co.uk/gps
-GPL-2
-GUI for accessing the Wintec WBT 201 / G-Rays 2 GPS device
-~amd64 ~x86
-
-doc
-
-
-
-4
-
--
-
-
-
-
-
diff --git a/metadata/cache/sci-geosciences/gtk-g-rays2-2.01 b/metadata/cache/sci-geosciences/gtk-g-rays2-2.01
new file mode 100644
index 000000000000..f2cac51e3c21
--- /dev/null
+++ b/metadata/cache/sci-geosciences/gtk-g-rays2-2.01
@@ -0,0 +1,22 @@
+virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+dev-libs/glib:2 dev-libs/dbus-glib sys-fs/udev[gudev] x11-libs/cairo x11-libs/gtk+:3 virtual/freedesktop-icon-theme
+0
+http://www.zen35309.zen.co.uk/gps/gtk-g-rays2-2.01.tar.xz
+
+http://www.daria.co.uk/gps
+GPL-2
+GUI for accessing the Wintec WBT 201 / G-Rays 2 GPS device
+amd64 x86
+autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
+debug
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-geosciences/mapnik-2.0.1 b/metadata/cache/sci-geosciences/mapnik-2.0.1
index 416b1eb8710b..4a7f53006a31 100644
--- a/metadata/cache/sci-geosciences/mapnik-2.0.1
+++ b/metadata/cache/sci-geosciences/mapnik-2.0.1
@@ -1,5 +1,5 @@
-net-misc/curl media-libs/libpng media-libs/tiff sys-libs/zlib media-fonts/dejavu media-libs/freetype dev-lang/python sci-libs/proj dev-libs/libxml2 dev-libs/icu virtual/jpeg x11-libs/agg[truetype] >=dev-libs/boost-1.48[python?] postgres? ( >=dev-db/postgresql-base-8.3 ) gdal? ( sci-libs/gdal ) geos? ( sci-libs/geos ) bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo dev-cpp/cairomm python? ( dev-python/pycairo ) ) sqlite? ( dev-db/sqlite:3 ) python? ( =dev-lang/python-2* ) dev-util/scons
-net-misc/curl media-libs/libpng media-libs/tiff sys-libs/zlib media-fonts/dejavu media-libs/freetype dev-lang/python sci-libs/proj dev-libs/libxml2 dev-libs/icu virtual/jpeg x11-libs/agg[truetype] >=dev-libs/boost-1.48[python?] postgres? ( >=dev-db/postgresql-base-8.3 ) gdal? ( sci-libs/gdal ) geos? ( sci-libs/geos ) bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo dev-cpp/cairomm python? ( dev-python/pycairo ) ) sqlite? ( dev-db/sqlite:3 ) python? ( =dev-lang/python-2* )
+>=dev-libs/boost-1.48[python?] dev-libs/icu dev-libs/libxml2 media-fonts/dejavu media-libs/freetype media-libs/libpng media-libs/tiff net-misc/curl sci-libs/proj sys-libs/zlib virtual/jpeg x11-libs/agg[truetype] bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo dev-cpp/cairomm python? ( dev-python/pycairo ) ) gdal? ( sci-libs/gdal ) geos? ( sci-libs/geos ) postgres? ( >=dev-db/postgresql-base-8.3 ) sqlite? ( dev-db/sqlite:3 ) python? ( =dev-lang/python-2* ) dev-util/scons
+>=dev-libs/boost-1.48[python?] dev-libs/icu dev-libs/libxml2 media-fonts/dejavu media-libs/freetype media-libs/libpng media-libs/tiff net-misc/curl sci-libs/proj sys-libs/zlib virtual/jpeg x11-libs/agg[truetype] bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo dev-cpp/cairomm python? ( dev-python/pycairo ) ) gdal? ( sci-libs/gdal ) geos? ( sci-libs/geos ) postgres? ( >=dev-db/postgresql-base-8.3 ) sqlite? ( dev-db/sqlite:3 ) python? ( =dev-lang/python-2* )
 0
 http://github.com/downloads/mapnik/mapnik/mapnik-v2.0.1.tar.bz2
 
diff --git a/metadata/cache/sec-policy/selinux-cups-2.20120215-r1 b/metadata/cache/sec-policy/selinux-cups-2.20120215-r1
index cee60c6f77b1..93e345675d32 100644
--- a/metadata/cache/sec-policy/selinux-cups-2.20120215-r1
+++ b/metadata/cache/sec-policy/selinux-cups-2.20120215-r1
@@ -1,5 +1,5 @@
->=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
->=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215-r9
+>=sec-policy/selinux-lpd-2.20120215 >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+>=sec-policy/selinux-lpd-2.20120215 >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215-r9
 0
 http://oss.tresys.com/files/refpolicy/refpolicy-2.20120215.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120215-r9.tar.bz2
 
diff --git a/metadata/cache/sys-apps/accountsservice-0.6.15 b/metadata/cache/sys-apps/accountsservice-0.6.15
index 72bdafde45b8..1e1a4500207f 100644
--- a/metadata/cache/sys-apps/accountsservice-0.6.15
+++ b/metadata/cache/sys-apps/accountsservice-0.6.15
@@ -6,7 +6,7 @@ http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.15.tar.x
 http://www.fedoraproject.org/wiki/Features/UserAccountDialog
 GPL-3
 D-Bus interfaces for querying and manipulating user account information
-amd64 arm x86
+~alpha amd64 arm x86
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib systemd toolchain-funcs user versionator
 doc +introspection
 
diff --git a/metadata/cache/sys-apps/openrc-0.10.2 b/metadata/cache/sys-apps/openrc-0.10.2
new file mode 100644
index 000000000000..d12daa0cc9f4
--- /dev/null
+++ b/metadata/cache/sys-apps/openrc-0.10.2
@@ -0,0 +1,22 @@
+virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133 virtual/os-headers
+virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133
+0
+mirror://gentoo/openrc-0.10.2.tar.bz2
+
+http://www.gentoo.org/proj/en/base/openrc/
+BSD-2
+OpenRC manages the services, startup and shutdown of a host
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+eutils flag-o-matic multilib pam toolchain-funcs user
+debug elibc_glibc ncurses pam selinux static-libs unicode kernel_linux kernel_FreeBSD
+
+
+
+4
+
+compile install postinst preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sys-auth/pam_mount-2.1 b/metadata/cache/sys-auth/pam_mount-2.1
deleted file mode 100644
index d2c7041b6cec..000000000000
--- a/metadata/cache/sys-auth/pam_mount-2.1
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.4 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 virtual/pkgconfig app-arch/xz-utils
->=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.4 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 sys-process/lsof
-0
-mirror://sourceforge/pam-mount/pam_mount-2.1.tar.xz
-
-http://pam-mount.sourceforge.net
-GPL-3
-A PAM module that can mount volumes for a user session
-amd64 ppc x86
-multilib toolchain-funcs
-crypt
-
-
-
-3
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/sys-auth/pam_mount-2.10 b/metadata/cache/sys-auth/pam_mount-2.10
deleted file mode 100644
index e2a9c353829f..000000000000
--- a/metadata/cache/sys-auth/pam_mount-2.10
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/pam-0.99 >=sys-libs/libhx-3.6 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig app-arch/xz-utils
->=sys-libs/pam-0.99 >=sys-libs/libhx-3.6 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux )
-0
-mirror://sourceforge/pam-mount/pam_mount-2.10.tar.xz
-
-http://pam-mount.sourceforge.net
-GPL-3
-A PAM module that can mount volumes for a user session
-~amd64 ~ppc ~x86
-multilib toolchain-funcs
-crypt ssl selinux
-
-
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/sys-auth/pam_mount-2.12 b/metadata/cache/sys-auth/pam_mount-2.12
deleted file mode 100644
index 642fc2d145a4..000000000000
--- a/metadata/cache/sys-auth/pam_mount-2.12
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/pam-0.99 >=sys-libs/libhx-3.11 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig app-arch/xz-utils
->=sys-libs/pam-0.99 >=sys-libs/libhx-3.11 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux )
-0
-mirror://sourceforge/pam-mount/pam_mount-2.12.tar.xz
-
-http://pam-mount.sourceforge.net
-GPL-3
-A PAM module that can mount volumes for a user session
-~amd64 ~ppc ~x86
-multilib toolchain-funcs
-crypt ssl selinux
-
-
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/sys-auth/pam_mount-2.5 b/metadata/cache/sys-auth/pam_mount-2.5
deleted file mode 100644
index bee3fce507b6..000000000000
--- a/metadata/cache/sys-auth/pam_mount-2.5
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.4 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 virtual/pkgconfig app-arch/xz-utils
->=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.4 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 sys-process/lsof
-0
-mirror://sourceforge/pam-mount/pam_mount-2.5.tar.xz
-
-http://pam-mount.sourceforge.net
-GPL-3
-A PAM module that can mount volumes for a user session
-~amd64 ~ppc ~x86
-multilib toolchain-funcs
-crypt
-
-
-
-3
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/sys-auth/pam_mount-2.6 b/metadata/cache/sys-auth/pam_mount-2.6
deleted file mode 100644
index 9b96fe43a43c..000000000000
--- a/metadata/cache/sys-auth/pam_mount-2.6
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.6 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 virtual/pkgconfig app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.6 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 sys-process/lsof
-0
-mirror://sourceforge/pam-mount/pam_mount-2.6.tar.xz
-
-http://pam-mount.sourceforge.net
-GPL-3
-A PAM module that can mount volumes for a user session
-~amd64 ~ppc ~x86
-autotools eutils libtool multilib toolchain-funcs user
-crypt
-
-
-
-3
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/sys-auth/pam_mount-2.8 b/metadata/cache/sys-auth/pam_mount-2.8
deleted file mode 100644
index 9ed3102a4b8e..000000000000
--- a/metadata/cache/sys-auth/pam_mount-2.8
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.8 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 virtual/pkgconfig app-arch/xz-utils
->=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.8 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 sys-process/lsof
-0
-mirror://sourceforge/pam-mount/pam_mount-2.8.tar.xz
-
-http://pam-mount.sourceforge.net
-GPL-3
-A PAM module that can mount volumes for a user session
-~amd64 ~ppc ~x86
-multilib toolchain-funcs
-crypt
-
-
-
-3
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/sys-block/ms-sys-2.1.3 b/metadata/cache/sys-block/ms-sys-2.1.3
deleted file mode 100644
index f572f70b4f9a..000000000000
--- a/metadata/cache/sys-block/ms-sys-2.1.3
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/gettext
-
-0
-mirror://sourceforge/ms-sys/ms-sys-2.1.3.tgz
-
-http://ms-sys.sourceforge.net
-GPL-2
-a command-line program for writing Microsoft compatible boot records.
-amd64 x86
-multilib toolchain-funcs
-
-
-
-
-
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/sys-block/ms-sys-2.1.4 b/metadata/cache/sys-block/ms-sys-2.1.4
deleted file mode 100644
index 5d0ef87df27e..000000000000
--- a/metadata/cache/sys-block/ms-sys-2.1.4
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-devel/gettext
-
-0
-mirror://sourceforge/ms-sys/ms-sys-2.1.4.tar.gz
-
-http://ms-sys.sourceforge.net
-GPL-2
-a command-line program for writing Microsoft compatible boot records.
-~amd64 ~x86
-multilib toolchain-funcs
-
-
-
-
-2
-
-compile install
-
-
-
-
-
diff --git a/metadata/cache/sys-block/ms-sys-2.3.0 b/metadata/cache/sys-block/ms-sys-2.3.0
new file mode 100644
index 000000000000..3040b9a5f4d1
--- /dev/null
+++ b/metadata/cache/sys-block/ms-sys-2.3.0
@@ -0,0 +1,22 @@
+sys-devel/gettext
+virtual/libintl
+0
+mirror://sourceforge/ms-sys/ms-sys-2.3.0.tar.gz
+
+http://ms-sys.sourceforge.net
+GPL-2
+A command-line program for writing Microsoft compatible boot records.
+~amd64 ~x86
+multilib toolchain-funcs
+linguas_sv
+
+
+
+4
+
+compile install
+
+
+
+
+
diff --git a/metadata/cache/sys-block/thin-provisioning-tools-0.1.5 b/metadata/cache/sys-block/thin-provisioning-tools-0.1.5
new file mode 100644
index 000000000000..75d2de934acb
--- /dev/null
+++ b/metadata/cache/sys-block/thin-provisioning-tools-0.1.5
@@ -0,0 +1,22 @@
+dev-libs/expat dev-libs/boost
+dev-libs/expat
+0
+https://github.com/downloads/jthornber/thin-provisioning-tools/thin-provisioning-tools-v0.1.5.tar.bz2
+
+https://github.com/jthornber/thin-provisioning-tools
+GPL-3
+A suite of tools for thin provisioning on Linux.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+eutils multilib toolchain-funcs user
+
+
+
+
+4
+
+configure install
+
+
+
+
+
diff --git a/metadata/cache/sys-freebsd/freebsd-sources-9.0-r3 b/metadata/cache/sys-freebsd/freebsd-sources-9.0-r3
new file mode 100644
index 000000000000..7968cd8a5a51
--- /dev/null
+++ b/metadata/cache/sys-freebsd/freebsd-sources-9.0-r3
@@ -0,0 +1,22 @@
+virtual/pmake virtual/pmake
+>=sys-freebsd/freebsd-mk-defs-8.0
+9.0-r3
+mirror://gentoo/freebsd-sys-9.0.tar.bz2
+strip binchecks
+http://www.freebsd.org/
+BSD
+FreeBSD kernel sources
+~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+bsdmk eutils flag-o-matic freebsd multilib portability toolchain-funcs user versionator
+symlink
+
+
+
+
+
+compile install postinst unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-fs/gt5-1.4.0-r1 b/metadata/cache/sys-fs/gt5-1.4.0-r1
deleted file mode 100644
index 8dde2d0738bd..000000000000
--- a/metadata/cache/sys-fs/gt5-1.4.0-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-
-|| ( www-client/links www-client/elinks www-client/lynx )
-0
-mirror://sourceforge/gt5/gt5-1.4.0.tar.gz
-
-http://gt5.sourceforge.net/
-GPL-2
-a diff-capable 'du-browser'
-amd64 ~sparc x86
-eutils multilib toolchain-funcs user
-
-
-
-
-
-
-install unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/lvm2-2.02.95-r2 b/metadata/cache/sys-fs/lvm2-2.02.95-r2
new file mode 100644
index 000000000000..a8a245c54503
--- /dev/null
+++ b/metadata/cache/sys-fs/lvm2-2.02.95-r2
@@ -0,0 +1,22 @@
+!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( >=sys-fs/udev-151-r4 ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( || ( >=sys-fs/udev-181[static-libs] <sys-fs/udev-181 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( >=sys-fs/udev-151-r4 ) !<sys-apps/openrc-0.10.1 >=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !<sys-fs/cryptsetup-1.1.2
+0
+ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.95.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.95.tgz
+
+http://sources.redhat.com/lvm2/
+GPL-2
+User-land utilities for LVM2 (device-mapper) software.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+autotools eutils libtool linux-info multilib toolchain-funcs user versionator
+readline static static-libs clvm cman +lvm1 selinux +udev +thin
+
+
+
+3
+
+compile configure install postinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-libs/libhx-3.10.1 b/metadata/cache/sys-libs/libhx-3.10.1
deleted file mode 100644
index db34bf712b7c..000000000000
--- a/metadata/cache/sys-libs/libhx-3.10.1
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/xz-utils
-
-0
-mirror://sourceforge/libhx/libHX-3.10.1.tar.xz
-
-http://libhx.sourceforge.net
-GPL-3
-Platform independent library providing basic system functions.
-~amd64 ~ppc ~x86
-eutils multilib toolchain-funcs user
-
-
-
-
-3
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/sys-libs/libhx-3.12 b/metadata/cache/sys-libs/libhx-3.12
deleted file mode 100644
index 4542db5bf8c7..000000000000
--- a/metadata/cache/sys-libs/libhx-3.12
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/xz-utils
-
-0
-mirror://sourceforge/libhx/libHX-3.12.tar.xz
-
-http://libhx.sourceforge.net
-GPL-3
-Platform independent library providing basic system functions.
-~amd64 ~ppc ~x86
-
-
-
-
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/sys-libs/libhx-3.5 b/metadata/cache/sys-libs/libhx-3.5
deleted file mode 100644
index 56c7fa5b7699..000000000000
--- a/metadata/cache/sys-libs/libhx-3.5
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/xz-utils
-
-0
-mirror://sourceforge/libhx/libHX-3.5.tar.xz
-
-http://libhx.sourceforge.net
-GPL-3
-Platform independent library providing basic system functions.
-amd64 ppc x86
-eutils multilib toolchain-funcs user
-
-
-
-
-3
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/sys-libs/libhx-3.8 b/metadata/cache/sys-libs/libhx-3.8
deleted file mode 100644
index 180aac15e02a..000000000000
--- a/metadata/cache/sys-libs/libhx-3.8
+++ /dev/null
@@ -1,22 +0,0 @@
-app-arch/xz-utils
-
-0
-mirror://sourceforge/libhx/libHX-3.8.tar.xz
-
-http://libhx.sourceforge.net
-GPL-3
-Platform independent library providing basic system functions.
-~amd64 ~ppc ~x86
-eutils multilib toolchain-funcs user
-
-
-
-
-3
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/sys-power/upower-0.9.16 b/metadata/cache/sys-power/upower-0.9.16
index 65b367968654..67b308c75f36 100644
--- a/metadata/cache/sys-power/upower-0.9.16
+++ b/metadata/cache/sys-power/upower-0.9.16
@@ -6,7 +6,7 @@ http://upower.freedesktop.org/releases/upower-0.9.16.tar.xz
 http://upower.freedesktop.org/
 GPL-2
 D-Bus abstraction for enumerating power devices and querying history and statistics
-~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 systemd
 debug doc +introspection ios kernel_FreeBSD kernel_linux
 
diff --git a/metadata/cache/virtual/gsasl-2 b/metadata/cache/virtual/gsasl-2
index 1057dba20887..f054f86a1f10 100644
--- a/metadata/cache/virtual/gsasl-2
+++ b/metadata/cache/virtual/gsasl-2
@@ -6,7 +6,7 @@
 
 
 Virtual for the GNU SASL library
-alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 
 
 
diff --git a/metadata/cache/virtual/libusb-1 b/metadata/cache/virtual/libusb-1
index f6553c9a997c..9cbbdc1d0445 100644
--- a/metadata/cache/virtual/libusb-1
+++ b/metadata/cache/virtual/libusb-1
@@ -1,5 +1,5 @@
 
-|| ( >=dev-libs/libusb-1.0.9_rc:1 dev-libs/libusbx:1 )
+|| ( dev-libs/libusbx:1 >=dev-libs/libusb-1.0.9_rc:1 )
 1
 
 
diff --git a/metadata/cache/virtual/pkgconfig-0 b/metadata/cache/virtual/pkgconfig-0
index 38cde6e91b66..ad2616f763d2 100644
--- a/metadata/cache/virtual/pkgconfig-0
+++ b/metadata/cache/virtual/pkgconfig-0
@@ -5,10 +5,10 @@
 
 
 
-virtual for pkg-config
+Virtual for the pkg-config implementation
 alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 
-
+userland_BSD
 
 
 
diff --git a/metadata/cache/virtual/ruby-minitest-0-r2 b/metadata/cache/virtual/ruby-minitest-0-r2
index 8b06c31fc6c8..b48c3c7e5dc4 100644
--- a/metadata/cache/virtual/ruby-minitest-0-r2
+++ b/metadata/cache/virtual/ruby-minitest-0-r2
@@ -6,7 +6,7 @@ ruby_targets_ruby18? ( dev-ruby/minitest[ruby_targets_ruby18] ) ruby_targets_ree
 
 
 Virtual ebuild for the Ruby minitest library
-~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 eutils java-utils-2 multilib ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby
 
diff --git a/metadata/cache/virtual/ruby-rdoc-1 b/metadata/cache/virtual/ruby-rdoc-1
index f700d429f56e..815ffd4737b4 100644
--- a/metadata/cache/virtual/ruby-rdoc-1
+++ b/metadata/cache/virtual/ruby-rdoc-1
@@ -6,7 +6,7 @@ ruby19
 
 
 Virtual ebuild for bundled and unbundled RDoc
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 eutils java-utils-2 multilib ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby19
 
diff --git a/metadata/cache/virtual/ruby-ssl-1 b/metadata/cache/virtual/ruby-ssl-1
index 8131f9c42d74..99841031c9ee 100644
--- a/metadata/cache/virtual/ruby-ssl-1
+++ b/metadata/cache/virtual/ruby-ssl-1
@@ -6,7 +6,7 @@ ruby19
 
 
 Virtual ebuild for the Ruby OpenSSL bindings
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby19
 
diff --git a/metadata/cache/virtual/ruby-test-unit-0-r4 b/metadata/cache/virtual/ruby-test-unit-0-r4
index 6f6d54f5dff9..2836f11c9308 100644
--- a/metadata/cache/virtual/ruby-test-unit-0-r4
+++ b/metadata/cache/virtual/ruby-test-unit-0-r4
@@ -6,7 +6,7 @@ ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:
 
 
 Virtual ebuild for the Ruby test/unit library
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18
 
diff --git a/metadata/cache/virtual/ruby-threads-1 b/metadata/cache/virtual/ruby-threads-1
index d1813b01b76b..894eb0968d8a 100644
--- a/metadata/cache/virtual/ruby-threads-1
+++ b/metadata/cache/virtual/ruby-threads-1
@@ -6,7 +6,7 @@ ruby19
 
 
 Virtual ebuild for a ruby interpreter with threading enabled.
-amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 eutils java-utils-2 multilib ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby19
 
diff --git a/metadata/cache/virtual/rubygems-1 b/metadata/cache/virtual/rubygems-1
index 708570675141..9f945f3f8c7b 100644
--- a/metadata/cache/virtual/rubygems-1
+++ b/metadata/cache/virtual/rubygems-1
@@ -6,7 +6,7 @@ ruby18
 
 
 Virtual ebuild for rubygems
-alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18
 
diff --git a/metadata/cache/virtual/rubygems-4 b/metadata/cache/virtual/rubygems-4
index e041ff0830be..7f2a33ae9226 100644
--- a/metadata/cache/virtual/rubygems-4
+++ b/metadata/cache/virtual/rubygems-4
@@ -6,7 +6,7 @@ ruby19
 
 
 Virtual ebuild for rubygems
-~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 eutils java-utils-2 multilib ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby19
 
diff --git a/metadata/cache/www-client/chromium-21.0.1145.0-r1 b/metadata/cache/www-client/chromium-21.0.1145.0-r1
new file mode 100644
index 000000000000..e674ff6c62b7
--- /dev/null
+++ b/metadata/cache/www-client/chromium-21.0.1145.0-r1
@@ -0,0 +1,22 @@
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+0
+http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1145.0.tar.bz2
+
+http://chromium.org/
+BSD
+Open-source version of Google Chrome web browser
+~amd64 ~x86
+chromium eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib pax-utils portability python toolchain-funcs user versionator virtualx
+bindist cups gnome gnome-keyring kerberos pulseaudio selinux custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/www-client/chromium-9999-r1 b/metadata/cache/www-client/chromium-9999-r1
index ecba0f407ea0..148d5527ad93 100644
--- a/metadata/cache/www-client/chromium-9999-r1
+++ b/metadata/cache/www-client/chromium-9999-r1
@@ -1,4 +1,4 @@
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/subversion net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/subversion net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 live
 
diff --git a/metadata/cache/x11-libs/libwnck-2.31.0 b/metadata/cache/x11-libs/libwnck-2.31.0
index 489d3093c9e7..2aea1ad23267 100644
--- a/metadata/cache/x11-libs/libwnck-2.31.0
+++ b/metadata/cache/x11-libs/libwnck-2.31.0
@@ -6,7 +6,7 @@ mirror://gnome/sources/libwnck/2.31/libwnck-2.31.0.tar.xz
 http://www.gnome.org/
 LGPL-2
 A window navigation construction kit
-~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib toolchain-funcs user versionator
 doc +introspection startup-notification
 
diff --git a/metadata/cache/x11-libs/pixman-0.26.0 b/metadata/cache/x11-libs/pixman-0.26.0
new file mode 100644
index 000000000000..18a53f5e7de2
--- /dev/null
+++ b/metadata/cache/x11-libs/pixman-0.26.0
@@ -0,0 +1,22 @@
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+
+0
+http://xorg.freedesktop.org/releases/individual/lib/pixman-0.26.0.tar.bz2
+
+http://xorg.freedesktop.org/
+MIT
+Low-level pixel manipulation routines
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+autotools autotools-utils eutils flag-o-matic libtool multilib toolchain-funcs user versionator xorg-2
+altivec iwmmxt mmx neon sse2 test static-libs
+
+
+
+4
+
+compile configure install postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-misc/spacefm-0.7.4 b/metadata/cache/x11-misc/spacefm-0.7.4
deleted file mode 100644
index 2dcda7a80cf8..000000000000
--- a/metadata/cache/x11-misc/spacefm-0.7.4
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib:2 dev-util/desktop-file-utils sys-apps/dbus virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/startup-notification x11-misc/shared-mime-info !kernel_linux? ( virtual/fam ) dev-util/intltool virtual/pkgconfig sys-devel/gettext
-dev-libs/glib:2 dev-util/desktop-file-utils sys-apps/dbus virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/startup-notification x11-misc/shared-mime-info !kernel_linux? ( virtual/fam )
-0
-mirror://sourceforge/spacefm/spacefm-0.7.4.tar.xz
-
-http://spacefm.sourceforge.net/
-GPL-2 LGPL-2.1
-a multi-panel tabbed file manager
-~amd64 ~x86
-fdo-mime
-kernel_linux
-
-
-
-4
-
-configure postinst postrm
-
-
-
-
-
diff --git a/metadata/cache/x11-misc/spacefm-0.7.5 b/metadata/cache/x11-misc/spacefm-0.7.7
similarity index 80%
rename from metadata/cache/x11-misc/spacefm-0.7.5
rename to metadata/cache/x11-misc/spacefm-0.7.7
index 2ca33abff528..b2344919efcc 100644
--- a/metadata/cache/x11-misc/spacefm-0.7.5
+++ b/metadata/cache/x11-misc/spacefm-0.7.7
@@ -1,20 +1,20 @@
 dev-libs/glib:2 dev-util/desktop-file-utils sys-apps/dbus >=sys-fs/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/startup-notification x11-misc/shared-mime-info dev-util/intltool virtual/pkgconfig sys-devel/gettext
 dev-libs/glib:2 dev-util/desktop-file-utils sys-apps/dbus >=sys-fs/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/startup-notification x11-misc/shared-mime-info
 0
-mirror://sourceforge/spacefm/spacefm-0.7.5.tar.xz
+mirror://sourceforge/spacefm/spacefm-0.7.7.tar.xz
 
 http://ignorantguru.github.com/spacefm/
 GPL-2 LGPL-2.1
 A multi-panel tabbed file manager
 ~amd64 ~x86
-fdo-mime
+eutils fdo-mime linux-info multilib toolchain-funcs user versionator
 
 
 
 
 4
 
-configure postinst postrm
+configure postinst postrm setup
 
 
 
diff --git a/metadata/cache/x11-misc/xdg-user-dirs-gtk-0.9 b/metadata/cache/x11-misc/xdg-user-dirs-gtk-0.9
index a6fa38449f04..2b262a65e18b 100644
--- a/metadata/cache/x11-misc/xdg-user-dirs-gtk-0.9
+++ b/metadata/cache/x11-misc/xdg-user-dirs-gtk-0.9
@@ -6,7 +6,7 @@ mirror://gnome/sources/xdg-user-dirs-gtk/0.9/xdg-user-dirs-gtk-0.9.tar.xz
 http://www.freedesktop.org/wiki/Software/xdg-user-dirs
 GPL-2
 xdg-user-dirs-gtk integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications
-~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 eutils gnome.org multilib toolchain-funcs user versionator
 
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 1c31099e992d..452f6c034dd0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 27 May 2012 06:07:25 +0000
+Mon, 28 May 2012 03:07:26 +0000
diff --git a/metadata/glsa/glsa-201205-04.xml b/metadata/glsa/glsa-201205-04.xml
new file mode 100644
index 000000000000..ed5357e8a7b3
--- /dev/null
+++ b/metadata/glsa/glsa-201205-04.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/glsa.xsl"?>
+<?xml-stylesheet type="text/xsl" href="/xsl/guide.xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201205-04">
+  <title>Chromium, V8: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been reported in Chromium and V8,
+    some of which may allow execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">chromium v8</product>
+  <announced>May 27, 2012</announced>
+  <revised>May 27, 2012: 1</revised>
+  <bug>417321</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-client/chromium" auto="yes" arch="*">
+      <unaffected range="ge">19.0.1084.52</unaffected>
+      <vulnerable range="lt">19.0.1084.52</vulnerable>
+    </package>
+    <package name="dev-lang/v8" auto="yes" arch="*">
+      <unaffected range="ge">3.9.24.28</unaffected>
+      <vulnerable range="lt">3.9.24.28</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Chromium is an open source web browser project. V8 is Google’s open
+      source JavaScript engine.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Chromium and V8. Please
+      review the CVE identifiers and release notes referenced below for
+      details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A context-dependent attacker could entice a user to open a specially
+      crafted web site or JavaScript program using Chromium or V8, possibly
+      resulting in the execution of arbitrary code with the privileges of the
+      process, or a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Chromium users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/chromium-19.0.1084.52"
+    </code>
+    
+    <p>All V8 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-lang/v8-3.9.24.28"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3103">
+      CVE-2011-3103
+    </uri>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3104">
+      CVE-2011-3104
+    </uri>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3105">
+      CVE-2011-3105
+    </uri>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3106">
+      CVE-2011-3106
+    </uri>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3107">
+      CVE-2011-3107
+    </uri>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3108">
+      CVE-2011-3108
+    </uri>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3109">
+      CVE-2011-3109
+    </uri>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3111">
+      CVE-2011-3111
+    </uri>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3115">
+      CVE-2011-3115
+    </uri>
+    <uri link="http://googlechromereleases.blogspot.com/2012/05/stable-channel-update_23.html">
+      Release Notes 19.0.1084.52
+    </uri>
+  </references>
+  <metadata timestamp="Sat, 26 May 2012 16:55:13 +0000" tag="requester">
+    phajdan.jr
+  </metadata>
+  <metadata timestamp="Sun, 27 May 2012 22:45:29 +0000" tag="submitter">
+    phajdan.jr
+  </metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 615b2536a0b2..452f6c034dd0 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 27 May 2012 06:07:26 +0000
+Mon, 28 May 2012 03:07:26 +0000
diff --git a/metadata/md5-cache/app-admin/apg-2.3.0b-r5 b/metadata/md5-cache/app-admin/apg-2.3.0b-r5
index e12c1d2d4b33..cf389cb5e977 100644
--- a/metadata/md5-cache/app-admin/apg-2.3.0b-r5
+++ b/metadata/md5-cache/app-admin/apg-2.3.0b-r5
@@ -4,10 +4,10 @@ DESCRIPTION=Another Password Generator
 EAPI=2
 HOMEPAGE=http://www.adel.nursat.kz/apg/
 IUSE=cracklib
-KEYWORDS=amd64 hppa ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 hppa ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=as-is
 RDEPEND=cracklib? ( sys-libs/cracklib )
 SLOT=0
 SRC_URI=http://www.adel.nursat.kz/apg/download/apg-2.3.0b.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=974eb27d98ddfca9ae13aa43897c8918
+_md5_=d7652a7299d7257f9d90cd4141d2839a
diff --git a/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20120527 b/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20120527
new file mode 100644
index 000000000000..57a3d598f1de
--- /dev/null
+++ b/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20120527
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/glib:2 net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A system information and benchmark tool for Linux systems
+EAPI=4
+HOMEPAGE=http://hardinfo.berlios.de/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/hardinfo-0.5.2_pre20120527.tar.xz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=3f0f7510e3a8bcc267f7acde6f09dd70
diff --git a/metadata/md5-cache/app-admin/packagekit-base-0.7.4 b/metadata/md5-cache/app-admin/packagekit-base-0.7.4
index d72d596613a3..be64b8460e23 100644
--- a/metadata/md5-cache/app-admin/packagekit-base-0.7.4
+++ b/metadata/md5-cache/app-admin/packagekit-base-0.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=Manage packages in a secure way using a cross-distro and cross-archi
 EAPI=3
 HOMEPAGE=http://www.packagekit.org/
 IUSE=connman cron doc +introspection networkmanager nsplugin pm-utils +policykit entropy static-libs test udev linguas_as linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_fi linguas_fr linguas_gu linguas_he linguas_hi linguas_hu linguas_it linguas_ja linguas_kn linguas_ko linguas_ml linguas_mr linguas_ms linguas_nb linguas_nl linguas_or linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=connman? ( net-misc/connman ) introspection? ( >=dev-libs/gobject-introspection-0.9.9 ) networkmanager? ( >=net-misc/networkmanager-0.6.4 ) nsplugin? ( >=dev-libs/nspr-4.8 x11-libs/cairo >=x11-libs/gtk+-2.14.0:2 x11-libs/pango ) policykit? ( >=sys-auth/polkit-0.98 ) udev? ( || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.26.1:2 >=sys-apps/dbus-1.3.0 entropy? ( >=sys-apps/entropy-1.0_rc27 ) pm-utils? ( sys-power/pm-utils ) >=app-portage/layman-1.2.3 >=sys-apps/portage-2.1.9 sys-auth/consolekit =dev-lang/python-2*
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.packagekit.org/releases/PackageKit-0.7.4.tar.xz
 _eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	nsplugins	c42fe69d78ae059f56a2d43658fc0480	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=90fc9316e3ba1cd783cb44379579255d
+_md5_=a390e132abc81a83842bad474fe9cf92
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.2.2 b/metadata/md5-cache/app-crypt/seahorse-3.2.2
index e8df2f73c34c..78938dde8a37 100644
--- a/metadata/md5-cache/app-crypt/seahorse-3.2.2
+++ b/metadata/md5-cache/app-crypt/seahorse-3.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=A GNOME application for managing encryption keys
 EAPI=4
 HOMEPAGE=http://www.gnome.org/projects/seahorse/index.html
 IUSE=avahi debug doc ldap test debug
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.90.0:3 >=gnome-base/gnome-keyring-3.1.5 net-libs/libsoup:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 || ( =app-crypt/gnupg-2.0* =app-crypt/gnupg-1.4* ) avahi? ( >=net-dns/avahi-0.6 ) ldap? ( net-nds/openldap ) !<app-crypt/seahorse-plugins-2.91.0_pre20110114
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse/3.2/seahorse-3.2.2.tar.xz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3988b9bd8f0eb5cc34b7c28ee4d7a678
+_md5_=21c8bdf825b72e1c04230c0c95f09874
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.0.6 b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.6
new file mode 100644
index 000000000000..e7b071e4f0c3
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/tuareg-mode-2.0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-21
+DESCRIPTION=An Objective Caml/Camllight mode for Emacs
+EAPI=4
+HOMEPAGE=http://forge.ocamlcore.org/projects/tuareg/
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=virtual/emacs-21
+SLOT=0
+SRC_URI=http://forge.ocamlcore.org/frs/download.php/882/tuareg-mode-2.0.6.tgz
+_eclasses_=elisp	6e2733d3f6b8238de88467c371e1da8a	elisp-common	230b4edb497ef94e18cc7f0712daa862	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=6b5b0339a2bc4765fb69cb9b8bdb9619
diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20120520-r1 b/metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20120520-r1
new file mode 100644
index 000000000000..412f8cab708f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20120520-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=>=sys-apps/findutils-4.2.26
+DESCRIPTION=Provides precompiled 32bit libraries
+EAPI=4
+HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html
+IUSE=alsa pulseaudio development
+KEYWORDS=-* ~amd64
+LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 as-is gsm public-domain
+RDEPEND=pulseaudio? ( media-sound/pulseaudio ) ~app-emulation/emul-linux-x86-baselibs-20120520 ~app-emulation/emul-linux-x86-medialibs-20120520
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-soundlibs-20120520.tar.xz
+_eclasses_=emul-linux-x86	c51a0cd6013332725233daa1b1b5c4ae	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=566b04fb2a624f8ff1d940186d0c6561
diff --git a/metadata/md5-cache/app-misc/geoclue-0.12.0_p20110307 b/metadata/md5-cache/app-misc/geoclue-0.12.0_p20110307
index 7866b87c50e9..966ccbc4d1e0 100644
--- a/metadata/md5-cache/app-misc/geoclue-0.12.0_p20110307
+++ b/metadata/md5-cache/app-misc/geoclue-0.12.0_p20110307
@@ -4,11 +4,11 @@ DESCRIPTION=A geoinformation D-Bus service
 EAPI=4
 HOMEPAGE=http://freedesktop.org/wiki/Software/GeoClue
 IUSE=geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes skyhook yahoo-geo
-KEYWORDS=amd64 ~arm x86 ~amd64-fbsd
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd
 LICENSE=LGPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 gnome-base/gconf skyhook? ( net-libs/libsoup ) sys-apps/dbus gtk? ( x11-libs/gtk+:2 ) gps? ( <=sci-geosciences/gpsd-2.95-r1 ) networkmanager? ( net-misc/networkmanager )
 REQUIRED_USE=skyhook? ( networkmanager )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~signals/geoclue-0.12.0_p20110307.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e3827cdb22e797a6d88267af93d0d769
+_md5_=a092fb9b2f246a3376f76fa36b2b9576
diff --git a/metadata/md5-cache/app-office/calligra-2.4.1 b/metadata/md5-cache/app-office/calligra-2.4.1
index 698f8b576174..215036d54964 100644
--- a/metadata/md5-cache/app-office/calligra-2.4.1
+++ b/metadata/md5-cache/app-office/calligra-2.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 DESCRIPTION=KDE Office Suite
 EAPI=4
 HOMEPAGE=http://www.calligra.org/
 IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 REQUIRED_USE=calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
 RESTRICT=test
 SLOT=4
 SRC_URI=mirror://kde/stable/calligra-2.4.1/calligra-2.4.1.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	gnome2-utils	dfd98be073cc8193fc79925566741ab0	kde4-base	a5866abff73618fd21d222141d24401d	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=24954ec69d96ca86e59bc6ec8298936e
+_md5_=0e2342a6a067c3972612e2c39ced7d9a
diff --git a/metadata/md5-cache/app-office/calligra-2.4.0-r1 b/metadata/md5-cache/app-office/calligra-2.4.2
similarity index 51%
rename from metadata/md5-cache/app-office/calligra-2.4.0-r1
rename to metadata/md5-cache/app-office/calligra-2.4.2
index 1f489a474b2e..c005898ce75a 100644
--- a/metadata/md5-cache/app-office/calligra-2.4.0-r1
+++ b/metadata/md5-cache/app-office/calligra-2.4.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 DESCRIPTION=KDE Office Suite
 EAPI=4
 HOMEPAGE=http://www.calligra.org/
 IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 REQUIRED_USE=calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
 RESTRICT=test
 SLOT=4
-SRC_URI=mirror://kde/stable/calligra-2.4.0/calligra-2.4.0.tar.bz2
+SRC_URI=mirror://kde/stable/calligra-2.4.2/calligra-2.4.2.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	gnome2-utils	dfd98be073cc8193fc79925566741ab0	kde4-base	a5866abff73618fd21d222141d24401d	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=84e91e8da649a1b90b3bcb79dc79b34e
+_md5_=27dd3bf111f19ef69979764d06f45f58
diff --git a/metadata/md5-cache/app-office/calligra-2.4.9999 b/metadata/md5-cache/app-office/calligra-2.4.49.9999
similarity index 52%
rename from metadata/md5-cache/app-office/calligra-2.4.9999
rename to metadata/md5-cache/app-office/calligra-2.4.49.9999
index bd2d9949abb2..e73b1c349217 100644
--- a/metadata/md5-cache/app-office/calligra-2.4.9999
+++ b/metadata/md5-cache/app-office/calligra-2.4.49.9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 dev-vcs/git >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 dev-vcs/git >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 DESCRIPTION=KDE Office Suite
 EAPI=4
 HOMEPAGE=http://www.calligra.org/
 IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
 LICENSE=GPL-2
-RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 REQUIRED_USE=calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
 RESTRICT=test
 SLOT=4
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	dfd98be073cc8193fc79925566741ab0	kde4-base	a5866abff73618fd21d222141d24401d	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=8b4cf4f651f9c681dcb3d3c31aa455b4
+_md5_=2ed540a7c96b7bed5772c572ba9f6649
diff --git a/metadata/md5-cache/app-office/calligra-2.4.90 b/metadata/md5-cache/app-office/calligra-2.4.90
new file mode 100644
index 000000000000..4c4a6e79ff82
--- /dev/null
+++ b/metadata/md5-cache/app-office/calligra-2.4.90
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+DESCRIPTION=KDE Office Suite
+EAPI=4
+HOMEPAGE=http://www.calligra.org/
+IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+REQUIRED_USE=calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
+RESTRICT=test
+SLOT=4
+SRC_URI=mirror://kde/unstable/calligra-2.4.90/calligra-2.4.90.tar.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	gnome2-utils	dfd98be073cc8193fc79925566741ab0	kde4-base	a5866abff73618fd21d222141d24401d	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=264e01771317b6996a62248f638981a3
diff --git a/metadata/md5-cache/app-office/calligra-9999 b/metadata/md5-cache/app-office/calligra-9999
index 6c10af3bca21..f45b546654b8 100644
--- a/metadata/md5-cache/app-office/calligra-9999
+++ b/metadata/md5-cache/app-office/calligra-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 dev-vcs/git >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+DEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=sys-apps/sed-4 dev-vcs/git >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 DESCRIPTION=KDE Office Suite
 EAPI=4
 HOMEPAGE=http://www.calligra.org/
 IUSE=attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr +pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype word-perfect xbase +xml +xslt calligra_features_kexi calligra_features_words calligra_features_flow calligra_features_plan calligra_features_stage calligra_features_sheets calligra_features_krita calligra_features_karbon calligra_features_braindump opengl +handbook aqua
 LICENSE=GPL-2
-RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
+RDEPEND=!app-office/karbon !app-office/kexi !app-office/koffice-data !app-office/koffice-l10n !app-office/koffice-libs !app-office/koffice-meta !app-office/kplato !app-office/kpresenter !app-office/krita !app-office/kspread !app-office/kword dev-lang/perl dev-libs/boost dev-libs/libxml2 >=kde-base/knewstuff-4.6.4:4[aqua=] media-libs/libpng sys-libs/zlib >=x11-libs/qt-gui-4.8.1-r1 attica? ( dev-libs/libattica ) crypt? ( app-crypt/qca:2 ) eigen? ( dev-cpp/eigen:2 ) exif? ( media-gfx/exiv2 ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) freetds? ( dev-db/freetds ) gif? ( media-libs/giflib ) glew? ( media-libs/glew ) glib? ( dev-libs/glib:2 ) gsf? ( gnome-extra/libgsf ) gsl? ( sci-libs/gsl ) iconv? ( virtual/libiconv ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) kdcraw? ( >=kde-base/libkdcraw-4.6.4:4[aqua=] ) kdepim? ( >=kde-base/kdepimlibs-4.6.4:4[aqua=,semantic-desktop] ) lcms? ( media-libs/lcms:2 ) marble? ( >=kde-base/marble-4.6.4:4[aqua=] ) mysql? ( virtual/mysql ) okular? ( >=kde-base/okular-4.6.4:4[aqua=] ) openctl? ( >=media-libs/opengtl-0.9.15 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler media-gfx/pstoedit ) postgres? ( dev-db/postgresql-base dev-libs/libpqxx ) semantic-desktop? ( dev-libs/soprano >=kde-base/kdelibs-4.6.4:4[aqua=,semantic-desktop] ) ssl? ( dev-libs/openssl ) sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) word-perfect? ( app-text/libwpd app-text/libwps app-text/libwpg ) xbase? ( dev-db/xbase ) xslt? ( dev-libs/libxslt ) calligra_features_kexi? ( >=dev-db/sqlite-3.7.9:3[extensions] dev-libs/icu ) >=kde-base/oxygen-icons-4.6.4:4[aqua=] handbook? ( >=kde-base/kdelibs-4.6.4:4[aqua=,handbook] ) opengl? ( >=x11-libs/qt-opengl-4.8.1:4 ) dev-lang/perl >=x11-libs/qt-core-4.8.1:4[qt3support,ssl] >=x11-libs/qt-dbus-4.8.1:4 >=x11-libs/qt-gui-4.8.1:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.8.1:4[accessibility] >=x11-libs/qt-script-4.8.1:4 >=x11-libs/qt-sql-4.8.1:4[qt3support] >=x11-libs/qt-svg-4.8.1:4 >=x11-libs/qt-test-4.8.1:4 >=x11-libs/qt-webkit-4.8.1:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.6.4:4[aqua=]
 REQUIRED_USE=calligra_features_kexi? ( calligra_features_sheets ) calligra_features_words? ( calligra_features_sheets ) calligra_features_krita? ( eigen exif lcms ) calligra_features_plan? ( kdepim semantic-desktop ) calligra_features_sheets? ( eigen ) test? ( calligra_features_karbon )
 RESTRICT=test
 SLOT=4
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	git-2	15733ab6a6feb34af9837b41623c2bad	gnome2-utils	dfd98be073cc8193fc79925566741ab0	kde4-base	a5866abff73618fd21d222141d24401d	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=2c1ee58b18c404d04233cc17b63d564a
+_md5_=f93cbf3069f1b462ea781464f79b8e9b
diff --git a/metadata/md5-cache/app-office/calligra-l10n-2.4.0 b/metadata/md5-cache/app-office/calligra-l10n-2.4.0
deleted file mode 100644
index 1b62c8c4ba75..000000000000
--- a/metadata/md5-cache/app-office/calligra-l10n-2.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/gettext >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-DESCRIPTION=Calligra localization package
-EAPI=4
-HOMEPAGE=http://www.kde.org/
-IUSE=doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-SLOT=4
-SRC_URI=linguas_ca? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-ca-2.4.0.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-ca@valencia-2.4.0.tar.bz2 ) linguas_cs? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-cs-2.4.0.tar.bz2 ) linguas_da? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-da-2.4.0.tar.bz2 ) linguas_de? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-de-2.4.0.tar.bz2 ) linguas_el? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-el-2.4.0.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-en_GB-2.4.0.tar.bz2 ) linguas_es? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-es-2.4.0.tar.bz2 ) linguas_et? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-et-2.4.0.tar.bz2 ) linguas_fi? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-fi-2.4.0.tar.bz2 ) linguas_fr? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-fr-2.4.0.tar.bz2 ) linguas_hu? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-hu-2.4.0.tar.bz2 ) linguas_it? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-it-2.4.0.tar.bz2 ) linguas_kk? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-kk-2.4.0.tar.bz2 ) linguas_nb? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-nb-2.4.0.tar.bz2 ) linguas_nds? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-nds-2.4.0.tar.bz2 ) linguas_nl? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-nl-2.4.0.tar.bz2 ) linguas_pl? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-pl-2.4.0.tar.bz2 ) linguas_pt? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-pt-2.4.0.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-pt_BR-2.4.0.tar.bz2 ) linguas_ru? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-ru-2.4.0.tar.bz2 ) linguas_sk? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-sk-2.4.0.tar.bz2 ) linguas_sv? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-sv-2.4.0.tar.bz2 ) linguas_uk? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-uk-2.4.0.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-zh_CN-2.4.0.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/calligra-2.4.0/calligra-l10n//calligra-l10n-zh_TW-2.4.0.tar.bz2 )
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	gnome2-utils	dfd98be073cc8193fc79925566741ab0	kde4-base	a5866abff73618fd21d222141d24401d	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=cd6fa3be5ab59342c676395e71ebb1e1
diff --git a/metadata/md5-cache/app-office/calligra-l10n-2.4.1 b/metadata/md5-cache/app-office/calligra-l10n-2.4.1
index 47b32c2e788e..628f3d7f8b1f 100644
--- a/metadata/md5-cache/app-office/calligra-l10n-2.4.1
+++ b/metadata/md5-cache/app-office/calligra-l10n-2.4.1
@@ -4,10 +4,10 @@ DESCRIPTION=Calligra localization package
 EAPI=4
 HOMEPAGE=http://www.kde.org/
 IUSE=doc linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_hu linguas_it linguas_kk linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_uk linguas_zh_CN linguas_zh_TW aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 SLOT=4
 SRC_URI=linguas_ca? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ca-2.4.1.tar.bz2 ) linguas_ca@valencia? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ca@valencia-2.4.1.tar.bz2 ) linguas_cs? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-cs-2.4.1.tar.bz2 ) linguas_da? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-da-2.4.1.tar.bz2 ) linguas_de? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-de-2.4.1.tar.bz2 ) linguas_el? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-el-2.4.1.tar.bz2 ) linguas_en_GB? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-en_GB-2.4.1.tar.bz2 ) linguas_es? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-es-2.4.1.tar.bz2 ) linguas_et? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-et-2.4.1.tar.bz2 ) linguas_fi? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-fi-2.4.1.tar.bz2 ) linguas_fr? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-fr-2.4.1.tar.bz2 ) linguas_hu? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-hu-2.4.1.tar.bz2 ) linguas_it? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-it-2.4.1.tar.bz2 ) linguas_kk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-kk-2.4.1.tar.bz2 ) linguas_nb? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nb-2.4.1.tar.bz2 ) linguas_nds? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nds-2.4.1.tar.bz2 ) linguas_nl? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-nl-2.4.1.tar.bz2 ) linguas_pl? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pl-2.4.1.tar.bz2 ) linguas_pt? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pt-2.4.1.tar.bz2 ) linguas_pt_BR? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-pt_BR-2.4.1.tar.bz2 ) linguas_ru? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-ru-2.4.1.tar.bz2 ) linguas_sk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-sk-2.4.1.tar.bz2 ) linguas_sv? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-sv-2.4.1.tar.bz2 ) linguas_uk? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-uk-2.4.1.tar.bz2 ) linguas_zh_CN? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-zh_CN-2.4.1.tar.bz2 ) linguas_zh_TW? ( mirror://kde/stable/calligra-2.4.1/calligra-l10n//calligra-l10n-zh_TW-2.4.1.tar.bz2 )
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	gnome2-utils	dfd98be073cc8193fc79925566741ab0	kde4-base	a5866abff73618fd21d222141d24401d	kde4-functions	9c01808120aa5c3905415f4cf4e6adb5	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=45f0971d8893053261def8855226ace0
+_md5_=1091cc1a8266316c6ce8bd2cce9a06e2
diff --git a/metadata/md5-cache/app-office/openerp-server-5.0.16 b/metadata/md5-cache/app-office/openerp-server-5.0.16
new file mode 100644
index 000000000000..2dfaafb2cebd
--- /dev/null
+++ b/metadata/md5-cache/app-office/openerp-server-5.0.16
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile config install postinst postrm preinst prepare setup
+DEPEND=dev-db/postgresql-server dev-python/egenix-mx-base dev-python/lxml dev-python/psycopg dev-python/pychart dev-python/pytz dev-python/pyxml dev-python/pyopenssl dev-python/reportlab media-gfx/pydot dev-libs/libxslt[python] dev-libs/libxml2[python] =dev-lang/python-2*
+DESCRIPTION=Open Source ERP & CRM
+EAPI=3
+HOMEPAGE=http://www.openerp.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/postgresql-server dev-python/egenix-mx-base dev-python/lxml dev-python/psycopg dev-python/pychart dev-python/pytz dev-python/pyxml dev-python/pyopenssl dev-python/reportlab media-gfx/pydot dev-libs/libxslt[python] dev-libs/libxml2[python] =dev-lang/python-2*
+SLOT=0
+SRC_URI=http://www.openerp.com/download/stable/source/openerp-server-5.0.16.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=62e6648cce110afa2efee3412c2f7580
diff --git a/metadata/md5-cache/app-text/tree-1.5.3 b/metadata/md5-cache/app-text/tree-1.5.3
deleted file mode 100644
index 33c7d772bfd0..000000000000
--- a/metadata/md5-cache/app-text/tree-1.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Lists directories recursively, and produces an indented listing of files.
-EAPI=2
-HOMEPAGE=http://mama.indstate.edu/users/ice/tree/
-IUSE=bash-completion
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-PDEPEND=bash-completion? ( app-shells/bash-completion )
-RDEPEND=bash-completion? ( app-admin/eselect )
-SLOT=0
-SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.5.3.tgz
-_eclasses_=bash-completion	003731da0df19d26955927bd534f3058	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=1ee5be0a63eb85ba42ae6354e0218b95
diff --git a/metadata/md5-cache/app-text/tree-1.6.0-r1 b/metadata/md5-cache/app-text/tree-1.6.0-r1
new file mode 100644
index 000000000000..64c48912eb4c
--- /dev/null
+++ b/metadata/md5-cache/app-text/tree-1.6.0-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Lists directories recursively, and produces an indented listing of files.
+EAPI=4
+HOMEPAGE=http://mama.indstate.edu/users/ice/tree/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.6.0.tgz
+_eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=cd1cbfb3596ce30273a1b0736065c50d
diff --git a/metadata/md5-cache/app-text/ttf2pk2-1.5_p20120525 b/metadata/md5-cache/app-text/ttf2pk2-1.5_p20120525
index 6847de218627..52085b4e5362 100644
--- a/metadata/md5-cache/app-text/ttf2pk2-1.5_p20120525
+++ b/metadata/md5-cache/app-text/ttf2pk2-1.5_p20120525
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/kpathsea-6.0.1_p20110627 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source] dev-util/pkgconfig
+DEPEND=>=dev-libs/kpathsea-6.0.1_p20110627 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source] virtual/pkgconfig
 DESCRIPTION=Freetype 2 based TrueType font to TeX's PK format converter
 EAPI=4
 HOMEPAGE=http://tug.org/texlive/
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/kpathsea-6.0.1_p20110627 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source]
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20120525-source.tar.xz
-_md5_=d96729d78f128f3924e01eb5e3a37bb9
+_md5_=12a03f8d7430fd691c4a546fe032cd26
diff --git a/metadata/md5-cache/dev-cpp/libassa-3.5.1 b/metadata/md5-cache/dev-cpp/libassa-3.5.1
index b6d3d4872a9e..43275f0f0881 100644
--- a/metadata/md5-cache/dev-cpp/libassa-3.5.1
+++ b/metadata/md5-cache/dev-cpp/libassa-3.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=A networking library based on Adaptive Communication Patterns
 EAPI=4
 HOMEPAGE=http://libassa.sourceforge.net/
 IUSE=doc static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=net-libs/libtirpc
 SLOT=0
 SRC_URI=mirror://sourceforge/libassa/libassa-3.5.1.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=482e3e744dbd9850d6c26f3bb30d8f85
+_md5_=e86df5af55baf522fa859398b8b442f4
diff --git a/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta1 b/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta1-r1
similarity index 97%
rename from metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta1
rename to metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta1-r1
index 2804cdba7c7a..bd36b29b9d6e 100644
--- a/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta1
+++ b/metadata/md5-cache/dev-db/postgresql-server-9.2.0_beta1-r1
@@ -9,6 +9,6 @@ LICENSE=POSTGRESQL
 PDEPEND=doc? ( ~dev-db/postgresql-docs-9.2.0_beta1 )
 RDEPEND=~dev-db/postgresql-base-9.2.0_beta1:9.2[pam?,pg_legacytimestamp=,nls=] perl? ( >=dev-lang/perl-5.8 ) selinux? ( sec-policy/selinux-postgresql ) tcl? ( >=dev-lang/tcl-8 ) uuid? ( dev-libs/ossp-uuid ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) python? ( =dev-lang/python-2* )
 SLOT=9.2
-SRC_URI=mirror://postgresql/source/v9.2.0beta1/postgresql-9.2beta1.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.2beta1.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.1.tbz2
+SRC_URI=mirror://postgresql/source/v9.2.0beta1/postgresql-9.2beta1.tar.bz2 http://dev.gentoo.org/~titanofold/postgresql-patches-9.2beta1.tbz2 http://dev.gentoo.org/~titanofold/postgresql-initscript-2.2.tbz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pam	3f746974e1cc47cabe3bd488c08cdc8e	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=04a2cac0c88294683333508c4a44ea91
+_md5_=f6337a7d60612ed8ad0b4faade25a78b
diff --git a/metadata/md5-cache/dev-games/irrlicht-1.7.3 b/metadata/md5-cache/dev-games/irrlicht-1.7.3
new file mode 100644
index 000000000000..ca6d38db6df7
--- /dev/null
+++ b/metadata/md5-cache/dev-games/irrlicht-1.7.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=virtual/jpeg media-libs/libpng app-arch/bzip2 virtual/opengl x11-libs/libX11 app-arch/unzip x11-proto/xproto x11-proto/xf86vidmodeproto
+DESCRIPTION=open source high performance realtime 3D engine written in C++
+EAPI=2
+HOMEPAGE=http://irrlicht.sourceforge.net/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=ZLIB
+RDEPEND=virtual/jpeg media-libs/libpng app-arch/bzip2 virtual/opengl x11-libs/libX11
+SLOT=0
+SRC_URI=mirror://sourceforge/irrlicht/irrlicht-1.7.3.zip
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=ce429d2922ef5f8e3887918d42acc317
diff --git a/metadata/md5-cache/dev-java/ant-nodeps-1.8.2 b/metadata/md5-cache/dev-java/ant-nodeps-1.8.2
index 687c1a6f5d5b..96509cd315a0 100644
--- a/metadata/md5-cache/dev-java/ant-nodeps-1.8.2
+++ b/metadata/md5-cache/dev-java/ant-nodeps-1.8.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=dev-java/java-config-2.1.9-r1 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 ~dev-java/ant-core-1.8.2 !dev-java/ant-tasks
+DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 ~dev-java/ant-core-1.8.2 !dev-java/ant-tasks
 DESCRIPTION=Formerly Ant's optional tasks w/o external deps, now compat empty jar
 EAPI=4
 HOMEPAGE=http://ant.apache.org/
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
 _eclasses_=ant-tasks	857f58838d57ada665b02e7afa435e21	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d252cf3023ffbc57c9784d2c92f9c1a8
+_md5_=c8456c64a2eedcb35ccbf9b493540d33
diff --git a/metadata/md5-cache/dev-java/jcharts-0.7.5-r2 b/metadata/md5-cache/dev-java/jcharts-0.7.5-r2
new file mode 100644
index 000000000000..2db22c1efa0b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jcharts-0.7.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/batik:1.7 java-virtuals/servlet-api:3.0 || ( virtual/jdk:1.6 virtual/jdk:1.5 virtual/jdk:1.4 ) app-arch/unzip >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=jCharts is a 100% Java based charting utility that outputs a variety of charts
+EAPI=4
+HOMEPAGE=http://jcharts.sourceforge.net/
+IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-java/batik:1.7 java-virtuals/servlet-api:3.0 || ( virtual/jre:1.6 virtual/jre:1.5 virtual/jre:1.4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/jcharts/jCharts-0.7.5.zip
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=683969ce58fc5b412ee4f681c3d599b7
diff --git a/metadata/md5-cache/dev-java/netbeans-java-7.0.1-r2 b/metadata/md5-cache/dev-java/netbeans-java-7.0.1-r2
new file mode 100644
index 000000000000..37aa908b1f8c
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-java-7.0.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-platform-7.0.1 ~dev-java/netbeans-harness-7.0.1 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-websvccommon-7.0.1 dev-java/appframework:0 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/swing-worker:0 dev-java/javahelp:0 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans Java Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/projects/java
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.0.1 ~dev-java/netbeans-harness-7.0.1 ~dev-java/netbeans-ide-7.0.1 ~dev-java/netbeans-websvccommon-7.0.1 dev-java/appframework:0 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/swing-worker:0 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/asm:2.2 dev-java/cglib:2.1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/ehcache:1.2 dev-java/fastinfoset:0 dev-java/javassist:3 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/jsr250:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 >=dev-java/maven-bin-3.0.3:3.0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
+SLOT=7.0
+SRC_URI=http://download.netbeans.org/netbeans/7.0.1/final/zip/netbeans-7.0.1-201107282000-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0-build.xml-r1.patch.bz2 http://hg.netbeans.org/binaries/FF23DBB427D09AAEC3998B50D740C42B6A3FCD61-ant-libs-1.8.2.zip http://hg.netbeans.org/binaries/A511890049A6A9B8D675F4417721337580CBD2F9-apache-maven-3.0.3-bin.zip http://hg.netbeans.org/binaries/B456600D274B835E1E7DDB16FD843DDAB2ED3EF1-appframework-1.0.3-doc.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/8C9BFFBCB34DB6E9C9C03413623F05375D44CE49-eclipselink-2.2.0.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-eclipselink-javax.persistence-2.0.jar http://hg.netbeans.org/binaries/263D76EEB2FA35AE240DE31CFDE83C04096AE19E-eclipselink-jpa-modelgen-2.2.0.jar http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip http://hg.netbeans.org/binaries/AF599F03E590A5992EE56F363DBD8F0F32B8787E-indexer-artifact-4.1.0.jar http://hg.netbeans.org/binaries/CAF99EFBB25E9183609D6FBA4F63D85E7606903F-indexer-core-4.1.0.jar http://hg.netbeans.org/binaries/ADD5DE96BF7F30DAA4EC41D70610CF72A16F58FD-javac-api-nb-7.0-b07.jar http://hg.netbeans.org/binaries/AA6FD013C506BAC98BCE1174EACAD00383650342-javac-impl-nb-7.0-b07.jar http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/2D0D28E05BD6B6452DAAFE2B5CCB69A84EA63E5D-spring-2.5.6.SEC01.jar http://hg.netbeans.org/binaries/D88A41174C5F85D1B791D6A8E0F8B8A1C459D6C0-spring-framework-3.0.2.RELEASE.zip
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=e8cae008b2c154cefe15358c1ce48fcd
diff --git a/metadata/md5-cache/dev-java/netbeans-java-7.1.2-r1 b/metadata/md5-cache/dev-java/netbeans-java-7.1.2-r1
new file mode 100644
index 000000000000..63f62dbbef8b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/netbeans-java-7.1.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup unpack
+DEPEND=virtual/jdk:1.6 app-arch/unzip ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/javahelp:0 dev-java/junit:4 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 dev-java/ant-nodeps >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Netbeans Java Cluster
+EAPI=4
+HOMEPAGE=http://netbeans.org/projects/java
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( CDDL GPL-2-with-linking-exception )
+RDEPEND=>=virtual/jdk-1.6 ~dev-java/netbeans-platform-7.1.2 ~dev-java/netbeans-harness-7.1.2 ~dev-java/netbeans-ide-7.1.2 ~dev-java/netbeans-websvccommon-7.1.2 dev-java/beansbinding:0 dev-java/cglib:2.2 dev-java/jdom:1.0 dev-java/absolutelayout:0 dev-java/antlr:0[java] dev-java/asm:2.2 dev-java/cglib:2.1 dev-java/commons-collections:0 dev-java/dom4j:1 dev-java/ehcache:1.2 dev-java/fastinfoset:0 dev-java/javassist:3 dev-java/jsr67:0 dev-java/jsr181:0 dev-java/jsr250:0 dev-java/glassfish-transaction-api:0 dev-java/jtidy:0 dev-java/saaj:0 dev-java/stax-ex:0 dev-java/xmlstreambuffer:0 >=dev-java/java-config-2.1.9-r1
+SLOT=7.1
+SRC_URI=http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2 http://hg.netbeans.org/binaries/1A78676E734C72549EE6D9F166BAFE22F7CBA8CD-ant-libs-1.8.3.zip http://hg.netbeans.org/binaries/29CFD351206016B67DD0D556098513D2B259C69B-apache-maven-3.0.4-bin.zip http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip http://hg.netbeans.org/binaries/BC0919190ADD3A7FB764C8412D10A2B026CD9563-eclipselink-2.3.0.jar http://hg.netbeans.org/binaries/7C60F22D32F56478AC25A732038E9DD7DFECF5DD-eclipselink-jpa-modelgen-2.3.0.jar http://hg.netbeans.org/binaries/59FAD2A4D4A1CFECED8149854EEEC3A7B9668927-glassfish-persistence-v2-build-58g.jar http://hg.netbeans.org/binaries/907363E301E2279930C82BEB466BF2053C6E993B-glassfish-persistence-v2ur1-build-09d.jar http://hg.netbeans.org/binaries/C8A5E0D558EA7E7349F9D32B838553D5E7DD214F-hibernate-3.2.5-lib.zip http://hg.netbeans.org/binaries/204680C59C7D8A4A1A26B9A2ED46D0DAA6DC10B3-indexer-artifact-4.1.2.jar http://hg.netbeans.org/binaries/EA1F2B2504FC5ABCB06146D858F74A97B85A2998-indexer-core-4.1.2.jar http://hg.netbeans.org/binaries/E90F4B2F8972AA5EF58139F16B78D5F6ACFC6EF9-javac-api-nb-7.0-b07.jar http://hg.netbeans.org/binaries/8BA05B53DB763AA62EFD389B2F1C8CFA889079EF-javac-impl-nb-7.0-b07.jar http://hg.netbeans.org/binaries/3BCA561B1B7B284B3D3C097F92A9CD47FF485058-javax.persistence-2.0.jar http://hg.netbeans.org/binaries/2F43A634A42CC4FD2EF9E24B488AFFD6984D3411-jaxws-2.2.zip http://hg.netbeans.org/binaries/23E69F0F17757673C573EBD9899727B82EF7DB7F-jaxws-2.2-api.zip http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip http://hg.netbeans.org/binaries/653A6AD1EF786BC577FC20F56E5F2B1D30423805-maven-dependency-tree-1.2.jar http://hg.netbeans.org/binaries/3D4C3416889FDC5C149D97382020F4AC6C736377-org.eclipse.persistence.jpa.jpql_1.0.0.jar http://hg.netbeans.org/binaries/CB686A65B6C4516A32173CB60385D02027440620-spring-2.5.6.SEC03.jar http://hg.netbeans.org/binaries/7622CB23DAEDD9DE0ACBD16C820D3A02F94572AF-spring-framework-3.0.6.RELEASE.zip
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-ant-2	c637c20d93ef0d49a5efcf5feaa776cd	java-pkg-2	6f723b44cff6b07377ca5c0848da887b	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=7da0b61da467418a34c9fd4dc1c501cb
diff --git a/metadata/md5-cache/dev-lang/ruby-1.9.3_p125 b/metadata/md5-cache/dev-lang/ruby-1.9.3_p125
index 08babbc5fccd..e0ac4d53690e 100644
--- a/metadata/md5-cache/dev-lang/ruby-1.9.3_p125
+++ b/metadata/md5-cache/dev-lang/ruby-1.9.3_p125
@@ -4,11 +4,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=2
 HOMEPAGE=http://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=|| ( Ruby BSD-2 )
 PDEPEND=rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=1.9
 SRC_URI=mirror://ruby/1.9/ruby-1.9.3-p125.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p125.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=98eb60426d398606a12cc8eedd11eba0
+_md5_=edfaeae362babf0cfce1c6c5030d686e
diff --git a/metadata/md5-cache/dev-libs/argtable-2.12 b/metadata/md5-cache/dev-libs/argtable-2.12
deleted file mode 100644
index 20e6c7f8b8ed..000000000000
--- a/metadata/md5-cache/dev-libs/argtable-2.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=An ANSI C library for parsing GNU-style command-line options with minimal fuss
-HOMEPAGE=http://argtable.sourceforge.net/
-IUSE=doc debug examples
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/argtable/argtable2-12.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e0e4aa3df52e29c3fbcdbd18096d637b
diff --git a/metadata/md5-cache/dev-libs/gjs-1.32.0 b/metadata/md5-cache/dev-libs/gjs-1.32.0
index e9274b7fb3c7..15aac006fb49 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.32.0
+++ b/metadata/md5-cache/dev-libs/gjs-1.32.0
@@ -4,10 +4,10 @@ DESCRIPTION=Javascript bindings for GNOME
 EAPI=4
 HOMEPAGE=http://live.gnome.org/Gjs
 IUSE=examples test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~alpha ~amd64 ~x86
 LICENSE=MIT MPL-1.1 LGPL-2 GPL-2
 RDEPEND=>=dev-libs/glib-2.31:2 >=dev-libs/gobject-introspection-1.31.22 dev-libs/dbus-glib sys-libs/readline x11-libs/cairo >=dev-lang/spidermonkey-1.8.5 =dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.32/gjs-1.32.0.tar.xz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=4aec0d782c3a4e2f23be2540da098fd7
+_md5_=bf1f9b059d1854bc9e5fefb803cbda86
diff --git a/metadata/md5-cache/dev-libs/libevent-2.0.18 b/metadata/md5-cache/dev-libs/libevent-2.0.18
index f7e3abfc9cc6..9d50f67598e7 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.0.18
+++ b/metadata/md5-cache/dev-libs/libevent-2.0.18
@@ -4,10 +4,10 @@ DESCRIPTION=A library to execute a function when a specific event occurs on a fi
 EAPI=2
 HOMEPAGE=http://monkey.org/~provos/libevent/
 IUSE=+ssl static-libs test
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl ) !<=dev-libs/9libs-1.0
 SLOT=0
 SRC_URI=mirror://sourceforge/levent/files/libevent-2.0.18-stable.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e67537872e0dd721f9a6f02981e752b9
+_md5_=840ec17d25900142b8990f3fcd46a12e
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.8.0-r1 b/metadata/md5-cache/dev-libs/libxml2-2.8.0-r1
index 384e91b3e51b..cd1f30b44eea 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.8.0-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.8.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=4
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug doc examples icu ipv6 lzma python readline static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=sys-libs/zlib icu? ( dev-libs/icu ) lzma? ( app-arch/xz-utils ) readline? ( sys-libs/readline ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz )
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	prefix	21058c21ca48453d771df15500873ede	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7170458b34c9df9965b853c439555705
+_md5_=4c0c5eb91bc025c625bf39fdf31bd341
diff --git a/metadata/md5-cache/dev-libs/libyaml-0.1.4 b/metadata/md5-cache/dev-libs/libyaml-0.1.4
index 4086713783b9..309cef7e54c9 100644
--- a/metadata/md5-cache/dev-libs/libyaml-0.1.4
+++ b/metadata/md5-cache/dev-libs/libyaml-0.1.4
@@ -3,9 +3,9 @@ DESCRIPTION=YAML 1.1 parser and emitter written in C
 EAPI=4
 HOMEPAGE=http://pyyaml.org/wiki/LibYAML
 IUSE=doc examples test static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=93882a4696a9eeee643e935a3590eded
+_md5_=9fbe655e46c94432869f39e64b22a3e0
diff --git a/metadata/md5-cache/dev-python/mock-0.8.0 b/metadata/md5-cache/dev-python/mock-0.8.0
index 8fa05d322e4a..f9b6c59b7981 100644
--- a/metadata/md5-cache/dev-python/mock-0.8.0
+++ b/metadata/md5-cache/dev-python/mock-0.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=A Python Mocking and Patching Library for Testing
 EAPI=3
 HOMEPAGE=http://www.voidspace.org.uk/python/mock/ http://pypi.python.org/pypi/mock
 IUSE=doc test test
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=mirror://pypi/m/mock/mock-0.8.0.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=a89f36be6ffeb6c6c391e440cc725282
+_md5_=cc48b5e7f967f2392f2fd693c8385bd2
diff --git a/metadata/md5-cache/dev-python/munkres-1.0.5.4 b/metadata/md5-cache/dev-python/munkres-1.0.5.4
new file mode 100644
index 000000000000..1550d2833490
--- /dev/null
+++ b/metadata/md5-cache/dev-python/munkres-1.0.5.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=dev-lang/python
+DESCRIPTION=Module implementing munkres algorithm for the Assignment Problem
+EAPI=4
+HOMEPAGE=http://pypi.python.org/pypi/munkres/
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-lang/python
+SLOT=0
+SRC_URI=mirror://pypi/m/munkres/munkres-1.0.5.4.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=3a3858f08b7c7ae5898f351568ee0378
diff --git a/metadata/md5-cache/dev-python/py-1.4.7 b/metadata/md5-cache/dev-python/py-1.4.7
index d51de1b38f6b..631d23c9e6db 100644
--- a/metadata/md5-cache/dev-python/py-1.4.7
+++ b/metadata/md5-cache/dev-python/py-1.4.7
@@ -4,10 +4,10 @@ DESCRIPTION=library with cross-python path, ini-parsing, io, code, log facilitie
 EAPI=3
 HOMEPAGE=http://pylib.org/ http://pypi.python.org/pypi/py
 IUSE=test
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.4.7.zip
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=f57081fc7f19d4936135e97d088b132e
+_md5_=abb1ef6223dfc0007d2d582eb1e8929e
diff --git a/metadata/md5-cache/dev-python/pycrypto-2.6 b/metadata/md5-cache/dev-python/pycrypto-2.6
index 351cd55e4bf0..6bc997169505 100644
--- a/metadata/md5-cache/dev-python/pycrypto-2.6
+++ b/metadata/md5-cache/dev-python/pycrypto-2.6
@@ -4,10 +4,10 @@ DESCRIPTION=Python Cryptography Toolkit
 EAPI=4
 HOMEPAGE=http://www.dlitz.net/software/pycrypto/ http://pypi.python.org/pypi/pycrypto
 IUSE=doc +gmp
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=PSF-2 public-domain
 RDEPEND=gmp? ( dev-libs/gmp ) =dev-lang/python-2*
 SLOT=0
 SRC_URI=http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=8db8f19104f3d0df5a25e77167125f01
+_md5_=1fc5833f881a33674ea17b070d716e13
diff --git a/metadata/md5-cache/dev-python/pyparsing-1.5.6 b/metadata/md5-cache/dev-python/pyparsing-1.5.6
index 049718404e96..e0e89a4801b5 100644
--- a/metadata/md5-cache/dev-python/pyparsing-1.5.6
+++ b/metadata/md5-cache/dev-python/pyparsing-1.5.6
@@ -4,10 +4,10 @@ DESCRIPTION=pyparsing is an easy-to-use Python module for text parsing
 EAPI=3
 HOMEPAGE=http://pyparsing.wikispaces.com/ http://pypi.python.org/pypi/pyparsing
 IUSE=doc examples
-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
 LICENSE=MIT
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=mirror://sourceforge/pyparsing/pyparsing-1.5.6.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ed4e43e75bcebfe6394307faade99fda
+_md5_=604103323d68b57b57ad063ba9c892e4
diff --git a/metadata/md5-cache/dev-python/scrapy-0.14.4 b/metadata/md5-cache/dev-python/scrapy-0.14.4
new file mode 100644
index 000000000000..b46af30213d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scrapy-0.14.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup test
+DEPEND=dev-python/setuptools doc? ( dev-python/sphinx ) test? ( dev-python/django net-ftp/vsftpd ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+DESCRIPTION=A high-level Python Screen Scraping framework
+EAPI=4
+HOMEPAGE=http://scrapy.org http://pypi.python.org/pypi/Scrapy/
+IUSE=boto doc examples ibl test ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/libxml2[python] boto? ( dev-python/boto ) dev-python/imaging dev-python/lxml ibl? ( dev-python/numpy ) ssl? ( dev-python/pyopenssl ) dev-python/setuptools dev-python/simplejson dev-python/twisted dev-python/twisted-conch dev-python/twisted-mail dev-python/twisted-web >=dev-python/w3lib-1.1 =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+SLOT=0
+SRC_URI=mirror://pypi/S/Scrapy/Scrapy-0.14.4.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=25b50d5f687bf6bf9645ac6a3a91951d
diff --git a/metadata/md5-cache/dev-python/simplejson-2.5.0 b/metadata/md5-cache/dev-python/simplejson-2.5.0
index d6937c02e481..89f6d1b121d1 100644
--- a/metadata/md5-cache/dev-python/simplejson-2.5.0
+++ b/metadata/md5-cache/dev-python/simplejson-2.5.0
@@ -3,10 +3,10 @@ DEPEND==dev-lang/python-2*
 DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
 EAPI=3
 HOMEPAGE=http://undefined.org/python/#simplejson http://pypi.python.org/pypi/simplejson
-KEYWORDS=amd64 ~arm ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND==dev-lang/python-2*
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-2.5.0.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=909a74c783978e3797c8f1728dc1e96c
+_md5_=70c0bc1a99e3539ca337c3d4faa0bd03
diff --git a/metadata/md5-cache/dev-python/unidecode-0.04.9 b/metadata/md5-cache/dev-python/unidecode-0.04.9
new file mode 100644
index 000000000000..b779a4197c46
--- /dev/null
+++ b/metadata/md5-cache/dev-python/unidecode-0.04.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=dev-lang/python
+DESCRIPTION=Module providing ASCII transliterations of Unicode text
+EAPI=4
+HOMEPAGE=http://pypi.python.org/pypi/Unidecode
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-lang/python
+SLOT=0
+SRC_URI=mirror://pypi/U/Unidecode/Unidecode-0.04.9.tar.gz
+_eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
+_md5_=97a27bfe9e336efa6ed5c9cc2354fe5e
diff --git a/metadata/md5-cache/dev-ruby/builder-2.1.2-r1 b/metadata/md5-cache/dev-ruby/builder-2.1.2-r1
index 0b4a1d0262d1..f8f77bc7ef2f 100644
--- a/metadata/md5-cache/dev-ruby/builder-2.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/builder-2.1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A builder to facilitate programatic generation of XML markup
 EAPI=2
 HOMEPAGE=http://rubyforge.org/projects/builder/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_jruby doc doc test test
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 SLOT=0
 SRC_URI=mirror://rubyforge/builder/builder-2.1.2.tgz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9b0f9d16b43c0b4be2cec03a97504df9
+_md5_=cfab092891a2b17fa1bcbb018775df59
diff --git a/metadata/md5-cache/dev-ruby/hoe-2.12.5 b/metadata/md5-cache/dev-ruby/hoe-2.12.5
index 651187b43bb1..bc8af29be382 100644
--- a/metadata/md5-cache/dev-ruby/hoe-2.12.5
+++ b/metadata/md5-cache/dev-ruby/hoe-2.12.5
@@ -4,10 +4,10 @@ DESCRIPTION=Hoe extends rake to provide full project automation.
 EAPI=2
 HOMEPAGE=http://seattlerb.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/rake-0.8.7[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/rake-0.8.7[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 SLOT=0
 SRC_URI=mirror://rubygems/hoe-2.12.5.gem
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=049567a0aba5c0cd64312d2ceceef356
+_md5_=15eee9fb9e8d5642760b19832f4e2d16
diff --git a/metadata/md5-cache/dev-ruby/json-1.5.4-r1 b/metadata/md5-cache/dev-ruby/json-1.5.4-r1
index 1aa32f97b7c3..a87b63c8641e 100644
--- a/metadata/md5-cache/dev-ruby/json-1.5.4-r1
+++ b/metadata/md5-cache/dev-ruby/json-1.5.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A JSON implementation as a Ruby extension.
 EAPI=2
 HOMEPAGE=http://json.rubyforge.org/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_jruby ruby_targets_ruby19 doc doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby GPL-2 )
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 SLOT=0
 SRC_URI=mirror://rubygems/json-1.5.4.gem
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=30d258695339135e549c03c4b92df707
+_md5_=d5c101999e684ec3bfdc5bf0112197d0
diff --git a/metadata/md5-cache/dev-ruby/minitest-2.8.1 b/metadata/md5-cache/dev-ruby/minitest-2.8.1
index 984b5348b75f..52203ad02dca 100644
--- a/metadata/md5-cache/dev-ruby/minitest-2.8.1
+++ b/metadata/md5-cache/dev-ruby/minitest-2.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and sl
 EAPI=2
 HOMEPAGE=http://rubyforge.org/projects/bfts
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 SLOT=0
 SRC_URI=mirror://rubygems/minitest-2.8.1.gem
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f3d21b74e36418a0307881614c0643e3
+_md5_=d5ae88dd12681c2cf3301ee76cd61c83
diff --git a/metadata/md5-cache/dev-ruby/racc-1.4.6-r1 b/metadata/md5-cache/dev-ruby/racc-1.4.6-r1
index 0e93b38353ee..897df5567708 100644
--- a/metadata/md5-cache/dev-ruby/racc-1.4.6-r1
+++ b/metadata/md5-cache/dev-ruby/racc-1.4.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A LALR(1) parser generator for Ruby
 EAPI=2
 HOMEPAGE=http://www.loveruby.net/en/racc.html
 IUSE=elibc_FreeBSD ruby_targets_ree18 ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 SLOT=0
 SRC_URI=mirror://rubygems/racc-1.4.6.gem
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c0b245f6f0ad40f95e708008d25c92cc
+_md5_=67b3fed56427c5e37f33f8de83e32f65
diff --git a/metadata/md5-cache/dev-ruby/rake-0.8.7-r6 b/metadata/md5-cache/dev-ruby/rake-0.8.7-r6
index bb19669751a0..2db920f23933 100644
--- a/metadata/md5-cache/dev-ruby/rake-0.8.7-r6
+++ b/metadata/md5-cache/dev-ruby/rake-0.8.7-r6
@@ -4,7 +4,7 @@ DESCRIPTION=Make-like scripting in Ruby
 EAPI=2
 HOMEPAGE=http://rake.rubyforge.org/
 IUSE=bash-completion doc bash-completion elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 PDEPEND=bash-completion? ( app-shells/bash-completion )
 RDEPEND=bash-completion? ( app-admin/eselect ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubyforge/rake/rake-0.8.7.tgz
 _eclasses_=bash-completion	003731da0df19d26955927bd534f3058	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c092940265a2ef7f091cb7288dec08b3
+_md5_=2b2cf2b68c15ddc8d9bc40a46497a5c5
diff --git a/metadata/md5-cache/dev-ruby/rdoc-3.12 b/metadata/md5-cache/dev-ruby/rdoc-3.12
index 806f0071bb5b..f0c62d85ab7c 100644
--- a/metadata/md5-cache/dev-ruby/rdoc-3.12
+++ b/metadata/md5-cache/dev-ruby/rdoc-3.12
@@ -4,10 +4,10 @@ DESCRIPTION=An extended version of the RDoc library from Ruby 1.8
 EAPI=3
 HOMEPAGE=https://github.com/rdoc/rdoc/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~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 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby MIT
 RDEPEND=ruby_targets_ruby18? ( =dev-ruby/json-1*[ruby_targets_ruby18] >=dev-ruby/json-1.4[ruby_targets_ruby18] ) ruby_targets_ree18? ( =dev-ruby/json-1*[ruby_targets_ree18] >=dev-ruby/json-1.4[ruby_targets_ree18] ) ruby_targets_ruby19? ( =dev-ruby/json-1*[ruby_targets_ruby19] >=dev-ruby/json-1.4[ruby_targets_ruby19] ) ruby_targets_jruby? ( =dev-ruby/json-1*[ruby_targets_jruby] >=dev-ruby/json-1.4[ruby_targets_jruby] ) ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.2:1.9 ) ruby_targets_ruby18? ( >=dev-lang/ruby-1.8.7:1.8 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 SLOT=0
 SRC_URI=mirror://rubygems/rdoc-3.12.gem
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b1ea1cbae4f37ed512061f658ca88d90
+_md5_=5498c55dcd5ebf1f8742df8e6f201aba
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-2.2.0 b/metadata/md5-cache/dev-ruby/ruby-gettext-2.2.0
new file mode 100644
index 000000000000..b59c93d5ad18
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-2.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/locale-2.0.5[ruby_targets_jruby] ) ruby_targets_ree18? ( >=dev-ruby/locale-2.0.5[ruby_targets_ree18] ) ) sys-devel/gettext ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/yard[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( || ( virtual/ruby-test-unit[ruby_targets_ruby18] dev-ruby/test-unit:2[ruby_targets_ruby18] ) ) ) ruby_targets_ruby19? ( test? ( || ( virtual/ruby-test-unit[ruby_targets_ruby19] dev-ruby/test-unit:2[ruby_targets_ruby19] ) ) ) ruby_targets_jruby? ( test? ( || ( virtual/ruby-test-unit[ruby_targets_jruby] dev-ruby/test-unit:2[ruby_targets_jruby] ) ) ) ruby_targets_ree18? ( test? ( || ( virtual/ruby-test-unit[ruby_targets_ree18] dev-ruby/test-unit:2[ruby_targets_ree18] ) ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package
+EAPI=4
+HOMEPAGE=http://www.yotabanana.com/hiki/ruby-gettext.html
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 doc doc test test
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/locale-2.0.5[ruby_targets_jruby] ) ruby_targets_ree18? ( >=dev-ruby/locale-2.0.5[ruby_targets_ree18] ) sys-devel/gettext ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18 )
+SLOT=0
+SRC_URI=mirror://rubygems/gettext-2.2.0.gem
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=d39b9fc5e2788f2f2bd7ee43c8072836
diff --git a/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r2 b/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r2
index 068fd8b6e0ee..f776ad6c8c32 100644
--- a/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r2
+++ b/metadata/md5-cache/dev-ruby/rubyforge-2.0.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Simplistic script which automates a limited set of rubyforge operati
 EAPI=2
 HOMEPAGE=http://codeforpeople.rubyforge.org/rubyforge/
 IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/json-1.1.7[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/json-1.1.7[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/json-1.1.7[ruby_targets_ruby19] ) ruby_targets_jruby? ( >=dev-ruby/json-1.1.7[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 SLOT=0
 SRC_URI=mirror://rubygems/rubyforge-2.0.4.gem
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-fakegem	6732f927427c6069df6c4f22271f2c75	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cadb67fa79b182c45df04216f364f6bb
+_md5_=b2504e5a7a6de80c95f8bce4c7b2320f
diff --git a/metadata/md5-cache/dev-ruby/rubygems-1.8.24 b/metadata/md5-cache/dev-ruby/rubygems-1.8.24
index b41ba0063850..41053458a333 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-1.8.24
+++ b/metadata/md5-cache/dev-ruby/rubygems-1.8.24
@@ -4,7 +4,7 @@ DESCRIPTION=Centralized Ruby extension management system
 EAPI=4
 HOMEPAGE=http://rubyforge.org/projects/rubygems/
 IUSE=server test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby MIT )
 PDEPEND=server? ( dev-ruby/builder[ruby_targets_ruby18] )
 RDEPEND=ruby_targets_jruby? ( >=dev-java/jruby-1.5.6-r1 ) ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.3_rc1 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby )
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 rub
 SLOT=0
 SRC_URI=mirror://rubyforge/rubygems/rubygems-1.8.24.tgz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	prefix	21058c21ca48453d771df15500873ede	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e2c59854838d6c5ee95c467577089f42
+_md5_=be7f33c2c7052d9e06309af31e77f9eb
diff --git a/metadata/md5-cache/dev-util/dialog-1.1.20120215 b/metadata/md5-cache/dev-util/dialog-1.1.20120215
index 9ae88e6616d7..63f65b20f198 100644
--- a/metadata/md5-cache/dev-util/dialog-1.1.20120215
+++ b/metadata/md5-cache/dev-util/dialog-1.1.20120215
@@ -4,10 +4,10 @@ DESCRIPTION=tool to display dialog boxes from a shell
 EAPI=4
 HOMEPAGE=http://invisible-island.net/dialog/dialog.html
 IUSE=examples minimal nls static-libs unicode
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=app-shells/bash-2.04-r3 !unicode? ( >=sys-libs/ncurses-5.2-r5 ) unicode? ( >=sys-libs/ncurses-5.2-r5[unicode] )
 SLOT=0
 SRC_URI=ftp://invisible-island.net/dialog/dialog-1.1-20120215.tgz
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=e0c6685036c13abc4ae2ec8d78fe1144
+_md5_=283b11a6c3b89196c5036e9f63db4586
diff --git a/metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1 b/metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1
index 30e63c9b0ccd..47b5b502121d 100644
--- a/metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1
+++ b/metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl virtual/perl-Getopt-Long app-arch/xz-utils
 DESCRIPTION=Helps prevent .la files from relinking to libraries outside a build tree
 EAPI=4
 HOMEPAGE=http://dev.gentoo.org/~tetromino/distfiles/fix-la-relink-command
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~tetromino/distfiles/fix-la-relink-command/fix-la-relink-command-0.1.1.tar.xz
-_md5_=697ce87a4c03242ab4ba1f9e57a32da9
+_md5_=79a8f34bd9e8e9a6633802be995930b1
diff --git a/metadata/md5-cache/dev-util/ragel-6.7-r1 b/metadata/md5-cache/dev-util/ragel-6.7-r1
index a1f40bbdcfaf..ad01b66b46f2 100644
--- a/metadata/md5-cache/dev-util/ragel-6.7-r1
+++ b/metadata/md5-cache/dev-util/ragel-6.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Compiles finite state machines from regular languages into executabl
 EAPI=4
 HOMEPAGE=http://www.complang.org/ragel/
 IUSE=vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.complang.org/ragel/ragel-6.7.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ab1aa167233b77c0d1033e82fb289aff
+_md5_=6d00567e28e9e449c7c8a9179cb602db
diff --git a/metadata/md5-cache/games-engines/stratagus-2.2.6 b/metadata/md5-cache/games-engines/stratagus-2.2.6
new file mode 100644
index 000000000000..3dec4348d0ce
--- /dev/null
+++ b/metadata/md5-cache/games-engines/stratagus-2.2.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=x11-libs/libX11 virtual/opengl dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) theora? ( media-libs/libtheora media-libs/libvorbis ) vorbis? ( media-libs/libvorbis ) doc? ( app-doc/doxygen ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A realtime strategy game engine
+EAPI=2
+HOMEPAGE=http://stratagus.sourceforge.net/
+IUSE=bzip2 debug doc mikmod mng theora vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 virtual/opengl dev-db/sqlite:3 >=dev-lang/lua-5 dev-lua/toluapp media-libs/libpng:0 media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) theora? ( media-libs/libtheora media-libs/libvorbis ) vorbis? ( media-libs/libvorbis )
+SLOT=0
+SRC_URI=http://launchpad.net/stratagus/trunk/2.2.6/+download/stratagus_2.2.6.orig.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	games	f75cdbfdf1760e514ca65e2f6c6a7c72	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=d9626805e44e5369daaa1cd2e4040bfd
diff --git a/metadata/md5-cache/games-mud/tf-50_beta8-r1 b/metadata/md5-cache/games-mud/tf-50_beta8-r1
index 3aff445838ae..3505d64a7525 100644
--- a/metadata/md5-cache/games-mud/tf-50_beta8-r1
+++ b/metadata/md5-cache/games-mud/tf-50_beta8-r1
@@ -10,4 +10,4 @@ RDEPEND=ssl? ( dev-libs/openssl ) dev-libs/libpcre
 SLOT=0
 SRC_URI=mirror://sourceforge/tinyfugue/tf-50b8.tar.gz http://homepage.mac.com/mikeride/abelinc/scripts/allrootpatch.txt -> tf-allrootpatch.txt http://homepage.mac.com/mikeride/abelinc/scripts/allsrcpatch.txt -> tf-allsrcpatch.txt doc? ( mirror://sourceforge/tinyfugue/tf-50b8-help.tar.gz )
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	games	f75cdbfdf1760e514ca65e2f6c6a7c72	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ba352f34bd64cda6877b573fb19ce3f2
+_md5_=e6f119a477dd86c5fafc8e32af902d01
diff --git a/metadata/md5-cache/games-strategy/uqm-0.7.0-r1 b/metadata/md5-cache/games-strategy/uqm-0.7.0-r1
new file mode 100644
index 000000000000..1ec9db3e46eb
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/uqm-0.7.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libvorbis virtual/jpeg >=media-libs/libpng-1.4 media-libs/libsdl media-libs/sdl-image media-libs/libogg media-libs/libvorbis media-libs/libmikmod app-arch/unzip
+DESCRIPTION=The Ur-Quan Masters: Port of Star Control 2
+EAPI=2
+HOMEPAGE=http://sc2.sourceforge.net/
+IUSE=music opengl remix voice
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libvorbis virtual/jpeg >=media-libs/libpng-1.4 media-libs/libsdl media-libs/sdl-image media-libs/libogg media-libs/libvorbis media-libs/libmikmod
+SLOT=0
+SRC_URI=mirror://sourceforge/sc2/uqm-0.7.0-source.tgz mirror://sourceforge/sc2/uqm-0.7.0-content.uqm music? ( mirror://sourceforge/sc2/uqm-0.7.0-3domusic.uqm ) voice? ( mirror://sourceforge/sc2/uqm-0.7.0-voice.uqm ) remix? ( mirror://sourceforge/sc2/uqm-remix-pack1.zip mirror://sourceforge/sc2/uqm-remix-pack2.zip mirror://sourceforge/sc2/uqm-remix-pack3.zip )
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	games	f75cdbfdf1760e514ca65e2f6c6a7c72	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=6ab1e017ea2316cf24f38eafd9976ddb
diff --git a/metadata/md5-cache/games-strategy/wargus-2.2.6 b/metadata/md5-cache/games-strategy/wargus-2.2.6
new file mode 100644
index 000000000000..10c9cb10169c
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/wargus-2.2.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND==games-engines/stratagus-2.2.6*[theora] media-libs/freetype media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2 media-sound/timidity++ media-video/ffmpeg2theora virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
+DESCRIPTION=Warcraft II for the Stratagus game engine (Needs WC2 DOS CD)
+EAPI=2
+HOMEPAGE=http://wargus.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PROPERTIES=interactive
+RDEPEND==games-engines/stratagus-2.2.6*[theora] media-libs/freetype media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://launchpad.net/wargus/trunk/2.2.6/+download/wargus_2.2.6.orig.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cdrom	415b847346ef9001a89e5c7da6711215	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	games	f75cdbfdf1760e514ca65e2f6c6a7c72	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=5e9dac37b36f2150e962f5c78c0a779c
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-3.2.3 b/metadata/md5-cache/gnome-base/gnome-control-center-3.2.3
index 41ebb92c3594..e943ea5bee59 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-3.2.3
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-3.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME Desktop Configuration Tool
 EAPI=4
 HOMEPAGE=http://www.gnome.org/
 IUSE=+cheese +colord +cups +gnome-online-accounts +networkmanager +socialweb debug
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
 RDEPEND=>=dev-libs/glib-2.29.14:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.1.19:3 >=gnome-base/gsettings-desktop-schemas-3.0.2 >=gnome-base/gconf-2.0:2 >=dev-libs/dbus-glib-0.73 >=gnome-base/gnome-desktop-3.1.0:3 >=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-0.9.16[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.9.1 >=x11-libs/libnotify-0.7.3 x11-apps/xmodmap x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libxklavier-5.1 >=x11-libs/libXi-1.2 cheese? ( media-libs/gstreamer:0.10 >=media-video/cheese-2.91.91.1 ) colord? ( >=x11-misc/colord-0.1.8 ) cups? ( >=net-print/cups-1.4[dbus] ) gnome-online-accounts? ( net-libs/gnome-online-accounts ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90 >=net-misc/networkmanager-0.8.997 ) socialweb? ( net-libs/libsocialweb ) app-admin/apg sys-apps/accountsservice x11-themes/gnome-icon-theme-symbolic cups? ( net-print/cups-pk-helper ) !<gnome-base/gdm-2.91.94 !<gnome-extra/gnome-color-manager-3.1.2 !gnome-extra/gnome-media[pulseaudio] !<gnome-extra/gnome-media-2.32.0-r300
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.2/gnome-control-center-3.2.3.tar.xz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=483c440f6a93e276e7ea112bbee07f0b
+_md5_=3cb62870e1ff0e913b4e1e8f96d07759
diff --git a/metadata/md5-cache/gnome-base/gnome-js-common-0.1.2 b/metadata/md5-cache/gnome-base/gnome-js-common-0.1.2
index fe7927ff3fd4..9f8e11b40893 100644
--- a/metadata/md5-cache/gnome-base/gnome-js-common-0.1.2
+++ b/metadata/md5-cache/gnome-base/gnome-js-common-0.1.2
@@ -3,9 +3,9 @@ DEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/intltool-0.35 >=sys-apps/s
 DESCRIPTION=GNOME JavaScript common modules and tests
 EAPI=3
 HOMEPAGE=http://gnome.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~alpha ~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-js-common/0.1/gnome-js-common-0.1.2.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a3ac73a98c3a35218c2bd5cb2a403a57
+_md5_=d80c6bd0092a134302574b1782bbec6b
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.2.3 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.2.3
index 40e108c91c89..1f4d59450c17 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.2.3
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-3.2.3
@@ -4,10 +4,10 @@ DESCRIPTION=Gnome Settings Daemon
 EAPI=4
 HOMEPAGE=http://www.gnome.org
 IUSE=+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard +udev test
-KEYWORDS=~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3.1.10:3 >=gnome-base/gconf-2.6.1:2 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/gnome-desktop-3.2.0-r1:3 >=gnome-base/gsettings-desktop-schemas-0.1.7.1 media-fonts/cantarell media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-0.9.16 >=sys-power/upower-0.9.11 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3 x11-libs/libX11 x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXxf86misc >=x11-libs/libxklavier-5.0 >=media-sound/pulseaudio-0.9.16 colord? ( >=x11-misc/colord-0.1.13 ) cups? ( >=net-print/cups-1.4[dbus] ) packagekit? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) >=app-admin/packagekit-base-0.6.12 ) policykit? ( >=sys-auth/polkit-0.97 >=sys-apps/dbus-1.1.2[X] ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) gnome-base/dconf >=x11-themes/gnome-themes-standard-2.91 >=x11-themes/gnome-icon-theme-2.91 >=x11-themes/gnome-icon-theme-symbolic-2.91 !<gnome-base/gnome-control-center-2.22 !<gnome-extra/gnome-color-manager-3.1.1 !<gnome-extra/gnome-power-manager-3.1.3
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.2/gnome-settings-daemon-3.2.3.tar.xz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=63a4f7e2ae393ed9eceb811392f499a5
+_md5_=7cea03d56bcd784d4b889d2623beba7c
diff --git a/metadata/md5-cache/media-fonts/cm-unicode-0.7.0 b/metadata/md5-cache/media-fonts/cm-unicode-0.7.0
index 20429eab29ed..8c270e21092e 100644
--- a/metadata/md5-cache/media-fonts/cm-unicode-0.7.0
+++ b/metadata/md5-cache/media-fonts/cm-unicode-0.7.0
@@ -4,9 +4,9 @@ DESCRIPTION=Computer Modern Unicode fonts
 EAPI=3
 HOMEPAGE=http://cm-unicode.sourceforge.net/
 IUSE=X
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=OFL
 SLOT=0
 SRC_URI=mirror://sourceforge/cm-unicode/0.7.0/cm-unicode-0.7.0-ttf.tar.xz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c61d0ecf9943cfd141ab4bd0c2e9c5b7
+_md5_=dff7a90f9ddd2a6896967aecc697cdab
diff --git a/metadata/md5-cache/media-fonts/droid-112_p1 b/metadata/md5-cache/media-fonts/droid-113-r2
similarity index 51%
rename from metadata/md5-cache/media-fonts/droid-112_p1
rename to metadata/md5-cache/media-fonts/droid-113-r2
index 486ad4231431..b64e7cbc6cd8 100644
--- a/metadata/md5-cache/media-fonts/droid-112_p1
+++ b/metadata/md5-cache/media-fonts/droid-113-r2
@@ -1,11 +1,12 @@
-DEFINED_PHASES=install postinst postrm setup
+DEFINED_PHASES=install postinst postrm prepare setup
 DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
 DESCRIPTION=Font family from Google's Android project
-HOMEPAGE=http://code.google.com/android/RELEASENOTES.html
+EAPI=4
+HOMEPAGE=http://code.google.com/android/RELEASENOTES.html http://www.cosmix.org/software/
 IUSE=X
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
-SRC_URI=mirror://gentoo/droid-112_p1.tar.gz
+SRC_URI=mirror://gentoo/droid-113-r1.tar.bz2 mirror://gentoo/DroidSansMonoSlashed-112_p1.ttf.bz2 mirror://gentoo/DroidSansMonoDotted-112_p1.ttf.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=ba239225478ef5ff5a54dac4ed1b1586
+_md5_=af0fe58835ef35feccc230632598becd
diff --git a/metadata/md5-cache/media-fonts/mgopen-1.0 b/metadata/md5-cache/media-fonts/mgopen-1.0
deleted file mode 100644
index b02ca26529c8..000000000000
--- a/metadata/md5-cache/media-fonts/mgopen-1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-DESCRIPTION=Magenta MgOpen Typeface Collection for Modern Greek.
-HOMEPAGE=http://www.zvr.gr/typo/mgopen/index
-IUSE=X
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=MagentaMgOpen
-SLOT=0
-SRC_URI=mirror://gentoo/MgOpen-20080519.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=890275426270694201e9a2c8100621e1
diff --git a/metadata/md5-cache/media-fonts/mgopen-1.1 b/metadata/md5-cache/media-fonts/mgopen-1.1
index 651e74df2b73..498032d39ab2 100644
--- a/metadata/md5-cache/media-fonts/mgopen-1.1
+++ b/metadata/md5-cache/media-fonts/mgopen-1.1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-DESCRIPTION=Magenta MgOpen Typeface Collection for Modern Greek.
-HOMEPAGE=http://www.zvr.gr/typo/mgopen/index
+DESCRIPTION=Magenta MgOpen typeface collection for Modern Greek
+HOMEPAGE=http://www.ellak.gr/pub/fonts/mgopen/index.en.html
 IUSE=X
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=MagentaMgOpen
 SLOT=0
 SRC_URI=mirror://gentoo/mgopen-1.1.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d34e3f6e6bc08d44ca73819bd7ffa7e3
+_md5_=036f8ec07940ed58865ddb1c1a34a838
diff --git a/metadata/md5-cache/media-fonts/sil-abyssinica-1.200 b/metadata/md5-cache/media-fonts/sil-abyssinica-1.200
index 1bd38cdd44a4..69b650c24ba1 100644
--- a/metadata/md5-cache/media-fonts/sil-abyssinica-1.200
+++ b/metadata/md5-cache/media-fonts/sil-abyssinica-1.200
@@ -4,9 +4,9 @@ DESCRIPTION=SIL Opentype Unicode fonts for Ethiopic languages
 EAPI=4
 HOMEPAGE=http://scripts.sil.org/AbyssinicaSIL
 IUSE=doc X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=mirror://gentoo/AbyssinicaSIL1.200.zip
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=e9b20a3837f00a99bb3cc7d94868942e
+_md5_=a014ae07feae1d0b5654bab8a5965ec1
diff --git a/metadata/md5-cache/media-fonts/sil-arabicfonts-1.0 b/metadata/md5-cache/media-fonts/sil-arabicfonts-1.0
deleted file mode 100644
index d60f9e023dc7..000000000000
--- a/metadata/md5-cache/media-fonts/sil-arabicfonts-1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-DESCRIPTION=SIL Opentype Unicode fonts for Arabic Languages
-HOMEPAGE=http://scripts.sil.org/ArabicFonts
-IUSE=X
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=SIL-freeware
-SLOT=0
-SRC_URI=mirror://gentoo/ttf-sil-arabicfonts-1.0.tgz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=63c0e4338ec3d8adaa3e0fa4a928a625
diff --git a/metadata/md5-cache/media-fonts/sil-arabicfonts-1.005 b/metadata/md5-cache/media-fonts/sil-arabicfonts-1.005
index c1aaf21fb6b4..f31e3547d922 100644
--- a/metadata/md5-cache/media-fonts/sil-arabicfonts-1.005
+++ b/metadata/md5-cache/media-fonts/sil-arabicfonts-1.005
@@ -4,9 +4,9 @@ DESCRIPTION=SIL Opentype Unicode fonts for Arabic Languages
 EAPI=4
 HOMEPAGE=http://scripts.sil.org/ArabicFonts
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=mirror://gentoo/ScheherazadeRegOT-1.005.zip mirror://gentoo/LateefRegOT_1.001.zip
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c5d8a51a01cbf7e523b7cb4f8d82f805
+_md5_=a919db2c482915e7f31b0e808fb77ee6
diff --git a/metadata/md5-cache/media-fonts/sil-charis-4.106 b/metadata/md5-cache/media-fonts/sil-charis-4.106
deleted file mode 100644
index 2874f770448c..000000000000
--- a/metadata/md5-cache/media-fonts/sil-charis-4.106
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-DESCRIPTION=SIL Charis - SIL fonts for Roman and Cyrillic languages
-EAPI=2
-HOMEPAGE=http://scripts.sil.org/CharisSILfont
-IUSE=doc +compact X
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=OFL
-SLOT=0
-SRC_URI=http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=CharisSIL4.106b.zip&filename=CharisSIL4.106.zip -> CharisSIL4.106.zip compact? ( http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=CharisSILCompact4.106.zip&filename=CharisSILCompact4.106.zip -> CharisSILCompact4.106.zip )
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=677a8c3eec8506e1ba46704f137caa3e
diff --git a/metadata/md5-cache/media-fonts/sil-charis-4.110 b/metadata/md5-cache/media-fonts/sil-charis-4.110
index 0cb11677bb4d..9634c786dcbd 100644
--- a/metadata/md5-cache/media-fonts/sil-charis-4.110
+++ b/metadata/md5-cache/media-fonts/sil-charis-4.110
@@ -4,9 +4,9 @@ DESCRIPTION=SIL Charis - SIL fonts for Roman and Cyrillic languages
 EAPI=4
 HOMEPAGE=http://scripts.sil.org/CharisSILfont
 IUSE=compact doc X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=mirror://gentoo/CharisSIL-4.110.zip compact? ( mirror://gentoo/CharisSILCompact-4.110.zip )
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=194d96cc0d7fef99e77f0c495a2a1bde
+_md5_=b87b797a869688ecdb480ac2fa44ca1a
diff --git a/metadata/md5-cache/media-fonts/sil-galatia-2.01 b/metadata/md5-cache/media-fonts/sil-galatia-2.01
deleted file mode 100644
index 8f4400bdff18..000000000000
--- a/metadata/md5-cache/media-fonts/sil-galatia-2.01
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-DESCRIPTION=The Galatia SIL Greek Unicode Fonts package
-HOMEPAGE=http://scripts.sil.org/SILgrkuni
-IUSE=doc X
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=SIL-freeware
-SLOT=0
-SRC_URI=mirror://gentoo/ttf-sil-galatia-2.01.tgz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=79ed3f43759dd128c8ea73023a2f922b
diff --git a/metadata/md5-cache/media-fonts/sil-galatia-2.1 b/metadata/md5-cache/media-fonts/sil-galatia-2.1
index ebd659967141..25932123a002 100644
--- a/metadata/md5-cache/media-fonts/sil-galatia-2.1
+++ b/metadata/md5-cache/media-fonts/sil-galatia-2.1
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-li
 DESCRIPTION=The Galatia SIL Greek Unicode Fonts package
 HOMEPAGE=http://scripts.sil.org/SILgrkuni
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=mirror://gentoo/GalSIL21.zip
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=64df9c92b4b327dfcbc2199d263c5289
+_md5_=e6a7168b96ca76817be7f5073af9b93b
diff --git a/metadata/md5-cache/media-fonts/sil-gentium-1.0.2 b/metadata/md5-cache/media-fonts/sil-gentium-1.0.2
deleted file mode 100644
index 54c65e748297..000000000000
--- a/metadata/md5-cache/media-fonts/sil-gentium-1.0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-DESCRIPTION=SIL Gentium Unicode font for Latin and Greek languages.
-HOMEPAGE=http://scripts.sil.org/gentium
-IUSE=doc X
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos
-LICENSE=OFL
-SLOT=0
-SRC_URI=mirror://gentoo/ttf-sil-gentium-1.02.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1a93ef06c869dc0d632b99ccd4a37b3e
diff --git a/metadata/md5-cache/media-fonts/sil-gentium-1.508 b/metadata/md5-cache/media-fonts/sil-gentium-1.508
index 5c64a058163b..bd180c98f97e 100644
--- a/metadata/md5-cache/media-fonts/sil-gentium-1.508
+++ b/metadata/md5-cache/media-fonts/sil-gentium-1.508
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm setup unpack
 DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-DESCRIPTION=SIL Gentium Plus unicode font for Latin and Greek languages.
+DESCRIPTION=SIL Gentium Plus unicode font for Latin and Greek languages
 EAPI=4
 HOMEPAGE=http://scripts.sil.org/gentium
 IUSE=compact doc X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=mirror://gentoo/GentiumPlus-1.508.zip compact? ( mirror://gentoo/GentiumPlusCompact-1.508.zip )
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=91eb0996b93aab8eba2b535e573db5ac
+_md5_=8500bd88ddd5afde099a1e4b05923cec
diff --git a/metadata/md5-cache/media-fonts/sil-padauk-2.4 b/metadata/md5-cache/media-fonts/sil-padauk-2.4
deleted file mode 100644
index 42e4d7f9da03..000000000000
--- a/metadata/md5-cache/media-fonts/sil-padauk-2.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-DESCRIPTION=SIL Padauk - SIL fonts for Myanmar
-HOMEPAGE=http://scripts.sil.org/padauk
-IUSE=X
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=OFL
-SLOT=0
-SRC_URI=mirror://gentoo/ttf-sil-padauk-2.4.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d67c34720ca1100bc987ad64d116ffe1
diff --git a/metadata/md5-cache/media-fonts/sil-padauk-2.8 b/metadata/md5-cache/media-fonts/sil-padauk-2.8
index 8c5f154d47fa..204f64f6fcb3 100644
--- a/metadata/md5-cache/media-fonts/sil-padauk-2.8
+++ b/metadata/md5-cache/media-fonts/sil-padauk-2.8
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install postinst postrm setup
 DEPEND=app-arch/unzip X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-DESCRIPTION=SIL Padauk - SIL fonts for Myanmar script
+DESCRIPTION=SIL fonts for Myanmar script
 EAPI=4
 HOMEPAGE=http://scripts.sil.org/padauk
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=OFL
 SLOT=0
 SRC_URI=mirror://gentoo/padauk-2.8.zip
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	font	9aa70ebc5cefbdd9056687b550a2fdc4	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8bae5fa2a71138a917f5a0efd9c37d09
+_md5_=30189a7719bd61e57c427fc08f33e299
diff --git a/metadata/md5-cache/media-libs/libmpd-0.20.0-r1 b/metadata/md5-cache/media-libs/libmpd-0.20.0-r1
deleted file mode 100644
index 47372018545d..000000000000
--- a/metadata/md5-cache/media-libs/libmpd-0.20.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.16:2 virtual/pkgconfig
-DESCRIPTION=A library handling connections to a MPD server
-EAPI=3
-HOMEPAGE=http://gmpc.wikia.com/wiki/Libmpd
-IUSE=static-libs
-KEYWORDS=amd64 ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16:2
-SLOT=0
-SRC_URI=http://download.sarine.nl/Programs/gmpc/0.20.0/libmpd-0.20.0.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6d6b67579aca605a7be01aeaeb9d92bb
diff --git a/metadata/md5-cache/media-libs/opengtl-0.9.15.1 b/metadata/md5-cache/media-libs/opengtl-0.9.15.1
deleted file mode 100644
index 902edc59e092..000000000000
--- a/metadata/md5-cache/media-libs/opengtl-0.9.15.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/libpng <sys-devel/llvm-3.0 sys-libs/zlib test? ( dev-util/lcov ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=Collection of libraries for graphics transformation algorithms
-EAPI=4
-HOMEPAGE=http://opengtl.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=media-libs/libpng <sys-devel/llvm-3.0 sys-libs/zlib
-SLOT=0
-SRC_URI=http://download.opengtl.org/OpenGTL-0.9.15.1.tar.bz2
-_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9fd5edee0d7b59f5b52f04aa2b50ab1a
diff --git a/metadata/md5-cache/media-libs/opengtl-0.9.15.2 b/metadata/md5-cache/media-libs/opengtl-0.9.15.2
index c790214dda69..81526e45a1fe 100644
--- a/metadata/md5-cache/media-libs/opengtl-0.9.15.2
+++ b/metadata/md5-cache/media-libs/opengtl-0.9.15.2
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of libraries for graphics transformation algorithms
 EAPI=4
 HOMEPAGE=http://opengtl.org/
 IUSE=debug test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2
 RDEPEND=media-libs/libpng <sys-devel/llvm-3.0 sys-libs/zlib
 SLOT=0
 SRC_URI=http://download.opengtl.org/OpenGTL-0.9.15.2.tar.bz2
 _eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9d7318c3050a904c0d084105e908e32f
+_md5_=f1e671fd2fc8f192c645d6879ebf3540
diff --git a/metadata/md5-cache/media-libs/portaudio-19_pre20110326 b/metadata/md5-cache/media-libs/portaudio-19_pre20110326
index e7232c09959e..355b34157eb3 100644
--- a/metadata/md5-cache/media-libs/portaudio-19_pre20110326
+++ b/metadata/md5-cache/media-libs/portaudio-19_pre20110326
@@ -4,10 +4,10 @@ DESCRIPTION=A free, cross-platform, open-source, audio I/O library
 EAPI=4
 HOMEPAGE=http://www.portaudio.com/
 IUSE=alsa +cxx debug jack oss static-libs
-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
 LICENSE=as-is
 RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )
 SLOT=0
 SRC_URI=http://www.portaudio.com/archives/pa_stable_v19_20110326.tgz
 _eclasses_=libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=3b8689f296bb1f5a152f7a3011fe444c
+_md5_=585976dda066a7829d2b8dcb29d79ac8
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-3.2 b/metadata/md5-cache/media-plugins/audacious-plugins-3.2
deleted file mode 100644
index c80314974437..000000000000
--- a/metadata/md5-cache/media-plugins/audacious-plugins-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.2 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) nls? ( dev-util/intltool ) virtual/pkgconfig
-DESCRIPTION=Audacious Player - Your music, your way, no exceptions
-EAPI=4
-HOMEPAGE=http://audacious-media-player.org/
-IUSE=aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome +gtk gtk3 ipv6 jack lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile vorbis wavpack
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.2 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-REQUIRED_USE=^^ ( gtk gtk3 )
-SLOT=0
-SRC_URI=http://distfiles.audacious-media-player.org/audacious-plugins-3.2.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=848ec0a18bbadbb3b3fbe7f193989983
diff --git a/metadata/md5-cache/media-plugins/audacious-plugins-3.2.1 b/metadata/md5-cache/media-plugins/audacious-plugins-3.2.3
similarity index 68%
rename from metadata/md5-cache/media-plugins/audacious-plugins-3.2.1
rename to metadata/md5-cache/media-plugins/audacious-plugins-3.2.3
index 28654a2323dd..8342e189ba86 100644
--- a/metadata/md5-cache/media-plugins/audacious-plugins-3.2.1
+++ b/metadata/md5-cache/media-plugins/audacious-plugins-3.2.3
@@ -1,14 +1,13 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.2.1 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) nls? ( dev-util/intltool ) virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.2.3 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl[audio] ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) nls? ( dev-util/intltool ) virtual/pkgconfig
 DESCRIPTION=Audacious Player - Your music, your way, no exceptions
 EAPI=4
 HOMEPAGE=http://audacious-media-player.org/
-IUSE=aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome +gtk gtk3 ipv6 jack lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile vorbis wavpack
+IUSE=aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome +gtk gtk3 ipv6 jack lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile vorbis wavpack
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.2.1 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+RDEPEND=app-arch/unzip >=dev-libs/dbus-glib-0.60 dev-libs/libxml2:2 media-libs/libmodplug >=media-sound/audacious-3.2.3 >=net-libs/neon-0.26.4 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) aac? ( >=media-libs/faad2-2.7 ) adplug? ( >=dev-cpp/libbinio-1.4 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 >=dev-libs/libcdio-0.79-r1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 ) fluidsynth? ( media-sound/fluidsynth ) jack? ( >=media-libs/bio2jack-0.4 media-sound/jack-audio-connection-kit ) lame? ( media-sound/lame ) libnotify? ( x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) mms? ( >=media-libs/libmms-0.3 ) mp3? ( >=media-sound/mpg123-1.12.1 ) mtp? ( media-libs/libmtp ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl[audio] ) sid? ( >=media-libs/libsidplay-2.1.1-r2 ) sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) vorbis? ( >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 ) wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
 REQUIRED_USE=^^ ( gtk gtk3 )
 SLOT=0
-SRC_URI=http://distfiles.audacious-media-player.org/audacious-plugins-3.2.1.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=6e92baa27de866a413faac208b4a3c8f
+SRC_URI=http://distfiles.audacious-media-player.org/audacious-plugins-3.2.3.tar.bz2
+_md5_=e1cd4e8db146e89c9cb5cddd8101d905
diff --git a/metadata/md5-cache/media-plugins/gmpc-albumview-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-albumview-0.20.0
deleted file mode 100644
index 138d03ea0366..000000000000
--- a/metadata/md5-cache/media-plugins/gmpc-albumview-0.20.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=media-sound/gmpc-0.20.0 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
-DESCRIPTION=This plugin shows your music collection in albums
-EAPI=4
-HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_ALBUMVIEW
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=media-sound/gmpc-0.20.0
-SLOT=0
-SRC_URI=http://download.sarine.nl/Programs/gmpc/0.20.0/gmpc-albumview-0.20.0.tar.gz
-_md5_=23dc5375af7ef8a2e5b2eafe12d68752
diff --git a/metadata/md5-cache/media-plugins/gmpc-awn-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-awn-0.20.0
deleted file mode 100644
index 3d12fb6bbe88..000000000000
--- a/metadata/md5-cache/media-plugins/gmpc-awn-0.20.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-sound/gmpc-0.20.0 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=This plugin integrates GMPC with the Avant Window Navigator
-EAPI=4
-HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_AWN
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-sound/gmpc-0.20.0
-SLOT=0
-SRC_URI=http://download.sarine.nl/Programs/gmpc/0.20.0/gmpc-awn-0.20.0.tar.gz
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c2912d1c9c483868ef23a1a1249d1749
diff --git a/metadata/md5-cache/media-plugins/gmpc-awn-11.8.16 b/metadata/md5-cache/media-plugins/gmpc-awn-11.8.16
index 16a0f4141e61..a47eb699c2e4 100644
--- a/metadata/md5-cache/media-plugins/gmpc-awn-11.8.16
+++ b/metadata/md5-cache/media-plugins/gmpc-awn-11.8.16
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-sound/gmpc-11.8.16 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=media-sound/gmpc-11.8.16 dev-libs/dbus-glib virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=This plugin integrates GMPC with the Avant Window Navigator
 EAPI=4
 HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_AWN
 IUSE=nls
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/gmpc-11.8.16
+RDEPEND=>=media-sound/gmpc-11.8.16 dev-libs/dbus-glib
 SLOT=0
 SRC_URI=http://download.sarine.nl/Programs/gmpc/11.8/gmpc-awn-11.8.16.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=df81b9695c7cebef87f708e72e96c716
+_md5_=aeb59d3d45940e0e565f547893e562b7
diff --git a/metadata/md5-cache/media-plugins/gmpc-jamendo-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-jamendo-0.20.0
deleted file mode 100644
index ddbaf97ea8b3..000000000000
--- a/metadata/md5-cache/media-plugins/gmpc-jamendo-0.20.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=media-sound/gmpc-0.20.0 >=media-libs/libmpd-0.15.98 dev-db/sqlite:3 sys-libs/zlib >=dev-libs/libxml2-2.6 >=x11-libs/gtk+-2.4:2 virtual/pkgconfig dev-util/gob nls? ( dev-util/intltool sys-devel/gettext )
-DESCRIPTION=Plugin allows you to browse and preview music available on jamendo.
-EAPI=3
-HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_JAMENDO
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=media-sound/gmpc-0.20.0 >=media-libs/libmpd-0.15.98 dev-db/sqlite:3 sys-libs/zlib >=dev-libs/libxml2-2.6 >=x11-libs/gtk+-2.4:2
-SLOT=0
-SRC_URI=mirror://sourceforge/musicpd/gmpc-jamendo-0.20.0.tar.gz
-_md5_=c68acf672a0f6cd3a7881a0b0e6ebaab
diff --git a/metadata/md5-cache/media-plugins/gmpc-lyricwiki-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-lyricwiki-0.20.0
deleted file mode 100644
index ee30dc9f23b8..000000000000
--- a/metadata/md5-cache/media-plugins/gmpc-lyricwiki-0.20.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
-DESCRIPTION=This plugin uses lyricwiki to fetch lyrics
-EAPI=3
-HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_LYRICWIKI
-IUSE=nls
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2
-SLOT=0
-SRC_URI=mirror://sourceforge/musicpd/gmpc-lyricwiki-0.20.0.tar.gz
-_md5_=f1e1ce90464826a69dfa3238a6137a57
diff --git a/metadata/md5-cache/media-plugins/gmpc-mmkeys-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-mmkeys-0.20.0
deleted file mode 100644
index e19eacbaa90c..000000000000
--- a/metadata/md5-cache/media-plugins/gmpc-mmkeys-0.20.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/dbus-glib >=media-sound/gmpc-0.20.0 dev-lang/vala:0.10 virtual/pkgconfig
-DESCRIPTION=Bind multimedia keys via gnome settings daemon
-EAPI=4
-HOMEPAGE=http://gmpc.wikia.com/wiki/Plugins
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/dbus-glib >=media-sound/gmpc-0.20.0
-SLOT=0
-SRC_URI=http://download.sarine.nl/Programs/gmpc/0.20.0/gmpc-mmkeys-0.20.0.tar.gz
-_md5_=156009d6cdd379c23bd2ef8897947a2f
diff --git a/metadata/md5-cache/media-plugins/gmpc-tagedit-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-tagedit-0.20.0
deleted file mode 100644
index 876fc2052498..000000000000
--- a/metadata/md5-cache/media-plugins/gmpc-tagedit-0.20.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=media-sound/gmpc-0.20.0 media-libs/taglib dev-libs/libxml2 virtual/pkgconfig dev-util/gob nls? ( dev-util/intltool sys-devel/gettext )
-DESCRIPTION=This plugin allows you to edit tags in your library
-EAPI=3
-HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_TAGEDIT
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=media-sound/gmpc-0.20.0 media-libs/taglib dev-libs/libxml2
-SLOT=0
-SRC_URI=mirror://sourceforge/musicpd/gmpc-tagedit-0.20.0.tar.gz
-_md5_=273fb1dfcb1b9492d19587780dc9ba0d
diff --git a/metadata/md5-cache/media-plugins/gmpc-wikipedia-0.20.0 b/metadata/md5-cache/media-plugins/gmpc-wikipedia-0.20.0
deleted file mode 100644
index 3b69f147df99..000000000000
--- a/metadata/md5-cache/media-plugins/gmpc-wikipedia-0.20.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2:2 net-libs/webkit-gtk:2 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
-DESCRIPTION=This plugin shows the Wikipedia article about the currently playing artist
-EAPI=3
-HOMEPAGE=http://gmpc.wikia.com/wiki/GMPC_PLUGIN_WIKIPEDIA
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=media-sound/gmpc-0.20.0 dev-libs/libxml2:2 net-libs/webkit-gtk:2
-SLOT=0
-SRC_URI=mirror://sourceforge/musicpd/gmpc-wikipedia-0.20.0.tar.gz
-_md5_=797681c54319aeb9cc252c09a4bc92e2
diff --git a/metadata/md5-cache/media-sound/ario-1.5 b/metadata/md5-cache/media-sound/ario-1.5
deleted file mode 100644
index 735f53643a3b..000000000000
--- a/metadata/md5-cache/media-sound/ario-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi ) dev-util/intltool virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
-DESCRIPTION=a GTK2 MPD (Music Player Daemon) client inspired by Rythmbox
-EAPI=2
-HOMEPAGE=http://ario-player.sourceforge.net
-IUSE=audioscrobbler dbus debug +idle libnotify nls python taglib zeroconf
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi )
-SLOT=0
-SRC_URI=mirror://sourceforge/ario-player/ario-1.5.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	gnome2-utils	dfd98be073cc8193fc79925566741ab0	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=b93ea49bce30f51951050b8772a61212
diff --git a/metadata/md5-cache/media-sound/ario-1.5.1 b/metadata/md5-cache/media-sound/ario-1.5.1
index 09a72f2be340..553409fd936e 100644
--- a/metadata/md5-cache/media-sound/ario-1.5.1
+++ b/metadata/md5-cache/media-sound/ario-1.5.1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi ) dev-util/intltool virtual/pkgconfig sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi ) dev-util/intltool virtual/pkgconfig sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
 DESCRIPTION=a GTK2 MPD (Music Player Daemon) client inspired by Rythmbox
 EAPI=4
 HOMEPAGE=http://ario-player.sourceforge.net
 IUSE=audioscrobbler dbus debug +idle libnotify nls python taglib zeroconf debug
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi )
+RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libmpdclient net-misc/curl net-libs/gnutls >=x11-libs/gtk+-2.16:2 audioscrobbler? ( net-libs/libsoup:2.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) taglib? ( media-libs/taglib ) zeroconf? ( net-dns/avahi ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/ario-player/ario-1.5.1.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f9c390d5125890d694cd0575a702b871
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=3c760d527dd97551fcddf90e43474d4b
diff --git a/metadata/md5-cache/media-sound/audacious-3.2.1 b/metadata/md5-cache/media-sound/audacious-3.2.1
deleted file mode 100644
index b5c29805c818..000000000000
--- a/metadata/md5-cache/media-sound/audacious-3.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.16 dev-libs/libxml2 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) session? ( x11-libs/libSM ) virtual/pkgconfig chardet? ( >=app-i18n/libguess-1.1 ) nls? ( dev-util/intltool )
-DESCRIPTION=Audacious Player - Your music, your way, no exceptions
-EAPI=4
-HOMEPAGE=http://audacious-media-player.org/
-IUSE=chardet +gtk gtk3 nls session
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-PDEPEND=>=media-plugins/audacious-plugins-3.2.1
-RDEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.16 dev-libs/libxml2 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) session? ( x11-libs/libSM )
-REQUIRED_USE=^^ ( gtk gtk3 )
-SLOT=0
-SRC_URI=http://distfiles.audacious-media-player.org/audacious-3.2.1.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=84a7f1763293ad8fe988058cdfed3474
diff --git a/metadata/md5-cache/media-sound/audacious-3.2 b/metadata/md5-cache/media-sound/audacious-3.2.3
similarity index 84%
rename from metadata/md5-cache/media-sound/audacious-3.2
rename to metadata/md5-cache/media-sound/audacious-3.2.3
index b06f5967d2d9..dd4428f18cb9 100644
--- a/metadata/md5-cache/media-sound/audacious-3.2
+++ b/metadata/md5-cache/media-sound/audacious-3.2.3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=configure install prepare
 DEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.16 dev-libs/libxml2 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) session? ( x11-libs/libSM ) virtual/pkgconfig chardet? ( >=app-i18n/libguess-1.1 ) nls? ( dev-util/intltool )
 DESCRIPTION=Audacious Player - Your music, your way, no exceptions
 EAPI=4
@@ -6,10 +6,10 @@ HOMEPAGE=http://audacious-media-player.org/
 IUSE=chardet +gtk gtk3 nls session
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-PDEPEND=>=media-plugins/audacious-plugins-3.2
+PDEPEND=>=media-plugins/audacious-plugins-3.2.3
 RDEPEND=>=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.16 dev-libs/libxml2 >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) session? ( x11-libs/libSM )
 REQUIRED_USE=^^ ( gtk gtk3 )
 SLOT=0
-SRC_URI=http://distfiles.audacious-media-player.org/audacious-3.2.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
+SRC_URI=http://distfiles.audacious-media-player.org/audacious-3.2.3.tar.bz2 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=7e44b8c7bc959aa7b3e6f9698d46aec2
+_md5_=c6d7c64ed78f049be7ed6abdabfc8761
diff --git a/metadata/md5-cache/media-sound/audio-entropyd-2.0.3 b/metadata/md5-cache/media-sound/audio-entropyd-2.0.3
index 87abe88ff6c3..f674ec4ae32d 100644
--- a/metadata/md5-cache/media-sound/audio-entropyd-2.0.3
+++ b/metadata/md5-cache/media-sound/audio-entropyd-2.0.3
@@ -3,10 +3,10 @@ DESCRIPTION=Audio-entropyd generates entropy-data for the /dev/random device.
 EAPI=4
 HOMEPAGE=http://www.vanheusden.com/aed/
 IUSE=selinux
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=selinux? ( sec-policy/selinux-entropyd ) media-sound/alsa-utils
 SLOT=0
 SRC_URI=http://www.vanheusden.com/aed/audio-entropyd-2.0.3.tgz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=924b5fba4e70d4567a5bed8903a46e65
+_md5_=82909c10bd56b581430a8b6341d305aa
diff --git a/metadata/md5-cache/media-sound/gmpc-0.20.0 b/metadata/md5-cache/media-sound/gmpc-0.20.0
deleted file mode 100644
index 5bfe3f6e1066..000000000000
--- a/metadata/md5-cache/media-sound/gmpc-0.20.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.12:2 x11-libs/libsexy >=gnome-base/libglade-2 >=media-libs/libmpd-0.19.2 net-libs/libsoup:2.4 dev-db/sqlite:3 xspf? ( >=media-libs/libxspf-1.2 ) dev-lang/vala:0.10 >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
-DESCRIPTION=A GTK+2 client for the Music Player Daemon
-EAPI=2
-HOMEPAGE=http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client
-IUSE=nls xspf
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.12:2 x11-libs/libsexy >=gnome-base/libglade-2 >=media-libs/libmpd-0.19.2 net-libs/libsoup:2.4 dev-db/sqlite:3 xspf? ( >=media-libs/libxspf-1.2 )
-SLOT=0
-SRC_URI=http://download.sarine.nl/Programs/gmpc/0.20.0/gmpc-0.20.0.tar.gz
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=8a990f76eea86ccf9f41cf061305cfd4
diff --git a/metadata/md5-cache/media-sound/gmpc-11.8.16 b/metadata/md5-cache/media-sound/gmpc-11.8.16
index 5eb2a4c132c5..4831e8c29cfa 100644
--- a/metadata/md5-cache/media-sound/gmpc-11.8.16
+++ b/metadata/md5-cache/media-sound/gmpc-11.8.16
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 ) dev-lang/vala:0.12 >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) >=sys-apps/sed-4
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 ) dev-lang/vala:0.12 >=dev-util/gob-2.0.17 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) >=sys-apps/sed-4
 DESCRIPTION=A GTK+2 client for the Music Player Daemon
 EAPI=4
 HOMEPAGE=http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client
 IUSE=nls xspf +unique
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 )
+RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 >=media-libs/libmpd-11.8 net-libs/libsoup:2.4 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-themes/hicolor-icon-theme unique? ( dev-libs/libunique:1 ) xspf? ( >=media-libs/libxspf-1.2 )
 SLOT=0
 SRC_URI=http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz
 _eclasses_=gnome2-utils	dfd98be073cc8193fc79925566741ab0
-_md5_=f094357a351fef58355d2dd85b59cc0e
+_md5_=706bd3ece63d3a4df93db9204846f58b
diff --git a/metadata/md5-cache/media-sound/mpc-0.22 b/metadata/md5-cache/media-sound/mpc-0.22
index 000b8b9a28f5..a20ad8416bc9 100644
--- a/metadata/md5-cache/media-sound/mpc-0.22
+++ b/metadata/md5-cache/media-sound/mpc-0.22
@@ -4,10 +4,10 @@ DESCRIPTION=A commandline client for Music Player Daemon (media-sound/mpd)
 EAPI=4
 HOMEPAGE=http://www.musicpd.org
 IUSE=iconv
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpdclient-2.2 iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpc-0.22.tar.bz2
 _eclasses_=bash-completion-r1	3480f8385cb9e31797e7b659e366e2d2
-_md5_=836a66d47d906e31db7b50feb47ba571
+_md5_=01d6fdcad5efc318e5442eaeb3a5d7dd
diff --git a/metadata/md5-cache/media-sound/mpd-0.16.8 b/metadata/md5-cache/media-sound/mpd-0.16.8
index b6676830352d..89ce5f64ce7b 100644
--- a/metadata/md5-cache/media-sound/mpd-0.16.8
+++ b/metadata/md5-cache/media-sound/mpd-0.16.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) alsa? ( media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio[-minimal] ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) virtual/pkgconfig !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+DEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) alsa? ( media-sound/alsa-utils media-libs/alsa-lib ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio[-minimal] ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) virtual/pkgconfig !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 DESCRIPTION=The Music Player Daemon (mpd)
 EAPI=4
 HOMEPAGE=http://www.musicpd.org
 IUSE=aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x64-macos ~x86 ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) alsa? ( media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio[-minimal] ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib )
+RDEPEND=!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) alsa? ( media-sound/alsa-utils media-libs/alsa-lib ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio[-minimal] ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) network? ( >=media-libs/libshout-2 !lame? ( !vorbis? ( media-libs/libvorbis ) ) ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) mms? ( media-libs/libmms ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pulseaudio ) || ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) lastfmradio? ( curl )
 SLOT=0
 SRC_URI=mirror://sourceforge/musicpd/mpd-0.16.8.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9f505460367ace6412c061721798aff6
+_md5_=9c593b899ca70e3126eef7b43b9e35cf
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.20 b/metadata/md5-cache/media-sound/ncmpc-0.20
index 5fecd4d85ca9..5492d82dfa59 100644
--- a/metadata/md5-cache/media-sound/ncmpc-0.20
+++ b/metadata/md5-cache/media-sound/ncmpc-0.20
@@ -4,10 +4,10 @@ DESCRIPTION=A ncurses client for the Music Player Daemon (MPD)
 EAPI=4
 HOMEPAGE=http://mpd.wikia.com/wiki/Client:Ncmpc
 IUSE=artist-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.12:2 >=media-libs/libmpdclient-2.2 sys-libs/ncurses lirc? ( app-misc/lirc )
 SLOT=0
 SRC_URI=http://downloads.sourceforge.net/musicpd/ncmpc-0.20.tar.bz2
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=4abd480540c4ea49f2c8f0736834bc61
+_md5_=aa749fbe42108fa0a247b7933470049c
diff --git a/metadata/md5-cache/media-sound/scmpc-0.2.2 b/metadata/md5-cache/media-sound/scmpc-0.2.2
deleted file mode 100644
index 5dfe12996fd0..000000000000
--- a/metadata/md5-cache/media-sound/scmpc-0.2.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=net-misc/curl dev-libs/argtable dev-libs/confuse dev-libs/libdaemon virtual/pkgconfig
-DESCRIPTION=a client for MPD which submits your tracks to last.fm
-HOMEPAGE=http://cmende.github.com/scmpc/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=net-misc/curl dev-libs/argtable dev-libs/confuse dev-libs/libdaemon
-SLOT=0
-SRC_URI=mirror://github/cmende/scmpc/scmpc-0.2.2.tar.bz2
-_md5_=8a834d18d3b020258a4f5ad74779d32c
diff --git a/metadata/md5-cache/media-video/ushare-1.1a-r3 b/metadata/md5-cache/media-video/ushare-1.1a-r3
new file mode 100644
index 000000000000..b258b339cc28
--- /dev/null
+++ b/metadata/md5-cache/media-video/ushare-1.1a-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=net-libs/libupnp-1.6.14 dlna? ( >=media-libs/libdlna-0.2.4 ) virtual/pkgconfig
+DESCRIPTION=uShare is a UPnP (TM) A/V & DLNA Media Server
+EAPI=4
+HOMEPAGE=http://ushare.geexbox.org/
+IUSE=dlna nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=net-libs/libupnp-1.6.14 dlna? ( >=media-libs/libdlna-0.2.4 )
+SLOT=0
+SRC_URI=http://ushare.geexbox.org/releases/ushare-1.1a.tar.bz2
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=aec4c9a171a0df36ca01c97765882948
diff --git a/metadata/md5-cache/net-libs/dhcpcd-dbus-0.6.0 b/metadata/md5-cache/net-libs/dhcpcd-dbus-0.6.0
index 529792538c94..4f3821963b35 100644
--- a/metadata/md5-cache/net-libs/dhcpcd-dbus-0.6.0
+++ b/metadata/md5-cache/net-libs/dhcpcd-dbus-0.6.0
@@ -8,4 +8,4 @@ LICENSE=BSD-2
 RDEPEND=sys-apps/dbus >=net-misc/dhcpcd-5.0
 SLOT=0
 SRC_URI=http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-0.6.0.tar.bz2
-_md5_=726a791e0b5696c18ae1530cb5219be5
+_md5_=3b32aaf868c2709f7d3fee2b0afbe55c
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.6.1 b/metadata/md5-cache/net-libs/libgsasl-1.6.1
index 5fc7847d75b5..7677c023338c 100644
--- a/metadata/md5-cache/net-libs/libgsasl-1.6.1
+++ b/metadata/md5-cache/net-libs/libgsasl-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU SASL library
 EAPI=3
 HOMEPAGE=http://www.gnu.org/software/gsasl/
 IUSE=idn gcrypt kerberos nls static-libs
-KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-3 LGPL-3
 RDEPEND=gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) !net-misc/gsasl
 SLOT=0
 SRC_URI=mirror://gnu/gsasl/libgsasl-1.6.1.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=c9e7c41658159c45b0ed82d4531feb1b
+_md5_=30258063da825039629306de359b73ac
diff --git a/metadata/md5-cache/net-libs/rest-0.7.12 b/metadata/md5-cache/net-libs/rest-0.7.12
index 9bb84676f6da..0f1cbf8971f1 100644
--- a/metadata/md5-cache/net-libs/rest-0.7.12
+++ b/metadata/md5-cache/net-libs/rest-0.7.12
@@ -4,10 +4,10 @@ DESCRIPTION=Helper library for RESTful services
 EAPI=4
 HOMEPAGE=http://git.gnome.org/browse/librest
 IUSE=doc +gnome +introspection test test
-KEYWORDS=amd64 x86
+KEYWORDS=~alpha amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-misc/ca-certificates >=dev-libs/glib-2.22:2 dev-libs/libxml2:2 net-libs/libsoup:2.4 gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 SLOT=0.7
 SRC_URI=mirror://gnome/sources/rest/0.7/rest-0.7.12.tar.xz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=fa798fb5a4d647da02b3e6026d0f42f5
+_md5_=f74eb292a66955228c6af58f5a7be092
diff --git a/metadata/md5-cache/net-misc/italc-2.0.0 b/metadata/md5-cache/net-misc/italc-2.0.0
new file mode 100644
index 000000000000..602e54a1cba5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/italc-2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=dev-libs/lzo sys-apps/tcp-wrappers virtual/jpeg sys-libs/zlib dev-libs/openssl x11-libs/qt-core x11-libs/qt-xmlpatterns x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-apps/xinput x11-libs/qt-gui:4 x11-proto/inputproto >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Intelligent Teaching And Learning with Computers (iTALC) supports working with computers in school
+EAPI=4
+HOMEPAGE=http://italc.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PROPERTIES=interactive
+RDEPEND=dev-libs/lzo sys-apps/tcp-wrappers virtual/jpeg sys-libs/zlib dev-libs/openssl x11-libs/qt-core x11-libs/qt-xmlpatterns x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-apps/xinput x11-libs/qt-gui:4
+SLOT=0
+SRC_URI=mirror://sourceforge/italc/italc-2.0.0.tar.bz2
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	cmake-utils	de2b6743eb0bffee798e01b913aec936	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=ccf5f363d2a00670a880be638e9a0f90
diff --git a/metadata/md5-cache/net-misc/mosh-1.2.0.95 b/metadata/md5-cache/net-misc/mosh-1.2.0.95
deleted file mode 100644
index 587835844517..000000000000
--- a/metadata/md5-cache/net-misc/mosh-1.2.0.95
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
-EAPI=4
-HOMEPAGE=http://mosh.mit.edu
-IUSE=+client examples +server +utempter
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
-REQUIRED_USE=|| ( client server ) examples? ( client )
-SLOT=0
-SRC_URI=mirror://gentoo/mosh-1.2.0.95.tar.gz
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=acf73203931a92eca301baf4272ff1a4
diff --git a/metadata/md5-cache/net-misc/mosh-1.2.1 b/metadata/md5-cache/net-misc/mosh-1.2.1
new file mode 100644
index 000000000000..b7f0d75a96e7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mosh-1.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig
+DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
+EAPI=4
+HOMEPAGE=http://mosh.mit.edu
+IUSE=bash-completion +client examples +server ufw +utempter
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
+REQUIRED_USE=|| ( client server ) examples? ( client )
+SLOT=0
+SRC_URI=https://github.com/downloads/keithw/mosh/mosh-1.2.1.tar.gz
+_md5_=5aff674d340a4243a41bc87b8675f76f
diff --git a/metadata/md5-cache/net-misc/mosh-9999 b/metadata/md5-cache/net-misc/mosh-9999
index ee14e3aa7cd8..377d858cea8e 100644
--- a/metadata/md5-cache/net-misc/mosh-9999
+++ b/metadata/md5-cache/net-misc/mosh-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	git-2	15733ab6a6feb34af9837b41623c2bad	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=b94ad1bedb631da5890d17b4cbb66e4d
+_md5_=a67b829606c48c9dd53158213e1adce9
diff --git a/metadata/md5-cache/net-misc/openvpn-2.2.2 b/metadata/md5-cache/net-misc/openvpn-2.2.2
index 2184cca20b7e..8fd1cc28251c 100644
--- a/metadata/md5-cache/net-misc/openvpn-2.2.2
+++ b/metadata/md5-cache/net-misc/openvpn-2.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=OpenVPN is a robust and highly flexible tunneling application compat
 EAPI=4
 HOMEPAGE=http://openvpn.net/
 IUSE=examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD
-KEYWORDS=~alpha amd64 ~arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )
 SLOT=0
 SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.2.2.tar.gz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=a879bfa0c6ed0dc1f2591d9e3f1c3fa6
+_md5_=9f3d8d0b585fe454577a1b9584d3b9d3
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.31-r1 b/metadata/md5-cache/net-nds/openldap-2.4.31-r1
new file mode 100644
index 000000000000..6a087ebf2718
--- /dev/null
+++ b/metadata/md5-cache/net-nds/openldap-2.4.31-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=LDAP suite of application and development tools
+EAPI=4
+HOMEPAGE=http://www.OpenLDAP.org/
+IUSE=crypt icu samba slp tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux smbkrb5passwd kerberos -cxx ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=OPENLDAP
+RDEPEND=sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
+REQUIRED_USE=cxx? ( sasl )
+SLOT=0
+SRC_URI=mirror://openldap/openldap-release/openldap-2.4.31.tgz mirror://gentoo/rfc2307bis.schema-20120525
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	db-use	2f5d6a2718559b90a51648d8ff58be83	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ssl-cert	7f678cd359743d336ecf3a6cc4ce1521	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=416dfd4f40f781207edc59ac7f5c05f0
diff --git a/metadata/md5-cache/net-nntp/tin-2.0.0 b/metadata/md5-cache/net-nntp/tin-2.0.0
index 87a008bab226..7560b6f050d9 100644
--- a/metadata/md5-cache/net-nntp/tin-2.0.0
+++ b/metadata/md5-cache/net-nntp/tin-2.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=A threaded NNTP and spool based UseNet newsreader
 EAPI=4
 HOMEPAGE=http://www.tin.org/
 IUSE=cancel-locks debug doc +etiquette evil forgery gpg idn ipv6 mime nls sasl socks5 spell unicode
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 arm ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) net-misc/urlview nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses[unicode?] unicode? ( dev-libs/icu )
 SLOT=0
 SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/v2.0/tin-2.0.0.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=935be4e2653f9c85d22d5e95bad27759
+_md5_=94dc20711c447cc48dd482e5bc4806ec
diff --git a/metadata/md5-cache/net-print/cups-pk-helper-0.2.2 b/metadata/md5-cache/net-print/cups-pk-helper-0.2.2
index caccb95fd31f..483be41deae8 100644
--- a/metadata/md5-cache/net-print/cups-pk-helper-0.2.2
+++ b/metadata/md5-cache/net-print/cups-pk-helper-0.2.2
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/glib-2.30.0:2 net-print/cups >=sys-auth/polkit-0.97 app-arch/x
 DESCRIPTION=PolicyKit helper to configure cups with fine-grained privileges
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/cups-pk-helper
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30.0:2 net-print/cups >=sys-auth/polkit-0.97 sys-apps/dbus
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-0.2.2.tar.xz
-_md5_=06d7d012278cd3c8d8b891115237c5e2
+_md5_=17524ee96cc0889addd2f9a1c0aadaec
diff --git a/metadata/md5-cache/net-zope/zope-interface-3.8.0 b/metadata/md5-cache/net-zope/zope-interface-3.8.0
index 8c0eab0e75ec..f34423c401b5 100644
--- a/metadata/md5-cache/net-zope/zope-interface-3.8.0
+++ b/metadata/md5-cache/net-zope/zope-interface-3.8.0
@@ -3,10 +3,10 @@ DEPEND=dev-python/setuptools net-zope/zope-fixers dev-lang/python
 DESCRIPTION=Interfaces for Python
 EAPI=3
 HOMEPAGE=http://pypi.python.org/pypi/zope.interface
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZPL
 RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-3.8.0.tar.gz
 _eclasses_=distutils	15ae23f6f8219a009bfcfff7724fe727	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=08ad629ee0c7b49276d2b20b57c1788f
+_md5_=64f73272ad1d9300b24cbeed4e635854
diff --git a/metadata/md5-cache/sci-electronics/qelectrotech-0.30_alpha b/metadata/md5-cache/sci-electronics/qelectrotech-0.30_alpha
new file mode 100644
index 000000000000..c4662fc9b02b
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/qelectrotech-0.30_alpha
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=x11-libs/qt-gui:4 x11-libs/qt-svg:4 doc? ( app-doc/doxygen )
+DESCRIPTION=Qt4 application to design electric diagrams
+EAPI=4
+HOMEPAGE=http://www.qt-apps.org/content/show.php?content=90198
+IUSE=debug doc linguas_ar linguas_ca linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_hr linguas_it linguas_pl linguas_pt linguas_ro linguas_ru linguas_sl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/qt-gui:4 x11-libs/qt-svg:4
+SLOT=0
+SRC_URI=http://download.tuxfamily.org/qet/tags/20120513/qelectrotech-0.3a-src.tar.gz
+_eclasses_=base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	qt4-r2	2111bb601bba6402257079dab64c7310	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=5006370b71d7b89702226711943a6519
diff --git a/metadata/md5-cache/sci-geosciences/gtk-g-rays2-1.23 b/metadata/md5-cache/sci-geosciences/gtk-g-rays2-1.23
deleted file mode 100644
index 42542930ab03..000000000000
--- a/metadata/md5-cache/sci-geosciences/gtk-g-rays2-1.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=virtual/pkgconfig sys-devel/gettext doc? ( dev-libs/libxslt )
-DESCRIPTION=GUI for accessing the Wintec WBT 201 / G-Rays 2 GPS device
-EAPI=4
-HOMEPAGE=http://www.daria.co.uk/gps
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/cairo
-SLOT=0
-SRC_URI=http://www.zen35309.zen.co.uk/gps/gtk-g-rays2-1.23.tar.bz2
-_md5_=0ca704ed909feea7afbf86735044c8eb
diff --git a/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.01 b/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.01
new file mode 100644
index 000000000000..f6bf2ea49080
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gtk-g-rays2-2.01
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=virtual/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=GUI for accessing the Wintec WBT 201 / G-Rays 2 GPS device
+EAPI=4
+HOMEPAGE=http://www.daria.co.uk/gps
+IUSE=debug
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/dbus-glib sys-fs/udev[gudev] x11-libs/cairo x11-libs/gtk+:3 virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=http://www.zen35309.zen.co.uk/gps/gtk-g-rays2-2.01.tar.xz
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=daa66e73e624f3a3ac13535fc7f6b784
diff --git a/metadata/md5-cache/sci-geosciences/mapnik-2.0.1 b/metadata/md5-cache/sci-geosciences/mapnik-2.0.1
index 89f6907cbf94..aa318cda623b 100644
--- a/metadata/md5-cache/sci-geosciences/mapnik-2.0.1
+++ b/metadata/md5-cache/sci-geosciences/mapnik-2.0.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=net-misc/curl media-libs/libpng media-libs/tiff sys-libs/zlib media-fonts/dejavu media-libs/freetype dev-lang/python sci-libs/proj dev-libs/libxml2 dev-libs/icu virtual/jpeg x11-libs/agg[truetype] >=dev-libs/boost-1.48[python?] postgres? ( >=dev-db/postgresql-base-8.3 ) gdal? ( sci-libs/gdal ) geos? ( sci-libs/geos ) bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo dev-cpp/cairomm python? ( dev-python/pycairo ) ) sqlite? ( dev-db/sqlite:3 ) python? ( =dev-lang/python-2* ) dev-util/scons
+DEPEND=>=dev-libs/boost-1.48[python?] dev-libs/icu dev-libs/libxml2 media-fonts/dejavu media-libs/freetype media-libs/libpng media-libs/tiff net-misc/curl sci-libs/proj sys-libs/zlib virtual/jpeg x11-libs/agg[truetype] bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo dev-cpp/cairomm python? ( dev-python/pycairo ) ) gdal? ( sci-libs/gdal ) geos? ( sci-libs/geos ) postgres? ( >=dev-db/postgresql-base-8.3 ) sqlite? ( dev-db/sqlite:3 ) python? ( =dev-lang/python-2* ) dev-util/scons
 DESCRIPTION=A Free Toolkit for developing mapping applications.
 EAPI=4
 HOMEPAGE=http://www.mapnik.org/
 IUSE=bidi cairo debug doc gdal geos postgres python sqlite
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-3
-RDEPEND=net-misc/curl media-libs/libpng media-libs/tiff sys-libs/zlib media-fonts/dejavu media-libs/freetype dev-lang/python sci-libs/proj dev-libs/libxml2 dev-libs/icu virtual/jpeg x11-libs/agg[truetype] >=dev-libs/boost-1.48[python?] postgres? ( >=dev-db/postgresql-base-8.3 ) gdal? ( sci-libs/gdal ) geos? ( sci-libs/geos ) bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo dev-cpp/cairomm python? ( dev-python/pycairo ) ) sqlite? ( dev-db/sqlite:3 ) python? ( =dev-lang/python-2* )
+RDEPEND=>=dev-libs/boost-1.48[python?] dev-libs/icu dev-libs/libxml2 media-fonts/dejavu media-libs/freetype media-libs/libpng media-libs/tiff net-misc/curl sci-libs/proj sys-libs/zlib virtual/jpeg x11-libs/agg[truetype] bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo dev-cpp/cairomm python? ( dev-python/pycairo ) ) gdal? ( sci-libs/gdal ) geos? ( sci-libs/geos ) postgres? ( >=dev-db/postgresql-base-8.3 ) sqlite? ( dev-db/sqlite:3 ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=http://github.com/downloads/mapnik/mapnik/mapnik-v2.0.1.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	python	36d7e2b7aa4dce62364c72eec96610cf	scons-utils	9cb9120b919b1ea34b4b7028d9973261	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=82dbe8de8026d83d5c310de365b2d1f6
+_md5_=ff34e40eeadeb67101b73488411cd00f
diff --git a/metadata/md5-cache/sci-libs/gdal-1.9.1 b/metadata/md5-cache/sci-libs/gdal-1.9.1
index b898bf4dd8e4..d0cfeb95d47c 100644
--- a/metadata/md5-cache/sci-libs/gdal-1.9.1
+++ b/metadata/md5-cache/sci-libs/gdal-1.9.1
@@ -11,4 +11,4 @@ REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
 SLOT=0
 SRC_URI=http://download.osgeo.org/gdal/gdal-1.9.1.tar.gz
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	base	5f35078c26d6c60556d5c8a2feb4f84f	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-pkg-opt-2	131dd2a697d663c0e33247611b9a1cd7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	perl-module	f172bf9f9c1de91c81b83a1ae4c27d57	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=00f79f548f0ea6cedc18cc34dca0c334
+_md5_=4306312bcdd594008956cc5385b6f0e2
diff --git a/metadata/md5-cache/sec-policy/selinux-cups-2.20120215-r1 b/metadata/md5-cache/sec-policy/selinux-cups-2.20120215-r1
index 4f6c2520b76d..e8810a6f675a 100644
--- a/metadata/md5-cache/sec-policy/selinux-cups-2.20120215-r1
+++ b/metadata/md5-cache/sec-policy/selinux-cups-2.20120215-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
+DEPEND=>=sec-policy/selinux-lpd-2.20120215 >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215-r9 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
 DESCRIPTION=SELinux policy for cups
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/proj/en/hardened/selinux/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215-r9
+RDEPEND=>=sec-policy/selinux-lpd-2.20120215 >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20120215-r9
 SLOT=0
 SRC_URI=http://oss.tresys.com/files/refpolicy/refpolicy-2.20120215.tar.bz2 http://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20120215-r9.tar.bz2
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	selinux-policy-2	0ead53370a365f78dccc975faedbd8af	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=43eca0505f845267681d41308e09af95
+_md5_=fc3474c7cf51ef7d644ac71fe59c329c
diff --git a/metadata/md5-cache/sys-apps/accountsservice-0.6.15 b/metadata/md5-cache/sys-apps/accountsservice-0.6.15
index b7472b3a2e3f..7ff045ceeba7 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-0.6.15
+++ b/metadata/md5-cache/sys-apps/accountsservice-0.6.15
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus interfaces for querying and manipulating user account informat
 EAPI=4
 HOMEPAGE=http://www.fedoraproject.org/wiki/Features/UserAccountDialog
 IUSE=doc +introspection
-KEYWORDS=amd64 arm x86
+KEYWORDS=~alpha amd64 arm x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 dev-libs/dbus-glib sys-auth/polkit introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.15.tar.xz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	systemd	70a153740015c3457222dbdd8e07c1f7	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f3e9d1fc21369671ba3cb95296761a13
+_md5_=9b4be0ad29e0e65db1a959cbb2521b68
diff --git a/metadata/md5-cache/sys-apps/openrc-0.10.2 b/metadata/md5-cache/sys-apps/openrc-0.10.2
new file mode 100644
index 000000000000..4908237798de
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.10.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133 virtual/os-headers
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=4
+HOMEPAGE=http://www.gentoo.org/proj/en/base/openrc/
+IUSE=debug elibc_glibc ncurses pam selinux static-libs unicode kernel_linux kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD-2
+RDEPEND=virtual/init kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase ) >=sys-apps/baselayout-2.1-r1 kernel_linux? ( sys-process/psmisc ) !<sys-fs/udev-133
+SLOT=0
+SRC_URI=mirror://gentoo/openrc-0.10.2.tar.bz2
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pam	3f746974e1cc47cabe3bd488c08cdc8e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=668e4b2f98098ca16ad9caeb242173f2
diff --git a/metadata/md5-cache/sys-auth/pam_mount-2.1 b/metadata/md5-cache/sys-auth/pam_mount-2.1
deleted file mode 100644
index 868b4d40a670..000000000000
--- a/metadata/md5-cache/sys-auth/pam_mount-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.4 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 virtual/pkgconfig app-arch/xz-utils
-DESCRIPTION=A PAM module that can mount volumes for a user session
-EAPI=3
-HOMEPAGE=http://pam-mount.sourceforge.net
-IUSE=crypt
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.4 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 sys-process/lsof
-SLOT=0
-SRC_URI=mirror://sourceforge/pam-mount/pam_mount-2.1.tar.xz
-_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=0b6475ed1c45abb9708af1e26e330b7d
diff --git a/metadata/md5-cache/sys-auth/pam_mount-2.10 b/metadata/md5-cache/sys-auth/pam_mount-2.10
deleted file mode 100644
index fdcece00deed..000000000000
--- a/metadata/md5-cache/sys-auth/pam_mount-2.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/pam-0.99 >=sys-libs/libhx-3.6 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig app-arch/xz-utils
-DESCRIPTION=A PAM module that can mount volumes for a user session
-EAPI=4
-HOMEPAGE=http://pam-mount.sourceforge.net
-IUSE=crypt ssl selinux
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/pam-0.99 >=sys-libs/libhx-3.6 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=mirror://sourceforge/pam-mount/pam_mount-2.10.tar.xz
-_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=430c8538926f248206fdd0a2acc40501
diff --git a/metadata/md5-cache/sys-auth/pam_mount-2.12 b/metadata/md5-cache/sys-auth/pam_mount-2.12
deleted file mode 100644
index ba6ca19199fd..000000000000
--- a/metadata/md5-cache/sys-auth/pam_mount-2.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/pam-0.99 >=sys-libs/libhx-3.11 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) virtual/pkgconfig app-arch/xz-utils
-DESCRIPTION=A PAM module that can mount volumes for a user session
-EAPI=4
-HOMEPAGE=http://pam-mount.sourceforge.net
-IUSE=crypt ssl selinux
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/pam-0.99 >=sys-libs/libhx-3.11 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux )
-SLOT=0
-SRC_URI=mirror://sourceforge/pam-mount/pam_mount-2.12.tar.xz
-_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=e717068be01b8889208fe203540128cc
diff --git a/metadata/md5-cache/sys-auth/pam_mount-2.5 b/metadata/md5-cache/sys-auth/pam_mount-2.5
deleted file mode 100644
index 4ef0361def6b..000000000000
--- a/metadata/md5-cache/sys-auth/pam_mount-2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.4 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 virtual/pkgconfig app-arch/xz-utils
-DESCRIPTION=A PAM module that can mount volumes for a user session
-EAPI=3
-HOMEPAGE=http://pam-mount.sourceforge.net
-IUSE=crypt
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.4 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 sys-process/lsof
-SLOT=0
-SRC_URI=mirror://sourceforge/pam-mount/pam_mount-2.5.tar.xz
-_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=085069753d47ee16a1498442ebb7f5b9
diff --git a/metadata/md5-cache/sys-auth/pam_mount-2.6 b/metadata/md5-cache/sys-auth/pam_mount-2.6
deleted file mode 100644
index 9fa0151228c8..000000000000
--- a/metadata/md5-cache/sys-auth/pam_mount-2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.6 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 virtual/pkgconfig app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A PAM module that can mount volumes for a user session
-EAPI=3
-HOMEPAGE=http://pam-mount.sourceforge.net
-IUSE=crypt
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.6 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 sys-process/lsof
-SLOT=0
-SRC_URI=mirror://sourceforge/pam-mount/pam_mount-2.6.tar.xz
-_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=5f4099705f19f92b946e3bf35a73ef11
diff --git a/metadata/md5-cache/sys-auth/pam_mount-2.8 b/metadata/md5-cache/sys-auth/pam_mount-2.8
deleted file mode 100644
index 450d44b318b9..000000000000
--- a/metadata/md5-cache/sys-auth/pam_mount-2.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.8 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 virtual/pkgconfig app-arch/xz-utils
-DESCRIPTION=A PAM module that can mount volumes for a user session
-EAPI=3
-HOMEPAGE=http://pam-mount.sourceforge.net
-IUSE=crypt
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.8 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 sys-process/lsof
-SLOT=0
-SRC_URI=mirror://sourceforge/pam-mount/pam_mount-2.8.tar.xz
-_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=05a7dfc03e755df140ba82b871731b91
diff --git a/metadata/md5-cache/sys-block/ms-sys-2.1.3 b/metadata/md5-cache/sys-block/ms-sys-2.1.3
deleted file mode 100644
index 915add0acdd0..000000000000
--- a/metadata/md5-cache/sys-block/ms-sys-2.1.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-devel/gettext
-DESCRIPTION=a command-line program for writing Microsoft compatible boot records.
-HOMEPAGE=http://ms-sys.sourceforge.net
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/ms-sys/ms-sys-2.1.3.tgz
-_eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=59c4cff6533ead82abf8fa0538b40073
diff --git a/metadata/md5-cache/sys-block/ms-sys-2.1.4 b/metadata/md5-cache/sys-block/ms-sys-2.3.0
similarity index 55%
rename from metadata/md5-cache/sys-block/ms-sys-2.1.4
rename to metadata/md5-cache/sys-block/ms-sys-2.3.0
index 629b32fb1e89..5f91a22b3561 100644
--- a/metadata/md5-cache/sys-block/ms-sys-2.1.4
+++ b/metadata/md5-cache/sys-block/ms-sys-2.3.0
@@ -1,11 +1,13 @@
 DEFINED_PHASES=compile install
 DEPEND=sys-devel/gettext
-DESCRIPTION=a command-line program for writing Microsoft compatible boot records.
-EAPI=2
+DESCRIPTION=A command-line program for writing Microsoft compatible boot records.
+EAPI=4
 HOMEPAGE=http://ms-sys.sourceforge.net
+IUSE=linguas_sv
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
+RDEPEND=virtual/libintl
 SLOT=0
-SRC_URI=mirror://sourceforge/ms-sys/ms-sys-2.1.4.tar.gz
+SRC_URI=mirror://sourceforge/ms-sys/ms-sys-2.3.0.tar.gz
 _eclasses_=multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=6a676686f4d28bc5e53b991fc04b8fbe
+_md5_=8c09ca48f4df99d79f0428ba877fbe1d
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.1.5 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.1.5
new file mode 100644
index 000000000000..9fd95e5e240c
--- /dev/null
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/expat dev-libs/boost
+DESCRIPTION=A suite of tools for thin provisioning on Linux.
+EAPI=4
+HOMEPAGE=https://github.com/jthornber/thin-provisioning-tools
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/expat
+SLOT=0
+SRC_URI=https://github.com/downloads/jthornber/thin-provisioning-tools/thin-provisioning-tools-v0.1.5.tar.bz2
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
+_md5_=637a9367a94f64d901c4509f35dac2e9
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-cddl-9.0 b/metadata/md5-cache/sys-freebsd/freebsd-cddl-9.0
index bdcea7e5bc9e..3a1000b886db 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-cddl-9.0
+++ b/metadata/md5-cache/sys-freebsd/freebsd-cddl-9.0
@@ -10,4 +10,4 @@ RDEPEND==sys-freebsd/freebsd-lib-9.0* =sys-freebsd/freebsd-libexec-9.0* build? (
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-cddl-9.0.tar.bz2 mirror://gentoo/freebsd-contrib-9.0.tar.bz2 mirror://gentoo/freebsd-ubin-9.0.tar.bz2 mirror://gentoo/freebsd-lib-9.0.tar.bz2 mirror://gentoo/freebsd-sbin-9.0.tar.bz2 mirror://gentoo/freebsd-sys-9.0.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.0.tar.bz2 mirror://gentoo/freebsd-include-9.0.tar.bz2 )
 _eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=bb9d09c6be73a113956ba8236ebb1007
+_md5_=744eea00435e71164c409d9147fc6145
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0-r3 b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0-r3
new file mode 100644
index 000000000000..1ca147ce3862
--- /dev/null
+++ b/metadata/md5-cache/sys-freebsd/freebsd-sources-9.0-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=virtual/pmake virtual/pmake
+DESCRIPTION=FreeBSD kernel sources
+HOMEPAGE=http://www.freebsd.org/
+IUSE=symlink
+KEYWORDS=~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD
+RDEPEND=>=sys-freebsd/freebsd-mk-defs-8.0
+RESTRICT=strip binchecks
+SLOT=9.0-r3
+SRC_URI=mirror://gentoo/freebsd-sys-9.0.tar.bz2
+_eclasses_=bsdmk	d13d2e416a2fa9a525bf82c9bdb05509	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	freebsd	ba8e26233fd04f10f90adfaadaa945b8	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=461e0097f4bdd3a77c78e9f94c436722
diff --git a/metadata/md5-cache/sys-fs/gt5-1.4.0-r1 b/metadata/md5-cache/sys-fs/gt5-1.4.0-r1
deleted file mode 100644
index e43bfba8dccf..000000000000
--- a/metadata/md5-cache/sys-fs/gt5-1.4.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=a diff-capable 'du-browser'
-HOMEPAGE=http://gt5.sourceforge.net/
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=|| ( www-client/links www-client/elinks www-client/lynx )
-SLOT=0
-SRC_URI=mirror://sourceforge/gt5/gt5-1.4.0.tar.gz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=dde603d9403b709b7281d7aa3f6eb5da
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.95-r2 b/metadata/md5-cache/sys-fs/lvm2-2.02.95-r2
new file mode 100644
index 000000000000..894554d0b921
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.95-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( >=sys-fs/udev-151-r4 ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( || ( >=sys-fs/udev-181[static-libs] <sys-fs/udev-181 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
+EAPI=3
+HOMEPAGE=http://sources.redhat.com/lvm2/
+IUSE=readline static static-libs clvm cman +lvm1 selinux +udev +thin
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( >=sys-fs/udev-151-r4 ) !<sys-apps/openrc-0.10.1 >=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !<sys-fs/cryptsetup-1.1.2
+SLOT=0
+SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.95.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.95.tgz
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	libtool	46e19fa7553f66c48ebc7cf025acd3ed	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=9faaa622ea28069f0a5ba4e71d4cf8cb
diff --git a/metadata/md5-cache/sys-libs/libhx-3.10.1 b/metadata/md5-cache/sys-libs/libhx-3.10.1
deleted file mode 100644
index 44652d35a0e6..000000000000
--- a/metadata/md5-cache/sys-libs/libhx-3.10.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Platform independent library providing basic system functions.
-EAPI=3
-HOMEPAGE=http://libhx.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/libhx/libHX-3.10.1.tar.xz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=d80a7dbed343cae92fa4a88e03de4336
diff --git a/metadata/md5-cache/sys-libs/libhx-3.12 b/metadata/md5-cache/sys-libs/libhx-3.12
deleted file mode 100644
index 3b039f111d31..000000000000
--- a/metadata/md5-cache/sys-libs/libhx-3.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Platform independent library providing basic system functions.
-EAPI=4
-HOMEPAGE=http://libhx.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/libhx/libHX-3.12.tar.xz
-_md5_=b9dd88bffafd3602d313b5bc7d0a132d
diff --git a/metadata/md5-cache/sys-libs/libhx-3.5 b/metadata/md5-cache/sys-libs/libhx-3.5
deleted file mode 100644
index a66582c9df48..000000000000
--- a/metadata/md5-cache/sys-libs/libhx-3.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Platform independent library providing basic system functions.
-EAPI=3
-HOMEPAGE=http://libhx.sourceforge.net
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/libhx/libHX-3.5.tar.xz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=9c322fbdcecd16b9c205157d107c7ec8
diff --git a/metadata/md5-cache/sys-libs/libhx-3.8 b/metadata/md5-cache/sys-libs/libhx-3.8
deleted file mode 100644
index 687d32cee798..000000000000
--- a/metadata/md5-cache/sys-libs/libhx-3.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Platform independent library providing basic system functions.
-EAPI=3
-HOMEPAGE=http://libhx.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://sourceforge/libhx/libHX-3.8.tar.xz
-_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e
-_md5_=61d670530652e62b4bbef03c9b08056e
diff --git a/metadata/md5-cache/sys-power/upower-0.9.16 b/metadata/md5-cache/sys-power/upower-0.9.16
index 86fffdfccffb..f989f33e7e68 100644
--- a/metadata/md5-cache/sys-power/upower-0.9.16
+++ b/metadata/md5-cache/sys-power/upower-0.9.16
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus abstraction for enumerating power devices and querying history
 EAPI=4
 HOMEPAGE=http://upower.freedesktop.org/
 IUSE=debug doc +introspection ios kernel_FreeBSD kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-apps/dbus >=sys-auth/polkit-0.104-r1 introspection? ( dev-libs/gobject-introspection ) kernel_linux? ( || ( >=sys-fs/udev-171-r5[gudev] <sys-fs/udev-171[extras] ) virtual/libusb:1 ios? ( >=app-pda/libimobiledevice-1 >=app-pda/libplist-1 ) ) kernel_linux? ( >=sys-power/pm-utils-1.4.1 )
 SLOT=0
 SRC_URI=http://upower.freedesktop.org/releases/upower-0.9.16.tar.xz
 _eclasses_=systemd	70a153740015c3457222dbdd8e07c1f7
-_md5_=fc5c9cc48a6c57cdc769f287e7da48f1
+_md5_=fd56bcc5dacad19d6cb90250d7826ee1
diff --git a/metadata/md5-cache/virtual/gsasl-2 b/metadata/md5-cache/virtual/gsasl-2
index c3cec5520611..252086c2cbd9 100644
--- a/metadata/md5-cache/virtual/gsasl-2
+++ b/metadata/md5-cache/virtual/gsasl-2
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DEPEND=|| ( net-libs/libgsasl net-misc/gsasl )
 DESCRIPTION=Virtual for the GNU SASL library
 EAPI=2
-KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 RDEPEND=|| ( net-libs/libgsasl net-misc/gsasl )
 SLOT=0
-_md5_=eb8bd0f2cef9048f501a4f2efa37974a
+_md5_=6473f2b54f6f9779212f4f3aa5714714
diff --git a/metadata/md5-cache/virtual/libusb-1 b/metadata/md5-cache/virtual/libusb-1
index 3fb56a55b103..d8d35222ba16 100644
--- a/metadata/md5-cache/virtual/libusb-1
+++ b/metadata/md5-cache/virtual/libusb-1
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libusb
 EAPI=2
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-RDEPEND=|| ( >=dev-libs/libusb-1.0.9_rc:1 dev-libs/libusbx:1 )
+RDEPEND=|| ( dev-libs/libusbx:1 >=dev-libs/libusb-1.0.9_rc:1 )
 SLOT=1
-_md5_=dd70ceaebe2de03efef373924011a9cb
+_md5_=a742446c3434deb98215197a3fcdf51a
diff --git a/metadata/md5-cache/virtual/pkgconfig-0 b/metadata/md5-cache/virtual/pkgconfig-0
index 89db37473b5b..a339659f6e6d 100644
--- a/metadata/md5-cache/virtual/pkgconfig-0
+++ b/metadata/md5-cache/virtual/pkgconfig-0
@@ -1,8 +1,9 @@
 DEFINED_PHASES=-
 DEPEND=|| ( >=dev-util/pkgconfig-0.26 dev-util/pkg-config-lite dev-util/pkgconf[pkg-config] dev-util/pkgconfig-openbsd[pkg-config] )
-DESCRIPTION=virtual for pkg-config
+DESCRIPTION=Virtual for the pkg-config implementation
 EAPI=2
+IUSE=userland_BSD
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=dev-util/pkgconfig-0.26 dev-util/pkg-config-lite dev-util/pkgconf[pkg-config] dev-util/pkgconfig-openbsd[pkg-config] )
 SLOT=0
-_md5_=d135dbfe06ac1ed9caa19f0e87bff0da
+_md5_=82345a74c0fb0721c9c0db84a8c0578c
diff --git a/metadata/md5-cache/virtual/ruby-minitest-0-r2 b/metadata/md5-cache/virtual/ruby-minitest-0-r2
index 5c076f1f0035..8df1e9017fd5 100644
--- a/metadata/md5-cache/virtual/ruby-minitest-0-r2
+++ b/metadata/md5-cache/virtual/ruby-minitest-0-r2
@@ -3,8 +3,8 @@ DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang
 DESCRIPTION=Virtual ebuild for the Ruby minitest library
 EAPI=2
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/minitest[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/minitest[ruby_targets_ree18] ) ruby_targets_ruby19? ( || ( dev-ruby/minitest[ruby_targets_ruby19] dev-lang/ruby:1.9 ) ) ruby_targets_jruby? ( dev-ruby/minitest[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby )
 SLOT=0
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=be988506899bdef2471f543d8ca92de5
+_md5_=7adaa69505fe0c5dba1ba1a0fa15396c
diff --git a/metadata/md5-cache/virtual/ruby-rdoc-1 b/metadata/md5-cache/virtual/ruby-rdoc-1
index b2fb94cd5386..8833c667b248 100644
--- a/metadata/md5-cache/virtual/ruby-rdoc-1
+++ b/metadata/md5-cache/virtual/ruby-rdoc-1
@@ -3,8 +3,8 @@ DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 DESCRIPTION=Virtual ebuild for bundled and unbundled RDoc
 EAPI=2
 IUSE=elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 RDEPEND=|| ( dev-ruby/rdoc[ruby_targets_ruby19] <dev-lang/ruby-1.9.2_rc2-r1:1.9 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 SLOT=ruby19
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ec22d3ec7ddac7c880cc924e2e7ba351
+_md5_=ae239fc264d4a1baca7ad087e6edd76c
diff --git a/metadata/md5-cache/virtual/ruby-ssl-1 b/metadata/md5-cache/virtual/ruby-ssl-1
index 983720e126d2..19072c13932e 100644
--- a/metadata/md5-cache/virtual/ruby-ssl-1
+++ b/metadata/md5-cache/virtual/ruby-ssl-1
@@ -3,8 +3,8 @@ DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 DESCRIPTION=Virtual ebuild for the Ruby OpenSSL bindings
 EAPI=2
 IUSE=elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=dev-lang/ruby:1.9[ssl] ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 SLOT=ruby19
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9f474533faf70ba1f5c7a1f369eb5f49
+_md5_=75eca257b4cfe7daf56c7adf8d863316
diff --git a/metadata/md5-cache/virtual/ruby-test-unit-0-r4 b/metadata/md5-cache/virtual/ruby-test-unit-0-r4
index fa633ed4785b..94ed7e4088c4 100644
--- a/metadata/md5-cache/virtual/ruby-test-unit-0-r4
+++ b/metadata/md5-cache/virtual/ruby-test-unit-0-r4
@@ -3,8 +3,8 @@ DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lan
 DESCRIPTION=Virtual ebuild for the Ruby test/unit library
 EAPI=2
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ruby_targets_ree18
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 )
 SLOT=0
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3dee36c527439d7c44649e76d62dc5ef
+_md5_=010ebccee375e559acfcd3a6f1619a15
diff --git a/metadata/md5-cache/virtual/ruby-threads-1 b/metadata/md5-cache/virtual/ruby-threads-1
index c1a36208380f..f18b686c00c4 100644
--- a/metadata/md5-cache/virtual/ruby-threads-1
+++ b/metadata/md5-cache/virtual/ruby-threads-1
@@ -3,8 +3,8 @@ DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 DESCRIPTION=Virtual ebuild for a ruby interpreter with threading enabled.
 EAPI=2
 IUSE=elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 RDEPEND=dev-lang/ruby:1.9 ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 SLOT=ruby19
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d1d055befffc4985ed841d0ae6c40350
+_md5_=06ea84e4b4c11be09d043abe3aae435e
diff --git a/metadata/md5-cache/virtual/rubygems-1 b/metadata/md5-cache/virtual/rubygems-1
index 0ed44a260707..e2da0188a963 100644
--- a/metadata/md5-cache/virtual/rubygems-1
+++ b/metadata/md5-cache/virtual/rubygems-1
@@ -3,8 +3,8 @@ DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
 DESCRIPTION=Virtual ebuild for rubygems
 EAPI=2
 IUSE=elibc_FreeBSD ruby_targets_ruby18
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=dev-ruby/rubygems[ruby_targets_ruby18] ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
 SLOT=ruby18
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e3dfbd5d0193cbcf9e44a0170a0cb264
+_md5_=41e6e1d9ef4fad341760b6f08a12a992
diff --git a/metadata/md5-cache/virtual/rubygems-4 b/metadata/md5-cache/virtual/rubygems-4
index 6201601f579a..945dbe7456c4 100644
--- a/metadata/md5-cache/virtual/rubygems-4
+++ b/metadata/md5-cache/virtual/rubygems-4
@@ -3,8 +3,8 @@ DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 DESCRIPTION=Virtual ebuild for rubygems
 EAPI=2
 IUSE=elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=dev-ruby/rubygems[ruby_targets_ruby19] ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
 SLOT=ruby19
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	java-utils-2	b173b5d55bfd6e328939985bc54a1c9e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	ruby-ng	927a565459a62f2839d06e03cfbe1440	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=617ffcc66bb2005d5788794118ecd6c1
+_md5_=3328317cc9b11fe76ef846b91601eb84
diff --git a/metadata/md5-cache/www-client/chromium-21.0.1145.0-r1 b/metadata/md5-cache/www-client/chromium-21.0.1145.0-r1
new file mode 100644
index 000000000000..11fae7872019
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-21.0.1145.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=4
+HOMEPAGE=http://chromium.org/
+IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+SLOT=0
+SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-21.0.1145.0.tar.bz2
+_eclasses_=chromium	5c2107cf3513e4286a44e7dd3fa22456	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	gnome2-utils	dfd98be073cc8193fc79925566741ab0	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	36d7e2b7aa4dce62364c72eec96610cf	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
+_md5_=247dc3ee727635c53f3c0ae5266a2083
diff --git a/metadata/md5-cache/www-client/chromium-9999-r1 b/metadata/md5-cache/www-client/chromium-9999-r1
index a044583f7281..fb1459f01ed1 100644
--- a/metadata/md5-cache/www-client/chromium-9999-r1
+++ b/metadata/md5-cache/www-client/chromium-9999-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/subversion net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/subversion net-misc/rsync test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=4
 HOMEPAGE=http://chromium.org/
@@ -8,4 +8,4 @@ LICENSE=BSD
 RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.1.3 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=live
 _eclasses_=chromium	5c2107cf3513e4286a44e7dd3fa22456	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	gnome2-utils	dfd98be073cc8193fc79925566741ab0	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	pax-utils	0ace932c4045349c7fc1af0fe7091acf	portability	536c5e70c5fb252ed3b769e04aa3f05b	python	36d7e2b7aa4dce62364c72eec96610cf	subversion	b1dabda0045f060f19070d67a57c1a21	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	0c41ff55e46b959d9457dde69e7a09d9
-_md5_=d1d49939be1d29a6499858817ce8f39f
+_md5_=a0e9c19ec81472a392cf88bda6167501
diff --git a/metadata/md5-cache/x11-libs/libXaw3d-1.6.2 b/metadata/md5-cache/x11-libs/libXaw3d-1.6.2
index 144e43fff357..2df08e8688ca 100644
--- a/metadata/md5-cache/x11-libs/libXaw3d-1.6.2
+++ b/metadata/md5-cache/x11-libs/libXaw3d-1.6.2
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw3d-1.6.2.tar.bz2
 _eclasses_=autotools	9379e4c8f662d374e1ad511530869282	autotools-utils	681f2683d43562170fd2238e335b866c	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
-_md5_=c6dfbc3d58bb11188a62183c8bbdae04
+_md5_=90081b0193c26ac844fd9c06e3196eae
diff --git a/metadata/md5-cache/x11-libs/libwnck-2.31.0 b/metadata/md5-cache/x11-libs/libwnck-2.31.0
index f057979b642b..da097dd70e95 100644
--- a/metadata/md5-cache/x11-libs/libwnck-2.31.0
+++ b/metadata/md5-cache/x11-libs/libwnck-2.31.0
@@ -4,10 +4,10 @@ DESCRIPTION=A window navigation construction kit
 EAPI=4
 HOMEPAGE=http://www.gnome.org/
 IUSE=doc +introspection startup-notification
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.19.7:2[introspection?] >=dev-libs/glib-2.16:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=dev-libs/gobject-introspection-0.6.14 ) startup-notification? ( >=x11-libs/startup-notification-0.4 )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libwnck/2.31/libwnck-2.31.0.tar.xz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	b6186c6d7990c0c8aafb64c553f3625b	gnome2-utils	dfd98be073cc8193fc79925566741ab0	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=e859b3486fd7b60de1bd9b2f7500c71a
+_md5_=dec129e0b33093cca40a2d4a168cdf64
diff --git a/metadata/md5-cache/x11-libs/pixman-0.26.0 b/metadata/md5-cache/x11-libs/pixman-0.26.0
new file mode 100644
index 000000000000..8e61483f6ad3
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/pixman-0.26.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=Low-level pixel manipulation routines
+EAPI=4
+HOMEPAGE=http://xorg.freedesktop.org/
+IUSE=altivec iwmmxt mmx neon sse2 test static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.26.0.tar.bz2
+_eclasses_=autotools	9379e4c8f662d374e1ad511530869282	autotools-utils	681f2683d43562170fd2238e335b866c	eutils	39af24987a4a7a34dccf2ef9cc6af3f7	flag-o-matic	90717f74af9d5b0f435a0e0be03145df	libtool	46e19fa7553f66c48ebc7cf025acd3ed	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4	xorg-2	1f3d4a23685b76726bd19b731cdf28e6
+_md5_=5206c789880921ef14d00b6d250ec1db
diff --git a/metadata/md5-cache/x11-misc/spacefm-0.7.4 b/metadata/md5-cache/x11-misc/spacefm-0.7.4
deleted file mode 100644
index 855818a9363f..000000000000
--- a/metadata/md5-cache/x11-misc/spacefm-0.7.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm
-DEPEND=dev-libs/glib:2 dev-util/desktop-file-utils sys-apps/dbus virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/startup-notification x11-misc/shared-mime-info !kernel_linux? ( virtual/fam ) dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=a multi-panel tabbed file manager
-EAPI=4
-HOMEPAGE=http://spacefm.sourceforge.net/
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils sys-apps/dbus virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/startup-notification x11-misc/shared-mime-info !kernel_linux? ( virtual/fam )
-SLOT=0
-SRC_URI=mirror://sourceforge/spacefm/spacefm-0.7.4.tar.xz
-_eclasses_=fdo-mime	0acfe1a88fd8751a1d5dc671168219fa
-_md5_=09d443413abfb0879559ccac9962b7c6
diff --git a/metadata/md5-cache/x11-misc/spacefm-0.7.5 b/metadata/md5-cache/x11-misc/spacefm-0.7.7
similarity index 59%
rename from metadata/md5-cache/x11-misc/spacefm-0.7.5
rename to metadata/md5-cache/x11-misc/spacefm-0.7.7
index a0123c6b9351..eda06014722c 100644
--- a/metadata/md5-cache/x11-misc/spacefm-0.7.5
+++ b/metadata/md5-cache/x11-misc/spacefm-0.7.7
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure postinst postrm
+DEFINED_PHASES=configure postinst postrm setup
 DEPEND=dev-libs/glib:2 dev-util/desktop-file-utils sys-apps/dbus >=sys-fs/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/startup-notification x11-misc/shared-mime-info dev-util/intltool virtual/pkgconfig sys-devel/gettext
 DESCRIPTION=A multi-panel tabbed file manager
 EAPI=4
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=dev-libs/glib:2 dev-util/desktop-file-utils sys-apps/dbus >=sys-fs/udev-143 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango x11-libs/startup-notification x11-misc/shared-mime-info
 SLOT=0
-SRC_URI=mirror://sourceforge/spacefm/spacefm-0.7.5.tar.xz
-_eclasses_=fdo-mime	0acfe1a88fd8751a1d5dc671168219fa
-_md5_=2a5639ac52fff3140589275b608566d5
+SRC_URI=mirror://sourceforge/spacefm/spacefm-0.7.7.tar.xz
+_eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	linux-info	cc184ad3383ffb6ffbaa82f53608e77f	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ca8f54bed254f725d97cd98c43c347f5
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.9 b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.9
index 440487a63a7d..57e4d426a715 100644
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.9
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.9
@@ -3,10 +3,10 @@ DEPEND=>=x11-misc/xdg-user-dirs-0.14 x11-libs/gtk+:3 dev-util/intltool virtual/p
 DESCRIPTION=xdg-user-dirs-gtk integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications
 EAPI=4
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/xdg-user-dirs
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=x11-misc/xdg-user-dirs-0.14 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/xdg-user-dirs-gtk/0.9/xdg-user-dirs-gtk-0.9.tar.xz
 _eclasses_=eutils	39af24987a4a7a34dccf2ef9cc6af3f7	gnome.org	8fef8f967214f56e08fa92d61163d891	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	toolchain-funcs	f71b9936acc911ed1cc84557d3b5c2b3	user	32a09e82e2f592bf88ad2fd08525166e	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=8deffde337976575f02ed42b1fb4a93d
+_md5_=c98571ec06961390cfc41629fe5429b2
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c6c4cc8f310e..283bbccf2fc5 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 27 May 2012 06:07:27 +0000
+Mon, 28 May 2012 03:07:28 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2a891f000c5b..de9a9ce4ef8a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun May 27 06:07:25 UTC 2012
+Mon May 28 03:07:26 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 35131dd08e6c..9bf37edd42d9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 27 May 2012 06:30:01 +0000
+Mon, 28 May 2012 03:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7b5b04ce44c6..6c4506a22266 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1338098701 Sun May 27 06:05:01 2012 UTC
+1338174301 Mon May 28 03:05:01 2012 UTC
diff --git a/net-libs/dhcpcd-dbus/dhcpcd-dbus-0.6.0.ebuild b/net-libs/dhcpcd-dbus/dhcpcd-dbus-0.6.0.ebuild
index 003575647346..6bc704c0864d 100644
--- a/net-libs/dhcpcd-dbus/dhcpcd-dbus-0.6.0.ebuild
+++ b/net-libs/dhcpcd-dbus/dhcpcd-dbus-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/dhcpcd-dbus/dhcpcd-dbus-0.6.0.ebuild,v 1.2 2012/05/26 23:49:12 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/dhcpcd-dbus/dhcpcd-dbus-0.6.0.ebuild,v 1.3 2012/05/28 00:13:18 mr_bones_ Exp $
 
 EAPI=4
 
@@ -20,4 +20,3 @@ RDEPEND="${DEPEND}
 src_configure() {
 	econf --localstatedir=/var
 }
-
diff --git a/net-libs/libgsasl/libgsasl-1.6.1.ebuild b/net-libs/libgsasl/libgsasl-1.6.1.ebuild
index 8d754efe67c3..88b41d6484a7 100644
--- a/net-libs/libgsasl/libgsasl-1.6.1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.6.1.ebuild,v 1.12 2011/12/20 11:53:39 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgsasl/libgsasl-1.6.1.ebuild,v 1.13 2012/05/27 17:39:13 maekke Exp $
 
 EAPI="3"
 
@@ -14,7 +14,7 @@ SLOT="0"
 # TODO: check http://www.gnu.org/software/gsasl/#dependencies for more
 # 	optional external libraries.
 #   * ntlm - libntlm ( http://josefsson.org/libntlm/ )
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="idn gcrypt kerberos nls static-libs"
 DEPEND="
 	gcrypt? ( dev-libs/libgcrypt )
diff --git a/net-libs/rest/rest-0.7.12.ebuild b/net-libs/rest/rest-0.7.12.ebuild
index 75e694e45400..eafc983039b7 100644
--- a/net-libs/rest/rest-0.7.12.ebuild
+++ b/net-libs/rest/rest-0.7.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rest/rest-0.7.12.ebuild,v 1.4 2012/05/05 02:54:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rest/rest-0.7.12.ebuild,v 1.5 2012/05/27 18:20:06 mattst88 Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://git.gnome.org/browse/librest"
 
 LICENSE="LGPL-2.1"
 SLOT="0.7"
-KEYWORDS="amd64 x86"
+KEYWORDS="~alpha amd64 x86"
 IUSE="doc +gnome +introspection test"
 
 # Coverage testing should not be enabled
diff --git a/net-misc/italc/Manifest b/net-misc/italc/Manifest
index bd2eec4ed68a..a92fb8552429 100644
--- a/net-misc/italc/Manifest
+++ b/net-misc/italc/Manifest
@@ -1 +1,2 @@
 DIST italc-1.0.9.tar.bz2 2737753 RMD160 299d443e17307bf196e29de1d159b9e5a4ba1a05 SHA1 f87b0666a96101f552612678c519f2ed21f65ed1 SHA256 0f810816b1a0e7ccecc4adbf289a0e61e93ba0d29412dd36b8553456c72b2ce0
+DIST italc-2.0.0.tar.bz2 3413075 RMD160 be43ba4a90cd7c68917d8f61ba6edd18286a44f5 SHA1 a5aa531beddc24512a8818f285c07781bc9e4e47 SHA256 edb5e0502ad73e3398f63e2f485fa7ca7d12cae50315801ac3f22304ccdb6aac
diff --git a/net-misc/italc/italc-2.0.0.ebuild b/net-misc/italc/italc-2.0.0.ebuild
new file mode 100644
index 000000000000..4ec669d9fb84
--- /dev/null
+++ b/net-misc/italc/italc-2.0.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/italc/italc-2.0.0.ebuild,v 1.1 2012/05/27 15:34:52 xmw Exp $
+
+EAPI=4
+
+inherit qt4-r2 eutils cmake-utils
+
+DESCRIPTION="Intelligent Teaching And Learning with Computers (iTALC) supports working with computers in school"
+HOMEPAGE="http://italc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/italc/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+PROPERTIES="interactive"
+
+RDEPEND="dev-libs/lzo
+	sys-apps/tcp-wrappers
+	virtual/jpeg
+	sys-libs/zlib
+	dev-libs/openssl
+	x11-libs/qt-core
+	x11-libs/qt-xmlpatterns
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-apps/xinput
+	x11-libs/qt-gui:4"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto"
+
+pkg_setup() {
+	enewgroup italc
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc TODO README AUTHORS INSTALL ChangeLog
+}
+
+pkg_postinst() {
+	elog "On the master, please run "
+	elog "# emerge --config =${CATEGORY}/${PF}"
+
+	elog "Please add the logins of master users (teachers) to the italc group by running"
+	elog "# usermod -a -G italc <loginname>"
+
+	elog ""
+}
+
+pkg_config() {
+	if [ ! -d /etc/italc/keys ] ; then
+		einfo "Creating public and private keys for italc in /etc/italc/keys."
+		/usr/bin/ica -role teacher -createkeypair > /dev/null
+		eend $?
+		einfo "Setting chmod 640 on private keys."
+		chgrp -R italc /etc/italc
+		chmod -R o-rwx /etc/italc/keys/private
+	else
+		einfo "Not creating new keypair, as /etc/italc/keys already exists"
+	fi
+}
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 95faf77bd6ed..e6bcd0a674d6 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -1,2 +1,2 @@
-DIST mosh-1.2.0.95.tar.gz 176065 RMD160 6221fbae9e6ae644f3e3b03f3ad698ce3a50b2cc SHA1 4eea379b965b660c5edd6a36822000ff3944c02e SHA256 cd2a8680aa6ed68cbfbd328cca0f83f7dd07456788b36f32aecd6c736ce47f8c
 DIST mosh-1.2.0.97.tar.gz 282447 RMD160 db9f2cb88d16866f6c758e65c8dda51a2f5448b0 SHA1 98fd53c08cbb8f943666b072fcab2f9ac594fb78 SHA256 75c4651c5d667cbff55144273f2c582762942f474c0e722ee635eaed1b3a3022
+DIST mosh-1.2.1.tar.gz 282635 RMD160 efed9fcebd1d7538a6995d087a30d3246cf37fb5 SHA1 73b95b11699d8321c749a9590e0c12caeed52405 SHA256 e11e050a8d15603caa32d0f874c39245d1bffa258c7dadfc5f8d820d6ff61656
diff --git a/net-misc/mosh/mosh-1.2.0.95.ebuild b/net-misc/mosh/mosh-1.2.1.ebuild
similarity index 64%
rename from net-misc/mosh/mosh-1.2.0.95.ebuild
rename to net-misc/mosh/mosh-1.2.1.ebuild
index 281f93626118..8765d5db70bd 100644
--- a/net-misc/mosh/mosh-1.2.0.95.ebuild
+++ b/net-misc/mosh/mosh-1.2.1.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.0.95.ebuild,v 1.2 2012/05/23 22:27:31 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.1.ebuild,v 1.1 2012/05/27 06:21:28 xmw Exp $
 
 EAPI=4
 
-inherit autotools eutils toolchain-funcs
-
 DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
 HOMEPAGE="http://mosh.mit.edu"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/keithw/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+client examples +server +utempter"
+IUSE="bash-completion +client examples +server ufw +utempter"
 REQUIRED_USE="|| ( client server )
 	examples? ( client )"
 
@@ -26,15 +24,14 @@ RDEPEND="dev-libs/protobuf
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	eautoreconf
-}
-
 src_configure() {
 	econf \
+		$(use_enable test tests) \
+		$(use_enable bash-completion completion) \
 		$(use_enable client) \
 		$(use_enable server) \
 		$(use_enable examples) \
+		$(use_enable ufw) \
 		$(use_with utempter)
 }
 
@@ -42,6 +39,13 @@ src_compile() {
 	emake V=1
 }
 
+src_test() {
+	einfo "running test encrypt-decrypt"
+	./src/tests/encrypt-decrypt -q || die
+	einfo "running test ocb-aes"
+	./src/tests/ocb-aes -q || die
+}
+
 src_install() {
 	default
 
diff --git a/net-misc/mosh/mosh-9999.ebuild b/net-misc/mosh/mosh-9999.ebuild
index 960d28ecc9f4..0d894369ecdf 100644
--- a/net-misc/mosh/mosh-9999.ebuild
+++ b/net-misc/mosh/mosh-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-9999.ebuild,v 1.9 2012/05/23 22:27:31 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-9999.ebuild,v 1.10 2012/05/27 06:21:28 xmw Exp $
 
 EAPI=4
 EGIT_REPO_URI="https://github.com/keithw/mosh.git"
 
-inherit autotools git-2 toolchain-funcs
+inherit autotools git-2
 
 DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
 HOMEPAGE="http://mosh.mit.edu"
diff --git a/net-misc/openvpn/openvpn-2.2.2.ebuild b/net-misc/openvpn/openvpn-2.2.2.ebuild
index 32d8eda93850..3dc04f61faa7 100644
--- a/net-misc/openvpn/openvpn-2.2.2.ebuild
+++ b/net-misc/openvpn/openvpn-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.2.2.ebuild,v 1.9 2012/05/23 14:44:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.2.2.ebuild,v 1.10 2012/05/27 12:50:14 maekke Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="examples iproute2 minimal pam passwordsave selinux +ssl static pkcs11 userland_BSD"
 
 DEPEND=">=dev-libs/lzo-1.07
diff --git a/net-nds/openldap/files/slapd-initd-2.4.28-r1 b/net-nds/openldap/files/slapd-initd-2.4.28-r1
index 01e9d90c4737..48946d6ef301 100644
--- a/net-nds/openldap/files/slapd-initd-2.4.28-r1
+++ b/net-nds/openldap/files/slapd-initd-2.4.28-r1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1,v 1.3 2012/05/25 22:21:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1,v 1.4 2012/05/27 07:22:43 robbat2 Exp $
 
 extra_commands="checkconfig"
 
@@ -14,7 +14,7 @@ depend() {
 }
 
 start() {
-	checkpath -q -d /var/run/openldap/ -u ldap:ldap 
+	checkpath -q -d /var/run/openldap/ -o ldap:ldap 
 	if ! checkconfig -Q ; then
 		eerror "There is a problem with your slapd.conf!"
 		return 1
diff --git a/net-nds/openldap/openldap-2.4.31-r1.ebuild b/net-nds/openldap/openldap-2.4.31-r1.ebuild
new file mode 100644
index 000000000000..76741fcc631b
--- /dev/null
+++ b/net-nds/openldap/openldap-2.4.31-r1.ebuild
@@ -0,0 +1,669 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.31-r1.ebuild,v 1.1 2012/05/27 07:22:43 robbat2 Exp $
+
+EAPI="4"
+
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20120525
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="http://www.OpenLDAP.org/"
+SRC_URI="mirror://openldap/openldap-release/${P}.tgz
+		 mirror://gentoo/${BIS_P}"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
+IUSE_BACKEND="+berkdb"
+IUSE_OVERLAY="overlays perl"
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux"
+IUSE_CONTRIB="smbkrb5passwd kerberos"
+IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+
+REQUIRED_USE="cxx? ( sasl )"
+
+# openssl is needed to generate lanman-passwords required by samba
+RDEPEND="sys-libs/ncurses
+	sys-devel/libtool
+	icu? ( dev-libs/icu )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( !gnutls? ( dev-libs/openssl )
+		gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) )
+	sasl? ( dev-libs/cyrus-sasl )
+	!minimal? (
+		odbc? ( !iodbc? ( dev-db/unixODBC )
+			iodbc? ( dev-db/libiodbc ) )
+		slp? ( net-libs/openslp )
+		perl? ( dev-lang/perl[-build] )
+		samba? ( dev-libs/openssl )
+		berkdb? ( sys-libs/db )
+		smbkrb5passwd? (
+			dev-libs/openssl
+			app-crypt/heimdal )
+		kerberos? ( virtual/krb5 )
+		cxx? ( dev-libs/cyrus-sasl )
+	)
+	selinux? ( sec-policy/selinux-ldap )"
+DEPEND="${RDEPEND}
+	sys-apps/groff"
+
+# for tracking versions
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+openldap_filecount() {
+	local dir="$1"
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG.example' | wc -l
+}
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	openldap_datadirs=""
+	if [ -f "${EROOT}"/etc/openldap/slapd.conf ]; then
+		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${EROOT}/etc/openldap/slapd.conf)"
+	fi
+	openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}"
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	have_files=0
+	for each in ${openldap_datadirs}; do
+		CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"`
+		CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}
+		if [ -d ${CURRENT_TAGDIR} ] &&	[ ${openldap_found_tag} == 0 ] ; then
+			einfo "- Checking ${each}..."
+			if [ -r ${CURRENT_TAG} ] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source ${CURRENT_TAG}
+				if [ "${OLDPF}" == "" ] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}`
+
+				[ $(openldap_filecount ${CURRENT_TAGDIR}) -gt 0 ] && have_files=1
+
+				# are we on the same branch?
+				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ "${have_files}" == "1" ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				[ $(openldap_filecount ${each}) -gt 0 ] && have_files=1
+				if [[ "${have_files}" == "1" ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					openldap_upgrade_howto
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+	[ "${have_files}" == "1" ] && einfo "DB files present" || einfo "No DB files present"
+
+	# Now we must check for the major version of sys-libs/db linked against.
+	SLAPD_PATH=${EROOT}/usr/$(get_libdir)/openldap/slapd
+	if [ "${have_files}" == "1" -a -f "${SLAPD_PATH}" ]; then
+		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
+			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
+		NEWVER="$(use berkdb && db_findver sys-libs/db)"
+		local fail=0
+		if [ -z "${OLDVER}" -a -z "${NEWVER}" ]; then
+			:
+			# Nothing wrong here.
+		elif [ -z "${OLDVER}" -a -n "${NEWVER}" ]; then
+			eerror "	Your existing version of OpenLDAP was not built against"
+			eerror "	any version of sys-libs/db, but the new one will build"
+			eerror "	against	${NEWVER} and your database may be inaccessible."
+			echo
+			fail=1
+		elif [ -n "${OLDVER}" -a -z "${NEWVER}" ]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
+			eerror "	built against any version and your database may be"
+			eerror "	inaccessible."
+			echo
+			fail=1
+		elif [ "${OLDVER}" != "${NEWVER}" ]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
+			eerror "	${NEWVER} and your database would be inaccessible."
+			echo
+			fail=1
+		fi
+		[ "${fail}" == "1" ] && openldap_upgrade_howto
+	fi
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+}
+
+openldap_upgrade_howto() {
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades can corrupt your database,"
+	eerror "you need to dump your database and re-create it afterwards."
+	eerror
+	eerror "Additionally, rebuilding against different major versions of the"
+	eerror "sys-libs/db libraries will cause your database to be inaccessible."
+	eerror ""
+	d="$(date -u +%s)"
+	l="/root/ldapdump.${d}"
+	i="${l}.raw"
+	eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
+	eerror " 2. slapcat -l ${i}"
+	eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
+	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. check that your data is intact."
+	eerror "11. set up the new replication system."
+	eerror
+	if [ "${FORCE_UPGRADE}" != "1" ]; then
+		die "You need to upgrade your database first"
+	else
+		eerror "You have the magical FORCE_UPGRADE=1 in place."
+		eerror "Don't say you weren't warned about data loss."
+	fi
+}
+
+pkg_setup() {
+	if ! use sasl && use cxx ; then
+		die "To build the ldapc++ library you must emerge openldap with sasl support"
+	fi
+	# Bug #322787
+	if use minimal && ! has_version "net-nds/openldap" ; then
+		einfo "No datadir scan needed, openldap not installed"
+	elif use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then
+		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	else
+		openldap_find_versiontags
+	fi
+
+	enewgroup ldap 439
+	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
+}
+
+src_prepare() {
+	# ensure correct SLAPI path by default
+	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \
+		"${S}"/include/ldap_defaults.h
+
+	epatch "${FILESDIR}"/${PN}-2.4.17-gcc44.patch
+
+	epatch \
+		"${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \
+		"${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
+
+	# bug #116045 - still present in 2.4.28
+	epatch "${FILESDIR}"/${PN}-2.4.28-contrib-smbk5pwd.patch
+	# bug #408077 - samba4
+	epatch "${FILESDIR}"/${PN}-2.4.30-contrib-samba4.patch
+
+	# bug #189817
+	epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
+
+	# bug #233633
+	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
+
+	# bug #281495
+	epatch "${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
+	# bug #294350
+	epatch "${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch
+
+	# unbreak /bin/sh -> dash
+	epatch "${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
+
+	cd "${S}"/build
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to block stripping"
+
+	# wrong assumption that /bin/sh is /bin/bash
+	sed -i \
+		-e 's|/bin/sh|/bin/bash|g' \
+		"${S}"/tests/scripts/* || die "sed failed"
+
+	cd "${S}"
+	AT_NOEAUTOMAKE=yes eautoreconf
+}
+
+build_contrib_module() {
+	lt="${S}/libtool"
+	# <dir> <sources> <outputname>
+	cd "${S}/contrib/slapd-modules/$1"
+	einfo "Compiling contrib-module: $3"
+	# Make sure it's uppercase
+	local define_name="$(echo "SLAPD_OVER_${1}" | LC_ALL=C tr '[:lower:]' '[:upper:]')"
+	"${lt}" --mode=compile --tag=CC \
+		"${CC}" \
+		-D${define_name}=SLAPD_MOD_DYNAMIC \
+		-I../../../include -I../../../servers/slapd ${CFLAGS} \
+		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
+	einfo "Linking contrib-module: $3"
+	"${lt}" --mode=link --tag=CC \
+		"${CC}" -module \
+		${CFLAGS} \
+		${LDFLAGS} \
+		-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+		-o $3.la ${2%.c}.lo || die "linking $3 failed"
+}
+
+src_configure() {
+	local myconf
+
+	#Fix for glibc-2.8 and ucred. Bug 228457.
+	append-flags -D_GNU_SOURCE
+
+	# Bug 408001
+	use elibc_FreeBSD && append-flags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
+
+	use debug && myconf="${myconf} $(use_enable debug)"
+
+	# ICU usage is not configurable
+	export ac_cv_header_unicode_utypes_h="$(use icu && echo yes || echo no)"
+
+	if ! use minimal ; then
+		# re-enable serverside overlay chains per bug #296567
+		# see ldap docs chaper 12.3.1 for details
+		myconf="${myconf} --enable-ldap"
+
+		# backends
+		myconf="${myconf} --enable-slapd"
+		if use berkdb ; then
+			einfo "Using Berkeley DB for local backend"
+			myconf="${myconf} --enable-bdb --enable-hdb"
+			# We need to include the slotted db.h dir for FreeBSD
+			append-cppflags -I$(db_includedir)
+		else
+			ewarn
+			ewarn "Note: if you disable berkdb, you can only use remote-backends!"
+			ewarn
+			ebeep 5
+			myconf="${myconf} --disable-bdb --disable-hdb"
+		fi
+		for backend in dnssrv ldap meta monitor null passwd relay shell sock; do
+			myconf="${myconf} --enable-${backend}=mod"
+		done
+
+		myconf="${myconf} $(use_enable perl perl mod)"
+
+		myconf="${myconf} $(use_enable odbc sql mod)"
+		if use odbc ; then
+			local odbc_lib="unixodbc"
+			if use iodbc ; then
+				odbc_lib="iodbc"
+				append-cppflags -I"${EPREFIX}"/usr/include/iodbc
+			fi
+			myconf="${myconf} --with-odbc=${odbc_lib}"
+		fi
+
+		# slapd options
+		myconf="${myconf} $(use_enable crypt) $(use_enable slp)"
+		myconf="${myconf} $(use_enable samba lmpasswd) $(use_enable syslog)"
+		if use experimental ; then
+			myconf="${myconf} --enable-dynacl"
+			myconf="${myconf} --enable-aci=mod"
+		fi
+		for option in aci cleartext modules rewrite rlookups slapi; do
+			myconf="${myconf} --enable-${option}"
+		done
+
+		# slapd overlay options
+		# Compile-in the syncprov, the others as module
+		myconf="${myconf} --enable-syncprov=yes"
+		use overlays && myconf="${myconf} --enable-overlays=mod"
+
+	else
+		myconf="${myconf} --disable-slapd --disable-bdb --disable-hdb"
+		myconf="${myconf} --disable-overlays --disable-syslog"
+	fi
+
+	# basic functionality stuff
+	myconf="${myconf} $(use_enable ipv6)"
+	myconf="${myconf} $(use_with sasl cyrus-sasl) $(use_enable sasl spasswd)"
+	myconf="${myconf} $(use_enable tcpd wrappers)"
+
+	local ssl_lib="no"
+	if use ssl || ( use ! minimal && use samba ) ; then
+		ssl_lib="openssl"
+		use gnutls && ssl_lib="gnutls"
+	fi
+
+	myconf="${myconf} --with-tls=${ssl_lib}"
+
+	for basicflag in dynamic local proctitle shared static; do
+		myconf="${myconf} --enable-${basicflag}"
+	done
+
+	# connectionless ldap per bug #342439
+	append-cppflags -DLDAP_CONNECTIONLESS
+
+	tc-export CC AR CXX
+	STRIP=/bin/true \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
+		${myconf} || die "econf failed"
+}
+
+src_configure_cxx() {
+	# This needs the libraries built by the first build run.
+	# So we have to run it AFTER the main build, not just after the main
+	# configure.
+	if ! use minimal ; then
+		 if use cxx ; then
+		 	local myconf_ldapcpp
+		 	myconf_ldapcpp="${myconf_ldapcpp} --with-ldap-includes=../../include"
+		 	cd "${S}/contrib/ldapc++"
+		 	OLD_LDFLAGS="$LDFLAGS"
+		 	OLD_CPPFLAGS="$CPPFLAGS"
+		 	append-ldflags -L../../libraries/liblber/.libs -L../../libraries/libldap/.libs
+		 	append-ldflags -L../../../libraries/liblber/.libs -L../../../libraries/libldap/.libs
+		 	append-cppflags -I../../../include
+		 	econf ${myconf_ldapcpp} \
+		 		CC="${CC}" \
+		 		CXX="${CXX}" \
+		 		|| die "econf ldapc++ failed"
+		 	CPPFLAGS="$OLD_CPPFLAGS"
+			LDFLAGS="${OLD_LDFLAGS}"
+		 fi
+	fi
+}
+
+src_compile() {
+	emake depend || die "emake depend failed"
+	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/bash || die "emake failed"
+	lt="${S}/libtool"
+	export echo="echo"
+
+	if ! use minimal ; then
+		 if use cxx ; then
+		 	einfo "Building contrib library: ldapc++"
+			src_configure_cxx
+		 	cd "${S}/contrib/ldapc++"
+		 	emake \
+		 		CC="${CC}" CXX="${CXX}" \
+		 		|| die "emake ldapc++ failed"
+		 fi
+
+		if use smbkrb5passwd ; then
+			einfo "Building contrib-module: smbk5pwd"
+			cd "${S}/contrib/slapd-modules/smbk5pwd"
+
+			emake \
+				DEFS="-DDO_SAMBA -DDO_KRB5 -DDO_SHADOW" \
+				KRB5_INC="$(krb5-config --cflags)" \
+				CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" \
+				|| die "emake smbk5pwd failed"
+		fi
+
+		if use overlays ; then
+			einfo "Building contrib-module: samba4"
+			cd "${S}/contrib/slapd-modules/samba4"
+
+			emake \
+				CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \
+				|| die "emake samba4 failed"
+		fi
+
+		if use kerberos ; then
+			cd "${S}/contrib/slapd-modules/passwd"
+			einfo "Compiling contrib-module: pw-kerberos"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I../../../include \
+				${CFLAGS} \
+				$(krb5-config --cflags) \
+				-DHAVE_KRB5 \
+				-o kerberos.lo \
+				-c kerberos.c || die "compiling pw-kerberos failed"
+			einfo "Linking contrib-module: pw-kerberos"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-kerberos.la \
+				kerberos.lo || die "linking pw-kerberos failed"
+		fi
+		# We could build pw-radius if GNURadius would install radlib.h
+		cd "${S}/contrib/slapd-modules/passwd"
+		einfo "Compiling contrib-module: pw-netscape"
+		"${lt}" --mode=compile --tag=CC \
+			"${CC}" \
+			-I../../../include \
+			${CFLAGS} \
+			-o netscape.lo \
+			-c netscape.c || die "compiling pw-netscape failed"
+		einfo "Linking contrib-module: pw-netscape"
+		"${lt}" --mode=link --tag=CC \
+			"${CC}" -module \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+			-o pw-netscape.la \
+			netscape.lo || die "linking pw-netscape failed"
+
+		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
+		build_contrib_module "allop" "allop.c" "overlay-allop"
+		build_contrib_module "allowed" "allowed.c" "allowed"
+		build_contrib_module "autogroup" "autogroup.c" "autogroup"
+		build_contrib_module "denyop" "denyop.c" "denyop-overlay"
+		build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
+		# lastmod may not play well with other overlays
+		build_contrib_module "lastmod" "lastmod.c" "lastmod"
+		build_contrib_module "nops" "nops.c" "nops-overlay"
+	    build_contrib_module "trace" "trace.c" "trace"
+		# build slapi-plugins
+		cd "${S}/contrib/slapi-plugins/addrdnvalues"
+		einfo "Building contrib-module: addrdnvalues plugin"
+		"${CC}" -shared \
+			-I../../../include \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o libaddrdnvalues-plugin.so \
+			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+
+	fi
+}
+
+src_test() {
+	cd tests ; make tests || die "make tests failed"
+}
+
+src_install() {
+	lt="${S}/libtool"
+	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/bash install || die "make install failed"
+
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README "${FILESDIR}"/DB_CONFIG.fast.example
+	docinto rfc ; dodoc doc/rfc/*.txt
+
+	# openldap modules go here
+	# TODO: write some code to populate slapd.conf with moduleload statements
+	keepdir /usr/$(get_libdir)/openldap/openldap/
+
+	# initial data storage dir
+	keepdir /var/lib/openldap-data
+	use prefix || fowners ldap:ldap /var/lib/openldap-data
+	fperms 0700 /var/lib/openldap-data
+
+	echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+	echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+	echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+	# change slapd.pid location in configuration file
+	keepdir /var/run/openldap
+	use prefix || fowners ldap:ldap /var/run/openldap
+	fperms 0755 /var/run/openldap
+
+	if ! use minimal; then
+		# use our config
+		rm "${ED}"etc/openldap/slapd.conf
+		insinto /etc/openldap
+		newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf
+		configfile="${ED}"etc/openldap/slapd.conf
+
+		# populate with built backends
+		ebegin "populate config with built backends"
+		for x in "${ED}"usr/$(get_libdir)/openldap/openldap/back_*.so; do
+			elog "Adding $(basename ${x})"
+			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}"
+		done
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
+		use prefix || fowners root:ldap /etc/openldap/slapd.conf
+		fperms 0640 /etc/openldap/slapd.conf
+		cp "${configfile}" "${configfile}".default
+		eend
+
+		# install our own init scripts
+		newinitd "${FILESDIR}"/slapd-initd-2.4.28-r1 slapd
+		newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
+		if [ $(get_libdir) != lib ]; then
+			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${ED}"etc/init.d/slapd
+		fi
+		# If built without SLP, we don't need to be before avahi
+		use slp \
+			|| sed -i \
+				-e '/before/{s/avahi-daemon//g}' \
+				"${ED}"etc/init.d/slapd
+
+		 if use cxx ; then
+		 	einfo "Install the ldapc++ library"
+		 	cd "${S}/contrib/ldapc++"
+		 	emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install || die "emake install ldapc++ failed"
+		 	newdoc README ldapc++-README
+		 fi
+
+		if use smbkrb5passwd ; then
+			einfo "Install the smbk5pwd module"
+			cd "${S}/contrib/slapd-modules/smbk5pwd"
+			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install || die "emake install smbk5pwd failed"
+			newdoc README smbk5pwd-README
+		fi
+
+		if use overlays ; then
+			einfo "Install the samba4 module"
+			cd "${S}/contrib/slapd-modules/samba4"
+			emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install samba4 failed"
+			newdoc README samba4-README
+		fi
+
+		einfo "Installing contrib modules"
+		cd "${S}/contrib/slapd-modules"
+		for l in */*.la; do
+			"${lt}" --mode=install cp ${l} \
+				"${ED}"usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
+		docinto contrib
+		newdoc addpartial/README addpartial-README
+		newdoc allop/README allop-README
+		doman allop/slapo-allop.5
+		newdoc autogroup/README autogroup-README
+		newdoc denyop/denyop.c denyop-denyop.c
+		newdoc dsaschema/README dsaschema-README
+		doman lastmod/slapo-lastmod.5
+		doman nops/slapo-nops.5
+		newdoc passwd/README passwd-README
+		cd "${S}/contrib/slapi-plugins"
+		insinto /usr/$(get_libdir)/openldap/openldap
+		doins  */*.so
+		docinto contrib
+		newdoc addrdnvalues/README addrdnvalues-README
+
+		insinto /etc/openldap/schema
+		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
+	fi
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0)
+}
+
+pkg_postinst() {
+	if ! use minimal ; then
+		# You cannot build SSL certificates during src_install that will make
+		# binary packages containing your SSL key, which is both a security risk
+		# and a misconfiguration if multiple machines use the same key and cert.
+		if use ssl; then
+			install_cert /etc/openldap/ssl/ldap
+			use prefix || chown ldap:ldap "${EROOT}"etc/openldap/ssl/ldap.*
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "add 'TLS_REQCERT never' if you want to use them."
+		fi
+
+		if use prefix; then
+			# Warn about prefix issues with slapd
+			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
+			eerror "to start up, and requires that certain files directories be owned by"
+			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
+			eerror "directories, you will have to manually fix this yourself."
+		fi
+
+		# These lines force the permissions of various content to be correct
+		use prefix || chown ldap:ldap "${EROOT}"var/run/openldap
+		chmod 0755 "${EROOT}"var/run/openldap
+		use prefix || chown root:ldap "${EROOT}"etc/openldap/slapd.conf{,.default}
+		chmod 0640 "${EROOT}"etc/openldap/slapd.conf{,.default}
+		use prefix || chown ldap:ldap "${EROOT}"var/lib/openldap-data
+	fi
+
+	elog "Getting started using OpenLDAP? There is some documentation available:"
+	elog "Gentoo Guide to OpenLDAP Authentication"
+	elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
+	elog "---"
+	elog "An example file for tuning BDB backends with openldap is"
+	elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
+
+	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0)
+}
diff --git a/net-nntp/tin/tin-2.0.0.ebuild b/net-nntp/tin/tin-2.0.0.ebuild
index 480977438a3c..9026d6afb6ae 100644
--- a/net-nntp/tin/tin-2.0.0.ebuild
+++ b/net-nntp/tin/tin-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/tin-2.0.0.ebuild,v 1.4 2012/05/21 10:03:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/tin/tin-2.0.0.ebuild,v 1.5 2012/05/27 17:47:16 maekke Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/v$(get_version_component_range 1
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 arm ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cancel-locks debug doc +etiquette evil forgery gpg idn ipv6 mime nls sasl socks5 spell unicode"
 
 RDEPEND="
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.2.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.2.ebuild
index a755e87767a8..f13f228eec05 100644
--- a/net-print/cups-pk-helper/cups-pk-helper-0.2.2.ebuild
+++ b/net-print/cups-pk-helper/cups-pk-helper-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pk-helper/cups-pk-helper-0.2.2.ebuild,v 1.3 2012/05/03 07:22:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-pk-helper/cups-pk-helper-0.2.2.ebuild,v 1.4 2012/05/27 23:12:09 mattst88 Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
 IUSE=""
 
 # Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92
diff --git a/net-zope/zope-interface/zope-interface-3.8.0.ebuild b/net-zope/zope-interface/zope-interface-3.8.0.ebuild
index 7a7c5c9dfa51..8175a104aedd 100644
--- a/net-zope/zope-interface/zope-interface-3.8.0.ebuild
+++ b/net-zope/zope-interface/zope-interface-3.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-interface/zope-interface-3.8.0.ebuild,v 1.6 2012/05/23 13:20:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-interface/zope-interface-3.8.0.ebuild,v 1.7 2012/05/27 13:01:09 maekke Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # net-zope/zope-fixers is required for building with Python 3.
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index ae5c1f6a680b..db1bbcaca825 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.86 2012/05/25 17:42:50 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.87 2012/05/27 18:25:29 mattst88 Exp $
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (25 May 2012)
 # Remove mask entry when app-misc/geoclue and app-accessibility/at-spi2-core
@@ -87,10 +87,6 @@ media-video/totem youtube
 # needs sys-libs/libcap-ng that is masked right now
 sys-apps/smartmontools caps
 
-# Nirbheek Chauhan <nirbheek@gentoo.org> (10 Dec 2010)
-# net-misc/connman is not keyworded, bug 348308
-mail-client/evolution connman
-
 # Raúl Porcel <armin76@gentoo.org> (5 Dec 2010)
 # Mask doc-pdf because of Java dependencies (bug #347259)
 net-analyzer/wireshark doc-pdf
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 59b17644e105..ca1d641f5ef3 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/use.mask,v 1.61 2012/05/26 17:03:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/use.mask,v 1.64 2012/05/27 23:25:56 mattst88 Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -alpha
@@ -188,3 +188,15 @@ d3d
 # Matt Turner <mattst88@gentoo.org) (10 Feb 2012)
 # mask wayland since dev-libs/wayland isn't keyworded
 wayland
+
+# Matt Turner <mattst88@gentoo.org (27 May 2012)
+# net-misc/connman is not keyworded
+connman
+
+# Matt Turner <mattst88@gentoo.org (27 May 2012)
+# net-libs/gnome-online-accounts is not keyworded
+gnome-online-accounts
+
+# Matt Turner <mattst88@gentoo.org (27 May 2012)
+# sys-apps/entropy is not keyworded
+entropy
diff --git a/profiles/package.mask b/profiles/package.mask
index 9ea7a26f6e94..67c2d4574073 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13793 2012/05/26 18:17:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13796 2012/05/27 17:17:39 dilfridge Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,33 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2012)
+# The successor of KOffice, Calligra, has now become stable
+# and we are removing KOffice soon from the portage tree.   
+# Please upgrade; you can do that with the following commands:
+#  emerge --deselect karbon kexi koffice-data koffice-l10n koffice-libs koffice-meta kplato kpresenter krita kspread kword
+#  emerge app-office/calligra app-office/calligra-l10n
+app-office/karbon
+app-office/kexi
+app-office/koffice-data
+app-office/koffice-l10n
+app-office/koffice-libs
+app-office/koffice-meta
+app-office/kplato
+app-office/kpresenter
+app-office/krita
+app-office/kspread
+app-office/kword
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2012)
+# Mask unreleased, alpha, and beta
+~app-office/calligra-2.4.2
+~app-office/calligra-2.4.90
+
+# Markos Chandras <hwoarang@getnoo.org> (27 May 2012)
+# Mask alpha release
+=sci-electronics/qelectrotech-0.30_alpha*
+
 # Alexis Ballier <aballier@gentoo.org> (26 May 2012)
 # API/ABI has changed with this release.
 # Mask until the tree is fine.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3c001c37665f..2c24f2082ad8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4689,7 +4689,6 @@ sci-geosciences/grass:gmath - Enable gmath wrapper for BLAS/Lapack (virtual/blas
 sci-geosciences/gshhs:data - Add earth data with sci-geosciences/gshhs-data
 sci-geosciences/mapnik:gdal - Enable sci-libs/gdal library support
 sci-geosciences/mapnik:geos - Enable sci-libs/geos library support
-sci-geosciences/mapnik:nobfonts - Enable Dejavu fonts instead of built-in fonts
 sci-geosciences/mapserver:gdal - Enable sci-libs/gdal library support
 sci-geosciences/mapserver:geos - Enable sci-libs/geos library support
 sci-geosciences/mapserver:postgis - Enable dev-db/postgis support
@@ -5200,6 +5199,7 @@ sys-fs/lvm2:clvm - Allow users to build clustered lvm2
 sys-fs/lvm2:cman - Cman support for clustered lvm
 sys-fs/lvm2:lvm1 - Allow users to build lvm2 with lvm1 support
 sys-fs/lvm2:nolvmstatic - Allow users to build lvm2 dynamically
+sys-fs/lvm2:thin - Support for thin volumes
 sys-fs/mtpfs:mad - Enable handling of MP3's metadata
 sys-fs/ntfs3g:crypt - Add support for encrypted NTFS drives/partitions.
 sys-fs/ntfs3g:external-fuse - Use external FUSE library instead of internal one. Must be disabled for unprivileged mounting to work.
diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest
index 8c0b6a88c8df..929a52e81485 100644
--- a/sci-electronics/qelectrotech/Manifest
+++ b/sci-electronics/qelectrotech/Manifest
@@ -1 +1,2 @@
 DIST qelectrotech-0.22-src.tar.gz 2288318 RMD160 58e5cdfed9a2fa455d3b5033a83dfcc7417cd26b SHA1 a612b92115af4091b64a1316f28905069b41840e SHA256 505f62163ab942475e692b3ec2ce7ce68fa58051ebb5a1dfafad94386568d5d0
+DIST qelectrotech-0.3a-src.tar.gz 10284060 RMD160 493e1ed7dc90e6f88b1a6c3153ac24ce07bbbbf2 SHA1 007eb3f1f239e7b0a61524ed003bfd7369fce70e SHA256 a6cde28fd2e831bdc6c6bcc0fdbcbbfb5a4f747bb3039ed187cabeee66884d61
diff --git a/sci-electronics/qelectrotech/files/qelectrotech-0.3-fix-paths.patch b/sci-electronics/qelectrotech/files/qelectrotech-0.3-fix-paths.patch
new file mode 100644
index 000000000000..6b282f1a4547
--- /dev/null
+++ b/sci-electronics/qelectrotech/files/qelectrotech-0.3-fix-paths.patch
@@ -0,0 +1,50 @@
+Index: qelectrotech-0.3a-src/qelectrotech.pro
+===================================================================
+--- qelectrotech-0.3a-src.orig/qelectrotech.pro
++++ qelectrotech-0.3a-src/qelectrotech.pro
+@@ -5,20 +5,20 @@
+ # Chemins utilises pour la compilation et l'installation de QET
+ unix {
+ 	# Chemins UNIX
+-	COMPIL_PREFIX              = '/usr/local/'
+-	INSTALL_PREFIX             = '/usr/local/'
++	COMPIL_PREFIX              = '/usr/'
++	INSTALL_PREFIX             = '/usr/'
+ 	QET_BINARY_PATH            = 'bin/'
+ 	QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
+ 	QET_COMMON_TBT_PATH        = 'share/qelectrotech/titleblocks/'
+ 	QET_LANG_PATH              = 'share/qelectrotech/lang/'
+ 	QET_EXAMPLES_PATH          = 'share/qelectrotech/examples/'
+ 	QET_LICENSE_PATH           = 'doc/qelectrotech/'
+-	QET_MIME_XML_PATH          = '../share/mime/application/'
+-	QET_MIME_DESKTOP_PATH      = '../share/mimelnk/application/'
+-	QET_MIME_PACKAGE_PATH      = '../share/mime/packages/'
++	QET_MIME_XML_PATH          = 'share/mime/application/'
++	QET_MIME_DESKTOP_PATH      = 'share/mimelnk/application/'
++	QET_MIME_PACKAGE_PATH      = 'share/mime/packages/'
+ 	QET_DESKTOP_PATH           = 'share/applications/'
+ 	QET_ICONS_PATH             = 'share/icons/hicolor/'
+-	QET_MAN_PATH               = 'man/'
++	QET_MAN_PATH               = 'share/man/'
+ }
+ win32 {
+ 	# Chemins Windows
+@@ -102,9 +102,6 @@ lang.files         = $$replace(TRANSLATI
+ examples.path      = $$join(INSTALL_PREFIX,,,$${QET_EXAMPLES_PATH})
+ examples.files     = examples/*
+ 
+-copyright.path     = $$join(INSTALL_PREFIX,,,$${QET_LICENSE_PATH})
+-copyright.files    = LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog
+-
+ mime_xml.path      = $$join(INSTALL_PREFIX,,,$${QET_MIME_XML_PATH})
+ mime_xml.files     = misc/x-qet-*.xml
+ 
+@@ -131,7 +128,7 @@ man.files          = man/files/*
+ man.extra          = sh man/compress_man_pages.sh
+ 
+ # L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE
+-INSTALLS += target elements tbt lang copyright
++INSTALLS += target elements tbt lang
+ # Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel
+ unix {
+ 	INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.30_alpha.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.30_alpha.ebuild
new file mode 100644
index 000000000000..2934ed1ba1cf
--- /dev/null
+++ b/sci-electronics/qelectrotech/qelectrotech-0.30_alpha.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/qelectrotech/qelectrotech-0.30_alpha.ebuild,v 1.1 2012/05/27 09:50:31 hwoarang Exp $
+
+EAPI="4"
+
+LANGS="ar ca cs de en es fr hr it pl pt ro ru sl"
+inherit qt4-r2 versionator
+
+MY_PV="${PV/_alpha/a}"
+MY_P="${PN}-${MY_PV/30a/3a}-src"
+
+DESCRIPTION="Qt4 application to design electric diagrams"
+HOMEPAGE="http://www.qt-apps.org/content/show.php?content=90198"
+SRC_URI="http://download.tuxfamily.org/qet/tags/20120513/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+RDEPEND="x11-libs/qt-gui:4
+	x11-libs/qt-svg:4"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/${MY_P}
+DOCS="CREDIT ChangeLog README"
+
+PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
+
+src_install() {
+	qt4-r2_src_install
+	if use doc; then
+		doxygen Doxyfile || die
+		dohtml -r doc/html/*
+	fi
+	for x in ${LANGS}; do
+		if ! has ${x} ${LINGUAS}; then
+			find "${D}"/usr/share/${PN}/lang/ -name "*${x}*" -exec rm {} \;
+		fi
+	done
+}
diff --git a/sci-geosciences/gtk-g-rays2/Manifest b/sci-geosciences/gtk-g-rays2/Manifest
index dd696331506d..ee609e7ec442 100644
--- a/sci-geosciences/gtk-g-rays2/Manifest
+++ b/sci-geosciences/gtk-g-rays2/Manifest
@@ -1 +1 @@
-DIST gtk-g-rays2-1.23.tar.bz2 1613941 RMD160 36dbb95400d86bbb5d6dbf8bbeff3758b0b74ece SHA1 f5d115ba8c86e166e7a9f8d13669a083aed369ae SHA256 fab59cb1a41a4eb1dea09905089b2a9786d68ed8d6377b859eb565d7acdfbf21
+DIST gtk-g-rays2-2.01.tar.xz 650456 RMD160 99e5b9a2ac2cc2ef7f4daa6823c758e79db67dad SHA1 9fb60b792ebf58bebecd537057cde63aaded15f7 SHA256 b0fbbc036146ea84a944eb7d33246198579383527a1fb01d42bce9b7913e7d7b
diff --git a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-1.23.ebuild b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-1.23.ebuild
deleted file mode 100644
index 88a42eb2b80a..000000000000
--- a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-1.23.ebuild
+++ /dev/null
@@ -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/sci-geosciences/gtk-g-rays2/gtk-g-rays2-1.23.ebuild,v 1.2 2012/05/04 07:14:06 jdhore Exp $
-
-EAPI=4
-
-DESCRIPTION="GUI for accessing the Wintec WBT 201 / G-Rays 2 GPS device"
-HOMEPAGE="http://www.daria.co.uk/gps"
-SRC_URI="http://www.zen35309.zen.co.uk/gps/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	gnome-base/libglade:2.0
-	x11-libs/gtk+:2
-	x11-libs/cairo"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( dev-libs/libxslt )"
-
-DOCS=( README AUTHORS ChangeLog docs/gtkGrays2.pdf )
diff --git a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.01.ebuild b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.01.ebuild
new file mode 100644
index 000000000000..d08665b9b1d6
--- /dev/null
+++ b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.01.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.01.ebuild,v 1.2 2012/05/27 08:50:00 scarabeus Exp $
+
+EAPI=4
+
+inherit autotools gnome2
+
+DESCRIPTION="GUI for accessing the Wintec WBT 201 / G-Rays 2 GPS device"
+HOMEPAGE="http://www.daria.co.uk/gps"
+SRC_URI="http://www.zen35309.zen.co.uk/gps/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/dbus-glib
+	sys-fs/udev[gudev]
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+DOCS="README AUTHORS ChangeLog"
+
+src_prepare() {
+	# werror is bad idea
+	sed -i -e 's:-Werror::g' configure.ac || die
+	# we run this ourselves
+	sed -i -e '/gtk-update-icon-cache/d' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
diff --git a/sci-geosciences/mapnik/mapnik-2.0.1.ebuild b/sci-geosciences/mapnik/mapnik-2.0.1.ebuild
index c7a6e208ae15..6a51bac5854a 100644
--- a/sci-geosciences/mapnik/mapnik-2.0.1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.0.1.ebuild,v 1.1 2012/05/26 09:42:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-2.0.1.ebuild,v 1.2 2012/05/27 08:07:31 scarabeus Exp $
 
 EAPI=4
 
@@ -18,28 +18,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bidi cairo debug doc gdal geos postgres python sqlite"
 
-RDEPEND="net-misc/curl
-	media-libs/libpng
-	media-libs/tiff
-	sys-libs/zlib
+RDEPEND="
+	>=dev-libs/boost-1.48[python?]
+	dev-libs/icu
+	dev-libs/libxml2
 	media-fonts/dejavu
 	media-libs/freetype
-	dev-lang/python
+	media-libs/libpng
+	media-libs/tiff
+	net-misc/curl
 	sci-libs/proj
-	dev-libs/libxml2
-	dev-libs/icu
+	sys-libs/zlib
 	virtual/jpeg
 	x11-libs/agg[truetype]
-	>=dev-libs/boost-1.48[python?]
-	postgres? ( >=dev-db/postgresql-base-8.3 )
-	gdal? ( sci-libs/gdal )
-	geos? ( sci-libs/geos )
 	bidi? ( dev-libs/fribidi )
 	cairo? (
 		x11-libs/cairo
 		dev-cpp/cairomm
 		python? ( dev-python/pycairo )
 	)
+	gdal? ( sci-libs/gdal )
+	geos? ( sci-libs/geos )
+	postgres? ( >=dev-db/postgresql-base-8.3 )
 	sqlite? ( dev-db/sqlite:3 )
 "
 
diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml
index 9ff54521135b..d80401d72923 100644
--- a/sci-geosciences/mapnik/metadata.xml
+++ b/sci-geosciences/mapnik/metadata.xml
@@ -13,6 +13,5 @@
 <use>
   <flag name='gdal'>Enable <pkg>sci-libs/gdal</pkg> library support</flag>
   <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
-  <flag name='nobfonts'>Enable Dejavu fonts instead of built-in fonts</flag>
 </use>
 </pkgmetadata>
diff --git a/sci-libs/gdal/gdal-1.9.1.ebuild b/sci-libs/gdal/gdal-1.9.1.ebuild
index f8a7e9b82eac..2e0daf6d6ce4 100644
--- a/sci-libs/gdal/gdal-1.9.1.ebuild
+++ b/sci-libs/gdal/gdal-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.1.ebuild,v 1.3 2012/05/26 07:13:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.1.ebuild,v 1.4 2012/05/27 07:49:48 scarabeus Exp $
 
 EAPI=4
 
@@ -135,6 +135,12 @@ src_configure() {
 		echo "Ruby module dir is: $RUBY_MOD_DIR"
 	fi
 
+	if use python; then
+		myopts+="
+			--with-pymoddir="${EPREFIX}"/$(python_get_sitedir)
+		"
+	fi
+
 	if use java; then
 		myopts+="
 			--with-java=$(java-config --jdk-home 2>/dev/null)
@@ -209,7 +215,6 @@ src_configure() {
 		$(use_with python) \
 		$(use_with threads) \
 		$(use_with xls freexl) \
-		--with-pymoddir="${EPREFIX}"/$(python_get_sitedir) \
 		${myopts}
 
 	# mysql-config puts this in (and boy is it a PITA to get it out)
diff --git a/sec-policy/selinux-cups/selinux-cups-2.20120215-r1.ebuild b/sec-policy/selinux-cups/selinux-cups-2.20120215-r1.ebuild
index 7a680e9be4a8..c81402fde87f 100644
--- a/sec-policy/selinux-cups/selinux-cups-2.20120215-r1.ebuild
+++ b/sec-policy/selinux-cups/selinux-cups-2.20120215-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cups/selinux-cups-2.20120215-r1.ebuild,v 1.1 2012/05/20 18:40:08 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-cups/selinux-cups-2.20120215-r1.ebuild,v 1.2 2012/05/27 10:16:52 swift Exp $
 EAPI="4"
 
 IUSE=""
@@ -12,3 +12,5 @@ inherit selinux-policy-2
 DESCRIPTION="SELinux policy for cups"
 
 KEYWORDS="~amd64 ~x86"
+DEPEND=">=sec-policy/selinux-lpd-2.20120215"
+RDEPEND="${DEPEND}"
diff --git a/sys-apps/accountsservice/accountsservice-0.6.15.ebuild b/sys-apps/accountsservice/accountsservice-0.6.15.ebuild
index f4a8990d8274..d931af1c4f04 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.15.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.15.ebuild,v 1.5 2012/05/04 09:17:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.15.ebuild,v 1.6 2012/05/27 18:15:14 mattst88 Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="~alpha amd64 arm x86"
 IUSE="doc +introspection"
 
 RDEPEND="dev-libs/glib:2
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index c3c1329f5e6b..5ebe90b0960c 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,4 +1,5 @@
 DIST openrc-0.10.1.tar.bz2 171816 RMD160 1f7ad33994cac074c01d266c4b27c57e581e7947 SHA1 549aa4ca92d978c96e84136bbd2d453f5e810c16 SHA256 070dd2a5b1d6624d89556bd86759dcffd8ea0c72325347a08390076e4e4963d6
+DIST openrc-0.10.2.tar.bz2 171775 RMD160 4a5869b688c345f1f3fc42a9ebcf47afb55df08e SHA1 de44bef7277995673ad4c5fa62825cf54fb60cad SHA256 fd69be652166636c8ad1c3ea819522306285f3e22873f4bcae36ea9a4e53e627
 DIST openrc-0.10.tar.bz2 171758 RMD160 5f164857cc83ee83838d470cb42e9de227d52473 SHA1 4f62e9b474d4f6d372ac8af2f224ce69795edac7 SHA256 05f9104e0981a927c8825b332b4dd93e140a748b15df888b990e57c4bfbe7de5
 DIST openrc-0.9.8.4.tar.bz2 166843 RMD160 2d48429eb2acac513dab803b282eaf495db66be3 SHA1 4987928b46ad37406ceca26bc0d09f4281669b71 SHA256 904e139a90d5f610b59f9e0cc52ddac487c58e4fa73468b5e9fdac1a03362533
 DIST openrc-0.9.9.1.tar.bz2 169195 RMD160 8c408cb7c73d48519686f55efbcae90a53a7131d SHA1 b3f8a7ac11c04ea6c085f7002f3d98e4e3d2bc5a SHA256 c5a528242689f7ccfc6eadcede831edc85255283032fb8362f9e039edfa90f3b
diff --git a/sys-apps/openrc/openrc-0.10.2.ebuild b/sys-apps/openrc/openrc-0.10.2.ebuild
new file mode 100644
index 000000000000..4d2f0b40027d
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.10.2.ebuild
@@ -0,0 +1,436 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.10.2.ebuild,v 1.1 2012/05/27 16:21:05 williamh Exp $
+
+EAPI=4
+
+EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git"
+[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2"
+inherit eutils flag-o-matic multilib pam toolchain-funcs ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/"
+if [[ ${PV} != "9999" ]] ; then
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug elibc_glibc ncurses pam selinux static-libs unicode kernel_linux kernel_FreeBSD"
+
+RDEPEND="virtual/init
+	kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	elibc_glibc? ( >=sys-libs/glibc-2.5 )
+	ncurses? ( sys-libs/ncurses )
+	pam? ( sys-auth/pambase )
+	>=sys-apps/baselayout-2.1-r1
+	kernel_linux? (
+		sys-process/psmisc
+	)
+	!<sys-fs/udev-133"
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+make_args() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	if use selinux; then
+			MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	if ! use static-libs; then
+			MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no"
+	fi
+}
+
+pkg_setup() {
+	export DEBUG=$(usev debug)
+	export MKPAM=$(usev pam)
+	export MKTERMCAP=$(usev ncurses)
+}
+
+src_prepare() {
+	sed -i 's:0444:0644:' mk/sys.mk || die
+	sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	epatch_user
+}
+
+src_compile() {
+	make_args
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${D}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	make_args
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
+	rm -rf "${D}"/etc/runlevels
+
+	# Install the default net configuration
+	doconfd conf.d/net
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${D}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install the gentoo pam.d file
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \
+		|| return
+	[[ -e ${ROOT}/etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d ${ROOT}/etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${ROOT}"/etc/runlevels/${runlevel}
+		touch "${ROOT}"/etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${ROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# default net script is just comments, so no point in biting people
+	# in the ass by accident.  we save in preinst so that the package
+	# manager doesnt go throwing etc-update crap at us -- postinst is
+	# too late to prevent that.  this behavior also lets us keep the
+	# file in the CONTENTS for binary packages.
+	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${ROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# upgrade timezone file ... do it before moving clock
+	if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
+		(
+		unset TIMEZONE
+		source "${ROOT}"/etc/conf.d/clock
+		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
+		)
+	fi
+
+	# /etc/conf.d/clock moved to /etc/conf.d/hwclock
+	local clock
+	use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
+	if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then
+		mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock}
+	fi
+	if [[ -e ${ROOT}/etc/init.d/clock ]] ; then
+		rm -f "${ROOT}"/etc/init.d/clock
+	fi
+	if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then
+		rm -f "${ROOT}"/etc/runlevels/boot/clock
+		ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock}
+	fi
+	if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then
+		rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock
+		ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock}
+	fi
+
+	# /etc/conf.d/rc is no longer used for configuration
+	if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then
+		elog "/etc/conf.d/rc is no longer used for configuration."
+		elog "Please migrate your settings to /etc/rc.conf as applicable"
+		elog "and delete /etc/conf.d/rc"
+	fi
+
+	# force net init.d scripts into symlinks
+	for f in "${ROOT}"/etc/init.d/net.* ; do
+		[[ -e ${f} ]] || continue # catch net.* not matching anything
+		[[ ${f} == */net.lo ]] && continue # real file now
+		[[ ${f} == *.openrc.bak ]] && continue
+		if [[ ! -L ${f} ]] ; then
+			elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
+			elog "You should delete '${f##*/}.openrc.bak' if you don't need it."
+			mv "${f}" "${f}.openrc.bak"
+			ln -snf net.lo "${f}"
+		fi
+	done
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	has_version sys-apps/openrc || migrate_from_baselayout_1
+	has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script
+}
+
+# >=openrc-0.4.0 no longer loads the udev addon
+migrate_udev_init_script() {
+	# make sure udev is in sysinit if it was enabled before
+	local enable_udev=false
+	local rc_devices=$(
+		[[ -f /etc/rc.conf ]] && source /etc/rc.conf
+		[[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
+		echo "${rc_devices:-${RC_DEVICES:-auto}}"
+	)
+	case ${rc_devices} in
+		udev|auto)
+			enable_udev=true
+			;;
+	esac
+
+	if $enable_udev; then
+		add_boot_init udev sysinit
+		add_boot_init udev-postmount default
+	fi
+}
+
+migrate_from_baselayout_1() {
+	# baselayout boot init scripts have been split out
+	for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
+		# baselayout-1 is always "old" net, so ignore "new" net
+		[[ ${f} == "network" ]] && continue
+
+		add_boot_init ${f}
+	done
+
+	# Try to auto-add some addons when possible
+	add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
+	add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt
+	add_boot_init_mit_config /etc/mdadm.conf mdraid
+	add_boot_init_mit_config /etc/evms.conf evms
+	[[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper
+	[[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
+	elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
+	elog "init.d scripts.  If you use such a thing, make sure you have the"
+	elog "required init.d scripts added to your boot runlevel."
+
+	# Upgrade our state for baselayout-1 users
+	if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then
+		(
+		[[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc
+		svcdir=${svcdir:-/var/lib/init.d}
+		if [[ ! -d ${ROOT}${svcdir}/started ]] ; then
+			ewarn "No state found, and no state exists"
+			elog "You should reboot this host"
+		else
+			mkdir -p "${ROOT}${LIBDIR}/rc/init.d"
+			einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d"
+			mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d
+			rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \
+				"${ROOT}${LIBDIR}"/rc/init.d/console
+			umount "${ROOT}${svcdir}" 2>/dev/null
+			rm -rf "${ROOT}${svcdir}"
+		fi
+		)
+	fi
+
+	# Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition
+	if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
+		elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules"
+		rm -f "${ROOT}"/etc/modules.autoload.d/.keep*
+		rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
+		if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
+			local f v
+			for f in "${ROOT}"/etc/modules.autoload.d/* ; do
+				v=${f##*/}
+				v=${v#kernel-}
+				v=${v//[^[:alnum:]]/_}
+				gawk -v v="${v}" -v f="${f##*/}" '
+				BEGIN { print "\n### START: Auto-converted from " f "\n" }
+				{
+					if ($0 ~ /^[^#]/) {
+						print "modules_" v "=\"${modules_" v "} " $1 "\""
+						gsub(/[^[:alnum:]]/, "_", $1)
+						printf "module_" $1 "_args_" v "=\""
+						for (i = 2; i <= NF; ++i) {
+							if (i > 2)
+								printf " "
+							printf $i
+						}
+						print "\"\n"
+					} else
+						print
+				}
+				END { print "\n### END: Auto-converted from " f "\n" }
+				' "${f}" >> "${D}"/etc/conf.d/modules
+			done
+				rm -f "${f}"
+			rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
+		fi
+	fi
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Remove old baselayout links
+	rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
+	rm -f "${ROOT}"/etc/init.d/{depscan,runscript}.sh
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
+		rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${ROOT}"/etc/runlevels/sysinit
+			cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \
+				"${ROOT}"/etc/runlevels/sysinit
+		fi
+		if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${ROOT}"/etc/runlevels/shutdown
+			cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \
+				"${ROOT}"/etc/runlevels/shutdown
+		fi
+	fi
+
+	# /etc/conf.d/net.example is no longer valid
+	local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example"
+	local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210'
+	if [[ -e "${NET_EXAMPLE}" ]] ; then
+		if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then
+			rm -f "${NET_EXAMPLE}"
+			elog "${NET_EXAMPLE} has been removed."
+		else
+			sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}"
+			elog "${NET_EXAMPLE} should be removed."
+		fi
+		elog "The new file is ${ROOT}/usr/share/doc/${PF}/net.example"
+	fi
+
+	# /etc/conf.d/wireless.example is no longer valid
+	local WIRELESS_EXAMPLE="${ROOT}/etc/conf.d/wireless.example"
+	local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3'
+	if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then
+		if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then
+			rm -f "${WIRELESS_EXAMPLE}"
+			elog "${WIRELESS_EXAMPLE} is deprecated and has been removed."
+		else
+			sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}"
+			elog "${WIRELESS_EXAMPLE} is deprecated and should be removed."
+		fi
+		elog "If you are using the old style network scripts,"
+		elog "Configure wireless settings in ${ROOT}/etc/conf.d/net"
+		elog "after reviewing ${ROOT}/usr/share/doc/${PF}/net.example"
+	fi
+
+	if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
+		ewarn "/etc/modules.autoload.d is no longer used.  Please convert"
+		ewarn "your files to /etc/conf.d/modules and delete the directory."
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${ROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${ROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${ROOT}etc/local.d"
+		mv "${ROOT}"etc/conf.d/local.start "${ROOT}"etc/local.d/baselayout1.start
+		mv "${ROOT}"etc/conf.d/local.stop "${ROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${ROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${ROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	elog "You should now update all files in /etc, using etc-update"
+	elog "or equivalent before restarting any services or this host."
+	elog
+	elog "Please read the migration guide available at:"
+	elog "http://www.gentoo.org/doc/en/openrc-migration.xml"
+}
diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index 7bef1b950855..0bced88bbefe 100644
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -1,8 +1,2 @@
-DIST pam_mount-2.1.tar.xz 283760 RMD160 b370523a1705f1c18b938bc26a93fd797b45d557 SHA1 b9452927c7b54dcde585b454cd9f4da958bd7bb0 SHA256 c0c87efeaa2c3007784cc7a6e82db3ad4ae65f8588a7e6d02dfbd460bb1f0925
-DIST pam_mount-2.10.tar.xz 284152 RMD160 d3305107e75a00fb420672f49b6e06965345c14d SHA1 3ef6fbb077454d6ee5bd3737bf6f99c78be36e83 SHA256 e0241950ee4753e0110dba13a68b8f1dc3c059c45a253452cdb67584d60c361c
 DIST pam_mount-2.11.tar.xz 283960 RMD160 95b5a2e3c6d53f34ca265489a10d07e956ad401a SHA1 2b133afc122f3ce76bd9373d3b569109c2c584db SHA256 48e3048f6e28fb1c69dee6bdd7f60af8772fe5ddab135c9f6b543202e6dbec2d
-DIST pam_mount-2.12.tar.xz 284140 RMD160 8ad32a3f758c10e5a91163b6ee083db332d45668 SHA1 14d3df0e5de36d028be859f108f5d4a8e0f19f8a SHA256 5454ade466fbfed5dc19330647f1f1f70a819d32d8d2355f5ff024cedfa00525
 DIST pam_mount-2.13.tar.xz 300648 RMD160 614f192c55b3bdd8883b6a321be0033580033fd2 SHA1 397ef72923286debe43a9fe466e9a3e1c2fd68a2 SHA256 077af9626a3ae2d68395392f6af1cb2d795329cd648ab8c6b60f814d7121ab2a
-DIST pam_mount-2.5.tar.xz 288644 RMD160 8b2562e3dc0cad7ec283387330019c51aae6dff9 SHA1 cd76420873728a018e50bc01fd3fb9f0da599cd7 SHA256 7fa248a98ffa49dc6d8ceae1b45088571b6845d7831cae95fc75ccbcca3afb26
-DIST pam_mount-2.6.tar.xz 284984 RMD160 b3ffab9a05c8463d3ac694dbdfbe30380abfa5cc SHA1 a825152621d26ff27a748936c7b743d973305221 SHA256 35918a867f5cc1c3a4f534c713d90cf7c591376b658e41c582f58611d769b1e2
-DIST pam_mount-2.8.tar.xz 283280 RMD160 258f96a0f1ac569777d921923d41cbf90cd93d5d SHA1 2b2c60553601c390abe98162213ed8a5bdbf5cce SHA256 720ee7d7969189e2bcf8b9c0ac51049e7f6219c95b79049bb9042c6ef21a457b
diff --git a/sys-auth/pam_mount/files/pam_mount-2.6-pmvarrun-bin.diff b/sys-auth/pam_mount/files/pam_mount-2.6-pmvarrun-bin.diff
deleted file mode 100644
index 322b86a10c47..000000000000
--- a/sys-auth/pam_mount/files/pam_mount-2.6-pmvarrun-bin.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- pam_mount-2.6-vanilla/src/Makefile.am	2010-11-23 02:47:43.365455635 +0100
-+++ pam_mount-2.6/src/Makefile.am	2010-11-23 02:48:30.226227213 +0100
-@@ -8,7 +8,8 @@
- 
- moduledir		= @PAM_MODDIR@
- module_LTLIBRARIES	= pam_mount.la
--sbin_PROGRAMS		= pmvarrun
-+sbin_PROGRAMS		=
-+bin_PROGRAMS		= pmvarrun
- if HAVE_LIBCRYPTO
- sbin_PROGRAMS		+= pmt-ehd
- endif
diff --git a/sys-auth/pam_mount/pam_mount-2.1.ebuild b/sys-auth/pam_mount/pam_mount-2.1.ebuild
deleted file mode 100644
index 44f033bfd05a..000000000000
--- a/sys-auth/pam_mount/pam_mount-2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.1.ebuild,v 1.6 2012/05/04 18:57:21 jdhore Exp $
-
-EAPI=3
-
-inherit multilib
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="http://pam-mount.sourceforge.net"
-SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="crypt"
-DEPEND=">=sys-libs/pam-0.99
-	dev-libs/openssl
-	>=sys-libs/libhx-3.4
-	dev-libs/libxml2
-	>=sys-fs/cryptsetup-1.1.0
-	virtual/pkgconfig
-	app-arch/xz-utils"
-RDEPEND=">=sys-libs/pam-0.99
-	dev-libs/openssl
-	>=sys-libs/libhx-3.4
-	dev-libs/libxml2
-	>=sys-fs/cryptsetup-1.1.0
-	sys-process/lsof"
-
-src_configure() {
-	econf --with-slibdir="/$(get_libdir)" || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc doc/*.txt || die "dodoc failed"
-}
diff --git a/sys-auth/pam_mount/pam_mount-2.10.ebuild b/sys-auth/pam_mount/pam_mount-2.10.ebuild
deleted file mode 100644
index ee5c24d01183..000000000000
--- a/sys-auth/pam_mount/pam_mount-2.10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.10.ebuild,v 1.5 2012/05/04 18:57:21 jdhore Exp $
-
-EAPI=4
-
-inherit multilib
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="http://pam-mount.sourceforge.net"
-SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="crypt ssl selinux"
-
-COMMON_DEPEND=">=sys-libs/pam-0.99
-	>=sys-libs/libhx-3.6
-	>=dev-libs/libxml2-2.6
-	crypt? ( >=sys-fs/cryptsetup-1.1.0 )
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	app-arch/xz-utils"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure() {
-	econf --with-slibdir="/$(get_libdir)" \
-			$(use_with crypt cryptsetup) \
-			$(use_with ssl crypto) \
-			$(use_with selinux)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/*.txt
-}
diff --git a/sys-auth/pam_mount/pam_mount-2.12.ebuild b/sys-auth/pam_mount/pam_mount-2.12.ebuild
deleted file mode 100644
index 7a2c25152a88..000000000000
--- a/sys-auth/pam_mount/pam_mount-2.12.ebuild
+++ /dev/null
@@ -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/sys-auth/pam_mount/pam_mount-2.12.ebuild,v 1.2 2012/05/04 18:57:21 jdhore Exp $
-
-EAPI=4
-
-inherit multilib
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="http://pam-mount.sourceforge.net"
-SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="crypt ssl selinux"
-
-COMMON_DEPEND=">=sys-libs/pam-0.99
-	>=sys-libs/libhx-3.11
-	>=dev-libs/libxml2-2.6
-	crypt? ( >=sys-fs/cryptsetup-1.1.0 )
-	ssl? ( >=dev-libs/openssl-0.9.8 )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	app-arch/xz-utils"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure() {
-	econf --with-slibdir="/$(get_libdir)" \
-			$(use_with crypt cryptsetup) \
-			$(use_with ssl crypto) \
-			$(use_with selinux)
-}
-
-src_install() {
-	default
-	use selinux || rm -r "${D}"/etc/selinux
-	dodoc doc/*.txt
-}
diff --git a/sys-auth/pam_mount/pam_mount-2.5.ebuild b/sys-auth/pam_mount/pam_mount-2.5.ebuild
deleted file mode 100644
index 17847b80d229..000000000000
--- a/sys-auth/pam_mount/pam_mount-2.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.5.ebuild,v 1.2 2012/05/04 18:57:21 jdhore Exp $
-
-EAPI=3
-
-inherit multilib
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="http://pam-mount.sourceforge.net"
-SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="crypt"
-DEPEND=">=sys-libs/pam-0.99
-	dev-libs/openssl
-	>=sys-libs/libhx-3.4
-	dev-libs/libxml2
-	>=sys-fs/cryptsetup-1.1.0
-	virtual/pkgconfig
-	app-arch/xz-utils"
-RDEPEND=">=sys-libs/pam-0.99
-	dev-libs/openssl
-	>=sys-libs/libhx-3.4
-	dev-libs/libxml2
-	>=sys-fs/cryptsetup-1.1.0
-	sys-process/lsof"
-
-src_configure() {
-	econf --with-slibdir="/$(get_libdir)" || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc doc/*.txt || die "dodoc failed"
-}
diff --git a/sys-auth/pam_mount/pam_mount-2.6.ebuild b/sys-auth/pam_mount/pam_mount-2.6.ebuild
deleted file mode 100644
index 7e3d4484d087..000000000000
--- a/sys-auth/pam_mount/pam_mount-2.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.6.ebuild,v 1.5 2012/05/21 19:26:33 xarthisius Exp $
-
-EAPI=3
-
-inherit multilib autotools eutils
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="http://pam-mount.sourceforge.net"
-SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="crypt"
-DEPEND=">=sys-libs/pam-0.99
-	dev-libs/openssl
-	>=sys-libs/libhx-3.6
-	dev-libs/libxml2
-	>=sys-fs/cryptsetup-1.1.0
-	virtual/pkgconfig
-	app-arch/xz-utils"
-RDEPEND=">=sys-libs/pam-0.99
-	dev-libs/openssl
-	>=sys-libs/libhx-3.6
-	dev-libs/libxml2
-	>=sys-fs/cryptsetup-1.1.0
-	sys-process/lsof"
-
-src_prepare() {
-	epatch "${FILESDIR}/pam_mount-2.6-pmvarrun-bin.diff"
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-slibdir="/$(get_libdir)" || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc doc/*.txt || die "dodoc failed"
-}
diff --git a/sys-auth/pam_mount/pam_mount-2.8.ebuild b/sys-auth/pam_mount/pam_mount-2.8.ebuild
deleted file mode 100644
index a502565898c5..000000000000
--- a/sys-auth/pam_mount/pam_mount-2.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.8.ebuild,v 1.2 2012/05/04 18:57:21 jdhore Exp $
-
-EAPI=3
-
-inherit multilib
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="http://pam-mount.sourceforge.net"
-SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="crypt"
-DEPEND=">=sys-libs/pam-0.99
-	dev-libs/openssl
-	>=sys-libs/libhx-3.8
-	dev-libs/libxml2
-	>=sys-fs/cryptsetup-1.1.0
-	virtual/pkgconfig
-	app-arch/xz-utils"
-RDEPEND=">=sys-libs/pam-0.99
-	dev-libs/openssl
-	>=sys-libs/libhx-3.8
-	dev-libs/libxml2
-	>=sys-fs/cryptsetup-1.1.0
-	sys-process/lsof"
-
-src_configure() {
-	econf --with-slibdir="/$(get_libdir)" || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc doc/*.txt || die "dodoc failed"
-}
diff --git a/sys-block/ms-sys/Manifest b/sys-block/ms-sys/Manifest
index a80cf47fbf4b..21868bddbac9 100644
--- a/sys-block/ms-sys/Manifest
+++ b/sys-block/ms-sys/Manifest
@@ -1,3 +1,2 @@
-DIST ms-sys-2.1.3.tgz 34967 RMD160 afd083c1022605fc73462485b377f443fb95d27d SHA1 1064be922a982b35978a9bf10bfa99f2b1aa5c77 SHA256 17fc33bc32dd413caedef8bf80ce802063d45e7fabe6cfc872d9e1772e6eb215
-DIST ms-sys-2.1.4.tar.gz 37977 RMD160 61ac01448324939c3d1c94fa423383ec55b7c9a4 SHA1 61eef6ff1f07f5d403c9b2de419d9076ba5a9f15 SHA256 817f8a1cb140d60245772398730be9f962f90bb6677537b57226de181fcc9d81
 DIST ms-sys-2.2.1.tar.gz 38723 RMD160 a565188addc43b1bcf569102c1a66b2a7c967876 SHA1 fab2fc64a9a1d955027c63567a04bfdf54c759d7 SHA256 4e5661fd5837e41350a7516012901111a8cece2e9d76efb5cfb2a6f90bf712c4
+DIST ms-sys-2.3.0.tar.gz 44949 RMD160 58a2e161c6815483a1a9bb492b142e65206a37a0 SHA1 1544bf031522428238415eb43a7e4b72cc7a9214 SHA256 7b271c35426d4f748b2e7da1dd6e8dad5fdd90dea40eb2e467a8908e39759d4d
diff --git a/sys-block/ms-sys/ms-sys-2.1.3.ebuild b/sys-block/ms-sys/ms-sys-2.1.3.ebuild
deleted file mode 100644
index e79d684250d7..000000000000
--- a/sys-block/ms-sys/ms-sys-2.1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/ms-sys/ms-sys-2.1.3.ebuild,v 1.4 2008/08/17 17:11:16 maekke Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="a command-line program for writing Microsoft compatible boot records."
-HOMEPAGE="http://ms-sys.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="sys-devel/gettext"
-
-src_compile() {
-	tc-export CC
-	emake PREFIX="/usr" || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" MANDIR="/usr/share/man" \
-		PREFIX="/usr" install || die "emake install failed."
-	dodoc CHANGELOG CONTRIBUTORS FAQ README TODO
-}
diff --git a/sys-block/ms-sys/ms-sys-2.1.4.ebuild b/sys-block/ms-sys/ms-sys-2.3.0.ebuild
similarity index 52%
rename from sys-block/ms-sys/ms-sys-2.1.4.ebuild
rename to sys-block/ms-sys/ms-sys-2.3.0.ebuild
index 339ba56bdffe..87bcc55e557b 100644
--- a/sys-block/ms-sys/ms-sys-2.1.4.ebuild
+++ b/sys-block/ms-sys/ms-sys-2.3.0.ebuild
@@ -1,29 +1,36 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/ms-sys/ms-sys-2.1.4.ebuild,v 1.1 2010/01/17 18:36:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/ms-sys/ms-sys-2.3.0.ebuild,v 1.1 2012/05/27 16:51:03 kensington Exp $
+
+EAPI=4
 
-EAPI=2
 inherit toolchain-funcs
 
-DESCRIPTION="a command-line program for writing Microsoft compatible boot records."
+DESCRIPTION="A command-line program for writing Microsoft compatible boot records."
 HOMEPAGE="http://ms-sys.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="linguas_sv"
 
-RDEPEND=""
 DEPEND="sys-devel/gettext"
+RDEPEND="virtual/libintl"
 
 src_compile() {
 	tc-export CC
-	emake PREFIX="/usr" || die
+	default
 }
 
 src_install() {
+	local nls=""
+	if ! use linguas_sv ; then
+		nls='NLS_FILES='
+	fi
+
 	emake DESTDIR="${D}" MANDIR="/usr/share/man" \
-		PREFIX="/usr" install || die
+		PREFIX="/usr" ${nls} install
+
 	dodoc CHANGELOG CONTRIBUTORS FAQ README TODO
 }
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
new file mode 100644
index 000000000000..2d6467dbc073
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -0,0 +1 @@
+DIST thin-provisioning-tools-v0.1.5.tar.bz2 119902 RMD160 c43e63add1a8393becab3ea976adb45e8dfa7036 SHA1 35b445b110a87a95b398959cd0657d2194f62d8d SHA256 0464ae4253738a3d75605e4e54ccdebccfe8ffab94b464ea6912c333fe4a8b3f
diff --git a/sys-block/thin-provisioning-tools/metadata.xml b/sys-block/thin-provisioning-tools/metadata.xml
new file mode 100644
index 000000000000..e7deaa2efa74
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+<maintainer>
+<email>robbat2@gentoo.org</email>
+<name>Robin H. Johnson</name>
+</maintainer>
+<longdescription lang="en">
+A suite of tools for thin provisioning on Linux.
+</longdescription>
+</pkgmetadata>
+
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.1.5.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.1.5.ebuild
new file mode 100644
index 000000000000..c1dd85b4a15f
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.1.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.1.5.ebuild,v 1.2 2012/05/27 18:02:44 robbat2 Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="A suite of tools for thin provisioning on Linux."
+HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools"
+MY_P="${PN}-v${PV}"
+SRC_URI="https://github.com/downloads/jthornber/thin-provisioning-tools/${MY_P}.tar.bz2"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/expat"
+DEPEND="${RDEPEND}
+		dev-libs/boost"
+
+src_configure() {
+	econf \
+		--prefix="${EPREFIX}/" \
+		--bindir="${EPREFIX}/sbin"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" MANDIR=/usr/share/man
+}
diff --git a/sys-freebsd/freebsd-cddl/files/zfs.initd b/sys-freebsd/freebsd-cddl/files/zfs.initd
new file mode 100644
index 000000000000..a2b0f97efa95
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/zfs.initd
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/files/zfs.initd,v 1.1 2012/05/27 06:23:07 naota Exp $
+
+depend() {
+	need hostid
+	before fsck
+}
+
+start() {
+	einfo "Starting zfs ..."
+	zfs mount -a
+	zfs share -a
+	if [ ! -r /etc/zfs/exports ]; then
+		touch /etc/zfs/exports
+	fi
+}
+
+stop() {
+	einfo "Stopping zfs ..."
+	zfs unshare -a
+	zfs unmount -a
+}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
index 2eeb201148be..dd4050821b3e 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.7 2012/05/16 16:18:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.8 2012/05/27 06:23:08 naota Exp $
 
 EAPI=4
 
@@ -54,4 +54,9 @@ src_install() {
 
 	# Install zfs volinit script.
 	newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
+
+	# Install zfs script
+	newinitd "${FILESDIR}"/zfs.initd zfs
+
+	keepdir /etc/zfs
 }
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch
new file mode 100644
index 000000000000..4824ff6e1a09
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch
@@ -0,0 +1,32 @@
+Taken from debian GNU/kFreeBSD.
+
+Regretably, with GCC 4.4 or later this is the only flag combination
+I could find that doesn't cause kernel panics CPU triple-faults or
+other kind of severe breakage. This is Gentoo Bug #410945.
+
+Clang can use -O2, so we do not force -O1 on it
+
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
+@@ -41,6 +41,9 @@
+ .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
+ COPTFLAGS+= -fno-strict-aliasing
+ .endif
++.if ${CC:T:Mclang} != "clang" && !empty(COPTFLAGS:M-O[23s])
++COPTFLAGS+= -O1
++.endif
+ .if !defined(NO_CPU_COPTFLAGS)
+ COPTFLAGS+= ${_CPUCFLAGS}
+ .endif
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -91,6 +91,9 @@
+ .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
+ CFLAGS+=	-fno-strict-aliasing
+ .endif
++.if ${CC:T:Mclang} != "clang" && !empty(CFLAGS:M-O[23s])
++CFLAGS+=	-O1
++.endif
+ WERROR?=	-Werror
+ CFLAGS+=	${WERROR}
+ CFLAGS+=	-D_KERNEL
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r3.ebuild
new file mode 100644
index 000000000000..2274bfb771c5
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.0-r3.ebuild,v 1.1 2012/05/27 13:06:03 ryao Exp $
+
+inherit bsdmk freebsd flag-o-matic
+
+DESCRIPTION="FreeBSD kernel sources"
+SLOT="${PVR}"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+IUSE="symlink"
+
+SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
+
+RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
+DEPEND=""
+
+RESTRICT="strip binchecks"
+
+S="${WORKDIR}/sys"
+
+MY_PVR="${PVR}"
+
+[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# This replaces the gentoover patch, it doesn't need reapply every time.
+	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
+		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
+		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
+		"${S}/conf/newvers.sh"
+
+	# workaround a kernel panic for amd64-fbsd, bug #408019
+	epatch "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
+
+	# __FreeBSD_cc_version comes from FreeBSD's gcc.
+	# on 9.0-RELEASE it's 900001.
+	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
+
+	# Remove -Werror
+	sed -e "s:-Werror:-Wno-error:g" \
+		-i "${S}/conf/kern.pre.mk" \
+		-i "${S}/conf/kmod.mk" || die
+
+	epatch "${FILESDIR}/${PN}-9.0-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i	"${S}/conf/ldscript.sparc64" || die
+	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
+	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
+	epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
+	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
+	epatch "${FILESDIR}/${PN}-9.0-sysctluint.patch"
+
+	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
+	# vop_whiteout to tmpfs, so it can be used as an overlay
+	# unionfs filesystem over the cd9660 readonly filesystem.
+	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
+}
+
+src_compile() {
+	einfo "Nothing to compile.."
+}
+
+src_install() {
+	insinto "/usr/src/sys-${MY_PVR}"
+	doins -r "${S}/"*
+}
+
+pkg_postinst() {
+	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
+		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		# just in case...
+		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	elif use symlink; then
+		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
+		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't remove previous symlinks, please fix manually."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
+		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
+			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
+	fi
+
+	if use sparc-fbsd ; then
+		ewarn "WARNING: kldload currently causes kernel panics"
+		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
+		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
+		ewarn "Please compile all modules you need into the kernel"
+	fi
+}
diff --git a/sys-fs/gt5/gt5-1.4.0-r1.ebuild b/sys-fs/gt5/gt5-1.4.0-r1.ebuild
deleted file mode 100644
index 9739e4186468..000000000000
--- a/sys-fs/gt5/gt5-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/gt5/gt5-1.4.0-r1.ebuild,v 1.4 2008/06/13 09:24:44 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="a diff-capable 'du-browser'"
-HOMEPAGE="http://gt5.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND="|| ( www-client/links
-		www-client/elinks
-		www-client/lynx )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-bash-shabang.patch"
-}
-
-src_install() {
-		dobin gt5
-		doman gt5.1
-		dodoc Changelog README
-}
diff --git a/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2 b/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2
new file mode 100644
index 000000000000..404c269b9343
--- /dev/null
+++ b/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2
@@ -0,0 +1,111 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2,v 1.1 2012/05/27 07:05:22 robbat2 Exp $
+
+depend() {
+	# As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that
+	# means dmeventd is NOT notified, as it cannot be safely running
+	before dmeventd checkfs fsck
+	after modules
+}
+
+dm_in_proc() {
+	local retval=0
+	for x in devices misc ; do
+		grep -qs 'device-mapper' /proc/${x}
+		retval=$((${retval} + $?))
+	done
+	return ${retval}
+}
+
+# char **get_new_dm_volumes(void)
+#
+#   Return dmsetup commands to setup volumes
+get_new_dm_volumes() {
+	local volume params
+
+	# Filter comments and blank lines
+	grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \
+	while read volume params ; do
+		# If it exists, skip it
+		dmvolume_exists "${volume%:}" && continue
+		# Assemble the command to run to create volume
+		echo "echo ${params} | /sbin/dmsetup create ${volume%:}"
+	done
+
+	return 0
+}
+
+# int dmvolume_exists(volume)
+#
+#   Return true if volume exists in DM table
+dmvolume_exists() {
+	local x line volume=$1
+
+	[ -z "${volume}" ] && return 1
+
+	/sbin/dmsetup ls 2>/dev/null | \
+	while read line ; do
+		for x in ${line} ; do
+			# the following conditonal return only breaks out
+			# of the while loop, as it is running in a pipe.
+			[ "${x}" = "${volume}" ] && return 1
+			# We only want to check the volume name
+			break
+		done
+	done
+
+	# if 1 was returned from the above loop, then indicate that
+	# volume exists
+	[ $? = 1 ] && return 0
+
+	# otherwise the loop exited normally and the volume does not
+	# exist
+	return 1
+}
+
+# int is_empty_dm_volume(volume)
+#
+#   Return true if the volume exists in DM table, but is empty/non-valid
+is_empty_dm_volume() {
+	local table volume=$1
+
+	set -- $(/sbin/dmsetup table 2>/dev/null | grep -e "^${volume}:")
+	[ "${volume}" = "$1" -a -z "$2" ]
+}
+
+
+start() {
+	if [ -e /proc/modules ] && ! dm_in_proc ; then
+		modprobe dm-mod 2>/dev/null
+	fi
+	# Ensure the dirs exist for locking and running
+	checkpath -q -d -m 0700 -o root:root /run/lvm /run/lock/lvm
+
+	local x volume
+	
+	if [ -x /sbin/dmsetup -a -c /dev/mapper/control -a -f /etc/dmtab ] ; then
+		[ -n "$(get_new_dm_volumes)" ] && \
+			einfo " Setting up device-mapper volumes:"
+	
+		get_new_dm_volumes | \
+		while read x ; do
+			[ -n "${x}" ] || continue
+	
+			volume="${x##* }"
+	
+			ebegin "  Creating volume: ${volume}"
+			if ! eval "${x}" >/dev/null 2>/dev/null ; then
+				eend 1 "  Error creating volume: ${volume}"
+				# dmsetup still adds an empty volume in some cases,
+				#  so lets remove it
+				is_empty_dm_volume "${volume}" && \
+					/sbin/dmsetup remove "${volume}" 2>/dev/null
+			else
+				eend 0
+			fi
+		done
+	fi
+}
+
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.95-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.95-r2
new file mode 100644
index 000000000000..a06aa0bbfee8
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.95-r2
@@ -0,0 +1,96 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.95-r2,v 1.1 2012/05/27 07:05:22 robbat2 Exp $
+
+depend() {
+	use dmeventd
+	before checkfs fsck
+	after dmeventd modules device-mapper
+}
+
+config='global { locking_dir = "/run/lock/lvm" }'
+
+dm_in_proc() {
+	local retval=0
+	for x in devices misc ; do
+		grep -qs 'device-mapper' /proc/${x}
+		retval=$((${retval} + $?))
+	done
+	return ${retval}
+}
+
+start() {
+	# LVM support for /usr, /home, /opt ....
+	# This should be done *before* checking local
+	# volumes, or they never get checked.
+	
+	# NOTE: Add needed modules for LVM or RAID, etc
+	#       to /etc/modules.autoload if needed
+	for lvm_path in /bin/lvm /sbin/lvm ; do
+		[ -x "$lvm_path" ] && break
+	done
+	if [ ! -x "$lvm_path" ]; then
+		eerror "Cannot find lvm binary in /sbin or /bin!"
+		return 1
+	fi
+	if [ -z "${CDBOOT}" ] ; then
+		if [ -e /proc/modules ] && ! dm_in_proc ; then
+			modprobe dm-mod 2>/dev/null
+		fi
+		if [ -d /proc/lvm ] || dm_in_proc ; then
+			ebegin "Setting up the Logical Volume Manager"
+			#still echo stderr for debugging
+			lvm_commands="#! ${lvm_path} --config '${config}'\n"
+			# Extra PV find pass because some devices might not have been available until very recently
+			lvm_commands="${lvm_commands}pvscan\n"
+			# Now make the nodes
+			lvm_commands="${lvm_commands}vgscan --mknodes\n"
+			# And turn them on!
+			lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n"
+			# Order of this is important, have to work around dash and LVM readline
+			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
+			eend $? "Failed to setup the LVM"
+		fi
+	fi
+}
+
+stop() {
+	for lvm_path in /bin/lvm /sbin/lvm ; do
+		[ -x "$lvm_path" ] && break
+	done
+	if [ ! -x "$lvm_path" ]; then
+		eerror "Cannot find lvm binary in /sbin or /bin!"
+		return 1
+	fi
+# Stop LVM2
+if [ -x /sbin/vgs ] && \
+   [ -x /sbin/vgchange ] && \
+   [ -x /sbin/lvchange ] && \
+   [ -f /etc/lvmtab -o -d /etc/lvm ] && \
+   [ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
+then
+	einfo "Shutting down the Logical Volume Manager"
+	
+
+        VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix 2> /dev/null)
+
+        if [ "$VGS" ]
+        then
+            ebegin "  Shutting Down LVs & VGs"
+			#still echo stderr for debugging
+			lvm_commands="#! ${lvm_path} --config '${config}'\n"
+			# Extra PV find pass because some devices might not have been available until very recently
+			lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n"
+			# Now make the nodes
+			lvm_commands="${lvm_commands}vgchange --sysinit -a ln\n"
+			# Order of this is important, have to work around dash and LVM readline
+			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
+			eend $? "Failed"
+        fi
+
+	einfo "Finished Shutting down the Logical Volume Manager"
+fi
+}
+
+# vim:ts=4
diff --git a/sys-fs/lvm2/lvm2-2.02.95-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.95-r2.ebuild
new file mode 100644
index 000000000000..27591d16c911
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.95-r2.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.95-r2.ebuild,v 1.3 2012/05/27 18:01:12 robbat2 Exp $
+
+EAPI=3
+inherit eutils multilib toolchain-funcs autotools linux-info
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
+HOMEPAGE="http://sources.redhat.com/lvm2/"
+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+		 ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="readline static static-libs clvm cman +lvm1 selinux +udev +thin"
+
+DEPEND_COMMON="!!sys-fs/device-mapper
+	readline? ( sys-libs/readline )
+	clvm? ( =sys-cluster/libdlm-3*
+			cman? ( =sys-cluster/cman-3* ) )
+	udev? ( >=sys-fs/udev-151-r4 )"
+
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available.
+RDEPEND="${DEPEND_COMMON}
+	!<sys-apps/openrc-0.10.1
+	>=sys-apps/baselayout-2.1-r1
+	!!sys-fs/lvm-user
+	!!sys-fs/clvm
+	>=sys-apps/util-linux-2.16
+	thin? ( sys-block/thin-provisioning-tools )"
+
+# Upgrading to this LVM will break older cryptsetup
+RDEPEND="${RDEPEND}
+		!<sys-fs/cryptsetup-1.1.2"
+
+DEPEND="${DEPEND_COMMON}
+		virtual/pkgconfig
+		>=sys-devel/binutils-2.20.1-r1
+		static? ( || ( >=sys-fs/udev-181[static-libs] <sys-fs/udev-181 ) )"
+
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+	use udev && local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+	check_extra_config
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	# 2. There are no longer any linking deps in /usr.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/lvm.conf-2.02.67.patch
+
+	# Should not be needed due to upstream re-arrangement of build
+	#epatch "${FILESDIR}"/${PN}-2.02.56-dmeventd.patch
+	# Should not be need with new upstream udev rules
+	#epatch "${FILESDIR}"/${PN}-2.02.56-device-mapper-export-format.patch
+
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch
+	# Fixed differently upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix-r3.patch
+
+	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	epatch "${FILESDIR}"/lvm2-2.02.56-lvm2create_initrd.patch
+	# bug 318513 - merged upstream
+	#epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
+	# bug 301331
+	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
+	# bug 330373
+	epatch "${FILESDIR}"/${PN}-2.02.92-locale-muck.patch
+	# --as-needed
+	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
+	# bug 332905
+	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch
+	# bug 361429 - merged upstream in .85
+	#epatch "${FILESDIR}"/${PN}-2.02.84-udev-pkgconfig.patch
+
+	# Merged upstream
+	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
+
+	epatch "${FILESDIR}"/${PN}-2.02.88-respect-cc.patch
+
+	# Upstream bug of LVM path
+	epatch "${FILESDIR}"/${PN}-2.02.95-lvmpath.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	local buildmode
+
+	myconf="${myconf} --enable-dmeventd"
+	myconf="${myconf} --enable-cmdlib"
+	myconf="${myconf} --enable-applib"
+	myconf="${myconf} --enable-fsadm"
+	myconf="${myconf} --enable-lvmetad"
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	if use static ; then
+		einfo "Building static LVM, for usage inside genkernel"
+		buildmode="internal"
+		# This only causes the .static versions to become available
+		# For recent systems, there are no linkages against anything in /usr anyway.
+		# We explicitly provide the .static versions so that they can be included in
+		# initramfs environments.
+		myconf="${myconf} --enable-static_link"
+	else
+		ewarn "Building shared LVM, it will not work inside genkernel!"
+		buildmode="shared"
+	fi
+
+	# dmeventd requires mirrors to be internal, and snapshot available
+	# so we cannot disable them
+	myconf="${myconf} --with-mirrors=internal"
+	myconf="${myconf} --with-snapshots=internal"
+	use thin \
+		&& myconf="${myconf} --with-thin=internal" \
+		|| myconf="${myconf} --with-thin=none"
+
+	if use lvm1 ; then
+		myconf="${myconf} --with-lvm1=${buildmode}"
+	else
+		myconf="${myconf} --with-lvm1=none"
+	fi
+
+	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+	use hppa && myconf="${myconf} --disable-o_direct"
+
+	if use clvm; then
+		myconf="${myconf} --with-cluster=${buildmode}"
+		# 4-state! Make sure we get it right, per bug 210879
+		# Valid options are: none, cman, gulm, all
+		#
+		# 2009/02:
+		# gulm is removed now, now dual-state:
+		# cman, none
+		# all still exists, but is not needed
+		#
+		# 2009/07:
+		# TODO: add corosync and re-enable ALL
+		local clvmd=""
+		use cman && clvmd="cman"
+		#clvmd="${clvmd/cmangulm/all}"
+		[ -z "${clvmd}" ] && clvmd="none"
+		myconf="${myconf} --with-clvmd=${clvmd}"
+		myconf="${myconf} --with-pool=${buildmode}"
+	else
+		myconf="${myconf} --with-clvmd=none --with-cluster=none"
+	fi
+
+	econf \
+		$(use_enable readline) \
+		$(use_enable selinux) \
+		--enable-pkgconfig \
+		--with-confdir="${EPREFIX}/etc" \
+		--sbindir="${EPREFIX}/sbin" \
+		--with-staticdir="${EPREFIX}/sbin" \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-default-run-dir=/run/lvm \
+		--with-default-locking-dir=/run/lock/lvm \
+		--with-dmeventd-path=/sbin/dmeventd \
+		$(use_enable udev udev_rules) \
+		$(use_enable udev udev_sync) \
+		$(use_with udev udevdir "${EPREFIX}/lib/udev/rules.d/") \
+		${myconf} \
+		CLDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+	einfo "Doing symlinks"
+	pushd include
+	emake || die "Failed to prepare symlinks"
+	popd
+
+	einfo "Starting main build"
+	emake || die "compile fail"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Failed to emake install"
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{conf,c,txt}
+	newinitd "${FILESDIR}"/lvm.rc-2.02.95-r2 lvm || die
+	newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring || die
+	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
+	if use clvm; then
+		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd || die
+		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd || die
+	fi
+
+	# move shared libs to /lib(64)
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
+		#gen_usr_ldscript libdevmapper.so
+	fi
+
+	dosbin "${S}"/scripts/lvm2create_initrd/lvm2create_initrd
+	doman  "${S}"/scripts/lvm2create_initrd/lvm2create_initrd.8
+	newdoc "${S}"/scripts/lvm2create_initrd/README README.lvm2create_initrd
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	# Device mapper stuff
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.95-r2 device-mapper || die
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
+
+	newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd || die
+	if use static-libs; then
+		dolib.a daemons/dmeventd/libdevmapper-event.a \
+		|| die "dolib.a libdevmapper-event.a"
+		#gen_usr_ldscript libdevmapper-event.so
+	fi
+
+	use static-libs || \
+	rm -f "${D}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+
+	#insinto /etc/udev/rules.d/
+	#newins "${FILESDIR}"/64-device-mapper.rules-2.02.56-r3 64-device-mapper.rules || die
+
+	# do not rely on /lib -> /libXX link
+	sed -i \
+		-e "s|/lib/rcscripts/|/$(get_libdir)/rcscripts/|" \
+		"${ED}"/etc/init.d/* || die
+
+	elog "USE flag nocman is deprecated and replaced"
+	elog "with the cman USE flag."
+	elog ""
+	elog "USE flags clvm and cman are masked"
+	elog "by default and need to be unmasked to be used"
+	elog ""
+	elog "If you are using genkernel and root-on-LVM, rebuild the initramfs."
+}
+
+pkg_postinst() {
+	elog "lvm volumes are no longer automatically created for"
+	elog "baselayout-2 users. If you are using baselayout-2, be sure to"
+	elog "run: # rc-update add lvm boot"
+	elog "Do NOT add it if you are still using baselayout-1."
+}
+
+src_test() {
+	einfo "Testcases disabled because of device-node mucking"
+	einfo "If you want them, compile the package and see ${S}/tests"
+}
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index b6d2440d762b..7ee8f0850fc9 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -19,5 +19,6 @@
 		<flag name='cman'>Cman support for clustered lvm</flag>
 		<flag name='lvm1'>Allow users to build lvm2 with lvm1 support</flag>
 		<flag name='nolvmstatic'>Allow users to build lvm2 dynamically</flag>
+		<flag name='thin'>Support for thin volumes</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-libs/libhx/Manifest b/sys-libs/libhx/Manifest
index 2537cec5109e..6a4a0eee0883 100644
--- a/sys-libs/libhx/Manifest
+++ b/sys-libs/libhx/Manifest
@@ -1,6 +1,2 @@
-DIST libHX-3.10.1.tar.xz 801748 RMD160 e454e7fafea81c6fff0204c72484567879e54851 SHA1 47ad50c94435b175c7976da50bac3e50137d1c1b SHA256 cb19ea6a7e4e9a23f7b6c61aefaadc875ad47ac8f7df9febc29d6bab82876bc4
 DIST libHX-3.11.tar.xz 802576 RMD160 7490575ef28218360a2fee2d49ba7fa4eed5a79e SHA1 c387107680baadc2e904d006c0b6881709d1b75f SHA256 20939814b73f606233cadedce1d2e9af0a3bbcd141e8bdb9c58a43308b7e4653
 DIST libHX-3.12.1.tar.xz 821460 RMD160 c0b37efb783e3e769cd3a8a296c6c5c442c0c879 SHA1 93ddac8e7d9624db753a867cc2bbbbbe15e2b5c5 SHA256 15476e7a8ea6fb30da16fe0516a7e6ab94f3f5d367f773579e2fa47be6f7a73c
-DIST libHX-3.12.tar.xz 820932 RMD160 2c704f7b9a1723d0a2bf5baab545d95109ea2a4d SHA1 62d4160cafbd89ffa28831488628fc16d2f80228 SHA256 68287508eda091d822f2599aadab4eb362f8be4349d471b7c39ac209fcaecb4e
-DIST libHX-3.5.tar.xz 767468 RMD160 d73a7bcedbdcf0aec358d833c88318af5ef1e773 SHA1 aac1485e2a184af668c7d7eeda65b95f3d188c11 SHA256 21cc91c9838c78fcc72d352bd441242c83fe700397e7cc4f47bf8f5cac75f430
-DIST libHX-3.8.tar.xz 781076 RMD160 6fe96c2d991093b6a15c58ff61750e9348bd19e9 SHA1 b20b6df47296792f03b70eabc0f5a5d2fd7e32aa SHA256 54381e45549141140496612a031023617bd4a93595595e569145c9996c6f7699
diff --git a/sys-libs/libhx/files/libhx-3.5-buffer-overflow.patch b/sys-libs/libhx/files/libhx-3.5-buffer-overflow.patch
deleted file mode 100644
index ae6ff91bb9bf..000000000000
--- a/sys-libs/libhx/files/libhx-3.5-buffer-overflow.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/src/string.c b/src/string.c
-index 1acfab2..bea6e71 100644
---- a/src/string.c
-+++ b/src/string.c
-@@ -153,7 +153,7 @@ EXPORT_SYMBOL char **HX_split(const char *str, const char *delim,
- 		}
- 	}
- 
--	if (max == 0)
-+	if (max == 0 || *cp < max)
- 		max = *cp;
- 	else if (*cp > max)
- 		*cp = max;
-diff --git a/src/tx-string.cpp b/src/tx-string.cpp
-index 4e9a534..cc2cbf8 100644
---- a/src/tx-string.cpp
-+++ b/src/tx-string.cpp
-@@ -142,6 +142,17 @@ static void t_split(void)
- 	free(a1);
- }
- 
-+static void t_split2(void)
-+{
-+	static const char tmp[] = "";
-+	int c = 0;
-+	char **a;
-+
-+	a = HX_split(tmp, " ", &c, 6);
-+	printf("Got %d fields\n", c);
-+	HX_zvecfree(a);
-+}
-+
- static void t_quote(void)
- {
- 	char *fm = NULL;
-@@ -178,6 +189,7 @@ int main(int argc, const char **argv)
- 	t_strncat();
- 	t_strsep();
- 	t_split();
-+	t_split2();
- 	t_quote();
- 	HXmc_free(tx);
- 	HX_exit();
diff --git a/sys-libs/libhx/libhx-3.10.1.ebuild b/sys-libs/libhx/libhx-3.10.1.ebuild
deleted file mode 100644
index 03213ee0facc..000000000000
--- a/sys-libs/libhx/libhx-3.10.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhx/libhx-3.10.1.ebuild,v 1.1 2011/04/17 00:56:22 hanno Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Platform independent library providing basic system functions."
-HOMEPAGE="http://libhx.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/libHX-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S="${WORKDIR}/libHX-${PV}"
-
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}" || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc doc/*.txt || die
-	find "${D}" -name '*.la' -delete
-}
diff --git a/sys-libs/libhx/libhx-3.12.ebuild b/sys-libs/libhx/libhx-3.12.ebuild
deleted file mode 100644
index 1de8e8019fff..000000000000
--- a/sys-libs/libhx/libhx-3.12.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhx/libhx-3.12.ebuild,v 1.1 2011/12/14 20:44:17 mattst88 Exp $
-
-EAPI=4
-
-DESCRIPTION="Platform independent library providing basic system functions."
-HOMEPAGE="http://libhx.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/libHX-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S="${WORKDIR}/libHX-${PV}"
-
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	default
-	dodoc doc/*.txt
-	find "${D}" -name '*.la' -delete
-}
diff --git a/sys-libs/libhx/libhx-3.5.ebuild b/sys-libs/libhx/libhx-3.5.ebuild
deleted file mode 100644
index 4578b62c8c8f..000000000000
--- a/sys-libs/libhx/libhx-3.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhx/libhx-3.5.ebuild,v 1.4 2010/09/12 13:52:37 josejx Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Platform independent library providing basic system functions."
-HOMEPAGE="http://libhx.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/libHX-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S="${WORKDIR}/libHX-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-buffer-overflow.patch"
-}
-
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}" || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc doc/*.txt || die
-}
diff --git a/sys-libs/libhx/libhx-3.8.ebuild b/sys-libs/libhx/libhx-3.8.ebuild
deleted file mode 100644
index ea69d42c847c..000000000000
--- a/sys-libs/libhx/libhx-3.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libhx/libhx-3.8.ebuild,v 1.1 2011/01/20 04:08:59 mattst88 Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Platform independent library providing basic system functions."
-HOMEPAGE="http://libhx.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/libHX-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-S="${WORKDIR}/libHX-${PV}"
-
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}" || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc doc/*.txt || die
-}
diff --git a/sys-power/upower/upower-0.9.16.ebuild b/sys-power/upower/upower-0.9.16.ebuild
index c37368492e52..1f1040d4e233 100644
--- a/sys-power/upower/upower-0.9.16.ebuild
+++ b/sys-power/upower/upower-0.9.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.16.ebuild,v 1.7 2012/05/21 06:10:01 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.16.ebuild,v 1.8 2012/05/27 13:02:24 maekke Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug doc +introspection ios kernel_FreeBSD kernel_linux" # test
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
diff --git a/virtual/gsasl/gsasl-2.ebuild b/virtual/gsasl/gsasl-2.ebuild
index 5866c0ddbcf3..b3298d9d419a 100644
--- a/virtual/gsasl/gsasl-2.ebuild
+++ b/virtual/gsasl/gsasl-2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/gsasl/gsasl-2.ebuild,v 1.2 2012/02/20 11:05:56 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/gsasl/gsasl-2.ebuild,v 1.3 2012/05/27 17:43:25 maekke Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND="|| ( net-libs/libgsasl net-misc/gsasl )"
diff --git a/virtual/libusb/libusb-1.ebuild b/virtual/libusb/libusb-1.ebuild
index af5d20b567f1..ea46ee9394d2 100644
--- a/virtual/libusb/libusb-1.ebuild
+++ b/virtual/libusb/libusb-1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/libusb-1.ebuild,v 1.18 2012/05/22 16:14:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/libusb-1.ebuild,v 1.19 2012/05/27 18:05:50 ssuominen Exp $
 
 EAPI=2
 
@@ -14,4 +14,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-
 IUSE=""
 
 DEPEND=""
-RDEPEND="|| ( >=dev-libs/libusb-1.0.9_rc:1 dev-libs/libusbx:1 )"
+RDEPEND="|| ( dev-libs/libusbx:1 >=dev-libs/libusb-1.0.9_rc:1 )"
diff --git a/virtual/pkgconfig/pkgconfig-0.ebuild b/virtual/pkgconfig/pkgconfig-0.ebuild
index 0fca40222f04..265abe986f93 100644
--- a/virtual/pkgconfig/pkgconfig-0.ebuild
+++ b/virtual/pkgconfig/pkgconfig-0.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/pkgconfig/pkgconfig-0.ebuild,v 1.4 2012/05/19 07:45:01 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/pkgconfig/pkgconfig-0.ebuild,v 1.7 2012/05/27 18:28:14 ryao Exp $
 
-EAPI="2"
+EAPI=2
 
-DESCRIPTION="virtual for pkg-config"
+DESCRIPTION="Virtual for the pkg-config implementation"
 HOMEPAGE=""
 SRC_URI=""
 
 LICENSE=""
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+IUSE="userland_BSD"
 
-DEPEND="|| (
+DEPEND="
+	|| (
 		>=dev-util/pkgconfig-0.26
 		dev-util/pkg-config-lite
 		dev-util/pkgconf[pkg-config]
diff --git a/virtual/ruby-minitest/ruby-minitest-0-r2.ebuild b/virtual/ruby-minitest/ruby-minitest-0-r2.ebuild
index 8c94c9d8583f..78d56a423a63 100644
--- a/virtual/ruby-minitest/ruby-minitest-0-r2.ebuild
+++ b/virtual/ruby-minitest/ruby-minitest-0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-minitest/ruby-minitest-0-r2.ebuild,v 1.2 2012/05/20 20:58:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-minitest/ruby-minitest-0-r2.ebuild,v 1.3 2012/05/27 14:53:50 maekke Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="ruby_targets_ruby18? ( dev-ruby/minitest[ruby_targets_ruby18] )
diff --git a/virtual/ruby-rdoc/ruby-rdoc-1.ebuild b/virtual/ruby-rdoc/ruby-rdoc-1.ebuild
index bd0360682b81..e46e607e3dbf 100644
--- a/virtual/ruby-rdoc/ruby-rdoc-1.ebuild
+++ b/virtual/ruby-rdoc/ruby-rdoc-1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-rdoc/ruby-rdoc-1.ebuild,v 1.6 2012/05/20 20:58:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-rdoc/ruby-rdoc-1.ebuild,v 1.7 2012/05/27 14:56:21 maekke Exp $
 
 EAPI=2
 USE_RUBY="ruby19"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="${USE_RUBY}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| ( dev-ruby/rdoc[ruby_targets_ruby19] <dev-lang/ruby-1.9.2_rc2-r1:1.9 )"
diff --git a/virtual/ruby-ssl/ruby-ssl-1.ebuild b/virtual/ruby-ssl/ruby-ssl-1.ebuild
index cb0888ded122..6799f55f27fd 100644
--- a/virtual/ruby-ssl/ruby-ssl-1.ebuild
+++ b/virtual/ruby-ssl/ruby-ssl-1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-ssl/ruby-ssl-1.ebuild,v 1.9 2012/05/20 20:58:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-ssl/ruby-ssl-1.ebuild,v 1.10 2012/05/27 14:42:27 maekke Exp $
 
 EAPI=2
 USE_RUBY="ruby19"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="${USE_RUBY}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-lang/ruby:1.9[ssl]"
diff --git a/virtual/ruby-test-unit/ruby-test-unit-0-r4.ebuild b/virtual/ruby-test-unit/ruby-test-unit-0-r4.ebuild
index 4fbfbc0f7530..6fa6bfe7b324 100644
--- a/virtual/ruby-test-unit/ruby-test-unit-0-r4.ebuild
+++ b/virtual/ruby-test-unit/ruby-test-unit-0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-test-unit/ruby-test-unit-0-r4.ebuild,v 1.8 2012/05/20 20:59:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-test-unit/ruby-test-unit-0-r4.ebuild,v 1.9 2012/05/27 13:51:35 maekke Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 jruby ree18"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
diff --git a/virtual/ruby-threads/ruby-threads-1.ebuild b/virtual/ruby-threads/ruby-threads-1.ebuild
index 80ee88b52cd5..e51393534767 100644
--- a/virtual/ruby-threads/ruby-threads-1.ebuild
+++ b/virtual/ruby-threads/ruby-threads-1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-threads/ruby-threads-1.ebuild,v 1.5 2012/05/26 10:02:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ruby-threads/ruby-threads-1.ebuild,v 1.6 2012/05/27 13:08:20 maekke Exp $
 
 EAPI=2
 USE_RUBY="ruby19"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="${USE_RUBY}"
-KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/ruby:1.9"
diff --git a/virtual/rubygems/rubygems-1.ebuild b/virtual/rubygems/rubygems-1.ebuild
index cf32565ce9bd..fccea1aae084 100644
--- a/virtual/rubygems/rubygems-1.ebuild
+++ b/virtual/rubygems/rubygems-1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/rubygems/rubygems-1.ebuild,v 1.2 2011/10/21 07:11:38 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/rubygems/rubygems-1.ebuild,v 1.3 2012/05/27 13:44:03 maekke Exp $
 
 EAPI=2
 USE_RUBY="ruby18"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="${USE_RUBY}"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-ruby/rubygems[ruby_targets_ruby18]"
diff --git a/virtual/rubygems/rubygems-4.ebuild b/virtual/rubygems/rubygems-4.ebuild
index 1272e3cc36e4..b04409a30365 100644
--- a/virtual/rubygems/rubygems-4.ebuild
+++ b/virtual/rubygems/rubygems-4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/rubygems/rubygems-4.ebuild,v 1.7 2012/05/20 20:57:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/rubygems/rubygems-4.ebuild,v 1.8 2012/05/27 13:37:24 maekke Exp $
 
 EAPI=2
 USE_RUBY="ruby19"
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="${USE_RUBY}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-ruby/rubygems[ruby_targets_ruby19]"
diff --git a/www-client/chromium/chromium-21.0.1145.0-r1.ebuild b/www-client/chromium/chromium-21.0.1145.0-r1.ebuild
new file mode 100644
index 000000000000..cb73cb50c01c
--- /dev/null
+++ b/www-client/chromium/chromium-21.0.1145.0-r1.ebuild
@@ -0,0 +1,420 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1145.0-r1.ebuild,v 1.1 2012/05/27 14:57:43 phajdan.jr Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.6"
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit chromium eutils flag-o-matic multilib \
+	pax-utils portability python toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux"
+
+RDEPEND="app-arch/bzip2
+	cups? (
+		dev-libs/libgcrypt
+		>=net-print/cups-1.3.11
+	)
+	>=dev-lang/v8-3.10.2.1
+	dev-libs/dbus-glib
+	dev-libs/elfutils
+	>=dev-libs/icu-49.1.1-r1
+	>=dev-libs/libevent-1.4.13
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	>=dev-libs/nss-3.12.3
+	gnome? ( >=gnome-base/gconf-2.24.0 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
+	>=media-libs/alsa-lib-1.0.19
+	media-libs/flac
+	>=media-libs/libjpeg-turbo-1.2.0-r1
+	media-libs/libpng
+	>=media-libs/libwebp-0.1.3
+	media-libs/speex
+	pulseaudio? ( media-sound/pulseaudio )
+	sys-fs/udev
+	sys-libs/zlib
+	virtual/libusb:1
+	x11-libs/gtk+:2
+	x11-libs/libXinerama
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	kerberos? ( virtual/krb5 )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	>=dev-lang/nacl-toolchain-newlib-0_p7311
+	dev-lang/perl
+	dev-lang/yasm
+	dev-python/ply
+	dev-python/simplejson
+	>=dev-util/gperf-3.0.3
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/make-3.81-r2
+	virtual/pkgconfig
+	test? (
+		dev-python/pyftpdlib
+	)"
+RDEPEND+="
+	!=www-client/chromium-9999
+	x11-misc/xdg-utils
+	virtual/ttf-fonts"
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Make sure the build system will use the right python, bug #344367.
+	python_set_active_version 2
+	python_pkg_setup
+
+	chromium_check_kernel_config
+
+	if use bindist; then
+		elog "bindist enabled: H.264 video support will be disabled."
+	else
+		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+	fi
+}
+
+src_prepare() {
+	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
+		native_client/toolchain/linux_x86_newlib || die
+
+	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
+	sed -i '1i#define OF(x) x' \
+		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die
+
+	epatch "${FILESDIR}/${PN}-svnversion-r0.patch"
+
+	epatch "${FILESDIR}/${PN}-zlib-r0.patch"
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	find third_party -type f \! -iname '*.gyp*' \
+		\! -path 'third_party/WebKit/*' \
+		\! -path 'third_party/angle/*' \
+		\! -path 'third_party/cacheinvalidation/*' \
+		\! -path 'third_party/cld/*' \
+		\! -path 'third_party/expat/*' \
+		\! -path 'third_party/ffmpeg/*' \
+		\! -path 'third_party/flac/flac.h' \
+		\! -path 'third_party/gpsd/*' \
+		\! -path 'third_party/harfbuzz/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/jsoncpp/*' \
+		\! -path 'third_party/khronos/*' \
+		\! -path 'third_party/launchpad_translations/*' \
+		\! -path 'third_party/leveldatabase/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libsrtp/*' \
+		\! -path 'third_party/libusb/libusb.h' \
+		\! -path 'third_party/libvpx/*' \
+		\! -path 'third_party/libxml/chromium/*' \
+		\! -path 'third_party/libyuv/*' \
+		\! -path 'third_party/lss/*' \
+		\! -path 'third_party/mesa/*' \
+		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/mongoose/*' \
+		\! -path 'third_party/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/protobuf/*' \
+		\! -path 'third_party/scons-2.0.1/*' \
+		\! -path 'third_party/sfntly/*' \
+		\! -path 'third_party/skia/*' \
+		\! -path 'third_party/smhasher/*' \
+		\! -path 'third_party/speex/speex.h' \
+		\! -path 'third_party/sqlite/*' \
+		\! -path 'third_party/tlslite/*' \
+		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/v8-i18n/*' \
+		\! -path 'third_party/webdriver/*' \
+		\! -path 'third_party/webgl_conformance/*' \
+		\! -path 'third_party/webrtc/*' \
+		\! -path 'third_party/zlib/contrib/minizip/*' \
+		-delete || die
+
+	local v8_bundled="$(chromium_bundled_v8_version)"
+	local v8_installed="$(chromium_installed_v8_version)"
+	elog "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
+
+	# Remove bundled v8.
+	find v8 -type f \! -iname '*.gyp*' -delete || die
+
+	# The implementation files include v8 headers with full path,
+	# like #include "v8/include/v8.h". Make sure the system headers
+	# will be used.
+	# TODO: find a solution that can be upstreamed.
+	rmdir v8/include || die
+	ln -s /usr/include v8/include || die
+
+	# Make sure the build system will use the right python, bug #344367.
+	# Only convert directories that need it, to save time.
+	python_convert_shebangs -q -r 2 build tools
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Disable tcmalloc, it causes problems with e.g. NVIDIA
+	# drivers, bug #413637.
+	myconf+=" -Dlinux_use_tcmalloc=0"
+
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	myconf+=" -Ddisable_glibc=1"
+
+	# Make it possible to remove third_party/adobe.
+	echo > "${T}/flapper_version.h" || die
+	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
+
+	# Use system-provided libraries.
+	# TODO: use_system_ffmpeg
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_vpx
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_icu=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libusb=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_speex=1
+		-Duse_system_v8=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_yasm=1
+		-Duse_system_zlib=1"
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use kerberos)
+		$(gyp_use pulseaudio)
+		$(gyp_use selinux selinux)"
+
+	if ! use selinux; then
+		# Enable SUID sandbox.
+		myconf+="
+			-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+			-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	myconf+="
+		-Dlinux_use_gold_binary=0
+		-Dlinux_use_gold_flags=0"
+
+	if ! use bindist; then
+		# Enable H.624 support in bundled ffmpeg.
+		myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
+	fi
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf+=" -Dtarget_arch=x64"
+	elif [[ $myarch = x86 ]] ; then
+		myconf+=" -Dtarget_arch=ia32"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+	fi
+
+	egyp_chromium ${myconf} || die
+}
+
+src_compile() {
+	local test_targets
+	for x in base cacheinvalidation crypto \
+		googleurl gpu media net printing sql; do
+		test_targets+=" ${x}_unittests"
+	done
+
+	local make_targets="chrome chromedriver"
+	if ! use selinux; then
+		make_targets+=" chrome_sandbox"
+	fi
+	if use test; then
+		make_targets+=$test_targets
+	fi
+
+	# See bug #410883 for more info about the .host mess.
+	emake ${make_targets} BUILDTYPE=Release V=1 \
+		CC.host="$(tc-getCC)" CFLAGS.host="${CFLAGS}" \
+		CXX.host="$(tc-getCXX)" CXXFLAGS.host="${CXXFLAGS}" \
+		LINK.host="$(tc-getCXX)" LDFLAGS.host="${LDFLAGS}" \
+		AR.host="$(tc-getAR)" || die
+
+	pax-mark m out/Release/chrome
+	if use test; then
+		for x in $test_targets; do
+			pax-mark m out/Release/${x}
+		done
+	fi
+}
+
+src_test() {
+	# For more info see bug #350349.
+	local mylocale='en_US.utf8'
+	if ! locale -a | grep -q "$mylocale"; then
+		eerror "${PN} requires ${mylocale} locale for tests"
+		eerror "Please read the following guides for more information:"
+		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
+		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
+		die "locale ${mylocale} is not supported"
+	fi
+
+	# For more info see bug #370957.
+	if [[ $UID -eq 0 ]]; then
+		die "Tests must be run as non-root. Please use FEATURES=userpriv."
+	fi
+
+	# ICUStringConversionsTest: bug #350347.
+	# MessagePumpLibeventTest: bug #398501.
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
+		'--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
+
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
+
+	# NetUtilTest: bug #361885.
+	# DnsConfigServiceTest.GetSystemConfig: bug #394883.
+	# CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
+		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned'
+
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/sql_unittests virtualmake
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+
+	if ! use selinux; then
+		doexe out/Release/chrome_sandbox || die
+		fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+	fi
+
+	doexe out/Release/chromedriver || die
+
+	doexe out/Release/nacl_helper{,_bootstrap} || die
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/nacl_irt_*.nexe || die
+	doins out/Release/libppGoogleNaClPluginChrome.so || die
+
+	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
+	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+	fi
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	doexe out/Release/libffmpegsumo.so || die
+
+	# Install icons and desktop entry.
+	for SIZE in 16 22 24 32 48 64 128 256 ; do
+		insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
+		newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
+			chromium-browser${CHROMIUM_SUFFIX}.png || die
+	done
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+}
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index ba6fec481898..287a04c3cd88 100644
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.116 2012/05/23 18:09:11 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.117 2012/05/27 14:57:43 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -53,6 +53,7 @@ RDEPEND="app-arch/bzip2
 	kerberos? ( virtual/krb5 )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${RDEPEND}
+	>=dev-lang/nacl-toolchain-newlib-0_p7311
 	dev-lang/perl
 	dev-lang/yasm
 	dev-python/ply
@@ -155,8 +156,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	#ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#	native_client/toolchain/linux_x86_newlib || die
+	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
+		native_client/toolchain/linux_x86_newlib || die
 
 	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
 	sed -i '1i#define OF(x) x' \
@@ -241,8 +242,8 @@ src_configure() {
 	# drivers, bug #413637.
 	myconf+=" -Dlinux_use_tcmalloc=0"
 
-	# Disable Native Client until we figure out bug #417019.
-	myconf+=" -Ddisable_nacl=1"
+	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
+	myconf+=" -Ddisable_glibc=1"
 
 	# Make it possible to remove third_party/adobe.
 	echo > "${T}/flapper_version.h" || die
@@ -324,7 +325,7 @@ src_configure() {
 src_compile() {
 	local test_targets
 	for x in base cacheinvalidation crypto \
-		googleurl gpu media net printing; do
+		googleurl gpu media net printing sql; do
 		test_targets+=" ${x}_unittests"
 	done
 
@@ -385,6 +386,7 @@ src_test() {
 		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:DnsConfigServiceTest.GetSystemConfig:CertDatabaseNSSTest.ImportServerCert_SelfSigned'
 
 	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/sql_unittests virtualmake
 }
 
 src_install() {
@@ -398,10 +400,10 @@ src_install() {
 
 	doexe out/Release/chromedriver || die
 
-	#doexe out/Release/nacl_helper{,_bootstrap} || die
-	#insinto "${CHROMIUM_HOME}"
-	#doins out/Release/nacl_irt_*.nexe || die
-	#doins out/Release/libppGoogleNaClPluginChrome.so || die
+	doexe out/Release/nacl_helper{,_bootstrap} || die
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/nacl_irt_*.nexe || die
+	doins out/Release/libppGoogleNaClPluginChrome.so || die
 
 	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
index 19ef4c3ffcd8..8f6ed43ad531 100644
--- a/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild,v 1.4 2012/05/25 11:36:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild,v 1.5 2012/05/27 18:00:31 mattst88 Exp $
 
 EAPI=4
 inherit xorg-2
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable unicode internationalization)
+		--enable-arrow-scrollbars
+		--enable-gray-stipples
 	)
 
 	xorg-2_pkg_setup
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
index 4648832bdf8c..2d72f6578869 100644
--- a/x11-libs/libwnck/libwnck-2.31.0.ebuild
+++ b/x11-libs/libwnck/libwnck-2.31.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.31.0.ebuild,v 1.7 2012/05/21 06:23:34 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libwnck/libwnck-2.31.0.ebuild,v 1.8 2012/05/27 13:24:38 maekke Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="doc +introspection startup-notification"
 
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 3d2d088339fc..54051ecf090c 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -4,3 +4,4 @@ DIST pixman-0.22.2.tar.bz2 461319 RMD160 13dbab02962cf45995aaebde4ec9a952ca8e6e7
 DIST pixman-0.24.0.tar.bz2 467328 RMD160 fed9b2b92f61aa952078d373734db42b00b06e59 SHA1 a3b73c3ea6cada20d705203a394f574aa69e2177 SHA256 744e8b36b29ba76bdfe8f7cbc45585fb237533ac8d716a27e306874dcfa1cf44
 DIST pixman-0.24.2.tar.bz2 467979 RMD160 985a64799ba4b7240248807e7a691c3e9824ee3d SHA1 233eed3cd16ee1b2a842140477503d2c68b74418 SHA256 32f74f3e3c1feea33e6ad3e2fd66cb3eb816805c384b346ea1636a87c9057dbf
 DIST pixman-0.24.4.tar.bz2 468400 RMD160 1df92f83b0b944e8a493a8cdf6318ebc6e778914 SHA1 683450f917015366ac7918fc517c76801aeff374 SHA256 5f4b384aa39e82a582bdc8835e2e81b28176db851dd1f7ff32d682d026a23bb5
+DIST pixman-0.26.0.tar.bz2 633088 RMD160 ed030bcbffe5066a95652152a60057b6012307b0 SHA1 d772cf794ec5da0966eba3cb360919a0a5e0d23f SHA256 ba07fb2f39264ac59ba020dfba4a3d00d436153a8991689760241a9a93a63325
diff --git a/x11-libs/pixman/files/pixman-0.26.0-add-missing-_mm_empty-calls.patch b/x11-libs/pixman/files/pixman-0.26.0-add-missing-_mm_empty-calls.patch
new file mode 100644
index 000000000000..b225e13c0806
--- /dev/null
+++ b/x11-libs/pixman/files/pixman-0.26.0-add-missing-_mm_empty-calls.patch
@@ -0,0 +1,50 @@
+From 84b96a49ba36e79b28c2ca57e0dfd261648b430d Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 27 May 2012 13:01:57 -0400
+Subject: [PATCH] mmx: add missing _mm_empty calls
+
+Fixes spurious test failures on x86-32.
+---
+ pixman/pixman-mmx.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
+index bb125bf..6e292c6 100644
+--- a/pixman/pixman-mmx.c
++++ b/pixman/pixman-mmx.c
+@@ -2232,6 +2232,8 @@ mmx_composite_src_x888_0565 (pixman_implementation_t *imp,
+ 	    w--;
+ 	}
+     }
++
++    _mm_empty ();
+ }
+ 
+ static void
+@@ -3542,6 +3544,7 @@ mmx_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask)
+ 	w--;
+     }
+ 
++    _mm_empty ();
+     return iter->buffer;
+ }
+ 
+@@ -3585,6 +3588,7 @@ mmx_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask)
+ 	w--;
+     }
+ 
++    _mm_empty ();
+     return iter->buffer;
+ }
+ 
+@@ -3630,6 +3634,7 @@ mmx_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask)
+ 	w--;
+     }
+ 
++    _mm_empty ();
+     return iter->buffer;
+ }
+ 
+-- 
+1.7.3.4
+
diff --git a/x11-libs/pixman/pixman-0.26.0.ebuild b/x11-libs/pixman/pixman-0.26.0.ebuild
new file mode 100644
index 000000000000..746641a4e36b
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.26.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.26.0.ebuild,v 1.1 2012/05/27 19:13:48 mattst88 Exp $
+
+EAPI=4
+inherit xorg-2 toolchain-funcs versionator
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
+DESCRIPTION="Low-level pixel manipulation routines"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="altivec iwmmxt mmx neon sse2 test"
+
+PATCHES=( "${FILESDIR}"/${P}-add-missing-_mm_empty-calls.patch )
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable mmx)
+		$(use_enable sse2)
+		$(use_enable altivec vmx)
+		$(use_enable neon arm-neon)
+		$(use_enable iwmmxt arm-iwmmxt)
+		--disable-gtk
+	)
+}
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index b6ca08093458..b49328d99962 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,3 +1,2 @@
-DIST spacefm-0.7.4.tar.xz 948208 RMD160 d88a0f0527fe3479d5e9cff5f87150b70d0fe90d SHA1 72829b4aa7ca5e3b7502608af664cbe161bf1bdc SHA256 54013950f0ade9449e8118110c1c5ce9daaaa48a8a48fdba433e0d6c9540ecb3
-DIST spacefm-0.7.5.tar.xz 964796 RMD160 0162890f2963f26033b5d4ea25adb1924d90bad7 SHA1 39a1e66c8d4906ad864bd21c7e78cded26023b04 SHA256 e11b514b421a4cdacecbd527e28c0007689a53d86a61672620855613c33e8d6d
 DIST spacefm-0.7.6.tar.xz 966380 RMD160 9cc5374cf7ac329d53dfe00661f9ce511077cb89 SHA1 a569d5f48fdd56d85cf3de85c9ffc4eb93605e17 SHA256 8ea46bd9fcf93e391cee57749915ff8b773cb959ad18ace0987a97ba8b3e3519
+DIST spacefm-0.7.7.tar.xz 967036 RMD160 1db2c458783ac002dd830648a80e648410ed9de4 SHA1 595a6f78a0282bdf91f2267c68a369c85ffddf5e SHA256 6015cdbf744adc88505cbe0c7cf83fb9079cb8170b21637751f554d2ce4dae0d
diff --git a/x11-misc/spacefm/spacefm-0.7.4.ebuild b/x11-misc/spacefm/spacefm-0.7.4.ebuild
deleted file mode 100644
index b8cd6445cb0c..000000000000
--- a/x11-misc/spacefm/spacefm-0.7.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/spacefm/spacefm-0.7.4.ebuild,v 1.5 2012/05/05 04:53:44 jdhore Exp $
-
-EAPI=4
-inherit fdo-mime
-
-DESCRIPTION="a multi-panel tabbed file manager"
-HOMEPAGE="http://spacefm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kernel_linux"
-
-RDEPEND="dev-libs/glib:2
-	dev-util/desktop-file-utils
-	sys-apps/dbus
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/startup-notification
-	x11-misc/shared-mime-info
-	!kernel_linux? ( virtual/fam )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--disable-hal \
-		$(use_enable kernel_linux inotify)
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	einfo ""
-	elog "To mount as non-root user you need:"
-	elog "  sys-fs/udisks:0"
-	elog "To perform as root functionality you need one of the following:"
-	elog "  x11-misc/ktsuss"
-	elog "  x11-libs/gksu"
-	elog "  kde-base/kdesu"
-	elog "Other optional dependencies:"
-	elog "  sys-process/lsof (device processes)"
-	elog "  virtual/eject (eject media)"
-	einfo""
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/x11-misc/spacefm/spacefm-0.7.5.ebuild b/x11-misc/spacefm/spacefm-0.7.7.ebuild
similarity index 73%
rename from x11-misc/spacefm/spacefm-0.7.5.ebuild
rename to x11-misc/spacefm/spacefm-0.7.7.ebuild
index dffff0f08faa..1a60a3f97eb1 100644
--- a/x11-misc/spacefm/spacefm-0.7.5.ebuild
+++ b/x11-misc/spacefm/spacefm-0.7.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/spacefm/spacefm-0.7.5.ebuild,v 1.3 2012/05/05 04:53:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/spacefm/spacefm-0.7.7.ebuild,v 1.1 2012/05/28 02:58:10 hasufell Exp $
 
 EAPI=4
 
-inherit fdo-mime
+inherit fdo-mime linux-info
 
 DESCRIPTION="A multi-panel tabbed file manager"
 HOMEPAGE="http://ignorantguru.github.com/spacefm/"
@@ -53,7 +53,15 @@ pkg_postinst() {
 	elog "Other optional dependencies:"
 	elog "  sys-process/lsof (device processes)"
 	elog "  virtual/eject (eject media)"
-	einfo""
+	einfo
+	if ! has_version 'sys-fs/udisks' ; then
+		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
+		has_version '<sys-fs/udev-173' && ewarn "You need at least udev-173"
+		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+		einfo
+	fi
 }
 
 pkg_postrm() {
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.9.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.9.ebuild
index 775310541715..56208e504e03 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.9.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.9.ebuild,v 1.9 2012/05/24 13:19:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.9.ebuild,v 1.10 2012/05/27 17:51:33 maekke Exp $
 
 EAPI=4
 inherit gnome.org
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=x11-misc/xdg-user-dirs-0.14