Sync with portage [Tue Jan 24 08:32:04 MSK 2012].

2012-01-24 08:32:04 +04:00 · 2012-01-24 08:32:04 +04:00 · b63c86e4c0
commit b63c86e4c0
parent 0ff41ce730
227 changed files with 3563 additions and 2273 deletions
--- a/app-arch/unp/unp-2.0_pre7.ebuild
+++ b/app-arch/unp/unp-2.0_pre7.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unp/unp-2.0_pre7.ebuild,v 1.1 2011/10/16 19:22:48 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unp/unp-2.0_pre7.ebuild,v 1.2 2012/01/23 15:14:34 ago Exp $

 EAPI=2

@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${PV/_/~}"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"

 DEPEND="nls? ( sys-devel/gettext )"
--- a/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r1.ebuild
+++ b/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r1.ebuild
@ -1,29 +1,22 @@
-# 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-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r1.ebuild,v 1.1 2010/06/30 21:31:57 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417-r1.ebuild,v 1.2 2012/01/23 22:30:33 ssuominen Exp $

-EAPI=2
+EAPI=4
 inherit autotools

 DESCRIPTION="Free rar unpacker for old (pre v3) rar files"
 HOMEPAGE="http://home.gna.org/unrar/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
-DEPEND=""
-S="${WORKDIR}/${PN/-gpl}"

-src_prepare() {
-	eautoreconf || die "eautoreconf failed"
-}
+DOCS="AUTHORS README"

-src_configure() {
-	econf --program-suffix="-gpl" || die "econf failed"
-}
+S=${WORKDIR}/${PN/-gpl}

-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README || die "dodoc failed"
-}
+src_prepare() { eautoreconf; }
+src_configure() { econf --program-suffix="-gpl"; }
--- a/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417.ebuild
+++ b/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar-gpl/unrar-gpl-0.0.1_p20080417.ebuild,v 1.4 2010/03/07 09:59:14 hanno Exp $
-
-inherit autotools
-
-DESCRIPTION="Free rar unpacker for old (pre v3) rar files"
-HOMEPAGE="http://home.gna.org/unrar/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND="!app-arch/unrar"
-S="${WORKDIR}/${PN/-gpl}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README || die "dodoc failed"
-}
--- a/app-arch/unrar/unrar-4.1.4-r1.ebuild
+++ b/app-arch/unrar/unrar-4.1.4-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.1.4-r1.ebuild,v 1.2 2012/01/18 22:20:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.1.4-r1.ebuild,v 1.3 2012/01/23 22:27:07 ssuominen Exp $

 EAPI=4
 inherit flag-o-matic multilib toolchain-funcs
@ -28,9 +28,6 @@ src_prepare() {
 }

 src_compile() {
-	#append-lfs-flags #356155 #makefile.unix has DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE in 4.1.4
-	#todo: LIBS="-L. -lunrar" fails with undefineds
-
 	local f=makefile.unix

 	emake -f ${f} CXX="$(tc-getCXX)" CXXFLAGS="-fPIC ${CXXFLAGS}" lib
--- a/app-arch/unrar/unrar-4.1.4.ebuild
+++ b/app-arch/unrar/unrar-4.1.4.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.1.4.ebuild,v 1.1 2012/01/18 10:10:51 ssuominen Exp $
-
-EAPI=4
-inherit flag-o-matic toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="http://www.rarlab.com/rar_add.htm"
-SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="unRAR"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-src_compile() {
-	append-lfs-flags #356155
-	emake \
-		-f makefile.unix \
-		CXXFLAGS="${CXXFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		STRIP="true"
-}
-
-src_install() {
-	dobin unrar
-	dodoc readme.txt
-}
--- a/app-emulation/qemu-kvm/files/qemu-ifup
+++ b/app-emulation/qemu-kvm/files/qemu-ifup
@ -0,0 +1,5 @@
+#!/bin/sh
+
+switch=$(/sbin/ip route list | awk '/^default / { print $5 }')
+/sbin/ifconfig $1 0.0.0.0 up
+/usr/sbin/brctl addif ${switch} $1
--- a/app-emulation/qemu-kvm/metadata.xml
+++ b/app-emulation/qemu-kvm/metadata.xml
@ -19,6 +19,8 @@
    <flag name='sdl'>Enable the SDL-based console</flag>
    <flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
    <flag name='ssl'>Enable TLS support for the VNC console server</flag>
+    <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
+        devices to another machine over TCP</flag>
    <flag name='vde'>Enable VDE-based networking</flag>
    <flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
    <flag name='xattr'>
@ -26,5 +28,5 @@
      <pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.
    </flag>
    <flag name='xen'>Enables support for Xen backends</flag>
-</use>
+  </use>
 </pkgmetadata>
--- 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.29 2012/01/22 22:49:21 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.30 2012/01/23 22:10:14 slyfox Exp $

 #BACKPORTS=1

@ -29,8 +29,9 @@ HOMEPAGE="http://www.linux-kvm.org"

 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \
-png pulseaudio rbd sasl sdl spice ssl threads vde +vhost-net xattr xen"
+IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss
+opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads usbredir vde
+vhost-net xattr xen"
 # static, depends on libsdl being built with USE=static-libs, which can not
 # be expressed in current EAPI's

@ -44,7 +45,7 @@ IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
 IUSE="${IUSE} +qemu_softmmu_targets_x86_64"

 for target in ${IUSE_SOFTMMU_TARGETS}; do
-	if [ "x${target}" = "xx86_64" ]; then
+	if [[ ${target} = x86_64 ]]; then
 		continue
 	fi
 	IUSE="${IUSE} qemu_softmmu_targets_${target}"
@ -76,8 +77,16 @@ RDEPEND="
 	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] )
@ -86,14 +95,10 @@ RDEPEND="
 		>=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 )
-
-	qemu_softmmu_targets_lm32? (
-		x11-libs/libX11
-		virtual/opengl
-	)
 "

 DEPEND="${RDEPEND}
@ -211,14 +216,14 @@ src_configure() {
 		user_targets="${user_targets} ${target}-linux-user"
 	done

-	if [ -z "${softmmu_targets}" ]; then
+	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
+	if [[ -n ${user_targets} ]]; then
 		einfo "Building the following user targets: ${user_targets}"
 		conf_opts="${conf_opts} --enable-linux-user"
 	else
@ -234,32 +239,31 @@ src_configure() {
 	# 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 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 qemu_softmmu_targets_lm32 opengl)" # single opengl user
-	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"
+	conf_opts="${conf_opts}
+		$(use_enable aio linux-aio)
+		$(use_enable bluetooth bluez)
+		$(use_enable brltty brlapi)
+		$(use_enable curl)
+		$(use_enable fdt)
+		$(use_enable hardened pie)
+		$(use_enable jpeg vnc-jpeg)
+		$(use_enable ncurses curses)
+		$(use_enable nss smartcard-nss)
+		$(use_enable opengl)
+		$(use_enable png vnc-png)
+		$(use_enable rbd)
+		$(use_enable sasl vnc-sasl)
+		$(use_enable sdl)
+		$(use_enable spice)
+		$(use_enable ssl vnc-tls)
+		$(use_enable threads vnc-thread)
+		$(use_enable vde)
+		$(use_enable vhost-net)
+		$(use_enable xen)
+		$(use_enable xattr attr)
+		--disable-darwin-user --disable-bsd-user
+	"

 	# audio options
 	audio_opts="oss"
@ -268,10 +272,12 @@ src_configure() {
 	use pulseaudio && audio_opts="pa ${audio_opts}"
 	use sdl && audio_opts="sdl ${audio_opts}"

-	set -- --prefix=/usr \
+	set -- --prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
 		--disable-strip \
 		--disable-werror \
 		--enable-kvm \
+		--disable-libiscsi \
 		--enable-nptl \
 		--enable-uuid \
 		${conf_opts} \
@ -283,17 +289,12 @@ src_configure() {

 	echo ./configure "$@" # show actual options
 	./configure "$@" || 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
+	if [[ -n ${softmmu_targets} ]]; then
 		insinto /lib/udev/rules.d/
 		doins "${FILESDIR}"/65-gentoo-kvm.rules || die

@ -304,6 +305,12 @@ src_install() {
 			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
 			elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
 		fi
+
+		if use qemu-ifup; then
+			insinto /etc/qemu/
+			insopts -m0755
+			doins "${FILESDIR}"/qemu-ifup || die
+		fi
 	fi

 	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
@ -320,7 +327,7 @@ src_install() {

 pkg_postinst() {

-	if [ ! -z "${softmmu_targets}" ]; then
+	if [[ -n ${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."
@ -333,7 +340,9 @@ pkg_postinst() {
 		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."
+		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 "qemu-ifup script from /etc/qemu."
 		elog
 		elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
 	fi
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@ -21,6 +21,7 @@
    <flag name='kvm'>Use the KVM (Kernel Virtual Machine) infrastructure on compatible hardware</flag>
    <flag name='ncurses'>Enable the ncurses-based console</flag>
    <flag name='nss'>Build support for Smartcard devices emulation using <pkg>dev-libs/nss</pkg></flag>
+    <flag name='nss'>Enable opengl/x11 output for lm32 target.</flag>
    <flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>
    <flag name='qemu-ifup'>Provides the qemu-ifup script for use with
        QEMU's built in bridging</flag>
@ -30,6 +31,8 @@
        emulation</flag>
    <flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
    <flag name='ssl'>Enable TLS support for the VNC console server</flag>
+    <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
+        devices to another machine over TCP</flag>
    <flag name='vde'>Enable Virtual Distributed Ethernet (VDE) based networking</flag>
    <flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
    <flag name='xattr'>
--- a/app-emulation/qemu/qemu-1.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-1.0-r1.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.0.ebuild,v 1.3 2012/01/22 21:08:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.0-r1.ebuild,v 1.1 2012/01/23 21:15:03 slyfox Exp $

-EAPI="2"
+EAPI=4

 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.qemu.org/qemu.git
@ -12,10 +12,7 @@ fi

 inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs

-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
+if [[ ${PV} != *9999* ]]; then
 	SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
@ -25,8 +22,8 @@ HOMEPAGE="http://www.qemu.org"

 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss \
-png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads vde \
+IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss
+opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
 +vhost-net xattr xen"

 COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
@ -60,6 +57,10 @@ RDEPEND="
 	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 )
@ -69,14 +70,11 @@ RDEPEND="
 	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 )

-	qemu_softmmu_targets_lm32? (
-		x11-libs/libX11
-		virtual/opengl
-	)
 "

 DEPEND="${RDEPEND}
@ -124,8 +122,6 @@ pkg_setup() {
 }

 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
@ -150,13 +146,13 @@ src_configure() {
 		user_targets="${user_targets} ${target}-linux-user"
 	done

-	if [ -z "${softmmu_targets}" ]; then
+	if [[ -z ${softmmu_targets} ]]; then
 		conf_opts="${conf_opts} --disable-system"
 	else
 		einfo "Building the following softmmu targets: ${softmmu_targets}"
 	fi

-	if [ ! -z "${user_targets}" ]; then
+	if [[ -n ${user_targets} ]]; then
 		einfo "Building the following user targets: ${user_targets}"
 		conf_opts="${conf_opts} --enable-linux-user"
 	else
@ -169,32 +165,31 @@ src_configure() {
 	# Add support for static builds
 	use static && conf_opts="${conf_opts} --static"

-	# 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 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 qemu_softmmu_targets_lm32 opengl)" # single opengl user
-	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"
+	conf_opts="${conf_opts}
+		$(use_enable aio linux-aio)
+		$(use_enable bluetooth bluez)
+		$(use_enable brltty brlapi)
+		$(use_enable curl)
+		$(use_enable fdt)
+		$(use_enable hardened pie)
+		$(use_enable jpeg vnc-jpeg)
+		$(use_enable ncurses curses)
+		$(use_enable nss smartcard-nss)
+		$(use_enable opengl)
+		$(use_enable png vnc-png)
+		$(use_enable rbd)
+		$(use_enable sasl vnc-sasl)
+		$(use_enable sdl)
+		$(use_enable spice)
+		$(use_enable ssl vnc-tls)
+		$(use_enable threads vnc-thread)
+		$(use_enable vde)
+		$(use_enable vhost-net)
+		$(use_enable xen)
+		$(use_enable xattr attr)
+		--disable-darwin-user --disable-bsd-user
+	"

 	# audio options
 	audio_opts="oss"
@ -203,13 +198,16 @@ src_configure() {
 	use pulseaudio && audio_opts="pa ${audio_opts}"
 	use sdl && audio_opts="sdl ${audio_opts}"

-	set -- --prefix=/usr \
+	set -- --prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
 		--disable-strip \
 		--disable-werror \
 		--disable-kvm \
+		--disable-libiscsi \
 		--enable-nptl \
 		--enable-uuid \
 		${conf_opts} \
+		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
 		--audio-drv-list="${audio_opts}" \
 		--target-list="${softmmu_targets} ${user_targets}" \
 		--cc="$(tc-getCC)" \
@ -217,32 +215,20 @@ src_configure() {

 	echo ./configure "$@" # show actual options
 	./configure "$@" || 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_compile() {
-	# Restricting parallel build until we get a patch to fix this
-	emake || die
 }

 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/"${PF}" \
+	    install || die "make install failed"

-	if [ ! -z "${softmmu_targets}" ]; then
-		exeinto /etc/qemu
-		use qemu-ifup && { doexe \
-			"${FILESDIR}/qemu-ifup" \
-			"${FILESDIR}/qemu-ifdown" \
-			|| die "qemu interface scripts missing" ; }
+	if [[ -n ${softmmu_targets} ]]; then
+		if use qemu-ifup; then
+			exeinto /etc/qemu
+			doexe "${FILESDIR}"/qemu-if{up,down}
+		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() {
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.9 2012/01/22 21:03:52 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.12 2012/01/23 21:34:33 slyfox Exp $

-EAPI="2"
+EAPI=4

 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://git.qemu.org/qemu.git
@ -12,10 +12,7 @@ fi

 inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs

-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
+if [[ ${PV} != *9999* ]]; then
 	SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
@ -25,8 +22,8 @@ HOMEPAGE="http://www.qemu.org"

 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss \
-png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads vde \
+IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss
+opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
 +vhost-net xattr xen"

 COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
@ -60,23 +57,28 @@ RDEPEND="
 	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 )
+	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 )
+	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 )
-
-	qemu_softmmu_targets_lm32? (
-		x11-libs/libX11
-		virtual/opengl
-	)
 "

 DEPEND="${RDEPEND}
@ -124,8 +126,6 @@ pkg_setup() {
 }

 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
@ -150,13 +150,13 @@ src_configure() {
 		user_targets="${user_targets} ${target}-linux-user"
 	done

-	if [ -z "${softmmu_targets}" ]; then
+	if [[ -z ${softmmu_targets} ]]; then
 		conf_opts="${conf_opts} --disable-system"
 	else
 		einfo "Building the following softmmu targets: ${softmmu_targets}"
 	fi

-	if [ ! -z "${user_targets}" ]; then
+	if [[ -n ${user_targets} ]]; then
 		einfo "Building the following user targets: ${user_targets}"
 		conf_opts="${conf_opts} --enable-linux-user"
 	else
@ -169,32 +169,31 @@ src_configure() {
 	# Add support for static builds
 	use static && conf_opts="${conf_opts} --static"

-	# 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 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 qemu_softmmu_targets_lm32 opengl)" # single opengl user
-	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"
+	conf_opts="${conf_opts}
+		$(use_enable aio linux-aio)
+		$(use_enable bluetooth bluez)
+		$(use_enable brltty brlapi)
+		$(use_enable curl)
+		$(use_enable fdt)
+		$(use_enable hardened pie)
+		$(use_enable jpeg vnc-jpeg)
+		$(use_enable ncurses curses)
+		$(use_enable nss smartcard-nss)
+		$(use_enable opengl)
+		$(use_enable png vnc-png)
+		$(use_enable rbd)
+		$(use_enable sasl vnc-sasl)
+		$(use_enable sdl)
+		$(use_enable spice)
+		$(use_enable ssl vnc-tls)
+		$(use_enable threads vnc-thread)
+		$(use_enable vde)
+		$(use_enable vhost-net)
+		$(use_enable xen)
+		$(use_enable xattr attr)
+		--disable-darwin-user --disable-bsd-user
+	"

 	# audio options
 	audio_opts="oss"
@ -203,10 +202,12 @@ src_configure() {
 	use pulseaudio && audio_opts="pa ${audio_opts}"
 	use sdl && audio_opts="sdl ${audio_opts}"

-	set -- --prefix=/usr \
+	set -- --prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
 		--disable-strip \
 		--disable-werror \
 		--disable-kvm \
+		--disable-libiscsi \
 		--enable-nptl \
 		--enable-uuid \
 		${conf_opts} \
@ -218,27 +219,20 @@ src_configure() {

 	echo ./configure "$@" # show actual options
 	./configure "$@" || 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"
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/"${PF}" \
+	    install || die "make install failed"

-	if [ ! -z "${softmmu_targets}" ]; then
-		exeinto /etc/qemu
-		use qemu-ifup && { doexe \
-			"${FILESDIR}/qemu-ifup" \
-			"${FILESDIR}/qemu-ifdown" \
-			|| die "qemu interface scripts missing" ; }
+	if [[ -n ${softmmu_targets} ]]; then
+		if use qemu-ifup; then
+			exeinto /etc/qemu
+			doexe "${FILESDIR}"/qemu-if{up,down}
+		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() {
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@ -1,3 +1,4 @@
 DIST pax-utils-0.2.1.tar.bz2 80580 RMD160 f8eb1e6ba6cda70ddae00ecdd02f4be0f543c84b SHA1 c3fba8661e7dd39fe3723eefacaa2d69bb236adf SHA256 6a5beefb686e425eb6829bc716d2b32b64c2e854287c212c9853bc2beb705c3a
 DIST pax-utils-0.2.2.tar.bz2 80999 RMD160 7856d1054973ecc96d91fff349c23d7409cbea0f SHA1 1d856ba7a53e8d853335d22d2ddb9ed78b4a764a SHA256 eac86abe7871ee12452d221c1e7c21acb9ba78ba2cba1daa587d3c93c77acd07
 DIST pax-utils-0.2.3.tar.xz 76652 RMD160 ac61a5148fe92be3dd0f0eced65581a6dda63200 SHA1 72a06931bba7687b53109e5021d664d28b9fc1c9 SHA256 b2cdc20a0c67b78753ff4c4cbaa84b8175b0e2eb926de7390daef34a19297285
+DIST pax-utils-0.3.0.tar.xz 79892 RMD160 73e2afb4212803c9cad8284f20dd859f505eb03b SHA1 b1b768e9141f1b919c1a9ce6a7c02f75cc1e5bcd SHA256 d6d2992a40d89ab02d39a90d3c88ef553ecf1c9b93bae82efe16453b9152696a
--- a/app-misc/pax-utils/pax-utils-0.3.0.ebuild
+++ b/app-misc/pax-utils/pax-utils-0.3.0.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.3.0.ebuild,v 1.1 2012/01/24 00:12:08 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties"
+HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml"
+SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.xz
+	http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.xz
+	http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="caps"
+#RESTRICT="mirror"
+
+RDEPEND="caps? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_unpack() {
+	# avoid newer EAPI for easy upgrade paths
+	xz -dc "${DISTDIR}/${A}" | tar xf - || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" USE_CAP=$(use caps && echo yes) || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc BUGS README TODO
+}
--- a/app-mobilephone/obexd/obexd-0.44.ebuild
+++ b/app-mobilephone/obexd/obexd-0.44.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-mobilephone/obexd/obexd-0.44.ebuild,v 1.1 2012/01/13 16:55:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexd/obexd-0.44.ebuild,v 1.2 2012/01/23 15:13:49 ago Exp $

 EAPI="4"

@ -9,7 +9,7 @@ HOMEPAGE="http://www.bluez.org/"
 SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE="-eds nokia -server usb"

 RDEPEND="eds? ( gnome-extra/evolution-data-server )
--- a/app-text/gv/gv-3.7.1-r1.ebuild
+++ b/app-text/gv/gv-3.7.1-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.7.1-r1.ebuild,v 1.7 2011/10/06 17:48:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.7.1-r1.ebuild,v 1.8 2012/01/23 16:38:30 ssuominen Exp $

 EAPI=2
 inherit autotools eutils
@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="xinerama"

-DEPEND="x11-libs/libX11
+RDEPEND="x11-libs/libX11
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libXext
@ -24,6 +24,7 @@ DEPEND="x11-libs/libX11
 	x11-libs/libXaw3d
 	app-text/ghostscript-gpl
 	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}"

 src_prepare() {
 	epatch "${FILESDIR}"/gv-3.6.1-a0.patch
--- a/app-text/gv/gv-3.7.3-r1.ebuild
+++ b/app-text/gv/gv-3.7.3-r1.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.7.3-r1.ebuild,v 1.2 2012/01/23 16:38:30 ssuominen Exp $
+
+EAPI=4
+inherit eutils flag-o-matic
+
+DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
+HOMEPAGE="http://www.gnu.org/software/gv/"
+SRC_URI="mirror://gnu/gv/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="xinerama"
+
+RDEPEND="app-text/ghostscript-gpl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXaw3d-1.6-r1
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.7.3-libXaw3d-1.6.patch
+}
+
+src_configure() {
+	# Expose the correct codepath from /usr/include/X11/Xaw3d/SimpleP.h
+	append-cppflags -DXAW_INTERNATIONALIZATION #372395
+
+	export ac_cv_lib_Xinerama_main=$(usex xinerama)
+
+	econf \
+		--enable-scrollbar-code \
+		--enable-international
+}
+
+src_install() {
+	default
+
+	doicon "${FILESDIR}"/gv_icon.xpm
+	make_desktop_entry gv GhostView gv_icon "Graphics;Viewer"
+}
--- a/app-text/gv/gv-3.7.3.ebuild
+++ b/app-text/gv/gv-3.7.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.7.3.ebuild,v 1.1 2012/01/22 19:07:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gv/gv-3.7.3.ebuild,v 1.2 2012/01/23 16:38:30 ssuominen Exp $

 EAPI=4
 inherit eutils
@ -34,8 +34,6 @@ src_prepare() {
 }

 src_configure() {
-	# For $(use_enable unicode international), see bug #372395
-
 	export ac_cv_lib_Xinerama_main=$(usex xinerama)

 	econf --enable-scrollbar-code
--- a/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsh/bsh-2.0_beta4-r4.ebuild,v 1.1 2012/01/23 18:58:59 sera Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 eutils java-ant-2
+
+MY_PV=${PV/_beta/b}
+MY_DIST=${PN}-${MY_PV}-src.jar
+
+DESCRIPTION="BeanShell: A small embeddable Java source interpreter"
+HOMEPAGE="http://www.beanshell.org"
+SRC_URI="http://www.beanshell.org/${MY_DIST} mirror://gentoo/beanshell-icon.png"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bsf readline"
+# some tests fail but ant doesn't fail
+RESTRICT="test"
+
+RDEPEND=">=virtual/jdk-1.4
+	java-virtuals/servlet-api:3.0
+	readline? ( dev-java/libreadline-java:0 )"
+DEPEND="${RDEPEND}
+	bsf? ( dev-java/bsf:2.3 )"
+
+S=${WORKDIR}/BeanShell-${MY_PV}
+
+src_unpack() {
+	jar xf "${DISTDIR}"/${MY_DIST} || die "failed to unpack"
+}
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.jar' -delete || die
+
+	epatch "${FILESDIR}/bsh${MY_PV}-build.patch"
+	use readline && epatch "${FILESDIR}/bsh2-readline.patch"
+
+	java-pkg_jar-from --into lib servlet-api-3.0
+	use readline && java-pkg_jar-from --into lib libreadline-java
+	use bsf && java-pkg_jar-from --into lib --build-only bsf-2.3
+}
+
+src_compile() {
+	eant $(use bsf && echo -Dexclude-bsf=) jarall $(use_doc)
+}
+
+src_test() {
+	eant test
+}
+
+src_install() {
+	java-pkg_newjar dist/${P/_beta/b}.jar
+
+	java-pkg_dolauncher bsh-console --main bsh.Console
+	java-pkg_dolauncher bsh-interpreter --main bsh.Interpreter
+
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/bsh
+
+	newicon "${DISTDIR}"/beanshell-icon.png beanshell.png
+
+	make_desktop_entry bsh-console "BeanShell Prompt" beanshell
+}
--- a/dev-java/jaxp/jaxp-1.4-r1.ebuild
+++ b/dev-java/jaxp/jaxp-1.4-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.4-r1.ebuild,v 1.2 2009/03/29 17:35:02 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.4-r1.ebuild,v 1.3 2012/01/23 16:12:40 ago Exp $

 JAVA_PKG_IUSE="doc source"

@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"

 LICENSE="CDDL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""

 DEPEND=">=virtual/jdk-1.4"
--- a/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
+++ b/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild
@ -1,6 +1,6 @@
-# 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/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild,v 1.1 2010/08/30 16:17:36 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/libmatthew-java/libmatthew-java-0.7.2-r1.ebuild,v 1.2 2012/01/23 15:15:00 ago Exp $

 JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2 flag-o-matic toolchain-funcs
@ -11,7 +11,7 @@ SRC_URI="http://www.matthew.ath.cx/projects/java/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""

 RDEPEND=">=virtual/jre-1.5"
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@ -0,0 +1 @@
+DIST SnakeYAML-all-1.9.zip 9122570 RMD160 2ab11eba3be04c72884622eadf09a063b819982d SHA1 b07b7c524b6a7d4e38a783753329d71a44956530 SHA256 7c1090eb1b2e06f784dc424678f18d513dfe020fd2f0042c63217e09ae9a8853
--- a/dev-java/snakeyaml/metadata.xml
+++ b/dev-java/snakeyaml/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
--- a/dev-java/snakeyaml/snakeyaml-1.9.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.9.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/snakeyaml/snakeyaml-1.9.ebuild,v 1.1 2012/01/23 19:22:09 sera Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A YAML 1.1 parser and emitter for Java 5"
+HOMEPAGE="http://code.google.com/p/snakeyaml/"
+SRC_URI="http://snakeyaml.googlecode.com/files/SnakeYAML-all-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+S="${WORKDIR}/${PN}"
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.class' -exec rm {} +
+
+	# Easier to use java-pkg-simple.
+	rm -v pom.xml || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	dodoc AUTHORS src/etc/announcement.msg
+}
--- a/dev-libs/boost/boost-1.48.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.48.0-r1.ebuild
@ -0,0 +1,608 @@
+# Copyright owners: Gentoo Foundation
+#                   Arfrever Frehtes Taifersar Arahesis
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
+
+inherit check-reqs flag-o-matic multilib python toolchain-funcs versionator
+
+MY_P=${PN}_$(replace_all_version_separators _)
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="http://www.boost.org/"
+SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc +eselect icu mpi python static-libs test tools"
+
+RDEPEND="icu? ( >=dev-libs/icu-3.3 )
+	mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
+	sys-libs/zlib
+	!!<=dev-libs/boost-1.35.0-r2
+	>=app-admin/eselect-boost-0.3"
+DEPEND="${RDEPEND}
+	>=dev-util/boost-build-1.48.0-r1:${SLOT}"
+
+S=${WORKDIR}/${MY_P}
+
+MAJOR_PV=$(replace_all_version_separators _ ${SLOT})
+BJAM="b2-${MAJOR_PV}"
+
+# Usage:
+# _add_line <line-to-add> <profile>
+# ... to add to specific profile
+# or
+# _add_line <line-to-add>
+# ... to add to all profiles for which the use flag set
+
+_add_line() {
+	if [[ -z "$2" ]]; then
+		echo "${1}" >> "${D}usr/share/boost-eselect/profiles/${SLOT}/default"
+		if use debug; then
+			echo "${1}" >> "${D}usr/share/boost-eselect/profiles/${SLOT}/debug"
+		fi
+	else
+		echo "${1}" >> "${D}usr/share/boost-eselect/profiles/${SLOT}/${2}"
+	fi
+}
+
+create_user-config.jam() {
+	local compiler compiler_version compiler_executable
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+		compiler_executable="$(tc-getCXX)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+		compiler_executable="$(tc-getCXX)"
+	fi
+	local mpi_configuration python_configuration
+
+	if use mpi; then
+		mpi_configuration="using mpi ;"
+	fi
+
+	if use python; then
+		python_configuration="using python : $(python_get_version) : /usr : $(python_get_includedir) : /usr/$(get_libdir) ;"
+	fi
+
+	# The debug-symbols=none and optimization=none are not official upstream flags but a Gentoo
+	# specific patch to make sure that all our CFLAGS/CXXFLAGS/LDFLAGS are being respected.
+	# Using optimization=off would for example add "-O0" and override "-O2" set by the user.
+	# Please take a look at the boost-build ebuild for more information.
+	cat > user-config.jam << __EOF__
+variant gentoorelease : release : <optimization>none <debug-symbols>none ;
+variant gentoodebug : debug : <optimization>none ;
+
+using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+${mpi_configuration}
+${python_configuration}
+__EOF__
+}
+
+pkg_pretend() {
+	if use test; then
+		CHECKREQS_DISK_BUILD="15G" check-reqs_pkg_pretend
+
+		ewarn "The tests may take several hours on a recent machine"
+		ewarn "but they will not fail (unless something weird happens ;-)"
+		ewarn "This is because the tests depend on the used compiler/-version"
+		ewarn "and the platform and upstream says that this is normal."
+		ewarn "If you are interested in the results, please take a look at the"
+		ewarn "generated results page:"
+		ewarn "  ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
+		ebeep 5
+	fi
+}
+
+pkg_setup() {
+	if use python; then
+		python_pkg_setup
+	fi
+
+	if use debug; then
+		ewarn "The debug USE flag means that a second set of the boost libraries"
+		ewarn "will be built containing debug symbols. You'll be able to select them"
+		ewarn "using the boost-eselect module. But even though the optimization flags"
+		ewarn "you might have set are not stripped, there will be a performance"
+		ewarn "penalty and linking other packages against the debug version"
+		ewarn "of boost is _not_ recommended."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-mpi_python3.patch"
+	epatch "${FILESDIR}/${P}-respect_python-buildid.patch"
+	epatch "${FILESDIR}/${P}-support_dots_in_python-buildid.patch"
+	epatch "${FILESDIR}/${P}-no_strict_aliasing_python2.patch"
+	epatch "${FILESDIR}/${P}-disable_libboost_python3.patch"
+	epatch "${FILESDIR}/${P}-python_linking.patch"
+	epatch "${FILESDIR}/${P}-disable_icu_rpath.patch"
+	epatch "${FILESDIR}/remove-toolset-${PV}.patch"
+
+	# This enables building the boost.random library with /dev/urandom support
+	if [[ -e /dev/urandom ]]; then
+		mkdir -p libs/random/build || die
+		cp "${FILESDIR}/random-Jamfile-${PV}" libs/random/build/Jamfile.v2 || die
+	fi
+}
+
+src_configure() {
+	OPTIONS=""
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# bug 298489
+	if use ppc || use ppc64; then
+		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
+	fi
+
+	use icu && OPTIONS+=" -sICU_PATH=/usr"
+	use icu || OPTIONS+=" --disable-icu"
+	use mpi || OPTIONS+=" --without-mpi"
+	use python || OPTIONS+=" --without-python"
+
+	# https://svn.boost.org/trac/boost/attachment/ticket/2597/add-disable-long-double.patch
+	if use sparc || { use mips && [[ ${ABI} = "o32" ]]; } || use hppa || use arm || use x86-fbsd || use sh; then
+		OPTIONS+=" --disable-long-double"
+	fi
+
+	OPTIONS+=" pch=off --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}usr\" --layout=versioned"
+
+	if use static-libs; then
+		LINK_OPTS="link=shared,static"
+		LIBRARY_TARGETS="*.a *$(get_libname)"
+	else
+		LINK_OPTS="link=shared"
+		# There is no dynamically linked version of libboost_test_exec_monitor and libboost_exception.
+		LIBRARY_TARGETS="libboost_test_exec_monitor*.a libboost_exception*.a *$(get_libname)"
+	fi
+}
+
+src_compile() {
+	local jobs
+	jobs=$( echo " ${MAKEOPTS} " | \
+		sed -e 's/ --jobs[= ]/ -j /g' \
+			-e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \
+			-e 's/ -j\>/ -j1/g' | \
+			( while read -d ' ' j; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; jobs="${j#-j}"; done; echo ${jobs} ) )
+	if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi
+
+	export BOOST_ROOT="${S}"
+	PYTHON_DIRS=""
+	MPI_PYTHON_MODULE=""
+
+	building() {
+		create_user-config.jam
+
+		einfo "Using the following command to build:"
+		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared $(use python && echo --python-buildid=${PYTHON_ABI})"
+
+		${BJAM} ${NUMJOBS} -q -d+2 \
+			gentoorelease \
+			--user-config=user-config.jam \
+			${OPTIONS} \
+			threading=single,multi ${LINK_OPTS} runtime-link=shared \
+			$(use python && echo --python-buildid=${PYTHON_ABI}) \
+			|| die "Building of Boost libraries failed"
+
+		# ... and do the whole thing one more time to get the debug libs
+		if use debug; then
+			einfo "Using the following command to build:"
+			einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --buildid=debug $(use python && echo --python-buildid=${PYTHON_ABI})"
+
+			${BJAM} ${NUMJOBS} -q -d+2 \
+				gentoodebug \
+				--user-config=user-config.jam \
+				${OPTIONS} \
+				threading=single,multi ${LINK_OPTS} runtime-link=shared \
+				--buildid=debug \
+				$(use python && echo --python-buildid=${PYTHON_ABI}) \
+				|| die "Building of Boost debug libraries failed"
+		fi
+
+		if use python; then
+			if [[ -z "${PYTHON_DIRS}" ]]; then
+				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
+			else
+				if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
+					die "Inconsistent structure of build directories"
+				fi
+			fi
+
+			local dir
+			for dir in ${PYTHON_DIRS}; do
+				mv ${dir} ${dir}-${PYTHON_ABI} || die "Renaming of '${dir}' to '${dir}-${PYTHON_ABI}' failed"
+			done
+
+			if use mpi; then
+				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
+					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoorelease -name mpi.so)"
+					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
+						die "Multiple mpi.so files found"
+					fi
+				else
+					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoorelease -name mpi.so)" ]]; then
+						die "Inconsistent structure of build directories"
+					fi
+				fi
+
+				mv stage/lib/mpi.so stage/lib/mpi.so-${PYTHON_ABI} || die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${PYTHON_ABI}' failed"
+			fi
+		fi
+	}
+	if use python; then
+		python_execute_function building
+	else
+		building
+	fi
+
+	if use tools; then
+		pushd tools > /dev/null || die
+		einfo "Using the following command to build the tools:"
+		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease --user-config=../user-config.jam ${OPTIONS}"
+
+		${BJAM} ${NUMJOBS} -q -d+2\
+			gentoorelease \
+			--user-config=../user-config.jam \
+			${OPTIONS} \
+			|| die "Building of Boost tools failed"
+		popd > /dev/null || die
+	fi
+}
+
+src_install () {
+	dodir /usr/share/boost-eselect/profiles/${SLOT}
+	touch "${D}usr/share/boost-eselect/profiles/${SLOT}/default" || die
+	if use debug; then
+		 touch "${D}usr/share/boost-eselect/profiles/${SLOT}/debug" || die
+	fi
+
+	if use mpi && use python; then
+		_add_line "python=\""
+	fi
+
+	installation() {
+		create_user-config.jam
+
+		if use python; then
+			local dir
+			for dir in ${PYTHON_DIRS}; do
+				cp -pr ${dir}-${PYTHON_ABI} ${dir} || die "Copying of '${dir}-${PYTHON_ABI}' to '${dir}' failed"
+			done
+
+			if use mpi; then
+				cp -p stage/lib/mpi.so-${PYTHON_ABI} "${MPI_PYTHON_MODULE}" || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to '${MPI_PYTHON_MODULE}' failed"
+				cp -p stage/lib/mpi.so-${PYTHON_ABI} stage/lib/mpi.so || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to 'stage/lib/mpi.so' failed"
+			fi
+		fi
+
+		einfo "Using the following command to install:"
+		einfo "${BJAM} -q -d+2 gentoorelease --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}usr/include\" --libdir=\"${D}usr/$(get_libdir)\" $(use python && echo --python-buildid=${PYTHON_ABI}) install"
+
+		${BJAM} -q -d+2 \
+			gentoorelease \
+			--user-config=user-config.jam \
+			${OPTIONS} \
+			threading=single,multi ${LINK_OPTS} runtime-link=shared \
+			--includedir="${D}usr/include" \
+			--libdir="${D}usr/$(get_libdir)" \
+			$(use python && echo --python-buildid=${PYTHON_ABI}) \
+			install || die "Installation of Boost libraries failed"
+
+		if use debug; then
+			einfo "Using the following command to install:"
+			einfo "${BJAM} -q -d+2 gentoodebug --user-config=user-config.jam ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}usr/include\" --libdir=\"${D}usr/$(get_libdir)\" --buildid=debug $(use python && echo --python-buildid=${PYTHON_ABI})"
+
+			${BJAM} -q -d+2 \
+				gentoodebug \
+				--user-config=user-config.jam \
+				${OPTIONS} \
+				threading=single,multi ${LINK_OPTS} runtime-link=shared \
+				--includedir="${D}usr/include" \
+				--libdir="${D}usr/$(get_libdir)" \
+				--buildid=debug \
+				$(use python && echo --python-buildid=${PYTHON_ABI}) \
+				install || die "Installation of Boost debug libraries failed"
+		fi
+
+		if use python; then
+			rm -r ${PYTHON_DIRS} || die
+
+			# Move mpi.so Python module to Python site-packages directory and make sure it is slotted.
+			if use mpi; then
+				mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
+				mv "${D}usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
+				touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die
+				_add_line "$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so"
+			fi
+		fi
+	}
+	if use python; then
+		python_execute_function installation
+	else
+		installation
+	fi
+
+	if use mpi && use python; then
+		_add_line "\""
+	fi
+
+	use python || rm -rf "${D}usr/include/boost-${MAJOR_PV}/boost"/python* || die
+
+	if use doc; then
+		find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
+		dohtml \
+			-A pdf,txt,cpp,hpp \
+			*.{htm,html,png,css} \
+			-r doc
+		dohtml \
+			-A pdf,txt \
+			-r tools
+		insinto /usr/share/doc/${PF}/html
+		doins -r libs
+		doins -r more
+
+		# To avoid broken links
+		insinto /usr/share/doc/${PF}/html
+		doins LICENSE_1_0.txt
+
+		dosym /usr/include/boost-${MAJOR_PV}/boost /usr/share/doc/${PF}/html/boost
+	fi
+
+	pushd "${D}usr/$(get_libdir)" > /dev/null || die
+
+	# Remove (unversioned) symlinks
+	# And check for what we remove to catch bugs
+	# got a better idea how to do it? tell me!
+	local f
+	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v "${MAJOR_PV}"); do
+		if [[ ! -h "${f}" ]]; then
+			eerror "Tried to remove '${f}' which is a regular file instead of a symlink"
+			die "Slotting/naming of the libraries broken!"
+		fi
+		rm "${f}" || die
+	done
+
+	# The threading libs obviously always gets the "-mt" (multithreading) tag
+	# some packages seem to have a problem with it. Creating symlinks...
+
+	if use static-libs; then
+		THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}.a libboost_thread-mt-${MAJOR_PV}$(get_libname)"
+	else
+		THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}$(get_libname)"
+	fi
+	local lib
+	for lib in ${THREAD_LIBS}; do
+		dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+	done
+
+	# The same goes for the mpi libs
+	if use mpi; then
+		if use static-libs; then
+			MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}.a libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
+		else
+			MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
+		fi
+		local lib
+		for lib in ${MPI_LIBS}; do
+			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+		done
+	fi
+
+	if use debug; then
+		if use static-libs; then
+			THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname) libboost_thread-mt-${MAJOR_PV}-debug.a"
+		else
+			THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname)"
+		fi
+
+		local lib
+		for lib in ${THREAD_DEBUG_LIBS}; do
+			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+		done
+
+		if use mpi; then
+			if use static-libs; then
+				MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug.a libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
+			else
+				MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
+			fi
+
+			local lib
+			for lib in ${MPI_DEBUG_LIBS}; do
+				dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
+			done
+		fi
+	fi
+
+	# Create a subdirectory with completely unversioned symlinks
+	# and store the names in the profiles-file for eselect
+	dodir /usr/$(get_libdir)/boost-${MAJOR_PV}
+
+	_add_line "libs=\"" default
+	local f
+	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v debug); do
+		dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}}
+		_add_line "/usr/$(get_libdir)/${f}" default
+	done
+	_add_line "\"" default
+
+	if use debug; then
+		_add_line "libs=\"" debug
+		dodir /usr/$(get_libdir)/boost-${MAJOR_PV}-debug
+		local f
+		for f in $(ls -1 ${LIBRARY_TARGETS} | grep debug); do
+			dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}-debug/${f/-${MAJOR_PV}-debug}
+			_add_line "/usr/$(get_libdir)/${f}" debug
+		done
+		_add_line "\"" debug
+
+		_add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" debug
+		_add_line "suffix=\"-debug\"" debug
+	fi
+
+	_add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" default
+
+	popd > /dev/null || die
+
+	if use tools; then
+		pushd dist/bin > /dev/null || die
+		# Append version postfix to binaries for slotting
+		_add_line "bins=\""
+		local b
+		for b in *; do
+			newbin "${b}" "${b}-${MAJOR_PV}"
+			_add_line "/usr/bin/${b}-${MAJOR_PV}"
+		done
+		_add_line "\""
+		popd > /dev/null || die
+
+		pushd dist > /dev/null || die
+		insinto /usr/share
+		doins -r share/boostbook
+		# Append version postfix for slotting
+		mv "${D}usr/share/boostbook" "${D}usr/share/boostbook-${MAJOR_PV}" || die
+		_add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\""
+		popd > /dev/null || die
+	fi
+
+	pushd status > /dev/null || die
+	if [[ -f regress.log ]]; then
+		docinto status
+		dohtml *.html ../boost.png
+		dodoc regress.log
+	fi
+	popd > /dev/null || die
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+src_test() {
+	testing() {
+		if use python; then
+			local dir
+			for dir in ${PYTHON_DIRS}; do
+				cp -pr ${dir}-${PYTHON_ABI} ${dir} || die "Copying of '${dir}-${PYTHON_ABI}' to '${dir}' failed"
+			done
+
+			if use mpi; then
+				cp -p stage/lib/mpi.so-${PYTHON_ABI} "${MPI_PYTHON_MODULE}" || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to '${MPI_PYTHON_MODULE}' failed"
+				cp -p stage/lib/mpi.so-${PYTHON_ABI} stage/lib/mpi.so || die "Copying of 'stage/lib/mpi.so-${PYTHON_ABI}' to 'stage/lib/mpi.so' failed"
+			fi
+		fi
+
+		pushd tools/regression/build > /dev/null || die
+		einfo "Using the following command to build test helpers:"
+		einfo "${BJAM} -q -d+2 gentoorelease --user-config=../../../user-config.jam ${OPTIONS} process_jam_log compiler_status"
+
+		${BJAM} -q -d+2 \
+			gentoorelease \
+			--user-config=../../../user-config.jam \
+			${OPTIONS} \
+			process_jam_log compiler_status \
+			|| die "Building of regression test helpers failed"
+
+		popd > /dev/null || die
+		pushd status > /dev/null || die
+
+		# Some of the test-checks seem to rely on regexps
+		export LC_ALL="C"
+
+		# The following is largely taken from tools/regression/run_tests.sh,
+		# but adapted to our needs.
+
+		# Run the tests & write them into a file for postprocessing
+		einfo "Using the following command to test:"
+		einfo "${BJAM} --user-config=../user-config.jam ${OPTIONS} --dump-tests"
+
+		${BJAM} \
+			--user-config=../user-config.jam \
+			${OPTIONS} \
+			--dump-tests 2>&1 | tee regress.log || die
+
+		# Postprocessing
+		cat regress.log | tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/process_jam_log --v2
+		if test $? != 0; then
+			die "Postprocessing the build log failed"
+		fi
+
+		cat > comment.html <<- __EOF__
+		<p>Tests are run on a <a href="http://www.gentoo.org">Gentoo</a> system.</p>
+__EOF__
+
+		# Generate the build log html summary page
+		tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/compiler_status --v2 \
+			--comment comment.html .. \
+			cs-$(uname).html cs-$(uname)-links.html
+		if test $? != 0; then
+			die "Generating the build log html summary page failed"
+		fi
+
+		# And do some cosmetic fixes :)
+		sed -i -e 's|http://www.boost.org/boost.png|boost.png|' *.html || die
+
+		popd > /dev/null || die
+
+		if use python; then
+			rm -r ${PYTHON_DIRS} || die
+		fi
+	}
+	if use python; then
+		python_execute_function -f -q testing
+	else
+		testing
+	fi
+}
+
+pkg_postinst() {
+	if use eselect; then
+		eselect boost update || ewarn "eselect boost update failed."
+	fi
+
+	if [[ ! -h "${ROOT}etc/eselect/boost/active" ]]; then
+		elog "No active boost version found. Calling eselect to select one..."
+		eselect boost update || ewarn "eselect boost update failed."
+	fi
+}
--- a/dev-libs/boost/boost-1.48.0.ebuild
+++ b/dev-libs/boost/boost-1.48.0.ebuild
@ -1,486 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.48.0.ebuild,v 1.2 2012/01/08 11:42:28 hwoarang Exp $
-
-EAPI="2"
-
-inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
-
-MY_P=${PN}_$(replace_all_version_separators _)
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="http://www.boost.org/"
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
-LICENSE="Boost-1.0"
-SLOT="$(get_version_component_range 1-2)"
-IUSE="debug doc +eselect icu mpi python static-libs test tools"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.3 )
-	mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) )
-	sys-libs/zlib
-	python? ( dev-lang/python )
-	!!<=dev-libs/boost-1.35.0-r2
-	>=app-admin/eselect-boost-0.3"
-DEPEND="${RDEPEND}
-	dev-util/boost-build:${SLOT}"
-
-S=${WORKDIR}/${MY_P}
-
-MAJOR_PV=$(replace_all_version_separators _ ${SLOT})
-BJAM="b2-${MAJOR_PV}"
-
-# Usage:
-# _add_line <line-to-add> <profile>
-# ... to add to specific profile
-# or
-# _add_line <line-to-add>
-# ... to add to all profiles for which the use flag set
-
-_add_line() {
-	if [ -z "$2" ] ; then
-		echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/default"
-		use debug && echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug"
-	else
-		echo "${1}" >> "${D}/usr/share/boost-eselect/profiles/${SLOT}/${2}"
-	fi
-}
-
-pkg_setup() {
-	# It doesn't compile with USE="python mpi" and python-3 (bug 295705)
-	if use python && use mpi ; then
-		if [[ "$(python_get_version --major)" != "2" ]]; then
-			eerror "The Boost.MPI python bindings do not support any other python version"
-			eerror "than 2.x. Please either use eselect to select a python 2.x version or"
-			eerror "disable the python and/or mpi use flag for =${CATEGORY}/${PF}."
-			die "unsupported python version"
-		fi
-	fi
-
-	if use test ; then
-		CHECKREQS_DISK_BUILD="15G"
-		check_reqs
-
-		ewarn "The tests may take several hours on a recent machine"
-		ewarn "but they will not fail (unless something weird happens ;-)"
-		ewarn "This is because the tests depend on the used compiler/-version"
-		ewarn "and the platform and upstream says that this is normal."
-		ewarn "If you are interested in the results, please take a look at the"
-		ewarn "generated results page:"
-		ewarn "  ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
-		ebeep 5
-
-	fi
-
-	if use debug ; then
-		ewarn "The debug USE-flag means that a second set of the boost libraries"
-		ewarn "will be built containing debug-symbols. You'll be able to select them"
-		ewarn "using the boost-eselect module. But even though the optimization flags"
-		ewarn "you might have set are not stripped, there will be a performance"
-		ewarn "penalty and linking other packages against the debug version"
-		ewarn "of boost is _not_ recommended."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/remove-toolset-${PV}.patch"
-	# This enables building the boost.random library with /dev/urandom support
-	if [[ -e /dev/urandom ]] ; then
-		mkdir -p libs/random/build || die
-		cp "${FILESDIR}/random-Jamfile-${PV}" libs/random/build/Jamfile.v2 || die
-	fi
-}
-
-src_configure() {
-	einfo "Writing new user-config.jam"
-
-	local compiler compilerVersion compilerExecutable mpi
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		compiler=darwin
-		compilerVersion=$(gcc-fullversion)
-		compilerExecutable=$(tc-getCXX)
-		# we need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation
-		append-ldflags -Wl,-headerpad_max_install_names
-	else
-		compiler=gcc
-		compilerVersion=$(gcc-version)
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	# Using -fno-strict-aliasing to prevent possible creation of invalid code.
-	append-flags -fno-strict-aliasing
-
-	# bug 298489
-	if use ppc || use ppc64 ; then
-		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
-	fi;
-
-	use mpi && mpi="using mpi ;"
-
-	if use python ; then
-		pystring="using python : $(python_get_version) : /usr :	$(python_get_includedir) : $(python_get_libdir) ;"
-	fi
-
-	cat > "${S}/user-config.jam" << __EOF__
-
-variant gentoorelease : release : <optimization>none <debug-symbols>none ;
-variant gentoodebug : debug : <optimization>none ;
-
-using ${compiler} : ${compilerVersion} : ${compilerExecutable} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-
-${pystring}
-
-${mpi}
-
-__EOF__
-
-	# Maintainer information:
-	# The debug-symbols=none and optimization=none
-	# are not official upstream flags but a Gentoo
-	# specific patch to make sure that all our
-	# CXXFLAGS/LDFLAGS are being respected.
-	# Using optimization=off would for example add
-	# "-O0" and override "-O2" set by the user.
-	# Please take a look at the boost-build ebuild
-	# for more infomration.
-
-	use icu && OPTIONS="-sICU_PATH=/usr"
-	use icu || OPTIONS="--disable-icu"
-	use mpi || OPTIONS="${OPTIONS} --without-mpi"
-	use python || OPTIONS="${OPTIONS} --without-python"
-
-	# https://svn.boost.org/trac/boost/attachment/ticket/2597/add-disable-long-double.patch
-	if use sparc || { use mips && [[ ${ABI} = "o32" ]]; } || use hppa || use arm || use x86-fbsd || use sh; then
-		OPTIONS="${OPTIONS} --disable-long-double"
-	fi
-
-	OPTIONS="${OPTIONS} pch=off --user-config=\"${S}/user-config.jam\" --boost-build=/usr/share/boost-build-${MAJOR_PV} --prefix=\"${D}/usr\" --layout=versioned"
-
-	if use static-libs ; then
-		LINK_OPTS="link=shared,static"
-		LIBRARY_TARGETS="*.a *$(get_libname)"
-	else
-		LINK_OPTS="link=shared"
-		#there is no dynamicly linked version of libboost_test_exec_monitor and libboost_exception
-		LIBRARY_TARGETS="libboost_test_exec_monitor*.a libboost_exception*.a *$(get_libname)"
-	fi
-}
-
-src_compile() {
-	jobs=$( echo " ${MAKEOPTS} " | \
-		sed -e 's/ --jobs[= ]/ -j /g' \
-			-e 's/ -j \([1-9][0-9]*\)/ -j\1/g' \
-			-e 's/ -j\>/ -j1/g' | \
-			( while read -d ' ' j ; do if [[ "${j#-j}" = "$j" ]]; then continue; fi; jobs="${j#-j}"; done; echo ${jobs} ) )
-	if [[ "${jobs}" != "" ]]; then NUMJOBS="-j"${jobs}; fi;
-
-	export BOOST_ROOT="${S}"
-
-	einfo "Using the following command to build: "
-	einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared"
-
-	${BJAM} ${NUMJOBS} -q -d+2 \
-		gentoorelease \
-		${OPTIONS} \
-		threading=single,multi ${LINK_OPTS} runtime-link=shared \
-		|| die "building boost failed"
-
-	# ... and do the whole thing one more time to get the debug libs
-	if use debug ; then
-		einfo "Using the following command to build: "
-		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --buildid=debug"
-
-		${BJAM} ${NUMJOBS} -q -d+2 \
-			gentoodebug \
-			${OPTIONS} \
-			threading=single,multi ${LINK_OPTS} runtime-link=shared \
-			--buildid=debug \
-			|| die "building boost failed"
-	fi
-
-	if use tools; then
-		cd "${S}/tools/"
-		einfo "Using the following command to build the tools: "
-		einfo "${BJAM} ${NUMJOBS} -q -d+2 gentoorelease ${OPTIONS}"
-
-		${BJAM} ${NUMJOBS} -q -d+2\
-			gentoorelease \
-			${OPTIONS} \
-			|| die "building tools failed"
-	fi
-
-}
-
-src_install () {
-	export BOOST_ROOT="${S}"
-
-	einfo "Using the following command to install: "
-	einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" install"
-
-	${BJAM} -q -d+2 \
-		gentoorelease \
-		${OPTIONS} \
-		threading=single,multi ${LINK_OPTS} runtime-link=shared \
-		--includedir="${D}/usr/include" \
-		--libdir="${D}/usr/$(get_libdir)" \
-		install || die "install failed for options '${OPTIONS}'"
-
-	if use debug ; then
-		einfo "Using the following command to install: "
-		einfo "${BJAM} -q -d+2 gentoodebug ${OPTIONS} threading=single,multi ${LINK_OPTS} runtime-link=shared --includedir=\"${D}/usr/include\" --libdir=\"${D}/usr/$(get_libdir)\" --buildid=debug"
-
-		${BJAM} -q -d+2 \
-			gentoodebug \
-			${OPTIONS} \
-			threading=single,multi ${LINK_OPTS} runtime-link=shared \
-			--includedir="${D}/usr/include" \
-			--libdir="${D}/usr/$(get_libdir)" \
-			--buildid=debug \
-			install || die "install failed for options '${OPTIONS}'"
-	fi
-
-	use python || rm -rf "${D}/usr/include/boost-${MAJOR_PV}/boost"/python* || die
-
-	dodir /usr/share/boost-eselect/profiles/${SLOT} || die
-	touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/default" || die
-	if use debug ; then
-		 touch "${D}/usr/share/boost-eselect/profiles/${SLOT}/debug" || die
-	fi
-
-	# Move the mpi.so to the right place and make sure it's slotted
-	if use mpi && use python; then
-		mkdir -p "${D}$(python_get_sitedir)/boost_${MAJOR_PV}" || die
-		mv "${D}/usr/$(get_libdir)/mpi.so" "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/" || die
-		touch "${D}$(python_get_sitedir)/boost_${MAJOR_PV}/__init__.py" || die
-		_add_line "python=\"$(python_get_sitedir)/boost_${MAJOR_PV}/mpi.so\""
-	fi
-
-	if use doc ; then
-		find libs/*/* -iname "test" -or -iname "src" | xargs rm -rf
-		dohtml \
-			-A pdf,txt,cpp,hpp \
-			*.{htm,html,png,css} \
-			-r doc || die
-		dohtml \
-			-A pdf,txt \
-			-r tools || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r libs || die
-		doins -r more || die
-
-		# To avoid broken links
-		insinto /usr/share/doc/${PF}/html
-		doins LICENSE_1_0.txt || die
-
-		dosym /usr/include/boost-${MAJOR_PV}/boost /usr/share/doc/${PF}/html/boost || die
-	fi
-
-	cd "${D}/usr/$(get_libdir)" || die
-
-	# Remove (unversioned) symlinks
-	# And check for what we remove to catch bugs
-	# got a better idea how to do it? tell me!
-	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v "${MAJOR_PV}") ; do
-		if [ ! -h "${f}" ] ; then
-			eerror "Ups, tried to remove '${f}' which is a a real file instead of a symlink"
-			die "slotting/naming of the libs broken!"
-		fi
-		rm "${f}" || die
-	done
-
-	# The threading libs obviously always gets the "-mt" (multithreading) tag
-	# some packages seem to have a problem with it. Creating symlinks...
-
-	if use static-libs ; then
-		THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}.a libboost_thread-mt-${MAJOR_PV}$(get_libname)"
-	else
-		THREAD_LIBS="libboost_thread-mt-${MAJOR_PV}$(get_libname)"
-	fi
-	for lib in ${THREAD_LIBS} ; do
-		dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die
-	done
-
-	# The same goes for the mpi libs
-	if use mpi ; then
-		if use static-libs ; then
-			MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}.a libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
-		else
-			MPI_LIBS="libboost_mpi-mt-${MAJOR_PV}$(get_libname)"
-		fi
-		for lib in ${MPI_LIBS} ; do
-			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die
-		done
-	fi
-
-	if use debug ; then
-		if use static-libs ; then
-			THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname) libboost_thread-mt-${MAJOR_PV}-debug.a"
-		else
-			THREAD_DEBUG_LIBS="libboost_thread-mt-${MAJOR_PV}-debug$(get_libname)"
-		fi
-
-		for lib in ${THREAD_DEBUG_LIBS} ; do
-			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die
-		done
-
-		if use mpi ; then
-			if use static-libs ; then
-				MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug.a libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
-			else
-				MPI_DEBUG_LIBS="libboost_mpi-mt-${MAJOR_PV}-debug$(get_libname)"
-			fi
-
-			for lib in ${MPI_DEBUG_LIBS} ; do
-				dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})" || die
-			done
-		fi
-	fi
-
-	# Create a subdirectory with completely unversioned symlinks
-	# and store the names in the profiles-file for eselect
-	dodir /usr/$(get_libdir)/boost-${MAJOR_PV} || die
-
-	_add_line "libs=\"" default
-	for f in $(ls -1 ${LIBRARY_TARGETS} | grep -v debug) ; do
-		dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}/${f/-${MAJOR_PV}} || die
-		_add_line "/usr/$(get_libdir)/${f}" default
-	done
-	_add_line "\"" default
-
-	if use debug ; then
-		_add_line "libs=\"" debug
-		dodir /usr/$(get_libdir)/boost-${MAJOR_PV}-debug || die
-		for f in $(ls -1 ${LIBRARY_TARGETS} | grep debug) ; do
-			dosym ../${f} /usr/$(get_libdir)/boost-${MAJOR_PV}-debug/${f/-${MAJOR_PV}-debug} || die
-			_add_line "/usr/$(get_libdir)/${f}" debug
-		done
-		_add_line "\"" debug
-
-		_add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" debug
-		_add_line "suffix=\"-debug\"" debug
-	fi
-
-	_add_line "includes=\"/usr/include/boost-${MAJOR_PV}/boost\"" default
-
-	if use tools; then
-		cd "${S}/dist/bin" || die
-		# Append version postfix to binaries for slotting
-		_add_line "bins=\""
-		for b in * ; do
-			newbin "${b}" "${b}-${MAJOR_PV}" || die
-			_add_line "/usr/bin/${b}-${MAJOR_PV}"
-		done
-		_add_line "\""
-
-		cd "${S}/dist" || die
-		insinto /usr/share || die
-		doins -r share/boostbook || die
-		# Append version postfix for slotting
-		mv "${D}/usr/share/boostbook" "${D}/usr/share/boostbook-${MAJOR_PV}" || die
-		_add_line "dirs=\"/usr/share/boostbook-${MAJOR_PV}\""
-	fi
-
-	cd "${S}/status" || die
-	if [ -f regress.log ] ; then
-		docinto status || die
-		dohtml *.html ../boost.png || die
-		dodoc regress.log || die
-	fi
-
-	use python && python_need_rebuild
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	[[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		einfo "Working around completely broken build-system(tm)"
-		for d in "${ED}"usr/lib/*.dylib ; do
-			if [[ -f ${d} ]] ; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				for r in ${refs} ; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-src_test() {
-	export BOOST_ROOT=${S}
-
-	cd "${S}/tools/regression/build" || die
-	einfo "Using the following command to build test helpers: "
-	einfo "${BJAM} -q -d+2 gentoorelease ${OPTIONS} process_jam_log compiler_status"
-
-	${BJAM} -q -d+2 \
-		gentoorelease \
-		${OPTIONS} \
-		process_jam_log compiler_status \
-		|| die "building regression test helpers failed"
-
-	cd "${S}/status" || die
-
-	# Some of the test-checks seem to rely on regexps
-	export LC_ALL="C"
-
-	# The following is largely taken from tools/regression/run_tests.sh,
-	# but adapted to our needs.
-
-	# Run the tests & write them into a file for postprocessing
-	einfo "Using the following command to test: "
-	einfo "${BJAM} ${OPTIONS} --dump-tests"
-
-	${BJAM} \
-		${OPTIONS} \
-		--dump-tests 2>&1 | tee regress.log || die
-
-	# Postprocessing
-	cat regress.log | "${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/process_jam_log" --v2
-	if test $? != 0 ; then
-		die "Postprocessing the build log failed"
-	fi
-
-	cat > "${S}/status/comment.html" <<- __EOF__
-		<p>Tests are run on a <a href="http://www.gentoo.org">Gentoo</a> system.</p>
-__EOF__
-
-	# Generate the build log html summary page
-	"${S}/tools/regression/build/bin/gcc-$(gcc-version)/gentoorelease/pch-off/compiler_status" --v2 \
-		--comment "${S}/status/comment.html" "${S}" \
-		cs-$(uname).html cs-$(uname)-links.html
-	if test $? != 0 ; then
-		die "Generating the build log html summary page failed"
-	fi
-
-	# And do some cosmetic fixes :)
-	sed -i -e 's|http://www.boost.org/boost.png|boost.png|' *.html || die
-}
-
-pkg_postinst() {
-	if use eselect ; then
-		eselect boost update || ewarn "eselect boost update failed."
-	fi
-
-	if [ ! -h "${ROOT}/etc/eselect/boost/active" ] ; then
-		elog "No active boost version found. Calling eselect to select one..."
-		eselect boost update || ewarn "eselect boost update failed."
-	fi
-}
--- a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
+++ b/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
@ -0,0 +1,29 @@
+--- libs/locale/build/Jamfile.v2
+++ libs/locale/build/Jamfile.v2
+@@ -58,8 +58,8 @@
+ 
+ if $(ICU_LINK)
+ {
+-    ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ;
+-    ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ;
+    ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
+    ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ;
+ }
+ else
+ {
+@@ -117,7 +117,6 @@
+       <library>icuuc/<link>shared/<runtime-link>shared 
+       <library>icudt/<link>shared/<runtime-link>shared 
+       <library>icuin/<link>shared/<runtime-link>shared
+-      <dll-path>$(ICU_PATH)/bin
+         <runtime-link>shared ;
+ 
+ 
+@@ -176,7 +175,6 @@
+       <library>icuuc_64/<link>shared/<runtime-link>shared 
+       <library>icudt_64/<link>shared/<runtime-link>shared 
+       <library>icuin_64/<link>shared/<runtime-link>shared
+-      <dll-path>$(ICU_PATH)/bin64
+         <runtime-link>shared ;
+  
+     
--- a/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
+++ b/dev-libs/boost/files/boost-1.48.0-disable_libboost_python3.patch
@ -0,0 +1,62 @@
+--- libs/python/build/Jamfile.v2
+++ libs/python/build/Jamfile.v2
+@@ -39,23 +39,6 @@
+     PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
+ }
+ 
+-
+-rule find-py3-version
+-{
+-    local versions = [ feature.values python ] ;
+-    local py3ver ;
+-    for local v in $(versions)
+-    {
+-        if $(v) >= 3.0
+-        {
+-            py3ver = $(v) ;
+-        }
+-    }
+-    return $(py3ver) ;
+-}
+-
+-py3-version = [ find-py3-version ] ;
+-
+ project boost/python
+   : source-location ../src
+   : requirements
+@@ -82,7 +65,7 @@
+ rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
+ rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
+ 
+-rule lib_boost_python ( is-py3 ? )
+rule lib_boost_python
+ {
+ 
+     local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
+@@ -91,7 +74,7 @@
+     {
+         python2 = true ;
+     }
+-    lib [ cond $(is-py3) : boost_python3 : boost_python ]
+    lib boost_python
+         : # sources
+         numeric.cpp
+         list.cpp
+@@ -148,7 +131,6 @@
+             <dependency>config-warning
+ 
+             <python-debugging>on:<define>BOOST_DEBUG_PYTHON
+-            [ cond $(is-py3) : <python>$(py3-version) ]
+         :   # default build
+             <link>shared
+         :   # usage requirements
+@@ -160,9 +142,3 @@
+ 
+ lib_boost_python ;
+ boost-install boost_python ;
+-
+-if $(py3-version)
+-{
+-    lib_boost_python yes ;
+-    boost-install boost_python3 ;
+-}
--- a/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch
+++ b/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch
@ -0,0 +1,95 @@
+https://svn.boost.org/trac/boost/ticket/4657
+https://svn.boost.org/trac/boost/changeset/76290
+
+--- libs/mpi/src/python/datatypes.cpp
+++ libs/mpi/src/python/datatypes.cpp
+@@ -17,7 +17,9 @@
+ 
+ void export_datatypes()
+ {
+#if PY_MAJOR_VERSION < 3 
+   register_serialized(long(0), &PyInt_Type);
+#endif
+   register_serialized(false, &PyBool_Type);
+   register_serialized(double(0.0), &PyFloat_Type);
+ }
+--- libs/mpi/src/python/py_environment.cpp
+++ libs/mpi/src/python/py_environment.cpp
+@@ -11,6 +11,9 @@
+  *  This file reflects the Boost.MPI "environment" class into Python
+  *  methods at module level.
+  */
+
+#include <locale>
+#include <string>
+ #include <boost/python.hpp>
+ #include <boost/mpi.hpp>
+ 
+@@ -50,11 +53,64 @@
+ 
+   // If anything changed, convert C-style argc/argv into Python argv
+   if (mpi_argv != my_argv)
+  {
+#if PY_MAJOR_VERSION >= 3
+
+    wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
+    /* We need a second copy, as Python might modify the first one. */
+    wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
+
+    if (!argv_copy || !argv_copy2) {
+      fprintf(stderr, "out of memory\n");
+      return false;
+    }
+
+    std::locale mylocale;
+    mbstate_t mystate;
+
+    const std::codecvt<char, wchar_t, mbstate_t>& myfacet =
+      std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale);
+
+    for (int i = 0; i < mpi_argc; i++) 
+    {
+      size_t length = strlen(mpi_argv[i]);
+
+      wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1));
+
+      const char *from_next;
+      wchar_t *to_next;
+
+      std::codecvt<wchar_t,char,mbstate_t>::result myresult = 
+        myfacet.out(mystate,
+            mpi_argv[i], mpi_argv[i] + length + 1, from_next,
+            dest, dest+length+1, to_next);
+
+      if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok )
+      {
+        fprintf(stderr, "failure translating argv\n");
+        return 1;
+      }
+
+      argv_copy2[i] = argv_copy[i] = dest;
+      if (!argv_copy[i])
+          return false;
+    }
+
+    PySys_SetArgv(mpi_argc, argv_copy);
+
+    for (int i = 0; i < mpi_argc; i++) {
+        PyMem_Free(argv_copy2[i]);
+    }
+    PyMem_Free(argv_copy);
+    PyMem_Free(argv_copy2);
+#else
+     PySys_SetArgv(mpi_argc, mpi_argv);
+#endif
+  }
+ 
+-  for (int arg = 0; arg < my_argc; ++arg)
+-    free(my_argv[arg]);
+-  delete [] my_argv;
+  for (int arg = 0; arg < mpi_argc; ++arg)
+    free(mpi_argv[arg]);
+  delete [] mpi_argv;
+ 
+   return true;
+ }
--- a/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
+++ b/dev-libs/boost/files/boost-1.48.0-no_strict_aliasing_python2.patch
@ -0,0 +1,23 @@
+--- libs/python/build/Jamfile.v2
+++ libs/python/build/Jamfile.v2
+@@ -85,6 +85,12 @@
+ rule lib_boost_python ( is-py3 ? )
+ {
+ 
+    local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
+    local python2 ;
+    if $(python_major_version) = 2
+    {
+        python2 = true ;
+    }
+     lib [ cond $(is-py3) : boost_python3 : boost_python ]
+         : # sources
+         numeric.cpp
+@@ -119,6 +125,7 @@
+         :   # requirements
+             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
+             <define>BOOST_PYTHON_SOURCE
+            [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
+           
+             # On Windows, all code using Python has to link to the Python
+             # import library.
--- a/dev-libs/boost/files/boost-1.48.0-python_linking.patch
+++ b/dev-libs/boost/files/boost-1.48.0-python_linking.patch
@ -0,0 +1,24 @@
+--- libs/python/build/Jamfile.v2
+++ libs/python/build/Jamfile.v2
+@@ -109,20 +109,7 @@
+             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
+             <define>BOOST_PYTHON_SOURCE
+             [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
+-          
+-            # On Windows, all code using Python has to link to the Python
+-            # import library.
+-            #
+-            # On *nix we never link libboost_python to libpython.  When
+-            # extending Python, all Python symbols are provided by the
+-            # Python interpreter executable.  When embedding Python, the
+-            # client executable is expected to explicitly link to
+-            # /python//python (the target representing libpython) itself.
+-            #
+-            # python_for_extensions is a target defined by Boost.Build to
+-            # provide the Python include paths, and on Windows, the Python
+-            # import library, as usage requirements.
+-            [ cond [ python.configured ] : <library>/python//python_for_extensions ]
+            [ cond [ python.configured ] : <library>/python//python ]
+             
+             # we prevent building when there is no python available
+             # as it's not possible anyway, and to cause dependents to
--- a/dev-libs/boost/files/boost-1.48.0-respect_python-buildid.patch
+++ b/dev-libs/boost/files/boost-1.48.0-respect_python-buildid.patch
@ -0,0 +1,69 @@
+https://svn.boost.org/trac/boost/ticket/6286
+
+--- boostcpp.jam
+++ boostcpp.jam
+@@ -99,13 +99,6 @@
+     BUILD_ID = [ regex.replace $(build-id) "[*\\/:.\"\' ]" "_" ] ;
+ }
+ 
+-# Python build id (only for Python libraries)
+-python-id = [ option.get "python-buildid" ] ;
+-if $(python-id)
+-{
+-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
+-}
+-
+ ##############################################################################
+ #
+ # 1. The 'tag' function that adds decoration suitable to the properties if
+--- libs/mpi/build/Jamfile.v2
+++ libs/mpi/build/Jamfile.v2
+@@ -8,6 +8,8 @@
+ #  Authors: Douglas Gregor
+ #           Andrew Lumsdaine
+ 
+import option ;
+import regex ;
+ import mpi ;
+ import indirect ;
+ import python ;
+@@ -24,6 +26,13 @@
+     <tag>@$(__name__).tag
+   ;
+ 
+# Python build id (only for Python libraries)
+python-id = [ option.get "python-buildid" ] ;
+if $(python-id)
+{
+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
+}
+
+ rule tag ( name : type ? : property-set )
+ {
+     local result = $(name) ;
+--- libs/python/build/Jamfile.v2
+++ libs/python/build/Jamfile.v2
+@@ -2,6 +2,8 @@
+ # Software License, Version 1.0. (See accompanying
+ # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ 
+import option ;
+import regex ;
+ import os ;
+ import indirect ;
+ import modules ;
+@@ -30,6 +32,14 @@
+         ;
+ }
+ 
+# Python build id (only for Python libraries)
+python-id = [ option.get "python-buildid" ] ;
+if $(python-id)
+{
+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
+}
+
+
+ rule find-py3-version
+ {
+     local versions = [ feature.values python ] ;
--- a/dev-libs/boost/files/boost-1.48.0-support_dots_in_python-buildid.patch
+++ b/dev-libs/boost/files/boost-1.48.0-support_dots_in_python-buildid.patch
@ -0,0 +1,22 @@
+--- libs/mpi/build/Jamfile.v2
+++ libs/mpi/build/Jamfile.v2
+@@ -30,7 +30,7 @@
+ python-id = [ option.get "python-buildid" ] ;
+ if $(python-id)
+ {
+-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
+ }
+ 
+ rule tag ( name : type ? : property-set )
+--- libs/python/build/Jamfile.v2
+++ libs/python/build/Jamfile.v2
+@@ -36,7 +36,7 @@
+ python-id = [ option.get "python-buildid" ] ;
+ if $(python-id)
+ {
+-    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" "_" ] ;
+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" "_" ] ;
+ }
+ 
+ 
--- a/dev-libs/boost/files/remove-toolset-1.48.0.patch
+++ b/dev-libs/boost/files/remove-toolset-1.48.0.patch
@ -1,5 +1,5 @@
--- boostcpp.jam	2010-11-17 11:51:56.000000000 +0200
-+++ boostcpp.jam.gentoo	2011-01-06 15:07:17.893270002 +0200
+--- boostcpp.jam
+++ boostcpp.jam
@@ -377,7 +377,7 @@
         if $(layout) = versioned
         {
--- a/dev-python/pythonmagick/Manifest
+++ b/dev-python/pythonmagick/Manifest
@ -1,2 +1 @@
-DIST PythonMagick-0.9.6.tar.xz 247024 RMD160 9921b7b3b70fb093647e0c6eac32bc3e1cb71340 SHA1 2cd5be6326431ab8f7b3f9e549759e978fae9351 SHA256 49dd090953b4f024544e18387ef184888487c6a8731d1d0d0a8c5dbf1c8cdab6
 DIST PythonMagick-0.9.7.tar.xz 247772 RMD160 c1103ab6ce047adb5ee85c8c3687c8d632ff9d26 SHA1 3be320d3b92a621a93899f65f2ad6028b4a36aa0 SHA256 8c5fbd7030f52aca0e2f11e2d61c8040c8758975987033ee121473bfbee694f5
--- a/dev-python/pythonmagick/pythonmagick-0.9.7-r1.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.9.7-r1.ebuild
@ -1,11 +1,11 @@
-# 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/pythonmagick/pythonmagick-0.9.6.ebuild,v 1.1 2011/07/29 23:14:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.7-r1.ebuild,v 1.1 2012/01/23 22:25:36 hwoarang Exp $

 EAPI="3"
 PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
+RESTRICT_PYTHON_ABIS="2.4 2.5 *-jython *-pypy-*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"

 inherit autotools eutils python
@ -22,8 +22,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

-RDEPEND=">=media-gfx/imagemagick-6.4
-	>=dev-libs/boost-1.35.0[python]"
+RDEPEND=">=dev-libs/boost-1.48[python]
+	>=media-gfx/imagemagick-6.4"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"

@ -39,14 +39,22 @@ src_prepare() {

 	eautoreconf

-	# Disable byte-compilation.
-	echo "#!/bin/sh" > config/py-compile
+	python_clean_py-compile_files
+
+	# Support Python 3.
+	sed -e "s/import _PythonMagick/from . import _PythonMagick/" -i PythonMagick/__init__.py || die "sed failed"

 	python_src_prepare
 }

 src_configure() {
-	python_src_configure --disable-static BOOST_PYTHON_LIB="boost_python"
+	configuration() {
+		sed -e "s/-lboost_python/-lboost_python-${PYTHON_ABI}/" -i Makefile.in
+		econf \
+			--disable-static \
+			--with-boost-python="boost_python-${PYTHON_ABI}"
+	}
+	python_execute_function -s configuration
 }

 src_install() {
--- a/dev-python/pythonmagick/pythonmagick-0.9.7.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.9.7.ebuild
@ -1,11 +1,11 @@
-# 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/pythonmagick/pythonmagick-0.9.7.ebuild,v 1.1 2011/11/03 10:24:18 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.9.7.ebuild,v 1.2 2012/01/23 22:25:36 hwoarang Exp $

 EAPI="3"
 PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython *-pypy-*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"

 inherit autotools eutils python
@ -22,8 +22,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

-RDEPEND=">=media-gfx/imagemagick-6.4
-	>=dev-libs/boost-1.35.0[python]"
+RDEPEND="<dev-libs/boost-1.48[python]
+	>=media-gfx/imagemagick-6.4"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"

@ -39,8 +39,7 @@ src_prepare() {

 	eautoreconf

-	# Disable byte-compilation.
-	echo "#!/bin/sh" > config/py-compile
+	python_clean_py-compile_files

 	python_src_prepare
 }
--- a/dev-python/tagpy/tagpy-0.94.8-r1.ebuild
+++ b/dev-python/tagpy/tagpy-0.94.8-r1.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tagpy/tagpy-0.94.8-r1.ebuild,v 1.1 2012/01/23 22:29:27 hwoarang Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
+
+inherit distutils
+
+DESCRIPTION="Python Bindings for TagLib"
+HOMEPAGE="http://mathema.tician.de//software/tagpy http://pypi.python.org/pypi/tagpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-libs/boost-1.48[python]
+	>=media-libs/taglib-1.4"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+src_prepare() {
+	# Disable broken check for Distribute.
+	sed -e "s/if 'distribute' not in setuptools.__file__:/if False:/" -i aksetup_helper.py
+
+	distutils_src_prepare
+}
+
+src_configure() {
+	configuration() {
+		"$(PYTHON -f)" ./configure.py \
+			--taglib-inc-dir="${EPREFIX}/usr/include/taglib" \
+			--boost-python-libname="boost_python-${PYTHON_ABI}-mt"
+	}
+	python_execute_function -s configuration
+}
+
+src_install() {
+	distutils_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/*
+	fi
+}
--- a/dev-python/tagpy/tagpy-0.94.8.ebuild
+++ b/dev-python/tagpy/tagpy-0.94.8.ebuild
@ -1,11 +1,11 @@
-# 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/tagpy/tagpy-0.94.8.ebuild,v 1.8 2011/03/05 17:11:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tagpy/tagpy-0.94.8.ebuild,v 1.9 2012/01/23 22:29:27 hwoarang Exp $

-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"

 inherit distutils

@ -18,8 +18,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="examples"

-RDEPEND=">=media-libs/taglib-1.4
-	|| ( >=dev-libs/boost-1.35.0-r5[python] <dev-libs/boost-1.35.0-r5 )"
+RDEPEND="<dev-libs/boost-1.48[python]
+	>=media-libs/taglib-1.4"
 DEPEND="${RDEPEND}
 	dev-python/setuptools"

@ -32,7 +32,7 @@ src_prepare() {

 src_configure() {
 	"$(PYTHON -f)" ./configure.py \
-		--taglib-inc-dir="/usr/include/taglib" \
+		--taglib-inc-dir="${EPREFIX}/usr/include/taglib" \
 		--boost-python-libname="boost_python-mt" || die "Configuration failed"
 }

@ -41,6 +41,6 @@ src_install() {

 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins test/* || die "Installation of examples failed"
+		doins test/*
 	fi
 }
--- a/dev-python/testtools/testtools-0.9.11.ebuild
+++ b/dev-python/testtools/testtools-0.9.11.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.11.ebuild,v 1.6 2012/01/21 15:46:17 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.11.ebuild,v 1.7 2012/01/23 16:45:21 tomka Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
@ -16,7 +16,7 @@ SRC_URI="http://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE=""

 DEPEND=""
--- a/dev-ruby/best_in_place/Manifest
+++ b/dev-ruby/best_in_place/Manifest
@ -1 +1,2 @@
 DIST best_in_place-1.0.4.gem 56832 RMD160 ccb3c88bd989b73c731987d8dbcae6e224edfa56 SHA1 aba5a95e07513c0b75e5297d61a4fff257bae965 SHA256 9abb4c2e3713bb1a4ded74924fbb23ee48e5abcef21adb245b906453bb1b2acd
+DIST best_in_place-1.0.5.gem 58368 RMD160 4c98317cc7795f7a170189660d0ec522accaddd5 SHA1 cb803d59b8f47d6d5f2c99a7797095cddcb6b2a1 SHA256 bc2ae968b2de854b44a7d5c4a5582a30c53ee9c0ae95f29c7aad37efa5a76780
--- a/dev-ruby/best_in_place/best_in_place-1.0.5.ebuild
+++ b/dev-ruby/best_in_place/best_in_place-1.0.5.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/best_in_place/best_in_place-1.0.5.ebuild,v 1.1 2012/01/23 18:45:05 flameeyes Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ree18"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+# if ever needed
+#GITHUB_USER="bernat"
+#GITHUB_PROJECT="${PN}"
+#RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="In-place editor helper for Rails 3o"
+HOMEPAGE="http://github.com/bernat/best_in_place"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/rails:3.1
+	dev-ruby/jquery-rails
+"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rspec-rails
+		>=dev-ruby/nokogiri-1.5.0
+		>=dev-ruby/capybara-1.0.1
+		>=dev-ruby/sqlite3-ruby-1.3.4-r1
+		dev-ruby/rdiscount
+	)"
+
+DEPEND+=" test? ( www-client/firefox )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/git ls-files/d' \
+		-e '/rspec-rails/s:,.*::' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+	rm test_app/Gemfile.lock
+
+	# improve timing-resilience on two tests that would otherwise fail
+	# https://github.com/bernat/best_in_place/issues/87
+	# fix an issue with the :display_as option, that has been sent upstream
+	epatch "${FILESDIR}"/${PN}-1.0.4-gentoo.patch
+}
+
+each_ruby_test() {
+	RAILS_ENV=test ${RUBY} -C test_app -S rake db:migrate || die "test_app migration failed"
+	VIRTUALX_COMMAND="${RUBY}" virtualmake -S rake spec || die "Specs failed"
+}
--- a/dev-util/pida/pida-0.6.2.ebuild
+++ b/dev-util/pida/pida-0.6.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pida/pida-0.6.2.ebuild,v 1.4 2012/01/14 21:23:05 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pida/pida-0.6.2.ebuild,v 1.5 2012/01/23 18:11:53 maksbotan Exp $

 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@ -17,15 +17,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="gnome"
+IUSE=""

 RDEPEND="|| ( dev-lang/python:2.7 dev-python/argparse )
 	>=app-editors/gvim-6.3[gtk]
 	>=dev-python/anyvc-0.3.2
-	>=dev-python/bpython-0.9.7
+	>=dev-python/bpython-0.9.7[gtk]
 	>=dev-python/pygtk-2.8
 	>dev-python/pygtkhelpers-0.4.1
-	gnome? ( >=x11-libs/vte-0.11.11-r2:0[python] )"
+	>=x11-libs/vte-0.11.11-r2:0[python]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
 	dev-util/pkgconfig"
--- a/dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild
+++ b/dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild,v 1.3 2012/01/21 15:50:06 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild,v 1.4 2012/01/23 16:49:15 tomka Exp $

 EAPI="3"

@ -22,7 +22,7 @@ LICENSE="GPL-2"

 SLOT="0"

-KEYWORDS="alpha amd64 ~x86"
+KEYWORDS="alpha amd64 x86"
 IUSE="gtk"

 DEPEND=""
--- a/dev-vcs/bzr-git/bzr-git-0.6.2.ebuild
+++ b/dev-vcs/bzr-git/bzr-git-0.6.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-git/bzr-git-0.6.2.ebuild,v 1.4 2012/01/21 15:49:48 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-git/bzr-git-0.6.2.ebuild,v 1.5 2012/01/23 16:48:54 tomka Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
@ -22,7 +22,7 @@ if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://samba.org/~jelmer/bzr/${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~x86"
+	KEYWORDS="alpha amd64 x86"
 fi

 IUSE=""
--- a/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild
+++ b/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild,v 1.3 2012/01/21 15:49:29 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/bzr-gtk-0.100.0.ebuild,v 1.4 2012/01/23 16:48:33 tomka Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
@ -17,7 +17,7 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~x86"
+KEYWORDS="alpha amd64 x86"
 IUSE="gconf gnome-keyring gpg +sourceview nautilus"

 DEPEND=">=dev-vcs/bzr-1.6_rc1
--- a/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.2.ebuild
+++ b/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.2.ebuild,v 1.3 2012/01/21 15:49:10 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-rewrite/bzr-rewrite-0.6.2.ebuild,v 1.4 2012/01/23 16:48:09 tomka Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
@ -15,7 +15,7 @@ SRC_URI="http://launchpad.net/bzr-rewrite/trunk/${PV}/+download/${P}.tar.gz"

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

 DEPEND=">=dev-vcs/bzr-1.14
--- a/dev-vcs/bzr-svn/bzr-svn-1.1.0.ebuild
+++ b/dev-vcs/bzr-svn/bzr-svn-1.1.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-svn/bzr-svn-1.1.0.ebuild,v 1.3 2012/01/21 15:48:52 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-svn/bzr-svn-1.1.0.ebuild,v 1.4 2012/01/23 16:47:47 tomka Exp $

 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@ -18,7 +18,7 @@ SRC_URI="http://samba.org/~jelmer/bzr/${MY_P}.tar.gz"

 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~x86"
+KEYWORDS="alpha amd64 x86"
 IUSE="test"
 # As long as https://bugs.launchpad.net/bzr-svn/+bug/526485 is unfixed
 RESTRICT=test
--- a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.7.ebuild
+++ b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.7.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.7.ebuild,v 1.3 2012/01/21 15:48:23 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.7.ebuild,v 1.4 2012/01/23 16:47:25 tomka Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
@ -18,7 +18,7 @@ SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"

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

 DEPEND=""
--- a/dev-vcs/bzr/bzr-2.4.1.ebuild
+++ b/dev-vcs/bzr/bzr-2.4.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.1.ebuild,v 1.7 2012/01/21 15:46:46 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.1.ebuild,v 1.8 2012/01/23 16:46:03 tomka Exp $

 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@ -19,7 +19,7 @@ SRC_URI="http://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="curl doc emacs +sftp test"

 RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-python/celementtree )
--- a/dev-vcs/bzrtools/bzrtools-2.4.0.ebuild
+++ b/dev-vcs/bzrtools/bzrtools-2.4.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/bzrtools-2.4.0.ebuild,v 1.4 2012/01/21 15:47:19 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzrtools/bzrtools-2.4.0.ebuild,v 1.5 2012/01/23 16:46:35 tomka Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/${PN}/stable/${PV}/+download/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 #IUSE="test"

--- a/dev-vcs/qbzr/qbzr-0.21.1.ebuild
+++ b/dev-vcs/qbzr/qbzr-0.21.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qbzr/qbzr-0.21.1.ebuild,v 1.4 2012/01/21 15:47:51 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qbzr/qbzr-0.21.1.ebuild,v 1.5 2012/01/23 16:47:04 tomka Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
@ -15,7 +15,7 @@ SRC_URI="https://edge.launchpad.net/qbzr/$(get_version_component_range 1-2)/${PV

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

 # bzr version comes from NEWS file. It's lowest version required for some
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@ -1,4 +1,5 @@
 DIST stgit-0.14.3.tar.gz 227645 RMD160 5ed7ab18a3f98269c3fc29e4d1dd353171add7d9 SHA1 9ea2e859281f8fe3cbb7f2bd9fd83b9846923cbe SHA256 874fe750a8938d57ea777a0019f9fe50eb0ea408b71b618141a286d4cddfec8d
 DIST stgit-0.15-missing-patches.tar.gz 1624 RMD160 bcf34ce30a80048340db9824a1b27b231854660d SHA1 bd242453c19e640c49f51779789d3984d2386636 SHA256 b0786e5abee9d7d872b9b249f709dfcf088030a40960fc809dc375ef26e4d1aa
 DIST stgit-0.15.tar.gz 342320 RMD160 3779091ed8639c825f053c66031b4569a6ffbdea SHA1 8f18e3079014d907237aeffa6b851074422b7f27 SHA256 691fe26dc0c0691cb65fa2763c437eaafc28c107a4d64a03653ce613414ff84d
+DIST stgit-0.16-missing-patches.tar.gz 1667 RMD160 114c568dc2321f60e45b93ef4f91d27af186f16c SHA1 c85953c38a44daadc30c3ae81bd65fa59b1b1f4b SHA256 f105bb417592be3c68d830ad1cf2e212e6e5cb809bf64cdffb516a0f7badd4f4
 DIST stgit-0.16.tar.gz 362687 RMD160 f65036fae844200cdb0a697fca236f3a1f88de48 SHA1 10b62d080a4c34c2dd11de4d1c800f62b9e5018c SHA256 02f1a19350ccf4a26abac1421df8c2d021e78f995c913f9562718a1700318a42
--- a/dev-vcs/stgit/stgit-0.16.ebuild
+++ b/dev-vcs/stgit/stgit-0.16.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/stgit-0.16.ebuild,v 1.1 2012/01/23 13:58:14 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/stgit-0.16.ebuild,v 1.2 2012/01/23 19:18:35 darkside Exp $

 EAPI="3"
 PYTHON_DEPEND="2"
@ -10,7 +10,7 @@ inherit distutils bash-completion-r1
 DESCRIPTION="Manage a stack of patches using GIT as a backend"
 HOMEPAGE="http://www.procode.org/stgit/"
 SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz
-	mirror://gentoo/${PN}-0.15-missing-patches.tar.gz"
+	mirror://gentoo/${P}-missing-patches.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
--- a/games-board/pokerth/Manifest
+++ b/games-board/pokerth/Manifest
@ -1 +1,2 @@
 DIST PokerTH-0.8.3-src.tar.bz2 7037418 RMD160 784cc7567dea73735847084278efb6d8e6563a9f SHA1 def75fe2cae1a1e23114a8c03b69085a98d696e0 SHA256 ff68054753b87dc8713306a96b53108b2e485610086a28481f0fc3d7a365a02e
+DIST PokerTH-0.9.1-src.tar.bz2 9028914 RMD160 ab69025840c6b2dde5791f637a1b70860f7f210d SHA1 17cbdba925609297403625a3e57597e38c00f589 SHA256 f74246b2e59be4c4b8710266c0ca976ea63dc2b6569dd6aee07040ffa8a8f180
--- a/games-board/pokerth/pokerth-0.9.1.ebuild
+++ b/games-board/pokerth/pokerth-0.9.1.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-0.9.1.ebuild,v 1.1 2012/01/23 20:45:44 mr_bones_ Exp $
+
+EAPI=2
+inherit flag-o-matic eutils qt4-r2 games
+
+MY_P="PokerTH-${PV}-src"
+DESCRIPTION="Texas Hold'em poker game"
+HOMEPAGE="http://www.pokerth.net/"
+SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2"
+
+LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated"
+
+RDEPEND="dev-db/sqlite
+	>=dev-libs/boost-1.41
+	dev-libs/libgcrypt
+	dev-libs/tinyxml
+	net-libs/libircclient
+	>=net-misc/curl-7.16
+	x11-libs/qt-core:4
+	virtual/gsasl
+	!dedicated? (
+		media-libs/libsdl
+		media-libs/sdl-mixer[mikmod,vorbis]
+		x11-libs/qt-gui:4
+	)"
+DEPEND="${RDEPEND}
+	!dedicated? ( x11-libs/qt-sql:4 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	if use dedicated ; then
+		sed -i \
+			-e 's/pokerth_game.pro//' \
+			pokerth.pro \
+			|| die "sed failed"
+	fi
+
+	sed -i \
+		-e '/no_dead_strip_inits_and_terms/d' \
+		*pro \
+		|| die 'sed failed'
+
+	local boost_ver=$(best_version ">=dev-libs/boost-1.41")
+
+	boost_ver=${boost_ver/*boost-/}
+	boost_ver=${boost_ver%.*}
+	boost_ver=${boost_ver/./_}
+
+	einfo "Using boost version ${boost_ver}"
+	append-cxxflags \
+		-I/usr/include/boost-${boost_ver}
+	append-ldflags \
+		-L/usr/$(get_libdir)/boost-${boost_ver}
+	append-flags -DBOOST_FILESYSTEM_VERSION=2
+
+	export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}"
+	export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}"
+}
+
+src_configure() {
+	eqmake4
+}
+
+src_install() {
+	dogamesbin bin/pokerth_server || die
+	if ! use dedicated ; then
+		dogamesbin ${PN} || die
+		insinto "${GAMES_DATADIR}/${PN}"
+		doins -r data || die
+		domenu ${PN}.desktop
+		doicon ${PN}.png
+	fi
+	doman docs/pokerth.1
+	dodoc ChangeLog TODO docs/{gui_styling,server_setup}_howto.txt
+	prepgamesdirs
+}
--- a/games-fps/quake1-textures/quake1-textures-20050820.ebuild
+++ b/games-fps/quake1-textures/quake1-textures-20050820.ebuild
@ -1,6 +1,6 @@
-# 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/games-fps/quake1-textures/quake1-textures-20050820.ebuild,v 1.7 2010/07/01 13:31:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-textures/quake1-textures-20050820.ebuild,v 1.8 2012/01/23 22:33:19 ssuominen Exp $

 inherit eutils games

@ -19,7 +19,6 @@ IUSE=""

 RDEPEND=""
 DEPEND="app-arch/unzip
-	!app-arch/unrar-gpl
 	|| (
 		app-arch/unrar
 		app-arch/rar )"
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@ -1,2 +1,3 @@
+DIST wesnoth-1.10.tar.bz2 339946658 RMD160 39f0addc95ccc556c952f1172666a3d0b5756149 SHA1 6315c8e262fba86a98fcb8dd67d5d4d56b807c4d SHA256 4ba12b1e43761650579d563d4384c5e06674b0bff75cef2cb0abb439ecdc8ece
 DIST wesnoth-1.8.5.tar.bz2 301024033 RMD160 c2a6a9f094b862ef274838fd062c5d961f97c261 SHA1 22c6cc10dc7172daf636158dba0acac35f538597 SHA256 eca3bdce505480a0cf045d0189df7260c16af9f543a427e7de8690fff9c655fa
 DIST wesnoth-1.8.6.tar.bz2 302226547 RMD160 2190efe45d554df59052db1a58fcc3bdf766c47e SHA1 ade2f88287b5900485646f0ffe3414fa8b695afb SHA256 4fe603fa984ac76a384dc94ba28bd99fe2d1adf02ddf1706f2fa1b82b40f8081
--- a/games-strategy/wesnoth/files/wesnoth-1.10-xdg-path-fix.patch
+++ b/games-strategy/wesnoth/files/wesnoth-1.10-xdg-path-fix.patch
@ -0,0 +1,54 @@
+Index: src/filesystem.cpp
+===================================================================
+--- src/filesystem.cpp	(Revision 52751)
+++ src/filesystem.cpp	(Revision 52752)
+@@ -63,6 +63,7 @@
+ #include "loadscreen.hpp"
+ #include "scoped_resource.hpp"
+ #include "serialization/string_utils.hpp"
+#include "version.hpp"
+ 
+ static lg::log_domain log_filesystem("filesystem");
+ #define DBG_FS LOG_STREAM(debug, log_filesystem)
+@@ -501,6 +502,23 @@
+ 
+ static void setup_user_data_dir();
+ 
+static const std::string& get_version_path_suffix()
+{
+	static std::string suffix;
+
+	// We only really need to generate this once since
+	// the version number cannot change during runtime.
+
+	if(suffix.empty()) {
+		std::ostringstream s;
+		s << game_config::wesnoth_version.major_version() << '.'
+		  << game_config::wesnoth_version.minor_version();
+		suffix = s.str();
+	}
+
+	return suffix;
+}
+
+ void set_preferences_dir(std::string path)
+ {
+ #ifdef _WIN32
+@@ -537,7 +555,7 @@
+ 	if (path.empty()) path = PREFERENCES_DIR;
+ #endif
+ 
+-	std::string path2 = ".wesnoth" + game_config::version.substr(0,3);
+	std::string path2 = ".wesnoth" + get_version_path_suffix();
+ 
+ #ifdef _X11
+ 	const char *home_str = getenv("HOME");
+@@ -553,7 +571,7 @@
+ 			user_data_dir += "/.local/share";
+ 		} else user_data_dir = xdg_data;
+ 		user_data_dir += "/wesnoth/";
+-		user_data_dir += game_config::version.substr(0,3);
+		user_data_dir += get_version_path_suffix();
+ 		create_directory_if_missing_recursive(user_data_dir);
+ 		game_config::preferences_dir = user_data_dir;
+ 	} else {
--- a/games-strategy/wesnoth/wesnoth-1.10.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.10.ebuild
@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.10.ebuild,v 1.1 2012/01/23 18:41:53 mr_bones_ Exp $
+
+EAPI=2
+inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org/"
+SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND=">=media-libs/libsdl-1.2.7[video,X]
+	media-libs/sdl-net
+	>=media-libs/sdl-ttf-2.0.8
+	>=media-libs/sdl-mixer-1.2[vorbis]
+	>=media-libs/sdl-image-1.2[jpeg,png]
+	!dedicated? (
+		dbus? ( sys-apps/dbus )
+	)
+	>=dev-libs/boost-1.36
+	sys-libs/zlib
+	x11-libs/pango
+	dev-lang/lua
+	media-libs/fontconfig
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	if use dedicated || use server ; then
+		sed \
+			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
+			-e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
+			-e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
+			-e "s/GAMES_GROUP/${GAMES_GROUP}/" "${FILESDIR}"/wesnothd.rc \
+			> "${T}"/wesnothd \
+			|| die "sed failed"
+	fi
+	if ! use doc ; then
+		sed -i \
+			-e '/manual/d' \
+			doc/CMakeLists.txt \
+			|| die "sed failed"
+	fi
+	# how do I hate boost? Let me count the ways...
+	local boost_ver=$(best_version ">=dev-libs/boost-1.36")
+
+	boost_ver=${boost_ver/*boost-/}
+	boost_ver=${boost_ver%.*}
+	boost_ver=${boost_ver/./_}
+
+	einfo "Using boost version ${boost_ver}"
+	append-cxxflags \
+		-I/usr/include/boost-${boost_ver}
+	append-ldflags \
+		-L/usr/$(get_libdir)/boost-${boost_ver}
+	export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}"
+	export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}"
+
+	epatch "${FILESDIR}"/${P}-xdg-path-fix.patch
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+	if [[ $(gcc-major-version) -eq 3 ]] ; then
+		filter-flags -fstack-protector
+		append-flags -fno-stack-protector
+	fi
+	if use dedicated || use server ; then
+		mycmakeargs=(
+			"-DENABLE_CAMPAIGN_SERVER=TRUE"
+			"-DENABLE_SERVER=TRUE"
+			"-DSERVER_UID=${GAMES_USER_DED}"
+			"-DSERVER_GID=${GAMES_GROUP}"
+			"-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
+			)
+	else
+		mycmakeargs=(
+			"-DENABLE_CAMPAIGN_SERVER=FALSE"
+			"-DENABLE_SERVER=FALSE"
+			)
+	fi
+	mycmakeargs+=(
+		$(cmake-utils_use_enable !dedicated GAME)
+		$(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
+		$(cmake-utils_use_enable nls NLS)
+		$(cmake-utils_use_enable dbus NOTIFICATIONS)
+		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
+		"-DENABLE_FRIBIDI=FALSE"
+		"-DENABLE_STRICT_COMPILATION=FALSE"
+		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
+		"-DDATAROOTDIR=${GAMES_DATADIR}"
+		"-DBINDIR=${GAMES_BINDIR}"
+		"-DICONDIR=/usr/share/pixmaps"
+		"-DDESKTOPDIR=/usr/share/applications"
+		"-DMANDIR=/usr/share/man"
+		"-DDOCDIR=/usr/share/doc/${PF}"
+		)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	DOCS="README changelog players_changelog" cmake-utils_src_install
+	if use dedicated || use server; then
+		keepdir "${GAMES_STATEDIR}/run/wesnothd"
+		doinitd "${T}"/wesnothd || die "doinitd failed"
+	fi
+	prepgamesdirs
+}
--- a/media-gfx/blender/blender-2.57-r1.ebuild
+++ b/media-gfx/blender/blender-2.57-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.9 2011/11/13 12:04:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.10 2012/01/23 18:34:59 ssuominen Exp $

 PYTHON_DEPEND="3:3.2"

@ -41,10 +41,10 @@ LICENSE="|| ( GPL-2 BL )"
 KEYWORDS="~amd64 ~x86"

 RDEPEND="virtual/jpeg
-	media-libs/libpng
+	media-libs/libpng:0
 	x11-libs/libXi
 	x11-libs/libX11
-	media-libs/tiff
+	media-libs/tiff:0
 	media-libs/libsamplerate
 	virtual/opengl
 	>=media-libs/freetype-2.0
@ -64,7 +64,7 @@ RDEPEND="virtual/jpeg
 	fftw? ( sci-libs/fftw:3.0 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	sndfile? ( media-libs/libsndfile )
-	lcms? ( media-libs/lcms )"
+	lcms? ( media-libs/lcms:0 )"

 DEPEND=">=dev-util/scons-2.0.1-r1
 	apidoc? (
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ b/media-gfx/blender/blender-2.60a.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-gfx/blender/blender-2.60a.ebuild,v 1.5 2012/01/16 18:28:11 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.6 2012/01/23 18:34:59 ssuominen Exp $

 PYTHON_DEPEND="3:3.2"
 EAPI=4
@ -37,10 +37,10 @@ LICENSE="|| ( GPL-2 BL )"
 KEYWORDS="~amd64 ~x86"

 RDEPEND="virtual/jpeg
-	media-libs/libpng
+	media-libs/libpng:0
 	x11-libs/libXi
 	x11-libs/libX11
-	media-libs/tiff
+	media-libs/tiff:0
 	media-libs/libsamplerate
 	virtual/opengl
 	>=media-libs/freetype-2.0
@ -60,7 +60,7 @@ RDEPEND="virtual/jpeg
 	fftw? ( sci-libs/fftw:3.0 )
 	jack? ( media-sound/jack-audio-connection-kit )
 	sndfile? ( media-libs/libsndfile )
-	lcms? ( media-libs/lcms )
+	lcms? ( media-libs/lcms:0 )
 	collada? ( media-libs/opencollada )"

 DEPEND="dev-util/scons
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@ -1,2 +1,2 @@
 DIST ImageMagick-6.7.1-0.tar.xz 7754528 RMD160 cc0e60a2c4c05723128200066f44939f7b1edd43 SHA1 6570b9f994ae58e047d3a3ad84b1bfdf2e749159 SHA256 1b26dff61f46cdbb13fe57acdba9583dc9c47e303826bddea9276a0d3a666b47
-DIST ImageMagick-6.7.4-0.tar.xz 7583560 RMD160 3f2f96844653e45ab53be62db8b6f3bfce729254 SHA1 f0310885972341b74670925b503ad8a8b05ad75d SHA256 7a23a77707efdac2686ca09ef4a1fb83f1f21385a6410a30a1c003180da37ca4
+DIST ImageMagick-6.7.4-8.tar.xz 7551180 RMD160 2bb25014e3c35f05af5796b9e2e0558582dfb1ac SHA1 71028edada3ac1f9e3f7b34082809cf7daf270b6 SHA256 796dd615cf372bd08b74cc96b0c0036a57c63f5cccbe6233073ccd2fc109dfd4
--- a/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild,v 1.13 2011/12/11 06:31:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.1.0.ebuild,v 1.14 2012/01/23 22:54:00 ssuominen Exp $

 EAPI=4
 inherit multilib toolchain-funcs versionator
@ -31,7 +31,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	jpeg2k? ( media-libs/jasper )
 	lcms? ( media-libs/lcms:2 )
 	lqr? ( >=media-libs/liblqr-0.1.0 )
-	opencl? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 )
+	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr )
 	perl? ( >=dev-lang/perl-5.8.6-r6 )
 	png? ( >=media-libs/libpng-1.4:0 )
--- a/media-gfx/imagemagick/imagemagick-6.7.4.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.4.8.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-gfx/imagemagick/imagemagick-6.7.4.0.ebuild,v 1.1 2011/12/11 06:21:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.4.8.ebuild,v 1.1 2012/01/23 22:54:00 ssuominen Exp $

 EAPI=4
 inherit multilib toolchain-funcs versionator
@ -14,9 +14,8 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 LICENSE="imagemagick"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png q32 q64 q8 raw static-libs svg tiff truetype video_cards_nvidia webp wmf X xml zlib"
+IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png q32 q64 q8 raw static-libs svg tiff truetype webp wmf X xml zlib"

-# libtool is required for loading plugins
 RDEPEND=">=sys-devel/libtool-2.2.6b
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
@ -32,12 +31,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	jpeg2k? ( media-libs/jasper )
 	lcms? ( media-libs/lcms:2 )
 	lqr? ( >=media-libs/liblqr-0.1.0 )
-	opencl? (
-		video_cards_nvidia? (
-			x11-drivers/nvidia-drivers
-			>=dev-util/nvidia-cuda-toolkit-3.1
-			)
-		)
+	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr )
 	pango? ( x11-libs/pango )
 	perl? ( >=dev-lang/perl-5.8.6-r6 )
@ -59,6 +53,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	!media-gfx/graphicsmagick[imagemagick]
+	app-arch/xz-utils
 	dev-util/pkgconfig
 	>=sys-apps/sed-4
 	X? ( x11-proto/xextproto )"
@ -77,11 +72,6 @@ src_configure() {
 	use q32 && depth=32
 	use q64 && depth=64

-	local opencl=disable
-	if use opencl && use video_cards_nvidia; then
-		opencl=enable
-	fi
-
 	local openmp=disable
 	if use openmp && tc-has-openmp; then
 		openmp=enable
@ -91,7 +81,7 @@ src_configure() {
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable static-libs static) \
 		$(use_enable hdri) \
-		--${opencl}-opencl \
+		$(use_enable opencl) \
 		--with-threads \
 		--without-included-ltdl \
 		--with-ltdl-include="${EPREFIX}/usr/include" \
@ -146,8 +136,8 @@ src_install() {
 	default

 	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -delete
-		find "${ED}" -depth -mindepth 1 -type d -empty -delete
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
 	fi

 	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
--- a/media-libs/xvid/xvid-1.3.2.ebuild
+++ b/media-libs/xvid/xvid-1.3.2.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-libs/xvid/xvid-1.3.2.ebuild,v 1.1 2011/06/06 16:33:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.3.2.ebuild,v 1.2 2012/01/23 16:12:11 ago Exp $

 EAPI=2
 inherit flag-o-matic multilib
@ -14,7 +14,7 @@ SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="examples +threads pic"

 NASM=">=dev-lang/nasm-2"
--- a/media-sound/awesfx/awesfx-0.5.1c-r2.ebuild
+++ b/media-sound/awesfx/awesfx-0.5.1c-r2.ebuild
@ -1,6 +1,6 @@
-# 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/media-sound/awesfx/awesfx-0.5.1c-r2.ebuild,v 1.3 2010/05/24 19:02:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/awesfx-0.5.1c-r2.ebuild,v 1.4 2012/01/23 23:10:24 ssuominen Exp $

 EAPI=2
 inherit eutils
@ -11,7 +11,7 @@ SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.bz2"

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

 RDEPEND="media-libs/alsa-lib"
--- a/media-sound/awesfx/awesfx-0.5.1c.ebuild
+++ b/media-sound/awesfx/awesfx-0.5.1c.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/awesfx/awesfx-0.5.1c.ebuild,v 1.5 2009/06/10 14:48:32 armin76 Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="AWE32 Sound Driver Utility Programs"
-HOMEPAGE="http://ftp.suse.com/pub/people/tiwai/awesfx"
-SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib"
-DEPEND="${RDEPEND}"
-
-BANK_LOC="/usr/share/sounds/sf2"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-getline.patch
-}
-
-src_configure() {
-	econf \
-		--with-sfpath=${BANK_LOC}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README SBKtoSF2.txt samples/README-bank
-	rm -f "${D}"/usr/share/sounds/sf2/README-bank
-}
-
-pkg_postinst() {
-	elog "Copy your SoundFont files from the original CDROM"
-	elog "shipped with your soundcard to ${BANK_LOC}."
-}
--- a/media-sound/gtick/gtick-0.4.2.ebuild
+++ b/media-sound/gtick/gtick-0.4.2.ebuild
@ -1,6 +1,6 @@
-# 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/media-sound/gtick/gtick-0.4.2.ebuild,v 1.5 2010/07/24 10:03:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gtick/gtick-0.4.2.ebuild,v 1.6 2012/01/23 23:07:44 ssuominen Exp $

 EAPI=2
 inherit eutils
@ -11,7 +11,7 @@ SRC_URI="http://www.antcom.de/gtick/download/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
 IUSE="nls sndfile"

 RDEPEND="x11-libs/gtk+:2
--- a/media-sound/shell-fm/Manifest
+++ b/media-sound/shell-fm/Manifest
@ -1,2 +1 @@
-DIST shell-fm-0.7.tar.bz2 41729 RMD160 f5339703525fcfbefb85b7b9863bb0702ae2328e SHA1 f5630f082e8b2bf810ffd5aa1ce5f91d5a8b9a84 SHA256 a29084322d42712b345c09107b80986d98cb456320567e04123e6cbccdfe63d3
 DIST shell-fm-0.8.tar.gz 54303 RMD160 f1d25719d5cd6ea7a8a37dd61df0f425e9ea336c SHA1 b267eb820e2c3c3eefba5e3fc6e45d366149427f SHA256 b6d5b754c6ea0285c060f4989de730101dd6a172bb075a2a04b4649be33a06a3
--- a/media-sound/shell-fm/files/shell-fm-0.7-asneeded.patch
+++ b/media-sound/shell-fm/files/shell-fm-0.7-asneeded.patch
@ -1,39 +0,0 @@
--- a/source/Makefile
-+++ b/source/Makefile
-@@ -6,10 +6,10 @@ LIB	:= libshellfm.so
- STATIC	:= libshellfm.a
- 
- ifeq ($(shell uname -s), OpenBSD)
-	LDFLAGS += -lossaudio
-+	LDLIBS += -lossaudio
- endif
- ifeq ($(shell uname -s), NetBSD)
-	LDFLAGS += -lossaudio
-+	LDLIBS += -lossaudio
- endif
- ifeq ($(shell uname -s), Darwin)
- 	CFLAGS += -D__darwin__
-@@ -18,12 +18,12 @@ endif
- CFLAGS  += -Os -Wall -W -I./include/ -DLIBAO \
- 	   $(shell pkg-config --cflags mad) \
- 	   $(shell pkg-config --cflags ao)
-LDFLAGS += $(shell pkg-config --libs mad) \
-+LDLIBS += $(shell pkg-config --libs mad) \
- 	   $(shell pkg-config --libs ao)
- 
- ifeq ($(shell pkg-config --exists taglib_c && echo 1), 1)
- 	CFLAGS  += $(shell pkg-config --cflags taglib_c) -DTAGLIB
-	LDFLAGS += $(shell pkg-config --libs taglib_c)
-+	LDLIBS += $(shell pkg-config --libs taglib_c)
- endif
- 
- .PHONY: clean tags cscope
-@@ -40,7 +40,7 @@ $(STATIC) : $(OBJECT)
- 	$(AR) -cvq $(STATIC) $(OBJECT)
- 
- $(BINARY)	: $(STATIC)
-	$(CC) -o $(BINARY) $(CFLAGS) $(MAIN) $(LDFLAGS) $(STATIC)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(MAIN) $(STATIC) $(LDLIBS) -o $(BINARY)
- 
- clean		:
- 	rm -f $(OBJECT) $(BINARY) $(LIB) $(STATIC)
--- a/media-sound/shell-fm/files/shell-fm-0.8-doublefree.patch
+++ b/media-sound/shell-fm/files/shell-fm-0.8-doublefree.patch
@ -0,0 +1,24 @@
+Fix double free crash: http://bugs.gentoo.org/392413
+
+--- source/sckif.c
+++ source/sckif.c
+@@ -39,6 +39,8 @@
+ 
+ #include "split.h"
+ 
+#include "ropen.h" /* fshutdown */
+
+ struct hash track;
+ 
+ static int stcpsck = -1, sunixsck = -1;
+@@ -191,9 +193,7 @@
+ 
+ 	if(disconnect) {
+ 		debug("removing client\n");
+-		shutdown(SHUT_RDWR, client_socket);
+-		close(client_socket);
+-		fclose(fd);
+		fshutdown(& fd);
+ 
+ 		remove_handle(client_socket);
+ 	}
--- a/media-sound/shell-fm/shell-fm-0.7.ebuild
+++ b/media-sound/shell-fm/shell-fm-0.7.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shell-fm/shell-fm-0.7.ebuild,v 1.4 2010/08/18 21:05:26 darkside Exp $
-
-EAPI=2
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="A lightweight console based player for Last.FM radio streams"
-HOMEPAGE="http://nex.scrapping.cc/shell-fm/"
-# I couldn't get constant tarball from github so I've tarballed this myself.
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-libs/libmad
-	media-libs/libao
-	media-libs/taglib"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-apps/sed"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	sed -i -e "s:-Os::" source/Makefile || die "sed failed"
-}
-
-src_compile() {
-	tc-export CC
-	if use ppc; then
-		append-flags -DWORDS_BIGENDIAN=1
-	fi
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin source/${PN} || die "dobin failed"
-	doman manual/${PN}.1 || die
-	exeinto /usr/share/${PN}/scripts
-	doexe scripts/{*.sh,*.pl,zcontrol} || die "doexe failed"
-}
--- a/media-sound/shell-fm/shell-fm-0.8-r1.ebuild
+++ b/media-sound/shell-fm/shell-fm-0.8-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shell-fm/shell-fm-0.8.ebuild,v 1.1 2011/05/24 21:12:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shell-fm/shell-fm-0.8-r1.ebuild,v 1.1 2012/01/23 16:04:21 ssuominen Exp $

 EAPI=4
 inherit flag-o-matic toolchain-funcs eutils
@ -14,8 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
 IUSE=""

-RDEPEND="media-libs/libmad
-	media-libs/libao
+RDEPEND="media-libs/libao
+	media-libs/libmad
 	media-libs/taglib"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@ -27,12 +27,12 @@ src_unpack() {
 }

 src_prepare() {
-	sed -i -e "s:-Os::" source/Makefile || die "sed failed"
+	epatch "${FILESDIR}"/${P}-doublefree.patch #392413
+
+	sed -i -e 's:-Os::' source/Makefile || die

 	tc-export CC AR
-	if use ppc; then
-		append-flags -DWORDS_BIGENDIAN=1
-	fi
+	use ppc && append-flags -DWORDS_BIGENDIAN=1
 }

 src_install() {
--- a/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild
+++ b/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild,v 1.2 2009/11/12 18:18:55 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-firmware/linuxtv-dvb-firmware-2009.09.19.ebuild,v 1.3 2012/01/23 22:17:55 ssuominen Exp $

 DESCRIPTION="Firmware files needed for operation of some dvb-devices"
 HOMEPAGE="http://www.linuxtv.org"
@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND=""
+DEPEND="app-arch/unrar"
 RDEPEND=""

 RESTRICT="mirror"
--- a/media-video/tovid/Manifest
+++ b/media-video/tovid/Manifest
@ -1 +1,2 @@
 DIST tovid-0.34.tar.gz 512950 RMD160 417b1c29d634f03aa6667407826f2e2dbd5175b0 SHA1 e652b9b402174d8c81a2e3b9962c17d25f4feefa SHA256 f95d14ffbd2bd491751b529b09fb27ae45e24af1ad44c87b25bac9c1a184f4ee
+DIST tovid-0.34_p20120123.tar.gz 1008271 RMD160 e7679043a6845e176c24c0dad872117a04dc3ce1 SHA1 0ca25885882633b152ddb800b3500ee8f7148b3f SHA256 941d3ca7aeb68fe306fb41aa1e97d4524f3ce8e340e83a249257f11755084186
--- a/media-video/tovid/tovid-0.34_p20120123.ebuild
+++ b/media-video/tovid/tovid-0.34_p20120123.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/tovid/tovid-0.34_p20120123.ebuild,v 1.1 2012/01/23 20:47:39 ssuominen Exp $
+
+# svn checkout http://tovid.googlecode.com/svn/trunk/tovid tovid-${PV}
+# note: see quickrelease file in the top source directory
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.7"
+PYTHON_USE_WITH="tk"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils gnome2-utils
+
+DESCRIPTION="A collection of DVD authoring tools"
+HOMEPAGE="http://tovid.wikia.com/wiki/Tovid_Wiki"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.gz"
+#SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-cdr/cdrdao
+	app-cdr/dvd+rw-tools
+	dev-python/pycairo
+	dev-python/imaging
+	dev-tcltk/tix
+	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )
+	media-sound/normalize
+	>=media-sound/sox-14.3.2
+	media-video/dvdauthor
+	>=media-video/mjpegtools-2.0.0
+	>=media-video/mplayer-1.0_rc4_p20110101
+	>=media-video/transcode-1.1.5
+	media-video/vcdimager
+	sys-devel/bc
+	virtual/ffmpeg"
+DEPEND="app-text/txt2tags"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_install() {
+	distutils_src_install
+
+	# punt at least .install.log
+	find "${ED}" -name '*.log' -exec rm -f {} +
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	gnome2_icon_cache_update
+}
--- a/metadata/cache/app-arch/unp-2.0_pre7
+++ b/metadata/cache/app-arch/unp-2.0_pre7
@ -6,7 +6,7 @@ mirror://debian/pool/main/u/unp/unp_2.0~pre7.tar.bz2
 http://packages.qa.debian.org/u/unp.html
 GPL-2
 Script for unpacking various file formats
-~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 bash-completion-r1 eutils multilib portability toolchain-funcs user
 nls

--- a/metadata/cache/app-arch/unrar-4.1.4
+++ b/metadata/cache/app-arch/unrar-4.1.4
@ -1,22 +0,0 @@
-
-!<=app-arch/unrar-gpl-0.0.1_p20080417
-0
-http://www.rarlab.com/rar/unrarsrc-4.1.4.tar.gz
-
-http://www.rarlab.com/rar_add.htm
-unRAR
-Uncompress rar files
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-eutils flag-o-matic multilib portability toolchain-funcs user
-
-
-
-
-4
-
-compile install
-
-
-
-
-
--- a/metadata/cache/app-arch/unrar-gpl-0.0.1_p20080417
+++ b/metadata/cache/app-arch/unrar-gpl-0.0.1_p20080417
@ -1,22 +0,0 @@
-!app-arch/unrar || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool
-!app-arch/unrar
-0
-mirror://gentoo/unrar-gpl-0.0.1_p20080417.tar.bz2
-
-http://home.gna.org/unrar/
-GPL-2
-Free rar unpacker for old (pre v3) rar files
-amd64 x86
-autotools eutils libtool multilib portability toolchain-funcs user
-
-
-
-
-
-
-compile install unpack
-
-
-
-
-
--- a/metadata/cache/app-arch/unrar-gpl-0.0.1_p20080417-r1
+++ b/metadata/cache/app-arch/unrar-gpl-0.0.1_p20080417-r1
@ -6,15 +6,15 @@ mirror://gentoo/unrar-gpl-0.0.1_p20080417.tar.bz2
 http://home.gna.org/unrar/
 GPL-2
 Free rar unpacker for old (pre v3) rar files
-~amd64 ~x86
+amd64 x86
 autotools eutils libtool multilib portability toolchain-funcs user




-2
+4

-configure install prepare
+configure prepare



--- a/metadata/cache/app-emulation/qemu-1.0
+++ b/metadata/cache/app-emulation/qemu-1.0
@ -1,22 +0,0 @@
-!app-emulation/qemu-kvm !app-emulation/qemu-user >=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 ) 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.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 ) qemu_softmmu_targets_lm32? ( x11-libs/libX11 virtual/opengl ) app-text/texi2html dev-util/pkgconfig >=sys-kernel/linux-headers-2.6.35
-!app-emulation/qemu-kvm !app-emulation/qemu-user >=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 ) 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.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 ) qemu_softmmu_targets_lm32? ( x11-libs/libX11 virtual/opengl )
-0
-http://wiki.qemu.org/download/qemu-1.0.tar.gz
-test
-http://www.qemu.org
-GPL-2
-QEMU emulator and ABI wrapper
-~amd64 ~ppc ~ppc64 ~x86
-eutils flag-o-matic linux-info multilib portability toolchain-funcs user versionator
-+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads vde +vhost-net xattr xen +qemu_softmmu_targets_i386 +qemu_softmmu_targets_x86_64 +qemu_softmmu_targets_alpha +qemu_softmmu_targets_arm +qemu_softmmu_targets_cris +qemu_softmmu_targets_m68k +qemu_softmmu_targets_microblaze +qemu_softmmu_targets_microblazeel +qemu_softmmu_targets_mips +qemu_softmmu_targets_mipsel +qemu_softmmu_targets_ppc +qemu_softmmu_targets_ppc64 +qemu_softmmu_targets_sh4 +qemu_softmmu_targets_sh4eb +qemu_softmmu_targets_sparc +qemu_softmmu_targets_sparc64 +qemu_softmmu_targets_s390x +qemu_softmmu_targets_lm32 +qemu_softmmu_targets_mips64 +qemu_softmmu_targets_mips64el +qemu_softmmu_targets_ppcemb +qemu_softmmu_targets_xtensa +qemu_softmmu_targets_xtensaeb +qemu_user_targets_i386 +qemu_user_targets_x86_64 +qemu_user_targets_alpha +qemu_user_targets_arm +qemu_user_targets_cris +qemu_user_targets_m68k +qemu_user_targets_microblaze +qemu_user_targets_microblazeel +qemu_user_targets_mips +qemu_user_targets_mipsel +qemu_user_targets_ppc +qemu_user_targets_ppc64 +qemu_user_targets_sh4 +qemu_user_targets_sh4eb +qemu_user_targets_sparc +qemu_user_targets_sparc64 +qemu_user_targets_s390x +qemu_user_targets_armeb +qemu_user_targets_ppc64abi32 +qemu_user_targets_sparc32plus +qemu_user_targets_unicore32
-
-
-
-2
-
-compile configure install postinst prepare setup
-
-
-
-
-
--- a/metadata/cache/app-emulation/qemu-1.0-r1
+++ b/metadata/cache/app-emulation/qemu-1.0-r1
@ -0,0 +1,22 @@
+!app-emulation/qemu-kvm !app-emulation/qemu-user >=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 ) 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
+!app-emulation/qemu-kvm !app-emulation/qemu-user >=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 ) 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 )
+0
+http://wiki.qemu.org/download/qemu-1.0.tar.gz
+test
+http://www.qemu.org
+GPL-2
+QEMU emulator and ABI wrapper
+~amd64 ~ppc ~ppc64 ~x86
+eutils flag-o-matic linux-info multilib portability toolchain-funcs user versionator
+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde +vhost-net xattr xen +qemu_softmmu_targets_i386 +qemu_softmmu_targets_x86_64 +qemu_softmmu_targets_alpha +qemu_softmmu_targets_arm +qemu_softmmu_targets_cris +qemu_softmmu_targets_m68k +qemu_softmmu_targets_microblaze +qemu_softmmu_targets_microblazeel +qemu_softmmu_targets_mips +qemu_softmmu_targets_mipsel +qemu_softmmu_targets_ppc +qemu_softmmu_targets_ppc64 +qemu_softmmu_targets_sh4 +qemu_softmmu_targets_sh4eb +qemu_softmmu_targets_sparc +qemu_softmmu_targets_sparc64 +qemu_softmmu_targets_s390x +qemu_softmmu_targets_lm32 +qemu_softmmu_targets_mips64 +qemu_softmmu_targets_mips64el +qemu_softmmu_targets_ppcemb +qemu_softmmu_targets_xtensa +qemu_softmmu_targets_xtensaeb +qemu_user_targets_i386 +qemu_user_targets_x86_64 +qemu_user_targets_alpha +qemu_user_targets_arm +qemu_user_targets_cris +qemu_user_targets_m68k +qemu_user_targets_microblaze +qemu_user_targets_microblazeel +qemu_user_targets_mips +qemu_user_targets_mipsel +qemu_user_targets_ppc +qemu_user_targets_ppc64 +qemu_user_targets_sh4 +qemu_user_targets_sh4eb +qemu_user_targets_sparc +qemu_user_targets_sparc64 +qemu_user_targets_s390x +qemu_user_targets_armeb +qemu_user_targets_ppc64abi32 +qemu_user_targets_sparc32plus +qemu_user_targets_unicore32
+
+
+
+4
+
+configure install postinst prepare setup
+
+
+
+
+
--- a/metadata/cache/app-emulation/qemu-9999
+++ b/metadata/cache/app-emulation/qemu-9999
@ -1,5 +1,5 @@
-!app-emulation/qemu-kvm !app-emulation/qemu-user >=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 ) 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.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 ) qemu_softmmu_targets_lm32? ( x11-libs/libX11 virtual/opengl ) app-text/texi2html dev-util/pkgconfig >=sys-kernel/linux-headers-2.6.35 dev-vcs/git
-!app-emulation/qemu-kvm !app-emulation/qemu-user >=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 ) 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.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 ) qemu_softmmu_targets_lm32? ( x11-libs/libX11 virtual/opengl )
+!app-emulation/qemu-kvm !app-emulation/qemu-user >=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 ) 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-emulation/qemu-kvm !app-emulation/qemu-user >=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 ) 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 )
 0

 test
@ -8,11 +8,11 @@ GPL-2
 QEMU emulator and ABI wrapper

 eutils flag-o-matic git-2 linux-info multilib portability toolchain-funcs user versionator
-+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads vde +vhost-net xattr xen +qemu_softmmu_targets_i386 +qemu_softmmu_targets_x86_64 +qemu_softmmu_targets_alpha +qemu_softmmu_targets_arm +qemu_softmmu_targets_cris +qemu_softmmu_targets_m68k +qemu_softmmu_targets_microblaze +qemu_softmmu_targets_microblazeel +qemu_softmmu_targets_mips +qemu_softmmu_targets_mipsel +qemu_softmmu_targets_ppc +qemu_softmmu_targets_ppc64 +qemu_softmmu_targets_sh4 +qemu_softmmu_targets_sh4eb +qemu_softmmu_targets_sparc +qemu_softmmu_targets_sparc64 +qemu_softmmu_targets_s390x +qemu_softmmu_targets_lm32 +qemu_softmmu_targets_mips64 +qemu_softmmu_targets_mips64el +qemu_softmmu_targets_ppcemb +qemu_softmmu_targets_xtensa +qemu_softmmu_targets_xtensaeb +qemu_user_targets_i386 +qemu_user_targets_x86_64 +qemu_user_targets_alpha +qemu_user_targets_arm +qemu_user_targets_cris +qemu_user_targets_m68k +qemu_user_targets_microblaze +qemu_user_targets_microblazeel +qemu_user_targets_mips +qemu_user_targets_mipsel +qemu_user_targets_ppc +qemu_user_targets_ppc64 +qemu_user_targets_sh4 +qemu_user_targets_sh4eb +qemu_user_targets_sparc +qemu_user_targets_sparc64 +qemu_user_targets_s390x +qemu_user_targets_armeb +qemu_user_targets_ppc64abi32 +qemu_user_targets_sparc32plus +qemu_user_targets_unicore32
+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde +vhost-net xattr xen +qemu_softmmu_targets_i386 +qemu_softmmu_targets_x86_64 +qemu_softmmu_targets_alpha +qemu_softmmu_targets_arm +qemu_softmmu_targets_cris +qemu_softmmu_targets_m68k +qemu_softmmu_targets_microblaze +qemu_softmmu_targets_microblazeel +qemu_softmmu_targets_mips +qemu_softmmu_targets_mipsel +qemu_softmmu_targets_ppc +qemu_softmmu_targets_ppc64 +qemu_softmmu_targets_sh4 +qemu_softmmu_targets_sh4eb +qemu_softmmu_targets_sparc +qemu_softmmu_targets_sparc64 +qemu_softmmu_targets_s390x +qemu_softmmu_targets_lm32 +qemu_softmmu_targets_mips64 +qemu_softmmu_targets_mips64el +qemu_softmmu_targets_ppcemb +qemu_softmmu_targets_xtensa +qemu_softmmu_targets_xtensaeb +qemu_user_targets_i386 +qemu_user_targets_x86_64 +qemu_user_targets_alpha +qemu_user_targets_arm +qemu_user_targets_cris +qemu_user_targets_m68k +qemu_user_targets_microblaze +qemu_user_targets_microblazeel +qemu_user_targets_mips +qemu_user_targets_mipsel +qemu_user_targets_ppc +qemu_user_targets_ppc64 +qemu_user_targets_sh4 +qemu_user_targets_sh4eb +qemu_user_targets_sparc +qemu_user_targets_sparc64 +qemu_user_targets_s390x +qemu_user_targets_armeb +qemu_user_targets_ppc64abi32 +qemu_user_targets_sparc32plus +qemu_user_targets_unicore32



-2
+4

 configure install postinst prepare setup unpack

--- 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 ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) 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 ) qemu_softmmu_targets_lm32? ( x11-libs/libX11 virtual/opengl ) 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 ) png? ( media-libs/libpng ) pulseaudio? ( media-sound/pulseaudio ) 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 ) qemu_softmmu_targets_lm32? ( x11-libs/libX11 virtual/opengl ) >=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-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
 0

 test
@ -8,7 +8,7 @@ GPL-2
 QEMU + Kernel-based Virtual Machine userland tools

 eutils flag-o-matic git-2 linux-info multilib portability python toolchain-funcs user versionator
-+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss png pulseaudio rbd sasl sdl spice ssl threads vde +vhost-net xattr xen +qemu_softmmu_targets_x86_64 qemu_softmmu_targets_i386 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_lm32 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus qemu_user_targets_unicore32
+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads usbredir vde +vhost-net xattr xen +qemu_softmmu_targets_x86_64 qemu_softmmu_targets_i386 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_lm32 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_user_targets_i386 qemu_user_targets_x86_64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mipsel qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_s390x qemu_user_targets_armeb qemu_user_targets_ppc64abi32 qemu_user_targets_sparc32plus qemu_user_targets_unicore32



--- a/metadata/cache/app-misc/pax-utils-0.3.0
+++ b/metadata/cache/app-misc/pax-utils-0.3.0
@ -0,0 +1,22 @@
+caps? ( sys-libs/libcap ) app-arch/xz-utils
+caps? ( sys-libs/libcap )
+0
+mirror://gentoo/pax-utils-0.3.0.tar.xz http://dev.gentoo.org/~solar/pax/pax-utils-0.3.0.tar.xz http://dev.gentoo.org/~vapier/dist/pax-utils-0.3.0.tar.xz
+
+http://hardened.gentoo.org/pax-utils.xml
+GPL-2
+ELF related utils for ELF 32/64 binaries that can check files for security relevant properties
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+eutils flag-o-matic multilib portability toolchain-funcs user
+caps
+
+
+
+
+
+compile install unpack
+
+
+
+
+
--- a/metadata/cache/app-text/gv-3.7.3-r1
+++ b/metadata/cache/app-text/gv-3.7.3-r1
@ -0,0 +1,22 @@
+app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXaw3d-1.6-r1 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) x11-proto/xproto
+app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXaw3d-1.6-r1 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
+0
+mirror://gnu/gv/gv-3.7.3.tar.gz
+
+http://www.gnu.org/software/gv/
+GPL-3
+Viewer for PostScript and PDF documents using Ghostscript
+~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+eutils flag-o-matic multilib portability toolchain-funcs user
+xinerama
+
+
+
+4
+
+configure install prepare
+
+
+
+
+
--- a/metadata/cache/dev-java/bsh-2.0_beta4-r4
+++ b/metadata/cache/dev-java/bsh-2.0_beta4-r4
@ -0,0 +1,22 @@
+>=virtual/jdk-1.4 java-virtuals/servlet-api:3.0 readline? ( dev-java/libreadline-java:0 ) bsf? ( dev-java/bsf:2.3 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jdk-1.4 java-virtuals/servlet-api:3.0 readline? ( dev-java/libreadline-java:0 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+0
+http://www.beanshell.org/bsh-2.0b4-src.jar mirror://gentoo/beanshell-icon.png
+test
+http://www.beanshell.org
+LGPL-2.1
+BeanShell: A small embeddable Java source interpreter
+~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
+bsf readline elibc_FreeBSD doc source elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test unpack
+
+
+
+
+
--- a/metadata/cache/dev-java/jaxp-1.4-r1
+++ b/metadata/cache/dev-java/jaxp-1.4-r1
@ -6,7 +6,7 @@ mirror://gentoo/jaxp-1.4.tar.bz2
 https://jaxp.dev.java.net/
 CDDL
 The Java API for XML Processing (JAXP)
-~amd64 ~ppc ~x86 ~x86-fbsd
+amd64 ~ppc ~x86 ~x86-fbsd
 eutils java-ant-2 java-pkg-2 java-utils-2 multilib portability toolchain-funcs user versionator
 elibc_FreeBSD doc source elibc_FreeBSD

--- a/metadata/cache/dev-java/snakeyaml-1.9
+++ b/metadata/cache/dev-java/snakeyaml-1.9
@ -0,0 +1,22 @@
+>=virtual/jdk-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+>=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+0
+http://snakeyaml.googlecode.com/files/SnakeYAML-all-1.9.zip
+
+http://code.google.com/p/snakeyaml/
+Apache-2.0
+A YAML 1.1 parser and emitter for Java 5
+~amd64 ~x86
+eutils java-pkg-2 java-pkg-simple java-utils-2 multilib portability toolchain-funcs user versionator
+elibc_FreeBSD doc source elibc_FreeBSD
+
+
+
+4
+
+compile install preinst prepare setup
+
+
+
+
+
--- a/metadata/cache/dev-lang/v8-3.6.6.19
+++ b/metadata/cache/dev-lang/v8-3.6.6.19
@ -1,7 +1,7 @@
 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
-http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.6.6.15.tar.bz2
+http://commondatastorage.googleapis.com/chromium-browser-official/v8-3.6.6.19.tar.bz2

 http://code.google.com/p/v8
 BSD
--- a/metadata/cache/dev-libs/boost-1.48.0-r1
+++ b/metadata/cache/dev-libs/boost-1.48.0-r1
@ -1,5 +1,5 @@
-icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3 dev-util/boost-build:1.48 >=app-admin/eselect-python-20091230
-icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib python? ( dev-lang/python ) !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3 >=app-admin/eselect-python-20091230
+icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3 >=dev-util/boost-build-1.48.0-r1:1.48 >=app-admin/eselect-python-20091230 python? ( dev-lang/python )
+icu? ( >=dev-libs/icu-3.3 ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) sys-libs/zlib !!<=dev-libs/boost-1.35.0-r2 >=app-admin/eselect-boost-0.3 >=app-admin/eselect-python-20091230 python? ( dev-lang/python )
 1.48
 mirror://sourceforge/boost/boost_1_48_0.tar.bz2

@ -12,9 +12,9 @@ debug doc +eselect icu mpi python static-libs test tools



-2
+4

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



--- a/metadata/cache/dev-python/pythonmagick-0.9.6
+++ b/metadata/cache/dev-python/pythonmagick-0.9.6
@ -1,22 +0,0 @@
->=media-gfx/imagemagick-6.4 >=dev-libs/boost-1.35.0[python] dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
->=media-gfx/imagemagick-6.4 >=dev-libs/boost-1.35.0[python] >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-0
-http://www.imagemagick.org/download/python/PythonMagick-0.9.6.tar.xz
-
-http://www.imagemagick.org/script/api.php
-GPL-3
-Python bindings for ImageMagick
-~amd64 ~ppc ~x86
-autotools eutils libtool multilib portability python toolchain-funcs user
-
-
-
-
-3
-
-compile configure install postinst postrm prepare test
-
-
-
-
-
--- a/metadata/cache/dev-python/pythonmagick-0.9.7
+++ b/metadata/cache/dev-python/pythonmagick-0.9.7
@ -1,5 +1,5 @@
->=media-gfx/imagemagick-6.4 >=dev-libs/boost-1.35.0[python] dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
->=media-gfx/imagemagick-6.4 >=dev-libs/boost-1.35.0[python] >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+<dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+<dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 http://www.imagemagick.org/download/python/PythonMagick-0.9.7.tar.xz

--- a/metadata/cache/dev-python/pythonmagick-0.9.7-r1
+++ b/metadata/cache/dev-python/pythonmagick-0.9.7-r1
@ -0,0 +1,22 @@
+>=dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+>=dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+0
+http://www.imagemagick.org/download/python/PythonMagick-0.9.7.tar.xz
+
+http://www.imagemagick.org/script/api.php
+GPL-3
+Python bindings for ImageMagick
+~amd64 ~ppc ~x86
+autotools eutils libtool multilib portability python toolchain-funcs user
+
+
+
+
+3
+
+compile configure install postinst postrm prepare test
+
+
+
+
+
--- a/metadata/cache/dev-python/tagpy-0.94.8
+++ b/metadata/cache/dev-python/tagpy-0.94.8
@ -1,5 +1,5 @@
->=media-libs/taglib-1.4 || ( >=dev-libs/boost-1.35.0-r5[python] <dev-libs/boost-1.35.0-r5 ) dev-python/setuptools >=app-admin/eselect-python-20091230 =dev-lang/python-2*
->=media-libs/taglib-1.4 || ( >=dev-libs/boost-1.35.0-r5[python] <dev-libs/boost-1.35.0-r5 ) >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+<dev-libs/boost-1.48[python] >=media-libs/taglib-1.4 dev-python/setuptools >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+<dev-libs/boost-1.48[python] >=media-libs/taglib-1.4 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
 0
 mirror://pypi/t/tagpy/tagpy-0.94.8.tar.gz

@ -12,9 +12,9 @@ examples



-3
+4

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



--- a/metadata/cache/dev-python/tagpy-0.94.8-r1
+++ b/metadata/cache/dev-python/tagpy-0.94.8-r1
@ -0,0 +1,22 @@
+>=dev-libs/boost-1.48[python] >=media-libs/taglib-1.4 dev-python/setuptools >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+>=dev-libs/boost-1.48[python] >=media-libs/taglib-1.4 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+mirror://pypi/t/tagpy/tagpy-0.94.8.tar.gz
+
+http://mathema.tician.de//software/tagpy http://pypi.python.org/pypi/tagpy
+BSD
+Python Bindings for TagLib
+~amd64 ~ppc ~ppc64 ~sparc ~x86
+distutils multilib python toolchain-funcs
+examples
+
+
+
+4
+
+compile configure install postinst postrm prepare setup
+
+
+
+
+
--- a/metadata/cache/dev-python/testtools-0.9.11
+++ b/metadata/cache/dev-python/testtools-0.9.11
@ -6,7 +6,7 @@ http://launchpad.net/testtools/0.9/0.9.11/+download/testtools-0.9.11.tar.gz
 https://launchpad.net/testtools http://pypi.python.org/pypi/testtools
 MIT
 Extensions to the Python unittest library
-alpha ~amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+alpha ~amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 distutils eutils multilib portability python toolchain-funcs user versionator


--- a/metadata/cache/dev-ruby/best_in_place-1.0.5
+++ b/metadata/cache/dev-ruby/best_in_place-1.0.5
@ -0,0 +1,22 @@
+test? ( ruby_targets_ruby18? ( dev-ruby/rails:3.1[ruby_targets_ruby18] dev-ruby/jquery-rails[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/rails:3.1[ruby_targets_ree18] dev-ruby/jquery-rails[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec-rails[ruby_targets_ruby18] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ruby18] >=dev-ruby/capybara-1.0.1[ruby_targets_ruby18] >=dev-ruby/sqlite3-ruby-1.3.4-r1[ruby_targets_ruby18] dev-ruby/rdiscount[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec-rails[ruby_targets_ree18] >=dev-ruby/nokogiri-1.5.0[ruby_targets_ree18] >=dev-ruby/capybara-1.0.1[ruby_targets_ree18] >=dev-ruby/sqlite3-ruby-1.3.4-r1[ruby_targets_ree18] dev-ruby/rdiscount[ruby_targets_ree18] ) ) test? ( www-client/firefox ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+ruby_targets_ruby18? ( dev-ruby/rails:3.1[ruby_targets_ruby18] dev-ruby/jquery-rails[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/rails:3.1[ruby_targets_ree18] dev-ruby/jquery-rails[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+3
+mirror://rubygems/best_in_place-1.0.5.gem
+
+http://github.com/bernat/best_in_place
+MIT
+In-place editor helper for Rails 3o
+~amd64
+eutils java-utils-2 multilib portability ruby-fakegem ruby-ng toolchain-funcs user versionator virtualx
+test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
+|| ( ruby_targets_ruby18 ruby_targets_ree18 )
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
--- a/metadata/cache/dev-util/pida-0.6.2
+++ b/metadata/cache/dev-util/pida-0.6.2
@ -1,5 +1,5 @@
-|| ( dev-lang/python:2.7 dev-python/argparse ) >=app-editors/gvim-6.3[gtk] >=dev-python/anyvc-0.3.2 >=dev-python/bpython-0.9.7 >=dev-python/pygtk-2.8 >dev-python/pygtkhelpers-0.4.1 gnome? ( >=x11-libs/vte-0.11.11-r2:0[python] ) dev-python/setuptools dev-util/pkgconfig >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-|| ( dev-lang/python:2.7 dev-python/argparse ) >=app-editors/gvim-6.3[gtk] >=dev-python/anyvc-0.3.2 >=dev-python/bpython-0.9.7 >=dev-python/pygtk-2.8 >dev-python/pygtkhelpers-0.4.1 gnome? ( >=x11-libs/vte-0.11.11-r2:0[python] ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+|| ( dev-lang/python:2.7 dev-python/argparse ) >=app-editors/gvim-6.3[gtk] >=dev-python/anyvc-0.3.2 >=dev-python/bpython-0.9.7[gtk] >=dev-python/pygtk-2.8 >dev-python/pygtkhelpers-0.4.1 >=x11-libs/vte-0.11.11-r2:0[python] dev-python/setuptools dev-util/pkgconfig >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+|| ( dev-lang/python:2.7 dev-python/argparse ) >=app-editors/gvim-6.3[gtk] >=dev-python/anyvc-0.3.2 >=dev-python/bpython-0.9.7[gtk] >=dev-python/pygtk-2.8 >dev-python/pygtkhelpers-0.4.1 >=x11-libs/vte-0.11.11-r2:0[python] >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 mirror://pypi/p/pida/pida-0.6.2.tar.gz

@ -8,7 +8,7 @@ GPL-2
 Gtk and/or Vim-based Python Integrated Development Application
 ~amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux
 distutils eutils multilib portability python toolchain-funcs user
-gnome
+



--- a/metadata/cache/dev-vcs/bzr-2.4.1
+++ b/metadata/cache/dev-vcs/bzr-2.4.1
@ -6,7 +6,7 @@ http://launchpad.net/bzr/2.4/2.4.1/+download/bzr-2.4.1.tar.gz
 http://bazaar-vcs.org/
 GPL-2
 Bazaar is a next generation distributed version control system.
-alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 bash-completion distutils elisp-common eutils multilib portability python toolchain-funcs user versionator
 curl doc emacs +sftp test bash-completion

--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST SnakeYAML-all-1.9.zip 9122570 RMD160 2ab11eba3be04c72884622eadf09a063b819982d SHA1 b07b7c524b6a7d4e38a783753329d71a44956530 SHA256 7c1090eb1b2e06f784dc424678f18d513dfe020fd2f0042c63217e09ae9a8853`