Sync with portage [Sun Jun 23 13:40:16 MSK 2013].

11 years ago · f0dd31af45
parent 921e779232
commit f0dd31af45
184 changed files with 2999 additions and 1859 deletions
--- a/app-arch/bzip2/bzip2-1.0.6-r4.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r4.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild,v 1.1 2013/06/23 07:42:43 pacho Exp $
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+#      (since we're building shared libs) ...
+
+EAPI=4
+
+inherit eutils toolchain-funcs flag-o-matic multilib multilib-minimal
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="http://www.bzip.org/"
+SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="static static-libs"
+
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+	epatch "${FILESDIR}"/${PN}-1.0.6-saneso.patch
+	epatch "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+	epatch "${FILESDIR}"/${PN}-1.0.6-progress.patch
+	epatch "${FILESDIR}"/${PN}-1.0.3-no-test.patch
+	epatch "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
+	epatch "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
+
+	# - Use right man path
+	# - Generate symlinks instead of hardlinks
+	# - pass custom variables to control libdir
+	sed -i \
+		-e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+		-e 's:ln -s -f $(PREFIX)/bin/:ln -f -s :' \
+		-e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+		-e 's:ln -s bzip2.1:& -f:g' \
+		Makefile || die
+
+	multilib_copy_sources
+}
+
+bemake() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		"$@"
+}
+
+multilib_src_compile() {
+	bemake -f Makefile-libbz2_so all
+	use static && append-flags -static
+	bemake all
+}
+
+multilib_src_install() {
+	emake PREFIX="${ED}"/usr LIBDIR=$(get_libdir) install
+
+	# Install the shared lib manually.  We install:
+	#  .x.x.x - standard shared lib behavior
+	#  .x.x   - SONAME some distros use #338321
+	#  .x     - SONAME Gentoo uses
+	dolib.so libbz2.so.${PV}
+	local v
+	for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+		dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+	done
+	gen_usr_ldscript -a bz2
+
+	use static || newbin bzip2-shared bzip2
+}
+
+multilib_src_install_all() {
+	dodoc README* CHANGES bzip2.txt manual.*
+
+	# move "important" bzip2 binaries to /bin and use the shared libbz2.so
+	dodir /bin
+	mv "${ED}"/usr/bin/b{zip2,zcat,unzip2} "${ED}"/bin/ || die
+	dosym bzip2 /bin/bzcat
+	dosym bzip2 /bin/bunzip2
+
+	use static-libs || find "${ED}"/usr -name libbz2.a -delete
+}
--- a/app-emulation/open-vm-tools-kmod/Manifest
+++ b/app-emulation/open-vm-tools-kmod/Manifest
@ -1,4 +1,5 @@
 DIST open-vm-tools-2012.10.14-874563.tar.gz 3618001 SHA256 57832997ae206becd1c281dbc1ab361fa33320fb77866126b4ef7f077e66d739 SHA512 ec97e3ef6f6b338994d09d2b25b3ddf7a2aecc5d98818733d2524c65edd0b46ecd1e0107ac33677b4a26bcda30b7fadec1b324e36d1ea4d9fc148824f0a88f31 WHIRLPOOL c31cee1074a04bcfd7bfd5e54c2509028abd1fee76b833c29e171f5c408ac4970a2e1ff85a6ea4be3493dbe25c074fe2882e55a8ea8de0bdba7618e0b625c2cb
 DIST open-vm-tools-2012.12.26-958366.tar.gz 3622541 SHA256 8d63a9c1e36ef968b87125b3c55c8ed5f75ecc9eafe84716eddee687b5b81606 SHA512 748d44951dcdff570faab071a5681ce68f8647df002de3a79853fbf1571835499f2dabc863cc7782b23fd55ad568d479ab10db9ff0bfc7c27cab4999b61f2a89 WHIRLPOOL ce4a51e9a40afea2a2f410e05ff9ca3535611a53d99c05e4d079f9b6df2cef1373113e3ec82bec378441f5f6689f6211c570c0ed4cfffe84534943d875f1bacb
+DIST open-vm-tools-2013.04.16-1098359.tar.gz 3737845 SHA256 fc939de4133d66c0cced8d0a7b5d87edcad3f598393b71c341e66bfec5087960 SHA512 682c25e315e3108617fd4d419f5bba8bf45f4966f13fa60944650390f63af2a7e4fcf740052106693403fcc2ec6f8b126e9911cbba044fc227f0c663e19f68e0 WHIRLPOOL eb13974f1e0a837617fad8c49f45e73570b343071c0619cc8408b5b9812e135cd9eafffc35a761740a58875c3e5583c625300398346d5863a2fa468044f6dd5f
 DIST open-vm-tools-8.8.2-590212.tar.gz 3795261 SHA256 c985c8fe7b292209ec1ac7c2b60749d7a9dd7859d789c332deb6baaf53ba8878 SHA512 5bcf97fe59287d73db43c46895f857ec34da750318150d6878b21ba8df79c76164a688e009585c7a14574f645e1e3ce66c5f9e9bcfc592a79b6f3bbd620dd619 WHIRLPOOL 486b22d74925b4813470ae3f3f5c725f2fec8919a36681cbfb6b47e0fa7452d7ae7b92085e823a96ff22da9f2f59d20267965799d32f609a27864ebce070db56
 DIST open-vm-tools-9.2.2-893683.tar.gz 3561799 SHA256 1ae795e75bf4b38185f39083b8075686d3bab4c1222f4e39c863aeccb2f5f387 SHA512 13490bdff2b8b316b1cd09e06c76293f21b83ede025ded5ddc71251e4f64279296f7dd0f248335f7e3d0714759be13f07263f154683878870a062c9ba55644fc WHIRLPOOL 16cbb0977a14a5f0f1efa1194dc1255d343767f7c55d3e97e03172c30117b24018634e870db7ad0d5010f5dd87d4664aa054d24e70e816b54cb1ca6148abb872
--- a/app-emulation/open-vm-tools-kmod/files/putname.patch
+++ b/app-emulation/open-vm-tools-kmod/files/putname.patch
@ -0,0 +1,13 @@
+diff --git a/modules/linux/vmblock/linux/control.c b/modules/linux/vmblock/linux/control.c
+index 79716bd..2dd83fe 100644
+--- a/modules/linux/vmblock/linux/control.c
+++ b/modules/linux/vmblock/linux/control.c
+@@ -293,7 +293,7 @@ ExecuteBlockOp(const char __user *buf,                // IN: buffer with name
+ 
+    retval = i < 0 ? -EINVAL : blockOp(name, blocker);
+ 
+-   putname(name);
+   __putname(name);
+ 
+    return retval;
+ }
--- a/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild
+++ b/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild
@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/open-vm-tools-kmod-2013.04.16.1098359.ebuild,v 1.1 2013/06/22 23:27:33 phajdan.jr Exp $
+
+EAPI="4"
+
+inherit eutils linux-info linux-mod versionator
+
+MY_PN="${PN/-kmod}"
+MY_PV="$(replace_version_separator 3 '-')"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Opensourced tools for VMware guests"
+HOMEPAGE="http://open-vm-tools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	virtual/linux-sources
+	"
+
+CONFIG_CHECK="
+	~DRM_VMWGFX
+	~VMWARE_BALLOON
+	~VMWARE_PVSCSI
+	~VMXNET3
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	VMWARE_MOD_DIR="modules/linux"
+	VMWARE_MODULE_LIST="vmblock vmci vmhgfs vmsync vmxnet vsock"
+
+	MODULE_NAMES=""
+	BUILD_TARGETS="auto-build HEADER_DIR=${KERNEL_DIR}/include BUILD_DIR=${KV_OUT_DIR} OVT_SOURCE_DIR=${S}"
+
+	for mod in ${VMWARE_MODULE_LIST};
+	do
+		if [ "${mod}" == "vmxnet" ];
+		then
+			MODTARGET="net"
+		else
+			MODTARGET="openvmtools"
+		fi
+		MODULE_NAMES="${MODULE_NAMES} ${mod}(${MODTARGET}:${S}/${VMWARE_MOD_DIR}/${mod})"
+	done
+}
+
+src_prepare() {
+	sed -i.bak -e '/\smake\s/s/make/$(MAKE)/g' modules/linux/{vmblock,vmci,vmhgfs,vmsync,vmxnet,vsock}/Makefile\
+		|| die "Sed failed."
+	epatch "${FILESDIR}/frozen.patch"
+	epatch "${FILESDIR}/putname.patch"
+	epatch_user
+}
+
+src_configure() {
+	:				# do nothing at all
+}
+
+src_install() {
+	linux-mod_src_install
+
+	local udevrules="${T}/60-vmware.rules"
+	cat > "${udevrules}" <<-EOF
+		KERNEL=="vsock", GROUP="vmware", MODE=660
+	EOF
+	insinto /lib/udev/rules.d/
+	doins "${udevrules}"
+}
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@ -1,4 +1,5 @@
 DIST open-vm-tools-2012.10.14-874563.tar.gz 3618001 SHA256 57832997ae206becd1c281dbc1ab361fa33320fb77866126b4ef7f077e66d739 SHA512 ec97e3ef6f6b338994d09d2b25b3ddf7a2aecc5d98818733d2524c65edd0b46ecd1e0107ac33677b4a26bcda30b7fadec1b324e36d1ea4d9fc148824f0a88f31 WHIRLPOOL c31cee1074a04bcfd7bfd5e54c2509028abd1fee76b833c29e171f5c408ac4970a2e1ff85a6ea4be3493dbe25c074fe2882e55a8ea8de0bdba7618e0b625c2cb
 DIST open-vm-tools-2012.12.26-958366.tar.gz 3622541 SHA256 8d63a9c1e36ef968b87125b3c55c8ed5f75ecc9eafe84716eddee687b5b81606 SHA512 748d44951dcdff570faab071a5681ce68f8647df002de3a79853fbf1571835499f2dabc863cc7782b23fd55ad568d479ab10db9ff0bfc7c27cab4999b61f2a89 WHIRLPOOL ce4a51e9a40afea2a2f410e05ff9ca3535611a53d99c05e4d079f9b6df2cef1373113e3ec82bec378441f5f6689f6211c570c0ed4cfffe84534943d875f1bacb
+DIST open-vm-tools-2013.04.16-1098359.tar.gz 3737845 SHA256 fc939de4133d66c0cced8d0a7b5d87edcad3f598393b71c341e66bfec5087960 SHA512 682c25e315e3108617fd4d419f5bba8bf45f4966f13fa60944650390f63af2a7e4fcf740052106693403fcc2ec6f8b126e9911cbba044fc227f0c663e19f68e0 WHIRLPOOL eb13974f1e0a837617fad8c49f45e73570b343071c0619cc8408b5b9812e135cd9eafffc35a761740a58875c3e5583c625300398346d5863a2fa468044f6dd5f
 DIST open-vm-tools-8.8.2-590212.tar.gz 3795261 SHA256 c985c8fe7b292209ec1ac7c2b60749d7a9dd7859d789c332deb6baaf53ba8878 SHA512 5bcf97fe59287d73db43c46895f857ec34da750318150d6878b21ba8df79c76164a688e009585c7a14574f645e1e3ce66c5f9e9bcfc592a79b6f3bbd620dd619 WHIRLPOOL 486b22d74925b4813470ae3f3f5c725f2fec8919a36681cbfb6b47e0fa7452d7ae7b92085e823a96ff22da9f2f59d20267965799d32f609a27864ebce070db56
 DIST open-vm-tools-9.2.2-893683.tar.gz 3561799 SHA256 1ae795e75bf4b38185f39083b8075686d3bab4c1222f4e39c863aeccb2f5f387 SHA512 13490bdff2b8b316b1cd09e06c76293f21b83ede025ded5ddc71251e4f64279296f7dd0f248335f7e3d0714759be13f07263f154683878870a062c9ba55644fc WHIRLPOOL 16cbb0977a14a5f0f1efa1194dc1255d343767f7c55d3e97e03172c30117b24018634e870db7ad0d5010f5dd87d4664aa054d24e70e816b54cb1ca6148abb872
--- a/app-emulation/open-vm-tools/open-vm-tools-2012.10.14.874563.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-2012.10.14.874563.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-2012.10.14.874563.ebuild,v 1.1 2012/12/09 14:12:28 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-2012.10.14.874563.ebuild,v 1.2 2013/06/22 18:49:40 dilfridge Exp $

-EAPI="4"
+EAPI=5

 inherit eutils multilib pam user versionator flag-o-matic toolchain-funcs

@ -35,7 +35,7 @@ RDEPEND="app-emulation/open-vm-tools-kmod
 		x11-libs/libXtst
 	)
 	fuse? ( sys-fs/fuse )
-	icu? ( dev-libs/icu )
+	icu? ( dev-libs/icu:= )
 	xinerama? ( x11-libs/libXinerama )
 	"

--- a/app-emulation/open-vm-tools/open-vm-tools-2012.12.26.958366.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-2012.12.26.958366.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-2012.12.26.958366.ebuild,v 1.1 2013/01/20 12:09:54 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-2012.12.26.958366.ebuild,v 1.2 2013/06/22 18:49:40 dilfridge Exp $

-EAPI="4"
+EAPI=5

 inherit eutils multilib pam user versionator flag-o-matic toolchain-funcs

@ -35,7 +35,7 @@ RDEPEND="app-emulation/open-vm-tools-kmod
 		x11-libs/libXtst
 	)
 	fuse? ( sys-fs/fuse )
-	icu? ( dev-libs/icu )
+	icu? ( dev-libs/icu:= )
 	xinerama? ( x11-libs/libXinerama )
 	"

--- a/app-emulation/open-vm-tools/open-vm-tools-2013.04.16.1098359.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-2013.04.16.1098359.ebuild
@ -0,0 +1,114 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-2013.04.16.1098359.ebuild,v 1.1 2013/06/22 23:23:57 phajdan.jr Exp $
+
+EAPI=5
+
+inherit eutils multilib pam user versionator flag-o-matic toolchain-funcs
+
+MY_PV="$(replace_version_separator 3 '-')"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Opensourced tools for VMware guests"
+HOMEPAGE="http://open-vm-tools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X doc fuse icu +pic xinerama"
+
+RDEPEND="app-emulation/open-vm-tools-kmod
+	dev-libs/glib:2
+	dev-libs/libdnet
+	sys-apps/ethtool
+	sys-process/procps
+	virtual/pam
+	X? (
+		dev-cpp/gtkmm:2.4
+		x11-base/xorg-server
+		x11-drivers/xf86-input-vmmouse
+		x11-drivers/xf86-video-vmware
+		x11-libs/gtk+:2
+		x11-libs/libnotify
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+	fuse? ( sys-fs/fuse )
+	icu? ( dev-libs/icu:= )
+	xinerama? ( x11-libs/libXinerama )
+	"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	virtual/linux-sources
+	sys-apps/findutils
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup vmware
+}
+
+src_prepare() {
+	# Do not filter out Werror
+	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
+	# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
+	sed -i -e 's:\(TEST_PLUGIN_INSTALLDIR=\).*:\1\$libdir/open-vm-tools/plugins/tests:g' configure || die "sed test_plugin_installdir failed"
+}
+
+src_configure() {
+	# http://bugs.gentoo.org/402279
+	if has_version '>=sys-process/procps-3.3.2'; then
+		export CUSTOM_PROCPS_NAME=procps
+		export CUSTOM_PROCPS_LIBS="$($(tc-getPKG_CONFIG) --libs libprocps)"
+	fi
+
+	econf \
+		--with-procps \
+		--with-dnet \
+		--without-kernel-modules \
+		$(use_enable doc docs) \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_with X x) \
+		$(use_with X gtk2) \
+		$(use_with X gtkmm) \
+		$(use_with icu) \
+		$(use_with pic) \
+		$(use_enable xinerama multimon)
+
+	# Bugs 260878, 326761
+	find ./ -name Makefile | xargs sed -i -e 's/-Werror//g'  || die "sed out Werror failed"
+}
+
+src_install() {
+	default
+
+	rm "${D}"/etc/pam.d/vmtoolsd
+	pamd_mimic_system vmtoolsd auth account
+
+	rm "${D}"/usr/$(get_libdir)/*.la
+	rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
+
+	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
+	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
+
+	exeinto /etc/vmware-tools/scripts/vmware/
+	doexe "${FILESDIR}"/network
+
+	if use X;
+	then
+		fperms 4755 "/usr/bin/vmware-user-suid-wrapper"
+
+		dobin "${S}"/scripts/common/vmware-xdg-detect-de
+
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}/open-vm-tools.desktop"
+
+		elog "To be able to use the drag'n'drop feature of VMware for file"
+		elog "exchange, please add the users to the 'vmware' group."
+	fi
+	elog "Add 'vmware-tools' service to the default runlevel."
+}
--- a/app-emulation/open-vm-tools/open-vm-tools-8.8.2.590212.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-8.8.2.590212.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-8.8.2.590212.ebuild,v 1.3 2012/05/31 23:06:14 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-8.8.2.590212.ebuild,v 1.4 2013/06/22 18:49:40 dilfridge Exp $

-EAPI="4"
+EAPI=5

 inherit eutils multilib pam user versionator

@ -35,7 +35,7 @@ RDEPEND="app-emulation/open-vm-tools-kmod
 		x11-libs/libXtst
 	)
 	fuse? ( sys-fs/fuse )
-	icu? ( dev-libs/icu )
+	icu? ( dev-libs/icu:= )
 	unity? (
 		dev-libs/uriparser
 		media-libs/libpng:1.2
--- a/app-emulation/open-vm-tools/open-vm-tools-9.2.2.893683.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-9.2.2.893683.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-9.2.2.893683.ebuild,v 1.1 2012/12/09 14:12:28 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-9.2.2.893683.ebuild,v 1.2 2013/06/22 18:49:40 dilfridge Exp $

-EAPI="4"
+EAPI=5

 inherit eutils multilib pam user versionator

@ -35,7 +35,7 @@ RDEPEND="app-emulation/open-vm-tools-kmod
 		x11-libs/libXtst
 	)
 	fuse? ( sys-fs/fuse )
-	icu? ( dev-libs/icu )
+	icu? ( dev-libs/icu:= )
 	unity? (
 		dev-libs/uriparser
 		media-libs/libpng:1.2
--- a/app-emulation/vmware-player/vmware-player-3.1.6.744570.ebuild
+++ b/app-emulation/vmware-player/vmware-player-3.1.6.744570.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-3.1.6.744570.ebuild,v 1.2 2012/10/29 14:50:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-3.1.6.744570.ebuild,v 1.3 2013/06/22 22:37:55 dilfridge Exp $

 EAPI="2"

@ -18,7 +18,7 @@ SRC_URI="
 	amd64? ( ${MY_P}.x86_64.bundle )
 	"

-LICENSE="vmware"
+LICENSE="vmware GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="doc +vmware-tools"
--- 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,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-4.0.4.744019-r1.ebuild,v 1.2 2012/10/29 14:50:28 flameeyes Exp $
+# $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"

@ -20,7 +20,7 @@ SRC_URI="
 	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
 	"

-LICENSE="vmware"
+LICENSE="vmware GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="cups doc +vmware-tools"
--- a/app-emulation/vmware-player/vmware-player-4.0.5.893925.ebuild
+++ b/app-emulation/vmware-player/vmware-player-4.0.5.893925.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-player/vmware-player-4.0.5.893925.ebuild,v 1.2 2013/01/08 21:44:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-4.0.5.893925.ebuild,v 1.3 2013/06/22 22:37:55 dilfridge Exp $

 EAPI="4"

@ -20,7 +20,7 @@ SRC_URI="
 	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
 	"

-LICENSE="vmware"
+LICENSE="vmware GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="cups doc +vmware-tools"
--- a/app-emulation/vmware-player/vmware-player-5.0.2.1031769.ebuild
+++ b/app-emulation/vmware-player/vmware-player-5.0.2.1031769.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-player/vmware-player-5.0.2.1031769.ebuild,v 1.1 2013/03/10 12:16:35 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-5.0.2.1031769.ebuild,v 1.2 2013/06/22 22:37:55 dilfridge Exp $

 EAPI="4"

@ -20,7 +20,7 @@ SRC_URI="
 	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
 	"

-LICENSE="vmware"
+LICENSE="vmware GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="cups doc +vmware-tools"
--- a/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild
+++ b/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild,v 1.4 2012/10/02 12:17:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/vmware-view-open-client-4.5.0.297975-r1.ebuild,v 1.5 2013/06/22 18:46:17 dilfridge Exp $

-EAPI="4"
+EAPI=5

 inherit eutils autotools versionator

@ -20,7 +20,7 @@ IUSE=""

 COMMON_DEPEND="
 	>=dev-libs/boost-1.34.1
-	>=dev-libs/icu-3.8.0
+	>=dev-libs/icu-3.8.0:=
 	>=dev-libs/libxml2-2.6.0
 	>=dev-libs/openssl-0.9.8
 	>=net-misc/curl-7.16.0[ssl]
--- a/app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild,v 1.2 2012/10/29 14:52:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-7.1.6.744570.ebuild,v 1.3 2013/06/22 22:44:06 dilfridge Exp $

 EAPI="2"

@ -18,7 +18,7 @@ SRC_URI="
 	amd64? ( ${MY_P}.x86_64.bundle )
 	"

-LICENSE="vmware"
+LICENSE="vmware GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="doc vix +vmware-tools"
--- 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,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-8.0.4.744019-r1.ebuild,v 1.2 2012/10/29 14:52:38 flameeyes Exp $
+# $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"

@ -19,7 +19,7 @@ SRC_URI="
 	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
 	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
 	"
-LICENSE="vmware"
+LICENSE="vmware GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="cups doc ovftool server vix vmware-tools"
--- a/app-emulation/vmware-workstation/vmware-workstation-8.0.5.893925.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-8.0.5.893925.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-workstation/vmware-workstation-8.0.5.893925.ebuild,v 1.1 2013/01/07 20:52:58 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-8.0.5.893925.ebuild,v 1.2 2013/06/22 22:44:06 dilfridge Exp $

 EAPI="4"

@ -19,7 +19,7 @@ SRC_URI="
 	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
 	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
 	"
-LICENSE="vmware"
+LICENSE="vmware GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="cups doc ovftool server vix vmware-tools"
--- a/app-emulation/vmware-workstation/vmware-workstation-9.0.2.1031769.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-9.0.2.1031769.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-workstation/vmware-workstation-9.0.2.1031769.ebuild,v 1.1 2013/03/10 12:17:23 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-9.0.2.1031769.ebuild,v 1.2 2013/06/22 22:44:06 dilfridge Exp $

 EAPI="4"

@ -19,7 +19,7 @@ SRC_URI="
 	x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
 	amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
 	"
-LICENSE="vmware"
+LICENSE="vmware GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="cups doc ovftool server vix vmware-tools"
--- a/app-text/pandoc/pandoc-1.11.1.ebuild
+++ b/app-text/pandoc/pandoc-1.11.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/app-text/pandoc/pandoc-1.11.1.ebuild,v 1.2 2013/06/19 06:07:54 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.11.1.ebuild,v 1.3 2013/06/22 22:28:37 slyfox Exp $

 EAPI=5

@ -29,7 +29,7 @@ RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
 		>=dev-haskell/data-default-0.4:=[profile?]
 		<dev-haskell/data-default-0.6:=[profile?]
 		=dev-haskell/extensible-exceptions-0.1*:=[profile?]
-		>=dev-haskell/highlighting-kate-0.5.3.7:=[profile?]
+		>=dev-haskell/highlighting-kate-0.5.3.9:=[profile?]
 		<dev-haskell/highlighting-kate-0.6:=[profile?]
 		>=dev-haskell/http-4000.0.5:=[profile?]
 		<dev-haskell/http-4000.3:=[profile?]
@ -48,7 +48,7 @@ RDEPEND=">=dev-haskell/base64-bytestring-0.1:=[profile?]
 		>=dev-haskell/tagsoup-0.12.5:=[profile?]
 		<dev-haskell/tagsoup-0.13:=[profile?]
 		=dev-haskell/temporary-1.1*:=[profile?]
-		>=dev-haskell/texmath-0.6.1.3:=[profile?]
+		>=dev-haskell/texmath-0.6.1.5:=[profile?]
 		<dev-haskell/texmath-0.7:=[profile?]
 		=dev-haskell/text-0.11*:=[profile?]
 		>=dev-haskell/xml-1.3.12:=[profile?]
--- a/dev-haskell/highlighting-kate/Manifest
+++ b/dev-haskell/highlighting-kate/Manifest
@ -5,3 +5,4 @@ DIST highlighting-kate-0.5.3.3.tar.gz 639766 SHA256 5680414b3ca5a332f096b66bfebd
 DIST highlighting-kate-0.5.3.4.tar.gz 629924 SHA256 e7f4d8786ba213e0351aa0e8bda5837a5fc8161cc6a9bf8be141591c4e6ea9f6 SHA512 7ef8db76606255c8ef083b4cea889b3f88090c14f24f2d17f3eb504b93b2e176abf6226809ad15c34b30be0eae8b3dfc0568f24230ddf8f021239d895f40b665 WHIRLPOOL 4e46c64f22b8052ebc5e23be3bf0df85c82f0f6f27beaef8ec4082d416c0fc1b2715686f827182dcace6346197d3130ff425f2f19914cb83e2fcf0301fbabd02
 DIST highlighting-kate-0.5.3.5.tar.gz 628362 SHA256 637bf142fb40c7fc748b3f6ee97661799ef87c7d78fe4769b3e7f017c780e654 SHA512 1c5d1fb3d12c87d369645ea0302012d147332424c2dd5e5c7ee912ac6e6d0c915176d0efbf7c85c294db8f25e35bfcbef0891ba65983e6a9fd651ffef4f6e709 WHIRLPOOL 92bd21024929b78d70102b50a4ac1712cdcd1bd682d55ea959cd0c8ffdd7149272204b1e2ea512f8fee4e1777be9ed38184950fa080f4d1880bf5d28a7ec5f9a
 DIST highlighting-kate-0.5.3.8.tar.gz 661579 SHA256 5ca00f73773b1638bbbdae736d41c889d3f971dbdfbfacdf7ab5001e21afafb9 SHA512 64462a341016c635867f7ed7e964d0d00f981c5a5ae779d08fb508ede93d58fc06807d1cb8a877ff4aba5560812489ee50a10f43e003955d06ef7bb7a124564d WHIRLPOOL 5795c5e59060a2ef4c7c8f530cbea4c8e0041731c73d7a1b75c825c0fcaf1e1bf321ac840c6fbf9bfaef482eba4c65c9c5ad0abc91d94a55bf56eadbe92a56a9
+DIST highlighting-kate-0.5.3.9.tar.gz 662621 SHA256 0ca2abc648da30cebfffcdf22140a380df3c5d98c80984bf97ee416c351a1395 SHA512 72bac3557650a5a575071b7c8a1137a472dcfe2f2b763725127315ce61aaf4bfc5f84e84c70d56b9232be3512bceaeeb1afc32db60b0839cea1cd152d230254c WHIRLPOOL b3f2ddc59bd3a86aeec1577143e2e5996e7abc6e907694d792868795fe9eb01685106a854687398c8aeabaab30c57f699d5d7717980f10237379bf14e64c1041
--- a/dev-haskell/highlighting-kate/highlighting-kate-0.5.3.9.ebuild
+++ b/dev-haskell/highlighting-kate/highlighting-kate-0.5.3.9.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/highlighting-kate/highlighting-kate-0.5.3.9.ebuild,v 1.1 2013/06/22 22:22:41 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Syntax highlighting"
+HOMEPAGE="http://github.com/jgm/highlighting-kate"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable pcre-light"
+
+RDEPEND=">=dev-haskell/blaze-html-0.4.2:=[profile?]
+		<dev-haskell/blaze-html-0.7:=[profile?]
+		dev-haskell/mtl:=[profile?]
+		dev-haskell/parsec:=[profile?]
+		>=dev-lang/ghc-6.10.4:=
+		pcre-light? ( =dev-haskell/pcre-light-0.4*:=[profile?]
+		)
+		!pcre-light? ( dev-haskell/regex-pcre-builtin:=[profile?]
+		)"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.10"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag executable executable) \
+		$(cabal_flag pcre-light pcre-light)
+}
--- a/dev-haskell/texmath/Manifest
+++ b/dev-haskell/texmath/Manifest
@ -4,3 +4,4 @@ DIST texmath-0.6.0.4.tar.gz 40331 SHA256 c674813d2c471ed7f0cc6b1de28cdbb7d57fa46
 DIST texmath-0.6.0.6.tar.gz 41544 SHA256 939c144a6ebd46a8bb35a079b2f6a4ae499185bd26f1f2e57394c4a777fab773 SHA512 551ec588442a499bf8b08c1beb3d8e036d83b38efc9ad1162f22cc221f3613a294e79fc7b4e08dfe5c24b614a2e8004cccc683a5e1965985be3f3b83becac45e WHIRLPOOL 97ec116b1cca118810e0cf64de66a949ef7d1d532cb06589706fdf3a2d1c21f25d6d3095b75086d4d3dc11bf325c97cfda7ed1b53b7f9706b19a4cc18d4aace0
 DIST texmath-0.6.1.1.tar.gz 43980 SHA256 5fe16f60c6dc282be989fb91e5074ccc5c785883612e2f6d88edc8bb650ad31b SHA512 3d459fd52d7abbd8ff372fb2aef51b33a7f4bb8506b8538768d008d138dcbea3eaec34a484761abd08e3853e7d26cc963e06dccf33793df9c6a6f576272da603 WHIRLPOOL 7087c39e06940178ccdc8898c362006e5c96f618fc9d9d2924a6552eb07b8565e4f4581768ea632ced703f03cf962edb647525ec06eb4a85bd43dd4e53cae739
 DIST texmath-0.6.1.3.tar.gz 43978 SHA256 0570c4feae01905b64656b03aeb6d0fdb7ebbc4968fcc3774b35532e939a50b8 SHA512 ecc7f7b17ca0ba3d3c2157c526ed956752ec70c1f9374fef326cf0e05f264047e29e880bb236e91dc69af72ed8a27a5a97ba1e591afc1d794140e29e2dd89545 WHIRLPOOL d244d21daa6819f59cb7022197f5ad72b5adf131f48ba5d066acf62333d433dd608676cec7320013c5ebdec7a3c6dd9ec2305205032af99f91e0ff1218571264
+DIST texmath-0.6.1.5.tar.gz 43225 SHA256 888cca454fc585272ed5fa41711943250f76efebbff302534d02c349409c9d95 SHA512 0be501446f4e653c6e8353b5d2ed5c602b9defa202924452af9bb18f3245a66eddf6a1842f5c94486b7aadce5fddc4fc8e047bfe17a2796e97d219ca32d6a526 WHIRLPOOL 3eb4e609fb17526380f183701bba01e79a01603d973be97a064ebfb0833dd11747354ee6e1e5c2566df2b8e51ccf52061ba933ae68e12d34300b74d88df266c8
--- a/dev-haskell/texmath/texmath-0.6.1.5.ebuild
+++ b/dev-haskell/texmath/texmath-0.6.1.5.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/texmath/texmath-0.6.1.5.ebuild,v 1.1 2013/06/22 22:27:10 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Conversion of LaTeX math formulas to MathML or OMML."
+HOMEPAGE="http://github.com/jgm/texmath"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="cgi test"
+
+RDEPEND=">=dev-haskell/parsec-3:=[profile?]
+		dev-haskell/syb:=[profile?]
+		dev-haskell/xml:=[profile?]
+		>=dev-lang/ghc-6.10.4:=
+		cgi? ( dev-haskell/cgi:=[profile?]
+			dev-haskell/json:=[profile?]
+			dev-haskell/utf8-string:=[profile?]
+		)"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+src_prepare() {
+	epatch "${FILESDIR}/01-${PN}-locale.patch"
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag cgi cgi) \
+		$(cabal_flag test test)
+}
+
+src_install() {
+	cabal_src_install
+
+	# remove test and it's data
+	rm -f  "${ED}/usr/bin/texmath" 2> /dev/null
+	rm -rf "${ED}/usr/share/${P}"/ghc-*/tests 2> /dev/null
+}
--- a/dev-python/hcs-utils/Manifest
+++ b/dev-python/hcs-utils/Manifest
@ -1,3 +1,4 @@
 DIST hcs_utils-1.1.1.tar.gz 7044 SHA256 9e9b44c8902d9064c19ddc119eb27c60317ec76863b2189ad5faf0867a5870b1 SHA512 570ab73c41117685b6afe79d798e0f8b2e885ffa8f9027e9189b8a99f55b5f0bfd68f7a951fa97c4beaf3013c65544e4ba3a8351dd312a867a45c5446a4dbdf0 WHIRLPOOL b7971e8f86738a551de75c787e1e00125f6e225c88129a5227937a7410c3cbc37e5758bd9a6ecf50c7afd47c5c04e0cb053aa0d37c6ed1e4ea87632d789fa44a
 DIST hcs_utils-1.2.tar.gz 10025 SHA256 f342d9712709cdcf1bb58750bf9573cc89cff20c47f4aaee8d9e2f53af3897d0 SHA512 382c2b27aa8dd4b5bb6f344c04a19e339dea8efc974e019202f1a37173da4399326db2ce1a1b0b45dbc56995101f78fa5123d01cfea5a50168b66ac043ee4ba4 WHIRLPOOL 7ec033a08fb2122fc38427eb09be598654a7b74a1e15fd3ecfe55c953c2c13b288c7cbd662a166bd74e8e11c33fa28f28821be47dff33dbb590c0ab0afad579d
 DIST hcs_utils-1.3.tar.gz 21999 SHA256 b03fe7fc1fc3877ec810297bfc550f7cce58cf1f62bc464e348846ad01739255 SHA512 49f7096c339463dde586592ac06dea6f7e3a955c42ab5bd49341ac276d727c7033fa3c17f36d1268ade3d6661fd123ce9a49ba47fbf855ea13d2ab2b46888a27 WHIRLPOOL f00125e833f1575a6e3c9a873eead83275e27c07d469131cefcb79e834f7e59b66426c87e3588e5a192360737ede02be6d26879cedf8d784fba11cf7438f2bfd
+DIST hcs_utils-1.4rc5.tar.gz 22970 SHA256 c38a023e6342e44f25eb185b4fe5922c3dc1ccf1ce134b721e113a450af78657 SHA512 c662de7727b34ea68c1b3167c1027e3d7ea17b0a8e4c86ff66a5aa82a2d9475f32b9f434f2ecc4bd5d46c053fdbe7b3940d773ac61721acc338f35369a9e3053 WHIRLPOOL 1e0ca76291137da0433ffb4090a1808ff9a7898b40f68ad5b0da812675ee9ac3dd2808d7cfe14124415fcd6c2390dcc7724c5d9d59c4c63b9e8c5a84a9a5d0e2
--- a/dev-python/hcs-utils/hcs-utils-1.4_rc5.ebuild
+++ b/dev-python/hcs-utils/hcs-utils-1.4_rc5.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hcs-utils/hcs-utils-1.4_rc5.ebuild,v 1.1 2013/06/23 04:51:55 idella4 Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+MY_P=${P/_rc/rc}
+DESCRIPTION="A library containing some useful snippets"
+HOMEPAGE="http://pypi.python.org/pypi/hcs_utils"
+SRC_URI="mirror://pypi/h/${PN/-/_}/${MY_P/-/_}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P/-/_}"
+
+python_test() {
+	cd "${BUILD_DIR}/lib" || die
+	py.test --doctest-modules hcs_utils || die
+}
--- a/dev-python/hgdistver/hgdistver-0.16-r1.ebuild
+++ b/dev-python/hgdistver/hgdistver-0.16-r1.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hgdistver/hgdistver-0.16-r1.ebuild,v 1.1 2013/06/23 05:14:58 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="utility lib to generate python package version infos from mercurial tags"
+HOMEPAGE="http://bitbucket.org/RonnyPfannschmidt/hgdistver/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	# https://bitbucket.org/RonnyPfannschmidt/hgdistver/issue/9/test-failures; train wreck
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
--- a/dev-python/hglib/Manifest
+++ b/dev-python/hglib/Manifest
@ -1,2 +1,3 @@
 DIST python-hglib-0.3.tar.gz 27469 SHA256 16d821354c1d068a68b2029e3863d687d8753eaeb001fd4bcf65ceb07c0d3e6e SHA512 d67de9567256e6f1649e4f3f7dfee63371d5f00fd3fd4f92426198f862e97c57f70e827d19f4e5e1929ad85ef2ce7aa5a0596b101cafdac71672e97dc115b397 WHIRLPOOL bfce04929ab92c8f0bc6086e83147182f038e5dd0370fc0efcf28a6cdd0604f28788a9a4e227057af289adaab635f765f41fb375aabe7b06e709f9ed47aa47bf
 DIST python-hglib-0.9.tar.gz 27794 SHA256 277bfcaea4437c8a4eb8fbb215a97973bc770cea038005965fb03ba3e1531b08 SHA512 432552d9d3e5aeb3ab62a23535e4cfa4f833f92e8d0be23e688d415ef86ee9e997b401f244b9f2a5b5e860c95e746c5aad1d750ca18928707b86e5d2c3ed6e3f WHIRLPOOL 2f8a8d47b5487bf77e537e186b23c9deb494cb57c42f28b04bd3223150376cedefac1033ce338dbcd32d008bc2f0f1240b77291401d00afd7caa7dbf1aa4e422
+DIST python-hglib-1.0.tar.gz 27833 SHA256 766458699a9f2e5f351bfe73164e4f8c30290d10a097aefacd25532f315b3099 SHA512 9c0a61299779aff613131aaabbc255c8648f0fa7ab1806af53f19fbdcece0c8a68ddca7880d25b926d67ff1b9201954b207919fb09f6a290acb078e8bbed7b68 WHIRLPOOL edb5dddcbe7a1f6d94ca76d6f78a2b3a53bd56c15e55ef5810ae32f07d270fd45be8947cb8eadbca3dac2de945e97f63cddd46c90157b688032b79f48b7d29bc
--- a/dev-python/hglib/hglib-1.0.ebuild
+++ b/dev-python/hglib/hglib-1.0.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hglib/hglib-1.0.ebuild,v 1.1 2013/06/23 02:48:20 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy{1_9,2_0} )
+PYTHON_USE_WITH="python_targets_python2_7? ( threads )"
+
+MY_P="python-${P}"
+MY_PN="python-${PN}"
+
+inherit distutils-r1
+
+DESCRIPTION="Library for using the Mercurial Command Server from Python"
+HOMEPAGE="http://mercurial.selenic.com/"
+SRC_URI="mirror://pypi/p/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=">=dev-vcs/mercurial-2.4.2"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3-tests.patch )
+
+python_test() {
+	if ! ${PYTHON} test.py; then
+		die "Tests failed under ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/stats.py )
+	distutils-r1_python_install_all
+}
--- a/dev-python/setupdocs/Manifest
+++ b/dev-python/setupdocs/Manifest
@ -1 +0,0 @@
-DIST SetupDocs-1.0.5.tar.gz 7867 SHA256 65dbb32703129a02840ec66258e32d37f93ec99cdba25f3db407bf7e43216441 SHA512 effaa952db8fda92f0dd6ffc5264289ce3a4157cfe5635f2936a877fa66b54d9e9917a6511bf009cbc157589956037f5d760cde2605e0c2bdba382fda341641d WHIRLPOOL 64353ca119aff6c4a75f3440b6a9ed35a159b84aa666bcaf9e1ff5e989b475e94a534d97710bca501da301d60d39c46fb94370fd26e71cbd386044d3fd985768
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@ -1,2 +1,3 @@
 DIST rake-0.8.7.tgz 103104 SHA256 43e209ccc3d320bd422fcffbd5654b80a110b9fea81d1d5f029715a35f5770cc SHA512 36b5e038db6e7f1b834651bd8d1411eb9db1ed05dc155f670fbd89ba8df9a380fcfe19498bbfac5876f5740e6b95ebd8e798fc9eb7be7d68a6f553e242ade598 WHIRLPOOL d582a2f875589cc9a93c18d715f6781975742c81a00fb4aea3b39407dd8ce2d15291f414302f9fe84339aacce89cb14222354360290d91699cf2832559476c1f
 DIST rake-0.9.2.2.gem 111616 SHA256 d83ceb634b73530b3e56dbc3cf2c143cddb4317fd3142855f298adffcac5c4a6 SHA512 d2779df0b66dd3fb6eda9dc959b99850e10722846fd45a58630e7e30577a660a18cff30834896a6144bf9b1fea6bbb21c5203d34cd7a2be1ecd9237f217084ac WHIRLPOOL 2734819fc407e966cd5a17c2995b3392d526c0b596d725c19bdb5ff15bdbdcefa141ee1f0102bc6a14334bb619f6938d276f2bfd11d3641313e1e697c71ef494
+DIST rake-0.9.6.gem 123904 SHA256 0cde8637bc097b984b602d7db77b1982b3a0be5ab014f1e533b6b517ca807e26 SHA512 9ea3b7bd96db7e96f8bf5a00db710003d39ffeea6eabfde4b9a8afead0e6f6a8fa7740f42a61d77a4322f64ab0338b19af8c63d0178624dc7c0e787e11b0b6f3 WHIRLPOOL 90ab856325bd4c4a3944720e063156d65368298658ed0619380da4cdbc7c932ede44e39fd79f87f5a5ed6ce63f4c7d01c0d1f06ee1b720e3576ac6ba04290e03
--- a/dev-ruby/rake/rake-0.9.6.ebuild
+++ b/dev-ruby/rake/rake-0.9.6.ebuild
@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake/rake-0.9.6.ebuild,v 1.1 2013/06/23 07:59:50 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit bash-completion-r1 ruby-fakegem
+
+DESCRIPTION="Make-like scripting in Ruby"
+HOMEPAGE="http://rake.rubyforge.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+DEPEND="${DEPEND} app-arch/gzip"
+RDEPEND="${RDEPEND}"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# Comment out unimportant test which failes on ruby18 at least.
+	sed -i -e '/def test_classic_namespace/,/^  end/ s:^:#:' test/test_rake_application_options.rb || die
+
+	# Avoid tests which can't work in bootstrapping because the test runs
+	# in a directory that can't access the file being loaded.
+	rm test/test_rake_clean.rb || die
+	sed -i -e '/test_run_code_rake/,/^  end/ s:^:#:' test/test_rake_test_task.rb || die
+
+	# Decompress the file. The compressed version has errors, ignore them.
+	zcat doc/rake.1.gz > doc/rake.1
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*jruby)
+			# Remove failing tests. These are not failures in rake but
+			# in our packaging of jruby. They are already present in
+			# rake 0.9.2.2, so avoid them for now so that we can at
+			# least bump 0.9.6 which is needed for ruby20.
+			rm test/test_rake_{functional,rules}.rb || die
+			;;
+	esac
+}
+
+all_ruby_compile() {
+	if use doc; then
+		ruby -Ilib bin/rake rdoc || die "doc generation failed"
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -S testrb test/test_*.rb || die
+}
+
+all_ruby_install() {
+	ruby_fakegem_binwrapper rake
+
+	if use doc; then
+		pushd html
+		dohtml -r *
+		popd
+	fi
+
+	doman doc/rake.1
+
+	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
+}
--- a/dev-ruby/treetop/Manifest
+++ b/dev-ruby/treetop/Manifest
@ -1 +1,2 @@
 DIST treetop-1.4.10.gem 181760 SHA256 e2aab49f88afd4bee4dee20ea3c0227dcc0c5159e0aed3e76a105e53dde1c405 SHA512 e28f11e600758be16b087372b297352343df69287452fbd6a6077ff7f87dcec0e666fc7e37a799e9fd0173a95befc215e7d9b6226427a4053639e99d491ea67c WHIRLPOOL ddc75e01f0fce40387eb848603281687f39d3d396a4a02a81bffd58d813fc38b1f00183056ed7d385daa4f1cf2d6d84750db9850c684792897fced0140ad4ac4
+DIST treetop-1.4.14.gem 183808 SHA256 9aa983f04630c853c7acae8504df492f22b6ab9be80e48be0e43eef5f8497361 SHA512 480de1f9191fc628ab53203d0387c6fef85dc86fbdcdf2367ef0c901af0163d8d2be99879ff731bef31f3b94e3a1f9e198c26c4c9b2d749ab1ee9f0185fe3ce6 WHIRLPOOL 2af050f1e5fd9346282ed7bcbf7c2d074627b62c1171166b8ae748caac5f56c0ec3d50759f8c836df3adc7c6acb28bb3083740b63931133a4a1e4030be3202c3
--- a/dev-ruby/treetop/treetop-1.4.14.ebuild
+++ b/dev-ruby/treetop/treetop-1.4.14.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/treetop/treetop-1.4.14.ebuild,v 1.1 2013/06/23 07:36:45 graaff Exp $
+
+EAPI=5
+
+# jruby fails tests, not investigated yet.
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Treetop is a language for describing languages."
+HOMEPAGE="http://treetop.rubyforge.org/"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/rr-0.10.2 dev-ruby/activesupport )"
+ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1"
+
+all_ruby_prepare() {
+	# Use a ruby18 compatible regexp, already fixed upstream.
+	sed -i -e 's/\[:\^space:\]/\^[:space:]/' spec/compiler/character_class_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}/examples
+	doins -r examples/*
+}
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@ -3,4 +3,5 @@ DIST cdiff-0.7.1.tar.gz 23274 SHA256 f14255941515ac6847680e80c6e0f2d6cd51145b6e7
 DIST cdiff-0.7.tar.gz 21709 SHA256 3f9f6c7600d473d7e41aefa2cace35a8906ef6e8692c4cc5c4aee08f6b57b82a SHA512 46f1ed34b2199ce2ffdfa4a182215700286e43dfae221825bbda43f36f566d651545da654d28bf07d480f1f37fb7ecf10489c6dacdebc51ce71cdcad73107f59 WHIRLPOOL 7689b32dec5368d537d4ddf891e07eef621f21c1865be06c34e58c6a6f41aff5714c23f337c7bbc7061537f430bac280798f41edb2bb984981b9e4bf789faea3
 DIST cdiff-0.8.tar.gz 24885 SHA256 3dc9d75fbe9e008c78e33692473a74359b849c086312eb047d0755b54f2318ef SHA512 b936d828e4e7dc46aab51109bb7d2ca850cca957f874d2acc84569f521e8f9a679e69bdb68881b66b3424bfa3d6cf81efc1ba4b2f2c9ae28754b66aaa6c48b02 WHIRLPOOL 0b06aa6399f125aee5c37460e464fc5ac9ea80159b8544ad61c739d73da3ba9f7b5d45d394d9868e2a6d7e626c77f73950d344537e61cf657c445fb2e7a7eed9
 DIST cdiff-0.9.1.tar.gz 28359 SHA256 b099239223151df274a3b2f94499ae3c1ef746e70a68a940a8395487d034570c SHA512 f3554fd843091e423c044ae46c3d497f14e8f9c623d1df5a2e3096c2746e15a4a1266744c4fa47083c5f9319e67d069e06d2e9477d8a3339c9ef4b2a33370fde WHIRLPOOL a3e766c876acf2bed1e9594b05465aad7cd599b8a1760f732fcb94c18091306871651b6b9b47b5931e8498c2755c3e78838252ecde3754b8252e127d902ddd90
+DIST cdiff-0.9.2.tar.gz 28987 SHA256 83ecc296ce1dadf386b92584d8f9608732279c20973777cbac0b3f2201a8b7c4 SHA512 59a2b2f1125d100f792da14bee626475c5949443a0abfec719f964ae77d3266b1d0c35ad843cb60b3f8d92959448e30c251484247e52181c6289f5abab261bc8 WHIRLPOOL f4359a38690f852fe58a9c89cc1d87d8b0c2501c612002bdb936787b3e3465b29cbadd1052c562e014411148bc30e3bdf154349912ffd409616240b9edfb692a
 DIST cdiff-0.9.tar.gz 28194 SHA256 fb22c1e7fefd1762e9df1666875da2312526f7d729c4bd07a47947898f4ae666 SHA512 9076309324b6cf3cf08ad2c0b322d53054a11650de827a3cd9a2b59d1788dac4f365944e562f10c7b0a60f792c664bb60d432ba175a5ae001578ac5ad34c4a52 WHIRLPOOL 9c715b9ea5d4de7460260ad13d22df1c6247276e96afe300b4bad20629f8a0b82627119443d37c9a1e93b4af1ed58ab2b459bcba5576c4948556e11ee6154031
--- a/dev-util/cdiff/cdiff-0.9.2.ebuild
+++ b/dev-util/cdiff/cdiff-0.9.2.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.2.ebuild,v 1.2 2013/06/22 23:35:38 tomwij Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+DOCS=( CHANGES README.rst )
+
+inherit distutils-r1
+
+DESCRIPTION="Colored, side-by-side diff terminal viewer."
+HOMEPAGE="https://github.com/ymattw/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="!app-misc/colordiff
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	sys-apps/less"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-disable-unimportant-failing-test.patch )
+
+src_test() {
+	python_export_best
+	${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
+	./tests/regression.sh || die "Regression tests failed."
+}
--- a/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch
+++ b/dev-util/cdiff/files/cdiff-0.9.2-disable-unimportant-failing-test.patch
@ -0,0 +1,11 @@
+--- a/tests/test_cdiff.py	2013-03-24 15:08:00.000000000 +0100
+++ b/tests/test_cdiff.py	2013-06-23 01:17:20.560520188 +0200
+@@ -737,7 +737,7 @@
+         os.chdir(self._non_ws)
+         ret = cdiff.main()
+         os.chdir(self._cwd)
+-        self.assertNotEqual(ret, 0)
+#        self.assertNotEqual(ret, 0)
+ 
+     def test_read_log(self):
+         sys.argv = [sys.argv[0], '--log']
--- a/games-rpg/manaplus/Manifest
+++ b/games-rpg/manaplus/Manifest
@ -1,3 +1,2 @@
-DIST manaplus-1.3.4.14.tar.xz 6841308 SHA256 e331d31a2039b06e5f9ada2e0ee0215119cc7978e2146be73bb36272583e08e7 SHA512 3a947dea12d4dea5bc3d341e4f883f9626881751511d18035ab68bbeb9d02fd2a2a9e1801b512fc84033503d4e1cf84d827089a2a8619fd181bb9346405ad0ca WHIRLPOOL 62b609b0ff8f6eeb44b44732becd8819dea10c2ade3ca51bd18a88ff7c1d7e4fe32b68a0e290b494126d9faf368824995a5b803a1c9378474712859617273c21
-DIST manaplus-1.3.5.12.tar.xz 6911696 SHA256 c747375fddc4e7f1496c547c8962dd247f9cad35681ccad4f9c9373d443688ea SHA512 e72c6047e6648c487649c430fb7a26c16db690dda2ffcc25a18160ff17ef0695e73458c1ba13d73327b0abfbda5b8ba5f333395edc3cbd126a8a8657bdec6fea WHIRLPOOL 3f3ffb13036edd059f301a29d3048cddec547bb3eaeeeddc75abda82abb03a2116a7aa57e4917b44bf0f170393c75039eea43841e69f8c3c38b479f0edf1198e
+DIST manaplus-1.3.6.23.tar.xz 6952352 SHA256 7fffcf22f7e0e84029afa50a34a534bb3766f0afdb5a7751d34d533c58ee18d3 SHA512 8204adffb61b3a0dd91dcf225968e5c7d76c8be1dfda29be1be04d9855496bf91e5516be65ff1193f7f34a58bfb283e347bfd2190d5757f050060be0cb6dd262 WHIRLPOOL dd9ef93aa2847f28217e9769f7301feb358d933c0c62898e527fe6adeb7ab4170e3570d2fbfd3c534c77fd706a778f0b69f1495968515073e1eacee128f5b277
 DIST manaplus-1.3.6.9.tar.xz 6920400 SHA256 2f4e8a859bcec82ff1ee9403a225b6f71db2b9d027a864009b418b055e608730 SHA512 11472d14a17325241c9eb11bffbf49c0c8d1200f8f932b38e5a30ddb06d5f236af20fde94ed636ed7f37be31b79e93c92bec5055c3916b27ac81b441c99ab0c5 WHIRLPOOL 553c9fe3686e60a240569147a7e1fe28c8b46f479261e8fe038bb894ebbee094d989bda32a38818ed572d0b345b1a52955363949f83bfd868293afa25be8340a
--- a/games-rpg/manaplus/manaplus-1.3.5.12.ebuild
+++ b/games-rpg/manaplus/manaplus-1.3.5.12.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/manaplus/manaplus-1.3.5.12.ebuild,v 1.1 2013/05/13 21:17:18 hasufell Exp $
-
-EAPI=5
-
-inherit games
-
-DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
-HOMEPAGE="http://manaplus.evolonline.org"
-SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/manaplus-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls opengl"
-
-RDEPEND="
-	>=dev-games/physfs-1.0.0
-	dev-libs/libxml2
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-image[png]
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	net-misc/curl
-	sys-libs/zlib
-	media-libs/libpng:0
-	media-fonts/dejavu
-	>=dev-games/guichan-0.8.1[sdl]
-	media-libs/libsdl[X,opengl?,video]
-	media-libs/sdl-gfx
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-misc/xdg-utils
-	x11-misc/xsel
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i \
-		-e '/^SUBDIRS/s/fonts//' \
-		data/Makefile.in || die
-
-	rm -r src/guichan || die
-}
-
-src_configure() {
-	egamesconf \
-		--without-internalguichan \
-		--localedir=/usr/share/locale \
-		--disable-manaserv \
-		--disable-eathena \
-		$(use_with opengl) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-mono.ttf
-	insinto "${GAMES_DATADIR}"/${PN}/data
-
-	prepgamesdirs
-}
--- a/games-rpg/manaplus/manaplus-1.3.6.23.ebuild
+++ b/games-rpg/manaplus/manaplus-1.3.6.23.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/manaplus/manaplus-1.3.4.14.ebuild,v 1.1 2013/04/13 20:46:28 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/manaplus/manaplus-1.3.6.23.ebuild,v 1.1 2013/06/22 22:42:22 hasufell Exp $

 EAPI=5

--- a/kde-misc/eyesaver/Manifest
+++ b/kde-misc/eyesaver/Manifest
@ -0,0 +1 @@
+DIST 89989-eyesaver-0.4.tar.gz 9663 SHA256 416144b018862e0c4d0f1b9084ffe8d2bb0ccf804b5021a436f02e01fa7db32b SHA512 b597a81155a0ee1d323d1fe89032b87432909414355cf2e151cbc1ed073dbb0067f41fd4b3774dd374fb73a596f9542794b415d6b27b01e0098dfea293ec506a WHIRLPOOL b1522450913fe323e662c5085317cd8017d9eeaa68a2e1ef4883fe06a63ab44dc4cb21c944ef7dac2a38416a8936abc5354656e6ab9cb2da107ae714568a3c11
--- a/kde-misc/eyesaver/eyesaver-0.4.ebuild
+++ b/kde-misc/eyesaver/eyesaver-0.4.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/eyesaver/eyesaver-0.4.ebuild,v 1.1 2013/06/22 21:56:01 creffett Exp $
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="KDE4 plasmoid. Reminds us to take our eyes off the screen"
+HOMEPAGE="http://www.kde-look.org/content/show.php/Eyesaver?content=89989"
+SRC_URI="http://www.kde-look.org/CONTENT/content-files/89989-${P}.tar.gz"
+
+LICENSE="GPL-1"
+# License unclear, HOMEPAGE and .desktop file have "GPL", assuming GPL-1.
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="media-libs/phonon"
+RDEPEND="
+	${DEPEND}
+	$(add_kdebase_dep plasma-workspace)
+"
+
+PATCHES=( "${FILESDIR}/eyesaver-0.2a-fix.patch" )
--- a/kde-misc/eyesaver/files/eyesaver-0.2a-fix.patch
+++ b/kde-misc/eyesaver/files/eyesaver-0.2a-fix.patch
@ -0,0 +1,11 @@
+--- eyesaver.cpp	2011-06-03 14:58:13.050524017 -0400
+++ eyesaver.cpp	2011-06-03 14:59:10.829774142 -0400
+@@ -82,7 +82,7 @@
+ 
+ void Plasmaeyesaver::apridocum () {
+     KUrl *doc = new KUrl("http://spitalia.altervista.org/blog/?page_id=18");
+-    new KRun::KRun(*doc,0);
+    new KRun(*doc,0);
+ }
+ 
+ void Plasmaeyesaver::createConfigurationInterface( KConfigDialog *p_parent )
--- a/kde-misc/eyesaver/metadata.xml
+++ b/kde-misc/eyesaver/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/kde-misc/socket-sentry/Manifest
+++ b/kde-misc/socket-sentry/Manifest
@ -0,0 +1 @@
+DIST socketsentry-0.9.3.tar.gz 156935 SHA256 1b8bfe859a2dd640647662e0b534a1f6dac429ee1252eed6887619704d9b26f6 SHA512 235e82370e8927ef03acb08af69dd97dfd67d9fa9a7c7d50bec1c504cd2d6d7bd3c102cb90cf212b772f838c1c1bce94b525bf2eecafe5827532d0f32c848c38 WHIRLPOOL 815a0867cec9984e07b110ed4c291e6d9db38bb2b9eb2fafa31330362cc4aba35610a118527265b0683292accd5733496e94b13f0a3e13d4fdb5e8e6522651f2
--- a/kde-misc/socket-sentry/files/socket-sentry-0.9.3-automagictests.patch
+++ b/kde-misc/socket-sentry/files/socket-sentry-0.9.3-automagictests.patch
@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -42,7 +42,7 @@
+ # The link libraries should contain the code under test. The TEST_SUPPORT_LIBS are also linked
+ # automatically.
+ function (add_qtestlib_tests test_source_files)
+-	if (DEFINED TEST_SUPPORT_LIBS)
+	if (DEFINED TEST_SUPPORT_LIBS AND WITH_TESTS)
+ 		foreach(test_file_src ${test_source_files})
+ 			get_filename_component(test_file_path ${test_file_src} PATH)
+ 			get_filename_component(test_file_base ${test_file_src} NAME_WE)
+@@ -54,7 +54,7 @@
+ 			target_link_libraries( ${test_exe} ${TEST_SUPPORT_LIBS} ${ARGN} )
+ 			add_test(${test_file_base} ${EXECUTABLE_OUTPUT_PATH}/${test_exe} )
+ 		endforeach(test_file_src)
+-	endif (DEFINED TEST_SUPPORT_LIBS)
+	endif (DEFINED TEST_SUPPORT_LIBS AND WITH_TESTS)
+ endfunction(add_qtestlib_tests)
+ 
+ add_subdirectory (socketsentry-service)
--- a/kde-misc/socket-sentry/metadata.xml
+++ b/kde-misc/socket-sentry/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/kde-misc/socket-sentry/socket-sentry-0.9.3.ebuild
+++ b/kde-misc/socket-sentry/socket-sentry-0.9.3.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/socket-sentry/socket-sentry-0.9.3.ebuild,v 1.1 2013/06/22 21:30:54 creffett Exp $
+
+EAPI=5
+
+inherit kde4-base
+
+MY_PN="socketsentry"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A KDE plasmoid that displays real-time network traffic on your Linux computer."
+HOMEPAGE="http://code.google.com/p/socket-sentry"
+SRC_URI="http://socket-sentry.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug test"
+
+RDEPEND="
+	>=net-libs/libpcap-0.8
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gmock dev-cpp/gtest )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.9.3-automagictests.patch" )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with test TESTS)
+	)
+	cmake-utils_src_configure
+}
--- a/kde-misc/stdin-plasmoid/Manifest
+++ b/kde-misc/stdin-plasmoid/Manifest
@ -0,0 +1 @@
+DIST 92309-0.2-beta1.tar.bz2 27400 SHA256 29c2ea5bcddffb1b3d0e2326bb50025a413bc904e50093582ba928812ddb8d6d SHA512 93d8ec9a45b1c447754af73162fd8924a84f788c873d6c0cbe57283873ea986a8abf47966beb07be5ff8d6eb89c3f46c85edf6aace20266425fa42815cb07cd8 WHIRLPOOL d12e38b9f06623a00c7786ece6aac13476ca70f35f3a169a9807cac98c2dbf13023906754b234426cb168fe0848e9150d4ab05fa1161e739e70ed652faf303da
--- a/kde-misc/stdin-plasmoid/metadata.xml
+++ b/kde-misc/stdin-plasmoid/metadata.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
+
--- a/kde-misc/stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild
+++ b/kde-misc/stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/stdin-plasmoid/stdin-plasmoid-0.2_beta1.ebuild,v 1.1 2013/06/22 21:44:42 creffett Exp $
+
+EAPI=5
+
+inherit kde4-base versionator
+
+MY_P="$(replace_version_separator 2 '-')"
+
+DESCRIPTION="KDE4 plasmoid for executing a process and capturing its stderr and stdout."
+HOMEPAGE="http://www.kde-look.org/content/show.php/STDIN+Plasmoid?content=92309"
+SRC_URI="http://www.kde-look.org/CONTENT/content-files/92309-${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep plasma-workspace)
+"
+
+S="${WORKDIR}/${MY_P}"
--- a/kde-misc/todo-list/Manifest
+++ b/kde-misc/todo-list/Manifest
@ -0,0 +1 @@
+DIST 90706-todo_plasmoid-0.4.tar.bz 18284 SHA256 4ac8504842dbc7f9b4096acef8b4e11c4c10eaa59012bcea55b0c0a9bcec95c6 SHA512 5a3c822db25387b5334d880e4cba8b3693f8717a0b0679aaac269a986dfcae72bc3115ddde1d75f5f0327334c99dc9828f03fa4f34f10c5ee98a182ba56dc39a WHIRLPOOL 02c2bdac2dc41295b34553bd6dbcb11b1af58fae2c884b2be52c44a910b081399e8d3ab8d6ab680865b048754e64d1ea0f98edcbdc3d4e1ed98bccaf876369c9
--- a/kde-misc/todo-list/metadata.xml
+++ b/kde-misc/todo-list/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/kde-misc/todo-list/todo-list-0.4.ebuild
+++ b/kde-misc/todo-list/todo-list-0.4.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/todo-list/todo-list-0.4.ebuild,v 1.1 2013/06/22 21:50:42 creffett Exp $
+
+EAPI=5
+
+inherit kde4-base
+
+MY_PN="todo_plasmoid"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="KDE4 plasmoid that shows a 'todo' list, using the korganizer 'Active calendar' resource file."
+HOMEPAGE="http://kde-look.org/content/show.php/todo+list?content=90706"
+SRC_URI="http://kde-look.org/CONTENT/content-files/90706-${MY_P}.tar.bz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep plasma-workspace)
+"
+
+S="${WORKDIR}/${MY_PN}"
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@ -2,3 +2,4 @@ DIST gimp-2.6.11-underlinking.patch.xz 5544 SHA256 5e7f2f16b8fe9b186b94cbe4cea1c
 DIST gimp-2.6.12.tar.bz2 16745411 SHA256 d553c9f1c07f59fa7b7ce9cc5f84ce59bf4e9dfb5b6ee4bd8718b74b947aec62 SHA512 4afd136510857adf68f7c85b34138ccf3d9e0499ac526481239e5d5bf0cbe400186c57b688b0818c3b372ed2c57bdeba8a1fb456fa0e82590495a4425393969f WHIRLPOOL 310c598dba3202713fa48f776494fe9a7d09ab7cd39538cff5d3f021af6c13c2ece0f30e84d1dd0fbbbb095584995a998700292ce995338648ff37fc7824f34c
 DIST gimp-2.8.2.tar.bz2 20161424 SHA256 0cd1a7e67e132ead810e16e31ff929394c83fcf841e4a295c45d6f3829601ad9 SHA512 82a15072aba97d41a7dd74920f5db4e89442ff83841ac614f6fadfd964bdb8d3ae478ac0ba2e906bcf4569c8de00a1616fd6d626032f093060f28df3655d9111 WHIRLPOOL ae8f3347bc847d6a5451b899a5849b947452239f2e73f19ec0e9f5fcf96141a1c697a930b678429ecd0c3184e7d41c9f45f15aef978bf44f0e3f3726305ddd74
 DIST gimp-2.8.4.tar.bz2 20214383 SHA256 e24a9f826e7c30edb83d96f4cf4787cf1a0ed98f28ea947d19736b4f49787ab5 SHA512 7a879bfdcec769495d61332980edf577ea0d37dbc84ef889239620bce7c458f17238a22884b1a063eddb1d1126c4241bf14dae81ace0134dff4a9e602046443b WHIRLPOOL 7cfe3e055fba96fe509ed3ee050de267efc038b7844d3ef0e2be066e0cabf0aacd199dbb98c9de5e4cab32ce57e3d6cd82fd890ed45485f3396b2a6b37a87675
+DIST gimp-2.8.6.tar.bz2 20306442 SHA256 215865b0ff4534bbced551995ae3093ede1918246ead914984603a5c1a5be845 SHA512 2bed2f3521e01355fd0e820024a54f40ad215c4167d3dbbfee0730b67e4d8edb161b493c75a02bd9439dced25331b879fed7b6737f84b975003feee5c1fcf45f WHIRLPOOL 73ec3109b4005f09b0725d489c7d577ff3ccca695c6aa1105c2fab6fae35899c36c4872a5203486e63e50a8439915c5f66afce26a05dafd1e4e432ce4574e82f
--- a/media-gfx/gimp/gimp-2.8.6.ebuild
+++ b/media-gfx/gimp/gimp-2.8.6.ebuild
@ -0,0 +1,165 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.6.ebuild,v 1.1 2013/06/22 18:41:33 sping Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit versionator autotools eutils gnome2 fdo-mime multilib python
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~arm-linux ~x86-linux"
+
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
+
+for lang in ${LANGS}; do
+	IUSE+=" linguas_${lang}"
+done
+
+RDEPEND=">=dev-libs/glib-2.30.2:2
+	>=dev-libs/atk-2.2.0
+	>=x11-libs/gtk+-2.24.10:2
+	>=x11-libs/gdk-pixbuf-2.24.1:2
+	>=x11-libs/cairo-1.10.2
+	>=x11-libs/pango-1.29.4
+	xpm? ( x11-libs/libXpm )
+	>=media-libs/freetype-2.1.7
+	>=media-libs/fontconfig-2.2.0
+	sys-libs/zlib
+	dev-libs/libxml2
+	dev-libs/libxslt
+	x11-themes/hicolor-icon-theme
+	>=media-libs/babl-0.1.10
+	>=media-libs/gegl-0.2.0
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	dbus? ( dev-libs/dbus-glib )
+	gnome? ( gnome-base/gvfs )
+	webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/jasper )
+	exif? ( >=media-libs/libexif-0.6.15 )
+	lcms? ( >=media-libs/lcms-1.16:0 )
+	mng? ( media-libs/libmng )
+	pdf? ( >=app-text/poppler-0.12.4[cairo] )
+	png? ( >=media-libs/libpng-1.2.37:0 )
+	python?	( >=dev-python/pygtk-2.10.4:2 )
+	tiff? ( >=media-libs/tiff-3.5.7:0 )
+	svg? ( >=gnome-base/librsvg-2.36.0:2 )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	x11-libs/libXcursor
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( virtual/udev[gudev] )"
+DEPEND="${RDEPEND}
+	sys-apps/findutils
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	doc? ( >=dev-util/gtk-doc-1 )
+	>=sys-devel/libtool-2.2
+	>=sys-devel/automake-1.11
+	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+S="${WORKDIR}"/${P}
+
+pkg_setup() {
+	G2CONF="--enable-default-binary \
+		--with-x \
+		--disable-silent-rules \
+		$(use_with aalib aa) \
+		$(use_with alsa) \
+		$(use_enable altivec) \
+		$(use_with bzip2) \
+		$(use_with curl libcurl) \
+		$(use_with dbus) \
+		$(use_with gnome gvfs) \
+		$(use_with webkit) \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with exif libexif) \
+		$(use_with lcms) \
+		$(use_with postscript gs) \
+		$(use_enable mmx) \
+		$(use_with mng libmng) \
+		$(use_with pdf poppler) \
+		$(use_with png libpng) \
+		$(use_enable python) \
+		$(use_enable smp mp) \
+		$(use_enable sse) \
+		$(use_with svg librsvg) \
+		$(use_with tiff libtiff) \
+		$(use_with udev gudev) \
+		$(use_with wmf) \
+		--with-xmc \
+		$(use_with xpm libxpm) \
+		--without-xvfb-run"
+
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
+	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
+	echo '#!/bin/sh' > py-compile
+	gnome2_src_prepare
+}
+
+_clean_up_locales() {
+	einfo "Cleaning up locales..."
+	for lang in ${LANGS}; do
+		use "linguas_${lang}" && {
+			einfo "- keeping ${lang}"
+			continue
+		}
+		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
+	done
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_convert_shebangs -r $(python_get_version) "${ED}"
+		python_need_rebuild
+	fi
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(get_version_component_range 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	_clean_up_locales
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
+		/usr/$(get_libdir)/gimp/2.0/plug-ins
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
+		/usr/$(get_libdir)/gimp/2.0/plug-ins
+}
--- a/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild
+++ b/media-libs/mediastreamer/mediastreamer-2.8.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/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild,v 1.5 2013/06/22 17:34:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild,v 1.6 2013/06/22 19:35:14 scarabeus Exp $

 EAPI="4"

@ -42,6 +42,7 @@ RDEPEND=">=net-libs/ortp-0.17[ipv6?]
 		X? ( x11-libs/libX11
 			x11-libs/libXv ) )"
 DEPEND="${RDEPEND}
+	dev-util/intltool
 	virtual/pkgconfig
 	x11-proto/videoproto
 	doc? ( app-doc/doxygen )"
--- a/media-libs/mesa/mesa-9.2_pre20130619.ebuild
+++ b/media-libs/mesa/mesa-9.2_pre20130619.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/mesa/mesa-9.2_pre20130619.ebuild,v 1.1 2013/06/19 15:32:40 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2_pre20130619.ebuild,v 1.2 2013/06/22 20:35:19 mattst88 Exp $

 EAPI=5

@ -49,14 +49,13 @@ done

 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl
-	openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
+	openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau
 	wayland xvmc xa xorg kernel_FreeBSD"

 REQUIRED_USE="
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
 	opencl? ( gallium r600-llvm-compiler )
-	gbm?    ( shared-glapi )
 	gles1?  ( egl )
 	gles2?  ( egl )
 	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
@ -276,6 +275,7 @@ src_configure() {
 	econf \
 		--enable-dri \
 		--enable-glx \
+		--enable-shared-glapi \
 		$(use_enable !bindist texture-float) \
 		$(use_enable debug) \
 		$(use_enable egl) \
@ -285,7 +285,6 @@ src_configure() {
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
-		$(use_enable shared-glapi) \
 		$(use_enable xa) \
 		$(use_enable xorg) \
 		--with-dri-drivers=${DRI_DRIVERS} \
--- a/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild
+++ b/media-sound/aqualung/aqualung-0.9_beta11-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/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.3 2013/05/02 16:35:04 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild,v 1.4 2013/06/22 18:34:17 scarabeus Exp $

 EAPI=5

@ -52,11 +52,13 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-use_lrdf_cflags.patch \
 		"${FILESDIR}"/${P}-ffmpeg.patch \
 		"${FILESDIR}"/${P}-libavformat54.patch \
-		"${FILESDIR}"/${P}-automake-1.13.patch
+		"${FILESDIR}"/${P}-automake-1.13.patch \
+		"${FILESDIR}"/${P}-libav9.patch
 	sed -i \
 		-e 's:$(pkgdatadir)/doc:/usr/share/doc/${PF}:' \
 		doc/Makefile.am || die
 	sed -i \
+		-e 's:avcodec_open,:avcodec_open2,:' \
 		-e '/BUILD_CFLAGS/s:-O2::' \
 		-e '/BUILD_CFLAGS/s: -ggdb -g -O0::' \
 		configure.ac || die
--- a/media-sound/aqualung/files/aqualung-0.9_beta11-libav9.patch
+++ b/media-sound/aqualung/files/aqualung-0.9_beta11-libav9.patch
@ -0,0 +1,33 @@
+diff -urN aqualung-0.9beta11.old/configure.ac aqualung-0.9beta11/configure.ac
+--- aqualung-0.9beta11.old/configure.ac	2013-06-22 20:22:58.928689843 +0200
+++ aqualung-0.9beta11/configure.ac	2013-06-22 20:31:52.203670871 +0200
+@@ -661,7 +661,7 @@
+ 	fi
+ 
+ 	AC_CHECK_LIB(avformat, avformat_open_input, [avf_lib=yes], [avf_lib=no], [-lavcodec -lavutil -lz])
+-	AC_CHECK_LIB(avcodec, avcodec_open, [avc_lib=yes], [avc_lib=no], [-lavformat -lavutil -lz])
+	AC_CHECK_LIB(avcodec, avcodec_open2, [avc_lib=yes], [avc_lib=no], [-lavformat -lavutil -lz])
+ 
+ 	if test "$avc_hdr" = "yes" -a "$avf_hdr" = "yes" -a "$avc_lib" = "yes" -a "$avf_lib" = "yes" ; then
+ 	        lavc_LIBS="-lavformat -lavcodec -lavutil -lz"
+diff -urN aqualung-0.9beta11.old/src/decoder/dec_lavc.c aqualung-0.9beta11/src/decoder/dec_lavc.c
+--- aqualung-0.9beta11.old/src/decoder/dec_lavc.c	2013-06-22 20:22:58.933689843 +0200
+++ aqualung-0.9beta11/src/decoder/dec_lavc.c	2013-06-22 20:28:17.916678495 +0200
+@@ -114,7 +114,7 @@
+ 	if (avformat_open_input(&pd->avFormatCtx, filename, NULL, NULL) != 0)
+ 		return DECODER_OPEN_BADLIB;
+ 
+-	if (av_find_stream_info(pd->avFormatCtx) < 0)
+	if (avformat_find_stream_info(pd->avFormatCtx, NULL) < 0)
+ 		return DECODER_OPEN_BADLIB;
+ 
+ 	/* debug */
+@@ -140,7 +140,7 @@
+ 	if (pd->avCodec == NULL)
+ 		return DECODER_OPEN_BADLIB;
+ 
+-	if (avcodec_open(pd->avCodecCtx, pd->avCodec) < 0)
+	if (avcodec_open2(pd->avCodecCtx, pd->avCodec, NULL) < 0)
+ 		return DECODER_OPEN_BADLIB;
+ 
+ 	if ((pd->avCodecCtx->channels != 1) && (pd->avCodecCtx->channels != 2)) {
--- a/media-video/libav/libav-0.8.7.ebuild
+++ b/media-video/libav/libav-0.8.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-0.8.7.ebuild,v 1.12 2013/06/13 12:40:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.7.ebuild,v 1.13 2013/06/23 09:01:01 scarabeus Exp $

 EAPI=5

@ -112,6 +112,7 @@ src_prepare() {
 	if [[ ${PV%_p*} != ${PV} ]]; then
 		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
 	fi
+	epatch "${FILESDIR}/${PN}-0.8.5-support-libcdio-paranoia.patch"
 }

 src_configure() {
--- a/media-video/libav/libav-0.8.9999.ebuild
+++ b/media-video/libav/libav-0.8.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-0.8.9999.ebuild,v 1.23 2013/06/13 12:40:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.24 2013/06/23 09:01:01 scarabeus Exp $

 EAPI=5

@ -112,6 +112,7 @@ src_prepare() {
 	if [[ ${PV%_p*} != ${PV} ]]; then
 		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
 	fi
+	epatch "${FILESDIR}/${PN}-0.8.5-support-libcdio-paranoia.patch"
 }

 src_configure() {
--- a/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch
+++ b/media-video/vdr2jpeg/files/vdr2jpeg-0.1.9-libav9.patch
@ -0,0 +1,54 @@
+--- ffm.cpp.old	2013-06-22 20:12:27.972712290 +0200
+++ ffm.cpp	2013-06-22 20:13:33.586709956 +0200
+@@ -672,7 +672,7 @@
+                         ost->file_index, ost->index);
+                 return false;
+             }
+-            if (avcodec_open(ost->st->codec, codec) < 0) {
+            if (avcodec_open2(ost->st->codec, codec, NULL) < 0) {
+                 fprintf(stderr, "Error while opening codec for output stream #%d.%d - maybe incorrect parameters such as bit_rate, rate, width or height\n",
+                         ost->file_index, ost->index);
+                 return false;
+@@ -691,7 +691,7 @@
+                         ist->st->codec->codec_id, ist->file_index, ist->index);
+                 return false;
+             }
+-            if (avcodec_open(ist->st->codec, codec) < 0) {
+            if (avcodec_open2(ist->st->codec, codec, NULL) < 0) {
+                 fprintf(stderr, "Error while opening codec for input stream #%d.%d\n",
+                         ist->file_index, ist->index);
+                 return false;
+@@ -937,7 +937,7 @@
+ 
+     /* If not enough info to get the stream parameters, we decode the
+        first frames to get it. (used in mpeg case for example) */
+-    ret = av_find_stream_info(ic);
+    ret = avformat_find_stream_info(ic, NULL);
+     if (ret < 0 && verbose >= 0) {
+         fprintf(stderr, "%s: could not find codec parameters\n", filename);
+         return false;
+@@ -1034,12 +1034,13 @@
+     AVCodecContext *video_enc;
+     CodecID codec_id;
+ 
+-    st = av_new_stream(oc, oc->nb_streams);
+    st = avformat_new_stream(oc, NULL);
+     if (!st) {
+         fprintf(stderr, "Could not alloc stream\n");
+         return false;
+     }
+-    avcodec_get_context_defaults2(st->codec, AVMEDIA_TYPE_VIDEO);
+    st->id = oc->nb_streams;
+    avcodec_get_context_defaults3(st->codec, NULL);
+ 
+     video_enc = st->codec;
+ 
+@@ -1204,7 +1205,7 @@
+ {
+     av_log_set_level(verbose);
+     av_register_all();
+-    avctx_opts= avcodec_alloc_context();
+    avctx_opts= avcodec_alloc_context3(NULL);
+ }
+ 
+ void ffm_deinitalize(void)
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild,v 1.7 2013/02/08 21:39:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild,v 1.8 2013/06/22 18:18:02 scarabeus Exp $

-EAPI=4
+EAPI=5

 inherit eutils

@ -30,7 +30,8 @@ src_prepare() {
 		-e "s:-o vdr2jpeg:\$(LDFLAGS) -o vdr2jpeg:" \
 		Makefile || die
 	epatch "${FILESDIR}/${P}-ffmpeg.patch" \
-		"${FILESDIR}/${P}-ffmpeg1.patch"
+		"${FILESDIR}/${P}-ffmpeg1.patch" \
+		"${FILESDIR}/${P}-libav9.patch"
 }

 src_install() {
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Sat, 22 Jun 2013 18:06:55 +0000
+Sun, 23 Jun 2013 09:06:55 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Sat, 22 Jun 2013 18:06:56 +0000
+Sun, 23 Jun 2013 09:06:55 +0000
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6-r4
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.6-r4
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
+EAPI=4
+HOMEPAGE=http://www.bzip.org/
+IUSE=static static-libs abi_x86_32 abi_x86_64 abi_x86_x32
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BZIP2
+RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 )
+SLOT=0
+SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	2f24bbf5311ec79274331abba1a6fbd6	multilib-minimal	70d90bda3149c94f02fa594ff1657ec0	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=8fd896de48fd28b615b4c27b5f9083b1
--- a/metadata/md5-cache/app-emulation/open-vm-tools-2012.10.14.874563
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-2012.10.14.874563
@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu ) xinerama? ( x11-libs/libXinerama ) doc? ( app-doc/doxygen ) virtual/pkgconfig virtual/linux-sources sys-apps/findutils
+DEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu:= ) xinerama? ( x11-libs/libXinerama ) doc? ( app-doc/doxygen ) virtual/pkgconfig virtual/linux-sources sys-apps/findutils
 DESCRIPTION=Opensourced tools for VMware guests
-EAPI=4
+EAPI=5
 HOMEPAGE=http://open-vm-tools.sourceforge.net/
 IUSE=X doc fuse icu +pic xinerama
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
-RDEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu ) xinerama? ( x11-libs/libXinerama )
+RDEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu:= ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://sourceforge/open-vm-tools/open-vm-tools-2012.10.14-874563.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=abd0352f2698a9b90bd815d8443505e6
+_md5_=81a7e6775bcc9e1bae2bafb63febaf77
--- a/metadata/md5-cache/app-emulation/open-vm-tools-2012.12.26.958366
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-2012.12.26.958366
@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu ) xinerama? ( x11-libs/libXinerama ) doc? ( app-doc/doxygen ) virtual/pkgconfig virtual/linux-sources sys-apps/findutils
+DEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu:= ) xinerama? ( x11-libs/libXinerama ) doc? ( app-doc/doxygen ) virtual/pkgconfig virtual/linux-sources sys-apps/findutils
 DESCRIPTION=Opensourced tools for VMware guests
-EAPI=4
+EAPI=5
 HOMEPAGE=http://open-vm-tools.sourceforge.net/
 IUSE=X doc fuse icu +pic xinerama
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
-RDEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu ) xinerama? ( x11-libs/libXinerama )
+RDEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu:= ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://sourceforge/open-vm-tools/open-vm-tools-2012.12.26-958366.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9957052826e21a8a18dd19a213a2cd14
+_md5_=f2fda6b01060f97e3b179b9f0862800e
--- a/metadata/md5-cache/app-emulation/open-vm-tools-2013.04.16.1098359
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-2013.04.16.1098359
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu:= ) xinerama? ( x11-libs/libXinerama ) doc? ( app-doc/doxygen ) virtual/pkgconfig virtual/linux-sources sys-apps/findutils
+DESCRIPTION=Opensourced tools for VMware guests
+EAPI=5
+HOMEPAGE=http://open-vm-tools.sourceforge.net/
+IUSE=X doc fuse icu +pic xinerama
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu:= ) xinerama? ( x11-libs/libXinerama )
+SLOT=0
+SRC_URI=mirror://sourceforge/open-vm-tools/open-vm-tools-2013.04.16-1098359.tar.gz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=b96dcc14c7fcad908eb60c1be28531a4
--- a/metadata/md5-cache/app-emulation/open-vm-tools-8.8.2.590212
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-8.8.2.590212
@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu ) unity? ( dev-libs/uriparser media-libs/libpng:1.2 x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama ) doc? ( app-doc/doxygen ) virtual/pkgconfig virtual/linux-sources sys-apps/findutils
+DEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu:= ) unity? ( dev-libs/uriparser media-libs/libpng:1.2 x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama ) doc? ( app-doc/doxygen ) virtual/pkgconfig virtual/linux-sources sys-apps/findutils
 DESCRIPTION=Opensourced tools for VMware guests
-EAPI=4
+EAPI=5
 HOMEPAGE=http://open-vm-tools.sourceforge.net/
 IUSE=X doc fuse icu +pic unity xinerama
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
-RDEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu ) unity? ( dev-libs/uriparser media-libs/libpng:1.2 x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama )
+RDEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu:= ) unity? ( dev-libs/uriparser media-libs/libpng:1.2 x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://sourceforge/open-vm-tools/open-vm-tools-8.8.2-590212.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b05fef3c37f15638fdbee5fe347273a3
+_md5_=f5a0c49ff230f6bdae5c054c8fb93e2c
--- a/metadata/md5-cache/app-emulation/open-vm-tools-9.2.2.893683
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-9.2.2.893683
@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu ) unity? ( dev-libs/uriparser media-libs/libpng:1.2 x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama ) doc? ( app-doc/doxygen ) virtual/pkgconfig virtual/linux-sources sys-apps/findutils
+DEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu:= ) unity? ( dev-libs/uriparser media-libs/libpng:1.2 x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama ) doc? ( app-doc/doxygen ) virtual/pkgconfig virtual/linux-sources sys-apps/findutils
 DESCRIPTION=Opensourced tools for VMware guests
-EAPI=4
+EAPI=5
 HOMEPAGE=http://open-vm-tools.sourceforge.net/
 IUSE=X doc fuse icu +pic unity xinerama
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
-RDEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu ) unity? ( dev-libs/uriparser media-libs/libpng:1.2 x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama )
+RDEPEND=app-emulation/open-vm-tools-kmod dev-libs/glib:2 dev-libs/libdnet sys-apps/ethtool sys-process/procps virtual/pam X? ( dev-cpp/gtkmm:2.4 x11-base/xorg-server x11-drivers/xf86-input-vmmouse x11-drivers/xf86-video-vmware x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libX11 x11-libs/libXtst ) fuse? ( sys-fs/fuse ) icu? ( dev-libs/icu:= ) unity? ( dev-libs/uriparser media-libs/libpng:1.2 x11-libs/libXScrnSaver ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=mirror://sourceforge/open-vm-tools/open-vm-tools-9.2.2-893683.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5d198ef0e4657795f9c68ee246891069
+_md5_=6a5bdf47c6d521aede126a2ba11cfa92
--- a/metadata/md5-cache/app-emulation/open-vm-tools-kmod-2013.04.16.1098359
+++ b/metadata/md5-cache/app-emulation/open-vm-tools-kmod-2013.04.16.1098359
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=Opensourced tools for VMware guests
+EAPI=4
+HOMEPAGE=http://open-vm-tools.sourceforge.net/
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=mirror://sourceforge/open-vm-tools/open-vm-tools-2013.04.16-1098359.tar.gz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=dc17ed662014e9e9414b0d92e353821f
--- a/metadata/md5-cache/app-emulation/vmware-player-3.1.6.744570
+++ b/metadata/md5-cache/app-emulation/vmware-player-3.1.6.744570
@ -5,11 +5,11 @@ EAPI=2
 HOMEPAGE=http://www.vmware.com/products/player/
 IUSE=doc +vmware-tools
 KEYWORDS=-* ~amd64 ~x86
-LICENSE=vmware
+LICENSE=vmware GPL-2
 PDEPEND=~app-emulation/vmware-modules-238.6 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 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/libview-0.6.6 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=fetch strip
 SLOT=0
 SRC_URI=x86? ( VMware-Player-3.1.6-744570.i386.bundle ) amd64? ( VMware-Player-3.1.6-744570.x86_64.bundle )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vmware-bundle	23c070352c2722510704dae8063293e0
-_md5_=5efa7902f101c4b04196ab30866a4ad0
+_md5_=50538041a32ff0180fabe9681a06ac0d
--- 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
@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://www.vmware.com/products/player/
 IUSE=cups doc +vmware-tools
 KEYWORDS=-* ~amd64 ~x86
-LICENSE=vmware
+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_=7d341f79a1331356f7a2aed6248953c4
+_md5_=4a5184a14492c2303a74c44cf7502d44
--- a/metadata/md5-cache/app-emulation/vmware-player-4.0.5.893925
+++ b/metadata/md5-cache/app-emulation/vmware-player-4.0.5.893925
@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://www.vmware.com/products/player/
 IUSE=cups doc +vmware-tools
 KEYWORDS=-* ~amd64 ~x86
-LICENSE=vmware
+LICENSE=vmware GPL-2
 PDEPEND=~app-emulation/vmware-modules-264.5 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.5/893925/linux/core/VMware-Player-4.0.5-893925.i386.bundle.tar ) amd64? ( https://softwareupdate.vmware.com/cds/vmw-desktop/player/4.0.5/893925/linux/core/VMware-Player-4.0.5-893925.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_=da46988a988e79075cc2b4504cc44d1c
+_md5_=3e6bd3dea5e91c6f2af2b93052d500a8
--- a/metadata/md5-cache/app-emulation/vmware-player-5.0.2.1031769
+++ b/metadata/md5-cache/app-emulation/vmware-player-5.0.2.1031769
@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://www.vmware.com/products/player/
 IUSE=cups doc +vmware-tools
 KEYWORDS=-* ~amd64 ~x86
-LICENSE=vmware
+LICENSE=vmware GPL-2
 PDEPEND=~app-emulation/vmware-modules-271.2 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/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/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/5.0.2/1031769/linux/core/VMware-Player-5.0.2-1031769.i386.bundle.tar ) amd64? ( https://softwareupdate.vmware.com/cds/vmw-desktop/player/5.0.2/1031769/linux/core/VMware-Player-5.0.2-1031769.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_=1cfb372846ac7a42382ffe557ef2b95a
+_md5_=25193c77024808648a55f396addfba56
--- a/metadata/md5-cache/app-emulation/vmware-view-open-client-4.5.0.297975-r1
+++ b/metadata/md5-cache/app-emulation/vmware-view-open-client-4.5.0.297975-r1
@ -1,12 +1,12 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/boost-1.34.1 >=dev-libs/icu-3.8.0 >=dev-libs/libxml2-2.6.0 >=dev-libs/openssl-0.9.8 >=net-misc/curl-7.16.0[ssl] x11-libs/gtk+:2 >=dev-util/intltool-0.21 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/boost-1.34.1 >=dev-libs/icu-3.8.0:= >=dev-libs/libxml2-2.6.0 >=dev-libs/openssl-0.9.8 >=net-misc/curl-7.16.0[ssl] x11-libs/gtk+:2 >=dev-util/intltool-0.21 virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Open Source VMware View Client
-EAPI=4
+EAPI=5
 HOMEPAGE=http://code.google.com/p/vmware-view-open-client/
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/boost-1.34.1 >=dev-libs/icu-3.8.0 >=dev-libs/libxml2-2.6.0 >=dev-libs/openssl-0.9.8 >=net-misc/curl-7.16.0[ssl] x11-libs/gtk+:2 >=net-misc/rdesktop-1.4.1
+RDEPEND=>=dev-libs/boost-1.34.1 >=dev-libs/icu-3.8.0:= >=dev-libs/libxml2-2.6.0 >=dev-libs/openssl-0.9.8 >=net-misc/curl-7.16.0[ssl] x11-libs/gtk+:2 >=net-misc/rdesktop-1.4.1
 SLOT=0
 SRC_URI=http://vmware-view-open-client.googlecode.com/files/VMware-view-open-client-source-4.5.0-297975.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b477ba605410dafa535e5a2082eda6c2
+_md5_=de4ab5e0da5635e866bfa3d67f3b25e9
--- a/metadata/md5-cache/app-emulation/vmware-workstation-7.1.6.744570
+++ b/metadata/md5-cache/app-emulation/vmware-workstation-7.1.6.744570
@ -5,11 +5,11 @@ EAPI=2
 HOMEPAGE=http://www.vmware.com/products/workstation/
 IUSE=doc vix +vmware-tools
 KEYWORDS=-* ~amd64 ~x86
-LICENSE=vmware
+LICENSE=vmware GPL-2
 PDEPEND=~app-emulation/vmware-modules-238.6 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/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 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/libview-0.6.6 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-server !app-emulation/vmware-player
 RESTRICT=fetch mirror strip
 SLOT=0
 SRC_URI=x86? ( VMware-Workstation-7.1.6-744570.i386.bundle ) amd64? ( VMware-Workstation-7.1.6-744570.x86_64.bundle )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	vmware-bundle	23c070352c2722510704dae8063293e0
-_md5_=90a0fda0b5ffed8cffd7aeb1b207adea
+_md5_=79668f2aeaff50910700d8884b81193c
--- 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
@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://www.vmware.com/products/workstation/
 IUSE=cups doc ovftool server vix vmware-tools
 KEYWORDS=-* ~amd64 ~x86
-LICENSE=vmware
+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_=84bb04de0c556bfa0d17fc134ba0e61c
+_md5_=fa78473f20af06641ea8a9662327b622
--- a/metadata/md5-cache/app-emulation/vmware-workstation-8.0.5.893925
+++ b/metadata/md5-cache/app-emulation/vmware-workstation-8.0.5.893925
@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://www.vmware.com/products/workstation/
 IUSE=cups doc ovftool server vix vmware-tools
 KEYWORDS=-* ~amd64 ~x86
-LICENSE=vmware
+LICENSE=vmware GPL-2
 PDEPEND=~app-emulation/vmware-modules-264.5 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.5/893925/linux/core/VMware-Workstation-8.0.5-893925.i386.bundle.tar ) amd64? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/8.0.5/893925/linux/core/VMware-Workstation-8.0.5-893925.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_=4e27489ed375d440246420589ea0979c
+_md5_=4a1f2b7db3ec06d9fbac5fa290905e17
--- a/metadata/md5-cache/app-emulation/vmware-workstation-9.0.2.1031769
+++ b/metadata/md5-cache/app-emulation/vmware-workstation-9.0.2.1031769
@ -5,11 +5,11 @@ EAPI=4
 HOMEPAGE=http://www.vmware.com/products/workstation/
 IUSE=cups doc ovftool server vix vmware-tools
 KEYWORDS=-* ~amd64 ~x86
-LICENSE=vmware
+LICENSE=vmware GPL-2
 PDEPEND=~app-emulation/vmware-modules-271.2 vmware-tools? ( app-emulation/vmware-tools )
 RDEPEND=dev-cpp/cairomm dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm 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/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/9.0.2/1031769/linux/core/VMware-Workstation-9.0.2-1031769.i386.bundle.tar ) amd64? ( https://softwareupdate.vmware.com/cds/vmw-desktop/ws/9.0.2/1031769/linux/core/VMware-Workstation-9.0.2-1031769.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_=3bdc3a6b3468abec4d0809bb518a867e
+_md5_=069b05e2fd99c45cc3ef0b5f62fe7213
--- a/metadata/md5-cache/app-text/pandoc-1.11.1
+++ b/metadata/md5-cache/app-text/pandoc-1.11.1
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/citeproc-hs-0.3.7:=[profile?] <dev-haskell/citeproc-hs-0.4:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] =dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/highlighting-kate-0.5.3.7:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.8:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] =dev-haskell/pandoc-types-1.10*:=[profile?] =dev-haskell/parsec-3.1*:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.13:=[profile?] =dev-haskell/temporary-1.1*:=[profile?] >=dev-haskell/texmath-0.6.1.3:=[profile?] <dev-haskell/texmath-0.7:=[profile?] =dev-haskell/text-0.11*:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] =dev-haskell/zlib-0.5*:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 =dev-haskell/hunit-1.2* >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/citeproc-hs-0.3.7:=[profile?] <dev-haskell/citeproc-hs-0.4:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] =dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/highlighting-kate-0.5.3.9:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.8:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] =dev-haskell/pandoc-types-1.10*:=[profile?] =dev-haskell/parsec-3.1*:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.13:=[profile?] =dev-haskell/temporary-1.1*:=[profile?] >=dev-haskell/texmath-0.6.1.5:=[profile?] <dev-haskell/texmath-0.7:=[profile?] =dev-haskell/text-0.11*:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] =dev-haskell/zlib-0.5*:=[profile?] >=dev-lang/ghc-7.0.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 =dev-haskell/hunit-1.2* >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=Conversion between markup formats
 EAPI=5
 HOMEPAGE=http://johnmacfarlane.net/pandoc
 IUSE=embed_data_files doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/citeproc-hs-0.3.7:=[profile?] <dev-haskell/citeproc-hs-0.4:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] =dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/highlighting-kate-0.5.3.7:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.8:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] =dev-haskell/pandoc-types-1.10*:=[profile?] =dev-haskell/parsec-3.1*:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.13:=[profile?] =dev-haskell/temporary-1.1*:=[profile?] >=dev-haskell/texmath-0.6.1.3:=[profile?] <dev-haskell/texmath-0.7:=[profile?] =dev-haskell/text-0.11*:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] =dev-haskell/zlib-0.5*:=[profile?] >=dev-lang/ghc-7.0.1:=
+RDEPEND=>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/citeproc-hs-0.3.7:=[profile?] <dev-haskell/citeproc-hs-0.4:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] =dev-haskell/extensible-exceptions-0.1*:=[profile?] >=dev-haskell/highlighting-kate-0.5.3.9:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.8:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?] =dev-haskell/pandoc-types-1.10*:=[profile?] =dev-haskell/parsec-3.1*:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.13:=[profile?] =dev-haskell/temporary-1.1*:=[profile?] >=dev-haskell/texmath-0.6.1.5:=[profile?] <dev-haskell/texmath-0.7:=[profile?] =dev-haskell/text-0.11*:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?] =dev-haskell/zlib-0.5*:=[profile?] >=dev-lang/ghc-7.0.1:=
 SLOT=0/1.11.1
 SRC_URI=mirror://hackage/packages/archive/pandoc/1.11.1/pandoc-1.11.1.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	0fe5ac58a8b877fae07bb258b762852e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=cc67afb2e7f35f8977ef0ab00c5c1580
+_md5_=e8c1ede4f9f2fb5e3f75f8e1abec7477
--- a/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.3.9
+++ b/metadata/md5-cache/dev-haskell/highlighting-kate-0.5.3.9
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prerm setup test
+DEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-6.10.4:= pcre-light? ( =dev-haskell/pcre-light-0.4*:=[profile?] ) !pcre-light? ( dev-haskell/regex-pcre-builtin:=[profile?] ) >=dev-haskell/cabal-1.10 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Syntax highlighting
+EAPI=5
+HOMEPAGE=http://github.com/jgm/highlighting-kate
+IUSE=executable pcre-light doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/blaze-html-0.4.2:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-lang/ghc-6.10.4:= pcre-light? ( =dev-haskell/pcre-light-0.4*:=[profile?] ) !pcre-light? ( dev-haskell/regex-pcre-builtin:=[profile?] )
+SLOT=0/0.5.3.9
+SRC_URI=mirror://hackage/packages/archive/highlighting-kate/0.5.3.9/highlighting-kate-0.5.3.9.tar.gz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	0fe5ac58a8b877fae07bb258b762852e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=37ddd623ffa5294754c99cb9af5733fa
--- a/metadata/md5-cache/dev-haskell/texmath-0.6.1.5
+++ b/metadata/md5-cache/dev-haskell/texmath-0.6.1.5
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=>=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-6.10.4:= cgi? ( dev-haskell/cgi:=[profile?] dev-haskell/json:=[profile?] dev-haskell/utf8-string:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Conversion of LaTeX math formulas to MathML or OMML.
+EAPI=5
+HOMEPAGE=http://github.com/jgm/texmath
+IUSE=cgi test doc hscolour profile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-haskell/parsec-3:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/xml:=[profile?] >=dev-lang/ghc-6.10.4:= cgi? ( dev-haskell/cgi:=[profile?] dev-haskell/json:=[profile?] dev-haskell/utf8-string:=[profile?] )
+SLOT=0/0.6.1.5
+SRC_URI=mirror://hackage/packages/archive/texmath/0.6.1.5/texmath-0.6.1.5.tar.gz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	ghc-package	2d57c65a8826a1c4234d2de7f1b9f486	haskell-cabal	0fe5ac58a8b877fae07bb258b762852e	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=0b40c9204f35a23d7adb7d230c8740e1
--- a/metadata/md5-cache/dev-python/hcs-utils-1.4_rc5
+++ b/metadata/md5-cache/dev-python/hcs-utils-1.4_rc5
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] test? ( dev-python/pytest[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=A library containing some useful snippets
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/hcs_utils
+IUSE=test python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=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_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hcs_utils/hcs_utils-1.4rc5.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_=5bc70e1660ada73f039610bd5d1949b6
--- a/metadata/md5-cache/dev-python/hgdistver-0.16-r1
+++ b/metadata/md5-cache/dev-python/hgdistver-0.16-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,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_pypy2_0(-)] test? ( dev-python/pytest[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_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_pypy2_0(-)] ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_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_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_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_pypy2_0(-)]
+DESCRIPTION=utility lib to generate python package version infos from mercurial tags
+EAPI=5
+HOMEPAGE=http://bitbucket.org/RonnyPfannschmidt/hgdistver/
+IUSE=test 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_pypy2_0
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+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_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_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_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_pypy2_0 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hgdistver/hgdistver-0.16.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_=b4e66bc4074cc39260995bc761970198
--- a/metadata/md5-cache/dev-python/hglib-1.0
+++ b/metadata/md5-cache/dev-python/hglib-1.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) 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_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Library for using the Mercurial Command Server from Python
+EAPI=5
+HOMEPAGE=http://mercurial.selenic.com/
+IUSE=examples test python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-vcs/mercurial-2.4.2 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_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-hglib/python-hglib-1.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_=d833e65e994e2456b40c1b9418b3c858
--- a/metadata/md5-cache/dev-ruby/rake-0.9.6
+++ b/metadata/md5-cache/dev-ruby/rake-0.9.6
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=app-arch/gzip ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) test? ( dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) test? ( dev-ruby/minitest[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 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=Make-like scripting in Ruby
+EAPI=4
+HOMEPAGE=http://rake.rubyforge.org/
+IUSE=doc elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/rake-0.9.6.gem
+_eclasses_=bash-completion-r1	5deec68e4713fd23ce30d4d9ed712908	eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=b1b1b53881a46c9850b75fd11684eca1
--- a/metadata/md5-cache/dev-ruby/treetop-1.4.14
+++ b/metadata/md5-cache/dev-ruby/treetop-1.4.14
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( test? ( >=dev-ruby/rr-0.10.2[ruby_targets_ruby18] dev-ruby/activesupport[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rr-0.10.2[ruby_targets_ruby19] dev-ruby/activesupport[ruby_targets_ruby19] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Treetop is a language for describing languages.
+EAPI=5
+HOMEPAGE=http://treetop.rubyforge.org/
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/polyglot-0.3.1[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=mirror://rubygems/treetop-1.4.14.gem
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=81b1cdd5e3d68be634c81b16f2537c44
--- a/metadata/md5-cache/dev-util/cdiff-0.9.2
+++ b/metadata/md5-cache/dev-util/cdiff-0.9.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!app-misc/colordiff dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-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(-)] sys-apps/less 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 ) 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_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
+DESCRIPTION=Colored, side-by-side diff terminal viewer.
+EAPI=5
+HOMEPAGE=https://github.com/ymattw/cdiff
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!app-misc/colordiff dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-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(-)] sys-apps/less 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 ) 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_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cdiff/cdiff-0.9.2.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_=c6afa6b3409b98e1450a839f75a61373
--- a/metadata/md5-cache/games-rpg/manaplus-1.3.4.14
+++ b/metadata/md5-cache/games-rpg/manaplus-1.3.4.14
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib media-libs/libpng:0 media-fonts/dejavu >=dev-games/guichan-0.8.1[sdl] media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils x11-misc/xsel nls? ( virtual/libintl ) opengl? ( virtual/opengl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
-EAPI=5
-HOMEPAGE=http://manaplus.evolonline.org
-IUSE=nls opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib media-libs/libpng:0 media-fonts/dejavu >=dev-games/guichan-0.8.1[sdl] media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils x11-misc/xsel nls? ( virtual/libintl ) opengl? ( virtual/opengl )
-SLOT=0
-SRC_URI=http://download.evolonline.org/manaplus/download/1.3.4.14/manaplus-1.3.4.14.tar.xz
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e92c23931bdd97079f5bae03a97c9f8d
--- a/metadata/md5-cache/games-rpg/manaplus-1.3.6.23
+++ b/metadata/md5-cache/games-rpg/manaplus-1.3.6.23
@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl sys-libs/zlib media-libs/libpng:0 media-fonts/dejavu >=dev-games/guichan-0.8.1[sdl] media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils x11-misc/xsel nls? ( virtual/libintl ) opengl? ( virtual/opengl )
 SLOT=0
-SRC_URI=http://download.evolonline.org/manaplus/download/1.3.5.12/manaplus-1.3.5.12.tar.xz
+SRC_URI=http://download.evolonline.org/manaplus/download/1.3.6.23/manaplus-1.3.6.23.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	games	0fb7637597e0869f6c8be79b11d0135a	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b30d084b31ffa19763b2d7f1607582eb
+_md5_=d2ccb2045a2a5f47a9e20b71657364a8
--- a/metadata/md5-cache/kde-misc/eyesaver-0.4
+++ b/metadata/md5-cache/kde-misc/eyesaver-0.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=media-libs/phonon >=sys-apps/sed-4 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-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=KDE4 plasmoid. Reminds us to take our eyes off the screen
+EAPI=5
+HOMEPAGE=http://www.kde-look.org/content/show.php/Eyesaver?content=89989
+IUSE=debug aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-1
+RDEPEND=media-libs/phonon >=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] 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=http://www.kde-look.org/CONTENT/content-files/89989-eyesaver-0.4.tar.gz
+_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_=7977f6f7b34ab07b2f25ccdfc021aac3
--- a/metadata/md5-cache/kde-misc/socket-sentry-0.9.3
+++ b/metadata/md5-cache/kde-misc/socket-sentry-0.9.3
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=net-libs/libpcap-0.8 test? ( dev-cpp/gmock dev-cpp/gtest ) >=sys-apps/sed-4 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-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=A KDE plasmoid that displays real-time network traffic on your Linux computer.
+EAPI=5
+HOMEPAGE=http://code.google.com/p/socket-sentry
+IUSE=debug test aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=net-libs/libpcap-0.8 >=kde-base/oxygen-icons-4.4:4[aqua=] 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=http://socket-sentry.googlecode.com/files/socketsentry-0.9.3.tar.gz
+_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_=d883117d1f972ae596c8861dc2c27c78
--- a/metadata/md5-cache/kde-misc/stdin-plasmoid-0.2_beta1
+++ b/metadata/md5-cache/kde-misc/stdin-plasmoid-0.2_beta1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-apps/sed-4 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-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=KDE4 plasmoid for executing a process and capturing its stderr and stdout.
+EAPI=5
+HOMEPAGE=http://www.kde-look.org/content/show.php/STDIN+Plasmoid?content=92309
+IUSE=debug aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] 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=http://www.kde-look.org/CONTENT/content-files/92309-0.2-beta1.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_=3e4483feed8591c97131a1e58867e4ca
--- a/metadata/md5-cache/kde-misc/todo-list-0.4
+++ b/metadata/md5-cache/kde-misc/todo-list-0.4
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-apps/sed-4 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-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=KDE4 plasmoid that shows a 'todo' list, using the korganizer 'Active calendar' resource file.
+EAPI=5
+HOMEPAGE=http://kde-look.org/content/show.php/todo+list?content=90706
+IUSE=debug aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=kde-base/plasma-workspace-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] 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=http://kde-look.org/CONTENT/content-files/90706-todo_plasmoid-0.4.tar.bz
+_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_=b4deff908566864df674dc531cd638e2
--- a/metadata/md5-cache/media-gfx/gimp-2.8.6
+++ b/metadata/md5-cache/media-gfx/gimp-2.8.6
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/udev[gudev] ) sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=3
+HOMEPAGE=http://www.gimp.org/
+IUSE=alsa aalib altivec bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm linguas_am linguas_ar linguas_ast linguas_az linguas_be linguas_bg linguas_br linguas_ca linguas_ca@valencia linguas_cs linguas_csb linguas_da linguas_de linguas_dz linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_km linguas_kn linguas_ko linguas_lt linguas_lv linguas_mk linguas_ml linguas_ms linguas_my linguas_nb linguas_nds linguas_ne linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_si linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_tt linguas_uk linguas_vi linguas_xh linguas_yi linguas_zh_CN linguas_zh_HK linguas_zh_TW debug
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~arm-linux ~x86-linux
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/udev[gudev] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+SLOT=2
+SRC_URI=mirror://gimp/v2.8/gimp-2.8.6.tar.bz2
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	7976d3f4d0c0816c67033d3dcd4d9472	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=e026058e283a7d934bdebbecb2607af6
--- a/metadata/md5-cache/media-libs/mediastreamer-2.8.2
+++ b/metadata/md5-cache/media-libs/mediastreamer-2.8.2
@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-libs/ortp-0.17[ipv6?] alsa? ( media-libs/alsa-lib ) g726? ( >=media-libs/spandsp-0.0.6_pre1 ) gsm? ( media-sound/gsm ) portaudio? ( media-libs/portaudio ) pulseaudio? ( >=media-sound/pulseaudio-0.9.21 ) speex? ( >=media-libs/speex-1.2_beta3 ) video? ( virtual/ffmpeg v4l? ( media-libs/libv4l sys-kernel/linux-headers ) theora? ( media-libs/libtheora ) sdl? ( media-libs/libsdl[video,X] ) X? ( x11-libs/libX11 x11-libs/libXv ) ) virtual/pkgconfig x11-proto/videoproto doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=net-libs/ortp-0.17[ipv6?] alsa? ( media-libs/alsa-lib ) g726? ( >=media-libs/spandsp-0.0.6_pre1 ) gsm? ( media-sound/gsm ) portaudio? ( media-libs/portaudio ) pulseaudio? ( >=media-sound/pulseaudio-0.9.21 ) speex? ( >=media-libs/speex-1.2_beta3 ) video? ( virtual/ffmpeg v4l? ( media-libs/libv4l sys-kernel/linux-headers ) theora? ( media-libs/libtheora ) sdl? ( media-libs/libsdl[video,X] ) X? ( x11-libs/libX11 x11-libs/libXv ) ) dev-util/intltool virtual/pkgconfig x11-proto/videoproto doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Mediastreaming library for telephony application
 EAPI=4
 HOMEPAGE=http://www.linphone.org/
@ -12,4 +12,4 @@ REQUIRED_USE=|| ( oss alsa portaudio coreaudio pulseaudio ) video? ( || ( sdl X
 SLOT=0
 SRC_URI=mirror://nongnu/linphone/mediastreamer/mediastreamer-2.8.2.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=295234a5dcb9423ca926e15d40702359
+_md5_=c21de75cc65131be0983591cf9fb9eae
--- a/metadata/md5-cache/media-libs/mesa-9.2_pre20130619
+++ b/metadata/md5-cache/media-libs/mesa-9.2_pre20130619
@ -3,12 +3,12 @@ DEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=5
 HOMEPAGE=http://mesa3d.sourceforge.net/
-IUSE=video_cards_i915 video_cards_i965 video_cards_ilo video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_nouveau video_cards_vmware bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau wayland xvmc xa xorg kernel_FreeBSD python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+IUSE=video_cards_i915 video_cards_i965 video_cards_ilo video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_nouveau video_cards_vmware bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau wayland xvmc xa xorg kernel_FreeBSD python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT SGI-B-2.0
 RDEPEND=!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.7 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 opencl? ( app-admin/eselect-opencl dev-libs/libclc ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( x11-base/xorg-server:= x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.45[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.45[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.45[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.45[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.45[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] )
-REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) opencl? ( gallium r600-llvm-compiler ) gbm? ( shared-glapi ) gles1? ( egl ) gles2? ( egl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) wayland? ( egl ) xa? ( gallium ) xorg? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
+REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) opencl? ( gallium r600-llvm-compiler ) gles1? ( egl ) gles2? ( egl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) wayland? ( egl ) xa? ( gallium ) xorg? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=mirror://gentoo/mesa-9.2_pre20130619.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9aa9cecaaf78644be7c0b8b8dc814dce	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3e5912960cff91912dc3118bc5320c76
+_md5_=b98f41a1c6ed9d768f9c72a96b03ab65
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST SetupDocs-1.0.5.tar.gz 7867 SHA256 65dbb32703129a02840ec66258e32d37f93ec99cdba25f3db407bf7e43216441 SHA512 effaa952db8fda92f0dd6ffc5264289ce3a4157cfe5635f2936a877fa66b54d9e9917a6511bf009cbc157589956037f5d760cde2605e0c2bdba382fda341641d WHIRLPOOL 64353ca119aff6c4a75f3440b6a9ed35a159b84aa666bcaf9e1ff5e989b475e94a534d97710bca501da301d60d39c46fb94370fd26e71cbd386044d3fd985768`
				`@ -0,0 +1 @@`
				`DIST 89989-eyesaver-0.4.tar.gz 9663 SHA256 416144b018862e0c4d0f1b9084ffe8d2bb0ccf804b5021a436f02e01fa7db32b SHA512 b597a81155a0ee1d323d1fe89032b87432909414355cf2e151cbc1ed073dbb0067f41fd4b3774dd374fb73a596f9542794b415d6b27b01e0098dfea293ec506a WHIRLPOOL b1522450913fe323e662c5085317cd8017d9eeaa68a2e1ef4883fe06a63ab44dc4cb21c944ef7dac2a38416a8936abc5354656e6ab9cb2da107ae714568a3c11`
				`@ -0,0 +1 @@`
				`DIST socketsentry-0.9.3.tar.gz 156935 SHA256 1b8bfe859a2dd640647662e0b534a1f6dac429ee1252eed6887619704d9b26f6 SHA512 235e82370e8927ef03acb08af69dd97dfd67d9fa9a7c7d50bec1c504cd2d6d7bd3c102cb90cf212b772f838c1c1bce94b525bf2eecafe5827532d0f32c848c38 WHIRLPOOL 815a0867cec9984e07b110ed4c291e6d9db38bb2b9eb2fafa31330362cc4aba35610a118527265b0683292accd5733496e94b13f0a3e13d4fdb5e8e6522651f2`
				`@ -0,0 +1 @@`
				`DIST 92309-0.2-beta1.tar.bz2 27400 SHA256 29c2ea5bcddffb1b3d0e2326bb50025a413bc904e50093582ba928812ddb8d6d SHA512 93d8ec9a45b1c447754af73162fd8924a84f788c873d6c0cbe57283873ea986a8abf47966beb07be5ff8d6eb89c3f46c85edf6aace20266425fa42815cb07cd8 WHIRLPOOL d12e38b9f06623a00c7786ece6aac13476ca70f35f3a169a9807cac98c2dbf13023906754b234426cb168fe0848e9150d4ab05fa1161e739e70ed652faf303da`
				`@ -0,0 +1 @@`
				`DIST 90706-todo_plasmoid-0.4.tar.bz 18284 SHA256 4ac8504842dbc7f9b4096acef8b4e11c4c10eaa59012bcea55b0c0a9bcec95c6 SHA512 5a3c822db25387b5334d880e4cba8b3693f8717a0b0679aaac269a986dfcae72bc3115ddde1d75f5f0327334c99dc9828f03fa4f34f10c5ee98a182ba56dc39a WHIRLPOOL 02c2bdac2dc41295b34553bd6dbcb11b1af58fae2c884b2be52c44a910b081399e8d3ab8d6ab680865b048754e64d1ea0f98edcbdc3d4e1ed98bccaf876369c9`