Sync with portage [Fri Jul 19 18:10:36 MSK 2013].

2013-07-19 18:10:40 +04:00 · 2013-07-19 18:10:40 +04:00 · 12fd3e7a1f
commit 12fd3e7a1f
parent 4dedb6a4f3
104 changed files with 1446 additions and 615 deletions
--- a/app-admin/eselect-rails/Manifest
+++ b/app-admin/eselect-rails/Manifest
@ -1,2 +1 @@
-DIST eselect-rails-0.16.tar.bz2 1630 SHA256 d3f7210e98a81c6923d8250f2286b6cbb37facb443a8ed4d00d43a25e3cfbc52 SHA512 a3a961366f8964cdfff5bfbf70fb0963c7e1d4a74f9b0ba3501201df693eca259e896aa57ce9baf00570dd8797e0d145860fa39883424b0457d8635218c5d753 WHIRLPOOL e84a33be85a8c3692459a87653f43001851c93373bfd1777b769456da2f60b82a341b0478f8b25317b3d41927fd1ffe54a50def3314bd7d25042b61e2df7e7b1
 DIST eselect-rails-0.18.tar.bz2 1628 SHA256 6dfcefd74cfb10e83c59d8594bd9e1d39ea40071b2c3a9a3e601a6107aa49671 SHA512 9f0e048ba0d865667e0917e8e08b5319f111816788c3821126c4d442ec3cc9c0466200a8889da420fb841f7b57ba5981cbb8a17d16fe634e550cbdfe618a3522 WHIRLPOOL cd117dafc480c2b6bb9b63a39047553d1d786dcbc711421dba25403309c9c814984aea0309db5d87643ddf165d143f915628c57e2d990d6cb3d2db04e40ada06
--- a/app-admin/eselect-rails/eselect-rails-0.16.ebuild
+++ b/app-admin/eselect-rails/eselect-rails-0.16.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-rails/eselect-rails-0.16.ebuild,v 1.6 2012/07/08 15:23:04 armin76 Exp $
-
-DESCRIPTION="Manages Ruby on Rails symlinks"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.0.10"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins *.eselect || die "doins failed"
-}
--- a/app-emacs/undo-tree/Manifest
+++ b/app-emacs/undo-tree/Manifest
@ -1,2 +1,3 @@
 DIST undo-tree-0.1.7.el.bz2 14938 SHA256 59fc421e48c3bb3ee4f407279362fc39022266041355104f1a5be116e95a85ba SHA512 358bd4255be503c4849857c92c8b0013446765904393f63cecefca016b5d95625a616d7cde1186e32c0e7bf4002f0647f4d8b890d9ece79f134940b03d11201c WHIRLPOOL 9cdb0c2c3ce0c4678fc2e6a2cfb9cb12430fa64eea0096705ecf0d8a6ddce827b0750b28fff538a2f19483c19cb569fa59a444c4aa7e7972b855e0cca0c8f385
 DIST undo-tree-0.5.2.el.bz2 27985 SHA256 35b3bef32c39a99656fb46d9ca7b2eccde4287ca2d226a93c90d8fd12f5354dc SHA512 62b355cbebd4e17a59b70acdae69bdddc9a6fd57d5c684d0560eb03dfac69121bc63941ef6520853b174a6de0a5ae54dc4f240a55f0623312a86e799ea3785d0 WHIRLPOOL 41aef615a8aadd29b5012bf3b3adbdbffdee75d0ce8fa1b50fa78371ed2c2a40ae932e8f50fe870be5541ae2e67f2271071645623589587b36b42533856823c3
+DIST undo-tree-0.6.3.el.bz2 30745 SHA256 03ca2e1a46ae6edfadcde89e9e5f06a86401a1bc994af88fb36931a7587cb084 SHA512 4d9461a9a074ec670fdebaa27310d350a8554e24ab8fba12a17ca1e339e6bc2ca616545dad1a374b20d0d427e735a3dc342373b12a56acc4553180ee6044bb04 WHIRLPOOL 433f28d49fb870db7c4e69b3e00304c68b38d6f1e0bbeba803aff84dc0b1b2ef67414185af586149a1d68e31511d9496e142134cb377778b605811643f3ff89f
--- a/app-emacs/undo-tree/undo-tree-0.6.3.ebuild
+++ b/app-emacs/undo-tree/undo-tree-0.6.3.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/undo-tree/undo-tree-0.6.3.ebuild,v 1.1 2013/07/19 06:32:47 tomka Exp $
+
+EAPI=4
+NEED_EMACS=22
+
+inherit elisp
+
+DESCRIPTION="Undo trees and visualization"
+HOMEPAGE="http://www.dr-qubit.org/emacs.php#undo-tree"
+SRC_URI="mirror://gentoo/${P}.el.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_postinst() {
+	elisp-site-regen
+	elog "To enable undo trees globally, place '(global-undo-tree-mode)'"
+	elog "in your .emacs file."
+}
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@ -4,6 +4,7 @@ DIST qemu-1.4.1-a2231a9d.tar.xz 5192 SHA256 5c6dacc243f55d00817dcc4fa24555c48665
 DIST qemu-1.4.1.tar.bz2 10417738 SHA256 75063a9326221607de3599e89fb5af80f2d8080ddc55ca253fff113843432df1 SHA512 b655d2816b9393ca30bbba2bc8a30076e1c933d593653a1f61b4d5f3aaa9b8eb390fa3aa6f3486f1d066b1e078a3d9e1a280d0e8dac68745b128ddc01ca1b149 WHIRLPOOL d45d290eb2877038f945d3aee88d28b5c81feb43b1ca4c8941b87fc225e4cfb7b7a601af8b8e639e831b7f41823b4d1723ca9149c0c072eb168907aa67e017be
 DIST qemu-1.4.2-6b5934f9.tar.xz 3132 SHA256 76af332ea3a731d04d5d2d909c4372250a156993ca56046dc607a7d43caa747e SHA512 c74cc6c3485cc19809676e7dc796d9f1d5b3d12decf1f0c61a948504471ac85f8b488c1acd0400b02827b1ad6b9745a6b47317c284365122ca772a842852f27e WHIRLPOOL 50dd6e7eed3902547dfae6c6cd73505232ed8abafc523c7df7e65a02cf9b29b3e7a29f4ce286b157c027f82e198ef23dd44a83c6925204317c7bb4d6e350617b
 DIST qemu-1.4.2.tar.bz2 10416877 SHA256 acae6c92b740ff89c0e31eca23338d4abd733432e51b081017757579b30ecf90 SHA512 aa296b3d06321c81b32fdd2fdcdf07f3c377123f18eadca977335592b64a4f2417eea421fe417b57e468741f707bda31ba907364d762983393272997fdef8999 WHIRLPOOL 782f3c6d8776210450a0c0ac24942d8e1c41995aeb8e910add704f8f6d95ae3392ee942c6b661d4674367d0e443453c7f29356b2b4c71be4ffed54436f90de8a
+DIST qemu-1.5.1.tar.bz2 11931754 SHA256 4c15a1ee2f387983eb5c1497f66bf567c34d14ba48517148f6eafef8ae09e3e8 SHA512 ea28434f786bd36d99f7908380f9dcd18def36899d001170edb9c1e6c341d81fab64d7d13b9028b01cb479ecb35f62975fe928767ac585267dd4ef7ffeb7b823 WHIRLPOOL 96cdc82d9e08fa0221d878d389120cd348f3c4c2cb76de61044cb67ea01dfbfdb2123b518d26516dc85149f627f8186725c20b7ef8c9f3bcd46c393321a67333
 DIST qemu-kvm-1.2.0-7c9a3a87.tar.xz 268436 SHA256 ed9d8f358cc82e920f6d424de25a82165503cd7e6715bc23312bc2eba6dda771 SHA512 dd5f69835c9fb00c7c36f90e83c7380ac1e3712ef8929f465ed18393da0187020f41d49963584a887199d032ec4783be14b8787c6165d723df94204a70346217 WHIRLPOOL c3e0760c6fdc68b616a0d6e654ec6fa8bdedda9a817fecd7723e168d293eb7bc864864c824b6bb3d61054a0b925302ca59a3c0850e98840dfbd0dbc06c254f82
 DIST qemu-kvm-1.2.0-9489a8c0-1.tar.xz 268020 SHA256 3ac9715a6bb50d8e363ea0a225a23472d326c31189637eb7ad25fef47afe526d SHA512 9ea7da5384af22525db40fef62a480e551395907df6bf2420e1ccdaceddb24515f0e463e16e929b6da34ab0c2f0e5e567ef097f186a46c0d2fcc2d0d17fc3045 WHIRLPOOL 89ece68af896212cb9a868f6bb0d0df397d22131e3ae147f575177b39f015860ea0895a1edf938f46d3e2322182f131abc0767b07d8c05565a7ff40420f65464
 DIST qemu-kvm-1.2.0.tar.gz 6839420 SHA256 e98ab96c24337e312864f2341016695ac11cb9a04be83548a8da89596d591b05 SHA512 c21354127d4585397ab400600ab1ac9aac80cc0431bbf615c8e906819075b00373f382954fbd9fa39bf6479126d8d8e3321b3713346d04abe2c249edfa4eb6fd WHIRLPOOL 3d0662b39174eee0cd8750f6bea5baf57e2dfa82b490c3f1e54f44720ddd05ad029c3011425f651e745973ddb03aaca310bc8acf9f8e656bbb8390a262f7013c
--- a/app-emulation/qemu/qemu-1.5.1.ebuild
+++ b/app-emulation/qemu/qemu-1.5.1.ebuild
@ -0,0 +1,541 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.1.ebuild,v 1.1 2013/07/19 04:42:15 cardoe Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE="ncurses,readline"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+	user udev fcaps readme.gentoo
+
+#BACKPORTS=6b5934f9
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
+	${BACKPORTS:+
+		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+IUSE="accessibility +aio alsa bluetooth +caps +curl debug fdt gtk iscsi +jpeg \
+kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
+rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
+static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net \
+virtfs +vnc xattr xen xfs"
+
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
+mipsel mips64 mips64el or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
+
+# Setup the default SoftMMU targets, while using the loops
+# below to setup the other targets.
+REQUIRED_USE="|| ("
+
+for target in ${IUSE_SOFTMMU_TARGETS}; do
+	IUSE="${IUSE} qemu_softmmu_targets_${target}"
+	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
+done
+
+for target in ${IUSE_USER_TARGETS}; do
+	IUSE="${IUSE} qemu_user_targets_${target}"
+	REQUIRED_USE="${REQUIRED_USE} qemu_user_targets_${target}"
+done
+REQUIRED_USE="${REQUIRED_USE} )"
+
+# Block USE flag configurations known to not work
+REQUIRED_USE="${REQUIRED_USE}
+	python? ( ${PYTHON_REQUIRED_USE} )
+	static? ( static-softmmu static-user )
+	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
+	virtfs? ( xattr )"
+
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	sys-apps/pciutils[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	aio? ( dev-libs/libaio[static-libs(+)] )
+	caps? ( sys-libs/libcap-ng[static-libs(+)] )
+	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] )
+	jpeg? ( virtual/jpeg[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	png? ( media-libs/libpng[static-libs(+)] )
+	rbd? ( sys-cluster/ceph[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
+	seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] )
+	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
+	tls? ( net-libs/gnutls[static-libs(+)] )
+	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	xattr? ( sys-apps/attr[static-libs(+)] )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	qemu_softmmu_targets_i386? (
+		>=sys-firmware/ipxe-1.0.0_p20130225
+		~sys-firmware/seabios-1.7.2.2
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	qemu_softmmu_targets_x86_64? (
+		>=sys-firmware/ipxe-1.0.0_p20130225
+		~sys-firmware/seabios-1.7.2.2
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	accessibility? ( app-accessibility/brltty )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/vte:2.90
+	)
+	iscsi? ( net-libs/libiscsi )
+	opengl? ( virtual/opengl )
+	pulseaudio? ( media-sound/pulseaudio )
+	python? ( ${PYTHON_DEPS} )
+	sdl? ( media-libs/libsdl[X] )
+	selinux? ( sec-policy/selinux-qemu )
+	smartcard? ( dev-libs/nss !app-emulation/libcacard )
+	spice? ( >=app-emulation/spice-protocol-0.12.3 )
+	systemtap? ( dev-util/systemtap )
+	usbredir? ( >=sys-apps/usbredir-0.6 )
+	virtfs? ( sys-libs/libcap )
+	xen? ( app-emulation/xen-tools )"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	static-softmmu? ( ${LIB_DEPEND} )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+
+STRIP_MASK="/usr/share/qemu/palcode-clipper"
+
+QA_PREBUILT="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+	usr/share/qemu/s390-ccw.img"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-or32
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
+you have the kernel module loaded before running kvm. The easiest way to
+ensure that the kernel module is loaded is to load it on boot.\n
+For AMD CPUs the module is called 'kvm-amd'\n
+For Intel CPUs the module is called 'kvm-intel'\n
+Please review /etc/conf.d/modules for how to load these\n\n
+Make sure your user is in the 'kvm' group\n
+Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+
+qemu_support_kvm() {
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
+		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
+		use qemu_softmmu_targets_s390x; then
+		return 0
+	fi
+
+	return 1
+}
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+	elif use kernel_linux; then
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			use python && CONFIG_CHECK+=" ~DEBUG_FS"
+			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+
+	python_export_best
+}
+
+src_prepare() {
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	epatch "${FILESDIR}"/qemu-9999-cflags.patch
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	# Fix ld and objcopy being called directly
+	tc-export LD OBJCOPY
+
+	# Verbose builds
+	MAKEOPTS+=" V=1"
+
+	epatch_user
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+	debug-print-function $FUNCNAME "$@"
+
+	local buildtype=$1
+	local builddir=$2
+	local conf_opts audio_opts
+	local static_flag="static-${buildtype}"
+
+	conf_opts="--prefix=/usr"
+	conf_opts+=" --sysconfdir=/etc"
+	conf_opts+=" --libdir=/usr/$(get_libdir)"
+	conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
+	conf_opts+=" --disable-bsd-user"
+	conf_opts+=" --disable-guest-agent"
+	conf_opts+=" --disable-strip"
+	conf_opts+=" --disable-werror"
+	conf_opts+=" --python=${PYTHON}"
+
+	# audio options
+	audio_opts="oss"
+	use alsa && audio_opts="alsa,${audio_opts}"
+	use sdl && audio_opts="sdl,${audio_opts}"
+	use pulseaudio && audio_opts="pa,${audio_opts}"
+
+	if [[ ${buildtype} == "user" ]]; then
+		conf_opts+=" --enable-linux-user"
+		conf_opts+=" --disable-system"
+		conf_opts+=" --target-list=${user_targets}"
+		conf_opts+=" --disable-blobs"
+		conf_opts+=" --disable-bluez"
+		conf_opts+=" --disable-curses"
+		conf_opts+=" --disable-kvm"
+		conf_opts+=" --disable-libiscsi"
+		conf_opts+=" $(use_enable seccomp)"
+		conf_opts+=" --disable-sdl"
+		conf_opts+=" --disable-smartcard-nss"
+		conf_opts+=" --disable-tools"
+		conf_opts+=" --disable-vde"
+	fi
+
+	if [[ ${buildtype} == "softmmu" ]]; then
+		conf_opts+=" --disable-linux-user"
+		conf_opts+=" --enable-system"
+		conf_opts+=" --with-system-pixman"
+		conf_opts+=" --target-list=${softmmu_targets}"
+		conf_opts+=" $(use_enable bluetooth bluez)"
+		conf_opts+=" $(use_enable gtk)"
+		use gtk && conf_opts+=" --with-gtkabi=3.0"
+		conf_opts+=" $(use_enable sdl)"
+		conf_opts+=" $(use_enable aio linux-aio)"
+		conf_opts+=" $(use_enable accessibility brlapi)"
+		conf_opts+=" $(use_enable caps cap-ng)"
+		conf_opts+=" $(use_enable curl)"
+		conf_opts+=" $(use_enable fdt)"
+		conf_opts+=" $(use_enable iscsi libiscsi)"
+		conf_opts+=" $(use_enable jpeg vnc-jpeg)"
+		conf_opts+=" $(use_enable kernel_linux kvm)"
+		conf_opts+=" $(use_enable kernel_linux nptl)"
+		conf_opts+=" $(use_enable ncurses curses)"
+		conf_opts+=" $(use_enable opengl glx)"
+		conf_opts+=" $(use_enable png vnc-png)"
+		conf_opts+=" $(use_enable rbd)"
+		conf_opts+=" $(use_enable sasl vnc-sasl)"
+		conf_opts+=" $(use_enable seccomp)"
+		conf_opts+=" $(use_enable smartcard smartcard-nss)"
+		conf_opts+=" $(use_enable spice)"
+		conf_opts+=" $(use_enable tls vnc-tls)"
+		conf_opts+=" $(use_enable tls vnc-ws)"
+		conf_opts+=" $(use_enable usbredir usb-redir)"
+		conf_opts+=" $(use_enable uuid)"
+		conf_opts+=" $(use_enable vde)"
+		conf_opts+=" $(use_enable vhost-net)"
+		conf_opts+=" $(use_enable virtfs)"
+		conf_opts+=" $(use_enable vnc)"
+		conf_opts+=" $(use_enable xattr attr)"
+		conf_opts+=" $(use_enable xen)"
+		conf_opts+=" $(use_enable xen xen-pci-passthrough)"
+		conf_opts+=" $(use_enable xfs xfsctl)"
+		use mixemu && conf_opts+=" --enable-mixemu"
+		conf_opts+=" --audio-drv-list=${audio_opts}"
+		#conf_opts+=" --enable-migration-from-qemu-kvm"
+	fi
+
+	conf_opts+=" $(use_enable debug debug-info)"
+	conf_opts+=" $(use_enable debug debug-tcg)"
+	conf_opts+=" --enable-docs"
+	conf_opts+=" $(use_enable tci tcg-interpreter)"
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
+
+	# Add support for static builds
+	use ${static_flag} && conf_opts="${conf_opts} --static --disable-pie"
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if ! use ${static_flag} && gcc-specs-pie; then
+		conf_opts="${conf_opts} --enable-pie"
+	fi
+
+	einfo "./configure ${conf_opts}"
+	cd ${builddir}
+	../configure \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)" \
+		${conf_opts} \
+		|| die "configure failed"
+
+		# FreeBSD's kernel does not support QEMU assigning/grabbing
+		# host USB devices yet
+		use kernel_FreeBSD && \
+			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
+}
+
+src_configure() {
+	softmmu_targets=
+	user_targets=
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		use "qemu_softmmu_targets_${target}" && \
+		softmmu_targets="${softmmu_targets},${target}-softmmu"
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		use "qemu_user_targets_${target}" && \
+		user_targets="${user_targets},${target}-linux-user"
+	done
+
+	[[ -n ${softmmu_targets} ]] && \
+		einfo "Building the following softmmu targets: ${softmmu_targets}"
+
+	[[ -n ${user_targets} ]] && \
+		einfo "Building the following user targets: ${user_targets}"
+
+	if [[ -n ${softmmu_targets} ]]; then
+		mkdir "${S}/softmmu-build"
+		qemu_src_configure "softmmu" "${S}/softmmu-build"
+	fi
+
+	if [[ -n ${user_targets} ]]; then
+		mkdir "${S}/user-build"
+		qemu_src_configure "user" "${S}/user-build"
+	fi
+}
+
+src_compile() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		default
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		default
+	fi
+}
+
+src_test() {
+	cd "${S}/softmmu-build"
+	emake -j1 check
+	emake -j1 check-report.html
+}
+
+qemu_python_install() {
+	python_domodule "${S}/QMP/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/kvm_stat"
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/QMP/qmp-shell"
+	python_doscript "${S}/QMP/qemu-ga-client"
+}
+
+src_install() {
+	if [[ -n ${user_targets} ]]; then
+		cd "${S}/user-build"
+		emake DESTDIR="${ED}" install
+
+		# Install binfmt handler init script for user targets
+		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
+	fi
+
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		emake DESTDIR="${ED}" install
+
+		if use test; then
+			dohtml check-report.html
+		fi
+
+		if use kernel_linux; then
+			udev_dorules "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use qemu_softmmu_targets_x86_64 ; then
+			newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm
+			ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
+			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
+			ewarn "your libvirt configs or other wrappers for ${PN}"
+		elif use x86 || use amd64; then
+			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+			elog "of the /usr/bin/qemu-kvm script."
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	# Install config file example for qemu-bridge-helper
+	insinto "/etc/qemu"
+	doins "${FILESDIR}/bridge.conf"
+
+	# Remove the docdir placed qmp-commands.txt
+	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/QMP/"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc QMP/qmp-commands.txt QMP/qmp-events.txt QMP/qmp-spec.txt
+
+	# Remove SeaBIOS since we're using the SeaBIOS packaged one
+	rm "${ED}/usr/share/qemu/bios.bin"
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+	fi
+
+	# Remove vgabios since we're using the vgabios packaged one
+	rm "${ED}/usr/share/qemu/vgabios.bin"
+	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	fi
+
+	# Remove sgabios since we're using the sgabios packaged one
+	rm "${ED}/usr/share/qemu/sgabios.bin"
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+	fi
+
+	# Remove iPXE since we're using the iPXE packaged one
+	rm "${ED}"/usr/share/qemu/pxe-*.rom
+	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+	fi
+
+	qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	local virtfs_caps=
+
+	if qemu_support_kvm; then
+		readme.gentoo_print_elog
+		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
+		ewarn "save states will be removed in the next release (1.6.x)"
+		ewarn
+		ewarn "It is recommended that you migrate any VMs that may be running"
+		ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
+		ewarn "any saved states with a newer qemu."
+		ewarn 
+		ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
+	fi
+
+	virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
+	virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+	use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+}
+
+pkg_info() {
+	echo "Using:"
+	echo "  $(best_version app-emulation/spice-protocol)"
+	echo "  $(best_version sys-firmware/ipxe)"
+	echo "  $(best_version sys-firmware/seabios)"
+	if has_version sys-firmware/seabios[binary]; then
+		echo "    USE=binary"
+	else
+		echo "    USE=''"
+	fi
+	echo "  $(best_version sys-firmware/vgabios)"
+}
--- a/app-i18n/man-pages-ru/man-pages-ru-3.49.2170.1764.20130606.ebuild
+++ b/app-i18n/man-pages-ru/man-pages-ru-3.49.2170.1764.20130606.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ru/man-pages-ru-3.49.2170.1764.20130606.ebuild,v 1.4 2013/07/18 11:39:24 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ru/man-pages-ru-3.49.2170.1764.20130606.ebuild,v 1.5 2013/07/19 11:46:40 zlogene Exp $

 EAPI="5"

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"

 LICENSE="FDL-1.3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""

 DEPEND=""
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@ -42,5 +42,7 @@ DIST ghc-bin-7.4.2-x86-stable-glibc.tbz2 92394017 SHA256 2c42257a60aec03ae622c1a
 DIST ghc-bin-7.6.2-amd64.tbz2 94464851 SHA256 82ba625dc5ff58db6e085155b2c1d708c490ac6ac84dba85763b74ec1cabda13 SHA512 b6ef3ed764a3a325dc2cbcfb5fa2f416d240ca70f33791bc6535b2d3416cfa281ad6c343b72c8ffd59be92cfcc3c5dcddb1a7c6d57128ab16b89d341880b022f WHIRLPOOL a5412e0df5105e1c1de0af71a5bb0671d27c869bd74a271b07bf4a8985c30f8e6aff69aa89e7801b2c49623f4cb0b9ec34ad3eb96af5d9bc2de106652b7bf4a0
 DIST ghc-bin-7.6.2-ia64.tbz2 158914515 SHA256 fac170050bfeb7c20ac62525bf169ad252d0598f2790db2027b04c4c70df58f1 SHA512 a79fa35aadf65ca60d1b0ae98bdd9151c3cce13eac1fa6c525cd29c5ea2359da8ff78549a138db876bceaa4ffcdbb621d87cde053be0fa282f8891251eb78e21 WHIRLPOOL 7753255c9f4a7b5fb7434157df7821bce3c3c2a36e8a781e5e6939aeb0c5721ce62d4710ebd4c377393dea3c51ed8300a3f8c8adb4d0c16ca8c7a8ce86f8e853
 DIST ghc-bin-7.6.2-x86.tbz2 93746314 SHA256 d5d50ae425cfa2cb7e476e0829fae61623fc6d728413ffa27cb7ecfc925633f1 SHA512 cd56331b8855539671e1b9463960413c84665da3aa7d6e7fcd1cf4425f003582f524d3385c97e7fe9707989712bf487cd7cc75a1096918abd057cc6021badde5 WHIRLPOOL d5dffb0e970c16f168d5d6b5057b42afa8704a156a5521eca01aa522248cd9cdb8fa29e0ae5c368e11fbd87c39b89569c4ccbde7d8ba1660801cf593f328266c
+DIST ghc-bin-7.6.3-alpha.tbz2 132175518 SHA256 c0a16219d1e270cb73e68d6d0b0fae08264fa308acceb876d2c4e7dea302e13d SHA512 944f8dfea78e54068bfeb8773e9b15d7e5e307c5cdef5d928e011ceaef3a9449950afc2b033508c496497e4f97d6acafc005ba097ed9fd18b978eae601cce6a7 WHIRLPOOL 16dfdc97b310038daced86f7ea93632e9f6e1879cfabd7e8a4f662358fe17074c060df1c864dca944a79d60c98f134cc31b335bfce3d89b8537001783803e7a9
 DIST ghc-bin-7.6.3-amd64.tbz2 94441516 SHA256 3ef747e96a40c9d5021e88b8afee0a97838c27b00619d9187783d95279c31779 SHA512 89f6c693d83d6309a0e44fcc68e30279c858adb0a0ea9317dd168b2e632c22a8507da78ed953523f5d7156db98e06c6df56d6edc19c0c50b3941ea578263dc64 WHIRLPOOL 891dfbfc9d88fa579b6a837651f7cc6d9aecef8b8752ec7bcebbdfef2a6d8929d0edaceff27ec61d6160d36d1b0e8406b7829a04a858ed64210b5c57b9c98940
+DIST ghc-bin-7.6.3-ia64.tbz2 158762376 SHA256 07234585032a319d769bdf2c748904e2a1ce170413f6f24e2a62b4ef9be6a05c SHA512 86b439432f446034a54af6e177a5dcbf32a523b004d41c22243be2acb412f5df2645f0adff6aa80ca3efffb905ffd4e70e6753c4735bc74ca8545ea00791699a WHIRLPOOL bddcf1ab380bdfcf4cccd2afe6248503199abfba127a2c97ca148d71a6a558607f7e3324d1ac3f2b7aeb812468bc76cef870e201642fb8298f2da15d3ebe200e
 DIST ghc-bin-7.6.3-x86.tbz2 93718672 SHA256 a55024f66a048437fcd6ef0f33cdb994a43628998a2f0fe4d094cc9ba83d1615 SHA512 624f2a3238dee15853018d45632d1363e42d34099a77e5e9ce5c8da976cb4c33578144f7c39dbf25ee68c17d8d42910db2347186849eeeda6bc20053ce2be990 WHIRLPOOL bc646fc19906b59416358fb7558b6e2c3f7ad069c2fcf443be36b621894cfcecb0844acf5b5f9c383e034dfff3e24d312a7da0d7a629836134ec5dc1ecd6f139
--- a/dev-lang/ghc/ghc-7.6.3.ebuild
+++ b/dev-lang/ghc/ghc-7.6.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3.ebuild,v 1.1 2013/06/01 14:16:25 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3.ebuild,v 1.2 2013/07/19 10:21:35 slyfox Exp $

 # Brief explanation of the bootstrap logic:
 #
@ -50,10 +50,10 @@ HOMEPAGE="http://www.haskell.org/ghc/"
 arch_binaries=""

 # sorted!
-#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
+arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
 #arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )"
 arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )"
-#arch_binaries="$arch_binaries ia64?  ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64.tbz2 )"
+arch_binaries="$arch_binaries ia64?  ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64.tbz2 )"
 #arch_binaries="$arch_binaries ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-${PV}-ppc.tbz2 )"
 #arch_binaries="$arch_binaries ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-${PV}-ppc64.tbz2 )"
 #arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
@ -65,13 +65,13 @@ arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc
 # 0 - yet
 yet_binary() {
 	case "${ARCH}" in
-		#alpha) return 0 ;;
+		alpha) return 0 ;;
 		#arm)
 		#	ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution."
 		#	return 0
 		#;;
 		amd64) return 0 ;;
-		#ia64) return 0 ;;
+		ia64) return 0 ;;
 		#ppc) return 0 ;;
 		#ppc64) return 0 ;;
 		#sparc) return 0 ;;
@ -233,20 +233,44 @@ relocate_path() {
 relocate_ghc() {
 	local to=$1

+	# libdir for prebuilt binary and for current system may mismatch
+	# It does for prefix installation for example: bug #476998
+	local bin_ghc_prefix=${WORKDIR}/usr
+	local bin_libpath=$(echo "${bin_ghc_prefix}"/lib*)
+	local bin_libdir=${bin_libpath#${bin_ghc_prefix}/}
+
 	# backup original script to use it later after relocation
 	local gp_back="${T}/ghc-pkg-${PV}-orig"
 	cp "${WORKDIR}/usr/bin/ghc-pkg-${PV}" "$gp_back" || die "unable to backup ghc-pkg wrapper"

+	if [[ ${bin_libdir} != $(get_libdir) ]]; then
+		einfo "Relocating '${bin_libdir}' to '$(get_libdir)' (bug #476998)"
+		# moving the dir itself is not strictly needed
+		# but then USE=binary would result in installing
+		# in '${bin_libdir}'
+		mv "${bin_ghc_prefix}/${bin_libdir}" "${bin_ghc_prefix}/$(get_libdir)" || die
+
+		relocate_path "/usr/${bin_libdir}" "/usr/$(get_libdir)" \
+			"${WORKDIR}/usr/bin/ghc-${PV}" \
+			"${WORKDIR}/usr/bin/ghci-${PV}" \
+			"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
+			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${PV}" \
+			"$gp_back" \
+			"${WORKDIR}/usr/$(get_libdir)/${P}/package.conf.d/"*
+	fi
+
 	# Relocate from /usr to ${EPREFIX}/usr
 	relocate_path "/usr" "${to}/usr" \
 		"${WORKDIR}/usr/bin/ghc-${PV}" \
 		"${WORKDIR}/usr/bin/ghci-${PV}" \
 		"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
 		"${WORKDIR}/usr/bin/hsc2hs" \
+		"${WORKDIR}/usr/bin/runghc-${PV}" \
 		"${WORKDIR}/usr/$(get_libdir)/${P}/package.conf.d/"*

 	# this one we will use to regenerate cache
-	# so it shoult point to current tree location
+	# so it should point to current tree location
 	relocate_path "/usr" "${WORKDIR}/usr" "$gp_back"

 	if use prefix; then
@ -257,8 +281,9 @@ relocate_ghc() {
 			"${WORKDIR}/usr/bin/ghc-${PV}" \
 			"${WORKDIR}/usr/bin/ghci-${PV}" \
 			"${WORKDIR}/usr/bin/ghc-pkg-${PV}" \
-			"$gp_back" \
 			"${WORKDIR}/usr/bin/hsc2hs" \
+			"${WORKDIR}/usr/bin/runghc-${PV}" \
+			"$gp_back" \
 			|| die "Adding LD_LIBRARY_PATH for wrappers failed"
 	fi

--- a/dev-python/g-pypi/g-pypi-0.3.ebuild
+++ b/dev-python/g-pypi/g-pypi-0.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/g-pypi/g-pypi-0.3.ebuild,v 1.5 2013/05/18 15:56:50 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/g-pypi/g-pypi-0.3.ebuild,v 1.6 2013/07/19 07:50:29 mgorny Exp $

 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@ -30,6 +30,7 @@ DEPEND="
 		dev-python/scripttest
 	)
 "
+# dev-python/unittest2 may not be necessary, bug #450648
 RDEPEND="
 	app-portage/gentoolkit
 	app-portage/gentoolkit-dev
@ -39,7 +40,7 @@ RDEPEND="
 	dev-python/jinja
 	dev-python/pygments
 	dev-python/sphinxcontrib-googleanalytics
-	virtual/python-unittest2
+	dev-python/unittest2
 	dev-python/yolk
 	virtual/python-argparse
 "
--- a/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
+++ b/dev-python/mechanize/mechanize-0.2.5-r1.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mechanize/mechanize-0.2.5-r1.ebuild,v 1.1 2013/07/19 11:58:10 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stateful programmatic web browsing in Python"
+HOMEPAGE="http://wwwsearch.sourceforge.net/mechanize/ http://pypi.python.org/pypi/mechanize"
+SRC_URI="http://wwwsearch.sourceforge.net/${PN}/src/${P}.tar.gz"
+
+LICENSE="|| ( BSD ZPL )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	# Ignore warnings (http://github.com/jjlee/mechanize/issues/issue/13).
+	# https://github.com/jjlee/mechanize/issues/66
+	"${PYTHON}" -W ignore test.py
+}
+
+python_install_all() {
+	# Fix some paths.
+	sed -e "s:../styles/:styles/:g" -i docs/html/* || die "sed failed"
+	if use doc; then
+		dohtml -r docs/html/ docs/styles
+	fi
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/meld3/meld3-0.6.9-r1.ebuild
+++ b/dev-python/meld3/meld3-0.6.9-r1.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.9-r1.ebuild,v 1.1 2013/07/19 12:24:12 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="meld3 is an HTML/XML templating engine."
+HOMEPAGE="https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+python_test() {
+	"${PYTHON}" ${PN}/test_${PN}.py || die "Tests failed under ${EPYTHON}"
+}
--- a/dev-python/meld3/meld3-0.6.9.ebuild
+++ b/dev-python/meld3/meld3-0.6.9.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/meld3/meld3-0.6.9.ebuild,v 1.2 2012/09/29 22:06:01 radhermit Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="meld3 is an HTML/XML templating engine."
-HOMEPAGE="https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS="CHANGES.txt COPYRIGHT.txt LICENSE.txt README.txt TODO.txt"
-
-src_test() {
-	cd ${PN}
-	testing() {
-		"$(PYTHON)" test_${PN}.py
-	}
-	python_execute_function testing
-}
--- a/dev-python/ws4py/ws4py-0.2.3.ebuild
+++ b/dev-python/ws4py/ws4py-0.2.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.2.3.ebuild,v 1.3 2013/01/11 15:50:38 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.2.3.ebuild,v 1.4 2013/07/19 07:56:00 mgorny Exp $

 # We could depend on dev-python/cherrypy when USE=server, but
 # that is an optional component ...
@ -31,7 +31,7 @@ IUSE="+client +server test +threads"
 RDEPEND="client? ( dev-lang/python[threads?] )"
 DEPEND="test? (
 		${RDEPEND}
-		virtual/python-unittest2
+		dev-python/unittest2
 		>=dev-python/cherrypy-3.2.0
 		dev-python/gevent
 	)"
--- a/dev-python/ws4py/ws4py-0.2.4-r1.ebuild
+++ b/dev-python/ws4py/ws4py-0.2.4-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.2.4-r1.ebuild,v 1.1 2013/03/16 11:15:45 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.2.4-r1.ebuild,v 1.2 2013/07/19 07:56:00 mgorny Exp $

 # We could depend on dev-python/cherrypy when USE=server, but
 # that is an optional component ...
@ -30,7 +30,7 @@ IUSE="+client +server test +threads"
 RDEPEND=""
 DEPEND="test? (
 		${RDEPEND}
-		virtual/python-unittest2[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
 		>=dev-python/cherrypy-3.2.0[${PYTHON_USEDEP}]
 		dev-python/gevent[${PYTHON_USEDEP}]
 	)"
--- a/dev-python/ws4py/ws4py-0.2.4.ebuild
+++ b/dev-python/ws4py/ws4py-0.2.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.2.4.ebuild,v 1.1 2013/01/11 15:50:38 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ws4py/ws4py-0.2.4.ebuild,v 1.2 2013/07/19 07:56:00 mgorny Exp $

 # We could depend on dev-python/cherrypy when USE=server, but
 # that is an optional component ...
@ -32,7 +32,7 @@ IUSE="+client +server test +threads"
 RDEPEND="client? ( dev-lang/python[threads?] )"
 DEPEND="test? (
 		${RDEPEND}
-		virtual/python-unittest2
+		dev-python/unittest2
 		>=dev-python/cherrypy-3.2.0
 		dev-python/gevent
 	)"
--- a/dev-qt/qthelp/qthelp-4.8.5-r1.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.5-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.5.ebuild,v 1.4 2013/07/19 03:20:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.5-r1.ebuild,v 1.1 2013/07/19 06:19:38 patrick Exp $

 EAPI=5

@ -92,7 +92,10 @@ src_compile() {
 	if use compat; then
 		# need to explicitly mangle this as we lack the toplevel makefiles
 		pushd .
-		cd src/plugins/accessible && "${S}"/bin/qmake || die
+		cd src/plugins/accessible 
+		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" && make || die
+		cd ../../../tools/assistant/compat/lib
+		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" && make || die
 		popd
 	fi
 	# ugly hack to build docs
@ -111,10 +114,16 @@ src_install() {
 	if use compat; then
 		# need to explicitly mangle this as we lack the toplevel makefiles
 		pushd .
-		cd src/plugins/accessible && "${S}"/bin/qmake || die
+		cd src/plugins/accessible && emake INSTALL_ROOT="${D}" install || die
+		cd ../../../tools/assistant/compat/lib && emake INSTALL_ROOT="${D}" install || die
 		popd
 		insinto /usr/include/qt4/
-		doins -r include/QtAssistant || die
+		doins -r include/QtAssistant
+		insinto /usr/include/qt4/QtAssistant/
+		# this is rather confusing
+		doins -r tools/assistant/compat/lib/*.h || die
+		# collides with qtgui
+		rm "${D}"/usr/lib64/qt4/plugins/accessible/libqtaccessiblewidgets.so
 	fi
 	emake INSTALL_ROOT="${D}" install_qchdocs

--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@ -1,5 +1,2 @@
-DIST multi_json-1.3.6.gem 15872 SHA256 d987e42b2d8117c46fd9dc3b1e29e681b94356b8c27d9b5ed26d45d1b6935f60 SHA512 8791386a38e51188736be4de0ace411c1f529ce6d5e01c31bc1e0448778cfeb68d3f9e0f9fd048687723984d5df7ef8b45e7b7c8c8e9ddc2a353fe44cd1f0521 WHIRLPOOL 61535a2b2edc61422e1c5fd239d9e66e3b2bd524acba5c5abd254a13a7235ca1d4f3c693a7266d30f30ab0f22f9627f0bc416c3873cb657802a09f28dba05a67
-DIST multi_json-1.3.7.gem 15872 SHA256 94d4aac8090afb2fdc4c6519736b12f7b91ec1e0af2834b64bfd837b9117afbc SHA512 824ebe356469a1e93dc5ba98e321054d10a359a71c9aaa051f5ba168a0814ab4610f2252b969a0c984666665b5559d3b9e29bd006edaf59870d1a121725e43a3 WHIRLPOOL 09f4b8291e5731a350b182b19ad37c82ebc0fded3e236ce0af786b0b23b94621ef0aa2c9d5bb7454fa8814e4d709804f2f67b3d5318f112e56de5547dc17f6c4
-DIST multi_json-1.4.0.gem 15360 SHA256 7ebc47d9b288f79f0a91e6d64dabde57430f7162fe885ca253f08b44746b3f19 SHA512 3502e4acdbf5b777e64c89eb2838a8bac18d15aa5580c1a61eb32fad2f82088e125fb3924216312870937ef2d0c79808e212e7c42e88b5401b32a20110eaa693 WHIRLPOOL 51096327783773957ef678276d95cd77894e4abf6a7713c231f8500c89acedbc1c103f17f2b9bed7a52b7ebfb1e17ab710eb39b8baed31059d61b3e81efd9719
 DIST multi_json-1.5.0.gem 15872 SHA256 e94cf8a6db88eb35657b20f5a17631fcc7e46a867f798fce7ef09944442d673a SHA512 5f36d9f3d7d11d090b3ae68fa0d5152f4a89006e3e3cc079d0fefc9297f4dbb4043708627c8de6b8a7bec4ecbc436f8dab7cefd2884ac68ee620cd905e0cd8b0 WHIRLPOOL 8a4979bdc6d78e3629102f4bac8922dd454ea02a92282763d11ae1093e405cb3f6c16c04d2e292701cdf2146ad6fc82b6913957e6d764e0f9d909085bb3074bd
 DIST multi_json-1.6.1.gem 24064 SHA256 8fe5991287b6d1a77719feaa03e460ab1f8c689b326106f6e627c54419d7635c SHA512 1672a4c7cad6ad4f9bd532b425a71ec7be2115675c04f66afbb203f2e1c078543175e4d0e01f118e86e503d29e078f52a6beb043e98af4e51de3c32f5eba402b WHIRLPOOL 5f1cf218f9214d3f2e62aa54c5cc8bf3175269f66d13e6f1f73e4235112bdaa10b88cca9887ca1f4eb2f2cefad8360b4a81add877d16dc767667bc357b62b226
--- a/dev-ruby/multi_json/multi_json-1.3.6.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.3.6.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.3.6.ebuild,v 1.2 2013/01/16 01:13:11 zerochaos Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A gem to provide swappable JSON backends"
-HOMEPAGE="http://github.com/intridea/multi_json"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-0.7 =dev-ruby/activesupport-3* )"
-
-ruby_add_bdepend "doc? ( dev-ruby/rspec:2 )"
-
-ruby_add_bdepend "test? ( dev-ruby/json )"
-
-USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile spec/helper.rb || die "Unable to remove bundler."
-	rm Gemfile || die "Unable to remove bundler Gemfile."
-
-	# Provide version otherwise provided by bundler.
-	sed -i -e "s/#{MultiJson::VERSION}/${PV}/" Rakefile || die
-
-	# Remove unimportant rspec options not supported by rspec 2.6.
-	rm .rspec || die
-
-	# Remove best default spec since we don't package oj yet.
-	sed -i -e '/defaults to the best available gem/,/^    end/ s:^:#:' spec/multi_json_spec.rb || die
-}
-
-each_ruby_test() {
-	CI=true each_fakegem_test
-}
--- a/dev-ruby/multi_json/multi_json-1.3.7.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.3.7.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.3.7.ebuild,v 1.2 2013/01/16 01:13:11 zerochaos Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A gem to provide swappable JSON backends"
-HOMEPAGE="http://github.com/intridea/multi_json"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-0.7 =dev-ruby/activesupport-3* )"
-
-ruby_add_bdepend "doc? ( dev-ruby/rspec:2 )"
-
-ruby_add_bdepend "test? ( dev-ruby/json )"
-
-USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile spec/helper.rb || die "Unable to remove bundler."
-	rm Gemfile || die "Unable to remove bundler Gemfile."
-
-	# Provide version otherwise provided by bundler.
-	sed -i -e "s/#{MultiJson::VERSION}/${PV}/" Rakefile || die
-
-	# Remove unimportant rspec options not supported by rspec 2.6.
-	rm .rspec || die
-
-	# Remove best default spec since we don't package oj yet.
-	sed -i -e '/defaults to the best available gem/,/^    end/ s:^:#:' spec/multi_json_spec.rb || die
-}
-
-each_ruby_test() {
-	CI=true each_fakegem_test
-}
--- a/dev-ruby/multi_json/multi_json-1.4.0.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.4.0.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/multi_json/multi_json-1.4.0.ebuild,v 1.2 2013/01/16 01:13:11 zerochaos Exp $
-
-EAPI=5
-
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A gem to provide swappable JSON backends"
-HOMEPAGE="http://github.com/intridea/multi_json"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "|| ( >=dev-ruby/json-1.4 >=dev-ruby/yajl-ruby-0.7 =dev-ruby/activesupport-3* )"
-
-ruby_add_bdepend "doc? ( dev-ruby/rspec:2 )"
-
-ruby_add_bdepend "test? ( dev-ruby/json )"
-
-USE_RUBY="${USE_RUBY/jruby/}" ruby_add_bdepend "test? ( dev-ruby/yajl-ruby )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile spec/helper.rb || die "Unable to remove bundler."
-	rm Gemfile || die "Unable to remove bundler Gemfile."
-
-	# Provide version otherwise provided by bundler.
-	sed -i -e "s/#{MultiJson::VERSION}/${PV}/" Rakefile || die
-
-	# Remove unimportant rspec options not supported by rspec 2.6.
-	rm .rspec || die
-
-	# Remove best default spec since we don't package oj yet.
-	sed -i -e '/defaults to the best available gem/,/^    end/ s:^:#:' spec/multi_json_spec.rb || die
-}
-
-each_ruby_test() {
-	CI=true each_fakegem_test
-}
--- a/dev-ruby/nagios_analyzer/Manifest
+++ b/dev-ruby/nagios_analyzer/Manifest
@ -1 +1,2 @@
 DIST nagios_analyzer-0.0.3.gem 9216 SHA256 682b816fa540c68e2e97e7e36904e4a6158490401ce96c143d13c3121e108fbb SHA512 069a577ca232db7aaa45b0953412392fa4eb7cb16dffcc23c2576d5fe7be6104fffe554303ff74e6559ee3f97a5f765406f379b42503b666ba6ec225260503f0 WHIRLPOOL 0672a648afce11fbbf0e533a404d0c8aef728964a4dd8cb8c78ae8d0f272a266ec63b08ef4b7e319a185991d1729eaca4ad25c13bb90dc61645185121a169f85
+DIST nagios_analyzer-0.0.5.gem 11264 SHA256 49248921a84b98ed4879ffc4833468e1be390dbe9345597e3d20095b977e0f33 SHA512 052ad107bf39d35b0c21392f4d5905ddcf009e3fa4b780706c23b9d6a45bf6a7b0a64dad596c8a32aedb332ee069f062c30b47479289569fb5f13b5705b03303 WHIRLPOOL 21d3a7f23c3d9c37da70c7b8820d524516fa5d36667a89929a02d0e90b544c3ff892f9dd08adf79dead357dd7f5fae51c1d985924311d5925b95cec4614d7273
--- a/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5.ebuild
+++ b/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5.ebuild,v 1.1 2013/07/19 05:40:16 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.textile"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple parser for Nagios status files"
+HOMEPAGE="https://github.com/jbbarth/nagios_analyzer"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@ -1,2 +1,3 @@
 DIST net-scp-1.0.4.gem 27136 SHA256 548494e245244d7bdc06015b60ca71e8c93574d511120e67eb26115482831f36 SHA512 2c8ddd1060fa62759ad6becc150986f32205b3c7807fe71cda01e473d4528b94dfc6412acb89308e2ad977f7e8287649f59a110d7a012fd8ffeb8389ec6f7f5f WHIRLPOOL 017caa4fc20b4af773531f2d056a97bfb9cd10c41d22a07fea4ee35862ca768ead7ca71890d8c100df292380adf01a747ad6308226f1a87b9c4d6ba93f8f0c06
 DIST net-scp-1.1.0.gem 31744 SHA256 44f38a78401f60cfa094fff43c2301f48c15b6d6f08aa1adfcd76627c354ef0a SHA512 6bf2ac3591aa0e84757808beafc1276797e08ca81454c3a09e92e5218527024849d19dd3d17f5c01170e336c9e83cce70aab06f2fdd6393b9171b057fb7271fb WHIRLPOOL a8a7998e7cbf18b5be656a3746841d8bc1862f9cec9f3ec20fe423061c6b5ec549b13b142f6fc0155472776047ea56e6d93374faef539571146196b958c1e740
+DIST net-scp-1.1.2.gem 32256 SHA256 f3d8848f63f9b7670e57af2e2c308e9bd6fddb7c5440a36e892478a1e62b5977 SHA512 5ba49a994a816b54aee32b5c3e708bed69fc22d7e688f60e93a1e2d29d086ed17f3685ea819d5db23a27abf8ba64fbd418204e1a1702fb0d2702607016febc09 WHIRLPOOL 08573792d16f1719ffbeabb621c4148823f649de43c8a0e8bea2506c329a3c653d21483113fa290022f3cfdd40713ac577d7816f2c77458dab5a80cf115432bd
--- a/dev-ruby/net-scp/net-scp-1.1.2.ebuild
+++ b/dev-ruby/net-scp/net-scp-1.1.2.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-scp/net-scp-1.1.2.ebuild,v 1.1 2013/07/19 05:42:55 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby implementation of the SCP client protocol"
+HOMEPAGE="http://net-ssh.rubyforge.org/scp"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/mocha
+	)"
+
+ruby_add_rdepend ">=dev-ruby/net-ssh-2.6.5"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test test/test_all.rb || die
+}
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@ -1,5 +1,3 @@
-DIST net-ssh-2.2.2.gem 133120 SHA256 211cf80d5d5805ca59723708a3cdfe43fa4dc30e5f86177a108f8cc2cd623487 SHA512 d2d7a463a8dc2f915e7050cdae1af8cd7e1d691700e47260f02728297b2616efba83cfac516febff37825c1c27070440dea1ddab057ae93e5085f9a83da94f63 WHIRLPOOL 3205074c56c046a4e7fd8c088256ca0c959eb4cfcfba3ba0616bf13fc3d790443eb6dc32647b68b2e25247522efd0f0c3ee27954e224938f3992efd85e42d2c1
 DIST net-ssh-git-2.4.0.tgz 135388 SHA256 d2e41ca9fd63c6235d556efd030b8bc0f515f9588ad22330884630c67b0a8eaa SHA512 6e851d3e231169f2b1411c8bdc44212cafb52dcbbbba9d8a757aa8fdf52af31efb698cc6bcc103aa4006caffcc9c929fd50be5ad323a8fd2c3fe97e6f23a484a WHIRLPOOL 1d55a43109cb8f69da9ccf55281b7456445c68ff4e9c730b479ca62d0a9dc9ed70b4fdfadfbfa81cb94f5815142685445f6b48e2ad9588bd96152fbd4530c369
-DIST net-ssh-git-2.6.2.tgz 157988 SHA256 e99e49299bc51810251e030a5da23c99eb755ca3a986615883fb100b5922cbe4 SHA512 bf487309f31d85a17ba647da8101b4a09bafa20c669105e7295c8414fabb0d2689ddbae81d25cf88d2f430c6a8f28f1067bde8c694a62deddb48d780eebb2cdc WHIRLPOOL 0b1e66f00fe26843f9aab763fc474c817f66a733e0831ec6f9ff507b3b8e53779a485e3aea6f918b46bdead9c48613d7dbbb7c8342d34d5fd764d47e5d0be693
-DIST net-ssh-git-2.6.3.tgz 158155 SHA256 1c7c35b13dd9e00ebbe7e4fdc5aa615b9de469dcd4f800d6b820f140508c670f SHA512 c5ee5f6224fcaf36c7e37d3528d7a402d2504fb859d7addd50ecba8e9e5dfa98a6d2c46d9815df80593991fac5d762fb490b1a036bcd611f67a0a4220b6e3c7e WHIRLPOOL f4d9ab716a839594f9033c77d9a730ffc78e186d45a384cffaeeb8f54913db2e33ee8908a6e02099bb5933c179da34b1308adb61d2312119f47149e22fd2f237
 DIST net-ssh-git-2.6.7.tgz 160612 SHA256 2d624ce32014b2fca3a6f59f87bba588d81b100afe9796ecd68b8d075b05ff0e SHA512 7dff32c5e6e82bed1ac85d74f5212ee818dfa0733138f474a41ebc265f9a5e7ef940b17ec6edf533a3c3bba5dcda872e5f93bdafbd28aada02ae2075cc1ad396 WHIRLPOOL 6473c98e66553515a4a9efc9144947360b4f8b7b3f4066963aa7e35b95999487a9ab2538e1aa586481353af45a066d4770f7cb6f8f23e5ecfb480348cfeba70e
+DIST net-ssh-git-2.6.8.tgz 161088 SHA256 3c8f80b5c2029094b96aefb73332fcb5da7dbbd617b1e880041e458a12356efe SHA512 623cbc9680e33cf461a3d6c39ad4ad0115ed7077aa9850eeae3c00ce1eaa5559e05b604245a08cf3382f332c34349751e86248beee6015dd4e4a01173bf49ed5 WHIRLPOOL 79fb24bf89de8bda788791a2b74c390b1d984b7dc4efbc3fc9fa4c649e7793bc095d7cc53c7a0447a2372d2b7781a863ac4cecc3aaa73d580dc84680aba8e7cb
--- a/dev-ruby/net-ssh/net-ssh-2.2.2.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-2.2.2.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/net-ssh-2.2.2.ebuild,v 1.8 2012/12/08 12:31:56 ago Exp $
-
-EAPI="2"
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc THANKS.rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="http://net-ssh.rubyforge.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/mocha )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die "Tests failed."
-}
--- a/dev-ruby/net-ssh/net-ssh-2.6.2.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-2.6.2.ebuild
@ -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/dev-ruby/net-ssh/net-ssh-2.6.2.ebuild,v 1.1 2012/11/25 11:46:40 graaff Exp $
-
-EAPI=4
-# no longer compatible with ruby 1.8.
-USE_RUBY="ruby19"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc THANKS.rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="http://net-ssh.rubyforge.org/"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/v${PV} -> net-ssh-git-${PV}.tgz"
-RUBY_S="${PN}-${PN}-*"
-
-LICENSE="GPL-2"
-SLOT="2.6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/mocha )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die "Tests failed."
-}
--- a/dev-ruby/net-ssh/net-ssh-2.6.8.ebuild
+++ b/dev-ruby/net-ssh/net-ssh-2.6.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/net-ssh-2.6.3.ebuild,v 1.1 2013/01/28 07:00:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/net-ssh/net-ssh-2.6.8.ebuild,v 1.1 2013/07/19 05:47:52 graaff Exp $

 EAPI=5
 # no longer compatible with ruby 1.8.
@ -9,7 +9,7 @@ USE_RUBY="ruby19"
 RUBY_FAKEGEM_TASK_TEST=""

 RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc THANKS.rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc THANKS.txt"
 RUBY_FAKEGEM_EXTRAINSTALL="support"

 inherit ruby-fakegem
--- a/dev-ruby/notify/Manifest
+++ b/dev-ruby/notify/Manifest
@ -1,2 +1,3 @@
 DIST notify-0.4.0.gem 6144 SHA256 a385890ef2ec3de95beb53290de0a7a7428ea4b1ff5b33cdebd5c5cdf4862c15 SHA512 db7ad4759f616230871110bb9321bef6cb037fa0e93680bd03548f02171e595828daaed3613ea1ad28941b8b639c663bc47af3370787bdcdd4ae6f4dfdb993f2 WHIRLPOOL 0d233ef20bed3d881a1a8ce5296f6d43581ce393a746093c169eb843e8963755479498c858332ff2d279a7b5169fff6aaf7c18d14199eb99e411e6f06a3bb83c
 DIST notify-0.5.1.gem 7168 SHA256 9274ef8a3377606374c3c610775e668e72ddaf75cbebd0b77edad82de6a4f0ab SHA512 09ee29cd6823867d7037d1d39f7c37432aeb984593e250699f8e96d40af1b36c29782d670469721b4cc74acad8245c2916b5c7a0abc004d6591877db0f00396c WHIRLPOOL e55116a2b4951633359af63b8def716a28f6c5353258c69e7d63deac9057c78dda29030bb4d161f40540cfa804a3740dfc77e8a61b93cd90b9cdec22214d1ce5
+DIST notify-0.5.2.gem 7168 SHA256 a1a7e7086a808e04c81ba801f94a6c352a9c8d57138b84bf2b9a62b886307a64 SHA512 f64ea5f265acc970f145e1c43e27d6608b1d90b8da6b7236c001808ab690ca302af501d08bda62e66b69434ef1940b6fa19faae3f9ef37c5cc9cebc4b5310564 WHIRLPOOL 39130cb2de01806d5127a3273af0534551cfaec077e7fc39ac71d857f6b234c65a7b08c432046ceda2d48fe4b19b14d24c5e585f907cceb1253fd60b0038f352
--- a/dev-ruby/notify/notify-0.5.2.ebuild
+++ b/dev-ruby/notify/notify-0.5.2.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/notify/notify-0.5.2.ebuild,v 1.1 2013/07/19 06:32:22 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md sample.rb"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A function to notify on cross platform"
+HOMEPAGE="http://github.com/jugyo/notify"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="x11-libs/libnotify"  # For notify-send support.
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@ -1,3 +1,4 @@
 DIST oauth2-0.5.2.gem 15872 SHA256 08311551cc83e8d4440e7dfee899f4fd9d35abb6f14abc9af54414b50987a5ca SHA512 7cc5a6b28db0fc328e964d056b68491ebdbd197f73e37955e4530fa961c0ed937e6a3a24d5a12ebe39689a4fc0891eed073461315108f4865b965604508e5d2f WHIRLPOOL d42611beebfb1ff8299f4db15e347d08df608dc02e12ea51fb619f1893ed3f809c271a8b421357092201b2222e5507edbbd022c7dfdf489dfc2cbc2d7ab52b6b
 DIST oauth2-0.8.0.gem 17920 SHA256 0bf5bca25ae4ba6ce533b95e9a74d1c12c91d50d00908faa31102183963d7744 SHA512 aed8cff8c97f19a39fe51af07d883474bcfc9573cefadb964ef4df416d9588c007aa7e26832a89c2f9a3d2c638b9da0f2b721340711c28f91c669d6ca0f05f9d WHIRLPOOL 0e8bcbd6af2ed2edf7f4e4b3d17f307a604d535d9f474527153c34adee4bea62ca558c3ac23ad4010b79a79e71701e791dabb51980b52334056c189316eb26a8
 DIST oauth2-0.9.1.gem 21504 SHA256 8b9b0a928fd64c2f5cdb4b636e38824776b400081d1aeb7ab735e6470b77a78f SHA512 eb702ad1fcd9e277001afe172c784d55fef28916684acb929bce660ade90a69244e0ed50d9ff2352f6a56c93148bc4023ee7a05aa68d52e36bf3c8d65c7d87d0 WHIRLPOOL 6eef7a7a3b586cba396eb999f936eec476afd95d760c23070f2090e5dea50ed73f1fc5e0f9a02a79835b53f6bc3184a73d8617ff98e40ef706e28d7f93f99a11
+DIST oauth2-0.9.2.gem 22016 SHA256 6d69c7efcd39c808b8faca37c84f46d04d6298451c9cce04d0d8316329ca6116 SHA512 5c47fd8450f91ad645eec03f24532c8e22f89ec2c11390f4cf75edd15ac96c9a9fe247f8f260261490bcce103c5e9c6eaf68a3505429231b02af96f3c992da09 WHIRLPOOL fedf329f2d3a2505212138ad41552fdb1e8ed243bc25fbf5d99b297f20c0683e797202c957a0f085aa54c00b7d8d5fec9fbb1ff6728e59e945e2ff0ae7364055
--- a/dev-ruby/oauth2/oauth2-0.9.2.ebuild
+++ b/dev-ruby/oauth2/oauth2-0.9.2.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/oauth2/oauth2-0.9.2.ebuild,v 1.1 2013/07/19 06:36:53 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem."
+HOMEPAGE="http://github.com/intridea/oauth2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/faraday-0.8
+	>=dev-ruby/httpauth-0.2
+	>=dev-ruby/jwt-0.1.4
+	>=dev-ruby/multi_json-1.0.3
+	>=dev-ruby/multi_xml-0.5
+	>=dev-ruby/rack-1.2"
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.5.0:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/SimpleCov.start/ s:^:#:' spec/helper.rb || die
+}
+
+each_ruby_test() {
+	CI=true ${RUBY} -S rspec spec || die
+}
--- a/dev-ruby/ohai/Manifest
+++ b/dev-ruby/ohai/Manifest
@ -1,2 +1,3 @@
 DIST ohai-0.6.12.tgz 97463 SHA256 fc65fcbfb4cdeb186562481ea5a4e73a35db7101f642cbfcdc0a839a607599af SHA512 adeb611af5e7a08c2b1ffaaf4a348535a7d301eb0836b99558298c3eae32d2d2b27e2ea97f243cec49254f888981ba5f6d3cbd5460f34bea425bd2a11bf3d6a6 WHIRLPOOL f670ed10d7c3d31f3e2b04f7b06261a3ff2c7a726091857ff00b7f7242b2ebdd2e70d3948c06b62a980630aced975d7111434015b32115eaa8b8c3fecea17d0f
 DIST ohai-6.14.0.tgz 110618 SHA256 beb8bdee164bdcbc8eb3887c9272dc333a562aa297df760a42d778bf09b740ff SHA512 85eb788680a08cb84349dbbdccf313e24c86c799914ff43296e7d11d022e4fbe3e209afcbd0ca3c333f53b14b4de2696fc6429381a6901d793542bb4d3155704 WHIRLPOOL aaf56edbcb0081d673afc4fb2e221c3e810b55965bd17a049cae13fdae70ea0700d2dabc6dbfa9a390dcfc490abdcb0643fd437f7c47c51d4c2ce750f74add8f
+DIST ohai-6.16.0.tgz 373480 SHA256 fcf2a1fef0d635a12be9826ad74008bce9ba74e7cb87415ba62e62f9c67f36d1 SHA512 1c379e5acf457e1d699148d1e6a355349472de2fb1ecf28af51fef36d4b4b47e75972452032f288010c3d3a92c7f1805923fbbbee715f1a3d4a198aa87f953c3 WHIRLPOOL 91e2dbe86bea382ac981365ec3ea8bb80bc04e0aeec8d66ef1c532df0a0a870c78d1add80dcbe151d02d65a7c7dc9c48981752ad35f72ac853330534bb3ee51e
--- a/dev-ruby/ohai/ohai-6.16.0.ebuild
+++ b/dev-ruby/ohai/ohai-6.16.0.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-6.16.0.ebuild,v 1.1 2013/07/19 07:01:54 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ohai profiles your system and emits JSON"
+HOMEPAGE="http://wiki.opscode.com/display/chef/Ohai"
+SRC_URI="https://github.com/opscode/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/ipaddress
+	dev-ruby/yajl-ruby
+	dev-ruby/mixlib-cli
+	dev-ruby/mixlib-config
+	dev-ruby/mixlib-log
+	dev-ruby/mixlib-shellout
+	>=dev-ruby/systemu-2.2.0"
+
+all_ruby_prepare() {
+	rm Gemfile .rspec || die
+	# Be more lenient to work with versions of systemu that we have in
+	# the tree.
+	sed -i -e 's/~> 2.2.0/>= 2.2.0/' ohai.gemspec || die
+
+	# Remove the Darwin-specific tests that require additional
+	# dependencies.
+	rm -rf spec/unit/plugins/darwin || die
+
+	# Avoid the ruby plugin tests because these always execute the
+	# system ruby, rather than the current ruby.
+	rm -rf spec/unit/plugins/ruby_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman docs/man/man1/ohai.1
+}
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@ -10,21 +10,31 @@ DIST eric4-i18n-tr-4.5.10.tar.gz 356958 SHA256 b4f40c13e8863b1321008e79024e03471
 DIST eric4-i18n-zh_CN.GB2312-4.5.10.tar.gz 390816 SHA256 f38f61444aabbe110150a786e31f4ea1697a9cdb39fabc87cd117ceaeb420d4d SHA512 bfe5e2d7707e223a1feea9e9064b1a8f40626b7db8def1ae1ba273fbae6db0b3267b72b49d5ac439d0c069d994a6c51f35164eb646dbef0ea73972d14ebc070b WHIRLPOOL 9cafe39ff50748ac9f9981407c3d0a8ae35746a024681bbeb81f973fb22225efbd3b6f14e16922f915b6794527ce34a9379b5359756aeca4f5be221cab5b1c7d
 DIST eric5-5.3.2.tar.gz 10144754 SHA256 3fe850aa7b1b9cd149573e2b0187f20dcb38e86f790ea67bdd6cecfd67c0c351 SHA512 551e2f92ccb8a988fc53f42b87fc9783eef5de9f05a948950f7e1be032da1a76c48b576d8b8d32ff46da8eb43457e7cc2e29dd8f36dbeb3069d1ea0ef6afbb87 WHIRLPOOL 6597d15bf33be45db2cf5447d61378928c5e6671a08b9c4483deb1a1cc49165b645e6f36f4feb2b301000c697e9b027357df5cf60e9dffba90973083bd30bed6
 DIST eric5-5.3.4.tar.gz 10294390 SHA256 03fa0c50a0cd59ff7afb27c53858f9e8e94aaf6edee8d2cef5c7d37e968a1416 SHA512 919524c6837fa6c91cd4c63644d2c1d2e7d3dbe4eacea06b48d0f21f026ca20175c1a1607fadbb02441628a20788d1fc97c5bfc1fa4b5b04772bcb4cbb0b3cde WHIRLPOOL c7e8401fa800f4852dcb11cedc2f4046bc3955d17ac49037c227fd9b3b9859a1e6dbf7f66af7ef8695f8d67591bd117cd8cc460196d70980d5afcf61b7493a84
+DIST eric5-5.3.5.tar.gz 10154655 SHA256 cda4fcc4c692de624d2e19b60c7e63612a9185e4299b0d7eb83e09c6ed62036a SHA512 d2e491a76460d409f42540b4ae593ba7a7da92ee8db5b502f8012df8ecedd1d4229d5c88da7ff0743a16a8a0085e931e2c6bf65b9333f8e581a309cb88789b02 WHIRLPOOL 16d8c9a97fa644ce65cddee201a16742d9466013f3dc2b84f7699d443c268e335ca311187d01019ae18a4700c83e0b08bb67e9967653e75aa99da610a1d084d4
 DIST eric5-i18n-cs-5.3.2.tar.gz 559463 SHA256 39d7b7d663714edabb00a55a1ceb96c83b378c07af25c7bd99e1484117b484dd SHA512 b43f6059ec6ca38707c2504e6cdffa1e7b1744980f4c046a10d9a2d011a8c7e20da7160278343466769960e71bb0a32afa61f725cada7740664a629c5d1b09c4 WHIRLPOOL bf397cf2458aa595394c43bd4cf245f404fe782808e9a59642d7a75a6c978f4c1726088de2ab2d6f0ef1bfe28f62b632972982bf098ddb38eb010791d68f6280
 DIST eric5-i18n-cs-5.3.4.tar.gz 559671 SHA256 7c7e6a6677f170910bbb6e16e6c7449f8ef5ca451bf9b96b5a89bf6387e95f13 SHA512 55f3c13f0ecb9752feeba9ca821562f95a693aa5eac8c27a60c989a5c152d5275737f85494ae4446056b5afc0bbf9340a966789dcc540d641e71b1a72c025182 WHIRLPOOL 9248bd283e16c3ec5148655227a539b297fd8fbd3d209865e9fd7ed74aea193deec76d8230d49214f144f152e6f60f5f7e6b9f28fb96e96b0cfad9e42e90a7f6
+DIST eric5-i18n-cs-5.3.5.tar.gz 559769 SHA256 288013504370a2db1d6b933c2581b125506522f4149f1cb703daf7f631c8aad5 SHA512 3eeaca3f2b1d1aca44622c3177f6e8fe474a996b2af9bd374e09775a6a00b10d2df71244c6d855483f8cdf39b6e48a90d32e2efed35858c1f79af2e587501687 WHIRLPOOL 16c0c35b532a0aa4be5df9ee12e55d47a3028cc62e99704c98a7196173481fc3e1adc31f0a01d3ce4aa7dc2f2243424205e034bb11d88ef7fb608d9173103f95
 DIST eric5-i18n-de-5.3.2.tar.gz 677443 SHA256 fd3454798a31f883ca63e4e6bad97308c54a3d51a2f263931609e2ff9175e499 SHA512 c44d3a04e8d488179261f76463174b7fbf69047146735439e7f0b3b44caae712edd59665e2675b21f11b1d6db1638b2c466a3dacd5ffe8a110413232a5633ef2 WHIRLPOOL b1dfba0197a754060773e2bacaf25c6d9d8bcc352cebe2559a6f8799b6421de9056065ba88fefd6de2841c081fcb84502a43cc45f3559715be98c251c7e34909
 DIST eric5-i18n-de-5.3.4.tar.gz 677515 SHA256 4c7ae66b1f8f6a168aa210b6fc27b44c1453ecd2dbc2179f6c574829b6f75b54 SHA512 d09decec7e2afde94c4af8803723855cae40371dfa69ac0fa72a5cfda21caa4f2121c240aa2badda3fff3a03892e09489114093473dded125113479de62d9b24 WHIRLPOOL 77de955e9d1a6c83d7cc3b92daa1aed9e342628fb60dcd57704a87c8ee8db66e6c2e4e434bf293b141e5f5cdeee49a0b877ec6100cda7af59d94535cca8e3a0a
+DIST eric5-i18n-de-5.3.5.tar.gz 677547 SHA256 a9d331fa1b8efbb5d5ee4cf45f5165bc6a6733e9b927bdfedac3965d54480279 SHA512 728525a4df502355e31c9e759f722943d387130a2b0449372f6eef2e3eccdf9c3a270dc1ae5af223752a65c577be3c0e84d558d9bcf33f75450ac1cf3b42dcd7 WHIRLPOOL 6abffd29d40a79ba86bcaaea3a58f0b9cad4ca0db861a4b17538714ac58967d3eb95eb92876e759a08dceaee3ada9481131dc8c22f3dca2f62b78ef917ed7a85
 DIST eric5-i18n-en-5.3.2.tar.gz 184729 SHA256 94cf75533f1b582fc39aae1f7bcd75c7c441383f3dedd35687b64845e829a5f9 SHA512 ca4048e1eaff641e02cd2d799f03e96050268d5753bf6bf1076b431643d26552f03244c6c9d221b2e680fe0c97a0f22d67ad697bfe5ba6b3e7772088c57817ab WHIRLPOOL fd40815b71b5f6b4b33982a2141f7fba2f5bdee0af0afb8c7f04c1d211026c189a0075322b7d618f4b731b8112238dbd858f5d9b42a62e445b9ef3b69b683eea
 DIST eric5-i18n-en-5.3.4.tar.gz 184957 SHA256 34b11f3226dd8ddaef43230a11f9331579c65b9b5daf973e06cec7a284e3dc59 SHA512 7d1c1626050c021ea05bc3c985b24bddfb5b9ee1333bffea20cf2dd1ac8234851dfed3c6255355d0304ac3c15addf60bd615009fb6c6540db2808a9811e2fc54 WHIRLPOOL d240d8ddb563c1db842d7324ecf6868e7ed899ba8fb7bed2ae4a3bc98813cef67a12af854c0b258b9bc0b874da0ed3b20c4806a39bf1dc3f8a7470f6199abb59
+DIST eric5-i18n-en-5.3.5.tar.gz 184950 SHA256 b5dcec6fdffd68b63a388914521b4b3f0728721973aaff87526125ea157e96e6 SHA512 7507c9953309fda5c5541370b01d998104110835e42688561bb7492763e0f82e45dbcb7cf6de27858527d20a3ac6b466a8801b554d7efc7bdaad9f50c37fbc64 WHIRLPOOL 91c8ad1fade8ad53d85688de8b119b7b7cf8f6f56d74b496388ab72ddf3285e09b80ff18d432e4a7c3d4ba3cf5c899463f8ab9629c6dd48c255ac6900627b968
 DIST eric5-i18n-es-5.3.2.tar.gz 681610 SHA256 c7be90a9d577f8da5b1c577fe6b669cbba51abcfef05932b20e4dde0e220c741 SHA512 b4dc8b25129e414fcf51ccdfa6a003be1841c694ff2c0f42192112ef2fbeccbd0902e6f988eadab8c9b34b6393400821dea5c02c1a161ac35496ed1a988867e7 WHIRLPOOL c9cce0345a7b10b78a986d9641614fadcec9f85894af562b139ba47b57fcf4c6337bcf94a166c7633c9b25734863825416bad115a99fadc74033323b905f7cf5
 DIST eric5-i18n-es-5.3.4.tar.gz 681999 SHA256 ae1963f0558d06472aef4d3fde4e5030201b681cdbc534129d8b359145dc8d22 SHA512 4b486b65ef079ec01f44a01917c8e3a21af12b3cc9d06820a92a3849a4327209fb9c3237799511646892ea54d8c550bc926c3ac4fe071f1f01c31fbe5c1d6a97 WHIRLPOOL e8ca913215fce45b454948b21e928b8fa684f7eacc4d3323acc153798d1f42f96cdb5e8dc3984ec29d229f82675388ca48164e9632b1a637fd09b5dcecee92bf
+DIST eric5-i18n-es-5.3.5.tar.gz 682263 SHA256 c70c4ea395d128b4b0b43b4f33c8a6b28f1e02ae305c7293cd1612336b215e6d SHA512 edf1a46de4f398ee58a63b3c69c81244f0535a4c21c8307639f3f77eac281536843c569ba006b757dbfc53080a0dfca8f12fe96f2884dbb0f951d843b323021c WHIRLPOOL 2abd70af9e1255048d1df31232d56b023c841bad492bc809a6414c0590340cd1bd9fd3b2b0c29c067e1172b90431eb6d63d07606b2183537433a10f92a29bbeb
 DIST eric5-i18n-fr-5.3.2.tar.gz 517792 SHA256 39ca88021f5a656ffb849aec66664f349d8b29164f002062e1e6340de4741048 SHA512 80b7b84a7a4509cb1b299c1b11e02dbc9b51d7c555700b59ff3f25bb191a2e57f2bdc9fdf7de76e7119c301bd84a496ec9206669978387c4ade48279e4216639 WHIRLPOOL 7fce06574bb0b352994d904ed9fe937b8b0b0b9f48c05ac3314376b10758c0dc6273820810effa8d0e978366f69b71caafde4b7661c35401f1da36b82ba05a98
 DIST eric5-i18n-fr-5.3.4.tar.gz 517994 SHA256 3ad69237838e0025069f5970c352eec1ff8b2d35d80499a2b1a1f65edace0b84 SHA512 325605b55be80ad7ad1b9bcf271e706e27fa1131127c80457c3ff09551772152214a698400bf38a31715fd174bcc41b7b4fc50312dcca96e3eb439531a8b5b79 WHIRLPOOL 43b2e2f6e8a6ce56c098d5441b0df43a64f9804ad19b7eab3d8871aa8b0ec5327b93b3d25bfdabe5f6c911dab15056dfbe2d305d3a9e6de457c0c12fc0032e71
+DIST eric5-i18n-fr-5.3.5.tar.gz 518034 SHA256 1ccad2f436d39f4c77fc3879b2025c51a7050567fa99969bd5ac24fb153caa2f SHA512 e1a068122d4bec0a17c3b5fc0c138bc28254965d3f4d2346e5f141a56e252c552804bf71289e40e318c684d540a6912b341b95fb45cc9ab72bf81058bd3ae0e4 WHIRLPOOL 6da301c7b083a4e7fd6a54478e362188f442e7338904743b0d2fd33b82495ed79df1d1e86fdf2c71ef05e449c2d82480ad5cff716299d90fc9339f8ad60ca01e
 DIST eric5-i18n-it-5.3.2.tar.gz 579281 SHA256 fc2457cce9613613c44a1c635ae65150caad9c84f4b59023c1bd2398c654fb17 SHA512 b35bac115df8dfe9754542a50e67182fda792d65f72f4c0205251bfc18d4e849c0b1cbdc68041a2fb651d4020359a9cc70906e9f3025d304616f121db68c3b8e WHIRLPOOL 445cca59f8db6ac2cc4278406cbb71eb4055369d7c31dfe4fedcc4f7d3e78216060f02af771681768c2e77657a9c5ef8bbe8ce7c720283a6eebed4a8e5d5ccf5
 DIST eric5-i18n-it-5.3.4.tar.gz 579425 SHA256 e3f9e579852d43bfa57377b18c09f970b19efa081bf9cfea9f956884b7c5d84a SHA512 2dc441722029ce2e384e4bd9a6aaa364ccb9d2d22dfb1591cfe742af5a80901392b18f0a3eeab34d5c32a0194320d3aaebdb8be069761328c5cbf619ada756dd WHIRLPOOL 57e163b18df7bd5a1ff5ea06c47732081cb901dd2e073749405d35ce8048097a636984ac2ccdb17c93af12546630c873bfb208f8d686f3dd30a4c33807fb55d0
+DIST eric5-i18n-it-5.3.5.tar.gz 579567 SHA256 4b900c122f33660d6ce8953d4669486a64865526a0967a6894fc3d2e3aa63c42 SHA512 ca39a8d630728472a18f7df5e41fe0c0bec811111a37c25f7534128a92a7367dd2e56bf5f95f0a0d61cde30e938d3abffc1bb9942e4c844819a4b50a995c8e61 WHIRLPOOL fc11d7522d990a6648e97ddb90aded6d8e7c2154053c10478302f08ca7509c288989b697eaf8c062d626953f178e77f636cc176161c6a05a7b35cd7bf0ee8db6
 DIST eric5-i18n-ru-5.3.2.tar.gz 608258 SHA256 015ba62666e2832bfeaea6615dcaeb2ae66ecb0a98b7426aa8979cf2526095b6 SHA512 8f467eff2ace04539a0cf0a605d62a60fa6f7348cd56520311376db502bf2b7ca5058b548a3be9383279c9e515789f4858d0e3efa35815ef9ab8a8bef86dee84 WHIRLPOOL 8f2773fb1ee79ec11abdc65b52c7823171cfd3de8ed7f162c2a53769b4a78e69fb62c38fd9ea24208cffc521a7cec3a31b412ed756e0d30fe87c238a9e496659
 DIST eric5-i18n-ru-5.3.4.tar.gz 608402 SHA256 0571b1eb43fc2d742a2a23392a00a77007285cdfdabaf280c3a297ff4308c8db SHA512 b0164f8e0de771c75fbbf837686f234bd2ff32083be4075b517101bf3ad7d5317cb6a59a38a3df04c6a0122b268b81cb13bccb8b74e2d5b242db906872de812c WHIRLPOOL 423d3e372b112770293daa743588ae56c80b6372bb357c0679d7349557f9659d42bca5ad0d1eb3942888e7d42af5b1bbe3a2a59546051fb25d41c847bb24c544
+DIST eric5-i18n-ru-5.3.5.tar.gz 608562 SHA256 b7267e78332b871fe811b9438e6338938e817c6826d62edb1b4268be6de9f80d SHA512 df25f7661fcd1d97c7f620f66b0e26148d72ccd16b255dbb0e283c25a749760fbc8758ff8bb9243f6e2133d0008b8306357fa0f5a43b1dc4005ac592171ac8a6 WHIRLPOOL e91169103e074a6e3e71f07cd8e000b2155e533b28fc618855eec98a558654a8999e9a4ca67ac3bf49fdc960713605d7e4cc8eb8b26686d24a7c1336915d9a90
 DIST eric5-i18n-tr-5.3.2.tar.gz 480358 SHA256 d7c42a6c416dcdb2b422ee20b0144b650dc51ac8810ba86e1bfbb15b14ee6482 SHA512 e759765e64ca2751e0d411b23a41005a2aef91fab749bdf9c86c4c0352cdf76dfee59c129a63cc620c9b35bc7b6fb1a4307be374685f2aa74ddbc16ede81a8e0 WHIRLPOOL 74e57fcd8b31e7503978af75cb079a78462cfca0ed16bb9cabc235afbb58d97c0ec2f30f617924338eda47ca18da41ce1760d32e622707d174e1c2347e522821
 DIST eric5-i18n-tr-5.3.4.tar.gz 480586 SHA256 71d295090b677d0b9bb28d04c68da94cee1a5c5447584cfe4a5c7e3cc0685e40 SHA512 f5c8636c332e094d9f33a049607e49dcf6bb5d8df6ff9b31a04fb2e62f107595646dfae21fac3ff72078655502baa09b86bc0d5af1e9196243fea88148cbab44 WHIRLPOOL 5ce647183b772be132b14115bddd757a54cc2a19df99f17eeb07814a757af44322853f5a05c71116c2f27e5af105b6a43378a88c2f8242aa52b4f4305a27a202
+DIST eric5-i18n-tr-5.3.5.tar.gz 480759 SHA256 6fc382fb1f3c33f1fe5cb270f88a98693f3f2b37e67cad4067f7b6606a9288d0 SHA512 2553cd4b4e54cc1a20e770a310fd427f948a1a9d7889dd03e426396a57c15745d2aeb5957dd23a53c43757332e2ce0bf1d2f2a3a4563e815c260a98c1bbf7efe WHIRLPOOL 573af299769482fcf89ff26e33d464d21ff2e055af245ffc7883e6968a93f1bc19a13bb58327f129f39152e005009ff1ba784b15895d16ab444cc4bc6476121e
 DIST eric5-i18n-zh_CN.GB2312-5.3.2.tar.gz 464843 SHA256 f522e57070375cc1842f0e4d64a9f9e42538544ae62bbd856bf19c9e5353a498 SHA512 be359bf4ae00bd27de37552c8ddd817229de2b5c9c7c1853c23b14a6af971e197abee63f980693bbcff15e024f1ff934465e6b2465682ad48c32840c54ee6e3e WHIRLPOOL b8f172d02e8a41c36a606de34519dc81e933c28932d311554335fb6ba3935597f2fe385e6264b9dd76b0b930c6da2204e5371ff4e4069e4c659cc39853228c31
 DIST eric5-i18n-zh_CN.GB2312-5.3.4.tar.gz 465040 SHA256 2bfe95f8941014336b9d8b06caacf02a84c5a4830529e356f9fd000a58d5fcf7 SHA512 48769c0eab26e03194a25e4728b0f5130295b80d85b8beed59aa3e6b47c34be91d7f96e7865b5871912c15fe4d618bd9b8c252c2bfd2811717386082734dbdf3 WHIRLPOOL 9754d9b1ea971d320ad12b0112160ae9222929df89447457362557f90746a6aa6474f138a8b3b6ea0f0712607e4c993a08ff06fc71257c8833af450492888332
+DIST eric5-i18n-zh_CN.GB2312-5.3.5.tar.gz 465112 SHA256 0ebce751899f365ee55aac326b96340e99d09ebdf8d54447e88bfcb2a09870d9 SHA512 1ae567ea9c9e1b047591cd74431578b5bc7719ba44f0050ac77f79d7d93a0da28bbb2a9eff9869ca3e77d0ae4177e98048da305fdc560a2eec399307f35169f3 WHIRLPOOL cef8bc11988f94c3b474e43c68de44461ba432e73cfc52c6b238d5ac6f46282566805d433e8eed7d7046dc402f800060c94c467d0adedd65f1d7438aa240093d
--- a/dev-util/eric/eric-5.3.5.ebuild
+++ b/dev-util/eric/eric-5.3.5.ebuild
@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.3.5.ebuild,v 1.1 2013/07/19 05:40:09 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="3:3.1"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.* *-jython 2.7-pypy-*"
+
+inherit eutils python
+
+SLOT="5"
+MY_PN="${PN}${SLOT}"
+MY_PV="${PV/_pre/-snapshot-}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
+HOMEPAGE="http://eric-ide.python-projects.org/"
+BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
+SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="spell"
+
+DEPEND="
+	>=dev-python/sip-4.12.4
+	>=dev-python/PyQt4-4.9.6-r1[X,help,sql,svg,webkit]
+	>=dev-python/qscintilla-python-2.6
+"
+RDEPEND="${DEPEND}
+	>=dev-python/chardet-2.0.1
+	>=dev-python/coverage-3.2
+	>=dev-python/pygments-1.5
+"
+PDEPEND="
+	spell? ( dev-python/pyenchant )
+"
+
+LANGS="cs de en es fr it ru tr zh_CN"
+for L in ${LANGS}; do
+	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
+	IUSE+=" linguas_${L}"
+done
+unset L
+
+S=${WORKDIR}/${MY_P}
+
+PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
+
+src_prepare() {
+	# Avoid file collisions between different slots of Eric.
+	sed -e "s/^Icon=eric$/&${SLOT}/" -i eric/${MY_PN}.desktop || die
+	sed -e "s/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/" \
+		-i $(grep -lr "eric\.png" .) || die
+	mv eric/icons/default/eric{,5}.png || die
+	mv eric/pixmaps/eric{,5}.png || die
+	rm -f eric/APIs/Python/zope-*.api
+	rm -f eric/APIs/Ruby/Ruby-*.api
+
+	# Delete internal copies of dev-python/chardet,
+	# dev-python/coverage and dev-python/pygments.
+	rm -fr eric/ThirdParty
+	rm -fr eric/DebugClients/Python{,3}/coverage
+	sed -i -e '\|/coverage/|d' eric/${MY_PN}.e4p || die
+	sed -i -e 's/from DebugClients\.Python3\?\.coverage /from coverage /' \
+		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
+
+	# Fix desktop files (bug 458092).
+	sed -i -e '/^Categories=/s:Python:X-&:' eric/eric5{,_webbrowser}.desktop || die
+}
+
+src_install() {
+	installation() {
+		"$(PYTHON)" install.py \
+			-z \
+			-b "${EPREFIX}/usr/bin" \
+			-i "${T}/images/${PYTHON_ABI}" \
+			-d "${EPREFIX}$(python_get_sitedir)" \
+			-c
+	}
+	python_execute_function installation
+	python_merge_intermediate_installation_images "${T}/images"
+
+	doicon eric/icons/default/${MY_PN}.png || die
+}
+
+pkg_postinst() {
+	python_mod_optimize -x "/eric5/(DebugClients/Python|UtilitiesPython2)/" ${MY_PN}{,config.py,plugins}
+
+	elog
+	elog "If you want to use Eric with mod_python, have a look at"
+	elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
+	elog
+	elog "The following packages will give Eric extended functionality:"
+	elog "  dev-python/pylint"
+	elog "  dev-python/pysvn"
+	elog
+	elog "This version has a plugin interface with plugin-autofetch from"
+	elog "the application itself. You may want to check those as well."
+	elog
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${MY_PN}{,config.py,plugins}
+}
--- a/media-gfx/openscad/openscad-2013.06.ebuild
+++ b/media-gfx/openscad/openscad-2013.06.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openscad/openscad-2013.06.ebuild,v 1.1 2013/07/05 05:19:10 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openscad/openscad-2013.06.ebuild,v 1.2 2013/07/19 04:22:55 mattm Exp $

 EAPI="2"

@ -12,7 +12,7 @@ SRC_URI="https://openscad.googlecode.com/files/${P}.src.tar.gz"

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

 CDEPEND="media-gfx/opencsg
--- a/media-sound/gnaural/gnaural-1.0.20110606.ebuild
+++ b/media-sound/gnaural/gnaural-1.0.20110606.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnaural/gnaural-1.0.20110606.ebuild,v 1.1 2012/09/10 11:16:53 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnaural/gnaural-1.0.20110606.ebuild,v 1.2 2013/07/19 08:42:26 nimiux Exp $

 EAPI=2

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

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="nls"

 RDEPEND="
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>video</herd>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>media-video@gentoo.org</email>
-</maintainer>
 <maintainer>
 	<email>nikoli@lavabit.com</email>
-	<description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<herd>video</herd>
+<herd>proxy-maintainers</herd>
 <use>
 	<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
 	<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Fri, 19 Jul 2013 04:06:56 +0000
+Fri, 19 Jul 2013 13:06:56 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Fri, 19 Jul 2013 04:06:56 +0000
+Fri, 19 Jul 2013 13:06:56 +0000
--- a/metadata/md5-cache/app-admin/eselect-rails-0.16
+++ b/metadata/md5-cache/app-admin/eselect-rails-0.16
@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Manages Ruby on Rails symlinks
-HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=app-admin/eselect-1.0.10
-SLOT=0
-SRC_URI=mirror://gentoo/eselect-rails-0.16.tar.bz2
-_md5_=32f1299db5e4546612cc821418c69112
--- a/metadata/md5-cache/app-emacs/undo-tree-0.6.3
+++ b/metadata/md5-cache/app-emacs/undo-tree-0.6.3
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-22
+DESCRIPTION=Undo trees and visualization
+EAPI=4
+HOMEPAGE=http://www.dr-qubit.org/emacs.php#undo-tree
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=virtual/emacs-22
+SLOT=0
+SRC_URI=mirror://gentoo/undo-tree-0.6.3.el.bz2
+_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f751dfdd8ed995c4e60bde5690b9eb85
--- a/metadata/md5-cache/app-emulation/qemu-1.5.1
+++ b/metadata/md5-cache/app-emulation/qemu-1.5.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure info install postinst prepare pretend setup test
+DEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130225 ~sys-firmware/seabios-1.7.2.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130225 ~sys-firmware/seabios-1.7.2.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[ncurses,readline] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses,readline] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses,readline] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools ) dev-lang/perl =dev-lang/python-2* sys-apps/texinfo virtual/pkgconfig kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) static-softmmu? ( >=dev-libs/glib-2.0[static-libs(+)] sys-apps/pciutils[static-libs(+)] sys-libs/zlib[static-libs(+)] >=x11-libs/pixman-0.28.0[static-libs(+)] aio? ( dev-libs/libaio[static-libs(+)] ) caps? ( sys-libs/libcap-ng[static-libs(+)] ) curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) ncurses? ( sys-libs/ncurses[static-libs(+)] ) png? ( media-libs/libpng[static-libs(+)] ) rbd? ( sys-cluster/ceph[static-libs(+)] ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] ) spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] ) ) test? ( dev-libs/glib[utils] sys-devel/bc ) virtual/pkgconfig filecaps? ( sys-libs/libcap )
+DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
+EAPI=5
+HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
+IUSE=accessibility +aio alsa bluetooth +caps +curl debug fdt gtk iscsi +jpeg kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net virtfs +vnc xattr xen xfs qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 +filecaps
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2 LGPL-2 BSD-2
+RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130225 ~sys-firmware/seabios-1.7.2.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130225 ~sys-firmware/seabios-1.7.2.2 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) accessibility? ( app-accessibility/brltty ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) gtk? ( x11-libs/gtk+:3 x11-libs/vte:2.90 ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[ncurses,readline] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses,readline] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses,readline] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) smartcard? ( dev-libs/nss !app-emulation/libcacard ) spice? ( >=app-emulation/spice-protocol-0.12.3 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.6 ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools )
+REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_or32 qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_unicore32 qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus ) python? ( || ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 ) ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk ) virtfs? ( xattr )
+SLOT=0
+SRC_URI=http://wiki.qemu-project.org/download/qemu-1.5.1.tar.bz2
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fcaps	832d0c7d930e7df835c19b5d0a5f6f4b	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	68315568b6b6ec436deb87db2cd36fe8	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=44e8cb4d981d918ff9fe280b7f042136
--- a/metadata/md5-cache/app-i18n/man-pages-ru-3.49.2170.1764.20130606
+++ b/metadata/md5-cache/app-i18n/man-pages-ru-3.49.2170.1764.20130606
@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=A collection of Russian translations of Linux manual pages
 EAPI=5
 HOMEPAGE=http://man-pages-ru.sourceforge.net/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=FDL-1.3
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=mirror://sourceforge/man-pages-ru/man-pages-ru_3.49-2170-1764-20130606.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=a9ffdb33665f6e250d48744e07b0430b
+_md5_=a501f51c2d41ae24cbab2a7dc7680997
--- a/metadata/md5-cache/dev-lang/ghc-7.6.3
+++ b/metadata/md5-cache/dev-lang/ghc-7.6.3
@ -10,6 +10,6 @@ PDEPEND=!ghcbootstrap? ( =app-admin/haskell-updater-1.2* ) llvm? ( sys-devel/llv
 RDEPEND=!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 virtual/libffi !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode]
 REQUIRED_USE=ia64? ( !gmp )
 SLOT=0/7.6.3
-SRC_URI=!binary? ( http://www.haskell.org/ghc/dist/7.6.3/ghc-7.6.3-src.tar.bz2 ) !ghcbootstrap? ( amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.6.3-amd64.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.6.3-x86.tbz2 ) )
+SRC_URI=!binary? ( http://www.haskell.org/ghc/dist/7.6.3/ghc-7.6.3-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-7.6.3-alpha.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.6.3-amd64.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-7.6.3-ia64.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.6.3-x86.tbz2 ) )
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	81c5f02d15a7142263afd98d4fcbf558	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5faf021fb230286ce6b015eb219ca6db
+_md5_=06b2c2c2440a12076aaea3ec82b8476a
--- a/metadata/md5-cache/dev-python/g-pypi-0.3
+++ b/metadata/md5-cache/dev-python/g-pypi-0.3
@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/iElectric/g-pypi
 IUSE=doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=app-portage/gentoolkit app-portage/gentoolkit-dev app-portage/metagen >=dev-python/jaxml-3.02 dev-python/setuptools dev-python/jinja dev-python/pygments dev-python/sphinxcontrib-googleanalytics virtual/python-unittest2 dev-python/yolk virtual/python-argparse || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+RDEPEND=app-portage/gentoolkit app-portage/gentoolkit-dev app-portage/metagen >=dev-python/jaxml-3.02 dev-python/setuptools dev-python/jinja dev-python/pygments dev-python/sphinxcontrib-googleanalytics dev-python/unittest2 dev-python/yolk virtual/python-argparse || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=0
 SRC_URI=mirror://pypi/g/g-pypi/g-pypi-0.3.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=58d2bf789516c0fe432a1831c901c67f
+_md5_=4d0562967f7c9e411697b758059bfa80
--- a/metadata/md5-cache/dev-python/mechanize-0.2.5-r1
+++ b/metadata/md5-cache/dev-python/mechanize-0.2.5-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Stateful programmatic web browsing in Python
+EAPI=5
+HOMEPAGE=http://wwwsearch.sourceforge.net/mechanize/ http://pypi.python.org/pypi/mechanize
+IUSE=doc python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
+LICENSE=|| ( BSD ZPL )
+RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=http://wwwsearch.sourceforge.net/mechanize/src/mechanize-0.2.5.tar.gz
+_eclasses_=distutils-r1	23c50381cb8eba8d1e7d233e14a967f8	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	68315568b6b6ec436deb87db2cd36fe8	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3d8ea3fbe0601e094fe0eeb9e3c3fed5
--- a/metadata/md5-cache/dev-python/meld3-0.6.9
+++ b/metadata/md5-cache/dev-python/meld3-0.6.9
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND==dev-lang/python-2*
-DESCRIPTION=meld3 is an HTML/XML templating engine.
-EAPI=4
-HOMEPAGE=https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3
-KEYWORDS=~amd64 ~x86
-LICENSE=ZPL
-RDEPEND==dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/m/meld3/meld3-0.6.9.tar.gz
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d572e93e59aba6db74744dfc75d881bd
--- a/metadata/md5-cache/dev-python/meld3-0.6.9-r1
+++ b/metadata/md5-cache/dev-python/meld3-0.6.9-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=meld3 is an HTML/XML templating engine.
+EAPI=5
+HOMEPAGE=https://github.com/supervisor/meld3 http://pypi.python.org/pypi/meld3
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=ZPL
+RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=mirror://pypi/m/meld3/meld3-0.6.9.tar.gz
+_eclasses_=distutils-r1	23c50381cb8eba8d1e7d233e14a967f8	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	68315568b6b6ec436deb87db2cd36fe8	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b6a7cd5d55752dd177004189feee2455
--- a/metadata/md5-cache/dev-python/ws4py-0.2.3
+++ b/metadata/md5-cache/dev-python/ws4py-0.2.3
@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup test unpack
-DEPEND=test? ( client? ( dev-lang/python[threads?] ) virtual/python-unittest2 >=dev-python/cherrypy-3.2.0 dev-python/gevent ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/pytest )
+DEPEND=test? ( client? ( dev-lang/python[threads?] ) dev-python/unittest2 >=dev-python/cherrypy-3.2.0 dev-python/gevent ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/pytest )
 DESCRIPTION=WebSocket support for Python
 EAPI=4
 HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
@ -10,4 +10,4 @@ RDEPEND=client? ( dev-lang/python[threads?] ) || ( =dev-lang/python-3.3* =dev-la
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/tarball/v0.2.3 -> ws4py-0.2.3.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
-_md5_=73a5febfca5e9b697ec95e1611ee2ffb
+_md5_=d067a0f700fb4f8fcf791bf4a6b1f337
--- a/metadata/md5-cache/dev-python/ws4py-0.2.4
+++ b/metadata/md5-cache/dev-python/ws4py-0.2.4
@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup test unpack
-DEPEND=test? ( client? ( dev-lang/python[threads?] ) virtual/python-unittest2 >=dev-python/cherrypy-3.2.0 dev-python/gevent ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/pytest )
+DEPEND=test? ( client? ( dev-lang/python[threads?] ) dev-python/unittest2 >=dev-python/cherrypy-3.2.0 dev-python/gevent ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( dev-python/pytest )
 DESCRIPTION=WebSocket support for Python
 EAPI=4
 HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
@ -10,4 +10,4 @@ RDEPEND=client? ( dev-lang/python[threads?] ) || ( =dev-lang/python-3.3* =dev-la
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/tarball/v0.2.4 -> ws4py-0.2.4.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
-_md5_=9ed35ab288d5e0c3b058333b61018bb3
+_md5_=ff7c5b8da72f88ec5315c4c35bcf7ed3
--- a/metadata/md5-cache/dev-python/ws4py-0.2.4-r1
+++ b/metadata/md5-cache/dev-python/ws4py-0.2.4-r1
@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( virtual/python-unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/cherrypy-3.2.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/gevent[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6[threads?] ) python_targets_python2_7? ( dev-lang/python:2.7[threads?] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DEPEND=test? ( dev-python/unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/cherrypy-3.2.0[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/gevent[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6[threads?] ) python_targets_python2_7? ( dev-lang/python:2.7[threads?] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 DESCRIPTION=WebSocket support for Python
 EAPI=5
 HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/tarball/v0.2.4 -> ws4py-0.2.4.tar.gz
 _eclasses_=distutils-r1	23c50381cb8eba8d1e7d233e14a967f8	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	68315568b6b6ec436deb87db2cd36fe8	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	3facff03591093044e38f21285a02129
-_md5_=da14c3f00b0d61385b357f4ae26416cc
+_md5_=08563a1b9160376c822714aa0730ecd2
--- a/metadata/md5-cache/dev-qt/qthelp-4.8.5-r1
+++ b/metadata/md5-cache/dev-qt/qthelp-4.8.5-r1
@ -10,4 +10,4 @@ RDEPEND=~dev-qt/qtcore-4.8.5[aqua=,debug=] ~dev-qt/qtgui-4.8.5[aqua=,debug=] ~de
 SLOT=4
 SRC_URI=http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz compat? ( ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	qt4-build	6aa53aa6cfed011803159d817e563eb3	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=3383ca192f43326d01d8fd3408f7bf58
+_md5_=19544796613425b2429922a88170c7f1
--- a/metadata/md5-cache/dev-ruby/multi_json-1.3.6
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.3.6
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby18] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby18] =dev-ruby/activesupport-3*[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby19] =dev-ruby/activesupport-3*[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( || ( >=dev-ruby/json-1.4[ruby_targets_ree18] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ree18] =dev-ruby/activesupport-3*[ruby_targets_ree18] ) ) ruby_targets_jruby? ( || ( >=dev-ruby/json-1.4[ruby_targets_jruby] >=dev-ruby/yajl-ruby-0.7[ruby_targets_jruby] =dev-ruby/activesupport-3*[ruby_targets_jruby] ) ) ) ruby_targets_ruby18? ( doc? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/json[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/json[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/json[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/yajl-ruby[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/yajl-ruby[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/yajl-ruby[ruby_targets_ree18] ) ) 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? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_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] ) test? ( 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] ) )
-DESCRIPTION=A gem to provide swappable JSON backends
-EAPI=4
-HOMEPAGE=http://github.com/intridea/multi_json
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~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/json-1.4[ruby_targets_ruby18] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby18] =dev-ruby/activesupport-3*[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby19] =dev-ruby/activesupport-3*[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( || ( >=dev-ruby/json-1.4[ruby_targets_ree18] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ree18] =dev-ruby/activesupport-3*[ruby_targets_ree18] ) ) ruby_targets_jruby? ( || ( >=dev-ruby/json-1.4[ruby_targets_jruby] >=dev-ruby/yajl-ruby-0.7[ruby_targets_jruby] =dev-ruby/activesupport-3*[ruby_targets_jruby] ) ) 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] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/multi_json-1.3.6.gem
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=1736d890f9ba7809d8c34b49a76f7503
--- a/metadata/md5-cache/dev-ruby/multi_json-1.3.7
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.3.7
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby18] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby18] =dev-ruby/activesupport-3*[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby19] =dev-ruby/activesupport-3*[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( || ( >=dev-ruby/json-1.4[ruby_targets_ree18] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ree18] =dev-ruby/activesupport-3*[ruby_targets_ree18] ) ) ruby_targets_jruby? ( || ( >=dev-ruby/json-1.4[ruby_targets_jruby] >=dev-ruby/yajl-ruby-0.7[ruby_targets_jruby] =dev-ruby/activesupport-3*[ruby_targets_jruby] ) ) ) ruby_targets_ruby18? ( doc? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/json[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/json[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/json[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/yajl-ruby[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/yajl-ruby[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/yajl-ruby[ruby_targets_ree18] ) ) 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? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_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] ) test? ( 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] ) )
-DESCRIPTION=A gem to provide swappable JSON backends
-EAPI=4
-HOMEPAGE=http://github.com/intridea/multi_json
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~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/json-1.4[ruby_targets_ruby18] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby18] =dev-ruby/activesupport-3*[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby19] =dev-ruby/activesupport-3*[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( || ( >=dev-ruby/json-1.4[ruby_targets_ree18] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ree18] =dev-ruby/activesupport-3*[ruby_targets_ree18] ) ) ruby_targets_jruby? ( || ( >=dev-ruby/json-1.4[ruby_targets_jruby] >=dev-ruby/yajl-ruby-0.7[ruby_targets_jruby] =dev-ruby/activesupport-3*[ruby_targets_jruby] ) ) 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] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/multi_json-1.3.7.gem
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cd9c5afd1c7a6b110b36869591ceb4f4
--- a/metadata/md5-cache/dev-ruby/multi_json-1.4.0
+++ b/metadata/md5-cache/dev-ruby/multi_json-1.4.0
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby18] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby18] =dev-ruby/activesupport-3*[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby19] =dev-ruby/activesupport-3*[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( || ( >=dev-ruby/json-1.4[ruby_targets_ree18] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ree18] =dev-ruby/activesupport-3*[ruby_targets_ree18] ) ) ruby_targets_jruby? ( || ( >=dev-ruby/json-1.4[ruby_targets_jruby] >=dev-ruby/yajl-ruby-0.7[ruby_targets_jruby] =dev-ruby/activesupport-3*[ruby_targets_jruby] ) ) ) ruby_targets_ruby18? ( doc? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/json[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/json[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/json[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/json[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/yajl-ruby[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/yajl-ruby[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/yajl-ruby[ruby_targets_ree18] ) ) 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? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_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] ) test? ( 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] ) )
-DESCRIPTION=A gem to provide swappable JSON backends
-EAPI=5
-HOMEPAGE=http://github.com/intridea/multi_json
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~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/json-1.4[ruby_targets_ruby18] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby18] =dev-ruby/activesupport-3*[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( || ( >=dev-ruby/json-1.4[ruby_targets_ruby19] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ruby19] =dev-ruby/activesupport-3*[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( || ( >=dev-ruby/json-1.4[ruby_targets_ree18] >=dev-ruby/yajl-ruby-0.7[ruby_targets_ree18] =dev-ruby/activesupport-3*[ruby_targets_ree18] ) ) ruby_targets_jruby? ( || ( >=dev-ruby/json-1.4[ruby_targets_jruby] >=dev-ruby/yajl-ruby-0.7[ruby_targets_jruby] =dev-ruby/activesupport-3*[ruby_targets_jruby] ) ) 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] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/multi_json-1.4.0.gem
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=abf81a651f93cefd0954d28e24a7e3e0
--- a/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5
+++ b/metadata/md5-cache/dev-ruby/nagios_analyzer-0.0.5
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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] ) )
+DESCRIPTION=A simple parser for Nagios status files
+EAPI=5
+HOMEPAGE=https://github.com/jbbarth/nagios_analyzer
+IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/nagios_analyzer-0.0.5.gem
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=f9de1d33f4e8d458ff6383d5248aa248
--- a/metadata/md5-cache/dev-ruby/net-scp-1.1.2
+++ b/metadata/md5-cache/dev-ruby/net-scp-1.1.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/mocha[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=A pure Ruby implementation of the SCP client protocol
+EAPI=5
+HOMEPAGE=http://net-ssh.rubyforge.org/scp
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/net-ssh-2.6.5[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
+SLOT=2
+SRC_URI=mirror://rubygems/net-scp-1.1.2.gem
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=8e048ef094de476564c5cedb2252c78a
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.2.2
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.2.2
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/ruby-ssl[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby18] dev-ruby/mocha[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/test-unit:2[ruby_targets_ree18] dev-ruby/mocha[ruby_targets_ree18] ) ) 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_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) 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_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=Non-interactive SSH processing in pure Ruby
-EAPI=2
-HOMEPAGE=http://net-ssh.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 doc test
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/ruby-ssl[ruby_targets_ree18] ) 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_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-SLOT=2
-SRC_URI=mirror://rubygems/net-ssh-2.2.2.gem
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=de0cd8dfce82f52b1ecfaa41a840a591
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.6.2
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.6.2
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby19] dev-ruby/mocha[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
-DESCRIPTION=Non-interactive SSH processing in pure Ruby
-EAPI=4
-HOMEPAGE=http://net-ssh.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-SLOT=2.6
-SRC_URI=https://github.com/net-ssh/net-ssh/tarball/v2.6.2 -> net-ssh-git-2.6.2.tgz
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=261634e48c80b883920e24196a3d7d63
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.6.8
+++ b/metadata/md5-cache/dev-ruby/net-ssh-2.6.8
@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=2.6
-SRC_URI=https://github.com/net-ssh/net-ssh/archive/v2.6.3.tar.gz -> net-ssh-git-2.6.3.tgz
+SRC_URI=https://github.com/net-ssh/net-ssh/archive/v2.6.8.tar.gz -> net-ssh-git-2.6.8.tgz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=89b963aa9584a07888cb070ae2b49b04
+_md5_=4b999e742ea8cc1fd8c8ef2d19c20396
--- a/metadata/md5-cache/dev-ruby/notify-0.5.2
+++ b/metadata/md5-cache/dev-ruby/notify-0.5.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( dev-lang/ruby: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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) 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] ) )
+DESCRIPTION=A function to notify on cross platform
+EAPI=5
+HOMEPAGE=http://github.com/jugyo/notify
+IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libnotify ruby_targets_ruby18? ( dev-lang/ruby: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_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/notify-0.5.2.gem
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=8d65603bd88bbab358942456d947b5ca
--- a/metadata/md5-cache/dev-ruby/oauth2-0.9.2
+++ b/metadata/md5-cache/dev-ruby/oauth2-0.9.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby19] >=dev-ruby/httpauth-0.2[ruby_targets_ruby19] >=dev-ruby/jwt-0.1.4[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.3[ruby_targets_ruby19] >=dev-ruby/multi_xml-0.5[ruby_targets_ruby19] >=dev-ruby/rack-1.2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-2.5.0:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem.
+EAPI=5
+HOMEPAGE=http://github.com/intridea/oauth2
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/faraday-0.8[ruby_targets_ruby19] >=dev-ruby/httpauth-0.2[ruby_targets_ruby19] >=dev-ruby/jwt-0.1.4[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.3[ruby_targets_ruby19] >=dev-ruby/multi_xml-0.5[ruby_targets_ruby19] >=dev-ruby/rack-1.2[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=mirror://rubygems/oauth2-0.9.2.gem
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=0670d19e1718de1462524e6a3d9f37fe
--- a/metadata/md5-cache/dev-ruby/ohai-6.16.0
+++ b/metadata/md5-cache/dev-ruby/ohai-6.16.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( dev-ruby/ipaddress[ruby_targets_ruby18] dev-ruby/yajl-ruby[ruby_targets_ruby18] dev-ruby/mixlib-cli[ruby_targets_ruby18] dev-ruby/mixlib-config[ruby_targets_ruby18] dev-ruby/mixlib-log[ruby_targets_ruby18] dev-ruby/mixlib-shellout[ruby_targets_ruby18] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ipaddress[ruby_targets_ruby19] dev-ruby/yajl-ruby[ruby_targets_ruby19] dev-ruby/mixlib-cli[ruby_targets_ruby19] dev-ruby/mixlib-config[ruby_targets_ruby19] dev-ruby/mixlib-log[ruby_targets_ruby19] dev-ruby/mixlib-shellout[ruby_targets_ruby19] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Ohai profiles your system and emits JSON
+EAPI=5
+HOMEPAGE=http://wiki.opscode.com/display/chef/Ohai
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby18? ( dev-ruby/ipaddress[ruby_targets_ruby18] dev-ruby/yajl-ruby[ruby_targets_ruby18] dev-ruby/mixlib-cli[ruby_targets_ruby18] dev-ruby/mixlib-config[ruby_targets_ruby18] dev-ruby/mixlib-log[ruby_targets_ruby18] dev-ruby/mixlib-shellout[ruby_targets_ruby18] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/ipaddress[ruby_targets_ruby19] dev-ruby/yajl-ruby[ruby_targets_ruby19] dev-ruby/mixlib-cli[ruby_targets_ruby19] dev-ruby/mixlib-config[ruby_targets_ruby19] dev-ruby/mixlib-log[ruby_targets_ruby19] dev-ruby/mixlib-shellout[ruby_targets_ruby19] >=dev-ruby/systemu-2.2.0[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=https://github.com/opscode/ohai/archive/6.16.0.tar.gz -> ohai-6.16.0.tgz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=860fc4d9381498dc44efeedcee2bf1ca
--- a/metadata/md5-cache/dev-util/eric-5.3.5
+++ b/metadata/md5-cache/dev-util/eric-5.3.5
@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.9.6-r1[X,help,sql,svg,webkit] >=dev-python/qscintilla-python-2.6 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* )
+DESCRIPTION=A full featured Python IDE using PyQt4 and QScintilla
+EAPI=4
+HOMEPAGE=http://eric-ide.python-projects.org/
+IUSE=spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+PDEPEND=spell? ( dev-python/pyenchant )
+RDEPEND=>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.9.6-r1[X,help,sql,svg,webkit] >=dev-python/qscintilla-python-2.6 >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.2 >=dev-python/pygments-1.5 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* )
+SLOT=5
+SRC_URI=mirror://sourceforge/eric-ide/eric5/stable/5.3.5/eric5-5.3.5.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.5/eric5-i18n-cs-5.3.5.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.5/eric5-i18n-de-5.3.5.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.5/eric5-i18n-en-5.3.5.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.5/eric5-i18n-es-5.3.5.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.5/eric5-i18n-fr-5.3.5.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.5/eric5-i18n-it-5.3.5.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.5/eric5-i18n-ru-5.3.5.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.5/eric5-i18n-tr-5.3.5.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.5/eric5-i18n-zh_CN.GB2312-5.3.5.tar.gz )
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c5d5e9fc767a145344020f4a688c911e
--- a/metadata/md5-cache/media-gfx/openscad-2013.06
+++ b/metadata/md5-cache/media-gfx/openscad-2013.06
@ -3,9 +3,10 @@ DEPEND=media-gfx/opencsg sci-mathematics/cgal dev-qt/qtcore:4 dev-qt/qtgui:4 dev
 DESCRIPTION=The Programmers Solid 3D CAD Modeller
 EAPI=2
 HOMEPAGE=http://www.openscad.org/
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-gfx/opencsg sci-mathematics/cgal dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-cpp/eigen:2 dev-libs/gmp dev-libs/mpfr dev-libs/boost sys-libs/glibc
 SLOT=0
 SRC_URI=https://openscad.googlecode.com/files/openscad-2013.06.src.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	ce0c9abfee272185e03ab73f09f5fd69	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bddd7ce27102868d220bf5036d44d5c0
+_md5_=523b4466a74023af88b132bbbe50a533
--- a/metadata/md5-cache/media-sound/gnaural-1.0.20110606
+++ b/metadata/md5-cache/media-sound/gnaural-1.0.20110606
@ -4,10 +4,10 @@ DESCRIPTION=An opensource binaural-beat generator
 EAPI=2
 HOMEPAGE=http://gnaural.sourceforge.net
 IUSE=nls debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2 >=gnome-base/libglade-2 >=dev-libs/glib-2 >=media-libs/libsndfile-1.0.2 >=media-libs/portaudio-19_pre20071207
 SLOT=0
 SRC_URI=mirror://sourceforge/gnaural/Gnaural/gnaural-1.0.20110606.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	7976d3f4d0c0816c67033d3dcd4d9472	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=c3be5197de192d8b90ec2102a6a94889
+_md5_=95fed9a291168382390e4226767609fb
--- a/metadata/md5-cache/net-ftp/qshare-2.1.5-r1
+++ b/metadata/md5-cache/net-ftp/qshare-2.1.5-r1
@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 net-dns/avahi[mdnsresponder-compat] sys-de
 DESCRIPTION=FTP server with a service discovery feature
 EAPI=5
 HOMEPAGE=http://www.zuzuf.net/qshare/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 net-dns/avahi[mdnsresponder-compat]
 SLOT=0
 SRC_URI=http://www.zuzuf.net/qshare/files/qshare-2.1.5-src.tar.bz2
 _eclasses_=cmake-utils	e40c43582b7ebe5daa0528b595603b29	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=66d021bc376bce2d28e62ae17b8bd425
+_md5_=a4e6a7359f9260507312e63bba34e8f8
--- a/metadata/md5-cache/net-libs/nodejs-0.10.13
+++ b/metadata/md5-cache/net-libs/nodejs-0.10.13
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/openssl virtual/python-json
+DESCRIPTION=Evented IO for V8 Javascript
+EAPI=5
+HOMEPAGE=http://nodejs.org/
+IUSE=+npm
+KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=dev-libs/openssl
+RESTRICT=test
+SLOT=0
+SRC_URI=http://nodejs.org/dist/v0.10.13/node-v0.10.13.tar.gz
+_eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	7ed4a8181d62a098eaa6c8eeacf190c9	python-utils-r1	68315568b6b6ec436deb87db2cd36fe8	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_md5_=942d17ab31b7724286451670f3a7ac38
--- a/metadata/md5-cache/net-libs/nodejs-0.11.4
+++ b/metadata/md5-cache/net-libs/nodejs-0.11.4
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/openssl
+DESCRIPTION=Evented IO for V8 Javascript
+EAPI=5
+HOMEPAGE=http://nodejs.org/
+IUSE=+npm
+KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=dev-libs/openssl
+RESTRICT=test
+SLOT=0
+SRC_URI=http://nodejs.org/dist/v0.11.4/node-v0.11.4.tar.gz
+_eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	python-any-r1	7ed4a8181d62a098eaa6c8eeacf190c9	python-utils-r1	68315568b6b6ec436deb87db2cd36fe8	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_md5_=b60552471bd67e076b5454a24d442e38
--- a/metadata/md5-cache/sci-biology/mafft-7.050
+++ b/metadata/md5-cache/sci-biology/mafft-7.050
@ -3,9 +3,9 @@ DESCRIPTION=Multiple sequence alignments using a variety of algorithms
 EAPI=5
 HOMEPAGE=http://mafft.cbrc.jp/alignment/software/index.html
 IUSE=threads
-KEYWORDS=~amd64 ~x86 ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://mafft.cbrc.jp/alignment/software/mafft-7.050-without-extensions-src.tgz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=838832802e6bd9d8e49cc2656fb4660b
+_md5_=33ca66dfa3c7c6d090511e44935c296c
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-0_p20130711
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-0_p20130711
@ -9,4 +9,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/raspberrypi/firmware/raw/ba8059e890/boot/bootcode.bin -> raspberrypi-firmware-ba8059e890-bootcode.bin https://github.com/raspberrypi/firmware/raw/ba8059e890/boot/fixup.dat -> raspberrypi-firmware-ba8059e890-fixup.dat https://github.com/raspberrypi/firmware/raw/ba8059e890/boot/fixup_cd.dat -> raspberrypi-firmware-ba8059e890-fixup_cd.dat https://github.com/raspberrypi/firmware/raw/ba8059e890/boot/fixup_x.dat -> raspberrypi-firmware-ba8059e890-fixup_x.dat https://github.com/raspberrypi/firmware/raw/ba8059e890/boot/start.elf -> raspberrypi-firmware-ba8059e890-start.elf https://github.com/raspberrypi/firmware/raw/ba8059e890/boot/start_cd.elf -> raspberrypi-firmware-ba8059e890-start_cd.elf https://github.com/raspberrypi/firmware/raw/ba8059e890/boot/start_x.elf -> raspberrypi-firmware-ba8059e890-start_x.elf
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a198ee32641009652faefe0f45de13b9
+_md5_=a1654b8e31b6c99570178fa626cbe980
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-1_pre20130715
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-1_pre20130715
@ -9,4 +9,4 @@ RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/raspberrypi/firmware/raw/9e9acf8978/boot/bootcode.bin -> raspberrypi-firmware-9e9acf8978-bootcode.bin https://github.com/raspberrypi/firmware/raw/9e9acf8978/boot/fixup.dat -> raspberrypi-firmware-9e9acf8978-fixup.dat https://github.com/raspberrypi/firmware/raw/9e9acf8978/boot/fixup_cd.dat -> raspberrypi-firmware-9e9acf8978-fixup_cd.dat https://github.com/raspberrypi/firmware/raw/9e9acf8978/boot/fixup_x.dat -> raspberrypi-firmware-9e9acf8978-fixup_x.dat https://github.com/raspberrypi/firmware/raw/9e9acf8978/boot/start.elf -> raspberrypi-firmware-9e9acf8978-start.elf https://github.com/raspberrypi/firmware/raw/9e9acf8978/boot/start_cd.elf -> raspberrypi-firmware-9e9acf8978-start_cd.elf https://github.com/raspberrypi/firmware/raw/9e9acf8978/boot/start_x.elf -> raspberrypi-firmware-9e9acf8978-start_x.elf
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5a22f98f8b9f7e5c66e10f24fc5f2f3a
+_md5_=470c2f4e9c8e4a43ea0a0603d483ef4b
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999.3.6
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999.3.6
@ -8,4 +8,4 @@ RDEPEND=!sys-boot/raspberrypi-loader
 RESTRICT=binchecks strip
 SLOT=0
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d189c39204a67a06318f135bc3fa18b6
+_md5_=41d893d014181d4a3ec7253fd83193bb
--- a/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999.3.9
+++ b/metadata/md5-cache/sys-boot/raspberrypi-firmware-9999.3.9
@ -8,4 +8,4 @@ RDEPEND=!sys-boot/raspberrypi-loader
 RESTRICT=binchecks strip
 SLOT=0
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0f0f927af8d38ba7f446018d86db7655
+_md5_=f1d93129b60f79197bf20857ed12b446
--- a/metadata/md5-cache/virtual/python-unittest2-1-r2
+++ b/metadata/md5-cache/virtual/python-unittest2-1-r2
@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=A virtual for packages needing unittest2 in Python 2.5, 2.6, 3.1
+EAPI=5
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-python/unittest2[python_targets_python2_5] ) python_targets_python2_6? ( dev-python/unittest2[python_targets_python2_6] ) python_targets_python3_1? ( dev-python/unittest2[python_targets_python3_1] )
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 )
+SLOT=0
+_eclasses_=multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	68315568b6b6ec436deb87db2cd36fe8	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_md5_=dfa629bff7e61867fa81fce7e519401e
--- a/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc5
+++ b/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc5
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A lightweight GTK+ based clipboard manager.
-EAPI=4
-HOMEPAGE=http://parcellite.sourceforge.net/
-IUSE=nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2
-SLOT=0
-SRC_URI=mirror://sourceforge/parcellite/parcellite-1.0.2rc5.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=02ae0a9138e188bb00c4a9876cfbf6cc
--- a/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc5-r1
+++ b/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc5-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=A lightweight GTK+ based clipboard manager.
-EAPI=4
-HOMEPAGE=http://parcellite.sourceforge.net/
-IUSE=nls linguas_ca linguas_cs linguas_da linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_nb linguas_pl linguas_pl_PL linguas_pt_BR linguas_ro linguas_ru linguas_sv linguas_tr linguas_zh_CN
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2
-SLOT=0
-SRC_URI=mirror://sourceforge/parcellite/parcellite-1.0.2rc5.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ad8a8189bf1ef05573de68f45338c42c
--- a/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc6
+++ b/metadata/md5-cache/x11-misc/parcellite-1.0.2_rc6
@ -1,4 +1,4 @@
-DEFINED_PHASES=configure postinst postrm
+DEFINED_PHASES=configure postinst postrm prepare
 DEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )
 DESCRIPTION=A lightweight GTK+ based clipboard manager.
 EAPI=4
@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.14 >=x11-libs/gtk+-2.10:2
 SLOT=0
-SRC_URI=mirror://sourceforge/parcellite/parcellite-1.0.2rc6.tar.gz
+SRC_URI=mirror://sourceforge/parcellite/parcellite-1.1.5.tar.gz
 _eclasses_=fdo-mime	0acfe1a88fd8751a1d5dc671168219fa
-_md5_=53b170da5b663f1b8ce1d56d3581250d
+_md5_=2753de3f25a91ac202c0a10db3c1292b
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Fri, 19 Jul 2013 04:06:58 +0000
+Fri, 19 Jul 2013 13:06:58 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Fri Jul 19 04:06:56 UTC 2013
+Fri Jul 19 13:06:56 UTC 2013
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Fri, 19 Jul 2013 04:30:01 +0000
+Fri, 19 Jul 2013 13:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1374206701 Fri Jul 19 04:05:01 2013 UTC
+1374239101 Fri Jul 19 13:05:01 2013 UTC
--- a/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy
+++ b/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy
@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy,v 1.1 2013/05/06 22:27:12 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy,v 1.2 2013/07/19 04:27:55 mattm Exp $

 pid_file="/var/run/zabbix/zabbix_proxy.pid"

@ -15,14 +15,14 @@ start_pre() {
 }

 start() {
-	ebegin "Starting Zabbix agent"
+	ebegin "Starting Zabbix proxy"
 	start-stop-daemon --start --pidfile ${pid_file} \
 		--user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf
 	eend $?
 }

 stop() {
-	ebegin "Stopping Zabbix agent"
+	ebegin "Stopping Zabbix proxy"
 	start-stop-daemon  --stop --pidfile ${pid_file}
 	eend $?
 }
--- a/net-ftp/qshare/qshare-2.1.5-r1.ebuild
+++ b/net-ftp/qshare/qshare-2.1.5-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/qshare-2.1.5-r1.ebuild,v 1.1 2013/06/12 12:53:56 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/qshare/qshare-2.1.5-r1.ebuild,v 1.2 2013/07/19 09:04:33 nimiux Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="http://www.zuzuf.net/qshare/files/${P}-src.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""

 RDEPEND="dev-qt/qtcore:4
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@ -1,8 +1,10 @@
 DIST node-v0.10.10.tar.gz 13683507 SHA256 a54de71d2c3ac7ae864ab9640b6eecb27d7d49c190ac1ca6526243fd7a8ad15c SHA512 4ea738e953a699f4f14f95d0a147fcb03e50467d320252b328ae4ffbd11ee3f1b67953096da9f0a24cfcac5c96241e0f57211d95fb5bf4b6ea2b194424c4f5db WHIRLPOOL 3e90775f946768fd4210b4ef4d7723d23802c64b2e0a4548b028a6436a974088bcff4bc426cc58c483375e0277e28761ccb0a53a8645249a85c019ccec38a7f4
+DIST node-v0.10.13.tar.gz 13373879 SHA256 a102fad260d216b95611ddd57aeb6531c92ad1038508390654423feb1b51c059 SHA512 d632bdb56999b6281f1d77f8e769605e9c90a7de9ef2d285879bac3ac0f66675a789a76a48282c8e0801bab3a4412630b1b2f01c3b8584176095c47aeb8e9a76 WHIRLPOOL d9fd9dbb673cbe5b7a2d96518b3ebcf84cff596110aaf1205ed20f268bc674c8cc8716de87af92c4dc180bb63beec5f74763e83429d5e9f5b467e6610ab82746
 DIST node-v0.10.6.tar.gz 13260795 SHA256 7e2079394efe82f62798178f617888c9d6a39150c76122c432ae9ea73ce28e79 SHA512 08e196948448fce089c583419f3e9c08cb666305fcb0dd929c41d25a6342892cf82c670449cd1b245d6aee689e8f7a5ce7515dd7f132d7ee1470e4513b6fb5cf WHIRLPOOL 18e13d2719fce63f589c82d3b95bb72d84659ec5d7a3a63d71db867e1d8213ff0be4f128fb563b29cdc65e89ef01fe2e073b105fe05f4951ac3eedcf127217f1
 DIST node-v0.10.7.tar.gz 13367694 SHA256 22d1d211f5260dfa5b842cebdb04633f28df180843105ff3eb792ca35ed425e0 SHA512 72772419417cb9d49838374117ea723e2b2efbafc9bcb4cad5217c8df9545eff59d3a3338d50af7daac61566774db069fea43ae3b7a320b0fb23344c9bd9da6f WHIRLPOOL 992efde0b7a0e92f56a5891e1c9a37e018d752bda9a2bf7894b5e725e59dfdf3577aa073be755f1f1212f7a5534844128d2aa26a36af1929c10c354edff026c3
 DIST node-v0.10.9.tar.gz 13678037 SHA256 25fb276ac6765ebb19f44d3e3775ed1c0275f874c896755d0d619226caee9c30 SHA512 34feca9d8a2a6580f4715e89533a9c3290ac60c9028864539bc7dc904d5bdd30f1c8d9fb6e61c909e33f5ff81c3078f80aa745ca420a153b2d14e21728de4d36 WHIRLPOOL 9a3a2e2d10b3459e4dd6474dfc2055b1f926b7387d82fd3abdd80b721d60a2fee6cbe73bf55dbc6af64c7b8771ffe97537531db06460592257d76d32856a4e3c
 DIST node-v0.11.0.tar.gz 12956118 SHA256 a1887957fd6f0091379d1317f1daeb791bbf4301e58d693d17ad1d0fdbfa7898 SHA512 1c3d3445edf8600a1bf60b7be69e22bbfc74c3c076b92bcd71168c0f830aa42ba0ef7a0a63d9663b35e480d2da9694b8620e3db11be1c1f7e78a24a90bf3f20e WHIRLPOOL 7378e8b0d695425b475c5711b7f4ba2b8bbe72e4317c5a18f8ccf6386d51f61718c6b3ee68d64c2e95552dccd5ca86a8b8ca96c279e9cae2899c9cbf8e18eac7
 DIST node-v0.11.2.tar.gz 13564314 SHA256 d115f01fea0b2c5a4c4ca489d0cc8cec70300f0212f08905d881ac55f642554a SHA512 67c834eb7509428d3ecb3cf808a66153941e4f484c879eae5b271b6b010dcf0cd3338f06e241b2ed423e5ba5062ae23be37c2e67bc1379b4b5f0823df3697dcc WHIRLPOOL 79634567de2d730f23b16ec2d3b4488b2423227d92fc522abf72359923d01e6180620f87eb46c8bb666defa63f87b4cdba2be9109f4042c512b81b2d3e0b0fd8
+DIST node-v0.11.4.tar.gz 14855090 SHA256 81f36aafa4a31fa59e0301358699d82766ea7ba178be810ce00444a7fc10db47 SHA512 33eb67ebe37afd6ba6340085c6f1a254720a6ca17761aea30685bc253038ec56036694a9912e5dbf3c1b08a3ee642be94096b7e56bc25877a24a8e2d197350b9 WHIRLPOOL 47baf6b369d4c48fbc157ca11201887e1e140a16215b43416d344bd46dd8e3f3d40022611b042af6a571e708743ff664f1531c55320aaaff8a76ec643efd46d5
 DIST node-v0.8.21.tar.gz 12191813 SHA256 e526f56d22bb2ebee5a607bd1e7a16dcc8530b916e3a372192e6cd5fa97d08e6 SHA512 10a305d5d798703144a4d4a29878b261be516f29a0bfe349e73879b81e16db89a6fabfce43a6b1abef2f085aa2cf884bde310b9feeb377083c43f674492f5d99 WHIRLPOOL f44085bb6710289adc85653f39073d17527bbe2bd27d9a998376a3eeab9fea462fb8f9d0f3baab4bda28d3046d3920a58ab14cfaa9eb1d20bb66cfdc1c71cc72
 DIST node-v0.8.23.tar.gz 12630347 SHA256 382432638aedc25495e655dda338adcf41c6fa1d35f355936d659784c1deed9d SHA512 d5dbd3eebf8c1b09af4ff437f2368ffaeb4db6127d99893db6181d39e3f5b176f1ec39519ed0fe536f4fce75852c149792a89fcb0947331969ce40a2503039b4 WHIRLPOOL 14a47c9ba868312ed3f2e61a69d03b841da385fc059c0706d05a0430721fdbb7581e398d495cdc4fe3050670295e448e9c6eeeaa80b01b2e9c6aa0120b6d7e3a
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@ -10,4 +10,7 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<use>
+	<flag name='npm'>Enable NPM package manager</flag>
+	</use>
 </pkgmetadata>
--- a/net-libs/nodejs/nodejs-0.10.13.ebuild
+++ b/net-libs/nodejs/nodejs-0.10.13.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.10.13.ebuild,v 1.1 2013/07/19 06:52:01 patrick Exp $
+
+EAPI=5
+
+# has known failures. sigh.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_{5,6,7} )
+
+inherit python-any-r1 pax-utils
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="+npm"
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}
+	virtual/python-json"
+
+S=${WORKDIR}/node-v${PV}
+
+src_prepare() {
+	# fix compilation on Darwin
+	# http://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e  "s/python/python2/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+}
+
+src_configure() {
+	local myconf=""
+	! use npm && myconf="--without-npm"
+
+	"${PYTHON}" configure --prefix="${EPREFIX}"/usr \
+		--openssl-use-sys --shared-zlib --without-dtrace ${myconf} || die
+}
+
+src_compile() {
+	emake out/Makefile
+	emake -C out mksnapshot
+	pax-mark m out/Release/mksnapshot
+	emake
+}
+
+src_install() {
+	"${PYTHON}" tools/install.py install "${D}"
+
+	use npm && dohtml -r "${ED}"/usr/lib/node_modules/npm/html/*
+	rm -rf "${ED}"/usr/lib/node_modules/npm/doc "${ED}"/usr/lib/node_modules/npm/html
+	rm -rf "${ED}"/usr/lib/dtrace
+
+	pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+	"${PYTHON}" tools/test.py --mode=release simple message || die
+}
--- a/net-libs/nodejs/nodejs-0.11.4.ebuild
+++ b/net-libs/nodejs/nodejs-0.11.4.ebuild
@ -0,0 +1,84 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nodejs/nodejs-0.11.4.ebuild,v 1.1 2013/07/19 06:52:01 patrick Exp $
+
+EAPI=5
+
+# has known failures. sigh.
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit python-any-r1 pax-utils
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/"
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="+npm"
+
+RDEPEND="dev-libs/openssl"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/node-v${PV}
+
+src_prepare() {
+	# fix compilation on Darwin
+	# http://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e  "s/python/python2/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+}
+
+src_configure() {
+	local myconf=""
+	! use npm && myconf="--without-npm"
+
+	# Use target arch detection logic, see v8-3.18 ebuilds
+	case ${CHOST} in
+		i?86-*)
+			myarch="ia32"
+			myconf+=" -Dv8_target_arch=ia32" ;;
+		x86_64-*)
+			if [[ $ABI = x86 ]] ; then
+				myarch="ia32"
+			else
+				myarch="x64"
+			fi ;;
+		arm*-*)
+			myarch="arm"
+			;;
+		*) die "Unrecognized CHOST: ${CHOST}"
+	esac
+
+	"${PYTHON}" configure --prefix="${EPREFIX}"/usr \
+		--openssl-use-sys --shared-zlib --without-dtrace ${myconf} || die
+}
+
+src_compile() {
+	emake out/Makefile
+	emake -C out "mksnapshot.${myarch}"
+	pax-mark m "out/Release/mksnapshot.${myarch}"
+	emake
+}
+
+src_install() {
+	"${PYTHON}" tools/install.py install "${D}" /usr
+
+	use npm && dohtml -r "${ED}"/usr/lib/node_modules/npm/html/*
+	rm -rf "${ED}"/usr/lib/node_modules/npm/doc "${ED}"/usr/lib/node_modules/npm/html
+	rm -rf "${ED}"/usr/lib/dtrace
+
+	pax-mark -m "${ED}"/usr/bin/node
+}
+
+src_test() {
+	"${PYTHON}" tools/test.py --mode=release simple message || die
+}
--- a/profiles/package.mask
+++ b/profiles/package.mask
@ -1,6 +1,6 @@
 ####################################################################

-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14934 2013/07/18 20:45:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14935 2013/07/19 06:20:58 patrick 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
@ -92,32 +92,6 @@ net-libs/openh323
 # Do not lastrite this, just leave mask by Lars Wendler's request.
 net-irc/xchat-otr

-# Davide Pesavento <pesa@gentoo.org> (09 Jul 2013)
-# Major packaging changes to some of the modules. Need to check all revdeps.
-=dev-qt/assistant-4.8.5*
-=dev-qt/designer-4.8.5*
-=dev-qt/linguist-4.8.5*
-=dev-qt/pixeltool-4.8.5*
-=dev-qt/qdbusviewer-4.8.5*
-=dev-qt/qt3support-4.8.5*
-=dev-qt/qtbearer-4.8.5*
-=dev-qt/qtcore-4.8.5*
-=dev-qt/qtdbus-4.8.5*
-=dev-qt/qtdeclarative-4.8.5*
-=dev-qt/qtdemo-4.8.5*
-=dev-qt/qtgui-4.8.5*
-=dev-qt/qthelp-4.8.5*
-=dev-qt/qtmultimedia-4.8.5*
-=dev-qt/qtopengl-4.8.5*
-=dev-qt/qtopenvg-4.8.5*
-=dev-qt/qtphonon-4.8.5*
-=dev-qt/qtscript-4.8.5*
-=dev-qt/qtsql-4.8.5*
-=dev-qt/qtsvg-4.8.5*
-=dev-qt/qttest-4.8.5*
-=dev-qt/qtwebkit-4.8.5*
-=dev-qt/qtxmlpatterns-4.8.5*
-
 # Hanno Boeck <hanno@gentoo.org> (9 Jul 2013)
 # Part of old and deprecated openvas versions,
 # removal in about 30 days
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -4642,6 +4642,7 @@ net-libs/loudmouth:asyncns - Use libasyncns for asynchronous name resolution.
 net-libs/neon:libproxy - Add support for net-libs/libproxy
 net-libs/neon:pkcs11 - Add support for PKCS#11 using dev-libs/pakchois
 net-libs/netembryo:sctp - Support for Stream Control Transmission Protocol
+net-libs/nodejs:npm - Enable NPM package manager
 net-libs/opal:audio - Enable audio support
 net-libs/opal:capi - Enable CAPI support
 net-libs/opal:celt - Enable CELT ultra-low delay audio codec
--- a/sci-biology/mafft/mafft-7.050.ebuild
+++ b/sci-biology/mafft/mafft-7.050.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/mafft/mafft-7.050.ebuild,v 1.1 2013/07/03 07:17:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/mafft/mafft-7.050.ebuild,v 1.2 2013/07/19 09:44:31 jlec Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="http://mafft.cbrc.jp/alignment/software/${P}${EXTENSIONS}-src.tgz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="threads"

 S="${WORKDIR}"/${P}${EXTENSIONS}
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild,v 1.2 2013/07/15 11:34:34 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild,v 1.3 2013/07/19 12:43:29 xmw Exp $

 EAPI=5

@ -30,8 +30,19 @@ src_unpack() { :; }

 pkg_preinst() {
 	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		if [ -e /boot/cmdline.txt -o -e /boot/config.txt ] ; then
-			die "Please backup and remove /boot/cmdline.txt and /boot/config.txt to and merge configs after installation."
+		local msg=""
+		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+		if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
+			msg+="/boot/config.txt "
+		fi
+		if [ -n "${msg}" ] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove(backup) your copies durning install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
 		fi
 	fi
 }
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild,v 1.1 2013/07/17 19:10:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1_pre20130715.ebuild,v 1.2 2013/07/19 12:43:29 xmw Exp $

 EAPI=5

@ -30,8 +30,19 @@ src_unpack() { :; }

 pkg_preinst() {
 	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		if [ -e /boot/cmdline.txt -o -e /boot/config.txt ] ; then
-			die "Please backup and remove /boot/cmdline.txt and /boot/config.txt to and merge configs after installation."
+		local msg=""
+		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+		if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
+			msg+="/boot/config.txt "
+		fi
+		if [ -n "${msg}" ] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove(backup) your copies durning install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
 		fi
 	fi
 }
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild,v 1.1 2013/07/17 19:10:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.6.ebuild,v 1.2 2013/07/19 12:43:29 xmw Exp $

 EAPI=5

@ -24,8 +24,19 @@ RESTRICT="binchecks strip"

 pkg_preinst() {
 	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		if [ -e /boot/cmdline.txt -o -e /boot/config.txt ] ; then
-			die "Please backup and remove /boot/cmdline.txt and /boot/config.txt to and merge configs after installation."
+		local msg=""
+		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+		if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
+			msg+="/boot/config.txt "
+		fi
+		if [ -n "${msg}" ] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove(backup) your copies durning install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
 		fi
 	fi
 }
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.9.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.9.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.9.ebuild,v 1.1 2013/07/17 19:10:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.3.9.ebuild,v 1.2 2013/07/19 12:43:29 xmw Exp $

 EAPI=5

@ -24,8 +24,19 @@ RESTRICT="binchecks strip"

 pkg_preinst() {
 	if [ -z "${REPLACING_VERSIONS}" ] ; then
-		if [ -e /boot/cmdline.txt -o -e /boot/config.txt ] ; then
-			die "Please backup and remove /boot/cmdline.txt and /boot/config.txt to and merge configs after installation."
+		local msg=""
+		if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+		if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
+			msg+="/boot/config.txt "
+		fi
+		if [ -n "${msg}" ] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove(backup) your copies durning install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
 		fi
 	fi
 }
--- a/virtual/python-unittest2/python-unittest2-1-r2.ebuild
+++ b/virtual/python-unittest2/python-unittest2-1-r2.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/python-unittest2-1-r2.ebuild,v 1.1 2013/07/19 07:58:37 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+inherit python-r1
+
+DESCRIPTION="A virtual for packages needing unittest2 in Python 2.5, 2.6, 3.1"
+HOMEPAGE=""
+SRC_URI=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+LICENSE=""
+SLOT="0"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	python_targets_python2_5? ( dev-python/unittest2[python_targets_python2_5] )
+	python_targets_python2_6? ( dev-python/unittest2[python_targets_python2_6] )
+	python_targets_python3_1? ( dev-python/unittest2[python_targets_python3_1] )"
--- a/x11-misc/parcellite/Manifest
+++ b/x11-misc/parcellite/Manifest
@ -1,3 +1,2 @@
-DIST parcellite-1.0.2rc5.tar.gz 726550 SHA256 6e7388093b76a6873aa237ea89bf941e0c1b1541a7793c23cf6ec72db93f5fc6 SHA512 fa67eb178abd39849a905ffa4085aa5282087aa19bac2995244606bb13ca988f351074adbe2d718a456b24f717f113a0739aba5e87b11363ad9e8c03fef7d866 WHIRLPOOL 3c74694506d83b99cd7e99f5e0629d8ebd6780691f1b7527f14d3b06038b8d41811b5f67c67c6713903fb0adb33c038a5c9c345ead11e83118147c5e83ceaa7a
-DIST parcellite-1.0.2rc6.tar.gz 674562 SHA256 73c719f32a727869b3765fd80be528469557e2fd105fe6ff9e45ac7f7088b30f SHA512 e7dd902949ff66069fca2b8b02908664b8f4f5b3fd718bb8bf91e3889c7238b80891592236d3e8dec1e9da6e34e144a1c5e14796052810555033066d5c6ee238 WHIRLPOOL d53179e18e2e8e9e11552a54a9016d35b0351a2bf69c179fbd7afba7f363265f9793796341935dfbebcf71a66bcfa668ca5ce3e39ffe9d34fa75d1c40f677acb
 DIST parcellite-1.1.4.tar.gz 692103 SHA256 56f1f6530d1a0682a8ee0844ff75980210492d4c3229a776a7f6c480fa139982 SHA512 5797a65ce9eef619eba21fd93a88062d1de5a9cfad41f314bb93078a94422ff223324949ecee35ea09a7a7576689a90fc6c764a47daf4943a84b4b9fabe7d89f WHIRLPOOL 770b9a58b059159fead9bb1f2d8e9f1917a73c51310a1d1c37e71ca1b7bdb14e2f40421b9297fc30da58280f7fc06f58f0a432cc917a8e6d5b782ab47af69019
+DIST parcellite-1.1.5.tar.gz 700803 SHA256 20fbd04f1563187ec93221ab3283f4fda4ac6c82af443afe7a3d6f3d81caa0be SHA512 e8712fc001770f7146afdbf7e759aa5886977673096b5b9e1aef21fc1bc8da016b95132941165e39f6e93b4de136fd4e2f7d75a05e49cea526a99f6c4027fe4d WHIRLPOOL 294bd04a259beb55c4748997334e533edc4b0536fefdf00b2a497889b4aaee4e6ad8f0cee181341e9f114333442e69eefaedcc46b27b8fba9c00f03b5f406dfd
--- a/Show more
+++ b/Show more