Sync with portage [Sun Jun 23 19:08:03 MSK 2013].

11 years ago · c31b2a0ba9
parent f0dd31af45
commit c31b2a0ba9
211 changed files with 1516 additions and 6392 deletions
--- a/app-editors/nedit/nedit-5.5_p20110116-r2.ebuild
+++ b/app-editors/nedit/nedit-5.5_p20110116-r2.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.5_p20110116.ebuild,v 1.4 2012/10/24 18:58:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nedit/nedit-5.5_p20110116-r2.ebuild,v 1.1 2013/06/23 12:26:22 pinkbyte Exp $

-EAPI=2
+EAPI=5

-inherit toolchain-funcs eutils
+inherit eutils toolchain-funcs

 DESCRIPTION="Multi-purpose text editor for the X Window System"
 HOMEPAGE="http://nedit.org/"
@ -13,11 +13,12 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""

 RDEPEND=">=x11-libs/motif-2.3:0
 	x11-libs/libXp
-	x11-libs/libXpm"
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	|| ( dev-util/yacc sys-devel/bison )
 	dev-lang/perl"
@ -34,9 +35,6 @@ src_prepare() {
 		-i Makefile source/preferences.c source/help_data.h source/nedit.c Xlt/Makefile || die
 	sed \
 		-e "s:nc:neditc:g" -i doc/nc.pod || die
-}
-
-src_configure() {
 	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
 		makefiles/Makefile.linux || die
 	sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:"                  \
@ -44,28 +42,35 @@ src_configure() {
 		   -e "s:-lX11:-lX11 -lXmu -liconv:"                   \
 		   -e "s:check_tif_rule::"                             \
 		makefiles/Makefile.macosx || die
+
+	epatch_user
 }

+src_configure() { :; }
+
 src_compile() {
-	case ${CHOST} in
+	case "${CHOST}" in
 		*-darwin*)
-			emake CC="$(tc-getCC)" macosx || die
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx
 			;;
 		*-linux*)
-			emake CC="$(tc-getCC)" linux || die
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
 			;;
 	esac
-	emake VERSION="NEdit ${PV}" -j1 -C doc all || die
+	emake VERSION="NEdit ${PV}" -j1 -C doc all
 }

 src_install() {
-	dobin source/nedit || die
-	newbin source/nc neditc || die
-	newman doc/nedit.man nedit.1 || die
-	newman doc/nc.man neditc.1 || die
+	dobin source/nedit
+	newbin source/nc neditc
+
+	make_desktop_entry "${PN}"
+	doicon "${FILESDIR}/${PN}.svg"
+
+	newman doc/nedit.man nedit.1
+	newman doc/nc.man neditc.1

-	dodoc README ReleaseNotes ChangeLog || die
-	cd doc
-	dodoc nedit.doc NEdit.ad faq.txt || die
-	dohtml nedit.html || die
+	dodoc README ReleaseNotes ChangeLog
+	dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt
+	dohtml doc/nedit.html
 }
--- a/app-emulation/vmware-modules/files/264-3.8.0.patch
+++ b/app-emulation/vmware-modules/files/264-3.8.0.patch
@ -0,0 +1,33 @@
+[patch] Vmware 9 on Linux Kernel 3.8rc4 and later
+source: http://communities.vmware.com/thread/432897 and bug 458228
+
+diff -rupN a/work/vmci-only/linux/driver.c b/work/vmci-only/linux/driver.c
+--- a/work/vmci-only/linux/driver.c	2012-10-31 23:28:45.000000000 -0400
+++ b/work/vmci-only/linux/driver.c	2013-03-18 15:23:52.488752357 -0400
+@@ -124,7 +124,7 @@ static struct pci_driver vmci_driver = {
+    .name     = "vmci",
+    .id_table = vmci_ids,
+    .probe = vmci_probe_device,
+-   .remove = __devexit_p(vmci_remove_device),
+   .remove = vmci_remove_device,
+ };
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+@@ -1741,7 +1741,7 @@ vmci_enable_msix(struct pci_dev *pdev) /
+  *-----------------------------------------------------------------------------
+  */
+ 
+-static int __devinit
+static int 
+ vmci_probe_device(struct pci_dev *pdev,           // IN: vmci PCI device
+                   const struct pci_device_id *id) // IN: matching device ID
+ {
+@@ -1969,7 +1969,7 @@ vmci_probe_device(struct pci_dev *pdev,
+  *-----------------------------------------------------------------------------
+  */
+ 
+-static void __devexit
+static void 
+ vmci_remove_device(struct pci_dev* pdev)
+ {
+    struct vmci_device *dev = pci_get_drvdata(pdev);
--- a/app-emulation/vmware-modules/vmware-modules-264.4.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.4.ebuild
@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.4.ebuild,v 1.2 2012/12/12 11:46:57 ssuominen Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic linux-info linux-mod user versionator udev
-
-PV_MAJOR=$(get_major_version)
-PV_MINOR=$(get_version_component_range 2)
-
-DESCRIPTION="VMware kernel modules"
-HOMEPAGE="http://www.vmware.com/"
-
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	|| ( =app-emulation/vmware-player-4.0.${PV_MINOR}*
-	=app-emulation/vmware-workstation-8.0.${PV_MINOR}* )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
-		CONFIG_CHECK="${CONFIG_CHECK} BKL"
-	fi
-
-	linux-info_pkg_setup
-
-	linux-mod_pkg_setup
-
-	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
-
-	VMWARE_MODULE_LIST="vmblock vmci vmmon vmnet vsock"
-	VMWARE_MOD_DIR="${PN}-${PVR}"
-
-	BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
-
-	enewgroup "${VMWARE_GROUP}"
-	filter-flags -mfpmath=sse
-
-	for mod in ${VMWARE_MODULE_LIST}; do
-		MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
-	done
-}
-
-src_unpack() {
-	cd "${S}"
-	for mod in ${VMWARE_MODULE_LIST}; do
-		tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-jobserver.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-3.2.0.patch"
-	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
-	epatch "${FILESDIR}/${PV_MAJOR}-d-make-root.patch"
-}
-
-src_install() {
-	linux-mod_src_install
-	local udevrules="${T}/60-vmware.rules"
-	cat > "${udevrules}" <<-EOF
-		KERNEL=="vmci",  GROUP="vmware", MODE=660
-		KERNEL=="vmmon", GROUP="vmware", MODE=660
-		KERNEL=="vsock", GROUP="vmware", MODE=660
-	EOF
-	udev_dorules "${udevrules}"
-}
--- a/app-emulation/vmware-modules/vmware-modules-264.5.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.5.ebuild,v 1.2 2013/06/21 20:44:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.5.ebuild,v 1.3 2013/06/23 13:13:19 dilfridge Exp $

 EAPI="4"

@ -66,6 +66,7 @@ src_prepare() {
 	use pax_kernel && epatch "${FILESDIR}/hardened.patch"
 	epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
 	kernel_is ge 3 7 0 && epatch "${FILESDIR}/${PV_MAJOR}-putname.patch"
+	kernel_is ge 3 8 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.8.0.patch"

 	# Allow user patches so they can support RC kernels and whatever else
 	epatch_user
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@ -1,7 +1,5 @@
 DIST VMware-Player-3.1.6-744570.i386.bundle 107116126 SHA256 e612fd4dbe45e14426f8fe72cc5eb88325001952f740b560fdd330e529be0272 SHA512 1399a40a3d357805ad585b60ab60cac2b4cd85bd9c78fe397a7bc313759c904e9d071732108128587612bcac43f311a1de80fdbc1817055e20e6c73b6a7e5149 WHIRLPOOL 297182b1a13e9c44796ad869cbf696cbc5d38b73866cf42283504a2175f7ac1e928c7c430d4f713b24b9a8c050d52f6f5171aa7c9448fa3d7721e5427e1a0dd2
 DIST VMware-Player-3.1.6-744570.x86_64.bundle 103054014 SHA256 ebf74c876bcce6a06c16dceab6116ab9daab057b8276ee337bf54a9f59cce79d SHA512 023e0ed0f5c4e695b738beb4df6286fce9572485c40acfaaf46e4ffbf49b574ac048f297b219dbea7fafa119dcdc700809cb0943309c328d34d92c30f96d8332 WHIRLPOOL e40a5353a2841aa50687e092aee424aa9d77cf7df32acfc2e66c11b6ff04adce5441b123dacedc68896ab7d7c744f69ca834020344425ea9edb77888e81cc560
-DIST VMware-Player-4.0.4-744019.i386.bundle.tar 131993600 SHA256 d06881c512a11fbc76f1c23d7a6c9d7bd3888c613b1678719fa77ed76243d678 SHA512 c1d763374a5d54759cd791669e846479e3ef009dd3d13f16192ca6fdb8727081b5ec510c0b2bf4a311e3e8f3ad905512c0b33be2c70e33e9b4f7037b8349e560 WHIRLPOOL e21bfdf308ee905d8bc6aefb7097b9e30c546186fa7e8750d556a4d3cb144648da36aae2622e54159918cfb5ddab848ee64f225148a0bfb6111264ce763ab067
-DIST VMware-Player-4.0.4-744019.x86_64.bundle.tar 129710080 SHA256 8584e18a4cbed8ce19bd239f8e1cbc2cccd17e2d016faba93fd685a160dade21 SHA512 ba3894fc942e67940d4c2f98f567ee46786a77dc21615ced01314b6dca9919469924bf4c96fdf08ab2443365de03f6a652ca595b6cbb13990ca3671282d01679 WHIRLPOOL ed123a9b22eb1d4fd03afa3b854f3e7d1f12400da75882892f561de3f44860ec67a18a779510ec70715534c03aa21c858721dd92be66a2384152d6a964728ce9
 DIST VMware-Player-4.0.5-893925.i386.bundle.tar 129781760 SHA256 34b48f6603ad204eb019ea07ace4381bdb53b0fb99ae2deebe8e98abdf0c2e41 SHA512 a09c4cddede03a953d63cb5892a88d3abbbf86d91a45e18a5c02f4461810d2ec38a4e5a8af9859082a002aa076e833f84c95043aa0b5e9d4cbc4abf38e65fd64 WHIRLPOOL 9e7c17dac258f9df2a211cfda364548d813f470bfea5790fa8737c02858aa0fad8ffc79a242fd16af54b24f2b298883a5f40502a91c738c5e21ecd99844e2412
 DIST VMware-Player-4.0.5-893925.x86_64.bundle.tar 127262720 SHA256 93454b17065dea2bdb5dd62da74122590162e5e3ef8e5218cc1ebe348189afca SHA512 0b012dd0b28a525500b931fc688286d20c6fac37e2c8e078f3999d9bb5c663e9600e610e9030fbbe3cc55a4dc4b05cf3727cdecb96630cb4ff9010878a471734 WHIRLPOOL 55d8363baced467e97b8718945e7dedd013718353c7a4b4e86234dc774db3456a5ae9ace54e457acd1c724b67df73dcfb95a8d9380aff7ef0e1a07df8db018d0
 DIST VMware-Player-5.0.2-1031769.i386.bundle.tar 220037120 SHA256 9ed94f5137f96d5ab1b4898abb7bdc1ab84edf7eb8b6477ca3f33a9b18e4d0be SHA512 5fac9dc97ff36631c40765fe4e63c734176891441f3dfbeb417d1dae7db02db7b65c799ae706cbbb8edd91c8aed3fe6d11ebbae8c69a82d37b3ddc48261bff5c WHIRLPOOL c7e634f59c6852e58f7665de7db9c4295451592ba61de738e4cac927907b9d662a9b944579aca1474b5bf5c241d1a5bbcc1ed8c07aff1c31d1d39d4a66309fe4
--- a/app-emulation/vmware-player/vmware-player-4.0.4.744019-r1.ebuild
+++ b/app-emulation/vmware-player/vmware-player-4.0.4.744019-r1.ebuild
@ -1,238 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-4.0.4.744019-r1.ebuild,v 1.3 2013/06/22 22:37:55 dilfridge Exp $
-
-EAPI="4"
-
-inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle
-
-MY_PN="VMware-Player"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/player/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
-	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
-	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-	"
-
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc +vmware-tools"
-RESTRICT="strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	dev-cpp/libsexymm
-	dev-cpp/pangomm:1.4
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libaio
-	dev-libs/libsigc++
-	dev-libs/libxml2
-	=dev-libs/openssl-0.9.8*
-	dev-libs/xmlrpc-c
-	gnome-base/libgnomecanvas
-	gnome-base/libgtop:2
-	gnome-base/librsvg:2
-	gnome-base/orbit
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libart_lgpl
-	=media-libs/libpng-1.2*
-	net-misc/curl
-	cups? ( net-print/cups )
-	sys-devel/gcc
-	sys-fs/fuse
-	sys-libs/glibc
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libgksu
-	x11-libs/libICE
-	x11-libs/libsexy
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/startup-notification
-	!app-emulation/vmware-workstation"
-PDEPEND="~app-emulation/vmware-modules-264.${PV_MINOR}
-	vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-
-src_unpack() {
-	default
-	local bundle=${A%.tar}
-
-	local component ; for component in \
-			vmware-player \
-			vmware-player-app \
-			vmware-vmx \
-			vmware-usbarbitrator \
-			vmware-network-editor \
-			vmware-player-setup
-			#vmware-ovftool
-	do
-		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
-	done
-}
-
-src_prepare() {
-	rm -f bin/vmware-modconfig
-	rm -rf lib/modules/binary
-}
-
-clean_bundled_libs() {
-	ebegin 'Removing superfluous libraries'
-	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
-	# see http://forums.gentoo.org/viewtopic-t-835867.html
-	# must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
-	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
-libssl.so.0.9.8
-libgcr.so.0' | while read -r libname libpath ; do
-		dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}"
-	done
-	eend
-}
-
-src_install() {
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/* || die "failed to install bin"
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share
-
-	if use cups; then
-		exeinto $(cups-config --serverbin)/filter
-		doexe extras/thnucups
-
-		insinto /etc/cups
-		doins -r etc/cups/*
-	fi
-
-	# install documentation
-	if use doc; then
-		dodoc doc/*
-	fi
-
-	exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doexe vmware-config
-
-	# create symlinks for the various tools
-	local tool ; for tool in thnuclnt vmplayer{,-daemon} \
-			vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
-		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-	done
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
-	# fix permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-
-	pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx
-
-	# create the environment
-	local envd="${T}/90vmware"
-	cat > "${envd}" <<-EOF
-		PATH='${VM_INSTALL_DIR}/bin'
-		ROOTPATH='${VM_INSTALL_DIR}/bin'
-	EOF
-	doenvd "${envd}" || die
-
-	# create the configuration
-	dodir /etc/vmware || die
-
-	cat > "${D}"/etc/vmware/bootstrap <<-EOF
-		BINDIR='${VM_INSTALL_DIR}/bin'
-		LIBDIR='${VM_INSTALL_DIR}/lib'
-	EOF
-
-	cat > "${D}"/etc/vmware/config <<-EOF
-		bindir = "${VM_INSTALL_DIR}/bin"
-		libdir = "${VM_INSTALL_DIR}/lib/vmware"
-		initscriptdir = "/etc/init.d"
-		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-		gksu.rootMethod = "su"
-		VMCI_CONFED = "yes"
-		VMBLOCK_CONFED = "yes"
-		VSOCK_CONFED = "yes"
-		NETWORKING = "yes"
-		player.product.version = "${MY_PV}"
-		product.buildNumber = "${PV_BUILD}"
-	EOF
-
-	# install the init.d script
-	local initscript="${T}/vmware.rc"
-
-	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-3.0.rc" > "${initscript}" || die
-	newinitd "${initscript}" vmware || die
-
-	# fill in variable placeholders
-	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-i "${D}/usr/share/applications/${PN}.desktop" || die
-}
-
-pkg_config() {
-	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "/etc/env.d was updated. Please run:"
-	ewarn "env-update && source /etc/profile"
-	ewarn ""
-	ewarn "Before you can use vmware-player, you must configure a default network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
-	einfo "Stopping ${PN} for safe unmerge"
-	/etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@ -1,7 +1,5 @@
 DIST VMware-Workstation-7.1.6-744570.i386.bundle 130391795 SHA256 fbeadabe7c0929a10f144dc82e37afc73bbd60bedf299bb2c6142dda379ad5b4 SHA512 c57148f0ef7041bdadf46668aaddd0315134185103706dc23815bf3ebe4f2389a9387c63d0caf3fb0e1baf236320c633264e473439b2e00eb26c11d489e6af0a WHIRLPOOL e631ccb14424d5165fc2f9bbe7d910e60c06ed3f4c5fbddbbf5b4bc66153a84927a3779359f3d07b258a59766ff9d063585e1ecc70dc4d107c073bf529541dbf
 DIST VMware-Workstation-7.1.6-744570.x86_64.bundle 137422513 SHA256 1a0694349393ce326f62c291d76c1c5e8d5473b49bf986476e1485df422a2f8f SHA512 df72b0c770f9e356efd1bbffe2c596909f193bc2100a015cfbab819fea017ee735fcc932180c0cc5ffbe8223fa66a06dcd35e34d183b06f71c7ba937c440e2fd WHIRLPOOL e7b50e706b88e30801ccaeaedf59f5fbdf06342d8566a65b3cb19ec2c433da52768b55f9e5e58e274071c284d38280e0635f8a9c3fd2d01f53037c1082d15af3
-DIST VMware-Workstation-8.0.4-744019.i386.bundle.tar 189839360 SHA256 5b469de4f583fc0d33750253244c23e0f6a9d5b713e8d46ea3dd07f01af2b5ed SHA512 f0b17262594bf613a971c49843eec8fd1182a031c0cdca91824a1c6a0315e87183c0d99f6e37e2aa3a9a9a00f57efbbc6ff155094aa6cc776901177697aa8e49 WHIRLPOOL bf5a7a2f8c7cfc53fe2d0dfbe1b8b1fa9452a3eb0a1b5a70363dab4bd23c86a628a3938b5c5c30301639ea748347230fc3ad0b8977dabc1c2b828f6dde81b1f1
-DIST VMware-Workstation-8.0.4-744019.x86_64.bundle.tar 189552640 SHA256 83cdf3f4cf99afdd3e9685b5cc50f613094cc24e7502a2dc577f05640382a6c5 SHA512 87258301b157f9bade30094a02a5f3749342b00ccb5b1359d10152331d3d257bb1afe23fa7b68c973e2f4e2b9e9afc7ca52e99118041e1d45be3099f8d10d51c WHIRLPOOL 1bf6ce95e63042bb47971c36f55f943ef8ce736c5f9355fe7afbc114a09f716277199a847af041bd467cdb02170414bd660bafa54cce59029347e27ffda6eb73
 DIST VMware-Workstation-8.0.5-893925.i386.bundle.tar 188180480 SHA256 79033aa837a1b2fcf1229c407b159586152d41f3c624ae1745264443bad06a90 SHA512 2ea55d6ba1b64ee33ca73af46ce4ba58be441ecb973e4f9e3711b7d516b1d6233ee8e125c0d90226169258a5bbccf73f67ea593a1eaa48e7368275f545db3306 WHIRLPOOL 270b37814ee4c19bbe3e1d573016cf1899a90dc1c3500181eeb336220eebde276fb11bb4e46d3121a8e1517f749fe9a127eb76f642938d7b8e8f22ae3fbed556
 DIST VMware-Workstation-8.0.5-893925.x86_64.bundle.tar 187729920 SHA256 39010a8b712c9e9ea86f0bf32b1ad86a7788748f00292f344b1bdea899a6ac0d SHA512 010cbe7a6ffa6cd07b6daab8534c4da260aae17a6c7988e74792aa450f266bea306cca49820a65dfb3e0b76e912a5430fe98f4f0446f750fe26b867cfe2ed48d WHIRLPOOL dbf6994fbf87b3eca0fe882075dbdd68de599c7b699e609a43d3bade5e23704158ef11a13dea12b41c2c3c7d57ba493e324b4ebf2b138c9cf5835699ba76ae55
 DIST VMware-Workstation-9.0.2-1031769.i386.bundle.tar 264898560 SHA256 f23efa3db418790cffa38a90639edd0f5e0834fa98c69a3146489cc3774a71c7 SHA512 ea38c747e236e3a5ae3da809f22a997044c3306239afbc2cc28dfd04f3589dc23e35295bcb5dfb7f5ea687a908b790fb56afa062b7a5cea523c8645d94d652b0 WHIRLPOOL 18aaed121c973911d00a89790b98c8b22b942d29a3580181e7937fe27882d4cd30b2e0a7c13d22129c2e72c7cbce87cff0c80f32e6726d25cf67ec159506db46
--- a/app-emulation/vmware-workstation/vmware-workstation-8.0.4.744019-r1.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-8.0.4.744019-r1.ebuild
@ -1,472 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-8.0.4.744019-r1.ebuild,v 1.3 2013/06/22 22:44:06 dilfridge Exp $
-
-EAPI="4"
-
-inherit eutils versionator fdo-mime gnome2-utils pam vmware-bundle
-
-MY_PN="VMware-Workstation"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/workstation/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
-	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
-	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
-	"
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc ovftool server vix vmware-tools"
-RESTRICT="mirror strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm
-	dev-cpp/libsexymm
-	dev-cpp/pangomm
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/expat
-	dev-libs/libaio
-	dev-libs/libsigc++
-	dev-libs/libxml2
-	=dev-libs/openssl-0.9.8*
-	dev-libs/xmlrpc-c
-	gnome-base/libgnomecanvas
-	gnome-base/libgtop:2
-	gnome-base/librsvg:2
-	gnome-base/orbit
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libart_lgpl
-	=media-libs/libpng-1.2*
-	media-libs/libpng
-	net-misc/curl
-	cups? ( net-print/cups )
-	sys-devel/gcc
-	sys-fs/fuse
-	sys-libs/glibc
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/libgksu
-	x11-libs/libICE
-	x11-libs/libsexy
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/startup-notification
-	x11-themes/hicolor-icon-theme
-	!app-emulation/vmware-player"
-PDEPEND="~app-emulation/vmware-modules-264.${PV_MINOR}
-	vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
-VM_HOSTD_USER="root"
-
-src_unpack() {
-	default
-	local bundle=${A%.tar}
-	local component; for component in \
-		vmware-vmx \
-		vmware-player-app \
-		vmware-player-setup \
-		vmware-workstation \
-		vmware-network-editor \
-		vmware-network-editor-ui \
-		vmware-usbarbitrator
-	do
-		vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
-	done
-
-	if use server; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
-	fi
-
-	if use vix; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation800andvSphere500 vmware-vix
-	fi
-	if use ovftool; then
-		vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
-	fi
-}
-
-src_prepare() {
-	rm -f  bin/vmware-modconfig
-	rm -rf lib/modules/binary
-	if use server; then
-		rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
-	fi
-
-	find "${S}" -name '*.a' -delete
-
-#	clean_bundled_libs
-}
-
-clean_bundled_libs() {
-	ebegin 'Removing superfluous libraries'
-	cd lib/lib || die
-	ldconfig -p | \
-		sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
-		fgrep -vx 'libcrypto.so.0.9.8
-libssl.so.0.9.8i
-libgcr.so.0
-libglib-2.0.so.0' |
-		xargs -d'\n' -r rm -rf
-	eend
-}
-
-src_install() {
-	local major_minor=$(get_version_component_range 1-2 "${PV}")
-	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
-	local build=$(get_version_component_range 4 "${PV}")
-
-	# install the binaries
-	into "${VM_INSTALL_DIR}"
-	dobin bin/*
-
-	# install the libraries
-	insinto "${VM_INSTALL_DIR}"/lib/vmware
-	doins -r lib/*
-
-	# install the ancillaries
-	insinto /usr
-	doins -r share
-
-	if use cups; then
-		exeinto $(cups-config --serverbin)/filter
-		doexe extras/thnucups
-
-		insinto /etc/cups
-		doins -r etc/cups/*
-	fi
-
-	insinto /etc/xdg
-	doins -r etc/xdg/*
-
-	# install documentation
-	doman man/man1/vmware.1.gz
-
-	if use doc; then
-		dodoc doc/*
-	fi
-
-	insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
-	doins vmware-config
-
-	# install vmware workstation server
-	if use server; then
-		dosbin sbin/*
-
-		cd "${S}"/vmware-workstation-server
-
-		# install binaries
-		into "${VM_INSTALL_DIR}"/lib/vmware
-		dobin bin/*
-
-		dobin "${FILESDIR}"/configure-hostd.sh
-
-		dobin "${FILESDIR}"/configure-hostd.sh
-
-		# install the libraries
-		insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
-		doins -r lib/*
-
-		into "${VM_INSTALL_DIR}"
-		for tool in  vmware-{hostd,vim-cmd,wssc-adminTool} ; do
-			cat > "${T}/${tool}" <<-EOF
-				#!/usr/bin/env bash
-				set -e
-
-				. /etc/vmware/bootstrap
-
-				exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
-					"${VM_INSTALL_DIR}/lib/vmware/lib" \\
-					"${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
-					"${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
-			EOF
-			dobin "${T}/${tool}"
-		done
-
-		insinto "${VM_INSTALL_DIR}"/lib/vmware
-		doins -r hostd
-
-		# create the configuration
-		insinto /etc/vmware/hostd
-		doins -r config/etc/vmware/hostd/*
-		doins -r etc/vmware/hostd/*
-
-		insinto /etc/vmware/ssl
-		doins etc/vmware/ssl/*
-
-		# pam
-		pamd_mimic_system vmware-authd auth account
-
-		# create directory for shared virtual machines.
-		keepdir "${VM_DATA_STORE_DIR}"
-		keepdir /var/log/vmware
-	fi
-
-	# install vmware-vix
-	if use vix; then
-		cd "${S}"/vmware-vix
-
-		# install the binary
-		into "${VM_INSTALL_DIR}"
-		dobin bin/*
-
-		# install the libraries
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
-		doins -r lib/*
-
-		dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
-
-		# install headers
-		insinto /usr/include/vmware-vix
-		doins include/*
-
-		if use doc; then
-			dohtml -r doc/*
-		fi
-	fi
-
-	# install ovftool
-	if use ovftool; then
-		cd "${S}"
-
-		insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
-		doins -r vmware-ovftool/*
-
-		chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
-		dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
-	fi
-
-	# create symlinks for the various tools
-	local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} \
-			vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper} ; do
-		dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
-	done
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
-	dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
-	# fix permissions
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
-	fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
-	fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
-	fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-	if use server; then
-		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,vim-cmd,wssc-adminTool}
-		fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
-		fperms 1777 "${VM_DATA_STORE_DIR}"
-	fi
-	if use vix; then
-		fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
-	fi
-
-	# create the environment
-	local envd="${T}/90vmware"
-	cat > "${envd}" <<-EOF
-		PATH='${VM_INSTALL_DIR}/bin'
-		ROOTPATH='${VM_INSTALL_DIR}/bin'
-	EOF
-	doenvd "${envd}"
-
-	# create the configuration
-	dodir /etc/vmware
-
-	cat > "${D}"/etc/vmware/bootstrap <<-EOF
-		BINDIR='${VM_INSTALL_DIR}/bin'
-		LIBDIR='${VM_INSTALL_DIR}/lib'
-	EOF
-
-	cat > "${D}"/etc/vmware/config <<-EOF
-		bindir = "${VM_INSTALL_DIR}/bin"
-		libdir = "${VM_INSTALL_DIR}/lib/vmware"
-		initscriptdir = "/etc/init.d"
-		authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
-		gksu.rootMethod = "su"
-		VMCI_CONFED = "yes"
-		VMBLOCK_CONFED = "yes"
-		VSOCK_CONFED = "yes"
-		NETWORKING = "yes"
-		player.product.version = "${major_minor_revision}"
-		product.version = "${major_minor_revision}"
-		product.buildNumber = "${build}"
-		product.name = "VMware Workstation"
-		workstation.product.version = "${major_minor_revision}"
-	EOF
-
-	if use vix; then
-		cat >> "${D}"/etc/vmware/config <<-EOF
-			vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
-			vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
-			vix.config.version = "1"
-		EOF
-	fi
-
-	if use server; then
-		cat >> "${D}"/etc/vmware/config <<-EOF
-			authd.client.port = "902"
-			authd.proxy.nfc = "vmware-hostd:ha-nfc"
-			authd.soapserver = "TRUE"
-		EOF
-	fi
-
-	# install the init.d script
-	local initscript="${T}/vmware.rc"
-	sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-		"${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
-	newinitd "${initscript}" vmware
-
-	if use server; then
-		# install the init.d script
-		local initscript="${T}/vmware-workstation-server.rc"
-		sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
-			-e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
-			-e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
-			-e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
-			"${FILESDIR}/vmware-server-8.0.rc" > ${initscript}
-		newinitd "${initscript}" vmware-workstation-server
-	fi
-
-	# fill in variable placeholders
-	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
-		-i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
-		-i "${D}/usr/share/applications/${PN}.desktop"
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
-		-i "${D}/usr/share/applications/vmware-player.desktop"
-	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
-		-i "${D}/usr/share/applications/vmware-netcfg.desktop"
-
-	if use server; then
-	# Configuration for vmware-workstation-server
-		local hostdUser="${VM_HOSTD_USER:-root}"
-		sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
-			-i "${D}/etc/vmware/hostd/authorization.xml" || die
-
-		# Shared VMs Path: [standard].
-		sed -e "s:##{DS_NAME}##:standard:g" \
-			-e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
-			-i "${D}/etc/vmware/hostd/datastores.xml" || die
-
-		sed -e "s:##{HTTP_PORT}##:-1:g" \
-			-e "s:##{HTTPS_PORT}##:443:g" \
-			-e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
-			-i "${D}/etc/vmware/hostd/proxy.xml" || die
-
-		# See vmware-workstation-server.py for more details.
-		sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{CFGDIR}##:/etc/vmware/:g" \
-			-e "s:##{ENABLE_AUTH}##:true:g" \
-			-e "s:##{HOSTDMODE}##:ws:g" \
-			-e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
-			-e "s:##{HOSTD_MOCKUP}##:false:g" \
-			-e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
-			-e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
-			-e "s:##{LOGDIR}##:/var/log/vmware/:g" \
-			-e "s:##{LOGLEVEL}##:verbose:g" \
-			-e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
-			-e "s:##{PLUGINDIR}##:./:g" \
-			-e "s:##{SHLIB_PREFIX}##:lib:g" \
-			-e "s:##{SHLIB_SUFFIX}##:.so:g" \
-			-e "s:##{USE_BLKLISTSVC}##:false:g" \
-			-e "s:##{USE_CBRCSVC}##:false:g" \
-			-e "s:##{USE_CIMSVC}##:false:g" \
-			-e "s:##{USE_DIRECTORYSVC}##:false:g" \
-			-e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
-			-e "s:##{USE_DYNAMO}##:false:g" \
-			-e "s:##{USE_DYNSVC}##:false:g" \
-			-e "s:##{USE_GUESTSVC}##:false:g" \
-			-e "s:##{USE_HBRSVC}##:false:g" \
-			-e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_HTTPNFCSVC}##:false:g" \
-			-e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_NFCSVC}##:true:g" \
-			-e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_OVFMGRSVC}##:true:g" \
-			-e "s:##{USE_PARTITIONSVC}##:false:g" \
-			-e "s:##{USE_SECURESOAP}##:false:g" \
-			-e "s:##{USE_SNMPSVC}##:false:g" \
-			-e "s:##{USE_SOLO_MOCKUP}##:false:g" \
-			-e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VDISKSVC}##:false:g" \
-			-e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
-			-e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
-			-e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
-			-e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
-			-e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
-			-e "s:##{WORKINGDIR}##:./:g" \
-			-i "${D}/etc/vmware/hostd/config.xml" || die
-
-		sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
-			-i "${D}/etc/vmware/hostd/environments.xml" || die
-
-		# @@VICLIENT_URL@@=XXX
-		sed -e "s:@@AUTHD_PORT@@:902:g" \
-			-i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
-	fi
-}
-
-pkg_config() {
-	"${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-
-	ewarn "/etc/env.d was updated. Please run:"
-	ewarn "env-update && source /etc/profile"
-	ewarn ""
-	ewarn "Before you can use vmware workstation, you must configure a default network setup."
-	ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
-	einfo "Stopping ${PN} for safe unmerge"
-	/etc/init.d/vmware stop
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
--- a/app-office/libreoffice/libreoffice-4.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.0.4.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.4.2.ebuild,v 1.1 2013/06/20 11:40:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.4.2.ebuild,v 1.2 2013/06/23 09:39:34 scarabeus Exp $

 EAPI=5

@ -235,6 +235,7 @@ REQUIRED_USE="
 	bluetooth? ( dbus )
 	gnome? ( gtk )
 	eds? ( gnome )
+	telepathy? ( gtk )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
--- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.31 2013/06/20 11:40:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.32 2013/06/23 09:39:34 scarabeus Exp $

 EAPI=5

@ -235,6 +235,7 @@ REQUIRED_USE="
 	bluetooth? ( dbus )
 	gnome? ( gtk )
 	eds? ( gnome )
+	telepathy? ( gtk )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
--- a/app-office/libreoffice/libreoffice-4.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.1.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.3 2013/06/20 11:40:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.4 2013/06/23 09:39:34 scarabeus Exp $

 EAPI=5

@ -236,6 +236,7 @@ REQUIRED_USE="
 	bluetooth? ( dbus )
 	gnome? ( gtk )
 	eds? ( gnome )
+	telepathy? ( gtk )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.178 2013/06/20 11:40:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.179 2013/06/23 09:39:34 scarabeus Exp $

 EAPI=5

@ -236,6 +236,7 @@ REQUIRED_USE="
 	bluetooth? ( dbus )
 	gnome? ( gtk )
 	eds? ( gnome )
+	telepathy? ( gtk )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
--- a/app-text/zathura-cb/metadata.xml
+++ b/app-text/zathura-cb/metadata.xml
@ -9,6 +9,9 @@
    <email>xmw@gentoo.org</email>
    <name>Michael Weber</name>
  </maintainer>
+  <use>
+    <flag name="deprecated">Use x11-libs/gtk+:2 instead of x11-libs/gtk+:3</flag>
+  </use>
  <upstream>
    <maintainer status="active">
      <email>mlq@pwmt.org</email>
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-cb/zathura-cb-9999.ebuild,v 1.1 2013/06/23 12:35:32 xmw Exp $
+
+EAPI=5
+
+inherit eutils git-2 toolchain-funcs
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS=""
+IUSE="+deprecated"
+
+COMMON_DEPEND=">=app-text/zathura-0.2.0[deprecated=]
+	dev-libs/glib:2
+	app-arch/libarchive:=
+	x11-libs/cairo:="
+RDEPEND="${COMMON_DEPEND}
+	app-arch/p7zip
+	app-arch/tar
+	app-arch/unrar
+	app-arch/unzip"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	#does not render w/o cairo
+	myzathuraconf=(
+		WITH_CAIRO=1
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
--- a/app-text/zathura-djvu/metadata.xml
+++ b/app-text/zathura-djvu/metadata.xml
@ -9,6 +9,9 @@
    <email>xmw@gentoo.org</email>
    <name>Michael Weber</name>
  </maintainer>
+  <use>
+    <flag name="deprecated">Use x11-libs/gtk+:2 instead of x11-libs/gtk+:3</flag>
+  </use>
  <upstream>
    <maintainer status="active">
      <email>mlq@pwmt.org</email>
--- a/app-text/zathura-djvu/zathura-djvu-9999.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-djvu/zathura-djvu-9999.ebuild,v 1.1 2013/06/23 12:41:21 xmw Exp $
+
+EAPI=5
+
+inherit eutils git-2 toolchain-funcs
+
+DESCRIPTION="DjVu plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS=""
+IUSE="+deprecated"
+
+RDEPEND=">=app-text/djvu-3.5.24-r1
+	>=app-text/zathura-0.2.0[deprecated=]
+	dev-libs/glib:2
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	#does not render w/o cairo
+	myzathuraconf=(
+		WITH_CAIRO=1
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
--- a/app-text/zathura-meta/metadata.xml
+++ b/app-text/zathura-meta/metadata.xml
@ -11,6 +11,7 @@
  </maintainer>
  <use>
    <flag name='cb'>Install plug-in for ComicBook support</flag>
+    <flag name="deprecated">Use x11-libs/gtk+:2 instead of x11-libs/gtk+:3</flag>
  </use>
  <upstream>
    <maintainer status="active">
--- a/app-text/zathura-meta/zathura-meta-9999.ebuild
+++ b/app-text/zathura-meta/zathura-meta-9999.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-meta/zathura-meta-9999.ebuild,v 1.1 2013/06/23 13:06:01 xmw Exp $
+
+EAPI=5
+
+DESCRIPTION="Meta package for app-text/zathura plugins"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS=""
+IUSE="cb +deprecated djvu +pdf postscript"
+
+RDEPEND=">=app-text/zathura-9999[deprecated=]
+	cb? ( >=app-text/zathura-cb-9999[deprecated=] )
+	djvu? ( >=app-text/zathura-djvu-9999[deprecated=] )
+	pdf? ( || ( 
+		>=app-text/zathura-pdf-poppler-9999[deprecated=] 
+		>=app-text/zathura-pdf-mupdf-9999[deprecated=] ) )
+	postscript? ( >=app-text/zathura-ps-9999[deprecated=] )"
--- a/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch
+++ b/app-text/zathura-pdf-mupdf/files/zathura-pdf-mupdf-9999-fz_drop_display_list.patch
@ -0,0 +1,20 @@
+--- zathura-pdf-mupdf-9999/pdf.c
+++ zathura-pdf-mupdf-9999/pdf.c
+@@ -506,7 +506,7 @@
+   }
+ 
+   fz_drop_pixmap(mupdf_page->ctx, pixmap);
+-  fz_free_display_list(mupdf_page->ctx, display_list);
+  fz_drop_display_list(mupdf_page->ctx, display_list);
+ 
+   return image_buffer;
+ }
+@@ -580,7 +580,7 @@
+   }
+ 
+   fz_drop_pixmap(mupdf_page->ctx, pixmap);
+-  fz_free_display_list(mupdf_page->ctx, display_list);
+  fz_drop_display_list(mupdf_page->ctx, display_list);
+ 
+   return ZATHURA_ERROR_OK;;
+ }
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@ -9,6 +9,9 @@
    <email>xmw@gentoo.org</email>
    <name>Michael Weber</name>
  </maintainer>
+  <use>
+    <flag name="deprecated">Use x11-libs/gtk+:2 instead of x11-libs/gtk+:3</flag>
+  </use>
  <upstream>
    <maintainer status="active">
      <email>mlq@pwmt.org</email>
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild,v 1.4 2013/06/20 11:25:55 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild,v 1.5 2013/06/23 12:43:39 xmw Exp $

 EAPI=5

@ -14,11 +14,11 @@ EGIT_BRANCH="mupdf-git"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="+deprecated"

 RDEPEND="!app-text/zathura-pdf-poppler
 	>=app-text/mupdf-9999:=
-	>=app-text/zathura-0.2.0
+	>=app-text/zathura-0.2.0[deprecated=]
 	media-libs/jbig2dec
 	media-libs/openjpeg:2
 	virtual/jpeg
@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 pkg_setup() {
-	# does not render w/o cairo
+	#does not render w/o cairo
 	myzathuraconf=(
 		WITH_CAIRO=1
 		CC="$(tc-getCC)"
@ -41,7 +41,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-mupdf-fz_new_text_page.patch \
 		"${FILESDIR}"/${P}-mupdf-pkgconfig.patch \
-		"${FILESDIR}"/${P}-mupdf-split-headers.patch
+		"${FILESDIR}"/${P}-mupdf-split-headers.patch \
+		"${FILESDIR}"/${P}-fz_drop_display_list.patch
 }

 src_compile() {
--- a/app-text/zathura-pdf-poppler/metadata.xml
+++ b/app-text/zathura-pdf-poppler/metadata.xml
@ -9,6 +9,9 @@
    <email>xmw@gentoo.org</email>
    <name>Michael Weber</name>
  </maintainer>
+  <use>
+    <flag name="deprecated">Use x11-libs/gtk+:2 instead of x11-libs/gtk+:3</flag>
+  </use>
  <upstream>
    <maintainer status="active">
      <email>mlq@pwmt.org</email>
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild,v 1.1 2013/06/23 12:53:52 xmw Exp $
+
+EAPI=5
+
+inherit eutils git-2 toolchain-funcs
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS=""
+IUSE="+deprecated"
+
+RDEPEND="app-text/poppler:=[cairo]
+	>=app-text/zathura-0.2.0[deprecated=]
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	#cairo is non-optional #473378
+	myzathuraconf=(
+		WITH_CAIRO=1
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
--- a/app-text/zathura-ps/metadata.xml
+++ b/app-text/zathura-ps/metadata.xml
@ -9,6 +9,9 @@
    <email>xmw@gentoo.org</email>
    <name>Michael Weber</name>
  </maintainer>
+  <use>
+    <flag name="deprecated">Use x11-libs/gtk+:2 instead of x11-libs/gtk+:3</flag>
+  </use>
  <upstream>
    <maintainer status="active">
      <email>mlq@pwmt.org</email>
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-9999.ebuild,v 1.1 2013/06/23 12:59:16 xmw Exp $
+
+EAPI=5
+
+inherit eutils git-2 toolchain-funcs
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS=""
+IUSE="+deprecated"
+
+RDEPEND=">=app-text/libspectre-0.2.6
+	>=app-text/zathura-0.2.0[deprecated=]
+	dev-libs/glib:2
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	#does not render w/o cairo
+	myzathuraconf=(
+		WITH_CAIRO=1
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.5.ebuild,v 1.1 2013/05/21 11:54:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.5.ebuild,v 1.2 2013/06/23 13:26:34 jer Exp $

 EAPI=5
 inherit eutils
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug static-libs"

 RDEPEND="virtual/libusb:1
--- a/dev-libs/libzip/libzip-0.11.ebuild
+++ b/dev-libs/libzip/libzip-0.11.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.11.ebuild,v 1.2 2013/05/19 16:48:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.11.ebuild,v 1.3 2013/06/23 13:27:49 jer Exp $

 EAPI=5

@ -15,7 +15,7 @@ SRC_URI="http://www.nih.at/libzip/${MY_P}.tar.gz"

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

 DEPEND="sys-libs/zlib"
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.210.0.ebuild
+++ b/dev-perl/Capture-Tiny/Capture-Tiny-0.210.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Capture-Tiny/Capture-Tiny-0.210.0.ebuild,v 1.4 2013/06/22 14:57:49 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Capture-Tiny/Capture-Tiny-0.210.0.ebuild,v 1.5 2013/06/23 13:42:23 jer Exp $

 EAPI=4

@ -12,7 +12,7 @@ DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"

 DEPEND="
--- a/dev-php/DBUnit/DBUnit-1.0.1.ebuild
+++ b/dev-php/DBUnit/DBUnit-1.0.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/DBUnit/DBUnit-1.0.1.ebuild,v 1.2 2012/06/24 18:36:12 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/DBUnit/DBUnit-1.0.1.ebuild,v 1.3 2013/06/23 13:49:05 jer Exp $

 EAPI="3"
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
@ -11,7 +11,7 @@ inherit php-pear-lib-r1
 DESCRIPTION="DbUnit port for PHP/PHPUnit"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
 HOMEPAGE="http://www.phpunit.de"

--- a/dev-php/File_Iterator/File_Iterator-1.3.1.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.3.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/File_Iterator/File_Iterator-1.3.1.ebuild,v 1.3 2012/03/24 17:38:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/File_Iterator/File_Iterator-1.3.1.ebuild,v 1.4 2013/06/23 13:47:05 jer Exp $

 EAPI=4

@ -12,6 +12,6 @@ inherit php-pear-lib-r1
 DESCRIPTION="FilterIterator implementation that filters files based on a list of suffixes"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
 HOMEPAGE="http://www.phpunit.de"
--- a/dev-php/PHPUnit_MockObject/PHPUnit_MockObject-1.1.1.ebuild
+++ b/dev-php/PHPUnit_MockObject/PHPUnit_MockObject-1.1.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PHPUnit_MockObject/PHPUnit_MockObject-1.1.1.ebuild,v 1.4 2012/10/17 03:16:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PHPUnit_MockObject/PHPUnit_MockObject-1.1.1.ebuild,v 1.5 2013/06/23 13:51:19 jer Exp $

 EAPI=4

@ -17,7 +17,7 @@ SRC_URI="http://pear.phpunit.de/get/PHPUnit_MockObject-1.1.1.tgz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""

 DEPEND=">=dev-php/pear-1.9.4
--- a/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.1.ebuild
+++ b/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.1.ebuild,v 1.3 2012/07/03 14:48:34 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PHPUnit_Selenium/PHPUnit_Selenium-1.0.1.ebuild,v 1.4 2013/06/23 13:52:04 jer Exp $

 EAPI="2"
 inherit php-pear-lib-r1
@ -8,7 +8,7 @@ inherit php-pear-lib-r1
 PHP_PEAR_PN="PHPUnit_Selenium"
 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"

-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 hppa x86"

 DESCRIPTION="Selenium RC integration for PHPUnit"
 HOMEPAGE="http://www.phpunit.de/"
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.1.2.ebuild
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.1.2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.1.2.ebuild,v 1.3 2012/08/21 12:42:30 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.1.2.ebuild,v 1.4 2013/06/23 13:49:56 jer Exp $

 EAPI=4

@ -15,7 +15,7 @@ SRC_URI="http://pear.phpunit.de/get/PHP_CodeCoverage-1.1.2.tgz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""

 DEPEND=">=dev-php/pear-1.9.4
--- a/dev-php/PHP_Timer/PHP_Timer-1.0.2.ebuild
+++ b/dev-php/PHP_Timer/PHP_Timer-1.0.2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PHP_Timer/PHP_Timer-1.0.2.ebuild,v 1.1 2012/03/10 14:52:23 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PHP_Timer/PHP_Timer-1.0.2.ebuild,v 1.2 2013/06/23 13:50:24 jer Exp $

 PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
 PHP_PEAR_URI="pear.phpunit.de"
@ -11,6 +11,6 @@ inherit php-pear-lib-r1
 DESCRIPTION="Utility class for timing"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
 HOMEPAGE="http://pear.phpunit.de/"
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild,v 1.4 2012/08/21 12:40:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild,v 1.5 2013/06/23 13:47:44 jer Exp $

 EAPI=4

@ -15,7 +15,7 @@ SRC_URI="http://pear.phpunit.de/get/PHP_TokenStream-1.1.3.tgz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""

 DEPEND="dev-lang/php[tokenizer]
--- a/dev-php/Text_Template/Text_Template-1.1.1.ebuild
+++ b/dev-php/Text_Template/Text_Template-1.1.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/Text_Template/Text_Template-1.1.1.ebuild,v 1.4 2013/01/19 16:32:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/Text_Template/Text_Template-1.1.1.ebuild,v 1.5 2013/06/23 13:48:46 jer Exp $

 EAPI="4"

@ -15,7 +15,7 @@ HOMEPAGE="http://pear.phpunit.de"
 DESCRIPTION="Simple template engine"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""

 DEPEND=">=dev-php/pear-1.9.4"
--- a/dev-php/YAML/YAML-1.0.6.ebuild
+++ b/dev-php/YAML/YAML-1.0.6.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/YAML/YAML-1.0.6.ebuild,v 1.3 2012/09/17 21:39:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/YAML/YAML-1.0.6.ebuild,v 1.4 2013/06/23 13:52:42 jer Exp $

 EAPI=4

@ -15,7 +15,7 @@ SRC_URI="http://pear.symfony-project.com//get/YAML-1.0.6.tgz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""

 DEPEND=">=dev-lang/php-5.2.4
--- a/dev-python/feedparser/feedparser-5.1.3-r1.ebuild
+++ b/dev-python/feedparser/feedparser-5.1.3-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/feedparser/feedparser-5.1.3-r1.ebuild,v 1.1 2013/02/10 02:10:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/feedparser-5.1.3-r1.ebuild,v 1.2 2013/06/23 11:02:57 pinkbyte Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_{5,6,7},3_{1,2,3}} pypy{1_9,2_0} )
@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
 # sgmllib is licensed under PSF-2.
 LICENSE="BSD-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
--- a/dev-python/hgtools/Manifest
+++ b/dev-python/hgtools/Manifest
@ -1 +1,2 @@
 DIST hgtools-2.0.2.zip 30635 SHA256 bfa82ccfea56b178c9f28cb719cb97853710880b207e0a32801ba1077757da07 SHA512 5173ff7e0e42657058731cdb3cf9c2fe7cbd378d026321be62e937c57da637fb79bbdc6b2c91df06f1c93854c253f77621c0a5b91a7df451d68ea72da6f25266 WHIRLPOOL 5f33ab464b72165948e8e568f3b3e2f5b364b14bc65ff9311906d0aafced74505d974f28af1241b963b6772cf770f544c77df2e6665376da86a41f83db9b349b
+DIST hgtools-3.0.2.zip 39191 SHA256 c07d775c12653767a6677cb81eea40952f1795b1da9dba4d3e42ffe7f6df8657 SHA512 0160c6ac2361371359d96012dbdd191d99f9f9b3161ac97308c0479a810847c2c233f6598ee50f94538e34ddeb418f70830f58280a1a3526b59e6a36dc163587 WHIRLPOOL 127efcd18069932dcc4e5a0676adf5c1e0ffb60aaca41be31190ec1a031075cd4abf3a35e52b9e22abd34b7625a89651ec810249e222334d8a7d34ca18c4dab7
--- a/dev-python/hgtools/hgtools-3.0.2.ebuild
+++ b/dev-python/hgtools/hgtools-3.0.2.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgtools/hgtools-3.0.2.ebuild,v 1.1 2013/06/23 12:11:50 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Classes and setuptools plugin for Mercurial repositories"
+HOMEPAGE="https://bitbucket.org/jaraco/hgtools/"
+SRC_URI="mirror://pypi/h/${PN}/${P}.zip"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="dev-vcs/mercurial"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	# new py3 test failures https://bitbucket.org/jaraco/hgtools/issue/14/test_reentrypy-py3-5-failures-from-8-tests
+	pushd "${BUILD_DIR}"/../ > /dev/null
+	py.test "${PN}"/tests || die
+}
--- a/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild,v 1.1 2013/04/29 08:34:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpickle/jsonpickle-0.4.0-r1.ebuild,v 1.3 2013/06/23 11:27:30 pinkbyte Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="test"

 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
--- a/dev-python/paramiko/paramiko-1.10.1.ebuild
+++ b/dev-python/paramiko/paramiko-1.10.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.10.1.ebuild,v 1.1 2013/05/04 03:35:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.10.1.ebuild,v 1.2 2013/06/23 13:39:55 jer Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="doc examples"

 RDEPEND=">=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]"
--- a/dev-python/pycrypto/pycrypto-2.6-r2.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6-r2.ebuild,v 1.10 2013/04/22 17:14:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6-r2.ebuild,v 1.11 2013/06/23 13:39:23 jer Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"

 LICENSE="PSF-2 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp"

 RDEPEND="gmp? ( dev-libs/gmp )"
--- a/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild
+++ b/dev-ruby/ruby-elf/ruby-elf-1.0.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/ruby-elf/ruby-elf-1.0.8.ebuild,v 1.1 2013/02/20 16:13:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-elf/ruby-elf-1.0.8.ebuild,v 1.2 2013/06/23 11:47:42 graaff Exp $

 EAPI=5

@ -58,7 +58,7 @@ all_ruby_compile() {
 }

 each_ruby_test() {
-	ruby-ng_testrb-2 test/test_*.rb
+	ruby-ng_testrb-2 -Ilib test/test_*.rb
 }

 all_ruby_install() {
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@ -1,3 +1,4 @@
 DIST rubygems-1.3.7.tgz 290986 SHA256 388b90ae6273f655507b10c8ba6bee9ea72e7d49c3e610025531cb8c3ba67c9d SHA512 8a0e2b26643cce7645520dbcb57bcb201a643d9c5537d30325dc5c8ddf488467d07708ae38cc18e12362cad0c71cf64de99994e60ed9131c5f6d457ed8ab2145 WHIRLPOOL fdda1de82e00bcea1c3de265f43ccf353bf3580b491dd12276643ff9c676264cb7eed0da9e0c98579f54eb9d39819416b13e431f40227966be4c6a44b0d2d9e6
 DIST rubygems-1.8.24.tgz 380101 SHA256 4b61fa51869b3027bcfe67184b42d2e8c23fa6ab17d47c5c438484b9be2821dd SHA512 f055ecf76f624cba747e2f841eb44b89bd28419b0a44973c6442d22233644fbe6babee7dea89a71f17deefaaa4e4e5e9ebeb6fd3abb58dafb63f313b1c3d60c9 WHIRLPOOL 0374cca1e38e3132d10ef43a47155b9e41b7c91f84f10d73a21f4b88a9811d9e1a7674c23414760c9c725bd75ca79257d57c8591dbe37112e784cd46251e80fd
 DIST rubygems-1.8.25.tgz 380540 SHA256 649348ddf8746887fb1ee79c55dc508f0627d3d0bfa7fcdbcd4edb24908f1cc8 SHA512 8df500dd313b915b7769a6b5b9fd11e3841b23a8dcebdcf0676f70e8ee958306fab269008922c9d903b1d0ddda49b5c0387e431f1d3ef91920c43e666b282615 WHIRLPOOL 639ae8d85c28a267b8eb2e3a6e3a950a79aeb9424b20cc43641bb5d8ff83110b73b801d3b668ba61be030879797e2cc95785e79b8b5667caca15d3d4d35c699d
+DIST rubygems-2.0.3.tgz 334203 SHA256 fcaf558640303d22ee44fa6d966b3b0dd243c4b56df47437414b5172639bcca8 SHA512 24913635956c42796f30027f20d30727e40afc4018a94f585b15143fa64af0399bb877992fb48e77fdbd8aa54cd4cba1f248993fb48ce7330d97196e3ed21a4d WHIRLPOOL 3480ceaafa4f3857251d9afc05d41fa1f34498a0c95596aac659bec9dd57a96db6ec16ac5d36a1372730da253d25c09c553b4164e9e842035d8ff1d8ec76acae
--- a/dev-ruby/rubygems/rubygems-2.0.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.0.3.ebuild
@ -0,0 +1,153 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.3.ebuild,v 1.1 2013/06/23 09:50:05 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19 jruby"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="http://rubyforge.org/projects/rubygems/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="http://production.cf.rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+
+RDEPEND="
+	ruby_targets_jruby? ( >=dev-java/jruby-1.5.6-r1 )
+	ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.3_rc1 )"
+
+# index_gem_repository.rb
+PDEPEND="server? ( dev-ruby/builder[ruby_targets_ruby18] )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest
+		virtual/ruby-rdoc
+	)"
+
+all_ruby_prepare() {
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/^  def test_self_bindir_default_dir/, /^  end/ s:^:#:' \
+		-e '/^  def test_self_default_dir/, /^  end/ s:^:#:' \
+		test/rubygems/test_gem.rb || die
+	sed -i -e '/test_check_executable_overwrite_default_bin_dir/,/^  end/ s:^:#:' test/rubygems/test_gem_installer.rb || die
+
+	# Remove tests that want to write to /usr/local/bin
+	rm test/rubygems/test_gem_uninstaller.rb test/rubygems/test_gem_install_update_options.rb || die
+
+	# Remove a test that fails when yard is installed.
+	sed -i -e '/test_self_attribute_names/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+
+	# Remove tests that try to load from an unsafe path
+	rm test/rubygems/test_gem.rb || die
+
+	# Remove tests that seem to have trouble loading from the /tmp test
+	# path. This should be narrowed down more...
+	rm test/rubygems/test_gem_commands_{cleanup_command,contents_command,pristine_command}.rb test/rubygems/test_gem_specification.rb || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby18)
+			# Remove test failing on ruby18. According to travis.yml
+			# upstream no longer cares.
+			sed -i -e '/test_install_location_extra_slash/,/^  end/ s:^:#:' test/rubygems/test_gem_package.rb || die
+			;;
+		*jruby)
+			sed -i -e '/test_install_location_extra_slash/,/^  end/ s:^:#:' test			# Remove failing tests. Before we did not run any tests at
+			# all so this is actually an improvement. Should be
+			rm test/rubygems/test_gem_security{,_policy}.rb test/rubygems/test_gem_{remote_fetcher,package_tar_reader_entry,package,installer,ext_ext_conf_builder}.rb || die
+			# investigated further.
+	esac
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		case ${RUBY} in
+			*xjruby)
+				eqawarn "Skipping tests for jruby 1.5."
+				;;
+			*)
+				RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
+				-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+				;;
+		esac
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	case "${RUBY}" in
+		*ruby19)
+			local sld=$(ruby_rbconfig_value 'sitelibdir')
+			insinto "${sld#${EPREFIX}}"  # bug #320813
+			newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
+			;;
+		*)
+			doruby "${FILESDIR}/auto_gem.rb" || die
+			;;
+	esac
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
+}
+
+all_ruby_install() {
+	dodoc History.txt README.rdoc
+
+	doenvd "${FILESDIR}/10rubygems"
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(18|19|...)"
+	ewarn
+}
+
+pkg_postrm() {
+	ewarn "If you have uninstalled dev-ruby/rubygems, Ruby applications are unlikely"
+	ewarn "to run in current shells because of missing auto_gem."
+	ewarn "Please run \"unset RUBYOPT\" in your shells before using ruby"
+	ewarn "or start new shells"
+	ewarn
+	ewarn "If you have not uninstalled dev-ruby/rubygems, please do not unset "
+	ewarn "RUBYOPT"
+}
--- a/dev-util/bluej/Manifest
+++ b/dev-util/bluej/Manifest
@ -1,5 +1,6 @@
 DIST BlueJ-source-308.zip 8458049 SHA256 907e75257a9567b50ab113341a7666b5eb1a7ef3bb79a63eb06f33f41c9f3026 SHA512 ccd58d70034d18283264fe27232af54ec940ef54f7d9aa9307268ba9bd948900d5033fffec0060781ff89089278be24319011a418966ed87a8c09a54b23ba576 WHIRLPOOL e67394328c026cada8d600ade488bcfeeae93e71b2f6b9a758705a51fa4d69ab83d2a1af1123daca83cdb639de6e9474a9e4ae5ed676407e850f4d94fff53454
 DIST BlueJ-source-309.zip 8524035 SHA256 2167b8e698b0de35f7e0b1b6b4348ff45c5742b363ac986711603443f4db4db6 SHA512 30254b2128776ccffba8f379e4413d667b29ca737baad99ea84ed8929bdb2d0a4abbb78bd7f14ad3a38a1ce04dcd9f8ffbac8efd7665bb07de96b8d3c1d9aa67 WHIRLPOOL 0ad5100e85fbabba4e3d0c359581a73211248a5ee5a9173f7cee95ef149be10d97afb5aaf6f4bc484600e26c47d6ab95f791c647cbd20e5cce699864d6065079
+DIST BlueJ-source-310.zip 9216439 SHA256 cc8151aae1998e2b33be8815ea48f0b76061610255bab5f9ddb266d047566af6 SHA512 9e40b54237e54690cb4582b741e563c3018303a757299f3dea1cbd8e67ff60d5819564db9853a78d9ecb6a197492f48a06669d6575cf9a0738289a6d41533e7f WHIRLPOOL 35a7551ab54dda2be0ef8631ec5b69a0d7dca4ce95ebaaf26940bdcab169d4705b233afcea66a574c2c0a39b48409a363ee2e41d5ab93474ed4730693df1e698
 DIST bluej-ref-manual.pdf 768751 SHA256 a6c514fcc79ffa1450c6313bae8b92ebe6c6939580cdf1a38e885a4cf71cffc3 SHA512 7f7e8cc2eab6402722eb8f94c878b506f595eee280cdfa85497d926cb06aa229defb0c8fbe5353dbbf6587e36a99ad5dae0a50fca21c1c80c88a92647d9b5319 WHIRLPOOL 476cc9058ecb4f79d9e4f3ccbec3a299f0f3deb357245bac0ab64e3bf0ce4e49f8aedfd5cbfe389b31c6d99e21491b6a002383bfa284eb0b9b4282545dbad6fe
 DIST bluej-testing-tutorial.pdf 269284 SHA256 07605ab6dd9743b6c971aaa932a3e8218057034af08d24ac90a09a74a5eb5599 SHA512 015da66cbf4940ca4bcab535023608a8497e7c6df1e06988393f8f0c7300a4521025474bf828e7889ff717e988968a2e973330758bf6dd570c057a837c78a9b5 WHIRLPOOL 472cbda358804a809ef61b8d1be947cba637e56068f3b0365f6ce808c0d076208b4b4430dfd6bb81eca987de407556e9bf83e019057f95320681a69ef2abe9b9
 DIST bluej-tutorial-2.0.1.pdf 1205655 SHA256 a6587a178ac7c071696884d9318aa33ade543898c5722caf61308acd77092db2 SHA512 410acbb75091d14b5ee7f5d56c01441a9611ed1f8b583c0301e1badf3d01bd2bb284da77d422c38ace283e7fe066b7975c772859697d25d6e9b334053d2f4833 WHIRLPOOL 27b1f934e2d08c261d32f385aa65ee826add4cb056257c6ab5e8c2e2b54a9f0fc884882bc4f611a1d87fe423706b8c4578b7c40060cceb46571924ee5d64b30d
--- a/dev-util/bluej/bluej-3.1.0.ebuild
+++ b/dev-util/bluej/bluej-3.1.0.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bluej/bluej-3.1.0.ebuild,v 1.1 2013/06/23 13:02:40 hasufell Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+EANT_BUILD_TARGET="ready-to-run"
+EANT_DOC_TARGET="doc-core"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DOC_PV="2.0.1"
+
+DESCRIPTION="An integrated Java environment for introductory teaching"
+HOMEPAGE="http://bluej.org/"
+SRC_URI="http://www.bluej.org/download/files/source/BlueJ-source-${PV//./}.zip
+doc? ( http://bluej.org/download/files/${PN}-ref-manual.pdf
+		http://bluej.org/tutorial/tutorial-${DOC_PV//.}.pdf -> ${PN}-tutorial-${DOC_PV}.pdf
+		http://bluej.org/tutorial/testing-tutorial.pdf -> ${PN}-testing-tutorial.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jdk-1.5.0"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+java_prepare() {
+	sed -i \
+		-e "s:^build_java_home=.*$:build_java_home=$(java-config -O):" \
+		-e "/^bluej_home/d" \
+		build.properties || die
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r lib icons
+
+	# fix config location and set symlink
+	dodir /etc
+	mv "${D}"/{usr/share/${PN}/lib,etc}/${PN}.defs
+	dosym /{etc,usr/share/${PN}/lib}/${PN}.defs
+
+	use source && java-pkg_dosrc src/${PN}/*
+
+	insinto /usr/share/doc/${PF}
+	use examples && { doins -r examples
+		docompress -x /usr/share/doc/${P}/examples ; }
+	use doc && { doins "${DISTDIR}"/${PN}-*.pdf
+		dohtml -r doc/all/* ; }
+
+	newbin "${FILESDIR}"/${PN}.wrapper ${PN}
+
+	make_desktop_entry ${PN} Blue-J
+}
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@ -1 +1,2 @@
 DIST plan9port-20130320.tgz 54184719 SHA256 d08fd032edc9c27bc549ee9076963812f210476d0d1f21f5300e9d867699ff55 SHA512 fae40eae76a0f3121f47a3895809f2433beed91fc9e879c8cde25e493ec91dfdfc89fe59e3fe3a8aab7c33a2537a02b30857edb3af7f202df4a98e02cee8ecb7 WHIRLPOOL 5b707c8d18c8f1fa8e3d36e8f14a20213cad9ab3344f088f18942034dce3356ba88675c5817a7d50b66275d71d95e6d5fd3fdefbd18bcca9089790e258dbb60f
+DIST plan9port-20130622.tgz 54184877 SHA256 d7da395c5f7909854fe20398f51bab4c369f77b676dac2739f27d9a4a72ecfcf SHA512 48010176421ef004376958d044b988db44d34aa56724585b7d4c77fce3ac79e20b211efc993cb832bdea2e9af8dff6f5a216546a65b6fa2e411a5de8e1e2ff41 WHIRLPOOL e6a750099b3b8074a71c850f43666f0c8adc5e331074408376b0f6c1afad113ffba59616753fc1c15d73a25504a5c222ef147fcb91abb3bb0028fef3818ef8e7
--- a/dev-util/plan9port/plan9port-20130622.ebuild
+++ b/dev-util/plan9port/plan9port-20130622.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20130622.ebuild,v 1.1 2013/06/23 11:13:37 blueness Exp $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Port of many Plan 9 programs and libraries"
+HOMEPAGE="http://swtch.com/plan9port/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
+
+LICENSE="9base BSD-4 MIT LGPL-2.1 BigelowHolmes"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="X? ( x11-apps/xauth )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PLAN9=/usr/lib/plan9
+
+src_prepare()
+{
+	epatch "${FILESDIR}/${PN}-"{9660srv-errno,noexecstack,cflags,builderr}".patch"
+
+	# Fix paths, done in place of ./INSTALL -c
+	einfo "Fixing hard-coded /usr/local/plan9 paths"
+	grep  --null -l -r '/usr/local/plan9' |
+	xargs --null sed -i "s!/usr/local/plan9!${PLAN9}!g"
+}
+
+src_configure() {
+	if ! use X; then
+		echo "WSYSTYPE=nowsys" >> LOCAL.config
+	fi
+}
+
+src_compile() {
+	# Convert -j5 to NPROC=5 for mk
+	export NPROC="$(echo "$MAKEOPTS" | sed -r -n 's/.*(^| )-j([0-9]*).*/\2/p')"
+
+	# The INSTALL script builds mk then [re]builds everything using that
+	einfo "Compiling Plan 9 from User Space can take a very long time"
+	einfo "depending on the speed of your computer. Please be patient!"
+	./INSTALL -b
+}
+
+src_install() {
+	dodir "${PLAN9}"
+
+	# P9P's man does not handle compression
+	docompress -x $PLAN9/man
+
+	# do* plays with the executable bit, and we should not modify them
+	cp -a * "${D}/${PLAN9}"
+
+	# build the environment variables and install them in env.d
+	cat > "${T}/30plan9" <<-EOF
+		PLAN9="${PLAN9}"
+		PATH="${PLAN9}/bin"
+		ROOTPATH="${PLAN9}/bin"
+		MANPATH="${PLAN9}/man"
+	EOF
+	doenvd "${T}/30plan9"
+}
+
+pkg_postinst() {
+	elog "Plan 9 from User Space has been successfully installed into"
+	elog "${PLAN9}. Your PLAN9 and PATH environment variables have"
+	elog "also been appropriately set, please use env-update and"
+	elog "source /etc/profile to bring that into immediate effect."
+	elog
+	elog "Please note that ${PLAN9}/bin has been appended to the"
+	elog "*end* or your PATH to prevent conflicts. To use the Plan9"
+	elog "versions of common UNIX tools, use the absolute path:"
+	elog "${PLAN9}/bin or the 9 command (eg: 9 troff)"
+	elog
+	elog "Please report any bugs to bugs.gentoo.org, NOT Plan9Port."
+}
--- a/kde-misc/kscreen/Manifest
+++ b/kde-misc/kscreen/Manifest
@ -0,0 +1 @@
+DIST kscreen-1.0.tar.bz2 77700 SHA256 40264cc86270247f60118b852fed6cca62671c2b7bc019139422d52f69630634 SHA512 c837282aa97b6c040719efa68662fe3014497b4a0a8251203f4e506b93db71ad55dfe76e8c2ce0fbd184373e610fe6b5301b13436a8b84b1e1bfbc14d0848d69 WHIRLPOOL 8aa88af0ed56c90a72bdf61cc8c1dad83f3da5363d4d51300b471b21d3ba8e82443e4b06e56f419e4d99c9b2f3d4fcf4f1950ebb3e2888d50e786d5d452e47bd
--- a/kde-misc/kscreen/kscreen-1.0.ebuild
+++ b/kde-misc/kscreen/kscreen-1.0.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kscreen/kscreen-1.0.ebuild,v 1.1 2013/06/23 11:59:35 johu Exp $
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+DECLARATIVE_REQUIRED="always"
+KDE_LINGUAS="bs cs da de el es et fi fr ga gl lt mr nl pt pt_BR ro ru sk sv tr
+uk zh_CN"
+inherit kde4-base
+
+DESCRIPTION="Alternative KDE screen management"
+HOMEPAGE="https://projects.kde.org/projects/playground/base/kscreen"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=x11-libs/libkscreen-${PV}
+	>=dev-libs/qjson-0.8
+"
+RDEPEND="${DEPEND}"
+
+DISTPLAY_MESSAGE=false
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		DISPLAY_MESSAGE=true
+	fi
+
+	kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+	if [[ "${DISPLAY_MESSAGE}" = true ]]; then
+		echo
+		elog "Disable the old screen management:"
+		elog "# qdbus org.kde.kded /kded org.kde.kded.unloadModule randrmonitor"
+		elog "# qdbus org.kde.kded /kded org.kde.kded.setModuleAutoloading randrmonitor false"
+		elog
+		elog "Enable the kded module for the kscreen based screen management:"
+		elog "# qdbus org.kde.kded /kded org.kde.kded.loadModule kscreen"
+		elog
+		elog "Now simply (un-)plugging displays should enable/disable them, while"
+		elog "the last state is remembered."
+		echo
+	fi
+
+	unset DISPLAY_MESSAGE
+
+	kde4-base_pkg_postinst
+}
--- a/kde-misc/kscreen/metadata.xml
+++ b/kde-misc/kscreen/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</pkgmetadata>
--- a/media-libs/libwmf/libwmf-0.2.8.4-r5.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r5.ebuild,v 1.1 2013/05/04 12:26:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r5.ebuild,v 1.2 2013/06/23 13:44:26 jer Exp $

 EAPI=5

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

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="X debug doc expat xml"

 RDEPEND="
--- a/media-sound/musique/metadata.xml
+++ b/media-sound/musique/metadata.xml
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-		<description>Proxy maintainer. CC him on bugs</description>
-	</maintainer>
+<herd>qt</herd>
 </pkgmetadata>
--- a/media-video/libav/libav-9.7.ebuild
+++ b/media-video/libav/libav-9.7.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.7.ebuild,v 1.1 2013/06/17 07:35:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.7.ebuild,v 1.2 2013/06/23 09:09:45 scarabeus Exp $

 EAPI=5

@ -228,17 +228,6 @@ src_configure() {
 	# Option to force building pic
 	use pic && myconf+=" --enable-pic"

-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[[ "${i}" == "native" ]] && i="host" # bug #273421
-		myconf+=" --cpu=${i}"
-		break
-	done
-
 	# cross compile support
 	if tc-is-cross-compiler ; then
 		myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
--- a/media-video/libav/libav-9.9999.ebuild
+++ b/media-video/libav/libav-9.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.6 2013/06/13 12:40:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.7 2013/06/23 09:09:45 scarabeus Exp $

 EAPI=5

@ -228,17 +228,6 @@ src_configure() {
 	# Option to force building pic
 	use pic && myconf+=" --enable-pic"

-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[[ "${i}" == "native" ]] && i="host" # bug #273421
-		myconf+=" --cpu=${i}"
-		break
-	done
-
 	# cross compile support
 	if tc-is-cross-compiler ; then
 		myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.59 2013/06/13 12:40:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.60 2013/06/23 09:09:45 scarabeus Exp $

 EAPI=5

@ -227,17 +227,6 @@ src_configure() {
 	# Option to force building pic
 	use pic && myconf+=" --enable-pic"

-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since configure
-	# will just ignore it.
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[[ "${i}" == "native" ]] && i="host" # bug #273421
-		myconf+=" --cpu=${i}"
-		break
-	done
-
 	# cross compile support
 	if tc-is-cross-compiler ; then
 		myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Sun, 23 Jun 2013 09:06:55 +0000
+Sun, 23 Jun 2013 14:06:57 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Sun, 23 Jun 2013 09:06:55 +0000
+Sun, 23 Jun 2013 14:06:57 +0000
--- a/metadata/md5-cache/app-editors/nedit-5.5_p20110116-r2
+++ b/metadata/md5-cache/app-editors/nedit-5.5_p20110116-r2
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare
-DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm || ( dev-util/yacc sys-devel/bison ) dev-lang/perl
+DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXt x11-libs/libX11 || ( dev-util/yacc sys-devel/bison ) dev-lang/perl
 DESCRIPTION=Multi-purpose text editor for the X Window System
-EAPI=2
+EAPI=5
 HOMEPAGE=http://nedit.org/
 KEYWORDS=~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm
+RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXp x11-libs/libXpm x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=mirror://gentoo/nedit-5.5_p20110116.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8f2d91d2e25707a219c4446c6304a0b9
+_md5_=2aad64f2e128779d5c7d29066a2e6ba8
--- a/metadata/md5-cache/app-emulation/vmware-modules-264.4
+++ b/metadata/md5-cache/app-emulation/vmware-modules-264.4
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=|| ( =app-emulation/vmware-player-4.0.4* =app-emulation/vmware-workstation-8.0.4* ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
-DESCRIPTION=VMware kernel modules
-EAPI=4
-HOMEPAGE=http://www.vmware.com/
-IUSE=pax_kernel kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=kernel_linux? ( virtual/modutils )
-SLOT=0
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b9c3722ab45981d01ecae274cc91d05a
--- a/metadata/md5-cache/app-emulation/vmware-modules-264.5
+++ b/metadata/md5-cache/app-emulation/vmware-modules-264.5
@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=02cf901fe656ad17fabb6449ed12a487
+_md5_=9d12779d221b7694ce997bf0b4ae64c1
--- a/metadata/md5-cache/app-emulation/vmware-player-4.0.4.744019-r1
+++ b/metadata/md5-cache/app-emulation/vmware-player-4.0.4.744019-r1
@ -1,15 +0,0 @@
-DEFINED_PHASES=config install postinst postrm preinst prepare prerm unpack
-DEPEND=>=sys-apps/sed-4 dev-libs/libxslt
-DESCRIPTION=Emulate a complete PC on your PC without the usual performance overhead of most emulators
-EAPI=4
-HOMEPAGE=http://www.vmware.com/products/player/
-IUSE=cups doc +vmware-tools
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=vmware GPL-2
-PDEPEND=~app-emulation/vmware-modules-264.4 vmware-tools? ( app-emulation/vmware-tools )
-RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-cpp/libsexymm dev-cpp/pangomm:1.4 dev-libs/atk dev-libs/glib:2 dev-libs/libaio dev-libs/libsigc++ dev-libs/libxml2 =dev-libs/openssl-0.9.8* dev-libs/xmlrpc-c gnome-base/libgnomecanvas gnome-base/libgtop:2 gnome-base/librsvg:2 gnome-base/orbit media-libs/fontconfig media-libs/freetype media-libs/libart_lgpl =media-libs/libpng-1.2* net-misc/curl cups? ( net-print/cups ) sys-devel/gcc sys-fs/fuse sys-libs/glibc sys-libs/zlib x11-libs/cairo x11-libs/gtk+:2 x11-libs/libgksu x11-libs/libICE x11-libs/libsexy x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/startup-notification !app-emulation/vmware-workstation
-RESTRICT=strip
-SLOT=0
-SRC_URI=x86? ( https://softwareupdate.vmware.com/cds/vmw-desktop/player/4.0.4/744019/linux/core/VMware-Player-4.0.4-744019.i386.bundle.tar ) amd64? ( https://softwareupdate.vmware.com/cds/vmw-desktop/player/4.0.4/744019/linux/core/VMware-Player-4.0.4-744019.x86_64.bundle.tar )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vmware-bundle	23c070352c2722510704dae8063293e0
-_md5_=4a5184a14492c2303a74c44cf7502d44
--- a/metadata/md5-cache/app-emulation/vmware-workstation-8.0.4.744019-r1
+++ b/metadata/md5-cache/app-emulation/vmware-workstation-8.0.4.744019-r1
@ -1,15 +0,0 @@
-DEFINED_PHASES=config install postinst postrm preinst prepare prerm unpack
-DEPEND=>=sys-apps/sed-4 dev-libs/libxslt
-DESCRIPTION=Emulate a complete PC on your PC without the usual performance overhead of most emulators
-EAPI=4
-HOMEPAGE=http://www.vmware.com/products/workstation/
-IUSE=cups doc ovftool server vix vmware-tools
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=vmware GPL-2
-PDEPEND=~app-emulation/vmware-modules-264.4 vmware-tools? ( app-emulation/vmware-tools )
-RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm dev-cpp/libsexymm dev-cpp/pangomm dev-libs/atk dev-libs/glib:2 dev-libs/icu dev-libs/expat dev-libs/libaio dev-libs/libsigc++ dev-libs/libxml2 =dev-libs/openssl-0.9.8* dev-libs/xmlrpc-c gnome-base/libgnomecanvas gnome-base/libgtop:2 gnome-base/librsvg:2 gnome-base/orbit media-libs/fontconfig media-libs/freetype media-libs/libart_lgpl =media-libs/libpng-1.2* media-libs/libpng net-misc/curl cups? ( net-print/cups ) sys-devel/gcc sys-fs/fuse sys-libs/glibc sys-libs/zlib x11-libs/cairo x11-libs/gtk+:2 x11-libs/libgksu x11-libs/libICE x11-libs/libsexy x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/startup-notification x11-themes/hicolor-icon-theme !app-emulation/vmware-player
-RESTRICT=mirror strip
-SLOT=0
-SRC_URI=x86? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/8.0.4/744019/linux/core/VMware-Workstation-8.0.4-744019.i386.bundle.tar ) amd64? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/8.0.4/744019/linux/core/VMware-Workstation-8.0.4-744019.x86_64.bundle.tar )
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	892e597faee02a5b94eb02ab512e7622	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vmware-bundle	23c070352c2722510704dae8063293e0
-_md5_=fa78473f20af06641ea8a9662327b622
--- a/metadata/md5-cache/app-office/libreoffice-4.0.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-4.0.4.2
@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=~app-office/libreoffice-l10n-4.0.4.2
 RDEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.3.1:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= =dev-libs/liborcus-0.3* >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
-REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.7.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-4.0.4.2.tar.xz http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-4.0.4.2.tar.xz http://download.documentfoundation.org/libreoffice/src/4.0.4//libreoffice-4.0.4.2.tar.xz http://download.documentfoundation.org/libreoffice/src/4.0.4//libreoffice-help-4.0.4.2.tar.xz http://download.documentfoundation.org/libreoffice/old/4.0.4.2//libreoffice-4.0.4.2.tar.xz http://download.documentfoundation.org/libreoffice/old/4.0.4.2//libreoffice-help-4.0.4.2.tar.xz http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	5deec68e4713fd23ce30d4d9ed712908	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=17e7c237c8c2dd202bcec645a3315252
+_md5_=bb1a9a74dc394d2bc7be66cfac08ec9e
--- a/metadata/md5-cache/app-office/libreoffice-4.0.9999
+++ b/metadata/md5-cache/app-office/libreoffice-4.0.9999
@ -7,8 +7,8 @@ IUSE=bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk jemalloc kde
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
 RDEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.3.1:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= =dev-libs/liborcus-0.3* >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
-REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.7.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	5deec68e4713fd23ce30d4d9ed712908	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e2a5e1d19d224fcbce094e5d56b21f65
+_md5_=d3fbc1df34bf2328be87feaae11efb69
--- a/metadata/md5-cache/app-office/libreoffice-4.1.9999
+++ b/metadata/md5-cache/app-office/libreoffice-4.1.9999
@ -7,8 +7,8 @@ IUSE=bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk gtk3 jemalloc
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
 RDEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub >=app-text/libmwaw-0.1.7 app-text/libodfgen app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.3.1:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/liborcus-0.5.1:= >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/harfbuzz-0.9.10:= media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
-REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.7.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	5deec68e4713fd23ce30d4d9ed712908	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3759e9168ea5807a0d4651f2b1123aed
+_md5_=7a32929cc04f39becd7f6759ce87b2b3
--- a/metadata/md5-cache/app-office/libreoffice-9999-r2
+++ b/metadata/md5-cache/app-office/libreoffice-9999-r2
@ -7,8 +7,8 @@ IUSE=bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk gtk3 jemalloc
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
 RDEPEND=python_single_target_python2_7? ( dev-lang/python:2.7[threads,xml] ) python_single_target_python3_3? ( dev-lang/python:3.3[threads,xml] ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_3(+)?] app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/liblangtag app-text/libmspub >=app-text/libmwaw-0.1.7 app-text/libodfgen app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=app-text/poppler-0.16:=[xpdf-headers(+),cxx] >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.3.1:0.3 dev-db/unixODBC dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= >=dev-libs/liborcus-0.5.1:= >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/harfbuzz-0.9.10:= media-libs/lcms:2 >=media-libs/libpng-1.4 >=media-libs/libcdr-0.0.5 media-libs/libvisio >=net-misc/curl-7.21.4 net-nds/openldap sci-mathematics/lpsolve virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) cups? ( net-print/cups ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/tomcat-servlet-api:3.0 ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/glu virtual/opengl ) postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) telepathy? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.18.0 >=x11-libs/gtk+-2.24:2 ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !<app-office/openoffice-bin-3.4.0-r1 !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=dev-qt/qt3support-4.7.4:4[accessibility] >=dev-qt/qtcore-4.7.4:4[qt3support,ssl] >=dev-qt/qtdbus-4.7.4:4 >=dev-qt/qtgui-4.7.4:4[accessibility,dbus] >=dev-qt/qtscript-4.7.4:4 >=dev-qt/qtsql-4.7.4:4[qt3support] >=dev-qt/qtsvg-4.7.4:4 >=dev-qt/qttest-4.7.4:4 >=dev-qt/qtwebkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
-REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+REQUIRED_USE=bluetooth? ( dbus ) gnome? ( gtk ) eds? ( gnome ) telepathy? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 SLOT=0
 SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.7.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	bash-completion-r1	5deec68e4713fd23ce30d4d9ed712908	check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	gnome2-utils	794d2847b4af390a1e020924876c8297	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	libtool	b1c8688e60f9580bcb9bb46e08737eb1	mozextension	ba6829881080a663d68531424a3dfbc6	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	2424f959506320f5196de8f79fa05297	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=46158a7b0b22b279d52064e0539c18e4
+_md5_=5cca46872929af509fcfb10f98b40854
--- a/metadata/md5-cache/app-text/zathura-cb-9999
+++ b/metadata/md5-cache/app-text/zathura-cb-9999
@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install setup unpack
+DEPEND=>=app-text/zathura-0.2.0[deprecated=] dev-libs/glib:2 app-arch/libarchive:= x11-libs/cairo:= virtual/pkgconfig dev-vcs/git
+DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
+EAPI=5
+HOMEPAGE=http://pwmt.org/projects/zathura/
+IUSE=+deprecated
+LICENSE=ZLIB
+RDEPEND=>=app-text/zathura-0.2.0[deprecated=] dev-libs/glib:2 app-arch/libarchive:= x11-libs/cairo:= app-arch/p7zip app-arch/tar app-arch/unrar app-arch/unzip
+SLOT=0
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a6c154c55cef2916121e61ab3d968dc3
--- a/metadata/md5-cache/app-text/zathura-djvu-9999
+++ b/metadata/md5-cache/app-text/zathura-djvu-9999
@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install setup unpack
+DEPEND=>=app-text/djvu-3.5.24-r1 >=app-text/zathura-0.2.0[deprecated=] dev-libs/glib:2 x11-libs/cairo:= virtual/pkgconfig dev-vcs/git
+DESCRIPTION=DjVu plug-in for zathura
+EAPI=5
+HOMEPAGE=http://pwmt.org/projects/zathura/
+IUSE=+deprecated
+LICENSE=ZLIB
+RDEPEND=>=app-text/djvu-3.5.24-r1 >=app-text/zathura-0.2.0[deprecated=] dev-libs/glib:2 x11-libs/cairo:=
+SLOT=0
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0a1f3e32abdfd5ef8d0c94df001104c6
--- a/metadata/md5-cache/app-text/zathura-meta-9999
+++ b/metadata/md5-cache/app-text/zathura-meta-9999
@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for app-text/zathura plugins
+EAPI=5
+HOMEPAGE=http://pwmt.org/projects/zathura/
+IUSE=cb +deprecated djvu +pdf postscript
+LICENSE=metapackage
+RDEPEND=>=app-text/zathura-9999[deprecated=] cb? ( >=app-text/zathura-cb-9999[deprecated=] ) djvu? ( >=app-text/zathura-djvu-9999[deprecated=] ) pdf? ( || ( >=app-text/zathura-pdf-poppler-9999[deprecated=] >=app-text/zathura-pdf-mupdf-9999[deprecated=] ) ) postscript? ( >=app-text/zathura-ps-9999[deprecated=] )
+SLOT=0
+_md5_=5738197f208f8c79201a9d5b401e7a2c
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999
@ -1,10 +1,11 @@
 DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-9999:= >=app-text/zathura-0.2.0 media-libs/jbig2dec media-libs/openjpeg:2 virtual/jpeg x11-libs/cairo:= virtual/pkgconfig dev-vcs/git
+DEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-9999:= >=app-text/zathura-0.2.0[deprecated=] media-libs/jbig2dec media-libs/openjpeg:2 virtual/jpeg x11-libs/cairo:= virtual/pkgconfig dev-vcs/git
 DESCRIPTION=PDF plug-in for zathura
 EAPI=5
 HOMEPAGE=http://pwmt.org/projects/zathura/
+IUSE=+deprecated
 LICENSE=ZLIB
-RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-9999:= >=app-text/zathura-0.2.0 media-libs/jbig2dec media-libs/openjpeg:2 virtual/jpeg x11-libs/cairo:=
+RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-9999:= >=app-text/zathura-0.2.0[deprecated=] media-libs/jbig2dec media-libs/openjpeg:2 virtual/jpeg x11-libs/cairo:=
 SLOT=0
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=773b484c056bb98668792424eda7aa2f
+_md5_=1b3241ea8b4b9c6ba004a7569d965054
--- a/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
+++ b/metadata/md5-cache/app-text/zathura-pdf-poppler-9999
@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install setup unpack
+DEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.0[deprecated=] x11-libs/cairo:= virtual/pkgconfig dev-vcs/git
+DESCRIPTION=PDF plug-in for zathura
+EAPI=5
+HOMEPAGE=http://pwmt.org/projects/zathura/
+IUSE=+deprecated
+LICENSE=ZLIB
+RDEPEND=app-text/poppler:=[cairo] >=app-text/zathura-0.2.0[deprecated=] x11-libs/cairo:=
+SLOT=0
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ef3b164f30ac028adda41f8a8b0d4348
--- a/metadata/md5-cache/app-text/zathura-ps-9999
+++ b/metadata/md5-cache/app-text/zathura-ps-9999
@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install setup unpack
+DEPEND=>=app-text/libspectre-0.2.6 >=app-text/zathura-0.2.0[deprecated=] dev-libs/glib:2 x11-libs/cairo:= virtual/pkgconfig dev-vcs/git
+DESCRIPTION=PostScript plug-in for zathura
+EAPI=5
+HOMEPAGE=http://pwmt.org/projects/zathura/
+IUSE=+deprecated
+LICENSE=ZLIB
+RDEPEND=>=app-text/libspectre-0.2.6 >=app-text/zathura-0.2.0[deprecated=] dev-libs/glib:2 x11-libs/cairo:=
+SLOT=0
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1cdf43839254983f0d695bf0d01a3ed5
--- a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5
+++ b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5
@ -4,10 +4,10 @@ DESCRIPTION=Userspace access to USB devices (libusb-0.1 compat wrapper)
 EAPI=5
 HOMEPAGE=http://libusb.sourceforge.net/
 IUSE=debug static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libusb:1 !dev-libs/libusb:0
 SLOT=0
 SRC_URI=mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2c936db8b8cb3658a9ff8c3d1c055b6d
+_md5_=7ad914a3c57378cb3b49a5665c85c2aa
--- a/metadata/md5-cache/dev-libs/libzip-0.11
+++ b/metadata/md5-cache/dev-libs/libzip-0.11
@ -4,11 +4,11 @@ DESCRIPTION=Library for manipulating zip archives
 EAPI=5
 HOMEPAGE=http://www.nih.at/libzip/
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=BSD
 RDEPEND=sys-libs/zlib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nih.at/libzip/libzip-0.11.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	40663e8518211ef0f236bd75da8cf0c1	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2841e7f80c68e9e748417ece50f5c91b
+_md5_=d9202738e0bc6c9ab6afb9f7f613a574
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.210.0
+++ b/metadata/md5-cache/dev-perl/Capture-Tiny-0.210.0
@ -4,10 +4,10 @@ DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Capture-Tiny/
 IUSE=test
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/perl[-build]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.21.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	ba21eba2562fc2643deeea95fd28665d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f95942d01e3f889c7ae176a984f6eb9b
+_md5_=2bb0cec744d55992e9278d97b34d659e
--- a/metadata/md5-cache/dev-php/DBUnit-1.0.1
+++ b/metadata/md5-cache/dev-php/DBUnit-1.0.1
@ -3,10 +3,10 @@ DEPEND=dev-lang/php >=dev-php/pear-1.9.0
 DESCRIPTION=DbUnit port for PHP/PHPUnit
 EAPI=3
 HOMEPAGE=http://www.phpunit.de
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 hppa x86
 LICENSE=BSD
 RDEPEND=>=dev-php/File_Iterator-1.2.2 dev-php/PHP_TokenStream dev-php/Text_Template dev-lang/php >=dev-php/pear-1.9.0
 SLOT=0
 SRC_URI=http://pear.phpunit.de/get/DbUnit-1.0.1.tgz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	php-pear-lib-r1	683c04445ce44b20b5df954b5050e387	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=2ea2f7531fff06befd78be5f20af6fc5
+_md5_=b9ac756c6802da367bc3641a883f342c
--- a/metadata/md5-cache/dev-php/File_Iterator-1.3.1
+++ b/metadata/md5-cache/dev-php/File_Iterator-1.3.1
@ -3,10 +3,10 @@ DEPEND=dev-lang/php >=dev-php/pear-1.9.0
 DESCRIPTION=FilterIterator implementation that filters files based on a list of suffixes
 EAPI=4
 HOMEPAGE=http://www.phpunit.de
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 hppa x86
 LICENSE=BSD
 RDEPEND=dev-lang/php >=dev-php/pear-1.9.0
 SLOT=0
 SRC_URI=http://pear.phpunit.de/get/File_Iterator-1.3.1.tgz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	php-pear-lib-r1	683c04445ce44b20b5df954b5050e387	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=53b9bfe5190ac2179fdd3f94b4335509
+_md5_=ae586f5885264867e23bb08d222482a5
--- a/metadata/md5-cache/dev-php/PHPUnit_MockObject-1.1.1
+++ b/metadata/md5-cache/dev-php/PHPUnit_MockObject-1.1.1
@ -3,10 +3,10 @@ DEPEND=>=dev-php/pear-1.9.4 >=dev-php/Text_Template-1.1.1 dev-lang/php >=dev-php
 DESCRIPTION=Mock Object library for PHPUnit
 EAPI=4
 HOMEPAGE=pear.phpunit.de
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 hppa x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.9.4 >=dev-php/Text_Template-1.1.1 dev-lang/php >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=http://pear.phpunit.de/get/PHPUnit_MockObject-1.1.1.tgz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	php-pear-r1	21c0c441f5d64d974c77685b2a05867a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=c0107577ed5e71a6e2fd9a5d051e836d
+_md5_=8c379a5a5eec50338b1bf1f1628486a4
--- a/metadata/md5-cache/dev-php/PHPUnit_Selenium-1.0.1
+++ b/metadata/md5-cache/dev-php/PHPUnit_Selenium-1.0.1
@ -3,10 +3,10 @@ DEPEND=!dev-php4/phpunit >=dev-php/PEAR-PEAR-1.9.1 dev-lang/php >=dev-php/pear-1
 DESCRIPTION=Selenium RC integration for PHPUnit
 EAPI=2
 HOMEPAGE=http://www.phpunit.de/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 hppa x86
 LICENSE=BSD
 RDEPEND=!dev-php4/phpunit >=dev-php/PEAR-PEAR-1.9.1 >=dev-lang/php-5.2[simplexml,xml,tokenizer] || ( <dev-lang/php-5.3[pcre,reflection,spl] >=dev-lang/php-5.3 ) >=dev-php/PEAR-Testing_Selenium-0.2.0 dev-lang/php >=dev-php/pear-1.9.0
 SLOT=0
 SRC_URI=http://pear.phpunit.de/get/PHPUnit_Selenium-1.0.1.tgz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	php-pear-lib-r1	683c04445ce44b20b5df954b5050e387	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=c138f1d4c0a88f5c38ba4df848867017
+_md5_=24706adc070beb995daf31558215f693
--- a/metadata/md5-cache/dev-php/PHP_CodeCoverage-1.1.2
+++ b/metadata/md5-cache/dev-php/PHP_CodeCoverage-1.1.2
@ -3,10 +3,10 @@ DEPEND=>=dev-php/pear-1.9.4 >=dev-php/File_Iterator-1.3.0 >=dev-php/PHP_TokenStr
 DESCRIPTION=Library that provides collection, processing, and rendering functionality for PHP code coverage information.
 EAPI=4
 HOMEPAGE=pear.phpunit.de
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 hppa x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.9.4 >=dev-php/File_Iterator-1.3.0 >=dev-php/PHP_TokenStream-1.1.0 >=dev-php/Text_Template-1.1.1 dev-lang/php >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=http://pear.phpunit.de/get/PHP_CodeCoverage-1.1.2.tgz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	php-pear-r1	21c0c441f5d64d974c77685b2a05867a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=35efbb8cf51c3962f14dfe15204b72c9
+_md5_=0397969d545f106d923525cd27a0bddd
--- a/metadata/md5-cache/dev-php/PHP_Timer-1.0.2
+++ b/metadata/md5-cache/dev-php/PHP_Timer-1.0.2
@ -2,10 +2,10 @@ DEFINED_PHASES=install setup
 DEPEND=dev-lang/php >=dev-php/pear-1.9.0
 DESCRIPTION=Utility class for timing
 HOMEPAGE=http://pear.phpunit.de/
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 hppa x86
 LICENSE=BSD
 RDEPEND=dev-lang/php >=dev-php/pear-1.9.0
 SLOT=0
 SRC_URI=http://pear.phpunit.de/get/PHP_Timer-1.0.2.tgz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	php-pear-lib-r1	683c04445ce44b20b5df954b5050e387	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=5f7ee36f0f47023c1b204d6470bc9e77
+_md5_=db3888d544bb0f6c03426347bafd99e9
--- a/metadata/md5-cache/dev-php/PHP_TokenStream-1.1.3
+++ b/metadata/md5-cache/dev-php/PHP_TokenStream-1.1.3
@ -3,10 +3,10 @@ DEPEND=dev-lang/php[tokenizer] >=dev-php/pear-1.9.4 dev-lang/php >=dev-php/pear-
 DESCRIPTION=Wrapper around PHP's tokenizer extension.
 EAPI=4
 HOMEPAGE=pear.phpunit.de
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 hppa x86
 LICENSE=BSD
 RDEPEND=dev-lang/php[tokenizer] >=dev-php/pear-1.9.4 dev-lang/php >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=http://pear.phpunit.de/get/PHP_TokenStream-1.1.3.tgz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	php-pear-r1	21c0c441f5d64d974c77685b2a05867a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=8641b926976720c5a0d3e87c6c1fca8e
+_md5_=131b01d62017719d400329b97054d72a
--- a/metadata/md5-cache/dev-php/Text_Template-1.1.1
+++ b/metadata/md5-cache/dev-php/Text_Template-1.1.1
@ -3,10 +3,10 @@ DEPEND=>=dev-php/pear-1.9.4 dev-lang/php >=dev-php/pear-1.9.0
 DESCRIPTION=Simple template engine
 EAPI=4
 HOMEPAGE=http://pear.phpunit.de
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 hppa x86
 LICENSE=BSD
 RDEPEND=dev-lang/php >=dev-php/pear-1.9.0
 SLOT=0
 SRC_URI=http://pear.phpunit.de/get/Text_Template-1.1.1.tgz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	php-pear-lib-r1	683c04445ce44b20b5df954b5050e387	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=db0f992a47bb9e4a2fed9ef6791c1c92
+_md5_=aa28243db14af734c3c5cd1911e70f38
--- a/metadata/md5-cache/dev-php/YAML-1.0.6
+++ b/metadata/md5-cache/dev-php/YAML-1.0.6
@ -3,10 +3,10 @@ DEPEND=>=dev-lang/php-5.2.4 >=dev-php/pear-1.4.1 dev-lang/php >=dev-php/pear-1.8
 DESCRIPTION=The Symfony YAML Component.
 EAPI=4
 HOMEPAGE=pear.symfony-project.com
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 hppa x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/php-5.2.4 >=dev-php/pear-1.4.1 dev-lang/php >=dev-php/pear-1.8.1
 SLOT=0
 SRC_URI=http://pear.symfony-project.com//get/YAML-1.0.6.tgz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	php-pear-r1	21c0c441f5d64d974c77685b2a05867a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=21803a0105a43e854a8b21ae2ac363e9
+_md5_=c2af2723117355fc2f84806ca9ca3b38
--- a/metadata/md5-cache/dev-python/feedparser-5.1.3-r1
+++ b/metadata/md5-cache/dev-python/feedparser-5.1.3-r1
@ -4,7 +4,7 @@ DESCRIPTION=Parse RSS and Atom feeds in Python
 EAPI=5
 HOMEPAGE=http://code.google.com/p/feedparser/ http://pypi.python.org/pypi/feedparser
 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD-2 PSF-2
 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(-)]
 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 )
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://feedparser.googlecode.com/files/feedparser-5.1.3.tar.bz2
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=eb8ca70585e0e30d86e5386eac25b9c5
+_md5_=ea64a85bdceced7e621638903633095d
--- a/metadata/md5-cache/dev-python/hgtools-3.0.2
+++ b/metadata/md5-cache/dev-python/hgtools-3.0.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/unzip dev-python/setuptools[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_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(-)] test? ( dev-python/pytest[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_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_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_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_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(-)]
+DESCRIPTION=Classes and setuptools plugin for Mercurial repositories
+EAPI=5
+HOMEPAGE=https://bitbucket.org/jaraco/hgtools/
+IUSE=test 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=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-vcs/mercurial 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_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_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(-)]
+REQUIRED_USE=|| ( 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
+SRC_URI=mirror://pypi/h/hgtools/hgtools-3.0.2.zip
+_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a868c8a15a9274d9e5b623a92107b5f8
--- a/metadata/md5-cache/dev-python/jsonpickle-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/jsonpickle-0.4.0-r1
@ -4,11 +4,11 @@ DESCRIPTION=Python library for serializing any arbitrary object graph into JSON
 EAPI=5
 HOMEPAGE=http://jsonpickle.github.com/ http://pypi.python.org/pypi/jsonpickle
 IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) 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_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-0.4.0.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6611c2599838670b7308593a65b67701
+_md5_=90da4273b63d48f6cd2c08a952e801b3
--- a/metadata/md5-cache/dev-python/paramiko-1.10.1
+++ b/metadata/md5-cache/dev-python/paramiko-1.10.1
@ -4,11 +4,11 @@ DESCRIPTION=SSH2 protocol library
 EAPI=5
 HOMEPAGE=https://github.com/paramiko/paramiko/ http://pypi.python.org/pypi/paramiko
 IUSE=doc examples python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-python/pycrypto-2.1[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(-)] 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 ) 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paramiko/paramiko-1.10.1.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4088f49e010b90dbdd5006fec12a0fbc
+_md5_=ae06f1e3160d7d767292bddf077f53c1
--- a/metadata/md5-cache/dev-python/pycrypto-2.6-r2
+++ b/metadata/md5-cache/dev-python/pycrypto-2.6-r2
@ -4,11 +4,11 @@ DESCRIPTION=Python Cryptography Toolkit
 EAPI=5
 HOMEPAGE=http://www.dlitz.net/software/pycrypto/ http://pypi.python.org/pypi/pycrypto
 IUSE=doc +gmp python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=PSF-2 public-domain
 RDEPEND=gmp? ( dev-libs/gmp ) 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 ) 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_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(-)]
 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 )
 SLOT=0
 SRC_URI=http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3feda7da40fb002d087e3361e62ba4af
+_md5_=fa455fd0a46a195a3b3ad9ecbd2344f4
--- a/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
+++ b/metadata/md5-cache/dev-ruby/ruby-elf-1.0.8
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
 SLOT=0
 SRC_URI=https://github.com/Flameeyes/ruby-elf/archive/1.0.8.tar.gz -> ruby-elf-1.0.8.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=02264b3b24dafea4e16a774318834e7a
+_md5_=30f8061c4a0897f42cb46cd524e2181e
--- a/metadata/md5-cache/dev-ruby/rubygems-2.0.3
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.0.3
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/minitest[ruby_targets_ruby18] virtual/ruby-rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] virtual/ruby-rdoc[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/minitest[ruby_targets_jruby] virtual/ruby-rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby )
+DESCRIPTION=Centralized Ruby extension management system
+EAPI=5
+HOMEPAGE=http://rubyforge.org/projects/rubygems/
+IUSE=server test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby MIT )
+PDEPEND=server? ( dev-ruby/builder[ruby_targets_ruby18] )
+RDEPEND=ruby_targets_jruby? ( >=dev-java/jruby-1.5.6-r1 ) ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.3_rc1 ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+SLOT=0
+SRC_URI=http://production.cf.rubygems.org/rubygems/rubygems-2.0.3.tgz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	prefix	21058c21ca48453d771df15500873ede	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=311b154921eaabb6fe193b84b26e75fc
--- a/metadata/md5-cache/dev-util/bluej-3.1.0
+++ b/metadata/md5-cache/dev-util/bluej-3.1.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.5.0 app-arch/unzip >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=An integrated Java environment for introductory teaching
+EAPI=5
+HOMEPAGE=http://bluej.org/
+IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jdk-1.5.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=http://www.bluej.org/download/files/source/BlueJ-source-310.zip doc? ( http://bluej.org/download/files/bluej-ref-manual.pdf http://bluej.org/tutorial/tutorial-201.pdf -> bluej-tutorial-2.0.1.pdf http://bluej.org/tutorial/testing-tutorial.pdf -> bluej-testing-tutorial.pdf )
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=7228c2aa040f2d8823c0c28df7c24b87
--- a/metadata/md5-cache/dev-util/plan9port-20130622
+++ b/metadata/md5-cache/dev-util/plan9port-20130622
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=X? ( x11-apps/xauth )
+DESCRIPTION=Port of many Plan 9 programs and libraries
+EAPI=4
+HOMEPAGE=http://swtch.com/plan9port/
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=9base BSD-4 MIT LGPL-2.1 BigelowHolmes
+RDEPEND=X? ( x11-apps/xauth )
+SLOT=0
+SRC_URI=http://plan9port.googlecode.com/files/plan9port-20130622.tgz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9fb1aecdd77fac8afb2042757ff83ed5
--- a/metadata/md5-cache/kde-misc/kscreen-1.0
+++ b/metadata/md5-cache/kde-misc/kscreen-1.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=x11-libs/libkscreen-1.0 >=dev-libs/qjson-0.8 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) >=dev-qt/qtdeclarative-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=Alternative KDE screen management
+EAPI=5
+HOMEPAGE=https://projects.kde.org/projects/playground/base/kscreen
+IUSE=debug linguas_bs linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_lt linguas_mr linguas_nl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_CN test aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=x11-libs/libkscreen-1.0 >=dev-libs/qjson-0.8 >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) >=dev-qt/qtdeclarative-4.8.0:4 dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=mirror://kde/stable/kscreen/1.0/src/kscreen-1.0.tar.bz2
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	66012c9c0ee3c91534d0eb257ff9b95c	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=b982fa440caf5c13d55730e725262788
--- a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r5
+++ b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r5
@ -4,11 +4,11 @@ DESCRIPTION=library for converting WMF files
 EAPI=5
 HOMEPAGE=http://wvware.sourceforge.net/
 IUSE=X debug doc expat xml
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl media-fonts/urw-fonts >=media-libs/freetype-2.0.1 >=media-libs/libpng-1.4 sys-libs/zlib x11-libs/gdk-pixbuf:2[X?] virtual/jpeg xml? ( expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 )
 REQUIRED_USE=expat? ( xml )
 SLOT=0
 SRC_URI=mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	40663e8518211ef0f236bd75da8cf0c1	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f80fc1bf444978424f5ab3a35c007447
+_md5_=46e765e27bf67b1f38a5b15a54346da8
--- a/metadata/md5-cache/media-video/libav-9.7
+++ b/metadata/md5-cache/media-video/libav-9.7
@ -11,4 +11,4 @@ REQUIRED_USE=bindist? ( !faac !openssl !fdk ) rtmp? ( network ) amr? ( gpl ) aac
 SLOT=0/9
 SRC_URI=http://libav.org/releases/libav-9.7.tar.xz test? ( http://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=732259d33769d6a27a74ba380b9a7bc1
+_md5_=984d47b5b1551b63d0a37b474d12af63
--- a/metadata/md5-cache/media-video/libav-9.9999
+++ b/metadata/md5-cache/media-video/libav-9.9999
@ -10,4 +10,4 @@ REQUIRED_USE=bindist? ( !faac !openssl !fdk ) rtmp? ( network ) amr? ( gpl ) aac
 SLOT=0/9
 SRC_URI=test? ( http://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=09041cfd9766aba54342030931d66f50
+_md5_=94e13dddd28b3eee9c165a696381a3d0
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST kscreen-1.0.tar.bz2 77700 SHA256 40264cc86270247f60118b852fed6cca62671c2b7bc019139422d52f69630634 SHA512 c837282aa97b6c040719efa68662fe3014497b4a0a8251203f4e506b93db71ad55dfe76e8c2ce0fbd184373e610fe6b5301b13436a8b84b1e1bfbc14d0848d69 WHIRLPOOL 8aa88af0ed56c90a72bdf61cc8c1dad83f3da5363d4d51300b471b21d3ba8e82443e4b06e56f419e4d99c9b2f3d4fcf4f1950ebb3e2888d50e786d5d452e47bd`