Sync with portage [Wed Jan 25 20:34:25 MSK 2012].

2012-01-25 20:34:26 +04:00 · 2012-01-25 20:34:26 +04:00 · e13b7d5a97
commit e13b7d5a97
parent 6c67c38ca3
128 changed files with 2970 additions and 1660 deletions
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@ -1,6 +1,4 @@
 DIST qemu-kvm-0.14.1-backports-2.tar.bz2 20045 RMD160 a6dfdfc4969ff96d287af389c99c9df9df16ff07 SHA1 4ea70f09ca8d24e30d307319352d9857031d3ccb SHA256 ab0e30b550475b379215d2fdeae9be2b8ad4e66a42bfad406683132892ea5982
 DIST qemu-kvm-0.14.1.tar.gz 5321321 RMD160 e3d69b4756bb0e45d14baad72d85827d949e0ae0 SHA1 7378f10ea04db19e5a5009cae1ecb65517e82877 SHA256 a59c4f6ab8646f2f019d2f9f15443e4db8289cf7cf47743d3c63d18fc584da27
-DIST qemu-kvm-0.15.0-backports-1.tar.bz2 1174 RMD160 4ec6259824f18e7704e88b1c348cb21756345ea3 SHA1 c8788c8d9788fe868ece37c00100a17fe402eb84 SHA256 337810cd52fb8002ae39fcc1d486a224419664a064040c887ce66fe889360969
-DIST qemu-kvm-0.15.0.tar.gz 5916130 RMD160 71e32e95368b84e9441a9a1d051b03ed9b04d3ed SHA1 b009c05461fed20f3f3c3a03b153c457e33683d4 SHA256 828e771bffa540b0fbfe6fa5250adc92d5416720134d1f55a45c7926d83a4478
 DIST qemu-kvm-0.15.1.tar.gz 5915998 RMD160 dba914ca40d6c63e9f3abce409d7daee1d33323b SHA1 2716ddfc49d98fee67a1ff0de9b199d211e72bec SHA256 aed6a3faa76c1e9601b4b5b8adbe5867a70c64567175f44944d88e16bd49733e
 DIST qemu-kvm-1.0.tar.gz 6210473 RMD160 6503b6ec9c8d89b785d644f5c4b47b4716e2fab7 SHA1 c16be4924c30747d93d609b7909e9e9239150c9a SHA256 b711ead5a0a28bf43e7e51ce2082e37120a3527ab012c609bc30fb94d37e116e
--- a/app-emulation/qemu-kvm/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch
+++ b/app-emulation/qemu-kvm/files/qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch
@ -0,0 +1,37 @@
+From d0ed2d2e8e863a9a64c9fc9c08fa68bee546ad00 Mon Sep 17 00:00:00 2001
+From: Anthony Liguori <aliguori@us.ibm.com>
+Date: Mon, 23 Jan 2012 07:30:43 -0600
+Subject: [PATCH 26/26] e1000: bounds packet size against buffer size
+
+Otherwise we can write beyond the buffer and corrupt memory.  This is tracked
+as CVE-2012-0029.
+
+Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
+---
+ hw/e1000.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/hw/e1000.c b/hw/e1000.c
+index 986ed9c..e164d79 100644
+--- a/hw/e1000.c
+++ b/hw/e1000.c
+@@ -466,6 +466,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
+             bytes = split_size;
+             if (tp->size + bytes > msh)
+                 bytes = msh - tp->size;
+
+            bytes = MIN(sizeof(tp->data) - tp->size, bytes);
+             pci_dma_read(&s->dev, addr, tp->data + tp->size, bytes);
+             if ((sz = tp->size + bytes) >= hdr && tp->size < hdr)
+                 memmove(tp->header, tp->data, hdr);
+@@ -481,6 +483,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
+         // context descriptor TSE is not set, while data descriptor TSE is set
+         DBGOUT(TXERR, "TCP segmentaion Error\n");
+     } else {
+        split_size = MIN(sizeof(tp->data) - tp->size, split_size);
+         pci_dma_read(&s->dev, addr, tp->data + tp->size, split_size);
+         tp->size += split_size;
+     }
+-- 
+1.7.7.6
+
--- a/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild
@ -1,292 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild,v 1.7 2012/01/22 21:23:30 slyfox Exp $
-
-BACKPORTS=1
-
-EAPI="3"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
-	GIT_ECLASS="git-2"
-fi
-
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib
-
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
-	${BACKPORTS:+
-		http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-# xen is disabled until the deps are fixed
-IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \
-png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
-+vhost-net xattr xen"
-# static, depends on libsdl being built with USE=static-libs, which can not
-# be expressed in current EAPI's
-
-COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets. x86_64 should be the only
-# defaults on for qemu-kvm
-IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	if [ "x${target}" = "xx86_64" ]; then
-		continue
-	fi
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-done
-
-RESTRICT="test"
-
-RDEPEND="
-	!app-emulation/kqemu
-	!app-emulation/qemu
-	!app-emulation/qemu-softmmu
-	!app-emulation/qemu-user
-	!app-emulation/qemu-kvm-spice
-	>=dev-libs/glib-2.0
-	sys-apps/pciutils
-	>=sys-apps/util-linux-2.16.0
-	sys-libs/zlib
-	aio? ( dev-libs/libaio )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	brltty? ( app-accessibility/brltty )
-	curl? ( >=net-misc/curl-7.15.4 )
-	esd? ( media-sound/esound )
-	fdt? ( >=sys-apps/dtc-1.2.0 )
-	jpeg? ( virtual/jpeg )
-	ncurses? ( sys-libs/ncurses )
-	nss? ( dev-libs/nss )
-	png? ( media-libs/libpng )
-	pulseaudio? ( media-sound/pulseaudio )
-	qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	sdl? ( >=media-libs/libsdl-1.2.11[X] )
-	spice? ( >=app-emulation/spice-0.6.0 )
-	ssl? ( net-libs/gnutls )
-	vde? ( net-misc/vde )
-	xattr? ( sys-apps/attr )
-	xen? ( app-emulation/xen-tools )
-"
-
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	dev-util/pkgconfig
-	>=sys-kernel/linux-headers-2.6.35"
-
-kvm_kern_warn() {
-	eerror "Please enable KVM support in your kernel, found at:"
-	eerror
-	eerror "  Virtualization"
-	eerror "    Kernel-based Virtual Machine (KVM) support"
-	eerror
-}
-
-pkg_setup() {
-	if ! use qemu_softmmu_targets_x86_64 && use x86_64 ; then
-		eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
-	fi
-
-	if ! use qemu_softmmu_targets_x86_64 && use x86 ; then
-		eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
-	fi
-
-	if kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-		eerror "Either upgrade your kernel"
-	else
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-			kvm_kern_warn
-		elif ! linux_chkconfig_present KVM; then
-			kvm_kern_warn
-		fi
-		if use vhost-net && ! linux_chkconfig_present VHOST_NET ; then
-			ewarn "You have to enable CONFIG_VHOST_NET in the kernel"
-			ewarn "to have vhost-net support."
-		fi
-	fi
-
-	enewgroup kvm
-}
-
-src_prepare() {
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-	# append CFLAGS while linking
-	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
-
-	# remove part to make udev happy
-	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
-
-	# ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones
-	# to the qemu-devel ml - bug 337988
-	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
-
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-}
-
-src_configure() {
-	local conf_opts audio_opts user_targets
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets} ${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets} ${target}-linux-user"
-	done
-
-	if [ -z "${softmmu_targets}" ]; then
-		eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm"
-		die "At least 1 SoftMMU target must be enabled"
-	else
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-	fi
-
-	if [ ! -z "${user_targets}" ]; then
-		einfo "Building the following user targets: ${user_targets}"
-		conf_opts="${conf_opts} --enable-linux-user"
-	else
-		conf_opts="${conf_opts} --disable-linux-user"
-	fi
-
-	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
-	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
-	# Add support for static builds
-	#use static && conf_opts="${conf_opts} --static"
-
-	# Support debug USE flag
-	use debug && conf_opts="${conf_opts} --enable-debug --disable-strip"
-
-	# Fix the $(prefix)/etc issue
-	conf_opts="${conf_opts} --sysconfdir=/etc"
-
-	#config options
-	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
-	conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
-	conf_opts="${conf_opts} $(use_enable brltty brlapi)"
-	conf_opts="${conf_opts} $(use_enable curl)"
-	conf_opts="${conf_opts} $(use_enable fdt)"
-	conf_opts="${conf_opts} $(use_enable hardened user-pie)"
-	conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
-	conf_opts="${conf_opts} $(use_enable ncurses curses)"
-	conf_opts="${conf_opts} $(use_enable nss smartcard-nss)"
-	conf_opts="${conf_opts} $(use_enable png vnc-png)"
-	conf_opts="${conf_opts} $(use_enable rbd)"
-	conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
-	conf_opts="${conf_opts} $(use_enable sdl)"
-	conf_opts="${conf_opts} $(use_enable spice)"
-	conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
-	conf_opts="${conf_opts} $(use_enable threads vnc-thread)"
-	conf_opts="${conf_opts} $(use_enable vde)"
-	conf_opts="${conf_opts} $(use_enable vhost-net)"
-	conf_opts="${conf_opts} $(use_enable xen)"
-	conf_opts="${conf_opts} $(use_enable xattr attr)"
-	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa ${audio_opts}"
-	use esd && audio_opts="esd ${audio_opts}"
-	use pulseaudio && audio_opts="pa ${audio_opts}"
-	use sdl && audio_opts="sdl ${audio_opts}"
-	./configure --prefix=/usr \
-		--disable-strip \
-		--disable-werror \
-		--enable-kvm \
-		--enable-nptl \
-		--enable-uuid \
-		${conf_opts} \
-		--audio-drv-list="${audio_opts}" \
-		--target-list="${softmmu_targets} ${user_targets}" \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		|| die "configure failed"
-
-		# this is for qemu upstream's threaded support which is
-		# in development and broken
-		# the kvm project has its own support for threaded IO
-		# which is always on and works
-		# --enable-io-thread \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if [ ! -z "${softmmu_targets}" ]; then
-		insinto /$(get_libdir)/udev/rules.d/
-		doins kvm/scripts/65-kvm.rules || die
-
-		if use qemu-ifup; then
-			insinto /etc/qemu/
-			insopts -m0755
-			doins kvm/scripts/qemu-ifup || die
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			dobin "${FILESDIR}"/qemu-kvm
-			dosym /usr/bin/qemu-kvm /usr/bin/kvm
-		else
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
-		fi
-	fi
-
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
-	dohtml qemu-doc.html qemu-tech.html || die
-}
-
-pkg_postinst() {
-
-	if [ ! -z "${softmmu_targets}" ]; then
-		elog "If you don't have kvm compiled into the kernel, make sure you have"
-		elog "the kernel module loaded before running kvm. The easiest way to"
-		elog "ensure that the kernel module is loaded is to load it on boot."
-		elog "For AMD CPUs the module is called 'kvm-amd'"
-		elog "For Intel CPUs the module is called 'kvm-intel'"
-		elog "Please review /etc/conf.d/modules for how to load these"
-		elog
-		elog "Make sure your user is in the 'kvm' group"
-		elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-		elog
-		elog "You will need the Universal TUN/TAP driver compiled into your"
-		elog "kernel or loaded as a module to use the virtual network device"
-		elog "if using -net tap.  You will also need support for 802.1d"
-		elog "Ethernet Bridging and a configured bridge if using the provided"
-		elog "kvm-ifup script from /etc/kvm."
-		elog
-		elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
-	fi
-}
--- a/app-emulation/qemu-kvm/qemu-kvm-1.0-r2.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-1.0-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.ebuild,v 1.7 2012/01/24 20:59:56 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0-r2.ebuild,v 1.1 2012/01/25 06:29:42 cardoe Exp $

 #BACKPORTS=1

@ -67,8 +67,10 @@ RDEPEND="
 	sys-apps/pciutils
 	>=sys-apps/util-linux-2.16.0
 	sys-libs/zlib
-	amd64? ( sys-apps/seabios )
-	x86? ( sys-apps/seabios )
+	amd64? ( sys-apps/seabios
+		sys-apps/vgabios )
+	x86? ( sys-apps/seabios
+		sys-apps/vgabios )
 	aio? ( dev-libs/libaio )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
@ -188,6 +190,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0-fix-nonkvm-arches.patch
 	epatch "${FILESDIR}"/${PN}-1.0-fix-qemu-system-ppc.patch

+	# bug #400595 / CVE-2012-0029
+	epatch "${FILESDIR}"/${P}-e1000-bounds-packet-size-against-buffer-size.patch
+
 	[[ -n ${BACKPORTS} ]] && \
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
 			epatch
@ -313,6 +318,18 @@ src_install() {
 		# Remove SeaBIOS since we're using the SeaBIOS packaged one
 		rm "${D}/usr/share/qemu/bios.bin"
 		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+
+		# Remove vgabios since we're using the vgabios packaged one
+		rm "${D}/usr/share/qemu/vgabios.bin"
+		rm "${D}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${D}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${D}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${D}/usr/share/qemu/vgabios-vmware.bin"
+		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
 	fi
 }

--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.30 2012/01/23 22:10:14 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.32 2012/01/25 06:02:34 cardoe Exp $

 #BACKPORTS=1

@ -65,8 +65,10 @@ RDEPEND="
 	sys-apps/pciutils
 	>=sys-apps/util-linux-2.16.0
 	sys-libs/zlib
-	amd64? ( sys-apps/seabios )
-	x86? ( sys-apps/seabios )
+	amd64? ( sys-apps/seabios
+		sys-apps/vgabios )
+	x86? ( sys-apps/seabios
+		sys-apps/vgabios )
 	aio? ( dev-libs/libaio )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
@ -322,6 +324,18 @@ src_install() {
 		# Remove SeaBIOS since we're using the SeaBIOS packaged one
 		rm "${D}/usr/share/qemu/bios.bin"
 		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+
+		# Remove vgabios since we're using the vgabios packaged one
+		rm "${D}/usr/share/qemu/vgabios.bin"
+		rm "${D}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${D}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${D}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${D}/usr/share/qemu/vgabios-vmware.bin"
+		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
 	fi
 }

--- a/app-misc/lockfile-progs/Manifest
+++ b/app-misc/lockfile-progs/Manifest
@ -1,2 +1,2 @@
-DIST lockfile-progs_0.1.13.tar.gz 116495 RMD160 507c084ba10619c5853edcb91f288b9c66a6f8d2 SHA1 ae3dfb42d4c1b6c9bc9be7a502d657ed2b58f74d SHA256 375c6068579770eaad73000eed54615fc8f4fb1ebd9384ed00ab7d0409711303
 DIST lockfile-progs_0.1.15.tar.gz 137270 RMD160 bb457d5794a41a222532a716cba5f3c59a70b9f6 SHA1 2494defdd7ac8828eb43744b116d31eadb0cf08c SHA256 51a4d932a1dba6a55cfffd0b4e4f0497c4a62da84e071b57b6c0f6eb9d81a960
+DIST lockfile-progs_0.1.16.tar.gz 155901 RMD160 59f98bfba025b7265cfc0869b86964acb8b21d52 SHA1 5624cefcf7ef5bca87544b7d7571fa33d8596bdc SHA256 f95132d632687af971da830497f06257fa86aedbc4b76874456652f06a0a8a69
--- a/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild
+++ b/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild
@ -1,10 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lockfile-progs/lockfile-progs-0.1.13.ebuild,v 1.6 2010/03/28 19:03:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild,v 1.1 2012/01/25 14:07:07 phajdan.jr Exp $

-EAPI="2"
-
-inherit eutils
+EAPI="4"

 DESCRIPTION="Programs to safely lock/unlock files and mailboxes"
 HOMEPAGE="http://packages.debian.org/sid/lockfile-progs"
@ -12,20 +10,16 @@ SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~s390 ~sh ~sparc x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE=""

 DEPEND="net-libs/liblockfile"
 RDEPEND="${DEPEND}"

-S="${WORKDIR}/sid"
+S="${WORKDIR}/main"

 src_prepare() {
 	# Provide better Makefile, with clear separation between compilation
 	# and installation.
-	cp "${FILESDIR}/Makefile" . || die "cp failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	cp "${FILESDIR}/Makefile" . || die
 }
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@ -1,2 +1,3 @@
 DIST tmux-1.4.tar.gz 259614 RMD160 d8d09ccac7c1c79244f96beccbd6d52f1cc50d1b SHA1 c0cb9b01aee9b2b5c939bacccd5c78cf6fa6773e SHA256 c7e005f32e256b8ece214b71c51947f4081af8c5f0400083e4adaac2c258bbc7
 DIST tmux-1.5.tar.gz 374093 RMD160 08eec02bcbd91b3c37a36a05167f3758e7911973 SHA1 e26132f02f344f8d6d06ae87d11f6a7aad880f67 SHA256 eb8215b57c05b765d2446d9acb2bc5edcdb3eb4ea31af89ee127a27e90056306
+DIST tmux-1.6.tar.gz 388633 RMD160 e88d1ac4751920bf5a6b52be80f332f1eb2e8694 SHA1 8756f6bcecb18102b87e5d6f5952ba2541f68ed3 SHA256 faee08ba1bd8c22537cd5b7458881d1bdb4985df88ed6bc5967c56881a7efbd6
--- a/app-misc/tmux/tmux-1.6.ebuild
+++ b/app-misc/tmux/tmux-1.6.ebuild
@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.6.ebuild,v 1.1 2012/01/25 09:03:16 wired Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="http://tmux.sourceforge.net"
+SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="vim-syntax"
+
+DEPEND="
+	|| ( >=dev-libs/libevent-2.0.10 <dev-libs/libevent-2 )
+	sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	vim-syntax? ( || (
+			app-editors/vim
+			app-editors/gvim ) )"
+
+DOCS=( CHANGES FAQ NOTES TODO )
+
+pkg_setup() {
+	if has_version "<app-misc/tmux-1.3"; then
+		echo
+		ewarn "Commands 'up-pane', 'down-pane' and 'select-prompt' were removed in version 1.3."
+		ewarn "You may want to update your configuration file accordingly to avoid errors on"
+		ewarn "tmux startup."
+		ewarn
+		ewarn "For the full Changelog, together with details on what replaced the above"
+		ewarn "commands, visit http://tmux.svn.sourceforge.net/viewvc/tmux/trunk/CHANGES"
+		ewarn
+		ewarn "WARNING: after updating to ${P} you will _not_ be able to connect to any"
+		ewarn "running 1.2 tmux server instances. You'll have to use an existing client to"
+		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
+		ewarn "to temporarily downgrade to tmux 1.2 to access them."
+		echo
+	elif has_version "<app-misc/tmux-1.6"; then
+		echo
+		ewarn "Some configuration options changed in this release."
+		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
+		ewarn "or visit http://tmux.svn.sourceforge.net/viewvc/tmux/trunk/CHANGES"
+		ewarn "for more details."
+		echo
+	fi
+}
+
+src_prepare() {
+	# look for config file in the prefix
+	sed -i -e '/SYSTEM_CFG/s:"/etc:"'"${EPREFIX}"'/etc:' tmux.h || die
+	# and don't just add some includes
+	sed -i -e 's:-I/usr/local/include::' Makefile.in || die
+}
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc examples/*.conf
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/tmux.vim
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}"/tmux.vim
+	fi
+}
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@ -1,2 +1,3 @@
 DIST akonadi-1.5.2.tar.bz2 209050 RMD160 51c4658fef5e9d638b2446d7e62f57d339225a7f SHA1 c5d24a2c553ec26e975ab51f98cf74a8a64af633 SHA256 4a4299ff360998c897a528f557013519cceb29be88ee4f235dd88aad41964e68
 DIST akonadi-1.6.2.tar.bz2 211347 RMD160 d4f923054a794ecbb03fd6a13db4c9e69a57975c SHA1 f02302686f6e50be240d1e73280c00a10c8ccf11 SHA256 29e5cffbc806b30ded70ba486e71a2aaf0e7b9ea1a798881b2e9bf25535b1696
+DIST akonadi-1.7.0.tar.bz2 210281 RMD160 0125b31a02143be7e50f427162bc9e7d0421a94d SHA1 794be377ed42d6ec906a3c9eb36af28493d7ea56 SHA256 bfb9228d83c1dfe1787883682afc4b9ac8b35096888a2b1ba0d3bc604d96b580
--- a/app-office/akonadi-server/akonadi-server-1.7.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.7.0.ebuild
@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.7.0.ebuild,v 1.1 2012/01/25 14:51:10 johu Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="mysql postgres +sqlite test"
+
+CDEPEND="
+	dev-libs/boost
+	>=dev-libs/soprano-2.6.51
+	>=x11-libs/qt-gui-4.5.0:4[dbus]
+	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
+	>=x11-libs/qt-test-4.5.0:4
+	x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+S=${WORKDIR}/${P/-server/}
+
+pkg_setup() {
+	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about driver name change
+	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+		ewarn
+		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+	fi
+
+	# Notify about MySQL not being default anymore
+	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+		ewarn
+		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
+		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+		ewarn "${CATEGORY}/${PN}."
+		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_USE_STRIGI_SEARCH=OFF
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	echo
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@ -1,3 +1,4 @@
 DIST html-xml-utils-2.8.tar.gz 193198 RMD160 38596222bd890278b902546f8c43a8eb6407ff24 SHA1 1b7f6a9186758eec9f115b8e6e30ed7d1f42f306 SHA256 41d5407a3baf4f82c6f6673f6590d835efe59f3a2c684a98ea620161e61608e4
 DIST html-xml-utils-5.3.tar.gz 233248 RMD160 1dc6e949e68392be78140a62a1b0f42fcbab82dd SHA1 97976bf56d9d8fd3835325b14490d190751f31a7 SHA256 8b2735f048895148be42693e9bbba6d23262ef638e01f9ccbb373c37e5c4a4e0
 DIST html-xml-utils-5.5.tar.gz 303827 RMD160 a0a5fc13237fd3d4366f7a6bcf37efd9c1f08389 SHA1 ec1e6d52825a6aa9e9aff0a34679621de5e419ba SHA256 2d381e5bfd7ace166ae5515e5eced3196eb84d3b7199c60896d573b18d6ba754
+DIST html-xml-utils-6.0.tar.gz 267172 RMD160 50273cd1cdc9d3459c8a0b0b09e1c2c7660fb6d6 SHA1 74f57eb8f1abec30fbc3dbbe37caa20ce6a72e48 SHA256 a3c5e562302c47030622f89a1893226f2fe3de4127c343618ba1e229a1b6e15a
--- a/app-text/html-xml-utils/html-xml-utils-6.0.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-6.0.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-6.0.ebuild,v 1.1 2012/01/25 10:09:36 radhermit Exp $
+
+EAPI=4
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files."
+SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags.patch
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-arm_resprect_cflags.patch
@ -0,0 +1,40 @@
+diff -ur a/js/src/configure.in b/js/src/configure.in
+--- a/js/src/configure.in	2011-07-17 13:43:42.000000000 +0200
+++ b/js/src/configure.in	2011-07-17 13:47:39.000000000 +0200
+@@ -4607,9 +4607,6 @@
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_THUMB2)
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -mthumb -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
+       fi
+@@ -4623,9 +4620,6 @@
+     arm*)
+       if test "$GNU_CC"; then
+         AC_DEFINE(MOZ_ARM_ARCH)
+-        CFLAGS="$CFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        CXXFLAGS="$CXXFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+-        ASFLAGS="$ASFLAGS -march=armv7-a -marm -mfloat-abi=softfp $MOZ_ARM_VFP_FLAGS"
+       else
+         AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-GNU toolchains])
+       fi
+@@ -4634,16 +4628,6 @@
+       AC_MSG_ERROR([--with-cpu-arch=armv7 is not supported for non-ARM CPU architectures])
+     ;;
+   esac
+-else
+-  case "$target_cpu" in
+-    arm*)
+-      if test "$GNU_CC"; then
+-        CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-        ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork -msoft-float"
+-      fi
+-      ;;
+-  esac
+ fi
+ 
+ AC_SUBST(MOZ_THUMB2)
--- a/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
+++ b/dev-lang/spidermonkey/files/spidermonkey-1.8.5-fix-ppc64.patch
@ -18,7 +18,7 @@ diff --git a/js/src/Makefile.in b/js/src/Makefile.in
 #############################################
 
 -ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
-+ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
+ifeq (,$(filter arm% %86 x86_64,$(TARGET_CPU)))
 
 VPATH +=	$(srcdir)/assembler \
 		$(srcdir)/assembler/wtf \
@ -28,4 +28,34 @@ diff --git a/js/src/Makefile.in b/js/src/Makefile.in
 CPPSRCS += 	pcre_compile.cpp \
                 pcre_exec.cpp \

+# HG changeset patch
+# User Luke Wagner <lw@mozilla.com>
+# Date 1299520258 28800
+# Node ID 68203913d04cf5be53fd16278816183d5670ba5c
+# Parent  27e5814815491ebb68e474e453aff6c2ea908c43
+Bug 618485 - Add missing 64-bit big-endian jsval_layout field (r=luke)
+
+diff --git a/js/src/jsval.h b/js/src/jsval.h
+--- a/js/src/jsval.h
+++ b/js/src/jsval.h
+@@ -342,16 +342,17 @@ typedef union jsval_layout
+         JSValueTag         tag : 17;
+         uint64             payload47 : 47;
+     } debugView;
+     struct {
+         union {
+             int32          i32;
+             uint32         u32;
+             JSWhyMagic     why;
+            jsuword        word;
+         } payload;
+     } s;
+     double asDouble;
+     void *asPtr;
+ } jsval_layout;
+ # endif /* JS_BITS_PER_WORD */
+ #endif  /* defined(IS_LITTLE_ENDIAN) */
+ 
+
+

--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
@ -1,9 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.2 2011/11/26 04:49:25 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.4 2012/01/25 14:34:43 anarchy Exp $

 EAPI="3"
-inherit eutils toolchain-funcs multilib python versionator pax-utils
+WANT_AUTOCONF="2.1"
+inherit autotools eutils toolchain-funcs multilib python versionator pax-utils

 MY_PN="js"
 TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
@ -38,6 +39,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
 	# https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
 	epatch "${FILESDIR}/${P}-fix-ppc64.patch"
+	# https://bugs.gentoo.org/show_bug.cgi?id=400727
+	epatch "${FILESDIR}/${P}-arm_resprect_cflags.patch"

 	epatch_user

@ -45,6 +48,9 @@ src_prepare() {
 		# Don't try to be smart, this does not work in cross-compile anyway
 		ln -sfn "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
 	fi
+
+	cd ${S}/js/src
+	eautoconf
 }

 src_configure() {
--- a/dev-libs/libappindicator/libappindicator-0.4.1-r201.ebuild
+++ b/dev-libs/libappindicator/libappindicator-0.4.1-r201.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-0.4.1-r201.ebuild,v 1.4 2011/11/28 16:49:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-0.4.1-r201.ebuild,v 1.5 2012/01/25 14:59:44 ssuominen Exp $

 EAPI=4

@ -43,8 +43,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-mono.patch
 	eautoreconf

-	rm -f py-compile
-	ln -s $(type -P true) py-compile
+	>py-compile
 }

 src_configure() {
--- a/dev-python/PyQt4/PyQt4-4.9.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.ebuild,v 1.2 2011/12/27 18:10:31 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.ebuild,v 1.3 2012/01/25 13:24:31 wired Exp $

 EAPI="3"
 PYTHON_DEPEND="*"
@ -36,7 +36,7 @@ DEPEND=">=dev-python/sip-4.13.1
 	)
 	declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 )
 	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
-	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
+	opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.8.0:4 >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) )
 	phonon? (
 		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) )
 		kde? ( media-libs/phonon )
--- a/dev-ruby/ruby-oci8/ruby-oci8-2.0.6.ebuild
+++ b/dev-ruby/ruby-oci8/ruby-oci8-2.0.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oci8/ruby-oci8-2.0.6.ebuild,v 1.3 2012/01/22 15:16:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-oci8/ruby-oci8-2.0.6.ebuild,v 1.4 2012/01/25 10:31:15 tomka Exp $

 EAPI="2"
 USE_RUBY="ruby18"
@ -12,7 +12,7 @@ HOMEPAGE="http://rubyforge.org/projects/ruby-oci8/"
 SRC_URI="mirror://rubyforge/${PN}/${P}.tar.gz"
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 RDEPEND="dev-db/oracle-instantclient-basic"
--- a/dev-ruby/webrobots/Manifest
+++ b/dev-ruby/webrobots/Manifest
@ -1,2 +1,3 @@
 DIST webrobots-0.0.11.gem 16384 RMD160 e951757e1366be259debea9e04141127446a14a2 SHA1 42f8d4c5b36c1de8b007d5d88613c190aca798fc SHA256 a96eaac96fdb1a809ca5853b770658bdd5395ad30046e2eb219ecde581e618e0
 DIST webrobots-0.0.12.gem 16384 RMD160 979fc835e1795355cdffef1328f5b3a1302bfb36 SHA1 24ef2e244dec92ec8860c461ae9ea43c2194191e SHA256 c333f652e00ba17162be6cabed61cf14dc47fa4b31421583cdddbffec72ad2a2
+DIST webrobots-0.0.13.gem 16384 RMD160 aa7a1dce20d180ea0cfaefedbb5b7257a9214e82 SHA1 3c04625711705f3af354942f2bb410d1545e761d SHA256 eade843b13ee1927ebda438eb5e6e856552787c8c92d47e586fe93f908eedbf8
--- a/dev-ruby/webrobots/webrobots-0.0.13.ebuild
+++ b/dev-ruby/webrobots/webrobots-0.0.13.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/webrobots/webrobots-0.0.13.ebuild,v 1.1 2012/01/25 07:21:51 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ree18 ruby19"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to help write robots.txt compliant web robots."
+HOMEPAGE="http://rubygems.org/gems/webrobots"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
+
+ruby_add_bdepend "test? ( dev-ruby/shoulda )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/bundler/,/end/d' Rakefile test/helper.rb || die
+	sed -i -e '/rcovtask/,/end/d' \
+		   -e '/jeweler/,/RubygemsDotOrgTasks/d' Rakefile || die
+}
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@ -1,2 +1,3 @@
 DIST cinnamon-1.1.3.tar.gz 2273742 RMD160 37f6cc48c6c46c69c8da16c647af3675ee3c0347 SHA1 fa563ab939d3cc47ab4833f611bfb2904ca32257 SHA256 dc349c4d924503468a34f61513c768d83aaef685811ec388f2ee826e195ff65c
+DIST cinnamon-1.2.tar.gz 2375269 RMD160 66844177f0b9a331c2bf59434ffbfa39504f4854 SHA1 bdf91cef0e01ccbdf4d1b4e35c0f51ad04adacbd SHA256 caa83d0536bc08e2446277bb744efdf141b40cf705f4cf86ffbb91dea5d6d488
 DIST cinnamon-session_1.0.0_all.deb 1634 RMD160 3420dd6144fe184cd0b049f9a7dc0b033b3cdb5a SHA1 f963e4473dbdb28964357f742119cf1c87c3361f SHA256 720e07da6f3163346db9d01fff1b8771aaf145c2d406a4e88435826a38de0134
--- a/gnome-extra/cinnamon/cinnamon-1.2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.2.ebuild
@ -0,0 +1,192 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2.ebuild,v 1.1 2012/01/25 08:43:16 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.5"
+
+inherit autotools eutils gnome2 pax-utils python
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+
+SRC_URI="https://github.com/linuxmint/Cinnamon/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+bluetooth +networkmanager"
+KEYWORDS="~amd64 ~x86"
+
+# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
+# latest gsettings-desktop-schemas is needed due to commit 602fa1c6
+# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
+# libXfixes-5.0 needed for pointer barriers
+# gnome-menus-3.2.0.1-r1 needed for new 10-xdg-menu-gnome
+COMMON_DEPEND=">=dev-libs/glib-2.29.10:2
+	>=dev-libs/gjs-1.29.18
+	>=dev-libs/gobject-introspection-0.10.1
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.0.0:3[introspection]
+	>=media-libs/clutter-1.7.5:1.0[introspection]
+	app-misc/ca-certificates
+	>=dev-libs/folks-0.5.2
+	>=dev-libs/json-glib-0.13.2
+	>=gnome-base/gnome-desktop-2.91.2:3
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-extra/evolution-data-server-2.91.6
+	>=media-libs/gstreamer-0.10.16:0.10
+	>=media-libs/gst-plugins-base-0.10.16:0.10
+	>=net-im/telepathy-logger-0.2.4[introspection]
+	net-libs/libsoup:2.4[introspection]
+	>=net-libs/telepathy-glib-0.15.5[introspection]
+	>=net-misc/networkmanager-0.8.999[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=x11-wm/muffin-1.0.0[introspection]
+
+	dev-libs/dbus-glib
+	dev-libs/libxml2:2
+	x11-libs/pango[introspection]
+	>=dev-libs/libcroco-0.6.2:0.6
+
+	gnome-base/gconf:2[introspection]
+	>=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection]
+	gnome-base/librsvg
+	media-libs/libcanberra
+	media-sound/pulseaudio
+
+	>=x11-libs/startup-notification-0.11
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-apps/mesa-progs
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] )
+	networkmanager? (
+		gnome-base/libgnome-keyring
+		>=net-misc/networkmanager-0.8.999[introspection] )"
+# Runtime-only deps are probably incomplete and approximate.
+# Each block:
+# 2. Introspection stuff + dconf needed via imports.gi.*
+# 3. gnome-session is needed for gnome-session-quit
+# 4. Control shell settings
+# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
+#    user switching with gdm-3.1.x)
+# 6. caribou needed for on-screen keyboard
+# 7. xdg-utils needed for xdg-open, used by extension tool
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/libgnomekbd-2.91.4[introspection]
+	sys-power/upower[introspection]
+
+	>=gnome-base/gnome-session-3.2.1-r1
+
+	>=gnome-base/gnome-settings-daemon-2.91
+	>=gnome-base/gnome-control-center-2.91.92-r1
+
+	>=sys-apps/accountsservice-0.6.14[introspection]
+
+	>=app-accessibility/caribou-0.3
+
+	x11-misc/xdg-utils
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.17
+	>=dev-util/pkgconfig-0.22
+	>=dev-util/intltool-0.40
+	gnome-base/gnome-common
+	!!=dev-lang/spidermonkey-1.8.2*"
+# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
+# https://bugs.gentoo.org/show_bug.cgi?id=360413
+S="${WORKDIR}/linuxmint-Cinnamon-185383f"
+
+pkg_setup() {
+	DOCS="AUTHORS NEWS README"
+	# Don't error out on warnings
+	G2CONF="${G2CONF}
+		--enable-compile-warnings=maximum
+		--disable-schemas-compile
+		--disable-jhbuild-wrapper-script
+		$(use_with bluetooth)
+		$(use_enable networkmanager)
+		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
+		BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	epatch "${FILESDIR}/${PN}-1.1.3-automagic-gnome-bluetooth.patch"
+
+	# Make networkmanager optional, bug #398593
+	epatch "${FILESDIR}/${PN}-1.2-optional-networkmanager.patch"
+
+	# Do not depend on libgnome (patch from gnome-shell 3.3.x)
+	epatch "${FILESDIR}/${PN}-1.1.3-extensionjs_path.patch"
+	epatch "${FILESDIR}/${PN}-1.1.3-xdg-open.patch"
+
+	# Gentoo uses /usr/libexec
+	sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \
+		-i "files/usr/share/gnome-session/sessions/cinnamon.session" || die "sed 1 failed"
+
+	eautoreconf
+	gnome2_src_prepare
+
+	# Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765
+	# Note: sed Makefile.in because it is generated from several Makefile.ams
+	sed -e 's/-DG_DISABLE_DEPRECATED//g' \
+		-i src/Makefile.in browser-plugin/Makefile.in || die "sed 2 failed"
+}
+
+src_install() {
+	gnome2_src_install
+	python_convert_shebangs 2 "${D}"/usr/bin/cinnamon-extension-tool
+
+	# Required for gnome-shell on hardened/PaX, bug #398941
+	pax-mark mr "${ED}usr/bin/cinnamon"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \
+	   ! has_version 'media-plugins/gst-plugins-vp8'; then
+		ewarn "To make use of Cinnamon's built-in screen recording utility,"
+		ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23"
+		ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version ">=x11-base/xorg-server-1.11"; then
+		ewarn "If you use multiple screens, it is highly recommended that you"
+		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
+		ewarn "pointer barriers which will make it easier to use hot corners."
+	fi
+
+	if has_version "<x11-drivers/ati-drivers-12"; then
+		ewarn "Cinnamon has been reported to show graphical corruption under"
+		ewarn "x11-drivers/ati-drivers-11.*; you may want to use GNOME in"
+		ewarn "fallback mode, or switch to open-source drivers."
+	fi
+
+	if has_version "media-libs/mesa[video_cards_radeon]"; then
+		elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers."
+		elog "Make sure that gallium architecture for r300 and r600 drivers is"
+		elog "selected using 'eselect mesa'."
+		if ! has_version "media-libs/mesa[gallium]"; then
+			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
+		fi
+	fi
+
+	if has_version "media-libs/mesa[video_cards_intel]"; then
+		elog "Cinnamon is unstable under gallium-mode i915/i965 mesa drivers."
+		elog "Make sure that classic architecture for i915 and i965 drivers is"
+		elog "selected using 'eselect mesa'."
+		if ! has_version "media-libs/mesa[classic]"; then
+			ewarn "You will need to emerge media-libs/mesa with USE=classic."
+		fi
+	fi
+}
--- a/gnome-extra/cinnamon/files/cinnamon-1.2-optional-networkmanager.patch
+++ b/gnome-extra/cinnamon/files/cinnamon-1.2-optional-networkmanager.patch
@ -0,0 +1,186 @@
+From 10f58d37fb7b2531bc2239bbc36337d2b3abde45 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 25 Jan 2012 01:58:07 -0500
+Subject: [PATCH] Make NM optional
+
+Derived from a patch for gnome-shell by Michael Biebl <biebl@debian.org>
+(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652482#29)
+---
+ configure.ac         |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
+ js/misc/config.js.in |    2 ++
+ js/ui/main.js        |    7 +++++--
+ js/ui/panel.js       |    3 ++-
+ src/Makefile.am      |   13 ++++++++-----
+ 5 files changed, 63 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9e1d63d..a9606a6 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -94,8 +94,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
+ 			       libcanberra
+                                telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
+                                telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
+-                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+-                               libnm-glib libnm-util gnome-keyring-1)
+                               polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
+
+##########################
+# Check for NetworkManager
+##########################
+NM_MIN_VERSION=0.9
+AC_ARG_ENABLE(networkmanager,
+              AS_HELP_STRING([--disable-networkmanager],
+                             [disable NetworkManager support @<:@default=auto@:>@]),,
+              [enable_networkmanager=auto])
+
+if test "x$enable_networkmanager" != "xno"; then
+   PKG_CHECK_MODULES(NETWORKMANAGER,
+                     [libnm-glib libnm-util gnome-keyring-1],
+                     [have_networkmanager=yes],
+                     [have_networkmanager=no])
+
+   CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
+   CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
+else
+   have_networkmanager="no  (disabled)"
+fi
+
+if test "x$have_networkmanager" = "xyes"; then
+   AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
+   AC_SUBST([HAVE_NETWORKMANAGER], [1])
+else
+   if test "x$enable_networkmanager" = "xyes"; then
+      AC_MSG_ERROR([Couldn't find NetworkManager.])
+   fi
+   AC_SUBST([HAVE_NETWORKMANAGER], [0])
+fi
+
+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
+ 
+ PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)
+ 
+@@ -250,3 +282,15 @@ AC_CONFIG_FILES([
+   files/Makefile
+ ])
+ AC_OUTPUT
+
+echo "
+Build configuration:
+
+	Prefix:                                 ${prefix}
+	Source code location:                   ${srcdir}
+	Compiler:                               ${CC}
+	Compiler Warnings:                      $enable_compile_warnings
+
+	Support for NetworkManager:             $have_networkmanager
+	Support for GStreamer recording:        $build_recorder
+"
+diff --git a/js/misc/config.js.in b/js/misc/config.js.in
+index 704989b..df7e014 100644
+--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
+@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
+ const GJS_VERSION = '@GJS_VERSION@';
+ /* 1 if gnome-bluetooth is available, 0 otherwise */
+ const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
+/* 1 if networkmanager is available, 0 otherwise */
+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
+ /* The system TLS CA list */
+ const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';
+diff --git a/js/ui/main.js b/js/ui/main.js
+index daeb4f7..2be3018 100644
+--- a/js/ui/main.js
+++ b/js/ui/main.js
+@@ -14,6 +14,7 @@ const St = imports.gi.St;
+ 
+ const AutomountManager = imports.ui.automountManager;
+ const AutorunManager = imports.ui.autorunManager;
+const Config = imports.misc.config;
+ const EndSessionDialog = imports.ui.endSessionDialog;
+ const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
+ const Environment = imports.ui.environment;
+@@ -27,7 +28,7 @@ const PlacesManager = imports.ui.placesManager;
+ const RunDialog = imports.ui.runDialog;
+ const Layout = imports.ui.layout;
+ const LookingGlass = imports.ui.lookingGlass;
+-const NetworkAgent = imports.ui.networkAgent;
+const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null;
+ const NotificationDaemon = imports.ui.notificationDaemon;
+ const WindowAttentionHandler = imports.ui.windowAttentionHandler;
+ const Scripting = imports.ui.scripting;
+@@ -103,7 +104,9 @@ function _createUserSession() {
+     placesManager = new PlacesManager.PlacesManager();    
+     automountManager = new AutomountManager.AutomountManager();
+     autorunManager = new AutorunManager.AutorunManager();
+-    networkAgent = new NetworkAgent.NetworkAgent();
+    if (Config.HAVE_NETWORKMANAGER) {
+        networkAgent = new NetworkAgent.NetworkAgent();
+    }
+ }
+ 
+ function _createGDMSession() {
+diff --git a/js/ui/panel.js b/js/ui/panel.js
+index 677d907..25ea0c6 100644
+--- a/js/ui/panel.js
+++ b/js/ui/panel.js
+@@ -44,7 +44,8 @@ if (Config.HAVE_BLUETOOTH)
+     STANDARD_STATUS_AREA_CINNAMON_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
+ 
+ try {
+-    STANDARD_STATUS_AREA_CINNAMON_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
+    if (Config.HAVE_NETWORKMANAGER)
+        STANDARD_STATUS_AREA_CINNAMON_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet; 
+ } catch(e) {
+     log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
+ }
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 182bf17..54770e7 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -108,9 +108,7 @@ cinnamon_public_headers_h =		\
+ 	cinnamon-generic-container.h	\
+ 	cinnamon-gtk-embed.h		\
+ 	cinnamon-global.h			\
+-	cinnamon-mobile-providers.h	\
+ 	cinnamon-mount-operation.h		\
+-	cinnamon-network-agent.h		\
+ 	cinnamon-perf-log.h		\
+ 	cinnamon-slicer.h			\
+ 	cinnamon-stack.h			\
+@@ -145,9 +143,7 @@ libcinnamon_la_SOURCES =		\
+ 	cinnamon-generic-container.c	\
+ 	cinnamon-gtk-embed.c		\
+ 	cinnamon-global.c			\
+-	cinnamon-mobile-providers.c	\
+ 	cinnamon-mount-operation.c		\
+-	cinnamon-network-agent.c		\
+ 	cinnamon-perf-log.c		\
+ 	cinnamon-polkit-authentication-agent.h	\
+ 	cinnamon-polkit-authentication-agent.c	\
+@@ -161,6 +157,10 @@ libcinnamon_la_SOURCES =		\
+ 	cinnamon-wm.c			\
+ 	cinnamon-xfixes-cursor.c
+ 
+if HAVE_NETWORKMANAGER
+libcinnamon_la_SOURCES += cinnamon-mobile-providers.h cinnamon-mobile-providers.c cinnamon-network-agent.h cinnamon-network-agent.c
+endif
+
+ libcinnamon_la_gir_sources = \
+ 	$(filter-out %-private.h $(cinnamon_recorder_non_gir_sources), $(cinnamon_public_headers_h) $(libcinnamon_la_SOURCES))
+ 
+@@ -272,7 +272,10 @@ libcinnamon_la_LIBADD =		\
+ libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
+ 
+ Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
+-Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6
+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6
+if HAVE_NETWORKMANAGER
+Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
+endif
+ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
+ Cinnamon_0_1_gir_LIBS = libcinnamon.la
+ Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
+-- 
+1.7.8.4
+
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@ -2,3 +2,4 @@ DIST libgda-4.2.11.tar.xz 11253296 RMD160 4dc6d0ed9edaa479e937183eeab74a18e7e951
 DIST libgda-4.2.12.tar.xz 11238088 RMD160 e15139cec3b843ca4d927482850de6b4527e676b SHA1 a7fb768ddb58742dbe102c112eb44bb08fafd708 SHA256 636c17d0a7380d77eb89c19426dc62580f900a86b9dd93cb0b03210ff77769f9
 DIST libgda-4.2.9.tar.xz 11215344 RMD160 fd172c5aac8ed76b97b9c66f0558c79ad373d3d1 SHA1 57205e2ec041f8138a85b7b5e5728dc0f1266fb6 SHA256 bbae913734b0bf0149b36d1b8617e343f08611c10219fa5ba24b84dfa782e814
 DIST libgda-5.0.2.tar.xz 11596872 RMD160 e537451442d9ce2653ab5a07ac1875241c8af4eb SHA1 cba9fd7f734782e021801e05214a89bf4b752a33 SHA256 53e710a76298a224546803ecee711e610c68cf6938bd908e6d7e3c9bab183593
+DIST libgda-5.0.3.tar.xz 11623340 RMD160 b72781633aec2f139ce6fe1d34006513cd58f7ef SHA1 151159134f4083e86a3b556fd80c48376e584290 SHA256 82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc
--- a/gnome-extra/libgda/libgda-5.0.3.ebuild
+++ b/gnome-extra/libgda/libgda-5.0.3.ebuild
@ -0,0 +1,151 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3.ebuild,v 1.1 2012/01/25 11:01:11 pacho Exp $
+
+EAPI="4"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
+PYTHON_DEPEND="2"
+
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
+
+DESCRIPTION="Gnome Database Access Library"
+HOMEPAGE="http://www.gnome-db.org/"
+LICENSE="GPL-2 LGPL-2"
+
+IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl vala"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.16:2
+	>=dev-libs/libxml2-2
+	dev-libs/libxslt
+	sys-libs/readline
+	sys-libs/ncurses
+	berkdb?   ( sys-libs/db )
+	!bindist? ( firebird? ( dev-db/firebird ) )
+	gtk? (
+		>=x11-libs/gtk+-3.0.0:3
+		canvas? ( x11-libs/goocanvas:2.0 )
+		sourceview? ( x11-libs/gtksourceview:3.0 )
+		graphviz? ( media-gfx/graphviz )
+	)
+	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
+	http? ( >=net-libs/libsoup-2.24:2.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
+	json?     ( dev-libs/json-glib )
+	ldap?     ( net-nds/openldap )
+	mdb?      ( >app-office/mdbtools-0.5 )
+	mysql?    ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	ssl?      ( dev-libs/openssl )
+	>=dev-db/sqlite-3.6.22:3"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.18
+	>=dev-util/intltool-0.35.5
+	>=app-text/gnome-doc-utils-0.9
+	doc? ( >=dev-util/gtk-doc-1 )
+	vala? ( >=dev-lang/vala-0.14:0.14[vapigen] )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+
+	if use canvas || use graphviz || use sourceview; then
+		if ! use gtk; then
+			ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
+			ewarn "Disabling for now."
+			G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
+		else
+			G2CONF="${G2CONF}
+				$(use_with canvas goocanvas)
+				$(use_with graphviz)
+				$(use_with sourceview gtksourceview)"
+		fi
+	fi
+
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		--disable-static
+		--enable-system-sqlite
+		$(use_with berkdb bdb /usr)
+		$(use_with gnome-keyring)
+		$(use_with gtk ui)
+		$(use_with http libsoup)
+		$(use_enable introspection)
+		$(use_with java java $JAVA_HOME)
+		$(use_enable json)
+		$(use_with ldap)
+		$(use_with mdb mdb /usr)
+		$(use_with mysql mysql /usr)
+		$(use_with postgres postgres /usr)
+		$(use_enable ssl crypto)
+		$(use_enable vala)"
+
+	if use bindist; then
+		# firebird license is not GPL compatible
+		G2CONF="${G2CONF} --without-firebird"
+	else
+		G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
+	fi
+
+	use berkdb && append-cppflags "-I$(db_includedir)"
+	use oci8 || G2CONF="${G2CONF} --without-oracle"
+
+	# Not in portage
+	G2CONF="${G2CONF}
+		--disable-default-binary"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Disable broken tests so we can check the others, upstream bug #????
+#	epatch "${FILESDIR}/${PN}-4.99.4-disable-broken-tests.patch"
+
+	# Prevent file collisions with libgda:4
+	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
+	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+	epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
+
+	# Move files with mv (since epatch can't handle rename diffs) and
+	# update pre-generated gtk-doc files
+	local f
+	for f in tools/browser/doc/gda-browser* ; do
+		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+	done
+	for f in tools/browser/doc/html/gda-browser.devhelp* ; do
+		sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
+			-i ${f} || die "sed ${f} failed"
+		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+	done
+	for f in control-center/data/*_gda-control-center.png ; do
+		mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
+			die "mv ${f} failed"
+	done
+
+	python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	local d
+	for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
+		python_mod_optimize ${d}
+	done
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	local d
+	for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
+		python_mod_cleanup ${d}
+	done
+}
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@ -1,4 +1,4 @@
-DIST postfix-2.10-20120118.tar.gz 3764796 RMD160 3429012003e563a9c7d6444952b1c46c25b69620 SHA1 e39f08d5aeb2eb3e213663d8ab903159901bb829 SHA256 ef924fa83c496882385e455d0a3b1140d66e09f4a502d79f27bd34380eeb1274
+DIST postfix-2.10-20120124.tar.gz 3757968 RMD160 d49ee7fcce180df9ccefbff155cab12e47437505 SHA1 01a0278217046435f8b184e9f46b3e839b9a7655 SHA256 95b2273c966e5ed146fcc4165c3a4e7fc04adc5863ac384516081495ac568515
 DIST postfix-2.7.4.tar.gz 3423968 RMD160 4f3e0db43c55cd50b3fb4493dbc698ff3f343294 SHA1 c755ceb3a5ee983f3b72f08e1fffb6384b1f1865 SHA256 9bad5851e8a7c97890ee9465e7f675f7826d56361369d3e792a79eaf98ed2b11
 DIST postfix-2.7.5.tar.gz 3425071 RMD160 a900ff09c0a54382a4af62b609f6ddaba17963fc SHA1 066cc87f602f2daf1d3207de92ca08de9eb16bab SHA256 2fe408f49bc8540bc41b44f1b7ee7a27561f1baa4e25ef55645778ba96d15932
 DIST postfix-2.7.6.tar.gz 3425286 RMD160 9961b959ae34a1fe1d3bf70acce1f16e5ada255d SHA1 9a2cd652abdc0d3cf29563261d5c0f407d8d7bf9 SHA256 4f7546d25463c5fc300eccd05c302a44458b1cc8dfda02c7205daa0038d5ab17
@ -8,7 +8,7 @@ DIST postfix-2.8.4.tar.gz 3646391 RMD160 fbeb785c5ed08febf5cf71ea375b10120c1f62b
 DIST postfix-2.8.5.tar.gz 3647010 RMD160 db4761f14b146c233426fa1afe49782e64f0c9e0 SHA1 49ef711c80b5a3434258ab24ae00940932503e80 SHA256 f8ed6c98bf5058c363da936a8034c64cee38ca67110e9212491de862116e1c17
 DIST postfix-2.8.6.tar.gz 3647498 RMD160 1f85ff0e9432109342436144f6963d39b79910e1 SHA1 32613ad01cad10ae04aad626f9a69ac9126b3d28 SHA256 8b427a5dfe95da98918fcafce4032bac5d6190603fbc090da3c5c3a22c74dae5
 DIST postfix-2.8.7.tar.gz 3647643 RMD160 ab0700f8f340fad11bf2a294a36ff1d70a1a8783 SHA1 81c87aceff4d9af67a304354bab9c99ac98fc8a0 SHA256 5c13465ab47414e9aa2e857851eff1a3f020cebd056e0dde6094ece3552806e5
-DIST postfix-2.9.0-RC1.tar.gz 3765216 RMD160 6c43e76cca56e87f412b3f78d28bab95b4a1f3b0 SHA1 cc787e276a5a276a357f0ac8d9c8d33efb1c2c3a SHA256 b51ab128e07bc17a5258c9764369dc038014b52bc9ee1287a86367a45007230f
+DIST postfix-2.9.0-RC2.tar.gz 3767961 RMD160 8a74a9b31e00cb528e0f692cac986f27368c6a77 SHA1 b01b7cc00ffed07c7836a320d6b69513bc3963cc SHA256 a06e12064a56f9df2568a5a961588ea7c62e62a99a0a4ec932811aaba98104e1
 DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
 DIST postfix-vda-v10-2.8.1.patch 56777 RMD160 42f6351d645cc7a211aea86cc35e1f3b10b50da1 SHA1 6b36480be036e7b7aa834fd904a2aa57c537cd40 SHA256 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12
 DIST postfix-vda-v10-2.8.3.patch 56777 RMD160 ce30005d590d884c589612e65dbd34cbdbf84a31 SHA1 c27217b9af33c86a44bbb4469b7ebd4203210f7a SHA256 02599bdf16e7d77fe6043d1dac972daecdd40c4b2758579200d6ccb11e83acaa
--- a/mail-mta/postfix/postfix-2.10_pre20120124.ebuild
+++ b/mail-mta/postfix/postfix-2.10_pre20120124.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20120118.ebuild,v 1.1 2012/01/19 16:36:24 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20120124.ebuild,v 1.1 2012/01/25 06:20:10 eras Exp $

 EAPI=4

@ -317,8 +317,8 @@ pkg_postinst() {
 		elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
 		if ! use berkdb; then
 			ewarn "\nPostfix is installed without BerkeleyDB support."
-			ewarn "Please turn on berkdb USE flag if hash or btree table"
-			ewarn "lookup support is needed.\n"
+			ewarn "Please turn on berkdb USE flag for hash or btree table"
+			ewarn "lookup support.\n"
 		fi
 	fi
 }
--- a/mail-mta/postfix/postfix-2.9.0_rc2.ebuild
+++ b/mail-mta/postfix/postfix-2.9.0_rc2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.0_rc1.ebuild,v 1.2 2012/01/19 16:36:24 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.0_rc2.ebuild,v 1.1 2012/01/25 06:20:10 eras Exp $

 EAPI=4

@ -317,8 +317,8 @@ pkg_postinst() {
 		elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
 		if ! use berkdb; then
 			ewarn "\nPostfix is installed without BerkeleyDB support."
-			ewarn "Please turn on berkdb USE flag if hash or btree table"
-			ewarn "lookup support is needed.\n"
+			ewarn "Please turn on berkdb USE flag for hash or btree table"
+			ewarn "lookup support.\n"
 		fi
 	fi
 }
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@ -1,4 +1,4 @@
 DIST gthumb-2.12.3.tar.bz2 5195429 RMD160 49407a23f02046eb9c37b879e199237143e94872 SHA1 d6c81503c5d2866c3a25e3389d5bf93c4da8c748 SHA256 0060c05fd372c2af2048d294ab3f75c8fb02c576d3e2004e08b7d34f49da1e66
-DIST gthumb-2.12.4.tar.xz 5715320 RMD160 9f67e0fbf306e0273f26ba82288b20147b81d9f5 SHA1 2436b972a5648c14bb574c402889305715135abb SHA256 b6e316ed8a7187ee58b388a44b1cef1ec3405b19a734cb07aaec311083761423
 DIST gthumb-2.14.0.tar.xz 5797712 RMD160 27cc368c85100f560f8d90e6ee1a031ee7b974b4 SHA1 f143ef133a3bf3d0dfc80b16c48845e4f47f8ade SHA256 9db3e4f714d62b91185e4f8edbee2c98a85bd76f0d4b82a7d7868a9b86ae10a2
 DIST gthumb-2.14.1.tar.xz 5800780 RMD160 b1fbd3844a42c1232954053d2ec87fd166febe1a SHA1 15a0672e5a94a8e828516b3c065a3a07ebffa461 SHA256 002a6611112273189348871ff7c717fb3c776f5570656389e3d6c5b26bffa11f
+DIST gthumb-2.14.2.tar.xz 5714744 RMD160 3a6970420d79379590ec8fd847616731cc08c01b SHA1 197e79ee38ad5652ca4b28c21c6856f096a6ea1f SHA256 5386e50e934c7f276584a6c47d0208f4756cf72e0dc6cff19eaf9d8a3ab53d7c
--- a/media-gfx/gthumb/gthumb-2.14.2-r300.ebuild
+++ b/media-gfx/gthumb/gthumb-2.14.2-r300.ebuild
@ -1,30 +1,32 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.12.4.ebuild,v 1.2 2011/10/27 16:28:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.14.2-r300.ebuild,v 1.1 2012/01/25 10:52:05 pacho Exp $

 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"

-inherit eutils gnome2
+inherit gnome2

 DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="http://live.gnome.org/gthumb"
+HOMEPAGE="https://live.gnome.org/gthumb"

 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="cdr exif gnome-keyring gstreamer http raw slideshow tiff test"
+IUSE="cdr exif gnome-keyring gstreamer http jpeg raw slideshow tiff test"

 # We can't link against libbrasero-burn3
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.20:2
+RDEPEND=">=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-2.24.0:2
 	>=gnome-base/gconf-2.6
 	>=dev-libs/libunique-1.1.2:1
+
 	media-libs/libpng:0
-	virtual/jpeg:0
+	x11-libs/libSM
+
 	cdr? ( >=app-cdr/brasero-2.28
-		<app-cdr/brasero-2.90 )
+		   <app-cdr/brasero-2.90 )
 	exif? ( >=media-gfx/exiv2-0.18 )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 )
 	gstreamer? (
@ -33,6 +35,7 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	http? (
 		>=net-libs/libsoup-2.26:2.4
 		>=net-libs/libsoup-gnome-2.26:2.4 )
+	jpeg? ( virtual/jpeg:0 )
 	slideshow? (
 		>=media-libs/clutter-1:1.0
 		>=media-libs/clutter-gtk-0.10:0.10 )
@ -51,14 +54,18 @@ DEPEND="${RDEPEND}
 #	gnome-base/gnome-common

 pkg_setup() {
+# Upstream says in configure help that libchamplain support crashes
+# frequently
 	G2CONF="${G2CONF}
 		--disable-static
-		--disable-maintainer-mode
+		--disable-libchamplain
+		--enable-unique
 		$(use_enable cdr libbrasero)
 		$(use_enable exif exiv2)
 		$(use_enable gstreamer)
 		$(use_enable gnome-keyring)
 		$(use_enable http libsoup)
+		$(use_enable jpeg)
 		$(use_enable raw libopenraw)
 		$(use_enable slideshow clutter)
 		$(use_enable test test-suite)
@ -70,10 +77,7 @@ src_prepare() {
 	gnome2_src_prepare

 	# Remove unwanted CFLAGS added with USE=debug
-	sed 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' -i configure.ac configure || die
-
-	# Avoid linking to libbrasero-burn3
-	epatch "${FILESDIR}/${PN}-no-brasero3.patch"
+	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' -i configure.ac -i configure || die

 	# GSeal doesn't get disabled with --disable-gseal
 	sed -e 's/-DGSEAL_ENABLE//g' -i configure.ac -i configure || die
--- a/media-gfx/gthumb/gthumb-2.14.2.ebuild
+++ b/media-gfx/gthumb/gthumb-2.14.2.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.14.2.ebuild,v 1.1 2012/01/25 10:52:05 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="https://live.gnome.org/gthumb"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cdr exif gnome-keyring gstreamer http jpeg raw slideshow tiff test"
+
+# We can't link against libbrasero-burn3
+RDEPEND=">=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-2.24.0:2
+	>=gnome-base/gconf-2.6
+	>=dev-libs/libunique-1.1.2:1
+
+	media-libs/libpng:0
+	x11-libs/libSM
+
+	cdr? ( >=app-cdr/brasero-2.28
+		   <app-cdr/brasero-2.90 )
+	exif? ( >=media-gfx/exiv2-0.18 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 )
+	gstreamer? (
+		>=media-libs/gstreamer-0.10
+		>=media-libs/gst-plugins-base-0.10 )
+	http? (
+		>=net-libs/libsoup-2.26:2.4
+		>=net-libs/libsoup-gnome-2.26:2.4 )
+	jpeg? ( virtual/jpeg:0 )
+	slideshow? (
+		>=media-libs/clutter-1:1.0
+		>=media-libs/clutter-gtk-0.10:0.10 )
+	tiff? ( media-libs/tiff )
+	raw? ( >=media-libs/libopenraw-0.0.8 )
+	!raw? ( media-gfx/dcraw )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.35
+	app-text/gnome-doc-utils
+	sys-devel/bison
+	sys-devel/flex
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+pkg_setup() {
+# Upstream says in configure help that libchamplain support crashes
+# frequently
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-libchamplain
+		--enable-unique
+		--disable-gnome-3
+		$(use_enable cdr libbrasero)
+		$(use_enable exif exiv2)
+		$(use_enable gstreamer)
+		$(use_enable gnome-keyring)
+		$(use_enable http libsoup)
+		$(use_enable jpeg)
+		$(use_enable raw libopenraw)
+		$(use_enable slideshow clutter)
+		$(use_enable test test-suite)
+		$(use_enable tiff)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove unwanted CFLAGS added with USE=debug
+	sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' -i configure.ac -i configure || die
+
+	# GSeal doesn't get disabled with --disable-gseal
+	sed -e 's/-DGSEAL_ENABLE//g' -i configure.ac -i configure || die
+}
--- a/media-libs/libvisio/Manifest
+++ b/media-libs/libvisio/Manifest
@ -1,2 +1,2 @@
-DIST libvisio-0.0.12.tar.xz 314424 RMD160 741ee632ea0457c10856c0825cb82f3bc958d79a SHA1 bbc391cbb43ee350e2d805d5d56be340c91e2bd3 SHA256 f24e5f6458ceaef4b53c51eaf2a4eba1dd03fc11897f389c7b113e8ffb55e3fe
+DIST libvisio-0.0.14.tar.xz 315620 RMD160 839a9622fdc3da8c20d6f220535c93422785e0e7 SHA1 9127d5b08fdfd4c3441588a073be38a5025bb9f0 SHA256 4528042a6df7ec462342a116ed8631865c4c835f58a54b44b96a0be52c1aa4e4
 DIST libvisio-0.0.8.tar.xz 282732 RMD160 50a513fba64cbc32904ec697f63f384954217cfc SHA1 adde696194cb117ef5d80b90e4ff2441fa15930d SHA256 8d7530734dd861425088df5aeb8216ee517f76d30bca2c5ff5f3e507d5d971da
--- a/media-libs/libvisio/libvisio-0.0.14.ebuild
+++ b/media-libs/libvisio/libvisio-0.0.14.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.12.ebuild,v 1.2 2012/01/12 10:06:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.14.ebuild,v 1.1 2012/01/25 12:19:09 scarabeus Exp $

 EAPI=4

--- a/media-libs/sampleicc/Manifest
+++ b/media-libs/sampleicc/Manifest
@ -1 +1,2 @@
 DIST SampleICC-1.6.4.tar.gz 659610 RMD160 98ec93aaa568373d968c1f82e5b7716bc29107f4 SHA1 b2f22978c0f0cccc5d89f5968c2eeb0e68de8ec6 SHA256 444dfab32f0058eef4deace0a6fe2ff47bb87a511613e22aedf61b5abbc382ed
+DIST SampleICC-1.6.6.tar.gz 660936 RMD160 f9b2aca9e2c032aee668c5a092aa97bfb1dabe0d SHA1 2fd20da5c174be0219b8ad3c514685d4cd03fb06 SHA256 675f3ee0e7c7f158b663c6a4db04110e7e94de454a46a5904a6d9f318c2de0f5
--- a/media-libs/sampleicc/sampleicc-1.6.6.ebuild
+++ b/media-libs/sampleicc/sampleicc-1.6.6.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sampleicc/sampleicc-1.6.6.ebuild,v 1.1 2012/01/25 12:22:36 scarabeus Exp $
+
+EAPI=4
+
+DESCRIPTION="C++ library for reading, writing, manipulating, and applying ICC profiles"
+HOMEPAGE="http://sampleicc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/SampleICC-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND="media-libs/tiff"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/SampleICC-${PV}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@ -1,5 +1,3 @@
-DIST abcm2ps-5.9.15.tar.gz 253032 RMD160 d5a6b2639c34d6c70f5412ffeb82db8369da312d SHA1 27e1fc6473a60daee7828dc02f60bbaf70361a7e SHA256 b54a045d7dab2c20e81fc64877a49809855dc8b249293a4e383e2ca2a0eae2d2
 DIST abcm2ps-5.9.24.tar.gz 254329 RMD160 26695fabb540b17bd2dee86ba18c7fa3baa11e8b SHA1 7261ea8d2442a63897f97882e788c2d2404cd8c9 SHA256 008f8cde72c09ddd1c6a61d0b1f86d0733f35b76c94b7ceaeff97d02e8bcc53f
-DIST abcm2ps-5.9.25.tar.gz 254499 RMD160 ed35ffb262118db45181923aad2cf50374faf7c3 SHA1 893886d5fc94f0c7483592871e39c5b24329ff73 SHA256 50efede424b4d60ec3653c1fee66d62ef8c082bbba5f2ac0ea6c80321a4973e3
 DIST abcm2ps-6.6.3.tar.gz 294909 RMD160 60044ed9cb8a13f2f4a1d81cd02f92039abb1163 SHA1 64b672d6967716839f2233208293fee5d7579ecf SHA256 32c3909bde02213b5ab8c3bdfd1d3b985cc833254a4c6dbfb156c7818834990e
 DIST transpose_abc.pl 21045 RMD160 3ea7c36f80249a2c6e6c03eca0d9d58c054e2cfc SHA1 82a852ae790d6f379d48e4f3acc5aeba0236e575 SHA256 bd6960872bfbc9f71f183f36d533ea33b8cf62a6027b447f0b0b8adfa25a2848
--- a/media-sound/abcm2ps/abcm2ps-5.9.15.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-5.9.15.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-5.9.15.ebuild,v 1.5 2011/12/18 17:49:39 armin76 Exp $
-
-EAPI=2
-
-DESCRIPTION="A program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://moinejf.free.fr/${P}.tar.gz
-	http://moinejf.free.fr/transpose_abc.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	sed -i \
-		-e '/LDFLAGS/s:=.*:= @LDFLAGS@:' \
-		Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll
-}
-
-src_install() {
-	dobin abcm2ps || die
-
-	insinto /usr/share/${PN}
-	doins *.fmt || die
-
-	dodoc Changes README *.txt || die
-
-	insinto /usr/share/doc/${PF}/examples
-	doins *.{abc,eps} || die
-
-	insinto /usr/share/doc/${PF}/contrib
-	doins "${DISTDIR}"/transpose_abc.pl || die
-}
--- a/media-sound/abcm2ps/abcm2ps-5.9.25.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-5.9.25.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcm2ps/abcm2ps-5.9.25.ebuild,v 1.2 2011/12/18 17:49:39 armin76 Exp $
-
-EAPI=4
-
-DESCRIPTION="A program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://moinejf.free.fr/${P}.tar.gz
-	http://moinejf.free.fr/transpose_abc.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples"
-
-src_prepare() {
-	sed -i -e '/LDFLAGS/s:=.*:= @LDFLAGS@:' Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc Changes README *.txt
-
-	if use examples ; then
-		docinto examples
-		dodoc *.{abc,eps}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	docinto contrib
-	dodoc "${DISTDIR}"/transpose_abc.pl
-}
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@ -1,4 +1,2 @@
-DIST abcMIDI-2011-10-19.zip 470032 RMD160 daffc7bae1637a0d771858d80f8de7759120ff84 SHA1 14302681720b78bddc40b73d83012c9a27dba1ba SHA256 3ba0943a30ae3e2306410cfdeb099b1f550ef035d4f4ca266bcbeecf0cfd8cca
-DIST abcMIDI-2011-11-18.zip 471211 RMD160 65a1b1c71597924f318ca94e125395f27229d38d SHA1 198a075a3dfdda5950b9f6255c82f9a2beac3213 SHA256 576057fcbf7987cbc7ea88d70efcac7c6c71ecb8eadbf4ad2b065dd0fffd31a2
-DIST abcMIDI-2011-12-08.zip 472182 RMD160 a71d9a020e4100e56d582f5f22178d8622ab6c15 SHA1 214f63b4ec9a681f10bfa6a024a6ee00339d711f SHA256 2e182468c6119f14d792120b9a81782309b8488054bb690e5433b63d4c6b1754
 DIST abcMIDI-2011-12-11.zip 473424 RMD160 9bcfe6647b14f69dc91b7a6560d26fef25093c4d SHA1 6c3456c14acc2b629c4e2b3dda90085b937b6d2e SHA256 469617a5ab8b6d1578bbb451dcbb35ba1ead900f045465ac0d41efaa743ad1e7
+DIST abcMIDI-2011-12-19.zip 473724 RMD160 a02aaf6fed7e99af6de0476acdeba777354b48e9 SHA1 92cba1a8de8b2d1ab8841d4342052679eac1c5d5 SHA256 c3ade583a7e9cd4e1f46d3ddd66e450f7d46e244ca28b7b6680333dc73bfba58
--- a/media-sound/abcmidi/abcmidi-2011.10.19.ebuild
+++ b/media-sound/abcmidi/abcmidi-2011.10.19.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcmidi/abcmidi-2011.10.19.ebuild,v 1.2 2011/10/21 20:18:20 radhermit Exp $
-
-EAPI="4"
-
-inherit eutils versionator
-
-MY_P="abcMIDI-$(replace_all_version_separators '-')"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="http://abc.sourceforge.net/abcMIDI/"
-SRC_URI="http://ifdo.pugmarks.com/~seymour/runabc/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-install.patch
-	rm makefile || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
--- a/media-sound/abcmidi/abcmidi-2011.11.18.ebuild
+++ b/media-sound/abcmidi/abcmidi-2011.11.18.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcmidi/abcmidi-2011.11.18.ebuild,v 1.1 2011/11/26 01:43:14 radhermit Exp $
-
-EAPI="4"
-
-inherit eutils versionator autotools
-
-MY_P="abcMIDI-$(replace_all_version_separators '-')"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="http://abc.sourceforge.net/abcMIDI/"
-SRC_URI="http://ifdo.pugmarks.com/~seymour/runabc/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2011.10.19-install.patch
-	rm makefile || die
-	sed -i -e "s:-O2::" configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
--- a/media-sound/abcmidi/abcmidi-2011.12.19.ebuild
+++ b/media-sound/abcmidi/abcmidi-2011.12.19.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcmidi/abcmidi-2011.12.08.ebuild,v 1.1 2011/12/10 02:03:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcmidi/abcmidi-2011.12.19.ebuild,v 1.1 2012/01/25 10:31:02 radhermit Exp $

 EAPI="4"

--- a/metadata/cache/app-emulation/qemu-kvm-0.15.0
+++ b/metadata/cache/app-emulation/qemu-kvm-0.15.0
@ -1,22 +0,0 @@
-!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-softmmu !app-emulation/qemu-user !app-emulation/qemu-kvm-spice >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.6.0 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools ) app-text/texi2html dev-util/pkgconfig >=sys-kernel/linux-headers-2.6.35
-!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-softmmu !app-emulation/qemu-user !app-emulation/qemu-kvm-spice >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.6.0 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools )
-0
-mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-0.15.0.tar.gz http://dev.gentoo.org/~flameeyes/qemu-kvm/qemu-kvm-0.15.0-backports-1.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-kvm-0.15.0-backports-1.tar.bz2
-test
-http://www.linux-kvm.org
-GPL-2
-QEMU + Kernel-based Virtual Machine userland tools
-~amd64 ~ppc ~ppc64 ~x86
-eutils flag-o-matic linux-info multilib portability toolchain-funcs user versionator
-+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde +vhost-net xattr xen +qemu_softmmu_targets_x86_64 qemu_softmmu_targets_i386 qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_alpha qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus
-
-
-
-3
-
-configure install postinst prepare setup
-
-
-
-
-
--- a/metadata/cache/app-emulation/qemu-kvm-1.0
+++ b/metadata/cache/app-emulation/qemu-kvm-1.0
@ -1,22 +0,0 @@
-!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools ) app-text/texi2html dev-util/pkgconfig >=sys-kernel/linux-headers-2.6.35 >=app-admin/eselect-python-20091230
-!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools ) >=app-admin/eselect-python-20091230
-0
-mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-1.0.tar.gz
-test
-http://www.linux-kvm.org
-GPL-2
-QEMU + Kernel-based Virtual Machine userland tools
-~amd64 ~ppc ~ppc64 ~x86
-eutils flag-o-matic linux-info multilib portability python toolchain-funcs user versionator
-+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde +vhost-net xattr xen +qemu_softmmu_targets_x86_64 qemu_softmmu_targets_i386 qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_alpha qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus
-
-
-
-3
-
-configure install postinst prepare setup
-
-
-
-
-
--- a/metadata/cache/app-emulation/qemu-kvm-1.0-r2
+++ b/metadata/cache/app-emulation/qemu-kvm-1.0-r2
@ -0,0 +1,22 @@
+!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios sys-apps/vgabios ) x86? ( sys-apps/seabios sys-apps/vgabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools ) app-text/texi2html dev-util/pkgconfig >=sys-kernel/linux-headers-2.6.35 >=app-admin/eselect-python-20091230
+!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios sys-apps/vgabios ) x86? ( sys-apps/seabios sys-apps/vgabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( >=net-misc/curl-7.15.4 ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools ) >=app-admin/eselect-python-20091230
+0
+mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-1.0.tar.gz
+test
+http://www.linux-kvm.org
+GPL-2
+QEMU + Kernel-based Virtual Machine userland tools
+~amd64 ~ppc ~ppc64 ~x86
+eutils flag-o-matic linux-info multilib portability python toolchain-funcs user versionator
+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde +vhost-net xattr xen +qemu_softmmu_targets_x86_64 qemu_softmmu_targets_i386 qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_alpha qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus
+
+
+
+3
+
+configure install postinst prepare setup
+
+
+
+
+
--- a/metadata/cache/app-emulation/qemu-kvm-9999
+++ b/metadata/cache/app-emulation/qemu-kvm-9999
@ -1,5 +1,5 @@
-!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( net-misc/curl ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl x11-libs/libX11 ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) usbredir? ( sys-apps/usbredir ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools ) app-text/texi2html dev-util/pkgconfig >=sys-kernel/linux-headers-2.6.35 dev-vcs/git >=app-admin/eselect-python-20091230
-!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios ) x86? ( sys-apps/seabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( net-misc/curl ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl x11-libs/libX11 ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) usbredir? ( sys-apps/usbredir ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools ) >=app-admin/eselect-python-20091230
+!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios sys-apps/vgabios ) x86? ( sys-apps/seabios sys-apps/vgabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( net-misc/curl ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl x11-libs/libX11 ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) usbredir? ( sys-apps/usbredir ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools ) app-text/texi2html dev-util/pkgconfig >=sys-kernel/linux-headers-2.6.35 dev-vcs/git >=app-admin/eselect-python-20091230
+!app-emulation/kqemu !app-emulation/qemu !app-emulation/qemu-user >=dev-libs/glib-2.0 sys-apps/pciutils >=sys-apps/util-linux-2.16.0 sys-libs/zlib amd64? ( sys-apps/seabios sys-apps/vgabios ) x86? ( sys-apps/seabios sys-apps/vgabios ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) brltty? ( app-accessibility/brltty ) curl? ( net-misc/curl ) esd? ( media-sound/esound ) fdt? ( >=sys-apps/dtc-1.2.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) nss? ( dev-libs/nss ) opengl? ( virtual/opengl x11-libs/libX11 ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11[X] ) spice? ( >=app-emulation/spice-0.9.0 >=app-emulation/spice-protocol-0.8.1 ) ssl? ( net-libs/gnutls ) usbredir? ( sys-apps/usbredir ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xen? ( app-emulation/xen-tools ) >=app-admin/eselect-python-20091230
 0

 test
--- a/metadata/cache/app-misc/lockfile-progs-0.1.13
+++ b/metadata/cache/app-misc/lockfile-progs-0.1.13
@ -1,22 +0,0 @@
-net-libs/liblockfile
-net-libs/liblockfile
-0
-mirror://debian/pool/main/l/lockfile-progs/lockfile-progs_0.1.13.tar.gz
-
-http://packages.debian.org/sid/lockfile-progs
-GPL-2
-Programs to safely lock/unlock files and mailboxes
-amd64 ~arm ~ppc ~s390 ~sh ~sparc x86
-eutils multilib portability toolchain-funcs user
-
-
-
-
-2
-
-install prepare
-
-
-
-
-
--- a/metadata/cache/app-misc/lockfile-progs-0.1.16
+++ b/metadata/cache/app-misc/lockfile-progs-0.1.16
@ -0,0 +1,22 @@
+net-libs/liblockfile
+net-libs/liblockfile
+0
+mirror://debian/pool/main/l/lockfile-progs/lockfile-progs_0.1.16.tar.gz
+
+http://packages.debian.org/sid/lockfile-progs
+GPL-2
+Programs to safely lock/unlock files and mailboxes
+~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86
+
+
+
+
+
+4
+
+prepare
+
+
+
+
+
--- a/metadata/cache/app-misc/tmux-1.6
+++ b/metadata/cache/app-misc/tmux-1.6
@ -0,0 +1,22 @@
+|| ( >=dev-libs/libevent-2.0.10 <dev-libs/libevent-2 ) sys-libs/ncurses
+|| ( >=dev-libs/libevent-2.0.10 <dev-libs/libevent-2 ) sys-libs/ncurses vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+0
+mirror://sourceforge/tmux/tmux-1.6.tar.gz
+
+http://tmux.sourceforge.net
+ISC
+Terminal multiplexer
+~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+eutils multilib portability toolchain-funcs user
+vim-syntax
+
+
+
+4
+
+install prepare setup
+
+
+
+
+
--- a/metadata/cache/app-office/akonadi-server-1.7.0
+++ b/metadata/cache/app-office/akonadi-server-1.7.0
@ -0,0 +1,22 @@
+dev-libs/boost >=dev-libs/soprano-2.6.51 >=x11-libs/qt-gui-4.5.0:4[dbus] >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?] >=x11-libs/qt-test-4.5.0:4 x11-misc/shared-mime-info dev-libs/libxslt >=dev-util/automoc-0.9.88 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-libs/boost >=dev-libs/soprano-2.6.51 >=x11-libs/qt-gui-4.5.0:4[dbus] >=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?] >=x11-libs/qt-test-4.5.0:4 x11-misc/shared-mime-info postgres? ( dev-db/postgresql-server )
+0
+mirror://kde/stable/akonadi/src/akonadi-1.7.0.tar.bz2
+
+http://pim.kde.org/akonadi
+LGPL-2.1
+The server part of Akonadi
+~amd64 ~x86 ~amd64-linux ~x86-linux
+base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
+mysql postgres +sqlite test
+|| ( sqlite mysql postgres )
+
+
+4
+
+compile configure install postinst prepare setup test unpack
+
+
+
+
+
--- a/metadata/cache/app-text/html-xml-utils-6.0
+++ b/metadata/cache/app-text/html-xml-utils-6.0
@ -0,0 +1,22 @@
+
+
+0
+http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-6.0.tar.gz
+
+http://www.w3.org/Tools/HTML-XML-utils/
+W3C
+A number of simple utilities for manipulating HTML and XML files.
+~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos
+
+
+
+
+
+4
+
+-
+
+
+
+
+
--- a/metadata/cache/dev-lang/spidermonkey-1.8.5-r1
+++ b/metadata/cache/dev-lang/spidermonkey-1.8.5-r1
@ -1,4 +1,4 @@
->=dev-libs/nspr-4.7.0 app-arch/zip =dev-lang/python-2*[threads] dev-util/pkgconfig >=app-admin/eselect-python-20091230
+>=dev-libs/nspr-4.7.0 app-arch/zip =dev-lang/python-2*[threads] dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) =sys-devel/autoconf-2.1* sys-devel/libtool >=app-admin/eselect-python-20091230
 >=dev-libs/nspr-4.7.0 >=app-admin/eselect-python-20091230
 0
 https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
@ -7,7 +7,7 @@ http://www.mozilla.org/js/spidermonkey/
 NPL-1.1
 Stand-alone JavaScript C library
 ~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-eutils multilib pax-utils portability python toolchain-funcs user versionator
+autotools eutils libtool multilib pax-utils portability python toolchain-funcs user versionator
 debug static-libs test


--- a/metadata/cache/dev-python/PyQt4-4.9
+++ b/metadata/cache/dev-python/PyQt4-4.9
@ -1,5 +1,5 @@
->=dev-python/sip-4.13.1 >=x11-libs/qt-core-4.6.2:4 >=x11-libs/qt-script-4.6.2:4 >=x11-libs/qt-test-4.6.2:4 X? ( >=x11-libs/qt-gui-4.6.2:4[dbus?] ) assistant? ( >=x11-libs/qt-assistant-4.6.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.6.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.6.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.6.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.6.2:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) phonon? ( !kde? ( || ( >=x11-libs/qt-phonon-4.6.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.6.2:4 ) svg? ( >=x11-libs/qt-svg-4.6.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.6.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.6.2:4 ) >=app-admin/eselect-python-20091230 dev-lang/python
->=dev-python/sip-4.13.1 >=x11-libs/qt-core-4.6.2:4 >=x11-libs/qt-script-4.6.2:4 >=x11-libs/qt-test-4.6.2:4 X? ( >=x11-libs/qt-gui-4.6.2:4[dbus?] ) assistant? ( >=x11-libs/qt-assistant-4.6.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.6.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.6.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.6.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.6.2:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) phonon? ( !kde? ( || ( >=x11-libs/qt-phonon-4.6.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.6.2:4 ) svg? ( >=x11-libs/qt-svg-4.6.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.6.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.6.2:4 ) >=app-admin/eselect-python-20091230 dev-lang/python
+>=dev-python/sip-4.13.1 >=x11-libs/qt-core-4.6.2:4 >=x11-libs/qt-script-4.6.2:4 >=x11-libs/qt-test-4.6.2:4 X? ( >=x11-libs/qt-gui-4.6.2:4[dbus?] ) assistant? ( >=x11-libs/qt-assistant-4.6.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.6.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.6.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.6.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.6.2:4 || ( >=x11-libs/qt-opengl-4.8.0:4 >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) phonon? ( !kde? ( || ( >=x11-libs/qt-phonon-4.6.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.6.2:4 ) svg? ( >=x11-libs/qt-svg-4.6.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.6.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.6.2:4 ) >=app-admin/eselect-python-20091230 dev-lang/python
+>=dev-python/sip-4.13.1 >=x11-libs/qt-core-4.6.2:4 >=x11-libs/qt-script-4.6.2:4 >=x11-libs/qt-test-4.6.2:4 X? ( >=x11-libs/qt-gui-4.6.2:4[dbus?] ) assistant? ( >=x11-libs/qt-assistant-4.6.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.6.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.6.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.6.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.6.2:4 || ( >=x11-libs/qt-opengl-4.8.0:4 >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) phonon? ( !kde? ( || ( >=x11-libs/qt-phonon-4.6.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.6.2:4 ) svg? ( >=x11-libs/qt-svg-4.6.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.6.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.6.2:4 ) >=app-admin/eselect-python-20091230 dev-lang/python
 0
 http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-4.9.tar.gz

--- a/metadata/cache/dev-ruby/ruby-oci8-2.0.6
+++ b/metadata/cache/dev-ruby/ruby-oci8-2.0.6
@ -6,7 +6,7 @@ mirror://rubyforge/ruby-oci8/ruby-oci8-2.0.6.tar.gz
 http://rubyforge.org/projects/ruby-oci8/
 Ruby
 A Ruby library for Oracle
-amd64 ~x86
+amd64 x86
 eutils java-utils-2 multilib portability ruby-ng toolchain-funcs user versionator
 elibc_FreeBSD ruby_targets_ruby18

--- a/metadata/cache/dev-ruby/webrobots-0.0.13
+++ b/metadata/cache/dev-ruby/webrobots-0.0.13
@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/shoulda[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/shoulda[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/shoulda[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+ruby_targets_ruby18? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ree18] ) ruby_targets_ruby19? ( >=dev-ruby/nokogiri-1.4.4[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+0
+mirror://rubygems/webrobots-0.0.13.gem
+
+http://rubygems.org/gems/webrobots
+BSD-2
+A library to help write robots.txt compliant web robots.
+~amd64
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator
+test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 doc doc test test
+|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
--- a/metadata/cache/gnome-extra/cinnamon-1.2
+++ b/metadata/cache/gnome-extra/cinnamon-1.2
@ -0,0 +1,22 @@
+>=dev-libs/glib-2.29.10:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=net-misc/networkmanager-0.8.999[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/muffin-1.0.0[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=dev-libs/glib-2.29.10:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=net-misc/networkmanager-0.8.999[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/muffin-1.0.0[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] sys-power/upower[introspection] >=gnome-base/gnome-session-3.2.1-r1 >=gnome-base/gnome-settings-daemon-2.91 >=gnome-base/gnome-control-center-2.91.92-r1 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+0
+https://github.com/linuxmint/Cinnamon/tarball/1.2 -> cinnamon-1.2.tar.gz
+
+http://cinnamon.linuxmint.com/
+GPL-2
+A fork of GNOME Shell with layout similar to GNOME 2
+~amd64 ~x86
+autotools eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib pax-utils portability python toolchain-funcs user versionator
+bluetooth +networkmanager
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
--- a/metadata/cache/gnome-extra/libgda-5.0.3
+++ b/metadata/cache/gnome-extra/libgda-5.0.3
@ -0,0 +1,22 @@
+app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 >=dev-util/pkgconfig-0.18 >=dev-util/intltool-0.35.5 >=app-text/gnome-doc-utils-0.9 doc? ( >=dev-util/gtk-doc-1 ) vala? ( >=dev-lang/vala-0.14:0.14[vapigen] ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 java? ( >=dev-java/java-config-2.1.9-r1 ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+5
+mirror://gnome/sources/libgda/5.0/libgda-5.0.3.tar.xz
+
+http://www.gnome-db.org/
+GPL-2 LGPL-2
+Gnome Database Access Library
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+autotools db-use eutils fdo-mime flag-o-matic gnome.org gnome2 gnome2-utils java-pkg-opt-2 java-utils-2 libtool multilib portability python toolchain-funcs user versionator
+berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl vala debug elibc_FreeBSD java
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
--- a/metadata/cache/mail-mta/postfix-2.10_pre20120124
+++ b/metadata/cache/mail-mta/postfix-2.10_pre20120124
@ -1,7 +1,7 @@
 >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) ssl? ( dev-libs/openssl )
 >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 0
-ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.10-20120118.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
+ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.10-20120124.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )

 http://www.postfix.org/
 IBM
--- a/metadata/cache/mail-mta/postfix-2.9.0_rc2
+++ b/metadata/cache/mail-mta/postfix-2.9.0_rc2
@ -1,7 +1,7 @@
 >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) ssl? ( dev-libs/openssl )
 >=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
 0
-ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.9.0-RC1.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
+ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-2.9.0-RC2.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )

 http://www.postfix.org/
 IBM
--- a/metadata/cache/media-gfx/gthumb-2.12.4
+++ b/metadata/cache/media-gfx/gthumb-2.12.4
@ -1,22 +0,0 @@
->=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.20:2 >=gnome-base/gconf-2.6 >=dev-libs/libunique-1.1.2:1 media-libs/libpng:0 virtual/jpeg:0 cdr? ( >=app-cdr/brasero-2.28 <app-cdr/brasero-2.90 ) exif? ( >=media-gfx/exiv2-0.18 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) http? ( >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) slideshow? ( >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.10:0.10 ) tiff? ( media-libs/tiff ) raw? ( >=media-libs/libopenraw-0.0.8 ) !raw? ( media-gfx/dcraw ) dev-util/pkgconfig app-text/scrollkeeper >=dev-util/intltool-0.35 app-text/gnome-doc-utils sys-devel/bison sys-devel/flex test? ( ~app-text/docbook-xml-dtd-4.1.2 ) app-arch/xz-utils >=sys-apps/sed-4
->=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.20:2 >=gnome-base/gconf-2.6 >=dev-libs/libunique-1.1.2:1 media-libs/libpng:0 virtual/jpeg:0 cdr? ( >=app-cdr/brasero-2.28 <app-cdr/brasero-2.90 ) exif? ( >=media-gfx/exiv2-0.18 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) http? ( >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) slideshow? ( >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.10:0.10 ) tiff? ( media-libs/tiff ) raw? ( >=media-libs/libopenraw-0.0.8 ) !raw? ( media-gfx/dcraw )
-0
-mirror://gnome/sources/gthumb/2.12/gthumb-2.12.4.tar.xz
-
-http://live.gnome.org/gthumb
-GPL-2
-Image viewer and browser for Gnome
-~amd64 ~ppc ~ppc64 ~x86
-eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
-cdr exif gnome-keyring gstreamer http raw slideshow tiff test debug
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup unpack
-
-
-
-
-
--- a/metadata/cache/media-gfx/gthumb-2.14.2
+++ b/metadata/cache/media-gfx/gthumb-2.14.2
@ -0,0 +1,22 @@
+>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-2.24.0:2 >=gnome-base/gconf-2.6 >=dev-libs/libunique-1.1.2:1 media-libs/libpng:0 x11-libs/libSM cdr? ( >=app-cdr/brasero-2.28 <app-cdr/brasero-2.90 ) exif? ( >=media-gfx/exiv2-0.18 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) http? ( >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) jpeg? ( virtual/jpeg:0 ) slideshow? ( >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.10:0.10 ) tiff? ( media-libs/tiff ) raw? ( >=media-libs/libopenraw-0.0.8 ) !raw? ( media-gfx/dcraw ) dev-util/pkgconfig app-text/scrollkeeper >=dev-util/intltool-0.35 app-text/gnome-doc-utils sys-devel/bison sys-devel/flex test? ( ~app-text/docbook-xml-dtd-4.1.2 ) app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-2.24.0:2 >=gnome-base/gconf-2.6 >=dev-libs/libunique-1.1.2:1 media-libs/libpng:0 x11-libs/libSM cdr? ( >=app-cdr/brasero-2.28 <app-cdr/brasero-2.90 ) exif? ( >=media-gfx/exiv2-0.18 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) http? ( >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) jpeg? ( virtual/jpeg:0 ) slideshow? ( >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.10:0.10 ) tiff? ( media-libs/tiff ) raw? ( >=media-libs/libopenraw-0.0.8 ) !raw? ( media-gfx/dcraw )
+0
+mirror://gnome/sources/gthumb/2.14/gthumb-2.14.2.tar.xz
+
+https://live.gnome.org/gthumb
+GPL-2
+Image viewer and browser for Gnome
+~amd64 ~ppc ~ppc64 ~x86
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
+cdr exif gnome-keyring gstreamer http jpeg raw slideshow tiff test debug
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
--- a/metadata/cache/media-gfx/gthumb-2.14.2-r300
+++ b/metadata/cache/media-gfx/gthumb-2.14.2-r300
@ -0,0 +1,22 @@
+>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-2.24.0:2 >=gnome-base/gconf-2.6 >=dev-libs/libunique-1.1.2:1 media-libs/libpng:0 x11-libs/libSM cdr? ( >=app-cdr/brasero-2.28 <app-cdr/brasero-2.90 ) exif? ( >=media-gfx/exiv2-0.18 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) http? ( >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) jpeg? ( virtual/jpeg:0 ) slideshow? ( >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.10:0.10 ) tiff? ( media-libs/tiff ) raw? ( >=media-libs/libopenraw-0.0.8 ) !raw? ( media-gfx/dcraw ) dev-util/pkgconfig app-text/scrollkeeper >=dev-util/intltool-0.35 app-text/gnome-doc-utils sys-devel/bison sys-devel/flex test? ( ~app-text/docbook-xml-dtd-4.1.2 ) app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-2.24.0:2 >=gnome-base/gconf-2.6 >=dev-libs/libunique-1.1.2:1 media-libs/libpng:0 x11-libs/libSM cdr? ( >=app-cdr/brasero-2.28 <app-cdr/brasero-2.90 ) exif? ( >=media-gfx/exiv2-0.18 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) http? ( >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) jpeg? ( virtual/jpeg:0 ) slideshow? ( >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.10:0.10 ) tiff? ( media-libs/tiff ) raw? ( >=media-libs/libopenraw-0.0.8 ) !raw? ( media-gfx/dcraw )
+0
+mirror://gnome/sources/gthumb/2.14/gthumb-2.14.2.tar.xz
+
+https://live.gnome.org/gthumb
+GPL-2
+Image viewer and browser for Gnome
+~amd64 ~ppc ~ppc64 ~x86
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
+cdr exif gnome-keyring gstreamer http jpeg raw slideshow tiff test debug
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
--- a/metadata/cache/media-libs/libvisio-0.0.14
+++ b/metadata/cache/media-libs/libvisio-0.0.14
@ -1,7 +1,7 @@
 >=dev-libs/boost-1.46 dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen )
 app-text/libwpd:0.9 app-text/libwpg:0.2
 0
-http://dev-www.libreoffice.org/src/libvisio-0.0.12.tar.xz
+http://dev-www.libreoffice.org/src/libvisio-0.0.14.tar.xz

 http://www.freedesktop.org/wiki/Software/libvisio
 LGPL-2.1
--- a/metadata/cache/media-libs/sampleicc-1.6.6
+++ b/metadata/cache/media-libs/sampleicc-1.6.6
@ -0,0 +1,22 @@
+media-libs/tiff
+media-libs/tiff
+0
+mirror://sourceforge/sampleicc/SampleICC-1.6.6.tar.gz
+
+http://sampleicc.sourceforge.net/
+BSD-2
+C++ library for reading, writing, manipulating, and applying ICC profiles
+~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+
+static-libs
+
+
+
+4
+
+configure install
+
+
+
+
+
--- a/metadata/cache/media-sound/abcm2ps-5.9.15
+++ b/metadata/cache/media-sound/abcm2ps-5.9.15
@ -1,22 +0,0 @@
-
-
-0
-http://moinejf.free.fr/abcm2ps-5.9.15.tar.gz http://moinejf.free.fr/transpose_abc.pl
-
-http://moinejf.free.fr/
-GPL-2
-A program to convert abc files to Postscript files
-amd64 ~ppc x86
-
-
-
-
-
-2
-
-configure install prepare unpack
-
-
-
-
-
--- a/metadata/cache/media-sound/abcm2ps-5.9.25
+++ b/metadata/cache/media-sound/abcm2ps-5.9.25
@ -1,22 +0,0 @@
-
-
-0
-http://moinejf.free.fr/abcm2ps-5.9.25.tar.gz http://moinejf.free.fr/transpose_abc.pl
-
-http://moinejf.free.fr/
-GPL-2
-A program to convert abc files to Postscript files
-~amd64 ~ppc ~x86
-
-examples
-
-
-
-4
-
-configure install prepare
-
-
-
-
-
--- a/metadata/cache/media-sound/abcmidi-2011.10.19
+++ b/metadata/cache/media-sound/abcmidi-2011.10.19
@ -1,22 +0,0 @@
-app-arch/unzip
-
-0
-http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2011-10-19.zip
-
-http://abc.sourceforge.net/abcMIDI/
-GPL-2
-Programs for processing ABC music notation files
-~amd64 ~x86
-eutils multilib portability toolchain-funcs user versionator
-examples
-
-
-
-4
-
-install prepare
-
-
-
-
-
--- a/metadata/cache/media-sound/abcmidi-2011.12.08
+++ b/metadata/cache/media-sound/abcmidi-2011.12.08
@ -1,22 +0,0 @@
-app-arch/unzip || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-
-0
-http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2011-12-08.zip
-
-http://abc.sourceforge.net/abcMIDI/
-GPL-2
-Programs for processing ABC music notation files
-~amd64 ~x86
-autotools eutils libtool multilib portability toolchain-funcs user versionator
-examples
-
-
-
-4
-
-install prepare
-
-
-
-
-
--- a/metadata/cache/media-sound/abcmidi-2011.12.19
+++ b/metadata/cache/media-sound/abcmidi-2011.12.19
@ -1,7 +1,7 @@
 app-arch/unzip || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool

 0
-http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2011-11-18.zip
+http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2011-12-19.zip

 http://abc.sourceforge.net/abcMIDI/
 GPL-2
--- a/metadata/cache/net-libs/telepathy-qt-0.5.15
+++ b/metadata/cache/net-libs/telepathy-qt-0.5.15
@ -1,22 +0,0 @@
-dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer net-libs/telepathy-glib net-libs/telepathy-farsight ) !net-libs/telepathy-qt4 dev-libs/libxslt dev-util/pkgconfig >=app-admin/eselect-python-20091230 =dev-lang/python-2* >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer net-libs/telepathy-glib net-libs/telepathy-farsight ) !net-libs/telepathy-qt4 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
-0
-http://telepathy.freedesktop.org/releases/telepathy-qt4/telepathy-qt4-0.5.15.tar.gz
-
-http://telepathy.freedesktop.org/
-LGPL-2.1
-Qt4 bindings for the Telepathy D-Bus protocol
-~amd64 ~x86
-base cmake-utils eutils flag-o-matic multilib portability python toolchain-funcs user
-debug farsight glib
-
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
--- a/metadata/cache/net-libs/telepathy-qt-0.8.0
+++ b/metadata/cache/net-libs/telepathy-qt-0.8.0
@ -1,5 +1,5 @@
-dev-python/dbus-python >=x11-libs/qt-core-4.6.0:4[glib?] >=x11-libs/qt-dbus-4.6.0:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer >=net-libs/telepathy-glib-0.15.1 net-libs/telepathy-farsight ) glib? ( dev-libs/glib:2 ) !net-libs/telepathy-qt4 dev-libs/libxslt dev-util/pkgconfig >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-dev-python/dbus-python >=x11-libs/qt-core-4.6.0:4[glib?] >=x11-libs/qt-dbus-4.6.0:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer >=net-libs/telepathy-glib-0.15.1 net-libs/telepathy-farsight ) glib? ( dev-libs/glib:2 ) !net-libs/telepathy-qt4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer >=net-libs/telepathy-glib-0.15.1 net-libs/telepathy-farsight ) glib? ( dev-libs/glib:2 ) !net-libs/telepathy-qt4 dev-libs/libxslt dev-util/pkgconfig test? ( x11-libs/qt-test:4 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer >=net-libs/telepathy-glib-0.15.1 net-libs/telepathy-farsight ) glib? ( dev-libs/glib:2 ) !net-libs/telepathy-qt4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 http://telepathy.freedesktop.org/releases/telepathy-qt4/telepathy-qt4-0.8.0.tar.gz

@ -8,7 +8,7 @@ LGPL-2.1
 Qt4 bindings for the Telepathy D-Bus protocol
 ~amd64 ~x86
 base cmake-utils eutils flag-o-matic multilib portability python toolchain-funcs user
-debug farsight glib
+debug farsight glib test



--- a/metadata/cache/net-libs/telepathy-qt-0.9.0
+++ b/metadata/cache/net-libs/telepathy-qt-0.9.0
@ -0,0 +1,22 @@
+dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer net-libs/telepathy-farsight ) glib? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.15.1 ) !net-libs/telepathy-qt4 dev-libs/libxslt dev-util/pkgconfig test? ( x11-libs/qt-test:4 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-python/dbus-python x11-libs/qt-core:4[glib?] x11-libs/qt-dbus:4 farsight? ( dev-libs/dbus-glib dev-libs/libxml2 media-libs/gstreamer net-libs/telepathy-farsight ) glib? ( dev-libs/glib:2 >=net-libs/telepathy-glib-0.15.1 ) !net-libs/telepathy-qt4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+0
+http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.0.tar.gz
+
+http://telepathy.freedesktop.org/
+LGPL-2.1
+Qt4 bindings for the Telepathy D-Bus protocol
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib portability python toolchain-funcs user
+debug farsight glib test
+
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
--- a/metadata/cache/net-mail/notmuch-0.10.1
+++ b/metadata/cache/net-mail/notmuch-0.10.1
@ -1,20 +1,20 @@
 >=dev-libs/glib-2.14 dev-libs/gmime:2.4 dev-libs/xapian doc? ( python? ( dev-python/sphinx ) ) sys-libs/talloc debug? ( dev-util/valgrind ) emacs? ( >=virtual/emacs-23 ) ruby? ( dev-lang/ruby:1.8 ) x86? ( >=dev-libs/xapian-1.2.7-r2 ) vim? ( || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) ) dev-util/pkgconfig test? ( app-misc/dtach sys-devel/gdb ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 >=dev-libs/glib-2.14 dev-libs/gmime:2.4 dev-libs/xapian doc? ( python? ( dev-python/sphinx ) ) sys-libs/talloc debug? ( dev-util/valgrind ) emacs? ( >=virtual/emacs-23 ) ruby? ( dev-lang/ruby:1.8 ) x86? ( >=dev-libs/xapian-1.2.7-r2 ) vim? ( || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) ) crypt? ( app-crypt/gnupg ) zsh-completion? ( app-shells/zsh ) >=app-admin/eselect-python-20091230 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
-http://notmuchmail.org//releases/notmuch-0.10.1.tar.gz
+http://notmuchmail.org//releases/notmuch-0.11.tar.gz

 http://notmuchmail.org/
 GPL-3
 The mail indexer
 ~amd64 ~x86
-autotools autotools-utils distutils elisp-common eutils libtool multilib portability python toolchain-funcs user
+distutils elisp-common multilib python toolchain-funcs
 bash-completion crypt debug doc emacs python ruby test vim zsh-completion
 test? ( crypt emacs )


 4

-compile configure install postinst postrm prepare setup test
+compile configure install postinst postrm prepare setup



--- a/metadata/cache/net-mail/offlineimap-6.5.2.1_rc1
+++ b/metadata/cache/net-mail/offlineimap-6.5.2.1_rc1
@ -0,0 +1,22 @@
+doc? ( dev-python/docutils ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[threads,ssl?] =dev-lang/python-2.6*[threads,ssl?] )
+>=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[threads,ssl?] =dev-lang/python-2.6*[threads,ssl?] )
+0
+https://github.com/downloads/spaetz/offlineimap/offlineimap-v6.5.2.1-rc1.tar.gz -> offlineimap-6.5.2.1_rc1.tar.gz
+
+http://offlineimap.org
+GPL-2
+Powerful IMAP/Maildir synchronization and reader support
+~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+distutils eutils multilib portability python toolchain-funcs user
+doc ssl
+
+
+
+3
+
+compile install postinst postrm prepare setup unpack
+
+
+
+
+
--- a/metadata/cache/net-misc/mikutter-0.1.0.642
+++ b/metadata/cache/net-misc/mikutter-0.1.0.642
@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby19? ( dev-ruby/ruby-gtk2[ruby_targets_ruby19] dev-ruby/rcairo[ruby_targets_ruby19] dev-ruby/httpclient[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+libnotify? ( x11-libs/libnotify ) sound? ( media-sound/alsa-utils ) ruby_targets_ruby19? ( dev-ruby/ruby-gtk2[ruby_targets_ruby19] dev-ruby/rcairo[ruby_targets_ruby19] dev-ruby/httpclient[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+0
+http://mikutter.hachune.net/bin/mikutter.0.1.0.642.tar.gz
+
+http://mikutter.hachune.net/
+GPL-3
+mikutter is simple, powerful and moeful twitter client
+~amd64 ~x86
+eutils java-utils-2 multilib portability ruby-ng toolchain-funcs user versionator
+libnotify sound test elibc_FreeBSD ruby_targets_ruby19
+
+
+
+3
+
+compile configure install prepare setup test unpack
+
+
+
+
+
--- a/metadata/cache/net-p2p/transmission-2.42
+++ b/metadata/cache/net-p2p/transmission-2.42
@ -0,0 +1,22 @@
+>=dev-libs/libevent-2.0.10 >=dev-libs/openssl-0.9.4 >=net-misc/curl-7.16.3[ssl] >=net-libs/miniupnpc-1.6 net-libs/libnatpmp sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.28:2 dev-libs/libappindicator:0 >=x11-libs/gtk+-2.22:2 ) gtk3? ( >=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.28:2 dev-libs/libappindicator:3 >=x11-libs/gtk+-3.2:3 ) qt4? ( x11-libs/qt-gui:4[dbus] ) dev-util/intltool dev-util/pkgconfig sys-apps/sed sys-devel/gettext >=sys-devel/libtool-2.2.6b nls? ( >=dev-util/intltool-0.40 sys-devel/gettext ) >=sys-apps/sed-4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
+>=dev-libs/libevent-2.0.10 >=dev-libs/openssl-0.9.4 >=net-misc/curl-7.16.3[ssl] >=net-libs/miniupnpc-1.6 net-libs/libnatpmp sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.28:2 dev-libs/libappindicator:0 >=x11-libs/gtk+-2.22:2 ) gtk3? ( >=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.28:2 dev-libs/libappindicator:3 >=x11-libs/gtk+-3.2:3 ) qt4? ( x11-libs/qt-gui:4[dbus] )
+0
+http://download.transmissionbt.com/transmission/files/transmission-2.42.tar.xz
+
+http://www.transmissionbt.com/
+MIT GPL-2
+A Fast, Easy and Free BitTorrent client
+~amd64 ~x86
+autotools base eutils fdo-mime gnome2-utils libtool multilib portability qt4-r2 toolchain-funcs user
+gtk gtk3 kde nls qt4 utp
+gtk? ( nls !gtk3 ) gtk3? ( nls !gtk )
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
--- a/metadata/cache/sci-chemistry/votca-csg-1.2.2
+++ b/metadata/cache/sci-chemistry/votca-csg-1.2.2
@ -6,7 +6,7 @@ primaryuri
 http://www.votca.org
 Apache-2.0
 Votca coarse-graining engine
-amd64 ~x86 ~amd64-linux ~x86-macos
+amd64 x86 ~amd64-linux ~x86-macos
 base bash-completion-r1 cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 doc examples extras +gromacs +system-boost

--- a/metadata/cache/sci-chemistry/votca-csgapps-1.2.2
+++ b/metadata/cache/sci-chemistry/votca-csgapps-1.2.2
@ -6,7 +6,7 @@ primaryuri
 http://www.votca.org
 Apache-2.0
 Extra applications for votca-csg
-amd64 ~x86 ~amd64-linux ~x86-macos
+amd64 x86 ~amd64-linux ~x86-macos
 base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user


--- a/metadata/cache/sci-libs/votca-tools-1.2.2
+++ b/metadata/cache/sci-libs/votca-tools-1.2.2
@ -6,7 +6,7 @@ primaryuri
 http://www.votca.org
 Apache-2.0
 Votca tools library
-amd64 ~x86 ~amd64-linux ~x86-macos
+amd64 x86 ~amd64-linux ~x86-macos
 base cmake-utils eutils flag-o-matic multilib portability toolchain-funcs user
 doc +fftw +gsl sqlite +system-boost

--- a/metadata/cache/sys-apps/vgabios-0.7a
+++ b/metadata/cache/sys-apps/vgabios-0.7a
@ -6,7 +6,7 @@ http://savannah.gnu.org/download/vgabios/vgabios-0.7a.tgz http://dev.gentoo.org/
 http://www.nongnu.org/vgabios/
 LGPL-2.1
 VGA BIOS implementation
-~amd64 ~x86
+-*
 eutils multilib portability toolchain-funcs user
 debug

--- a/metadata/cache/www-apps/phpBB-3.0.10
+++ b/metadata/cache/www-apps/phpBB-3.0.10
@ -0,0 +1,22 @@
+|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+virtual/httpd-php >=app-admin/webapp-config-1.50.15
+3.0.10
+http://download.phpbb.com/pub/release/3.0/3.0.10/phpBB-3.0.10.tar.bz2
+
+http://www.phpbb.com/
+GPL-2
+phpBB is an open-source bulletin board package
+~alpha ~amd64 ~ppc ~sparc ~x86
+webapp
+vhosts
+
+
+
+4
+
+install postinst prerm setup
+
+
+
+
+
--- a/metadata/cache/www-apps/phpBB-3.0.8
+++ b/metadata/cache/www-apps/phpBB-3.0.8
@ -1,22 +0,0 @@
-|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-virtual/httpd-php >=app-admin/webapp-config-1.50.15
-3.0.8
-mirror://sourceforge/phpbb/phpBB-3.0.8.tar.bz2
-
-http://www.phpbb.com/
-GPL-2
-phpBB is an open-source bulletin board package
-~alpha ~amd64 ~ppc ~sparc ~x86
-depend.php eutils multilib phpconfutils portability toolchain-funcs user webapp
-vhosts
-
-
-
-3
-
-install postinst prerm setup
-
-
-
-
-
--- a/metadata/cache/www-client/chromium-16.0.912.75
+++ b/metadata/cache/www-client/chromium-16.0.912.75
@ -1,22 +0,0 @@
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.6.5.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) dev-lang/nacl-toolchain-newlib dev-lang/perl dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.6.5.1 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-0
-http://commondatastorage.googleapis.com/chromium-browser-official/chromium-16.0.912.75.tar.bz2
-
-http://chromium.org/
-BSD
-Open-source version of Google Chrome web browser
-amd64 x86
-eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib pax-utils portability python toolchain-funcs user versionator virtualx
-bindist cups gnome gnome-keyring kerberos pulseaudio linguas_am linguas_ar linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fil linguas_fr linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_kn linguas_ko linguas_lt linguas_lv linguas_ml linguas_mr linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW test
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test
-
-
-
-
-
--- a/metadata/cache/www-client/chromium-18.0.1017.2
+++ b/metadata/cache/www-client/chromium-18.0.1017.2
@ -1,7 +1,7 @@
 app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-fs/udev sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
-http://commondatastorage.googleapis.com/chromium-browser-official/chromium-18.0.1003.1.tar.bz2
+http://commondatastorage.googleapis.com/chromium-browser-official/chromium-18.0.1017.2.tar.bz2

 http://chromium.org/
 BSD
--- a/metadata/cache/x11-wm/muffin-1.0.0
+++ b/metadata/cache/x11-wm/muffin-1.0.0
@ -0,0 +1,22 @@
+>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.91.7:3[introspection?] >=gnome-base/gconf-2:2 >=dev-libs/glib-2.14:2 >=media-libs/clutter-1.7.5:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) xinerama? ( x11-libs/libXinerama ) >=app-text/gnome-doc-utils-0.8 sys-devel/gettext >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 test? ( app-text/docbook-xml-dtd:4.5 ) xinerama? ( x11-proto/xineramaproto ) x11-proto/xextproto x11-proto/xproto app-arch/xz-utils >=sys-apps/sed-4
+>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.91.7:3[introspection?] >=gnome-base/gconf-2:2 >=dev-libs/glib-2.14:2 >=media-libs/clutter-1.7.5:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) xinerama? ( x11-libs/libXinerama ) !x11-misc/expocity
+0
+https://github.com/linuxmint/muffin/tarball/1.0.0 -> muffin-1.0.0.tar.gz
+
+http://cinnamon.linuxmint.com/
+GPL-2
+Compositing window manager forked from Mutter for use with Cinnamon
+~amd64 ~x86
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib portability toolchain-funcs user versionator
+introspection test xinerama
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 25 Jan 2012 06:06:46 +0000
+Wed, 25 Jan 2012 15:06:52 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 25 Jan 2012 06:06:46 +0000
+Wed, 25 Jan 2012 15:06:52 +0000
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Wed, 25 Jan 2012 06:06:48 +0000
+Wed, 25 Jan 2012 15:06:54 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Wed Jan 25 06:06:46 UTC 2012
+Wed Jan 25 15:06:52 UTC 2012
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Wed, 25 Jan 2012 06:30:01 +0000
+Wed, 25 Jan 2012 15:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1327471501 Wed Jan 25 06:05:01 2012 UTC
+1327503901 Wed Jan 25 15:05:01 2012 UTC
--- a/net-libs/telepathy-qt/Manifest
+++ b/net-libs/telepathy-qt/Manifest
@ -1,2 +1,2 @@
-DIST telepathy-qt4-0.5.15.tar.gz 3327150 RMD160 10c684c7baffe41a185fee08e16d32c12ab85faa SHA1 13c0e94e1368e4f3ce8c540676296a5a60991883 SHA256 ee051b5a96f0812e8749433808673a75a049d1f97d3c035b8b2b08dce5db9b6a
+DIST telepathy-qt-0.9.0.tar.gz 4120044 RMD160 f9cf24c8ab0043f404f39ed46cdff54a9d5ec75d SHA1 6d977a76b9854ceec933444507c6a11a0333af39 SHA256 cf2ae8d2cf75c1cf40a3faff263d3f36b88d637eddfec0724a5fcc51ffb6706c
 DIST telepathy-qt4-0.8.0.tar.gz 4014194 RMD160 e6850de7d57c8c6bab57f381667209bfac4d3ea7 SHA1 ba34bf78b7e1b6d7bb087780d8e1709a3cf4775b SHA256 e4a4dee2a2fb88bebfdac50ed7341b5c927b0411b4df93209cd9291915a0e1dc
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.5.12-automagicness.patch
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.5.12-automagicness.patch
@ -1,169 +0,0 @@
-diff -urN telepathy-qt4-0.5.12.old/CMakeLists.txt telepathy-qt4-0.5.12/CMakeLists.txt
--- telepathy-qt4-0.5.12.old/CMakeLists.txt	2011-03-23 08:51:03.000000000 +0100
-+++ telepathy-qt4-0.5.12/CMakeLists.txt	2011-03-23 09:02:55.000000000 +0100
-@@ -85,6 +85,11 @@
- include(Doxygen)
- include(MacroLogFeature)
- 
-+# options
-+option(WITH_Glib "Enable building with glib features" ON)
-+option(WITH_Farsight "Enable building with farsight features" ON)
-+option(ENABLE_DEBUG_OUTPUT "Compile support for printing debug output to stderr" ON)
-+
- # external dependencies
- 
- # Required dependencies
-@@ -98,10 +103,9 @@
- 
- add_definitions(-DQT_NO_CAST_FROM_ASCII)
- 
-set(ENABLE_DEBUG_OUTPUT ON CACHE BOOL "If activated, compiles support for printing debug output to stderr")
-if (ENABLE_DEBUG_OUTPUT)
-+if(ENABLE_DEBUG_OUTPUT)
-     add_definitions(-DENABLE_DEBUG)
-endif (ENABLE_DEBUG_OUTPUT)
-+endif(ENABLE_DEBUG_OUTPUT)
- 
- # Check for Qt4 Glib support
- include(CheckCXXSourceCompiles)
-@@ -109,21 +113,6 @@
- set(CMAKE_REQUIRED_DEFINITIONS "")
- set(CMAKE_REQUIRED_FLAGS "")
- 
-CHECK_CXX_SOURCE_COMPILES("
-#include <QtCore/QtGlobal>
-int main()
-{
-#if defined(QT_NO_GLIB)
-#error \"Qt was compiled with Glib disabled\"
-#endif
-return 0;
-}"
-QT4_GLIB_SUPPORT)
-macro_log_feature(QT4_GLIB_SUPPORT "Qt4 Glib Support"
-                  "QtCore library using Glib's main event loop"
-                  "http://qt.nokia.com/" FALSE ""
-                  "Needed, together with Telepathy-Glib, to build most of the unit tests")
-
- # Check for operator== in QDBusVariant
- SET(CMAKE_REQUIRED_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY})
- CHECK_CXX_SOURCE_COMPILES("
-@@ -172,50 +161,76 @@
- 
- # Find GLib2, GObject, DBus and LibXml2
- # Those are needed for the insane include dir dependency hell
-find_package(GLIB2)
-find_package(GObject)
-find_package(DBus)
-find_package(DBusGLib)
-find_package(LibXml2)
-
-# Find tp-farsight
-set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
-find_package(TelepathyFarsight)
-macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
-                  "A Framework for dealing with audio/video conferencing protocols"
-                  "http://farsight.freedesktop.org/wiki/" FALSE "0.0.4"
-                  "Needed, together with GStreamer, to build telepathy-qt4-farsight and some additional examples")
-
-# Find GStreamer
-find_package(GStreamer)
-macro_log_feature(GSTREAMER_FOUND "GStreamer"
-                  "An open source multimedia framework"
-                  "Needed, together with Tp-Farsight, to build telepathy-qt4-farsight and some additional examples"
-                  "http://www.gstreamer.net/" FALSE)
-
-# Build TelepathyQt4-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found
-if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
-    set (FARSIGHT_COMPONENTS_FOUND 1)
-else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
-    set (FARSIGHT_COMPONENTS_FOUND 0)
-endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
-+if(WITH_Farsight)
-+	find_package(GLIB2 REQUIRED)
-+	find_package(GObject REQUIRED)
-+	find_package(DBus REQUIRED)
-+	find_package(DBusGLib REQUIRED)
-+	find_package(LibXml2 REQUIRED)
-+
-+	# Find tp-farsight
-+	set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
-+	find_package(TelepathyFarsight REQUIRED)
-+	macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
-+					  "A Framework for dealing with audio/video conferencing protocols"
-+					  "http://farsight.freedesktop.org/wiki/" FALSE "0.0.4"
-+					  "Needed, together with GStreamer, to build telepathy-qt4-farsight and some additional examples")
-+
-+	# Find GStreamer
-+	find_package(GStreamer REQUIRED)
-+	macro_log_feature(GSTREAMER_FOUND "GStreamer"
-+					  "An open source multimedia framework"
-+					  "Needed, together with Tp-Farsight, to build telepathy-qt4-farsight and some additional examples"
-+					  "http://www.gstreamer.net/" FALSE)
-+
-+	# Build TelepathyQt4-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found
-+	if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
-+		set (FARSIGHT_COMPONENTS_FOUND 1)
-+	else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
-+		set (FARSIGHT_COMPONENTS_FOUND 0)
-+	endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
-+else(WITH_Farsight)
-+	set(FARSIGHT_COMPONENTS_FOUND 0)
-+endif(WITH_Farsight)
- 
- # Find telepathy-glib
-set(TELEPATHY_GLIB_MIN_VERSION 0.13.10)
-find_package(TelepathyGlib)
-macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib"
-                  "Glib bindings for Telepathy"
-                  "http://telepathy.freedesktop.org/" FALSE "0.13.0"
-                  "Needed, together with Qt Glib integration, to build most of the unit tests")
-
-find_program(GLIB_GENMARSHAL glib-genmarshal)
-
-# Enable glib-based tests only if Qt4 has GLib support and Telepathy-glib was found
-if(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-    set(ENABLE_TP_GLIB_TESTS 1)
-else(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-    set(ENABLE_TP_GLIB_TESTS 0)
-endif(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-+if(WITH_Glib)
-+	CHECK_CXX_SOURCE_COMPILES("
-+	#include <QtCore/QtGlobal>
-+	int main()
-+	{
-+	#if defined(QT_NO_GLIB)
-+	#error \"Qt was compiled with Glib disabled\"
-+	#endif
-+	return 0;
-+	}"
-+	QT4_GLIB_SUPPORT)
-+	macro_log_feature(QT4_GLIB_SUPPORT "Qt4 Glib Support"
-+					  "QtCore library using Glib's main event loop"
-+					  "http://qt.nokia.com/" FALSE ""
-+					  "Needed, together with Telepathy-Glib, to build most of the unit tests")
-+
-+	find_package(GLIB2 REQUIRED)
-+	find_package(DBus REQUIRED)
-+
-+	set(TELEPATHY_GLIB_MIN_VERSION 0.13.10)
-+	find_package(TelepathyGlib REQUIRED)
-+	macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib"
-+					  "Glib bindings for Telepathy"
-+					  "http://telepathy.freedesktop.org/" FALSE "0.13.0"
-+					  "Needed, together with Qt Glib integration, to build most of the unit tests")
-+
-+	find_program(GLIB_GENMARSHAL glib-genmarshal)
-+	# Enable glib-based tests only if Qt4 has GLib support and Telepathy-glib was found
-+	if(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-+		set(ENABLE_TP_GLIB_TESTS 1)
-+	else(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-+		set(ENABLE_TP_GLIB_TESTS 0)
-+	endif(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-+else(WITH_Glib)
-+	set(ENABLE_TP_GLIB_TESTS 0)
-+endif(WITH_Glib)
-+
- 
- # Add the source subdirectories
- add_subdirectory(TelepathyQt4)
--- a/net-libs/telepathy-qt/files/telepathy-qt-0.9.0-automagicness.patch
+++ b/net-libs/telepathy-qt/files/telepathy-qt-0.9.0-automagicness.patch
@ -0,0 +1,198 @@
+--- telepathy-qt-0.9.0.orig/CMakeLists.txt	2011-12-20 21:33:46.000000000 +0100
+++ telepathy-qt-0.9.0/CMakeLists.txt	2012-01-24 23:32:57.000000000 +0100
+@@ -73,6 +73,12 @@
+ 
+ include(MacroLogFeature)
+ 
+# options
+option(WITH_Glib "Enable building with glib features" ON)
+option(WITH_Farsight "Enable building with farsight features" ON)
+option(ENABLE_DEBUG_OUTPUT "Compile support for printing debug output to stderr" ON)
+option(WITH_Test "Enable test suite" ON)
+
+ # external dependencies
+ 
+ # Required dependencies
+@@ -108,31 +114,9 @@
+ 
+ add_definitions(-DQT_NO_CAST_FROM_ASCII)
+ 
+-set(ENABLE_DEBUG_OUTPUT ON CACHE BOOL "If activated, compiles support for printing debug output to stderr")
+-if (ENABLE_DEBUG_OUTPUT)
+if(ENABLE_DEBUG_OUTPUT)
+     add_definitions(-DENABLE_DEBUG)
+-endif (ENABLE_DEBUG_OUTPUT)
+-
+-# Check for Qt Glib support
+-include(CheckCXXSourceCompiles)
+-set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})
+-set(CMAKE_REQUIRED_DEFINITIONS "")
+-set(CMAKE_REQUIRED_FLAGS "")
+-
+-CHECK_CXX_SOURCE_COMPILES("
+-#include <QtCore/QtGlobal>
+-int main()
+-{
+-#if defined(QT_NO_GLIB)
+-#error \"Qt was compiled with Glib disabled\"
+-#endif
+-return 0;
+-}"
+-QT_GLIB_SUPPORT)
+-macro_log_feature(QT_GLIB_SUPPORT "Qt Glib Support"
+-                  "QtCore library using Glib's main event loop"
+-                  "http://qt.nokia.com/" FALSE ""
+-                  "Needed, together with Telepathy-Glib, to build most of the unit tests")
+endif(ENABLE_DEBUG_OUTPUT)
+ 
+ # Find python version >= 2.5
+ find_package(PythonLibrary REQUIRED)
+@@ -158,63 +142,100 @@
+ 
+ # Find GLib2, GObject, DBus and LibXml2
+ # Those are needed for the insane include dir dependency hell
+-find_package(GLIB2)
+-find_package(GObject)
+-find_package(GIO)
+-find_package(GIOUnix)
+-find_package(DBus)
+-find_package(DBusGLib)
+-find_package(LibXml2)
+-
+-# Find tp-farsight
+-set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
+-find_package(TelepathyFarsight)
+-macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
+-                  "A Framework for dealing with audio/video conferencing protocols"
+-                  "http://farsight.freedesktop.org/wiki/" FALSE "0.0.4"
+-                  "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
+-
+-# Find GStreamer
+-find_package(GStreamer)
+-macro_log_feature(GSTREAMER_FOUND "GStreamer"
+-                  "An open source multimedia framework"
+-                  "Needed, together with Tp-Farsight, to build telepathy-qt-farsight and some additional examples"
+-                  "http://www.gstreamer.net/" FALSE)
+-
+-# Build TelepathyQt-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found
+-if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
+-    set (FARSIGHT_COMPONENTS_FOUND 1)
+-else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
+if (WITH_Farsight)
+    find_package(GLIB2)
+    find_package(GObject)
+    find_package(DBus)
+    find_package(DBusGLib)
+    find_package(LibXml2)
+
+    # Find tp-farsight
+    set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
+    find_package(TelepathyFarsight)
+    macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
+		      "A Framework for dealing with audio/video conferencing protocols"
+		      "http://farsight.freedesktop.org/wiki/" FALSE "0.0.4"
+		      "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
+
+    # Find GStreamer
+    find_package(GStreamer)
+    macro_log_feature(GSTREAMER_FOUND "GStreamer"
+		      "An open source multimedia framework"
+		      "Needed, together with Tp-Farsight, to build telepathy-qt-farsight and some additional examples"
+		      "http://www.gstreamer.net/" FALSE)
+
+    # Build TelepathyQt-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found
+    if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
+	set (FARSIGHT_COMPONENTS_FOUND 1)
+    else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
+	set (FARSIGHT_COMPONENTS_FOUND 0)
+    endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
+else(WITH_Farsight)
+     set (FARSIGHT_COMPONENTS_FOUND 0)
+-endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND)
+endif(WITH_Farsight)
+ 
+ # Find telepathy-glib
+-set(TELEPATHY_GLIB_MIN_VERSION 0.17.2)
+-find_package(TelepathyGlib)
+-macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib"
+-                  "Glib bindings for Telepathy"
+-                  "http://telepathy.freedesktop.org/" FALSE ${TELEPATHY_GLIB_MIN_VERSION}
+-                  "Needed, together with Qt Glib integration, to build most of the unit tests")
+-
+-find_program(GLIB_GENMARSHAL glib-genmarshal)
+-
+-# Enable glib-based tests only if Qt has GLib support and Telepathy-glib was found
+-if(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
+-    set(ENABLE_TP_GLIB_TESTS 1)
+-    if(GIO_FOUND AND GIOUNIX_FOUND)
+-        set(ENABLE_TP_GLIB_GIO_TESTS 1)
+-    else(GIO_FOUND AND GIOUNIX_FOUND)
+-        set(ENABLE_TP_GLIB_GIO_TESTS 0)
+-    endif(GIO_FOUND AND GIOUNIX_FOUND)
+-else(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
+if(WITH_Glib)
+    # Check for Qt Glib support
+    include(CheckCXXSourceCompiles)
+    set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})
+    set(CMAKE_REQUIRED_DEFINITIONS "")
+    set(CMAKE_REQUIRED_FLAGS "")
+
+    CHECK_CXX_SOURCE_COMPILES("E_TP
+    #include <QtCore/QtGlobal>
+    int main()
+    {
+    #if defined(QT_NO_GLIB)
+    #error \"Qt was compiled with Glib disabled\"
+    #endif
+    return 0;
+    }"
+    QT_GLIB_SUPPORT)
+    macro_log_feature(QT_GLIB_SUPPORT "Qt Glib Support"
+		      "QtCore library using Glib's main event loop"
+		      "http://qt.nokia.com/" FALSE ""
+		      "Needed, together with Telepathy-Glib, to build most of the unit tests")
+
+    find_package(GLIB2 REQUIRED)
+    find_package(GIO)
+    find_package(GIOUnix)
+    find_package(DBus REQUIRED)
+
+    # Find telepathy-glib
+    set(TELEPATHY_GLIB_MIN_VERSION 0.17.2)
+    find_package(TelepathyGlib)
+    macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib"
+		      "Glib bindings for Telepathy"
+		      "http://telepathy.freedesktop.org/" FALSE ${TELEPATHY_GLIB_MIN_VERSION}
+		      "Needed, together with Qt Glib integration, to build most of the unit tests")
+
+    find_program(GLIB_GENMARSHAL glib-genmarshal)
+
+    # Enable glib-based tests only if Qt has GLib support and Telepathy-glib was found
+    if(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
+	set(ENABLE_TP_GLIB_TESTS 1)
+	if(GIO_FOUND AND GIOUNIX_FOUND)
+	    set(ENABLE_TP_GLIB_GIO_TESTS 1)
+	else(GIO_FOUND AND GIOUNIX_FOUND)
+	    set(ENABLE_TP_GLIB_GIO_TESTS 0)
+	endif(GIO_FOUND AND GIOUNIX_FOUND)
+    else(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
+	set(ENABLE_TP_GLIB_TESTS 0)
+	set(ENABLE_TP_GLIB_GIO_TESTS 0)
+    endif(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
+else(WITH_Glib)
+     set(ENABLE_TP_GLIB_TESTS 0)
+     set(ENABLE_TP_GLIB_GIO_TESTS 0)
+-endif(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
+endif(WITH_Glib)
+
+ 
+ # Add the source subdirectories
+ add_subdirectory(TelepathyQt)
+ add_subdirectory(examples)
+-add_subdirectory(tests)
+if(WITH_Test)
+  add_subdirectory(tests)
+endif(WITH_Test)
+ add_subdirectory(tools)
+ 
+ # Generate config.h and config-version.h
--- a/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild,v 1.1 2012/01/24 17:40:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.8.0.ebuild,v 1.2 2012/01/25 08:49:10 johu Exp $

 EAPI=4

@ -15,12 +15,12 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${MY_PN}/${MY_PN}-${PV}.tar.g
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug farsight glib"
+IUSE="debug farsight glib test"

 RDEPEND="
 	dev-python/dbus-python
-	>=x11-libs/qt-core-4.6.0:4[glib?]
-	>=x11-libs/qt-dbus-4.6.0:4
+	x11-libs/qt-core:4[glib?]
+	x11-libs/qt-dbus:4
 	farsight? (
 		dev-libs/dbus-glib
 		dev-libs/libxml2
@ -34,6 +34,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	dev-util/pkgconfig
+	test? ( x11-libs/qt-test:4 )
 "

 PATCHES=( "${FILESDIR}/${P}-automagicness.patch" )
@ -51,6 +52,10 @@ src_prepare() {
 	base_src_prepare

 	sed -i -e '/^add_subdirectory(examples)$/d' CMakeLists.txt || die
+
+	if ! use test ; then
+		sed -i -e '/^add_subdirectory(tests)$/d' CMakeLists.txt || die
+	fi
 }

 src_configure() {
--- a/net-libs/telepathy-qt/telepathy-qt-0.5.15.ebuild
+++ b/net-libs/telepathy-qt/telepathy-qt-0.5.15.ebuild
@ -1,22 +1,23 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.5.15.ebuild,v 1.1 2012/01/24 17:40:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt/telepathy-qt-0.9.0.ebuild,v 1.1 2012/01/25 08:49:10 johu Exp $

 EAPI=4

-PYTHON_DEPEND="2"
-MY_PN=${PN}4
+PYTHON_DEPEND="2:2.5"
 inherit python base cmake-utils

 DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="http://telepathy.freedesktop.org/"
-SRC_URI="http://telepathy.freedesktop.org/releases/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug farsight glib"
+IUSE="debug farsight glib test"

+# TODO raise dep if version is available:
+# >=net-libs/telepathy-glib-0.17.2
 RDEPEND="
 	dev-python/dbus-python
 	x11-libs/qt-core:4[glib?]
@ -25,32 +26,41 @@ RDEPEND="
 		dev-libs/dbus-glib
 		dev-libs/libxml2
 		media-libs/gstreamer
-		net-libs/telepathy-glib
 		net-libs/telepathy-farsight
 	)
+	glib? (
+		dev-libs/glib:2
+		>=net-libs/telepathy-glib-0.15.1
+	)
 	!net-libs/telepathy-qt4
 "
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	dev-util/pkgconfig
+	test? ( x11-libs/qt-test:4 )
 "

-PATCHES=( "${FILESDIR}/${PN}-0.5.12-automagicness.patch" )
+PATCHES=( "${FILESDIR}/${P}-automagicness.patch" )

-DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO )
-
-S=${WORKDIR}/${MY_PN}-${PV}
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )

 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
 }

+src_prepare() {
+	base_src_prepare
+
+	sed -i -e '/^add_subdirectory(examples)$/d' CMakeLists.txt || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_enable debug DEBUG_OUTPUT)
 		$(cmake-utils_use_with glib)
 		$(cmake-utils_use_with farsight)
+		$(cmake-utils_use_with test)
 	)
 	cmake-utils_src_configure
 }
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@ -1,2 +1,2 @@
-DIST notmuch-0.10.1.tar.gz 408501 RMD160 51ae631d6d0cd9b2d9494b5d58192358848e9701 SHA1 0939709a2e60c59656b8e0761ae8bcb38bba2a06 SHA256 687d690fc9e6896bcad16fdc7e6d0173108bc6218c11bfcde846d3d7d4bbcc5a
 DIST notmuch-0.10.2.tar.gz 408872 RMD160 82a3fb751340d8c58bd5e32110cfd77d273c46f6 SHA1 3064c1722d30c71f287e1ab63ac13a5847e20c14 SHA256 2ba5ba9b32e62180d7d5f2bc3f89360aede72319e57962ffeffa98cd1c37f0f7
+DIST notmuch-0.11.tar.gz 438168 RMD160 184ba8a7589d499ae18b8ec61c1cc05c1b1b2d1e SHA1 11eb1d967af089ed36f6816f61ebae308bc19339 SHA256 ce062b31db6868babaf3088adee95bfd1030b2691493e815da1730dd262226c0
--- a/net-mail/notmuch/files/0.10.1-fix-test-build.patch
+++ b/net-mail/notmuch/files/0.10.1-fix-test-build.patch
@ -1,104 +0,0 @@
-From dc1fae07d2896d9eace61989b7c25d9434ee7f3f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Fri, 25 Nov 2011 10:08:47 +0100
-Subject: [PATCH] Build symbol-test with make instead of hardcoding in
- symbol-hiding.
-
-If symbol-test is built in symbol-hiding with hardcoded g++ invokation, it's
-not so easy to pass $(srcdir) which is required to find notmuch.h when srcdir
-and builddir are separate directories.
-
-Fixed warnings in symbol-test.cc, btw.
---
- test/.gitignore     |    1 +
- test/Makefile.local |    5 ++++-
- test/basic          |    2 +-
- test/symbol-hiding  |    3 +--
- test/symbol-test.cc |    9 ++++-----
- 5 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/test/.gitignore b/test/.gitignore
-index 9e97052..7e30e8d 100644
--- a/test/.gitignore
-+++ b/test/.gitignore
-@@ -1,4 +1,5 @@
- test-results
- corpus.mail
- smtp-dummy
-+symbol-test
- tmp.*
-diff --git a/test/Makefile.local b/test/Makefile.local
-index 8eb0433..a672fd3 100644
--- a/test/Makefile.local
-+++ b/test/Makefile.local
-@@ -11,8 +11,11 @@ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)
- $(dir)/smtp-dummy: $(smtp_dummy_modules)
- 	$(call quiet,CC) $^ -o $@
- 
-+$(dir)/symbol-test: $(dir)/symbol-test.o
-+	$(call quiet,CC) $^ -o $@ -Llib -lnotmuch -lxapian
-+
- .PHONY: test check
-test:	all $(dir)/smtp-dummy
-+test:	all $(dir)/smtp-dummy $(dir)/symbol-test
- 	@${dir}/notmuch-test $(OPTIONS)
- 
- check: test
-diff --git a/test/basic b/test/basic
-index 38db2ba..5463bf8 100755
--- a/test/basic
-+++ b/test/basic
-@@ -56,7 +56,7 @@ tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
- available=$(ls -1 $TEST_DIRECTORY/ | \
-     sed -r -e "/^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test)/d" \
- 	   -e "/^(README|test-lib.sh|test-lib.el|test-results|tmp.*|valgrind|corpus*)/d" \
-	   -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc)/d" \
-+	   -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc|symbol-test|symbol-test.o)/d" \
- 	   -e "/^(test.expected-output|.*~)/d" \
- 	   -e "/^(gnupg-secret-key.asc)/d" \
- 	   -e "/^(gnupg-secret-key.NOTE)/d" \
-diff --git a/test/symbol-hiding b/test/symbol-hiding
-index d0b31ae..f67b653 100755
--- a/test/symbol-hiding
-+++ b/test/symbol-hiding
-@@ -12,13 +12,12 @@ test_description='exception symbol hiding'
- . ./test-lib.sh
- 
- run_test(){
-    result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib ./symbol-test 2>&1)
-+    result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test 2>&1)
- }
- 
- output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian'
- caught No chert database found at path \`./nonexistant'"
- 
-g++ -o symbol-test -I$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test.cc -L$TEST_DIRECTORY/../lib -lnotmuch -lxapian
- mkdir -p fakedb/.notmuch
- test_expect_success 'running test' run_test
- test_begin_subtest 'checking output'
-diff --git a/test/symbol-test.cc b/test/symbol-test.cc
-index 1de06ea..bfbe38f 100644
--- a/test/symbol-test.cc
-+++ b/test/symbol-test.cc
-@@ -1,14 +1,13 @@
- #include <stdio.h>
- #include <xapian.h>
- #include <notmuch.h>
-main (int argc, char **argv){
-+int main (){
- 
-    notmuch_database_t *notmuch
-      = notmuch_database_open ("fakedb",
-				     NOTMUCH_DATABASE_MODE_READ_ONLY);
-+  //notmuch_database_t *notmuch =
-+  notmuch_database_open ("fakedb", NOTMUCH_DATABASE_MODE_READ_ONLY);
- 
-   try{
-    (void)new Xapian::WritableDatabase ("./nonexistant",					Xapian::DB_OPEN);
-+    (void)new Xapian::WritableDatabase ("./nonexistant", Xapian::DB_OPEN);
-   } catch (const Xapian::Error &error) {
-     printf("caught %s\n",error.get_msg().c_str());
-     return 0;
-- 
-1.7.8.rc3
-
--- a/net-mail/notmuch/notmuch-0.10.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.10.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.10.1.ebuild,v 1.1 2011/12/02 08:38:53 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.11.ebuild,v 1.1 2012/01/25 10:28:03 aidecoe Exp $

 EAPI=4

@ -11,7 +11,6 @@ RUBY="/usr/bin/ruby18"
 RDOC="/usr/bin/rdoc18"

 inherit elisp-common distutils
-inherit autotools-utils

 DESCRIPTION="The mail indexer"
 HOMEPAGE="http://notmuchmail.org/"
@ -44,8 +43,7 @@ RDEPEND="${CDEPEND}
 	zsh-completion? ( app-shells/zsh )
 	"

-PATCHES=( "${FILESDIR}/${PV}-fix-test-build.patch" )
-DOCS=( AUTHORS NEWS README TODO )
+DOCS=( AUTHORS NEWS README )
 SITEFILE="50${PN}-gentoo.el"

 bindings() {
@ -65,7 +63,7 @@ pkg_setup() {
 }

 src_prepare() {
-	autotools-utils_src_prepare
+	default
 	bindings python distutils_src_prepare

 	r_fix() {
@ -87,11 +85,11 @@ src_configure() {
 		$(use_with emacs)
 		$(use_with zsh-completion)
 	)
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
 }

 src_compile() {
-	autotools-utils_src_compile
+	default
 	bindings python distutils_src_compile

 	r_make() {
@ -118,7 +116,7 @@ src_compile() {
 }

 src_install() {
-	autotools-utils_src_install
+	default

 	if use emacs; then
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
--- a/Show more
+++ b/Show more