Sync with portage [Tue Mar 12 00:02:23 MSK 2013].

11 years ago · e5962838ca
parent fc6ad50e53
commit e5962838ca
406 changed files with 4420 additions and 5977 deletions
--- a/app-admin/emacs-updater/Manifest
+++ b/app-admin/emacs-updater/Manifest
@ -1,2 +1,3 @@
 DIST emacs-updater-1.10.tar.xz 6444 SHA256 6519597ee64e95bcaa1145e6b3f88e15d4de64da7764f20a02d0de55dcae34c8 SHA512 2cbbb6a12ebc72af68056c0dadbbe82afb34dd565ab659085cee5e497441444ee53c9bcea288b1bf29c4720fa12849f9f144816769ccb03a7eb11aff3010d9f3 WHIRLPOOL 9fd4967f2ec8f1f831282dcea0b8d869b2576e1c659b4f4858b15a440ab1db47032cccfc792b84c4153977bba2c7f43a48b7931fe4c5d73ec18573b1a5ea2d2b
+DIST emacs-updater-1.12.tar.xz 6892 SHA256 f2407629a1e34fce3abd3478488b3866221530d34a2a451a9999ca681a071dbd SHA512 aa5b62b233aa95286063e9efc1df8a113b8a7a7650e4a979b01dd8b7937caf4e52a16a398f16472f9915fb01aa17408f2c069337ab2005f7070ad1048f65cb3e WHIRLPOOL 59aa61f44089d7bce0aeea361bf377e5ecbf9a2caec4f758ee1183c40a674b0f8111b386cbb6988f3651c8bf5dc1b730995e4b160c3f34b45c48bbdcaed0552a
 DIST emacs-updater-1.9.tar.bz2 6445 SHA256 3d1957b42adbdbd9d2736942b7c8a7f281868cd4d413406761c62f2093e970c0 SHA512 aac069a9e06d10bf44d6e62a63094207488c1ab44dbe9234d2c9b315dcee9a1b4eab80058594fd8a191ae20a379d8a8cf4609c5971525f695508a80fe20618e7 WHIRLPOOL 8ae3046709141f9b9172998f1ccee8db2afa4c4217d4fddba0252eba88fe911f905470e40ecd63c248cebb7c53095d69a549b52158bf313a7fcd1910b0178171
--- a/app-admin/emacs-updater/emacs-updater-1.12.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.12.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/emacs-updater/emacs-updater-1.12.ebuild,v 1.1 2013/03/11 11:27:03 ulm Exp $
+
+EAPI=5
+
+DESCRIPTION="Rebuild Emacs packages"
+HOMEPAGE="http://www.gentoo.org/proj/en/lisp/emacs/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+RDEPEND=">=app-portage/portage-utils-0.3
+	virtual/emacs"
+
+src_prepare() {
+	if [[ -n ${EPREFIX} ]]; then
+		sed -i -e "1s:/:${EPREFIX%/}/:" \
+			-e "s:^\(EMACS\|SITELISP\)=:&${EPREFIX%/}:" \
+			emacs-updater || die
+	fi
+}
+
+src_install() {
+	dosbin emacs-updater
+	doman emacs-updater.8
+}
--- a/app-admin/eselect-xvmc/eselect-xvmc-0.4.ebuild
+++ b/app-admin/eselect-xvmc/eselect-xvmc-0.4.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-xvmc/eselect-xvmc-0.4.ebuild,v 1.1 2013/03/11 14:36:20 ottxor Exp $
+
+EAPI=5
+
+DESCRIPTION="Manages XvMC implementations"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-admin/eselect"
+
+S="${FILESDIR}"
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${FILESDIR}"/${P}.eselect xvmc.eselect
+}
--- a/app-admin/eselect-xvmc/files/eselect-xvmc-0.4.eselect
+++ b/app-admin/eselect-xvmc/files/eselect-xvmc-0.4.eselect
@ -0,0 +1,198 @@
+# -*-eselect-*-  vim: ft=eselect
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Manage the XvMC implementation used by your system"
+MAINTAINER="{cardoe,ottxor}@gentoo.org"
+VERSION="0.4"
+
+init_XVMC_vars() {
+	get_libname() {
+		case ${OSTYPE} in
+			darwin*) echo ${1:+.}${1}.dylib ;;
+			*) echo .so${1:+.}${1} ;;
+		esac
+	}
+
+	XVMCLIBS=(
+		"libXvMCNVIDIA_dynamic$(get_libname 1)"
+		"libXvMC$(get_libname 1)"
+		"libviaXvMC$(get_libname 1)"
+		"libviaXvMCPro$(get_libname 1)"
+		"libchromeXvMC$(get_libname 1)"
+		"libchromeXvMCPro$(get_libname 1)"
+		"libXvMCVIA$(get_libname)"
+		"libXvMCVIAPro$(get_libname)"
+		"libI810XvMC$(get_libname 1)"
+		"/usr/lib/libIntelXvMC$(get_libname)"
+		"libAMDXvBA$(get_libname 1)"
+	)
+
+	XVMCPRETTY=(
+		"nvidia"
+		"xorg-x11"
+		"via"
+		"via-pro"
+		"openchrome"
+		"openchrome-pro"
+		"unichrome"
+		"unichrome-pro"
+		"intel-i810"
+		"intel-i915/i965"
+		"ati"
+	)
+}
+
+get_implementation_indices() {
+	local ret n
+	for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do
+		[[ -e "${EROOT}/usr/lib/${XVMCLIBS[n]##*/}" ]] && ret+=($n)
+	done
+
+	echo ${ret[@]}
+}
+
+get_current_implementation_index() {
+	local n
+	if [[ -f "${EROOT}/etc/X11/XvMCConfig" ]]; then
+		local current=$(< "${EROOT}/etc/X11/XvMCConfig")
+		for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do
+			if [[ "${XVMCLIBS[n]}" = "${current}" ]]; then
+				echo "${n}"
+				return
+			fi
+		done
+	fi
+
+	echo "-1"
+}
+
+set_new_implementation() {
+	echo -n "Switching to ${XVMCPRETTY[$1]} XvMC implementation..."
+	touch "${EROOT}/etc/X11/XvMCConfig" 2>&1 > /dev/null
+	if [[ $? -eq 0 ]]; then
+		echo "${XVMCLIBS[$1]}" > "${EROOT}/etc/X11/XvMCConfig"
+		chmod 644 "${EROOT}/etc/X11/XvMCConfig"
+		[[ ${EROOT} == "/" ]] && chown 0:0 "${EROOT}/etc/X11/XvMCConfig"
+		echo " done"
+	else
+		echo " failed!"
+		echo "Insufficient privileges"
+	fi
+}
+
+### list action
+
+## {{{ list stuff
+describe_list() {
+	echo "List Available XvMC implementations"
+}
+
+do_list() {
+	local output n
+	init_XVMC_vars
+	local avail=( $(get_implementation_indices) )
+	local current=$(get_current_implementation_index)
+	write_list_start \
+		"Available XvMC implementations ($(highlight '*') is current):"
+
+	for n in "${avail[@]}"; do
+		output[n]=${XVMCPRETTY[n]}
+		[[ ${current} -eq ${n} ]] \
+			&& output[n]=$(highlight_marker "${output[n]}")
+	done
+	write_numbered_list -m "(none found)" "${output[@]}"
+
+	return 0
+}
+## }}}
+
+### show action
+
+## {{{ show stuff
+describe_show() {
+	echo "Print the current XvMC implementation."
+}
+
+do_show() {
+	init_XVMC_vars
+	local current=$(get_current_implementation_index)
+	write_list_start "Current XvMC implementation:"
+
+	if [[ ${current} -ne -1 ]]; then
+		echo "${XVMCPRETTY[current]}"
+		return 0
+	else
+		echo "(none)"
+		return 2
+	fi
+}
+## }}}
+
+### set action
+
+## {{{ set stuff
+describe_set() {
+	echo "Select the XvMC implementation"
+}
+
+describe_set_parameters() {
+	echo "<target>"
+}
+
+describe_set_options() {
+	echo "<target> : XvMC implementation to activate"
+	echo "--use-old : If an implementation is already set, use that one instead"
+}
+
+do_set() {
+	init_XVMC_vars
+	local current=$(get_current_implementation_index)
+	local avail=( $(get_implementation_indices) )
+	local n new action
+
+	while [[ ${#@} -gt 0 ]]; do
+		local opt=${1}
+		shift
+		case ${opt} in
+			--use-old)
+				if [[ ${current} -gt -1 ]]; then
+					(( ${current} < ${#XVMCPRETTY[@]} )) && action="old-implementation"
+				fi
+				;;
+			*)
+				[[ -z ${action} ]] && action="set-implementation"
+
+				if is_number ${opt} ; then
+					new=${avail[opt - 1]}
+					if [[ -z ${new} ]]; then
+						die -q "Unrecognized option: ${opt}"
+					fi
+				elif has ${opt} ${XVMCPRETTY[@]}; then
+					for (( n = 0; n < ${#XVMCPRETTY[@]}; ++n )); do
+						[[ "${XVMCPRETTY[n]}" = "${opt}" ]] && new=${n}
+					done
+				else
+					die -q "Unrecognized option: ${opt}"
+				fi
+				;;
+		esac
+	done
+
+	case ${action} in
+		old-implementation)
+			set_new_implementation ${current}
+			return $?
+		;;
+		set-implementation)
+			if [[ -n ${new} ]]; then
+				set_new_implementation ${new}
+				return $?
+			else
+				die -q "Please specify an implementation to set"
+			fi
+		;;
+		*)
+			die -q "Invalid usage of set action."
+	esac
+}
--- a/app-admin/eselect-xvmc/metadata.xml
+++ b/app-admin/eselect-xvmc/metadata.xml
@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>cardoe@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>ottxor@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<maintainer>
+		<email>cardoe@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@ -1,3 +1 @@
-DIST heimdal-1.5.1.tar.gz 6800347 SHA256 bd69940e67ce985589451d868354a959eebf96d8a059f513b23d40e4aa101d5f SHA512 897c8f562073d3f2638f1a2e7ffa76f56f3e46c3f986c50844bfba46735d4c0f1c09b9bfa3569d8dd79822afb1c04b69be09276f86e3dd2397874e4b3b839318 WHIRLPOOL 76195fde1921817b3674d71ea63ec694462f531c78fcc67c7ca94aaf7e6ca0d6507a61eb525524b5e10699275ef479938db297a6d6583a026fa7f96adc2b536d
-DIST heimdal-1.5.2.tar.gz 6798615 SHA256 22603f282f31173533b939d289f3374258aa1ccccbe51ee088d7568d321279ec SHA512 a04abb6f6ad3b1d6c366d9c4e6d92f5c2ca00ae0261c7acbfb1a5782d1bab4b3c498c4fa4b114867cb7e09291cee663cf4fd5c25afca8deb425a8e5112308957 WHIRLPOOL fb0bf1a13675f240c3728cc3378d5652322c08b792a5c2d0ef21a954a1e76149bd580548aacd0dfa67df8653b27972b24bbc9e2a16ffd518646a2ca38f3d601c
 DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19
--- a/app-crypt/heimdal/files/CVE-2011-4862.patch
+++ b/app-crypt/heimdal/files/CVE-2011-4862.patch
@ -1,16 +0,0 @@
-Stolen shamelessly from FreeBSD
-
-Index: crypto/heimdal/appl/telnet/libtelnet/encrypt.c
-===================================================================
--- appl/telnet/libtelnet/encrypt.c	(revision 228798)
-+++ appl/telnet/libtelnet/encrypt.c	(working copy)
-@@ -736,6 +736,9 @@
-     int dir = kp->dir;
-     int ret = 0;
- 
-+    if (len > MAXKEYLEN)
-+        len = MAXKEYLEN;
-+
-     if (!(ep = (*kp->getcrypt)(*kp->modep))) {
- 	if (len == 0)
- 	    return;
--- a/app-crypt/heimdal/files/heimdal-kadmind.initd-r1
+++ b/app-crypt/heimdal/files/heimdal-kadmind.initd-r1
@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kadmind.initd-r1,v 1.1 2011/02/16 22:14:12 eras Exp $
-
-depend() {
-	need net
-	use heimdal-kdc
-	after logger
-}
-
-start() {
-	ebegin "Starting Heimdal kadmind"
-		/usr/sbin/kadmind "${OPTIONS}" &
-		echo $! > /var/run/heimdal-kadmind.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Heimdal kadmind"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kadmind
-	eend $?
-}
--- a/app-crypt/heimdal/files/heimdal-kdc.initd-r1
+++ b/app-crypt/heimdal/files/heimdal-kdc.initd-r1
@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc.initd-r1,v 1.1 2011/02/16 22:14:12 eras Exp $
-
-depend() {
-	need net
-	after logger
-}
-
-OPTIONS="${OPTIONS} --detach"
-
-start() {
-	ebegin "Starting Heimdal kdc"
-	start-stop-daemon --start --quiet --exec \
-		/usr/sbin/kdc -- ${OPTIONS# }
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Heimdal kdc"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kdc
-	eend $?
-}
--- a/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r1
+++ b/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r1
@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r1,v 1.1 2011/02/16 22:14:12 eras Exp $
-
-depend() {
-	need net
-	use heimdal-kdc
-	after logger
-}
-
-start() {
-	ebegin "Starting Heimdal kpasswdd"
-	start-stop-daemon --background --start --quiet --exec \
-		/usr/sbin/kpasswdd -- "${OPTIONS}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Heimdal kpasswdd"
-	start-stop-daemon --stop --quiet --exec \
-		/usr/sbin/kpasswdd
-	eend $?
-}
--- a/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild
@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.1-r1.ebuild,v 1.11 2012/05/31 03:25:16 zmedico Exp $
-
-EAPI=2
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib python toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	sys-libs/ncurses
-	sys-libs/readline
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_missing-include.patch"
-	epatch "${FILESDIR}/CVE-2011-4862.patch"
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	local myconf=""
-	if use berkdb; then
-		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
-	else
-		myconf="--without-berkeley-db"
-	fi
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread-support) \
-		$(use_with caps capng) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r1 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r1 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r1 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-
-	# default database dir
-	keepdir /var/heimdal
-
-	# Ugly hack for broken symlink - bug #417081
-	rm "${D}"/usr/share/man/man5/qop.5 || die
-	dosym mech.5 /usr/share/man/man5/qop.5
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgssapi.so.2
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgssapi.so.2
-}
--- a/app-crypt/heimdal/heimdal-1.5.2-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.2-r1.ebuild
@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.2-r1.ebuild,v 1.1 2012/06/13 17:48:19 eras Exp $
-
-EAPI=4
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib python toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	sys-libs/ncurses
-	sys-libs/readline
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_missing-include.patch"
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	epatch "${FILESDIR}/heimdal_missing_symbols.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	local myconf=""
-	if use berkdb; then
-		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
-	else
-		myconf="--without-berkeley-db"
-	fi
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread-support) \
-		$(use_with caps capng) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r1 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r1 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r1 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	use static-libs || prune_libtool_files
-
-	# default database dir
-	keepdir /var/heimdal
-
-	# Ugly hack for broken symlink - bug #417081
-	rm "${D}"/usr/share/man/man5/qop.5 || die
-	dosym mech.5 /usr/share/man/man5/qop.5
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgssapi.so.2
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgssapi.so.2
-}
--- a/app-crypt/heimdal/heimdal-1.5.2-r2.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.2-r2.ebuild
@ -1,148 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.2-r2.ebuild,v 1.1 2013/01/16 19:58:57 eras Exp $
-
-EAPI=4
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib python toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	sys-libs/ncurses
-	sys-libs/readline
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_missing-include.patch"
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	epatch "${FILESDIR}/heimdal_missing_symbols.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	local myconf=""
-	if use berkdb; then
-		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
-	else
-		myconf="--without-berkeley-db"
-	fi
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread-support) \
-		$(use_with caps capng) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-
-	# default database dir
-	keepdir /var/heimdal
-
-	# Ugly hack for broken symlink - bug #417081
-	rm "${D}"/usr/share/man/man5/qop.5 || die
-	dosym mech.5 /usr/share/man/man5/qop.5
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgssapi.so.2
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgssapi.so.2
-}
--- a/app-crypt/heimdal/heimdal-1.5.2.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.2.ebuild
@ -1,147 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.2.ebuild,v 1.4 2012/05/31 03:25:16 zmedico Exp $
-
-EAPI=4
-# PYTHON_BDEPEND="2"
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib python toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	berkdb? ( sys-libs/db )
-	!berkdb? ( sys-libs/gdbm )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.5.7
-	>=sys-libs/e2fsprogs-libs-1.41.11
-	sys-libs/ncurses
-	sys-libs/readline
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt )
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	virtual/pkgconfig
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/heimdal_missing-include.patch"
-	epatch "${FILESDIR}/heimdal_db5.patch"
-	epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	epatch "${FILESDIR}/heimdal_link_order.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	local myconf=""
-	if use berkdb; then
-		myconf="--with-berkeley-db --with-berkeley-db-include=$(db_includedir)"
-	else
-		myconf="--without-berkeley-db"
-	fi
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/usr/sbin \
-		$(use_enable afs afs-support) \
-		$(use_enable otp) \
-		$(use_enable pkinit kx509) \
-		$(use_enable pkinit pk-init) \
-		$(use_enable static-libs static) \
-		$(use_enable threads pthread-support) \
-		$(use_with caps capng) \
-		$(use_with hdb-ldap openldap /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-
-	dodoc ChangeLog README NEWS TODO
-
-	# Begin client rename and install
-	for i in {telnetd,ftpd,rshd,popper}
-	do
-		mv "${D}"/usr/share/man/man8/{,k}${i}.8
-		mv "${D}"/usr/sbin/{,k}${i}
-	done
-
-	for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
-	do
-		mv "${D}"/usr/share/man/man1/{,k}${i}.1
-		mv "${D}"/usr/bin/{,k}${i}
-	done
-
-	mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
-	mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r1 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r1 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r1 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-
-	# default database dir
-	keepdir /var/heimdal
-
-	# Ugly hack for broken symlink - bug #417081
-	rm "${D}"/usr/share/man/man5/qop.5 || die
-	dosym mech.5 /usr/share/man/man5/qop.5
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgssapi.so.2
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgssapi.so.2
-}
--- a/app-crypt/heimdal/heimdal-1.5.3.ebuild
+++ b/app-crypt/heimdal/heimdal-1.5.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.3.ebuild,v 1.12 2013/03/10 16:24:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.5.3.ebuild,v 1.13 2013/03/11 07:38:47 ago Exp $

 EAPI=4
 # PYTHON_BDEPEND="2"
@ -15,7 +15,7 @@ SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit ssl static-libs threads test X"

 RDEPEND="ssl? ( dev-libs/openssl )
--- a/app-crypt/oclhashcat-lite-bin/Manifest
+++ b/app-crypt/oclhashcat-lite-bin/Manifest
@ -1,3 +1 @@
-DIST oclHashcat-lite-0.10.7z 2478892 SHA256 4d4d668981c249e4a7dff139f0952794300ac1d6dac6b9cd355a90928af98b78 SHA512 22768b09d7d0157aafdcbed7be4ac22611b30e4bd1e7eb936b45ffd0988bea78b1d2932cdae8a40ebbe82be7b29c4d7a63f69c5743648edb0f9c72fd0de46842 WHIRLPOOL 4faa59a57771f2d5729d82530e97f3b6523d98dbbfc4f9662298a5aafe7ed96630856786c83e7a71ecab34361326a170c132d64a281082a8ee7287f8a920a07e
-DIST oclHashcat-lite-0.13.7z 2728439 SHA256 5d62b4ae1207b0de6f43a4a6da1fc54bb36c72feeb7825a499df5d534c6b4258 SHA512 17622edc4aa9df1b809a1f235130f8f3ec92664a2fc800fdd288af7d56719613b667b972263e8b7de16fe161fd611b08e9029e78368e699d542997f2b1b1bd56 WHIRLPOOL 4c991f9b501be938e17c2393abeac25f42a7d74aa7290c3e09b34f592baf42facc5688b38285ff06782db6f0120e8cf1dbf31b96219dc310ed4692ed60ee128e
 DIST oclHashcat-lite-0.14.7z 2967901 SHA256 faec3c48c1ee9adde97d4f5efad17bb36ce4e69b495eeed80ae89d6faf9db551 SHA512 71fd31947208df6cd1ce26d64b0b68191d479a8142cde936eafe4c256e11905ab955a238a93393f3cf5865c75729d13bb0d496da9109c5f644e326331dca9b08 WHIRLPOOL 4c6972b5c993debbd1590fa0b4fdc59ba409cc9bcee05de2112cf4c79a74bf67c63e5a5abf70047fe0ae4cb1d6f23a57b83b84f3f1ac34e8247e9542da1d7881
--- a/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild
+++ b/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild
@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.10.ebuild,v 1.3 2012/07/04 17:41:29 zerochaos Exp $
-
-EAPI=4
-
-inherit eutils pax-utils
-
-DESCRIPTION="An opencl hash cracker"
-HOMEPAGE="http://hashcat.net/oclhashcat-lite/"
-MY_P="oclHashcat-lite-${PV}"
-SRC_URI="http://hashcat.net/files/${MY_P}.7z"
-
-#license applies to this version per http://hashcat.net/forum/thread-1348.html
-LICENSE="hashcat"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_fglrx
-	video_cards_nvidia"
-
-IUSE="${IUSE_VIDEO_CARDS}"
-
-RDEPEND="sys-libs/zlib
-	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.40 )
-	video_cards_fglrx?  ( >=x11-drivers/ati-drivers-12.4 )"
-DEPEND="${RDEPEND}
-	app-arch/p7zip"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="strip"
-QA_PREBUILT="*Hashcat-lite*.bin"
-
-src_install() {
-	dodoc docs/*
-	rm -rf *.exe docs || die
-	if use x86; then
-		rm oclHashcat-lite64.bin || die
-		rm cudaHashcat-lite64.bin || die
-	fi
-	if use amd64; then
-		rm oclHashcat-lite32.bin || die
-		rm cudaHashcat-lite32.bin || die
-	fi
-	if ! use video_cards_fglrx; then
-		rm -r kernels/4098 || die
-		rm oclHashcat-lite*.bin || die
-	fi
-	if ! use video_cards_nvidia; then
-		rm -r kernels/4318 || die
-		rm cudaHashcat-lite*.bin || die
-	fi
-
-	#I assume this is needed but I didn't check
-	pax-mark m *Hashcat-lite*.bin
-
-	insinto /opt/${PN}
-	doins -r "${S}"/*
-
-	dodir /opt/bin
-
-	cat <<-EOF > "${ED}"/opt/bin/oclhashcat-lite
-		#! /bin/sh
-		echo "oclHashcat-lite and all related files have been installed in /opt/${PN}"
-		echo "Please run one of the following binaries to use gpu accelerated hashcat:"
-	EOF
-
-	for x in oclHashcat-lite64.bin oclHashcat-lite32.bin cudaHashcat-lite64.bin cudaHashcat-lite32.bin
-	do
-		if [ -f "${ED}"/opt/${PN}/${x} ]
-		then
-			case "${x}" in
-				oclHashcat-lite64.bin)
-					echo "echo '64 bit ATI accelerated \"oclHashcat-lite64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
-					;;
-				oclHashcat-lite32.bin)
-					echo "echo '32 bit ATI accelerated \"oclHashcat-lite32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
-					;;
-				cudaHashcat-lite64.bin)
-					echo "echo '64 bit NVIDIA accelerated \"cudaHashcat-lite64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
-					;;
-				cudaHashcat-lite32.bin)
-					echo "echo '32 bit NVIDIA accelerated \"cudaHashcat-lite32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
-					;;
-			esac
-
-			fperms +x /opt/${PN}/${x}
-
-			cat <<-EOF > "${ED}"/opt/bin/${x}
-				#! /bin/sh
-				cd /opt/${PN}
-				echo "Warning: ${x} is running from /opt/${PN} so be careful of relative paths."
-				exec ./${x} "\$@"
-			EOF
-
-			fperms +x /opt/bin/${x}
-
-		fi
-	done
-
-	fperms +x /opt/bin/oclhashcat-lite
-	fowners root:video /opt/${PN}
-	einfo "oclhashcat-lite can be run as user if you are in the video group"
-}
--- a/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.13.ebuild
+++ b/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.13.ebuild
@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-lite-bin/oclhashcat-lite-bin-0.13.ebuild,v 1.1 2012/12/31 21:28:01 zerochaos Exp $
-
-EAPI=4
-
-inherit eutils pax-utils
-
-DESCRIPTION="An opencl hash cracker"
-HOMEPAGE="http://hashcat.net/oclhashcat-lite/"
-MY_P="oclHashcat-lite-${PV}"
-SRC_URI="http://hashcat.net/files/${MY_P}.7z"
-
-#license applies to this version per http://hashcat.net/forum/thread-1348.html
-LICENSE="hashcat"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_fglrx
-	video_cards_nvidia"
-
-IUSE="${IUSE_VIDEO_CARDS}"
-
-RDEPEND="sys-libs/zlib
-	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-304.51 )
-	video_cards_fglrx?  ( =x11-drivers/ati-drivers-12.8 )"
-DEPEND="${RDEPEND}
-	app-arch/p7zip"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="strip"
-QA_PREBUILT="*Hashcat-lite*.bin"
-
-src_install() {
-	dodoc docs/*
-	rm -rf *.exe docs || die
-	if use x86; then
-		rm oclHashcat-lite64.bin || die
-		rm cudaHashcat-lite64.bin || die
-	fi
-	if use amd64; then
-		rm oclHashcat-lite32.bin || die
-		rm cudaHashcat-lite32.bin || die
-	fi
-	if ! use video_cards_fglrx; then
-		rm -r kernels/4098 || die
-		rm oclHashcat-lite*.bin || die
-	fi
-	if ! use video_cards_nvidia; then
-		rm -r kernels/4318 || die
-		rm cudaHashcat-lite*.bin || die
-	fi
-
-	#I assume this is needed but I didn't check
-	pax-mark m *Hashcat-lite*.bin
-
-	insinto /opt/${PN}
-	doins -r "${S}"/*
-
-	dodir /opt/bin
-
-	cat <<-EOF > "${ED}"/opt/bin/oclhashcat-lite
-		#! /bin/sh
-		echo "oclHashcat-lite and all related files have been installed in /opt/${PN}"
-		echo "Please run one of the following binaries to use gpu accelerated hashcat:"
-	EOF
-
-	for x in oclHashcat-lite64.bin oclHashcat-lite32.bin cudaHashcat-lite64.bin cudaHashcat-lite32.bin
-	do
-		if [ -f "${ED}"/opt/${PN}/${x} ]
-		then
-			case "${x}" in
-				oclHashcat-lite64.bin)
-					echo "echo '64 bit ATI accelerated \"oclHashcat-lite64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
-					;;
-				oclHashcat-lite32.bin)
-					echo "echo '32 bit ATI accelerated \"oclHashcat-lite32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
-					;;
-				cudaHashcat-lite64.bin)
-					echo "echo '64 bit NVIDIA accelerated \"cudaHashcat-lite64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
-					;;
-				cudaHashcat-lite32.bin)
-					echo "echo '32 bit NVIDIA accelerated \"cudaHashcat-lite32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-lite
-					;;
-			esac
-
-			fperms +x /opt/${PN}/${x}
-
-			cat <<-EOF > "${ED}"/opt/bin/${x}
-				#! /bin/sh
-				cd /opt/${PN}
-				echo "Warning: ${x} is running from /opt/${PN} so be careful of relative paths."
-				exec ./${x} "\$@"
-			EOF
-
-			fperms +x /opt/bin/${x}
-
-		fi
-	done
-
-	fperms +x /opt/bin/oclhashcat-lite
-	fowners root:video /opt/${PN}
-	einfo "oclhashcat-lite can be run as user if you are in the video group"
-}
--- a/app-crypt/oclhashcat-plus-bin/Manifest
+++ b/app-crypt/oclhashcat-plus-bin/Manifest
@ -1,5 +1 @@
-DIST oclHashcat-plus-0.081-32.7z 19358773 SHA256 2b293e19dc87e969eea4e1b75055b791d4855d6066858fd1075494ba44179aca SHA512 30dde0691f4ac5fa9fc55f2e79f334e5d6aeea6a7e99da89b53b824df34395f7024df7b53eedfb600306f9e484deeb932c8ba9357f9a7cf07e414632f71b77f8 WHIRLPOOL eea0cbb98b4ee2030966310e260817cef253ace7d62f77f3bcbacbd2cd8458e34fc4183e5495a473d31a30f5b1ff3c0c157629b351498977874bf65a4e2df1be
-DIST oclHashcat-plus-0.081-64.7z 22259753 SHA256 5390a8a3c6b8887536e936c918ca2cfeba6b971e4cd9a57dca36a3cfa5e83684 SHA512 650e75eec5d1b20fe13469097f707b667c422c5595793af4675ae860c6338aad98f809fec15dd44a53bae92a3763008632e0f618f181036ac2d70440f43d1e1d WHIRLPOOL 224764c6ccd204ea0f432c611a9076908d13bfb524caf16c0c861f2c308521f9483d22a6863d24273079b045a79c0431b1c5543b315838c7a5f11d3a264e8cb6
-DIST oclHashcat-plus-0.09.7z 16556469 SHA256 8cb00584d43adf189116bf689a26740d421d0a541f3543855b3d0bf001f618a7 SHA512 0de76421b9d52027312c71b48c20d64e27deeee481a2859c5eb2af370cf3032cfd378e9aeed2c6cf19da7cc1adf1244cefde51b60aa885a66028d743f7d64a00 WHIRLPOOL 84dda3c0953593a2cfb1920909038ae320da305ff8e48294c008ef9328247bf38e56b16d197743dac063ceb2e536ed6d502a36e0ca6e666cdd32b514883e36a1
-DIST oclHashcat-plus-0.12.7z 18713143 SHA256 8b02548e0d6e97c59bafdeabdb411b84eef581a00a131bf89238a9560bafc8fa SHA512 c2d8225f4c4bd546824823040b31aba66bd73539dd26a9f0fd695f0bf7078610f0970cbcfe3d25df133fdbf6365311c2b233fb1779da56e4756646b9b864a2b2 WHIRLPOOL 27d96e5eadc10de4fcd4ee98a93449a34e132563f79dc0c9cefa8281e85c246b3cba519942e3c76b2a1b37cafa8ca977c7f62783953f34a3d1f05b99c633d2aa
 DIST oclHashcat-plus-0.13.7z 22397251 SHA256 374e612979a9e10ecf01d2f2a892f8f0af00ca8cfcfbcba5e6e36eb2aae27228 SHA512 3e259ad7abb1a42b1bed30de2ccc1d3f81d0ce420b27e4969332abbbe460287e3b3420c253cc7a82e060daa7411464927edb4f084e8e671ae60553c234f097de WHIRLPOOL 075f6eab5b03e24964ce4793435189bd950678f12276cd45f49e12f57b6d638c1d6acdb91d2d8397963de5a83b44383103c41438ac21a67d6e51d4c68149d399
--- a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.ebuild
+++ b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.ebuild
@ -1,112 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.081.ebuild,v 1.3 2012/07/04 17:51:22 zerochaos Exp $
-
-EAPI=4
-
-inherit eutils pax-utils
-
-DESCRIPTION="An opencl multihash cracker"
-HOMEPAGE="http://hashcat.net/oclhashcat-plus/"
-
-MY_P="oclHashcat-plus-${PV}"
-SRC_URI="amd64? ( http://hashcat.net/files/${MY_P}-64.7z ) \
-	 x86? ( http://hashcat.net/files/${MY_P}-32.7z )"
-
-LICENSE="hashcat"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_fglrx
-	video_cards_nvidia"
-
-IUSE="${IUSE_VIDEO_CARDS}"
-
-RDEPEND="sys-libs/zlib
-	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.40 )
-	video_cards_fglrx?  ( >=x11-drivers/ati-drivers-12.4 )"
-DEPEND="${RDEPEND}
-	app-arch/p7zip"
-
-#S="${WORKDIR}/${MY_P}"
-#temporary hack needed due to 0.81 patch release
-S="${WORKDIR}/oclHashcat-plus-0.08"
-
-RESTRICT="strip"
-QA_PREBUILT="*Hashcat-plus*.bin"
-
-src_install() {
-	dodoc docs/*
-	rm -r *.exe docs || die
-	#patches already in aircrack-ng
-	rm -r contrib/aircrack-ng_r1959 || die
-
-	#the current release (0.08) seperates 64bit from 32 bit, will he stay with this?
-	#if ! use amd64; then
-	#	rm oclHashcat-plus64.bin || die
-	#	rm cudaHashcat-plus64.bin || die
-	#	rm kernels/4098/*64* kernels/4318/*64* || die
-	#fi
-	#if ! use x86; then
-	#	rm oclHashcat-plus32.bin || die
-	#	rm cudaHashcat-plus32.bin || die
-	#	rm kernels/4098/*32* kernels/4318/*32* || die
-	#fi
-	if ! use video_cards_fglrx; then
-		rm -r kernels/4098 || die
-		rm oclHashcat-plus*.bin || die
-	fi
-	if ! use video_cards_nvidia; then
-		rm -r kernels/4318 || die
-		rm cudaHashcat-plus*.bin || die
-	fi
-	pax-mark m *Hashcat-plus*.bin
-
-	insinto /opt/${PN}
-	doins -r "${S}"/* || die "Copy files failed"
-
-	dodir /opt/bin
-
-	cat <<-EOF > "${ED}"/opt/bin/oclhashcat-plus
-		#! /bin/sh
-		echo "oclHashcat-plus and all related files have been installed in /opt/${PN}"
-		echo "Please run one of the following binaries to use gpu accelerated hashcat:"
-	EOF
-
-	for x in oclHashcat-plus64.bin oclHashcat-plus32.bin cudaHashcat-plus64.bin cudaHashcat-plus32.bin
-	do
-		if [ -f "${ED}"/opt/${PN}/${x} ]
-		then
-			case "${x}" in
-				oclHashcat-plus64.bin)
-					echo "echo '64 bit ATI accelerated \"oclHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
-					;;
-				oclHashcat-plus32.bin)
-					echo "echo '32 bit ATI accelerated \"oclHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
-					;;
-				cudaHashcat-plus64.bin)
-					echo "echo '64 bit NVIDIA accelerated \"cudaHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
-					;;
-				cudaHashcat-plus32.bin)
-					echo "echo '32 bit NVIDIA accelerated \"cudaHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
-					;;
-			esac
-
-			fperms +x /opt/${PN}/${x}
-
-			cat <<-EOF > "${ED}"/opt/bin/${x}
-				#! /bin/sh
-				cd /opt/${PN}
-				echo "Warning: ${x} is running from /opt/${PN} so be careful of relative paths."
-				exec ./${x} "\$@"
-			EOF
-
-			fperms +x /opt/bin/${x}
-
-		fi
-	done
-
-	fperms +x /opt/bin/oclhashcat-plus
-	fowners root:video /opt/${PN}
-	einfo "oclhashcat-plus can be run as user if you are in the video group"
-}
--- a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.09.ebuild
+++ b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.09.ebuild
@ -1,96 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.09.ebuild,v 1.2 2012/10/30 16:30:44 zerochaos Exp $
-
-EAPI=4
-
-inherit eutils pax-utils
-
-DESCRIPTION="An opencl multihash cracker"
-HOMEPAGE="http://hashcat.net/oclhashcat-plus/"
-
-MY_P="oclHashcat-plus-${PV}"
-SRC_URI="http://hashcat.net/files/${MY_P}.7z"
-
-LICENSE="hashcat"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_fglrx
-	video_cards_nvidia"
-
-IUSE="${IUSE_VIDEO_CARDS}"
-
-RDEPEND="sys-libs/zlib
-	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-304.32 )
-	video_cards_fglrx?  ( >=x11-drivers/ati-drivers-12.8 )"
-DEPEND="${RDEPEND}
-	app-arch/p7zip"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="strip"
-QA_PREBUILT="*Hashcat-plus*.bin"
-
-src_install() {
-	dodoc docs/*
-	rm -r *.exe docs || die
-
-	if ! use video_cards_fglrx; then
-		rm -r kernels/4098 || die
-		rm oclHashcat-plus*.bin || die
-	fi
-	if ! use video_cards_nvidia; then
-		rm -r kernels/4318 || die
-		rm cudaHashcat-plus*.bin || die
-	fi
-	pax-mark m *Hashcat-plus*.bin
-
-	insinto /opt/${PN}
-	doins -r "${S}"/* || die "Copy files failed"
-
-	dodir /opt/bin
-
-	cat <<-EOF > "${ED}"/opt/bin/oclhashcat-plus
-		#! /bin/sh
-		echo "oclHashcat-plus and all related files have been installed in /opt/${PN}"
-		echo "Please run one of the following binaries to use gpu accelerated hashcat:"
-	EOF
-
-	for x in oclHashcat-plus64.bin oclHashcat-plus32.bin cudaHashcat-plus64.bin cudaHashcat-plus32.bin
-	do
-		if [ -f "${ED}"/opt/${PN}/${x} ]
-		then
-			case "${x}" in
-				oclHashcat-plus64.bin)
-					echo "echo '64 bit ATI accelerated \"oclHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
-					;;
-				oclHashcat-plus32.bin)
-					echo "echo '32 bit ATI accelerated \"oclHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
-					;;
-				cudaHashcat-plus64.bin)
-					echo "echo '64 bit NVIDIA accelerated \"cudaHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
-					;;
-				cudaHashcat-plus32.bin)
-					echo "echo '32 bit NVIDIA accelerated \"cudaHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
-					;;
-			esac
-
-			fperms +x /opt/${PN}/${x}
-
-			cat <<-EOF > "${ED}"/opt/bin/${x}
-				#! /bin/sh
-				cd /opt/${PN}
-				echo "Warning: ${x} is running from /opt/${PN} so be careful of relative paths."
-				exec ./${x} "\$@"
-			EOF
-
-			fperms +x /opt/bin/${x}
-
-		fi
-	done
-
-	fperms +x /opt/bin/oclhashcat-plus
-	fowners root:video /opt/${PN}
-	einfo "oclhashcat-plus can be run as user if you are in the video group"
-}
--- a/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.12.ebuild
+++ b/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.12.ebuild
@ -1,98 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/oclhashcat-plus-bin/oclhashcat-plus-bin-0.12.ebuild,v 1.1 2012/12/31 21:20:04 zerochaos Exp $
-
-EAPI=4
-
-inherit eutils pax-utils
-
-DESCRIPTION="An opencl multihash cracker"
-HOMEPAGE="http://hashcat.net/oclhashcat-plus/"
-
-MY_P="oclHashcat-plus-${PV}"
-SRC_URI="http://hashcat.net/files/${MY_P}.7z"
-
-LICENSE="hashcat"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_fglrx
-	video_cards_nvidia"
-
-IUSE="${IUSE_VIDEO_CARDS}"
-
-RDEPEND="sys-libs/zlib
-	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-304.51 )
-	video_cards_fglrx?  ( =x11-drivers/ati-drivers-12.8 )"
-DEPEND="${RDEPEND}
-	app-arch/p7zip"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="strip"
-QA_PREBUILT="*Hashcat-plus*.bin"
-
-src_install() {
-	dodoc docs/*
-	rm -r *.exe docs || die
-	use x86 && rm *Hashcat-plus64*
-	use amd64 && rm *Hashcat-plus32*
-
-	if ! use video_cards_fglrx; then
-		rm -r kernels/4098 || die
-		rm oclHashcat-plus*.bin || die
-	fi
-	if ! use video_cards_nvidia; then
-		rm -r kernels/4318 || die
-		rm cudaHashcat-plus*.bin || die
-	fi
-	pax-mark m *Hashcat-plus*.bin
-
-	insinto /opt/${PN}
-	doins -r "${S}"/* || die "Copy files failed"
-
-	dodir /opt/bin
-
-	cat <<-EOF > "${ED}"/opt/bin/oclhashcat-plus
-		#! /bin/sh
-		echo "oclHashcat-plus and all related files have been installed in /opt/${PN}"
-		echo "Please run one of the following binaries to use gpu accelerated hashcat:"
-	EOF
-
-	for x in oclHashcat-plus64.bin oclHashcat-plus32.bin cudaHashcat-plus64.bin cudaHashcat-plus32.bin
-	do
-		if [ -f "${ED}"/opt/${PN}/${x} ]
-		then
-			case "${x}" in
-				oclHashcat-plus64.bin)
-					echo "echo '64 bit ATI accelerated \"oclHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
-					;;
-				oclHashcat-plus32.bin)
-					echo "echo '32 bit ATI accelerated \"oclHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
-					;;
-				cudaHashcat-plus64.bin)
-					echo "echo '64 bit NVIDIA accelerated \"cudaHashcat-plus64.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
-					;;
-				cudaHashcat-plus32.bin)
-					echo "echo '32 bit NVIDIA accelerated \"cudaHashcat-plus32.bin\"'" >> "${ED}"/opt/bin/oclhashcat-plus
-					;;
-			esac
-
-			fperms +x /opt/${PN}/${x}
-
-			cat <<-EOF > "${ED}"/opt/bin/${x}
-				#! /bin/sh
-				cd /opt/${PN}
-				echo "Warning: ${x} is running from /opt/${PN} so be careful of relative paths."
-				exec ./${x} "\$@"
-			EOF
-
-			fperms +x /opt/bin/${x}
-
-		fi
-	done
-
-	fperms +x /opt/bin/oclhashcat-plus
-	fowners root:video /opt/${PN}
-	einfo "oclhashcat-plus can be run as user if you are in the video group"
-}
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@ -9,6 +9,5 @@ DIST emacs-23.4-patches-8.tar.bz2 4742 SHA256 ec48d5186aa31240d5740a02949f5ac536
 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
 DIST emacs-24.2-patches-3.tar.xz 3884 SHA256 cf2de3291f8dd09c8073300e2395182d51761055c67818a390cd7b052e764f44 SHA512 c424580bc9b93af3b99e5fcf0189a711314857019594ea90c42317f72cedf552bb3af93ce8394dd4af888d98395ff09a372535b7b58b98b8831adf165919e561 WHIRLPOOL 2eeb7a6b441626584ae2b9fd9eba231ef8b87e7ce017f703f8fe23b2cf2cb8e251dfb041c7affe73484d20916ea3fa341b583b23ffdf59948f66121a2613f63b
 DIST emacs-24.2.tar.xz 34712012 SHA256 1f11b65520611d108eceea886cc1d2573704e18b19aded8a09b75fdea7eb0ddd SHA512 7627d985e9691dd5b5f2a14472592bc1da96ce90823ff50457bb5c20b6e746912b319befff5fb1dac024e1f150df6b7c687ee2cc785f5b7387885244f511bdbd WHIRLPOOL 37a2f8e45a7b3364728f9f99b0661a60355b93f19d745de505dc71b9d8a2ab4de6b4b75a104830da2bcc8d1b3d22539e5f52c85d2f104d8de0dcd0dd69dc9924
-DIST emacs-24.3-rc2.tar.xz 35575280 SHA256 9745142a0f3f0a6ead93ba8ad529e862f74f94672b32b38bee526c736b4bcf01 SHA512 b39c8b233569937e0414368fe46ee6312d50eb09fce2e2890d3b3d70c1e7d9914c80c1e0166d4876fc41c9e4188ebc73d1a8cdd6e75398aab7ee1281c693fd35 WHIRLPOOL fde5decf6239911d271d730cf37cdb287c6c135ff2f0a71f8a0f5478d4953244dac2e05cd42b69425542114473354e5f16b65f8fdf53c866b6cb287415375f58
-DIST emacs-24.3-rc3.tar.xz 35587524 SHA256 0e023fd1c485b443862a67da64a3eb461c41d984e01ccbe9c6dd4acecbf71463 SHA512 99aed34dd91c0ade6326d35618f2914b1b982c5852be5db208064471eaf4e304e2f5b1cf7ccbc4369001b3814a29b49fbe676cc19d7a18e037ad531995a4a91a WHIRLPOOL e4e39f37776e0f081823f860f16769106188d6b5036e8a24d40adf0f6a286f681e0d71158ef67ca6a632829f2a4d2d1991f76fe20c6cb0e3d8eb2fbfd520c37f
+DIST emacs-24.3.tar.xz 35565352 SHA256 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d SHA512 a1300fa10a9fba2db9735db3d01382bcda89ceec033976c4622796dfdf6d2748ed5fa73edf229182b368190c8acbf706810dd5f344542d2c0d294154bc2d0ca9 WHIRLPOOL 687ad4c7d69b41884bf28269bdea1808e03cdcec5a5218d0bac23c07cca3ced341ef98b4d5892149e2dbe899774a5e60edde9931d6c0fe41687995f530fb61d8
 DIST leim-21.4.tar.gz 3291433 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b SHA512 c361996f7a3fcc550e7af30a7df3f692071ded2c9dce998e72f537b0e8011f319cfae1742d0be463608a86852046cba23037a29c3ecdcbaf5976807e1d1a1e2c WHIRLPOOL d7f25d5d491f323b80609567ce5cbcb5f20109cdd4671e9972c79279a3ca5338bbf67d35ae8f0bc627bc06917f545d71ab1f66a09c647f47ddaea26772bfc5c1
--- a/app-editors/emacs/emacs-23.4-r5.ebuild
+++ b/app-editors/emacs/emacs-23.4-r5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r5.ebuild,v 1.13 2013/03/10 16:22:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r5.ebuild,v 1.14 2013/03/11 08:27:34 ulm Exp $

 EAPI=4
 WANT_AUTOMAKE="none"
@ -283,8 +283,8 @@ src_install () {
 		See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml
 		for how to enable anti-aliased fonts."
 	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		${EPREFIX}/Applications/Gentoo. You may want to copy or symlink it
-		into /Applications by yourself."
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
 	readme.gentoo_create_doc
 }

--- a/app-editors/emacs/emacs-24.3_rc2.ebuild
+++ b/app-editors/emacs/emacs-24.3_rc2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3_rc2.ebuild,v 1.1 2013/03/07 15:22:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3.ebuild,v 1.1 2013/03/11 08:27:34 ulm Exp $

 EAPI=5

@ -8,7 +8,7 @@ inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo

 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu-alpha/emacs/pretest/${P/_/-}.tar.xz"
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz"

 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
@ -287,8 +287,8 @@ src_install () {
 		See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml
 		for how to enable anti-aliased fonts."
 	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		${EPREFIX}/Applications/Gentoo. You may want to copy or symlink it
-		into /Applications by yourself."
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
 	readme.gentoo_create_doc
 }

--- a/app-editors/emacs/emacs-24.3_rc3.ebuild
+++ b/app-editors/emacs/emacs-24.3_rc3.ebuild
@ -1,334 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3_rc3.ebuild,v 1.1 2013/03/08 19:33:37 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu-alpha/emacs/pretest/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	>=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	alsa? ( media-libs/alsa-lib )
-	gpm? ( sys-libs/gpm )
-	dbus? ( sys-apps/dbus )
-	gnutls? ( net-libs/gnutls )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg )
-		png? ( >=media-libs/libpng-1.4:0 )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			Xaw3d? ( x11-libs/libXaw3d )
-			!Xaw3d? (
-				athena? ( x11-libs/libXaw )
-				!athena? ( motif? ( >=x11-libs/motif-2.3:0 ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	alsa? ( virtual/pkgconfig )
-	dbus? ( virtual/pkgconfig )
-	gnutls? ( virtual/pkgconfig )
-	libxml2? ( virtual/pkgconfig )
-	X? ( virtual/pkgconfig )
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/paxctl )"
-
-RDEPEND="${RDEPEND}
-	!<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-	#EPATCH_SUFFIX=patch epatch
-	epatch_user
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.ac \
-			|| die "unable to sed configure.ac"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "/AC_PATH_PROG/s/gzip/PrEvEnTcOmPrEsSiOn/" configure.ac \
-			|| die "unable to sed configure.ac"
-	fi
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		myconf+=" --with-sound"
-	else
-		myconf+=" $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			local f
-			for f in athena Xaw3d motif; do
-				use ${f} && ewarn "USE flag \"${f}\" ignored" \
-					"(superseded by \"gtk\")"
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-			use motif && ewarn "USE flag \"motif\" ignored" \
-				"(superseded by \"athena\" or \"Xaw3d\")"
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Cocoa support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
-	# According to configure, this option is only used for GNU/Linux
-	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
-	# out the location because $(get_libdir) does not necessarily return
-	# something that matches the host OS's libdir naming (e.g. RHEL).
-	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
-	crtdir=${crtdir%/*}
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--program-transform-name="s/emacs-[0-9].*/${EMACS_SUFFIX}/" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-crt-dir="${crtdir}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-info \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with gpm) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	# move man pages to the correct place
-	local m
-	for m in "${ED}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
-	done
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	local c=";;"
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-		c=""
-	fi
-
-	sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	X  ${c}(setq find-function-C-source-directory
-	X  ${c}      "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		${EPREFIX}/Applications/Gentoo. You may want to copy or symlink it
-		into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@ -1,2 +1,3 @@
 DIST scite323.tgz 2053250 SHA256 d0d324a5e420ff96db6cd1c6eeac23b6f4c046e7545e73c4625ab2add90e4a65 SHA512 70125c33a8bcb68d428a6f006d1043a9398ce34ef11f2287ebdcd84bab132c515d176ec247c2c0d3321b2f8cfa9f4a01c67526f48d2ae1d00d6d3429e2616990 WHIRLPOOL 5f260a7b11869dd41047fab3dbeebc8bbd0b7cb70d6129efb28459648ad42b1d99895ac9b5baf239a0d684c3a3205fbe6190213b72da66ec3daf150d4e082c67
 DIST scite324.tgz 1956084 SHA256 bd20b97513aee8e4584253d6ca31ec658bd4f098ceefb354889eb8a498cb5c08 SHA512 974d8609e663808b1f7bcb290f97ac4fbb61cc13c9328dd357960c637b50326fb7d75de6e19fe53cdfe4df5f5fb41c8a9dd23494715b43e4b56834aaae67b485 WHIRLPOOL 46950463738ae3098da594476d101f28941b26127fcd140c0879b48ffbe73f2f5bcc3750fa301ee5d40c9e7c46e5868fb2f1377a6485c2dd4b9c2fd7f5a4d8fd
+DIST scite325.tgz 1974782 SHA256 ac3ca9588bb23ef21da2e22f6ef21416bbd7bf6957130a8e4057b3e5f3c58bef SHA512 2ebd98a2ae064630d4b784d9be91f2727e17d95deac6ef3e096c1df86540546aee174d770e14efe10f1cb4d1c11e68d98bec47ad108219a781dd01bcf0137716 WHIRLPOOL dcfbc7839d3fc3aba0c05868e417a95fd8d264e38c4a81cc2e5c613b284758ea04c41511c0b99890f4d40b6d1f6d2af046a545c3ff53f9c99e49a85949795619
--- a/app-editors/scite/scite-3.2.5.ebuild
+++ b/app-editors/scite/scite-3.2.5.ebuild
@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.2.5.ebuild,v 1.1 2013/03/11 13:01:34 ago Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs eutils
+
+MY_PV=${PV//./}
+DESCRIPTION="A very powerful editor for programmers"
+HOMEPAGE="http://www.scintilla.org/SciTE.html"
+SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
+
+LICENSE="HPND lua? ( MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="lua"
+
+RDEPEND="dev-libs/glib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	lua? ( >=dev-lang/lua-5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-apps/sed-4"
+
+S="${WORKDIR}/${PN}/gtk"
+
+src_prepare() {
+	cd "${WORKDIR}/scintilla/gtk"
+	sed -i makefile \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
+		-e "s#-Os##" \
+		|| die "error patching makefile"
+
+	cd "${WORKDIR}/scite/gtk"
+	sed -i makefile \
+		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
+		|| die "error patching makefile"
+
+	cd "${S}"
+	sed -i makefile \
+		-e 's#usr/local#usr#g' \
+		-e 's#/gnome/apps/Applications#/applications#' \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
+		-e 's#${D}##' \
+		-e 's#-g root#-g 0#' \
+		-e "s#-Os##" \
+		|| die "error patching makefile"
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}-3.0.1-no-lua.patch"
+}
+
+src_compile() {
+	emake -C ../../scintilla/gtk AR="$(tc-getAR)"
+	if use lua; then
+		emake
+	else
+		emake NO_LUA=1
+	fi
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/{pixmaps,applications}
+
+	emake prefix="${ED}/usr" install
+
+	# we have to keep this because otherwise it'll break upgrading
+	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
+	dosym /usr/bin/scite /usr/bin/SciTE
+
+	# replace .desktop file with our own working version
+	rm -f "${ED}/usr/share/applications/SciTE.desktop"
+	domenu "${FILESDIR}/scite.desktop"
+
+	doman ../doc/scite.1
+	dodoc ../README
+}
--- a/app-office/calcurse/Manifest
+++ b/app-office/calcurse/Manifest
@ -1,3 +1,4 @@
 DIST calcurse-3.1.1.tar.gz 678208 SHA256 0bc2cbe1eb33d61589b04e9d991572e4934f843660a14c64bd3be06f865d006d SHA512 c90973ddc3ef2707b43800d3b272ee652bc8289d8b68d9e516df92d4a2c70b9035fda8ced558c245da923670bf064217ad2b95edeb202229ee2350a11af8d24e WHIRLPOOL e7b02b721312c6173dd8f510eb71cdf35e183c915fee1b0de2c5af82119bf77c91e8ead0a1e53803a2abe7960865279077e8e6783c64e7bc9cc7db6be4f8e2c6
 DIST calcurse-3.1.2.tar.gz 678379 SHA256 47da7fc65ab122c6f989188f62eda473c7367b13b99693dc6de5fa5ea6f2a76e SHA512 5a1630e59ff62affd43ecc030a4753cda0977c209c2686bd2f7776c7956848f3709eb14ce0b2af56200dbca9631d263a39730f528d06b9cd160a2270ea6d031c WHIRLPOOL 3ea777870ecb7c44f698bb427486d48e241bc79a6dac2ab52498e07a4c1bd08ba694b3f665245181d00bc3caa9cd6ff9e9a84671c480f445366bfc92ac6e65f8
 DIST calcurse-3.1.3.tar.gz 686770 SHA256 32bb99ef67a522ce8a164cd151bca620ebf6ebb1ffce9afa013a518dc5ccc0db SHA512 6ffa62eb1f0899f1ac2cf6fbe59130fdd30b8cf8dd1cbea5d54b5d973cdc006f9fa87894068eaaea6ba2abdde0b8f3037005d2bff088d673ba74cf14acea3050 WHIRLPOOL c49698b375fcc902f3a43d391a2c055b90327c5ddc42fc39efe80397b3c7251b0fd13d07678532a85d34c7c33109f317cab4d06ed41d8e4c546a3d7876c66e51
+DIST calcurse-3.1.4.tar.gz 684526 SHA256 4121b3b14ded3583af7613a99646332701ee2ccc8cf2b87397eb3c07b97390e3 SHA512 efdb655f96a176ca45a23a6246987735413a69046e5273efafffd5d2087f880969f84e387dd84672dacc8fae670a86ee7b132f6a4662e072ba92121492fd7ca7 WHIRLPOOL cc0802f6128068419de98524fcd984cf3213ca7f7f2cc003b122c808aed858230a87f387682368379329d0205bb42a55d232e5cf82f639535ffdda8ab51d9fa7
--- a/app-office/calcurse/calcurse-3.1.4.ebuild
+++ b/app-office/calcurse/calcurse-3.1.4.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calcurse/calcurse-3.1.4.ebuild,v 1.2 2013/03/11 12:57:08 jer Exp $
+
+EAPI=5
+
+DESCRIPTION="a text-based calendar and scheduling application"
+HOMEPAGE="http://calcurse.org/"
+SRC_URI="http://calcurse.org/files/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+CC_LINGUAS=( de en es fr nl pt_BR ru )
+IUSE+=" ${CC_LINGUAS[@]/#/linguas_}"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README TODO )
--- a/app-office/lyx/lyx-2.0.5.1.ebuild
+++ b/app-office/lyx/lyx-2.0.5.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.5.1.ebuild,v 1.9 2013/03/02 19:36:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.5.1.ebuild,v 1.10 2013/03/11 17:49:04 ago Exp $

 EAPI=3

@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
 IUSE="cups debug nls +latex xetex luatex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"

 LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0.ebuild,v 1.2 2013/02/19 02:45:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.78.0.ebuild,v 1.4 2013/03/11 12:33:35 nimiux Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"

 RDEPEND=">=app-text/build-docbook-catalog-1.1
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@ -4,6 +4,5 @@ DIST 20121128-10gen-mms-agent.zip 31408 SHA256 be5314dcf2dbfe22b6acd6901fa7d436c
 DIST mongodb-src-r2.0.7.tar.gz 2982999 SHA256 b204d94bc912692bdc154402fbfc2e5c4bd60b09dcbe244f3b2b7657f0a82736 SHA512 4c92d99433388f6829e990f3a065b7d897c0ef83a8b41e99613b1b7fbccd8d1797a048c4340d6dafed956dcb06785ac9784a4b68990020c5052b11368ec98806 WHIRLPOOL 159952c811eae62cdb6b4ad577351a8f6537b8fae1b2d2ad5e4dbdf07e14944aebff765ee896f48ce53cbd7d53b6bb0fc2da470226488f2957b5c6e6df07f3e4
 DIST mongodb-src-r2.0.8.tar.gz 2983263 SHA256 882f0880609c9658793702af4da5183f49d85331600ae4d8997018367f4ae827 SHA512 f79ecc75bcf574886681b27198263cc9128ab6d865b71ae3a32ea366e9125f3c636fa45a7e94d8ee7acc04adb8da655f940da03e8a285d11d6b62b0c1cad23f5 WHIRLPOOL 21525830a69a8c734bdc39d979cd3abd3e7092ffa5b1e98392ca5e013e0bd7dd2e298792ba876e5c6098204fc73f35d5cf6186cb58e12f933de46fa903938c65
 DIST mongodb-src-r2.2.0.tar.gz 10150762 SHA256 084626e476ac747dfae143889c24a10f739cd54480af9bf253f50999f065608b SHA512 b040efe01457703d14d63f69b3fff79a09d6068a89b17d52ad7eb430f81d3f60fdba711cee628d55456a772d7e36fde7c683d4d71fa7d95225e436e28ccac163 WHIRLPOOL 43d12039aff75bdb12c41721ccf259b379245a655aba72472f2a973dad921d9a384f79356d6bfa9795b609f2011324b1e7100ff94b8b92f2834c40a3a9bbe653
-DIST mongodb-src-r2.2.1.tar.gz 10163588 SHA256 6ddc92c859c8d018bbdf5191c15e621dfe1505f71ddd039c26b20070f634a567 SHA512 d34182d397a34baeed02e8d50c46866bec7a70b1eedb7027c03eeb56f568dfe7fe0494aa83317acda305e8aed2dc118ff2c36dafcb8814bc4566ecafa83005e2 WHIRLPOOL ca22ad970114dce259ce95bfbb12a44244a1021888a43a142a4c94dd1fd8f2d64963845ff95eb1f45bb41fc3e75d25248133b47bcf1a0c241d2010eded0b6328
 DIST mongodb-src-r2.2.2.tar.gz 10171793 SHA256 e646abd0a9839dec11fa4f35089aad8e9aeef628bce7832ab40a3138c7462127 SHA512 004c321dc046ee59a3bdb2e672d6720d627b6a0d482afacf89b557846bc0600ac06623c94076fd41f62fc6d59660a8a80c5333d128e7482a9835e260f7238142 WHIRLPOOL 52f310acb1cbed1d296fbe3719c71c74cf3bf89ea1ad89bc8dbc6aafeafae3e719fdce479fcf5a9d95b29eaab2e6099111687ed748309a125c18dfb10782f20a
 DIST mongodb-src-r2.2.3.tar.gz 10178451 SHA256 dd292c73f8182eb201ae4dd4bd7132c79c56247a7bc4fcde9d09a5bc6c74978d SHA512 216bb448db731ff5b435edcc127ccd99ca6fc388d1814872915e3fb6584621263d1339d8bf4da8a37ae25911df3fc036fb0fb898998e0c37ec65f61d5e38d83a WHIRLPOOL ca9a78b8574e03ec40dc4a505f768c34af964435685768fb878d30827dcb6c4c6da32d13d705f6704febd299a5d0e03aa594a51ae6894b9bc14aad0134b8cf76
--- a/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch
+++ b/dev-db/mongodb/files/mongodb-2.2-fix-sharedclient.patch
@ -0,0 +1,34 @@
+diff -urN mongodb-src-r2.2.0.orig/src/SConscript.client mongodb-src-r2.2.0/src/SConscript.client
+--- mongodb-src-r2.2.0.orig/src/SConscript.client	2012-08-28 08:28:11.000000000 +0300
+++ mongodb-src-r2.2.0/src/SConscript.client	2013-03-08 10:32:46.776436389 +0200
+@@ -3,7 +3,7 @@
+ # This SConscript describes build and install rules for the Mongo C++ driver and associated exmaple
+ # programs.
+ 
+-Import('env clientEnv')
+Import('env clientEnv has_option')
+ 
+ clientSource = [
+     'mongo/bson/oid.cpp',
+@@ -96,9 +96,11 @@
+     clientHeaders.extend(Glob('mongo/%s/*.hpp' % path))
+ 
+ mongoclient_lib = env.Library('mongoclient', clientSource),
+if has_option( "sharedclient" ):
+    mongoclient_slib = env.SharedLibrary('mongoclient', clientSource)
+ mongoclient_install = env.Install('#/', [
+         mongoclient_lib,
+-        #env.SharedLibrary('mongoclient', clientSource),
+        mongoclient_slib,
+         ])
+ env.Alias('mongoclient', mongoclient_install)
+ 
+@@ -135,6 +137,8 @@
+ prefix = GetOption("prefix")
+ 
+ env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
+if has_option( "sharedclient" ):
+    env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
+ 
+ for x in clientHeaderDirectories:
+     env.Install(prefix + "/include/mongo/" + x,
--- a/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch
+++ b/dev-db/mongodb/files/mongodb-2.2-fix-x86client.patch
@ -1,13 +1,15 @@
-diff --git a/src/SConscript.client b/src/SConscript.client
-index 7a6bdc9..3fb55e5 100644
--- a/src/SConscript.client
-+++ b/src/SConscript.client
-@@ -134,7 +134,7 @@ env.Install(
+diff -urN mongodb-src-r2.2.0.orig/src/SConscript.client mongodb-src-r2.2.0/src/SConscript.client
+--- mongodb-src-r2.2.0.orig/src/SConscript.client	2013-03-08 10:32:46.000000000 +0200
+++ mongodb-src-r2.2.0/src/SConscript.client	2013-03-08 10:34:04.208437762 +0200
+@@ -136,9 +136,9 @@
 # install
 prefix = GetOption("prefix")
 
 -env.Install(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
 +env.InstallAs(prefix + "/lib", '${LIBPREFIX}mongoclient${LIBSUFFIX}')
+ if has_option( "sharedclient" ):
+-    env.Install(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
+    env.InstallAs(prefix + "/lib", '${SHLIBPREFIX}mongoclient${SHLIBSUFFIX}')
 
 for x in clientHeaderDirectories:
     env.Install(prefix + "/include/mongo/" + x,
--- a/dev-db/mongodb/mongodb-2.2.0-r1.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.0-r1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0-r1.ebuild,v 1.2 2012/11/22 03:45:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0-r1.ebuild,v 1.3 2013/03/11 10:12:04 ultrabug Exp $

 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@ -37,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb

-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
 	scons_opts+=" --use-system-tcmalloc"
 	scons_opts+=" --use-system-pcre"
 	scons_opts+=" --use-system-snappy"
@ -53,6 +53,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"

 	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
 	# on amd64 machines [2].
--- a/dev-db/mongodb/mongodb-2.2.0-r2.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.0-r2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0-r2.ebuild,v 1.2 2012/11/22 03:45:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.0-r2.ebuild,v 1.3 2013/03/11 10:12:04 ultrabug Exp $

 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@ -37,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb

-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
 	scons_opts+=" --use-system-tcmalloc"
 	scons_opts+=" --use-system-pcre"
 	scons_opts+=" --use-system-snappy"
@ -54,6 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"

 	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
 	# on amd64 machines [2].
--- a/dev-db/mongodb/mongodb-2.2.1.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.1.ebuild
@ -1,116 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.1.ebuild,v 1.2 2012/11/09 16:08:37 flameeyes Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils user versionator
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
-	mms-agent? ( http://dev.gentoo.org/~ultrabug/20120830-10gen-mms-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mms-agent static-libs v8"
-
-PDEPEND="mms-agent? ( dev-python/pymongo )"
-RDEPEND="
-	v8? ( dev-lang/v8 )
-	>=dev-libs/boost-1.50[threads(+)]
-	dev-libs/libpcre[cxx]
-	dev-util/google-perftools
-	net-libs/libpcap
-	app-arch/snappy"
-DEPEND="${RDEPEND}
-	sys-libs/readline
-	sys-libs/ncurses"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-boost"
-
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
-	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
-
-	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
-	# on amd64 machines [2].
-	# [1] https://jira.mongodb.org/browse/SERVER-5575
-	# [2] https://bugs.gentoo.org/show_bug.cgi?id=434664
-	if use !prefix && [[ "$(get_libdir)" == "lib" ]]; then
-		epatch "${FILESDIR}/${PN}-2.2-fix-x86client.patch"
-	fi
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || rm "${ED}/usr/$(get_libdir)/libmongoclient.a"
-
-	use v8 && pax-mark m "${ED}"/usr/bin/{mongo,mongod}
-
-	for x in /var/{lib,log,run}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 1.8 ]]; then
-		ewarn "You just upgraded from a previous version of mongodb !"
-		ewarn "Make sure you run 'mongod --upgrade' before using this version."
-	fi
-	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
-}
--- a/dev-db/mongodb/mongodb-2.2.2-r2.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.2-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.2-r1.ebuild,v 1.1 2013/01/18 11:19:27 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.2-r2.ebuild,v 1.1 2013/03/11 10:12:04 ultrabug Exp $

 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@ -37,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb

-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
 	scons_opts+=" --use-system-tcmalloc"
 	scons_opts+=" --use-system-pcre"
 	scons_opts+=" --use-system-snappy"
@ -54,6 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"

 	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
 	# on amd64 machines [2].
--- a/dev-db/mongodb/mongodb-2.2.3-r1.ebuild
+++ b/dev-db/mongodb/mongodb-2.2.3-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.3.ebuild,v 1.1 2013/02/02 19:04:05 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.3-r1.ebuild,v 1.1 2013/03/11 10:12:04 ultrabug Exp $

 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@ -37,7 +37,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb

-	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts="  --cc=$(tc-getCC) --cxx=$(tc-getCXX) --sharedclient"
 	scons_opts+=" --use-system-tcmalloc"
 	scons_opts+=" --use-system-pcre"
 	scons_opts+=" --use-system-snappy"
@ -54,6 +54,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
 	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
+	epatch "${FILESDIR}/${PN}-2.2-fix-sharedclient.patch"

 	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
 	# on amd64 machines [2].
--- a/dev-dotnet/gio-sharp/metadata.xml
+++ b/dev-dotnet/gio-sharp/metadata.xml
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
-  <maintainer>
-    <email>ssuominen@gentoo.org</email>
-    <name>Samuli Suominen</name>
-  </maintainer>
+<herd>dotnet</herd>
 </pkgmetadata>
--- a/dev-dotnet/gkeyfile-sharp/metadata.xml
+++ b/dev-dotnet/gkeyfile-sharp/metadata.xml
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
-  <maintainer>
-    <email>ssuominen@gentoo.org</email>
-    <name>Samuli Suominen</name>
-  </maintainer>
+<herd>dotnet</herd>
 </pkgmetadata>
--- a/dev-dotnet/gtk-sharp-beans/metadata.xml
+++ b/dev-dotnet/gtk-sharp-beans/metadata.xml
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
-  <maintainer>
-    <email>ssuominen@gentoo.org</email>
-    <name>Samuli Suominen</name>
-  </maintainer>
+<herd>dotnet</herd>
 </pkgmetadata>
--- a/dev-dotnet/gudev-sharp/metadata.xml
+++ b/dev-dotnet/gudev-sharp/metadata.xml
@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>dotnet</herd>
-  <maintainer>
-    <email>ssuominen@gentoo.org</email>
-    <name>Samuli Suominen</name>
-  </maintainer>
+<herd>dotnet</herd>
 </pkgmetadata>
--- a/dev-games/vamos/Manifest
+++ b/dev-games/vamos/Manifest
@ -1,2 +1 @@
-DIST vamos-0.7.0.tar.gz 1648589 SHA256 ee4d6bf92c1769ed1cf47cb000316df02815dc866f91e22450d1a008f65d6af9 SHA512 9f64b08583aed69dd49f4d63cf5f8fa078bcb28895d20b5d420dc211a00fca4a26ee4bb6de2849334a80daa0e3ff8c576fe1407da3b772692c06f31de75b8026 WHIRLPOOL 22eb63a339db00dfedc62474de4c3ee46beeeea28a6ee88927dd9a511894ed2a097a102ee9e962229a3edcfaa45e30cf2dffb3e1f9d2e56c73856a60044454d5
 DIST vamos-0.7.1.tar.gz 1681074 SHA256 c81930b5ea376431c0abf868bf23153440eb6c44c1c47e3d9a53a5a15ab35824 SHA512 7560911e12636a4c530b6eeedc942be7121e39312d58f736a72d3b7fa2f632c962e9ccf714709f8f2e4335fa6d718f6870e7ba9e0c84f55c572e7915b4bf03e2 WHIRLPOOL 925b0038ae1638d270f54b7fee81526589bb4e2a67817834d17678063d2587da753d4e75237d610c4c111fabb1fcdb6b6e42417893f78245cd5f04100d7ada09
--- a/dev-games/vamos/files/vamos-0.7.0-as-needed.patch
+++ b/dev-games/vamos/files/vamos-0.7.0-as-needed.patch
@ -1,11 +0,0 @@
--- vamos-0.7.0.orig/media/Makefile.in
-+++ vamos-0.7.0/media/Makefile.in
-@@ -71,7 +71,7 @@
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
-libvamos_media_la_LIBADD =
-+libvamos_media_la_LIBADD = ../geometry/libvamos-geometry.la
- am_libvamos_media_la_OBJECTS = Ac3d.lo Sample.lo Texture_Image.lo \
- 	XML_Parser.lo
- libvamos_media_la_OBJECTS = $(am_libvamos_media_la_OBJECTS)
--- a/dev-games/vamos/vamos-0.7.0.ebuild
+++ b/dev-games/vamos/vamos-0.7.0.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/vamos/vamos-0.7.0.ebuild,v 1.3 2013/01/13 11:22:57 ago Exp $
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="an automotive simulation framework"
-HOMEPAGE="http://vamos.sourceforge.net/"
-SRC_URI="mirror://sourceforge/vamos/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/freeglut
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,video]
-	media-libs/openal
-	media-libs/freealut"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-unit-tests \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin caelum/.libs/caelum
-	newdoc caelum/README README.caelum
-	dodoc AUTHORS ChangeLog README TODO
-	prune_libtool_files
-}
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild
@ -1,219 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild,v 1.13 2013/01/01 18:55:31 armin76 Exp $
-
-EAPI=4
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
-
-SASLAUTHD_CONF_VER="2.1.21"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	kerberos? ( virtual/krb5 )
-	openldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sasldb_al.patch
-	epatch "${FILESDIR}"/${P}-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${P}-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${P}-autotools_fixes.patch
-	epatch "${FILESDIR}"/${P}-as_needed.patch
-	epatch "${FILESDIR}"/${P}-missing_header.patch
-	epatch "${FILESDIR}"/${P}-gssapi.patch
-	epatch "${FILESDIR}"/${P}-lib_before_plugin.patch
-	epatch "${FILESDIR}"/${P}-fix_heimdal.patch
-	epatch "${FILESDIR}"/${P}-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23+db-5.0.patch
-	epatch "${FILESDIR}"/${P}-get_fqhostname.patch
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' configure.in
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	AT_M4DIR="${S}/cmulocal ${S}/config" eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	# Java support.
-	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
-	fi
-
-	# Fix for bug #59634.
-	if ! use ssl ; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres || use sqlite ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
-	else
-		einfo "Building without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	fi
-
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--enable-otp \
-		--without-sqlite \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable java) \
-		$(use_with java javahome ${JAVA_HOME}) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-
-	# Add testsaslauthd (bug #58768).
-	cd "${S}/saslauthd"
-	emake testsaslauthd
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	if use sample ; then
-		docinto sample
-		dodoc sample/*.c
-		exeinto /usr/share/doc/${P}/sample
-		doexe sample/client sample/server
-	fi
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	if use java ; then
-		java-pkg_dojar ${PN}.jar
-		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-		# hackish, don't wanna dig through makefile
-		rm -Rf "${D}/usr/$(get_libdir)/java"
-		docinto "java"
-		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-		dodir "/usr/share/doc/${PF}/java/Test"
-		insinto "/usr/share/doc/${PF}/java/Test"
-		doins "${S}"/java/Test/*.java
-	fi
-
-	docinto ""
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-
-	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-
-	newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
-	use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2.0.23
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2.0.23
-}
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26.ebuild
@ -1,213 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26.ebuild,v 1.1 2013/02/22 15:47:31 eras Exp $
-
-EAPI=5
-inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
-
-SASLAUTHD_CONF_VER="2.1.21"
-
-DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
-HOMEPAGE="http://cyrusimap.web.cmu.edu/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
-srp ssl static-libs urandom"
-
-DEPEND="net-mail/mailbase
-	authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-	berkdb? ( >=sys-libs/db-3.2 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	kerberos? ( virtual/krb5 )
-	openldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
-	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
-	epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
-
-	# Get rid of the -R switch (runpath_switch for Sun)
-	# >=gcc-4.6 errors out with unknown option
-	sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' configure.in
-
-	# Use plugindir for sasldir
-	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
-
-	# Java support.
-	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
-
-	local myconf
-
-	# Add authdaemond support (bug #56523).
-	if use authdaemond ; then
-		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
-	fi
-
-	# Fix for bug #59634.
-	if ! use ssl ; then
-		myconf="${myconf} --without-des"
-	fi
-
-	if use mysql || use postgres || use sqlite ; then
-		myconf="${myconf} --enable-sql"
-	else
-		myconf="${myconf} --disable-sql"
-	fi
-
-	# Default to GDBM if both 'gdbm' and 'berkdb' are present.
-	if use gdbm ; then
-		einfo "Building with GNU DB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB as database backend for your SASLdb"
-		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
-	else
-		einfo "Building without SASLdb support"
-		myconf="${myconf} --with-dblib=none"
-	fi
-
-	# Use /dev/urandom instead of /dev/random (bug #46038).
-	if use urandom ; then
-		myconf="${myconf} --with-devrandom=/dev/urandom"
-	fi
-
-	econf \
-		--enable-login \
-		--enable-ntlm \
-		--enable-auth-sasldb \
-		--disable-cmulocal \
-		--disable-krb4 \
-		--enable-otp \
-		--without-sqlite \
-		--with-saslauthd=/var/lib/sasl2 \
-		--with-pwcheck=/var/lib/sasl2 \
-		--with-configdir=/etc/sasl2 \
-		--with-plugindir=/usr/$(get_libdir)/sasl2 \
-		--with-dbpath=/etc/sasl2/sasldb2 \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with openldap ldap) \
-		$(use_enable ldapdb) \
-		$(use_enable sample) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable java) \
-		$(use_with java javahome ${JAVA_HOME}) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
-		$(use_enable srp) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	# Thanks to axxo@gentoo.org for the solution.
-	cd "${S}"
-	if use java ; then
-		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/sasl2 /etc/sasl2
-
-	if use sample ; then
-		docinto sample
-		dodoc sample/*.c
-		exeinto /usr/share/doc/${P}/sample
-		doexe sample/client sample/server
-	fi
-
-	# Default location for java classes breaks OpenOffice (bug #60769).
-	if use java ; then
-		java-pkg_dojar ${PN}.jar
-		java-pkg_regso "${D}/usr/$(get_libdir)/libjavasasl.so"
-		# hackish, don't wanna dig through makefile
-		rm -Rf "${D}/usr/$(get_libdir)/java"
-		docinto "java"
-		dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
-		dodir "/usr/share/doc/${PF}/java/Test"
-		insinto "/usr/share/doc/${PF}/java/Test"
-		doins "${S}"/java/Test/*.java
-	fi
-
-	docinto ""
-	dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
-	newdoc pwcheck/README README.pwcheck
-	dohtml doc/*.html
-
-	docinto "saslauthd"
-	dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
-
-	newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
-
-	newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
-
-	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd
-	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
-
-	newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
-
-	use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2.0.25
-}
-
-pkg_postinst () {
-	# Generate an empty sasldb2 with correct permissions.
-	if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
-		einfo "Generating an empty sasldb2 with correct permissions ..."
-		echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
-			|| die "Failed to generate sasldb2"
-		"${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
-			|| die "Failed to delete temp user"
-		chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
-		chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
-			|| die "Failed to chmod ${ROOT}/etc/sasl2/sasldb2"
-	fi
-
-	if use authdaemond ; then
-		elog "You need to add a user running a service using Courier's"
-		elog "authdaemon to the 'mail' group. For example, do:"
-		elog "	gpasswd -a postfix mail"
-		elog "to add the 'postfix' user to the 'mail' group."
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2.0.25
-}
--- a/dev-libs/libaio/libaio-0.3.109-r4.ebuild
+++ b/dev-libs/libaio/libaio-0.3.109-r4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r4.ebuild,v 1.10 2013/03/10 16:17:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r4.ebuild,v 1.11 2013/03/11 07:37:47 ago Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/libs/aio/${P}.tar.bz2"

 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="multilib static-libs test"

 EMULTILIB_PKG="true"
--- a/dev-libs/libzip/libzip-0.10.1-r1.ebuild
+++ b/dev-libs/libzip/libzip-0.10.1-r1.ebuild
@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.10.1-r1.ebuild,v 1.7 2013/01/14 09:57:59 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.10.1-r1.ebuild,v 1.8 2013/03/11 13:01:20 ssuominen Exp $

 EAPI=4

 MY_P=${P/_}

 AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
+inherit autotools-utils eutils

 DESCRIPTION="Library for manipulating zip archives"
 HOMEPAGE="http://www.nih.at/libzip/"
@ -47,7 +47,7 @@ src_prepare() {

 src_install() {
 	autotools-utils_src_install
-	remove_libtool_files all
+	prune_libtool_files --all
 }

 src_test() {
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r1.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r1.ebuild
@ -1,92 +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/ossp-uuid/ossp-uuid-1.6.2-r1.ebuild,v 1.9 2012/12/30 16:57:46 ulm Exp $
-
-EAPI="2"
-
-PHP_EXT_NAME="uuid"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_VERSION="5"
-
-MY_P="uuid-${PV}"
-PHP_EXT_S="${WORKDIR}/${MY_P}/php"
-PHP_EXT_OPTIONAL_USE="php"
-inherit eutils multilib php-ext-source-r2
-
-DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID."
-HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/"
-SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="+cxx php"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-
-	epatch "${FILESDIR}/${P}-gentoo-r1.patch"
-
-	if use php; then
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env ${slot}
-			epatch "${FILESDIR}/${P}-gentoo-php.patch"
-		done
-
-		php-ext-source-r2_src_prepare
-	fi
-}
-
-src_configure() {
-	# Notes:
-	# * collides with e2fstools libs and includes if not moved around
-	# * perl-bindings are broken
-	# * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3
-	econf \
-		--includedir=/usr/include/ossp \
-		--with-dce \
-		--without-pgsql \
-		--without-perl \
-		--without-php \
-		$(use_with cxx) \
-		|| die "econf failed"
-	if use php; then
-		php-ext-source-r2_src_configure
-	fi
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use php; then
-		php-ext-source-r2_src_compile
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS
-
-	if use php ; then
-		php-ext-source-r2_src_install
-		cd "${S}/php"
-		insinto /usr/share/php
-		newins uuid.php5 uuid.php
-	fi
-
-	mv "${D}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc
-	mv "${D}/usr/share/man/man3"/uuid.3{,ossp}
-	mv "${D}/usr/share/man/man3"/uuid++.3{,ossp}
-}
-
-src_test() {
-	emake check || die "emake check failed"
-	# Tests for the php-bindings would be available
-}
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild,v 1.13 2013/03/10 16:21:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r2.ebuild,v 1.14 2013/03/11 07:37:20 ago Exp $

 EAPI="4"

@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 IUSE="+cxx perl php static-libs"

 DEPEND="perl? ( dev-lang/perl )"
--- a/dev-python/BitVector/BitVector-3.3.ebuild
+++ b/dev-python/BitVector/BitVector-3.3.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/BitVector/BitVector-3.3.ebuild,v 1.1 2013/03/11 08:40:46 patrick Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS=1
+RESTRICT_PYTHON_ABIS="2.4 2.5"
+
+inherit distutils
+
+DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
+HOMEPAGE="http://cobweb.ecn.purdue.edu/~kak/dist/ http://pypi.python.org/pypi/BitVector"
+SRC_URI="http://cobweb.ecn.purdue.edu/~kak/dist/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PYTHON_MODULES="BitVector.py"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# Don't install test.py.
+	rm -f test.py
+}
+
+src_test() {
+	cd Test${PN}
+
+	testing() {
+		PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" Test.py
+	}
+	python_execute_function testing
+}
--- a/dev-python/BitVector/Manifest
+++ b/dev-python/BitVector/Manifest
@ -1,3 +1,4 @@
 DIST BitVector-3.0.tar.gz 147792 SHA256 a56fdeb184227e73a6be726d574f379d092022e1073087fc7769d0e1cfe896ba SHA512 a5616cc9e97ea09748cbfc906405bbcd61fc377ee22dd22a8f34aed0c947a5224e78e099267462aa3581fae4a1a3b76c678059a32227976c395381b48f66c2a1 WHIRLPOOL addac8dff0af2bbdd1c0809ac37442c8043262711a7e2dfe15e1b952edcd16c7e6f091494aceab49d9c384032ce9c384b2ac9c4265e3584e60e351297fd8fe84
 DIST BitVector-3.1.tar.gz 157374 SHA256 fb839af4a65b9a656d7b6aa7a83c4088023b15f2123ea3a5f8a2764a6c17b1f7 SHA512 8b88bf2f958dc2fa1e3efdf4768e1e999549f7fb93d1c64b758e0acbb1e5aee3633fb08db053adca2e4404d08de1fd2b41d6a6c4e73c26f8723056a2403b17d2 WHIRLPOOL 3d163c97f2f42bf0407a6cf30a097c4f0c9b205f645423b9f1b186c90b3bdae0254c172d66a7f455c956ba790d47a6917ebc9373fb031ed691933c3a39c69b0c
 DIST BitVector-3.2.tar.gz 160287 SHA256 05c3981259b6d64cc29a3d91be973dd75e6f72231337bd0f9616f0466bacc16d SHA512 0c8c5ea08e0fe2d6e3c15295240ffb4ae43aaf53de062c199f5db19f60819e98037a6ff07c590c627f84697cd91f4c5e59e7cce961a1e39f1880d96394a6a88b WHIRLPOOL b683c04bb83ce7dca2e09d5c01fc2c7b5ca4f4b38a74277656150b0820b33bcbaac9e3274a107e8671bbb0aae5e30e0186ed6dd3bc060a3ea3502576bc96666a
+DIST BitVector-3.3.tar.gz 126836 SHA256 ad82343d3e12f2538a250de3385c2511e980e85478f858659c5280eb988d0484 SHA512 2a8ea8ca6d2da30a63abfb59eba21ed6e2a8f3e0ca37d3ca6063bf903519625b4e77bc9da8e9561d0a4fa943d87b1ba474c100fa86d8cc485b472a143c9059a3 WHIRLPOOL fe53f8db55d160341d633cdab96838ff10175f7ab3da332d5874c6203522edc168e447b755c04a98fcec6e5821c6c9a83dfdd919a3d19f2ca13a1ef43615a99c
--- a/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.12 2013/03/03 00:36:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.6-r2.ebuild,v 1.13 2013/03/11 17:51:00 ago Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@ -20,7 +20,7 @@ fi

 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"

 IUSE="X dbus debug declarative doc examples help kde multimedia opengl phonon script scripttools sql svg webkit xmlpatterns"
 REQUIRED_USE="
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@ -1,2 +1,3 @@
 DIST ansi2html-0.9.1.tar.gz 30752 SHA256 72945cb51a15fbfd20c39e39256d838d3c7f0101232b5b697a5f0149401f7d42 SHA512 a5b06dc6b2c89c1dcd18b6d1b71aa5179720a1547d1421bdbe9f3974c159c2731a91d82919a1714e07824c39da4c32ada85ccb1be9c7a3e4207c8707a9b55998 WHIRLPOOL 7dd82815a2b9fc16c9317edfdc64b908d41e6345670cfad2fe0ac551d9b8a6e6f50375ac902e094f148f24f3d3003dfeefce35d065cc6e56c9b649bd3c97e74d
 DIST ansi2html-0.9.3.tar.gz 24178 SHA256 31653bbb3528624be03282ef617d96f92292b7da5d6b1541fc6b128a91ac825b SHA512 46c00c2f101b7c8ce7b3af9028c16a12a87da05fae9b92d9e5d8e1e5a60dac9ab49d6163852e33eb680338d35b371b0e64dcb858fa94724d8386a90a470ae8a1 WHIRLPOOL 67e5513e6af4a90e71b2403e1dfd2fab2d43a431f34d67c81b3ddc923e55c41099c05112209df89be186d2418ad2cee044d153d6748f09758042146cdac11301
+DIST ansi2html-0.9.4.tar.gz 27082 SHA256 8ab5d857bc9a789b4d3b7e3ced75b765f5c74ab8959cba585ac10066eec4b467 SHA512 5cc60687538309d2f5ea93a2e52d33af758e3c9372ce6dcc2286997a751d95cb6cc5a366614c36af6169b9189d7b5dda49c4d1b6e8b301ab4c592a8a9b650822 WHIRLPOOL da40dd7ef1f47fe80ff11f0c1f4f0f33613d8819c6d5e14c4b500977c70caa46b26c86a7796c71f4e8d95fcadb5223050f373e6237181886820ff2ccca45c761
--- a/dev-python/ansi2html/ansi2html-0.9.4.ebuild
+++ b/dev-python/ansi2html/ansi2html-0.9.4.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.9.4.ebuild,v 1.1 2013/03/11 06:26:09 patrick Exp $
+
+EAPI=5
+
+# ordereddict is need for < 2.7, but it's not packaged (yet)
+PYTHON_COMPAT=( python{2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Convert text with ANSI color codes to HTML"
+HOMEPAGE="http://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests -w tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@ -1,2 +1,3 @@
 DIST autopep8-0.5.2.tar.gz 10049 SHA256 a9a808bac49605036bdeaa4bf5b50a9bbf87088a54b9a2e54e18c85abcecb70f SHA512 9d27a9b2c7cf90a7ea420732ac13675c6bc93435d9d9dc4e437e3e2e121d4b2931b995da77d751e2dbcf4c2c5379fda6c4c3c0f6cc222b461d4daa95e9ec2564 WHIRLPOOL 5b4f6ca08695da516f6579399de1decb3a1be6b2520a636812f1b68cb6ee7e05cb546fe7537513deb3f9a3f914808ffeaa956d1daa2c4e0bcf14f22071e9e7c8
 DIST autopep8-0.8.6.tar.gz 48048 SHA256 ee3ffd6b6f4484a06aeb8b47c148b74eb7b51d3ca4003c163b4e522bd555c2d6 SHA512 0430bc2c0427816945c0e433736fd4d5515b7842391c7e1dc5680cf3a4752c60d4d37d4331a60c8808f09ed02c3753e851894f86040968af9506ed0d0cef74e4 WHIRLPOOL 2c3d976fb32fe6e0129a2416ff51563e9d007314dfa0ee3d9819df8df4e934ca9a02bbc48d114b1d6374e53851e4fdf54e10f22cc6e4336d1e249dc22e812878
+DIST autopep8-0.8.7.tar.gz 48884 SHA256 8742d3e5fe19a7926af248bf43016d41600e64e71d15af5158f8cf0e1099263f SHA512 aaa02a6ca93586b2493f915dc145c835214a22470f7fe6c93d21ae6e6c1f56b001f3ae2089fad629099bbf8752c167ca6271ac75d25511458f9d8eb4c6409d8a WHIRLPOOL e16f35cb4dec502103f651893a7ee0c340a595a578da52f08763c8ac6d29842f25b7d18c4cb6387b329d79a3ba51fdeca9015da5f80c9ab72de852c40145e52e
--- a/dev-python/autopep8/autopep8-0.8.7.ebuild
+++ b/dev-python/autopep8/autopep8-0.8.7.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-0.8.7.ebuild,v 1.1 2013/03/11 06:20:27 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8"
+SRC_URI="https://github.com/hhatto/${PN}/tarball/ver${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-python/pep8-1.3.2
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${PYTHON}" setup.py test || die
+}
+
+pkg_postinst() {
+	ewarn "Since this version of autopep depends on >=dev-python/pep8-1.3"
+	ewarn "it is affected by https://github.com/jcrocholl/pep8/issues/45"
+	ewarn "(indentation checks inside triple-quotes)."
+	ewarn "If you do not want to be affected by this, then add the"
+	ewarn "following lines to your local package.mask:"
+	ewarn "  >=dev-python/pep8-1.3"
+	ewarn "  >=dev-python/autopep8-0.6"
+}
--- a/dev-python/billiard/Manifest
+++ b/dev-python/billiard/Manifest
@ -1,3 +1,4 @@
 DIST billiard-2.7.3.18.tar.gz 125092 SHA256 3ec1c17ff0c51ebb03ec3dea4629f81617424c937360ce1e5ba930dea147b659 SHA512 976db60981cc2e011dac9b43ac81ddbc6a2d51dc7d4b18ed72be8f879f34175cd6351c6f52a219448f7614aecf71f5f9e26393b8653de5bf714aca89e3f051b8 WHIRLPOOL 983d5c44d25a188a6a3a95767e9a9e52b0543a6f6f1b79942b9b587f5149aa5f49d47a866193b5348aad020f8f144846d3d234b703c2a3068cf6c7478227af80
 DIST billiard-2.7.3.19.tar.gz 125515 SHA256 0e0fcf9a7cf44bf7634614070d117a23ef9ac945b6c55ed454b43f5a85adc2db SHA512 4d0938ac276996433a20401e29f286555b850517e07c3747c0417a21dc1b4edc74e7e360db18915f9707c1e9c8b32b6a8ceb3016df1d6da91d5165b59bd7a947 WHIRLPOOL 8b953a283a89d49afde6229ead41919a42e4f2039d42025f6ec8c56bb3d1bb4b14ebd4be2ac98a1c7769810185b33f28ff48bc7a63a5dfb8b705238a5cd70e93
 DIST billiard-2.7.3.20.tar.gz 125674 SHA256 7f828599fc5ed67e9588ff2341e96fd8cf975d2479c51bd6bf9a26df65ad200e SHA512 76f62567e471aa7841d7fd281e3680b4a011f6b5c72d744576ded0640777da341c0bcb01722711e223bc0278d510b4a4a05ef68b554a982141dcdd4d768cd789 WHIRLPOOL e96eb730a13a90106140b76a3d4a8f387621ce4c2c1ee151222b6091cef22f81db4f6152bef9fbd58e8aa128affc91bf28fd0f7c32c87185b179e88b74e1047e
+DIST billiard-2.7.3.21.tar.gz 125890 SHA256 1a72a6f2127e3572f4ba40cb64bd5d078111520c2c080f1fb08daf217c483be5 SHA512 2005bdbcd6ebaa6a97cdfb4220956f2bb2abd71164d7fd123f96773bf924764bda1f09140acf3d9aab6bc80ff8eb77d05c526b8571c551204e006806533fdb9e WHIRLPOOL f18be92edaa2cef4293bc40a65ce406fdd50a7d6857a9d3ef48fc96fe9e140e524ed814e51284dcdae2c017b6a82e5752852e26fc3db5a199ce908c30121e5b9
--- a/dev-python/billiard/billiard-2.7.3.21.ebuild
+++ b/dev-python/billiard/billiard-2.7.3.21.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/billiard/billiard-2.7.3.21.ebuild,v 1.1 2013/03/11 08:50:28 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python multiprocessing fork"
+HOMEPAGE="http://pypi.python.org/pypi/billiard https://github.com/celery/billiard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	nosetests || die
+}
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@ -1,3 +1,4 @@
 DIST bitstring-2.2.0.zip 584654 SHA256 7c39ffcc2a2d62f6ea5a0114ea903c9bafd05056c94d5385c56d04bb9d0f4a3d SHA512 a8f0908e91bfcb0cc862ab1a7586a7863792dc9e31e7a87a7bc61df701feb8a475391e30c0dfe7999d1c2b856646576b0d25e1336f0d1509ca30e9757c01cd9f WHIRLPOOL 5cf0739b7d5492c3ebea877a588bf4080decdcdb147dc8708fb1a05088394f7879664eedf2959cdc240a3ec87c7b13b726279053cea85361f4917c5c5c306aa1
 DIST bitstring-3.0.1.zip 623680 SHA256 d75d20f1c4c7543cf500e95eab9596877fa1c4d7d9952d7402dae77dc410419e SHA512 9a9728cc513d1692d4f4800b43b5de36841d49620c63cbe637fa06cfb554f23bd6276b51a096a71f649a4adb8b905127332f517e7f214f48a672502611c603da WHIRLPOOL fb8f15991340662cccf8a0e2936e8564734f54d145b6529b91985b6d27441debb2b22e1a197e39216159b93d875bd79106e7e1547462574d2256b72c62031780
 DIST bitstring-3.0.2.zip 618856 SHA256 1ff42c7192b694774e09ad70a6dd40a0e655ec022ed4f090c929ea69f21b8ebc SHA512 6b0f4d926b693a2c9f28a61902000a446ce76778a0e31ea845891fccc3bdbe8b5f369a457fcc653801777c0c83a801a663a77c932fa4d6233976fad142987825 WHIRLPOOL d402b12d4f589bfe256944508fe6d8491f829907f32ac451d560222bded611bbeaf28e36c659e0d5967a2a60bcf1de5e3c8b35f7fba25a98721456beafa0608d
+DIST bitstring-3.1.0.zip 620245 SHA256 a85b382481985e1382de09e9e00fc4e31ef7c2f36c2f0724c4d008a9a0691c3f SHA512 23e4b7584acce15e452900d7354284dc75cccddee3bbedfcfd53c955af3ae701ee2f089dd6f019e3960b9b86f22b80b92786b2e85ededa48ad33bb02c3ff797b WHIRLPOOL a9fa999d832c12d9f29297e1937cea482f2af9841b950dca3ebff906085e4543770292cf1b9b62f50b27b41b1ef1de8d2f8cc80051ae3483414dff861afbd73b
--- a/dev-python/bitstring/bitstring-3.1.0.ebuild
+++ b/dev-python/bitstring/bitstring-3.1.0.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.1.0.ebuild,v 1.1 2013/03/11 08:43:22 patrick Exp $
+
+EAPI=3
+SUPPORT_PYTHON_ABIS=1
+RESTRICT_PYTHON_ABIS="2.5"
+inherit distutils
+
+DESCRIPTION="A pure Python module for creation and analysis of binary data"
+HOMEPAGE="http://python-bitstring.googlecode.com/"
+SRC_URI="http://python-bitstring.googlecode.com/files/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="app-arch/unzip"
+
+src_test() {
+	testing() {
+		PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" test_${PN}.py
+	}
+	pushd test > /dev/null
+	python_execute_function testing
+	popd > /dev/null
+}
--- a/dev-python/celery/Manifest
+++ b/dev-python/celery/Manifest
@ -1,3 +1,4 @@
 DIST celery-3.0.12.tar.gz 1218262 SHA256 716a465327ded5048893d518eafdade5eb09eb9d941e6efdbdaaac73b0251d3d SHA512 4ce7da636b52b0f87d46444c27ac1c6ba2e6afc1cd3378829e1a01c01f18adf6ed91e64e08ff19a52833071df58dbf6d452ffcfd008a4fe1ce57ccbff0bb0ed6 WHIRLPOOL 5d045eb19394d09b6816d60a745508565d75775b814225939ee9e252b0690cca2b4b73850a970ba98a6c3ad21bede1747d297b7a8e757bb0cb8d366ced275650
 DIST celery-3.0.13.tar.gz 1223019 SHA256 1a8d045c94bfda832db2afbc786e8c99ac0e094d6019a5d89c8adfe04f396d6a SHA512 20bfa638893497f1bbb29859fa0b6f488341aa07d0243da7a713642b9723825de7f747dca09d0f5544dddc7b9595775e947ce247d03204f4080be51d5e3a4955 WHIRLPOOL ac699c0900631138247fccf0de4f13ed8f508e3edb2c5fd01582d36e96ebbdb80bdd9fae00b9c2984f6088cf14cda30114335ebdc1afc5a8da3981a3e541bffe
 DIST celery-3.0.14.tar.gz 1229097 SHA256 57006a6e477282a2e55ace498729bf13218ac2c7ad5d9d920ad86b2469458df2 SHA512 df98a4a5661a005ed295339f527aef15e7d25c625904bb60bf3e305f40136c21ecd30d557cffe71b1888214e28099205df31e56e26d1d698e4b1366c11cbb722 WHIRLPOOL 29e984da6d5120ac31f04e5bf789ed1163d0726351725921d8c776a2fea1dd10e83a64a9979149f3bd2690884908f3963c7caa0374e49ca33fc7098aed8dda57
+DIST celery-3.0.15.tar.gz 1229180 SHA256 c20637d2ad68ddc407f4fba89e3afccbe7a9c55a3b79059579ba9fcf5de5d976 SHA512 697d88797d90cba747d8d331d2bef30427ef2ce574674543c0aec37d22a59c324a64092d1a0218c89ac122178a65488bb9a97e83b2a319272afd2538c2f6985b WHIRLPOOL af92937d660b12f560a18e7ebe94be448773b490e1c76d2bb017c434d95c871f988c6bedad746aa8da94cb6b87e34ca46ef73dbefc8f3af28f7925e4c8f81e44
--- a/dev-python/celery/celery-3.0.15.ebuild
+++ b/dev-python/celery/celery-3.0.15.ebuild
@ -0,0 +1,90 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celery/celery-3.0.15.ebuild,v 1.1 2013/03/11 08:50:11 patrick Exp $
+
+EAPI="4"
+
+# Not broken but unsupported; dev-python/redis-py doesn't
+# support python3 which is a dep in tests. pypy fails just 1 test
+PYTHON_TESTS_RESTRICTED_ABIS="3.* 2.7-pypy-*"
+PYTHON_DEPEND="*:2.7"
+RESTRICT_PYTHON_ABIS="2.[5-6]"
+SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils eutils
+
+DESCRIPTION="Celery is an open source asynchronous task queue/job queue based on distributed message passing."
+HOMEPAGE="http://celeryproject.org/ http://pypi.python.org/pypi/celery"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples sql test"
+
+# jython would need: threadpool, simplejson
+# python2.5 would need: ordereddict, test? unittest2
+# python2.6 would need: multiprocessing, test? simplejson
+RDEPEND=">=dev-python/kombu-2.4.7
+	<dev-python/kombu-3.0
+	sql? ( dev-python/sqlalchemy )
+	dev-python/python-dateutil
+	>=dev-python/anyjson-0.3.3
+	virtual/pyparsing
+	>=dev-python/billiard-2.7.3.17
+	dev-python/pytz
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/gevent
+		>=dev-python/mock-0.7.0
+		virtual/python-unittest2
+		dev-python/pyopenssl
+		dev-python/nose-cover3
+		dev-python/sqlalchemy
+		dev-python/pymongo
+		dev-python/redis-py
+		dev-db/redis
+	)
+	doc? (
+		dev-python/docutils
+		dev-python/sphinx
+		dev-python/jinja
+		dev-python/sphinxcontrib-issuetracker
+		dev-python/sqlalchemy
+	)
+	dev-python/setuptools"
+
+src_test() {
+	testing() {
+		nosetests --py3where build-${PYTHON_ABI}/lib/${PN}/tests
+	}
+	python_execute_function testing
+}
+
+src_compile() {
+	distutils_src_compile
+	dodocs() {
+		echo "test $PYTHON_ABI"
+		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
+			mkdir docs/.build || die
+			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C docs html
+		fi
+	}
+	use doc && python_execute_function dodocs
+}
+
+src_install() {
+	distutils_src_install --install-scripts="/usr/bin"
+
+	# Main celeryd init.d and conf.d
+	newinitd "${FILESDIR}/celery.initd" celery
+	newconfd "${FILESDIR}/celery.confd" celery
+
+	if use examples; then
+		insinto usr/share/doc/${P}/
+		doins -r examples
+	fi
+	use doc && dohtml -r docs/.build/html/
+}
--- a/dev-python/d2to1/Manifest
+++ b/dev-python/d2to1/Manifest
@ -1 +1,2 @@
 DIST d2to1-0.2.7.tar.gz 18784 SHA256 a029a89acac1117cf206e2e19ceff2e7f6eeee5d317c69b5a61be2632cc042cc SHA512 c5a5d216474bbdee297cdb1d824cf9e7c06563fb93706b87c7ef997538b941cc06055176bdaeee8392e63ed7bbab7c22989548d219768b26dfbedb71e0e8b012 WHIRLPOOL 2ef34d39fb6c494999ea5110a0ce5b744b5d63ae90d8308bf9f49525eaee4b2eb9354c787d00344091c68903999369c19b35b27844bd9c179334f9dd20fa6443
+DIST d2to1-0.2.9.tar.gz 37159 SHA256 f913e388aae7b7409cedffa51bc3ad19843a8bf6251227aa103857ef6db0c1c9 SHA512 12addbfbaa8cc392878758c7007ca6c61cd1aece68bc6692660b4affad4fb6773fa4c149a7eea17e2369b4063230087f6d4e4a6ba3538ced8e9f6ee67a0c9a4e WHIRLPOOL eb33078c579988f3bd685870f25cf48e35d8393c94b8d9648198b5d7b7aff1cf6ee18217526c4394b89689a49b10235656613984a99805a46e639d801994e26c
--- a/dev-python/d2to1/d2to1-0.2.9.ebuild
+++ b/dev-python/d2to1/d2to1-0.2.9.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/d2to1/d2to1-0.2.9.ebuild,v 1.1 2013/03/11 05:48:11 patrick Exp $
+
+EAPI=4
+
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils
+
+DESCRIPTION="Allows using distutils2-like setup.cfg files for a package metadata"
+HOMEPAGE="http://pypi.python.org/pypi/d2to1"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools"
+RDEPEND="${DEPEND}"
--- a/dev-python/fabric/Manifest
+++ b/dev-python/fabric/Manifest
@ -7,4 +7,5 @@ DIST Fabric-1.5.0.tar.gz 208678 SHA256 cddd0209dd9ff787dfdd7add752ae4adec8510b5c
 DIST Fabric-1.5.1.tar.gz 209128 SHA256 81b67886b539ecaa952925e2c821eff3bf95e26ae0c70d5058d3b67fc400367e SHA512 fc036d2e354189c26abe00b75ba016142d5aa8da2c523d02e2054da16e28d6fcba3f702379a68f5552ba7a26b6d48bc84fec4359b511b6769779b1488d8ee10a WHIRLPOOL 64824048530f9b85ea27ed4b24195b8bb8944eb7dbd2692f95f2afc8c70289bba8c03e2127346e8ca509daf5471e4f64328ef84350d976ebc2f6ae8acf2e506a
 DIST Fabric-1.5.2.tar.gz 211449 SHA256 bf3a942f22a1f7926ada9690375335756849e5a555b608bda63f7bf421be5726 SHA512 37c30625772e8beea3b1d740612e7232d95238f0bb7b3ddfe32dfb5b6fe416ea7b076ec9360608801425ad40ad0932c3d3884fdc0f145c62469c2c5626390cc1 WHIRLPOOL 64a699fc4e66aa59a0c8bfd52ad943e5ca372b1d627dab48752bc367e63724d07e9c4addf35c3be977f0a20090f3e2a01ea1eddd97e5ed41aa42ab9d6c358562
 DIST Fabric-1.5.3.tar.gz 241041 SHA256 e90a15a5a6fe9be6941ca7141e1d36e0dc8112a9df13d316fa4770a92391b725 SHA512 9cbd093f24d8b4dc2aa0c363d040df98652bdc955a7416e65b5c8b9dc32c3191d4d2dc7ff61f1bf93050ff3a68b858ba178e0bc11b0b33137191b760d7476b54 WHIRLPOOL 1c7a3e1e7adb3ba48e17df2847e07599ccf8e839867db064a701e03d162aab39b3f3c2492d38dca7452a669233c6a454925972cf586db755ee80b183b649471c
+DIST Fabric-1.6.0.tar.gz 215790 SHA256 6e326603a0b2f9b8cb7283e3c6dea1d22216c97a274bdab30ed9c8a41e1d996e SHA512 e8ac7351fd7e1b68f160ea022ddcf876e917ecbbe03d849a853884c3270816f0ad0856810be2c1640f94eae1437479e12f7ef20b8edf8be5e1c4a4507e7a33b4 WHIRLPOOL b7f322780d01304870513375424268af76e5faedcd1c576a6e9f67a413036283627681b15afdc81528140cf0c7c0ac9275454d22528a411998ed1fdaa288cd51
 DIST fabric-1.4.2.tar.gz 194062 SHA256 a2052fefd10b7f433b9598a409b19eb6581656807a7a02fbaf94b6b61e7173a2 SHA512 de448ea3029998d1040bf02f07a36e9183b5c87fbe2dd9f217e19034f762b7b6d821d95c4f1fd3b2f5e1955adcaced880c3eaba5d85f91ff3e5ef4a7aeee4d4a WHIRLPOOL 9af535af3ad227ad3cfacd35ba6b4ff82efc879f4a8fe327f62d2c9f99b4911db95c026c06e1ac1b4c54730ca4dbaa274a459a3ed9ab2f7ca0f63297f3a07ad2
--- a/dev-python/fabric/fabric-1.6.0.ebuild
+++ b/dev-python/fabric/fabric-1.6.0.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.6.0.ebuild,v 1.1 2013/03/11 06:59:24 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython *-pypy-*"
+DISTUTILS_SRC_TEST="nosetests"
+
+# Requires multiprocessing package from py2.6+
+PYTHON_TESTS_RESTRICTED_ABIS="2.5"
+
+inherit distutils
+
+MY_PN="Fabric"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Fabric is a simple, Pythonic tool for remote execution and deployment."
+HOMEPAGE="http://fabfile.org http://pypi.python.org/pypi/Fabric"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/paramiko"
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	doc? ( dev-python/sphinx )
+	test? ( <dev-python/fudge-1.0 )"
+
+S="${WORKDIR}/${MY_P}"
+PYTHON_MODULES="fabfile fabric"
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		emake -C docs html
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml -r docs/_build/html/
+	fi
+}
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@ -1,4 +1,5 @@
 DIST irc-3.2.2.zip 84701 SHA256 b597ac3f0713386ba122f608a24e9f6fecd53ddac5ddb7889547ecab392ada1b SHA512 63a64626137617b14f401a6eb51a98b85db14db884faa9355b430df0f5fe8f9391139bb6e50fbbc985b5fd873844c8febe54685af679a847692175c366e8a6c7 WHIRLPOOL e6cc90191a242a2f1777b34550ffefafac0cb37890e593da29b61958a250eb93755e5d9301c6b5b727d42c0de74d2017884169024827cb3524f6ff21ecc3dcff
 DIST irc-3.4.2.zip 87053 SHA256 671e20e39a1684aeef5e006334dd4d3a5ed10fc1142bd9e91a50a861f51c2d75 SHA512 d48997f98deae30b554b29618155a827702a2e333d907483157c1d48894ab3beea999c2c7f89571552a1ff54e62964f80afbb7374e693fec4afa9faa1570ce2b WHIRLPOOL 751b31f213878505b9e104fdd2c984b2c8d7059c062a9b073f0b197db897021dada82010c1f7fcd49a8069dc641a04f95ce2a519fb2dfa0d050c16f4494c741f
 DIST irc-5.0.1.zip 88039 SHA256 c7262b21a4b6f713913aaddcd6e1c73920a07903feda9758065699d6d5fc3796 SHA512 3633d55908f5df5f296cdbc3a87d46139b0b69bae9dabd31acce6b1fc47bb8e0cd4464993e0df536957546b9c0562cff223b3a1d266c58ce6fe0009d0b15ae03 WHIRLPOOL 21c829651f299ba56ad133eca976c5e4b3b09cd865f0470290bafadfb39291171c864f13a2eab5c5953dffef0b258f960c42f8d03d90f267b943e30b5641de8d
+DIST irc-8.0.1.zip 107370 SHA256 d7b0703f8fd94d67eac8136e4f8d8a4975b24f492766ba4372256932f44caf19 SHA512 6df02af77f0f7580f7ca1af273a46fe546c5c0aa55b75e2a689994f4547e6eed54c121e7d38b301f7874c98affe13a32bd5ff27401b9de90b02291a4e703c85c WHIRLPOOL 6b5397d1520a5ee047f6aa24a451924bf75ac52905a5bc4a7280549f091ccd0d9536021c58d0fe5f912758a27f58cea81881426c56f62502f8265371b7cdbd73
 DIST irc-8.0.zip 106508 SHA256 240ca0f797877f5e3508929da218dbafb031ab3e198f0270197286624e391cd1 SHA512 f1dda78ab6bd6982b8e04e7ef334eede11aa61307237be8249543eca00558a46245da32d6cf4b523424fe6bd8a0e25a995d38aa8686642350b820af513ae052c WHIRLPOOL bafcbf891d8a6a96f1b98d1456596b8b15c5b002974eb5a673583c63d271d47922d1498435b2a10e0622251e7094c9724551c8102f238c8c51ffee8f2aa7dab6
--- a/dev-python/irc/files/irc-setup.py.8.0.1.patch
+++ b/dev-python/irc/files/irc-setup.py.8.0.1.patch
@ -0,0 +1,13 @@
+--- setup.py	2013-03-11 15:04:36.162537614 +0800
+++ setup.py.new	2013-03-11 15:06:48.495867668 +0800
+@@ -33,10 +33,6 @@
+     ],
+     install_requires=[
+     ] + importlib_req + argparse_req,
+-    setup_requires=[
+-        'hgtools',
+-        'pytest-runner',
+-    ],
+     tests_require=[
+         'pytest',
+         'mock',
--- a/dev-python/irc/irc-8.0.1.ebuild
+++ b/dev-python/irc/irc-8.0.1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/irc-8.0.1.ebuild,v 1.1 2013/03/11 07:25:05 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="*:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5"
+
+inherit distutils eutils
+
+DESCRIPTION="IRC client framework written in Python."
+HOMEPAGE="https://bitbucket.org/jaraco/irc http://pypi.python.org/pypi/irc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip
+	app-text/dos2unix"
+
+RDEPEND="!>=dev-python/python-irclib-3.2.2"
+
+src_prepare() {
+	# Prevent setup from downloading hgtools package
+	dos2unix setup.py || die "Oops :("
+	epatch "${FILESDIR}/irc-setup.py.${PV}.patch"
+
+	# Don't rely on hgtools for version
+	sed -e "s/use_hg_version=True/version=\"${PV}\"/" -i setup.py || die
+	sed -e "/^tag_/d" -i setup.cfg || die
+
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		insinto "/usr/share/doc/${PF}/examples"
+		doins scripts/*
+	fi
+}
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@ -2,3 +2,4 @@ DIST msgpack-python-0.1.12.tar.gz 49674 SHA256 5aa1d925a536c399a07a1f1d8f394d991
 DIST msgpack-python-0.2.1.tar.gz 55934 SHA256 019a2f3f8c3d4630d1f3de7bb6ea2d4ad9a32259359258c811fde48af0ab2ba8 SHA512 eefc14cce461e8fc98619f5c4589651c82555dfaa260119894f8589fd58fdd5d58539aaf5f231b0f65cc9bb69bf78cd7468f3dcfe90398c694e30fa2d4bbc38a WHIRLPOOL 9586afd84d29881c3567d2274d4332f47f85fe8cd54985815269fe51e0457ec3b824c3af45b7876a66e2b0c5d1e1a7fc89993770af90bd33dbeeeee8ec6f4299
 DIST msgpack-python-0.2.2.tar.gz 57956 SHA256 75cedc4d667a4e4d9eb5757544a7f6e6774b533760d8ea4c1b24fb844550a11c SHA512 267e407794a42e962324f8d3211a4864af1440895480d6fb1bc5cbd9380be9609761551a1750255640b0c2f956759b2689fbfad8e6fd0948e5305293609c0e10 WHIRLPOOL 41a2ccf2501d25e8eb39d428c0e64b3f00954a0012876f671fae6a3c9d86acee068bc940343a95645f91a56eeabb5836b1de7fac06c0b10d673205134bf49c43
 DIST msgpack-python-0.2.4.tar.gz 132973 SHA256 e63c7f3dd676e590111e156549a96b0bf4644ee10f3bfa42c561ad58e25566a3 SHA512 5d95e2ebf8ddee6b12c54ccdfa27bc5e0e185e4b131840ce9b414ef9be2fb42b8367939b4a4ca725fdfc2dac4123d0559b2e34e6a8e0656f50df4db5c602a2b2 WHIRLPOOL fd682d1efc55fbdd359970075210512e8e19dc8d2cf4542a0f4bc380c9b6dc47d9b8c4e4511a35df634e13579a0ad67e31abd4df44da6744c08473fa3e5de288
+DIST msgpack-python-0.3.0.tar.gz 97932 SHA256 fb6ed5144a9fe2b58d46f8f276417d48dd57f9eea2a94e0f51c6b04e7044f9b3 SHA512 4f4812293efbfb3b970b976d2fb37b5e0402f668ce03a2e1533df30070243c9d72d584f67ee15f76b1914b4928936983846e7e663574bd2cb3316dc69041946a WHIRLPOOL a2904c0fb5274953222af508403e4dbcd743e6917646e2a38bb726c92dd80754d73c6f520e7949a5df9608888fab9854819bd1d214edb565e578001b2dcf189b
--- a/dev-python/msgpack/msgpack-0.3.0.ebuild
+++ b/dev-python/msgpack/msgpack-0.3.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/msgpack/msgpack-0.3.0.ebuild,v 1.1 2013/03/11 06:12:43 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1
+
+MY_PN="${PN}-python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MessagePack (de)serializer for Python"
+HOMEPAGE="http://msgpack.org http://pypi.python.org/pypi/msgpack-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/six[${PYTHON_USEDEP}] 
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	nosetests -P -w test || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/numpy/numpy-1.6.2.ebuild
+++ b/dev-python/numpy/numpy-1.6.2.ebuild
@ -1,151 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.16 2013/02/24 16:33:39 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*::3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.3 *-jython *-pypy-*"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils eutils flag-o-matic fortran-2 toolchain-funcs versionator
-
-DOC_P="${PN}-1.6.0"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="http://numpy.scipy.org/ http://pypi.python.org/pypi/numpy"
-SRC_URI="mirror://sourceforge/numpy/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/numpy-html.zip -> ${DOC_P}-html.zip
-		http://docs.scipy.org/doc/${DOC_P}/numpy-ref.pdf -> ${DOC_P}-ref.pdf
-		http://docs.scipy.org/doc/${DOC_P}/numpy-user.pdf -> ${DOC_P}-user.pdf
-	)"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-
-RDEPEND="
-	dev-python/setuptools
-	lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	doc? ( app-arch/unzip )
-	lapack? ( virtual/pkgconfig )
-	test? ( >=dev-python/nose-0.10 )"
-
-PYTHON_CFLAGS=("* + -fno-strict-aliasing")
-
-# Build system installs f2py${Python_version} scripts.
-PYTHON_NONVERSIONED_EXECUTABLES=("/usr/bin/f2py[[:digit:]]+\.[[:digit:]]+")
-
-DOCS="COMPATIBILITY DEV_README.txt THANKS.txt"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_pkg_setup
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	if use lapack; then
-		append-fflags -fPIC
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${DOC_P}-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g'
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.1-atlas.patch \
-		"${FILESDIR}"/${P}-test-pareto.patch
-
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		# make sure _dotblas.so gets built
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
-		cat >> site.cfg <<-EOF
-			[blas]
-			include_dirs = $(pc_incdir cblas)
-			library_dirs = $(pc_libdir cblas blas):${libdir}
-			blas_libs = $(pc_libs cblas blas)
-			[lapack]
-			library_dirs = $(pc_libdir lapack):${libdir}
-			lapack_libs = $(pc_libs lapack)
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-}
-
-src_compile() {
-	distutils_src_compile ${NUMPY_FCONFIG}
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py ${NUMPY_FCONFIG} build -b "build-${PYTHON_ABI}" install \
-			--home="${S}/test-${PYTHON_ABI}" --no-compile || die "install test failed"
-		pushd "${S}/test-${PYTHON_ABI}/"lib* > /dev/null
-		PYTHONPATH=python "$(PYTHON)" -c "import numpy; numpy.test()" 2>&1 | tee test.log
-		grep -Eq "^(ERROR|FAIL):" test.log && return 1
-		popd > /dev/null
-		rm -fr test-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install ${NUMPY_FCONFIG}
-
-	delete_txt() {
-		rm -f "${ED}"$(python_get_sitedir)/numpy/*.txt
-	}
-	python_execute_function -q delete_txt
-
-	docinto f2py
-	dodoc numpy/f2py/docs/*.txt
-	doman numpy/f2py/f2py.1
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${WORKDIR}"/html
-		doins  "${DISTDIR}"/${DOC_P}*pdf
-	fi
-}
--- a/dev-python/odfpy/Manifest
+++ b/dev-python/odfpy/Manifest
@ -1,3 +1,4 @@
 DIST odfpy-0.9.2.tar.gz 398078 SHA256 8ed47b5e0d0c8fa31f5fcc53896d8201c28b3df018f26d3c1dbc361e44d93536 SHA512 b32cd0949cea192c3418c0fd92e5a7f61473429575044446d41b3d464b78f80da9bde959a3779ad615fa60d5a0392f8df58d4ed74e56a35c6a6c5704dbae92a4 WHIRLPOOL 72a7eb35dcc5e8356b1f9878866897de53f9d5755a16aa25313e32ed04bc77b078115a9ae029ae17c3bc43b0cedf3c334d8fb812f2c06c93e65426942405ef7a
 DIST odfpy-0.9.4.tar.gz 463006 SHA256 e8a8b99c4cf16ef34b22f49dfab27ea9b8be6a18f423beec7fa29af13a7a73c8 SHA512 d6589176187a082f4719f1ad4d1471f71d65cfc7851ef5e9154e85beee7f422065e3c7457900394ff6485c7100d64fea8c4e8b91ff66aefbbf255fe6e4ac588e WHIRLPOOL 7d123cb2f16d2c4edf400744da8bb6c07d4559143d8b13f51733384f9afcf52800739498be5068892b61048318529d1bda0c4e066cb535f488da65eb388dbec4
 DIST odfpy-0.9.5.tar.gz 463546 SHA256 8f62af3d48884dcf257831719d38a9c93cd63cb57202ee6a9165e5d64a5f55e4 SHA512 f013bab0124a29fac2ec853fa0e6eca7027368704e3682f20653110d82d831e73bd2f225fc080d8f0a8fea92c7c196f651ea95622fa51805c9613b917cdf88e6 WHIRLPOOL 5c2c5af759856ce52019cdea491b01a296d1358cbe0b9b6fafbde04e9511a3024e4db8bef685d648936e2d2a5d51803e5d87089d1f52978e81765bf6ad6e2ad4
+DIST odfpy-0.9.6.tar.gz 452061 SHA256 907f62853858913bc3d5b00e4be4f4e5d56ab3f0d51125a54e949824b560f0bf SHA512 6e49e956426695984d634c2409129741b84d093886fe8012dc17196e20abff77bb486c986e497b0f35642ad0de60a8bbf3cf07352d85ea509cab7da9f3fa470b WHIRLPOOL 11625e99a500eb9e6c13b1c1cb19486689accbb2f8dc6f93a858496ba5f60a1513a89302bce24c1603ef0d46a17bca1126a40c4532f9fafb2cab3b0263c1acd8
--- a/dev-python/odfpy/odfpy-0.9.6.ebuild
+++ b/dev-python/odfpy/odfpy-0.9.6.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/odfpy/odfpy-0.9.6.ebuild,v 1.1 2013/03/11 06:23:59 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils
+
+DESCRIPTION="Python API and tools to manipulate OpenDocument files"
+HOMEPAGE="https://joinup.ec.europa.eu/software/odfpy/home http://pypi.python.org/pypi/odfpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PYTHON_MODNAME="odf"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${PN}-0.9.4-tests.patch"
+}
+
+src_test() {
+	cd tests || die
+	testing() {
+		local exit_status=0 test
+		for test in test*.py; do
+			einfo "Running ${test} ..."
+			PYTHONPATH="../build-${PYTHON_ABI}/lib" "$(PYTHON)" "${test}"
+			[[ $? -ne 0 ]] && exit_status=1
+		done
+		return ${exit_status}
+	}
+	python_execute_function testing
+}
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@ -3,4 +3,5 @@ DIST pep8-1.3.3.tar.gz 33591 SHA256 f0697c178f9e1c9ed5071fd1a9a8a99269cf2f66f9ff
 DIST pep8-1.3.tar.gz 32387 SHA256 58dff3f15b5fd15714b9689d1eb461df780fa06cfb29687554aa4bc6d79e7320 SHA512 65ad21208e10a8b3422a4d69c901f2360462d8605086bae801db81bfe6991c30da1401b4b7b81edffb0d8dd9a36387d353d4ac0ed3b799fc5f1c40cf8fe8f573 WHIRLPOOL 5320f50cb2ef74d72c6115d69bb7771bdbf7ef3e5653ef1f2e9abff7faae8ef6d3b4756cea8256f89341e8bf34c56f9b9bb139c3987103e9b3439d90ca5bbd90
 DIST pep8-1.4.1.tar.gz 54945 SHA256 071dbe7109114f0dc3fb5f779f64bb3d08ff51b00a7ebb8dc8aee19f1a95b7f3 SHA512 18d51a99a499d2341fefd4710575f20d7b59e87bfa26394468f3c3df3ed234193268f4ba4342716d2b9a9afd3afb86510d679266d1553b4874582ea5b88ff17b WHIRLPOOL 6828d0912926c8f1b15025a67e38220da3a078377d8837193dec5a97dc8c69969a1c4d0b2b9043af55aa19b638ff1df2847160c94f839c1b89b08c511807e598
 DIST pep8-1.4.2.tar.gz 59715 SHA256 30b373fe9859c39fd1ea3afb67e1894934a73b7b3ed8cb7505e4f5903b88bc8c SHA512 2830b0d66335bd51a63e6fba62443465c20f0653d47f0a7de953639f8dac3efbd32cf18580892b34575c3ee8074c9790d738858ccaf4b0447941c66e7fef630f WHIRLPOOL df6e1430357792efcc0e538318a8a208d3b25c371ddc85aea097eb551e039eb38b0d40731f2693d59b47f38d35bd29f8a13eb454cc25bcaa9d3f7a56c72574a9
+DIST pep8-1.4.5.tar.gz 63021 SHA256 dd908e7df835ebb1b82ba0675e1b7e173ea9c55d7ae62808ecad2e6db2a6ee0e SHA512 c4d8e5b116762480e1aad2ddad1cd02d2d74779adcef8153739c7ca1e56d33bd81b42c984c525797548d915245f24d3cea636d6b89ade8e9e428f31b0a6fe8a6 WHIRLPOOL c597328ce58d226311162c7126c949f92e9142f0fa9a979cdd0ede29f71b839587ef4c5cef57ac8fdd608753f52a6c91220b90807ca9b3b56cc5b5772c688b9a
 DIST pep8-1.4.tar.gz 54417 SHA256 3fbaedba1f61b40760366325825dc36a8fb60a86690f4bec2e1da2e807cbb187 SHA512 dfe357534f924badee5ad88ec9de60d856af29a6332bcacb73ef994f9ca24c7dea8964596dedc45914b82099754c28a66d475c6df716a7e3629706e5cd78ea97 WHIRLPOOL cc276a9219bb49b5a9bb24d6a11b6adb6c3d4020570dd49f972dd9083a41ee2e8964d39e43629c92dba9d4db31c783e73d8c9ccd53dc87515168f7cac6a7fd19
--- a/dev-python/pep8/pep8-1.4.5.ebuild
+++ b/dev-python/pep8/pep8-1.4.5.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.4.5.ebuild,v 1.1 2013/03/11 06:47:36 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker"
+HOMEPAGE="http://github.com/jcrocholl/pep8 http://pypi.python.org/pypi/pep8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGES.txt )
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
+}
--- a/dev-python/pp/Manifest
+++ b/dev-python/pp/Manifest
@ -1,3 +1,4 @@
 DIST pp-1.6.1.tar.bz2 22974 SHA256 4926ad51a9b21753672f71883441287ff3a1a66fc9d6ee0f0e357b8652b3cb98 SHA512 e439dc6e11d15025c69117ae33ed5dbb95a15778d9abd4d35a1c3d98bd48dd260698a86e262f6f25261accb5e0d1ea5a83677fb3450d60396fb3af68e177a3ee WHIRLPOOL 9a6004a49a6168426e6fbe1981cf9f032afe0b74eaba51d3af3429d6c65301ea4e092cc9a664cf3ff7a05465b73cf4f1ce9ee9c7c46b149aba1287e85d8b18dc
 DIST pp-1.6.2.tar.bz2 25736 SHA256 5b5a43b830e36add9f14fe10f6618c2aaa7636151f135b7f9023ecdb8f06b03b SHA512 52e90342473783bc8ef8126484afb45cb1cfa43f9b58824c3537d798c58c6abb3764c32700d411fb8f894912dfdcb83c6004ab13c83a55d9d08f25126625124c WHIRLPOOL 51c1d85afaba75a36600a6db1eeba8c62f660bc16be5e1bd12494c0d1df495ee83063159be72684e4b22648c67d4ad15c70656de375745abfab351d4f34ca5cc
 DIST pp-1.6.3.tar.bz2 27144 SHA256 9fd3ad3e5b16f5ae8085c1a49d5219deb418a2a63cf9ee8ccdc7f1367de168cd SHA512 76584d84e927613f204a012130b26e956291c8a37967e7e938fd2812cbc29b14eb99006b584618e635487f3d689739c4e11aea09b5ce6b57760f4df11e8a2dcf WHIRLPOOL 85ccac32aeca9d8c6bb2f1e1586d8c74748d05caa520b59dedf92ec59d8a9e1fdfbae8a482ba240702fe46130f154c41b255fc83e7d7a5065556bfb422f67ccd
+DIST pp-1.6.4.tar.bz2 27166 SHA256 7f932d8eff4b35357bf5b48c1abd7734a955c98a50138c13b7b9eb36aadaf408 SHA512 213322aaa60e1485b855e96336a01c45407185892dede693c013a200554656ce08799ee23ee4a0cf628b382b98e0519445c99dbb89f209b1b907ac0a1fc8147e WHIRLPOOL fce8fe3ceaeb9e1d4133734107924faec6bcc5b4d862a37629443d0ec1774504956271dfa1af7de8dd2c06012e488e99dbe1220705fe3f4ae7c8cc8f721211da
--- a/dev-python/pp/pp-1.6.4.ebuild
+++ b/dev-python/pp/pp-1.6.4.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pp/pp-1.6.4.ebuild,v 1.1 2013/03/11 06:59:45 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils
+
+DESCRIPTION="Parallel and distributed programming for Python"
+HOMEPAGE="http://www.parallelpython.com/"
+SRC_URI="http://www.parallelpython.com/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND=""
+RDEPEND=""
+RESTRICT_PYTHON_ABIS="3.*"
+
+PYTHON_MODNAME="pp.py ppauto.py pptransport.py ppworker.py"
+
+src_install() {
+	distutils_src_install
+
+	doman doc/ppserver.1
+	use doc && dohtml doc/ppdoc.html
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/examples"
+	fi
+}
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@ -1,6 +1,7 @@
 DIST py-1.4.10.zip 225401 SHA256 b4607de3fe00363067e4e3f1eb6940ce096a8e3f3f835ed777b06a70387cd162 SHA512 0fe1bf8f02e199b4b4ebc363fc3763a181d18e7a4565cadea0e6b3e06afd2ae62c88b62c257e06a1914804e5a1bf69aed59a7899e4646c61e356a336d49b5045 WHIRLPOOL d9dada6821d871a3621214764edc0deaaf72ed2dce7eb325817cc9c386c61a0ac5b8078a255cd4d58ce0f3281637d7e602e3f56205def77777cc327378102dc2
 DIST py-1.4.11.zip 225526 SHA256 47cbcc8d8a29b319c561a32c514e2f83a364a04baa4345e78b3d6b8c7f781290 SHA512 9c20029190934b7dea9fbb8247cdcb53e67464585db4305bced84cca821d4d71beec911ed6b1112905c4a70f4598e7d6d3f0918250d5f6aa7cd2d39e5001e0df WHIRLPOOL 4d66ac6f97a25ea35e2e7baad46e1b3aaba6796598f9bd89fb9a505b7f81aa7b8c95044f2245669ae8597312aa40c626fd841e4369ac656c92bb5f94282acaab
 DIST py-1.4.12.zip 227103 SHA256 36767367ba7517375dc5c1cb066e4f8fe3e05b7eacf3600c011fb510cc45122f SHA512 7165580dc72fdaa11104ae8d897e9ef0f9917ecfe510f5f4ed4e7ee3893f16c5e4eb573b95759ebdc351492f68a9af5d89ecdb8a3ab186058e18a0d1bc790c2d WHIRLPOOL e842b3029a8018dae784cb3649b06f16eee4d2146b7e4d3f5b642c99d0a19e4d67517326c480d76752ac9d87c28a64423336582ab485adde60f39de6d44a6a50
+DIST py-1.4.13.tar.gz 189278 SHA256 ec1dc7fe04066e7ab93e1ac457f04bc301778a48bf368bf1796e84f500fda6f1 SHA512 ee07538dcd5180731fdde5f3f480b4b9bef88e77f125b9926d2787305d7339ca9b6d94a60e1b8f759dc325b1ec4277871bda8bfb2bdb5fcc0863304ecc6fc49b WHIRLPOOL 0b96b9576e0943962d8a14f4252ef60e77edee9280b6e82ff1fb29b17f5ad22071316a72f040756aab1870eef5f668b329fdd37dc6f962104438161f047897bf
 DIST py-1.4.5.zip 225478 SHA256 8425c7140cfc5acf5b67cfb2f2af8d835ab2f6663ee2ca3d7206c1d81e1d35ea SHA512 d82a28599d930508ffbd96e7bedb6a3655b176fc42310184c69a4befd868ea4d6c9936eb5e4e8d5d89482e6e925211f8517d767509a1ea8db072a7fba32fdcb1 WHIRLPOOL 2301988868b61c8f571aab92b73cff76a3b5470b4fb8af5fff7ab1b3721f03775032e80f6a3447147bd31662de9d5515e035b709ad949392dff4986fda4e006d
 DIST py-1.4.7.zip 227360 SHA256 b66ec2289357146be31a5a2050e1e298654da33c95a50b890bc09c764b905ff2 SHA512 091a4e0e73b3716ea91d343066eff0d05e5ae4d20c0416e63d75a4f8b243306eaec7cf8a0a740169f0db8085212a92fa4451393edf94e498d0cfd32296369e78 WHIRLPOOL 45b35cf757af0d60ed92b913fd899ce33175c31917d756a8dd1c1bd5ddf19bd30d59e9efec0192e11a44238acb64e3803fa16bb98d36651ba44cdebca435c1d5
 DIST py-1.4.8.zip 228276 SHA256 e29f881fc54919e0faecc2c44913d1c32ff6fbb7097889bc9b384ddadb4949a5 SHA512 a4221a375e2fb03ff5aa494bdaf29d361ba93d2e57671289c9e27a41c11b5dc3d4d3cae4aac84c7ca0637f44befba7a11f27afd356347c02151aa9f40d6adb32 WHIRLPOOL 32d4a88effcd79cf9fffbbab56ef6f138d008aa02f3e81ff826f665aa1e514c18e7b15df1c17d188b0f9282d00ef879f1881e16f3c038202b5aa54dfa5e17bd0
--- a/dev-python/py/py-1.4.13.ebuild
+++ b/dev-python/py/py-1.4.13.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.13.ebuild,v 1.1 2013/03/11 06:49:06 patrick Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="http://pylib.org/ http://pypi.python.org/pypi/py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+DOCS=( CHANGELOG README.txt )
+
+python_test() {
+	py.test || die "testing failed with ${EPYTHON}"
+}
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@ -1,2 +1,3 @@
 DIST pyftpdlib-0.6.0.tar.gz 128878 SHA256 547afb8bca676e508dbb15c42a9fd3f5af6bdc289781a4c22abd007f74e9936a SHA512 e382a98d4e483b086e0a5055ff034d6fb25feeba32eeab4dce6a17a1d0a2a53571ea9c9b124d7a249d5a7f53f5739cdfdee7553a6db22e1181bc68abfa7b797f WHIRLPOOL 5c0ee7c2ba81a790f580f72a59c040a0dd637627bcd546b1dabe9aea7ccb3d6d9c422ea79c8ea065eed234f582496515ce81e86b5508e3b44dbce22f9c596e4d
 DIST pyftpdlib-0.7.0.tar.gz 94898 SHA256 a11a4b6b5cffa7eab8fb48b24cc90777c21fbedb8873fa15c2231526df0596c6 SHA512 d08a81771538f6b898cb327fd44f2743c8da06d5bff07cd720731dc7f0072f3be6dfba19841b7b6ac3e9c8ba91fdad72c191e0e83e0f8b069f147ccb2f6bc169 WHIRLPOOL aee4d5a9c13eb059eaaf61f2798a194be1e955a0d69c3c7f2e5c06d860ecf837ea282d850b9672ff1a0efc9ce2c1a82fc354d2bad09efe6547440076bc60cf59
+DIST pyftpdlib-1.0.1.tar.gz 116428 SHA256 bec5c2af5942c3970d53b1a9fa27286eba40c2089e3e0ef653ff6f5ed0c4865b SHA512 478f04cb156a6178f03aee40190f17b65e42f04c60311936bf068d11f9ffbd8ae9a118fea456386ccf5184e3fed6270b40b4dfec6523902e310f78ec73785be8 WHIRLPOOL 71b34ef1031b402b2be0d7aac64f796820a20e022fc71fb451777cc4dc50b28ba48dca20608958cd670d90a9baf839c8e4933ddb63b0484fff425faaa5e5e3b1
--- a/dev-python/pyftpdlib/pyftpdlib-1.0.1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.0.1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1.ebuild,v 1.1 2013/03/11 06:27:13 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="ssl"
+PYTHON_USE_WITH_OPT="ssl"
+SUPPORT_PYTHON_ABIS="1"
+# pypy has no spwd.so
+PYTHON_TESTS_RESTRICTED_ABIS="2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="Python FTP server library"
+HOMEPAGE="http://code.google.com/p/pyftpdlib/ http://pypi.python.org/pypi/pyftpdlib"
+SRC_URI="http://pyftpdlib.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="examples ssl"
+
+DEPEND="ssl? (
+	dev-lang/python:2.7
+	dev-python/pyopenssl
+)"
+RDEPEND="${DEPEND}"
+
+DOCS="CREDITS HISTORY"
+
+src_test() {
+	testing() {
+		for test in test/{test_ftpd.py,test_contrib.py}; do
+			PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" $test || die
+		done
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r demo test
+	fi
+}
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@ -3,3 +3,4 @@ DIST pylint-0.25.0.tar.gz 205462 SHA256 433a9c8089a2212d99c4ef954f96b70af6ff3d2a
 DIST pylint-0.25.1.tar.gz 211562 SHA256 5991744c9247bf355a531651fca35f9fd67506892081574677aadd175ec94a00 SHA512 46eafc1b39b20ba5362b3c8e20a835e3524df9da0a5707c1c6df75b15aaa846120d99e7cac13e0d6e888b540b2ca72a5a8e0cbb188ac00c9cbfbea7e634df2ef WHIRLPOOL 06733b38acca2d7cbffb9f97fa0772d3e47a432b31e52d41e040bca51d65273f9ba8cfceb1f8f58117ffa1803606ccf86a20320270ec09169b1625ee598fda72
 DIST pylint-0.25.2.tar.gz 214769 SHA256 08c2a0ccf2d715cdc9a2a0478200c54aac5b4f6d521e10c5b27db65d5787ff07 SHA512 eea1a783ca52623fa2a026fe82939b8a5920b3b6be21b808388bb9336ba85aeded157198a436fcf3ab8735df6cfcf94c352b695db1131490dda2e26305be68d0 WHIRLPOOL b6a4595e14a350c9156ebb6fce3c9c35ada304f0c33659c55266534c4539f871102dfb6c601bd4e0b4a067a5695da28dcefda7e911d7d11325f4672b38dc7ecd
 DIST pylint-0.26.0.tar.gz 222738 SHA256 1f4eadcf65aff81873f77bd5d3ebd23809adc4fbb035049bdef416e7728e0738 SHA512 c341d302d0810d313ac941f3b32154cbe7f73ef3badbf4e0c1433b8ef6f7614a0c17cd27cf752146f3addbf5a682d409a51b5d7444eefd80a4afb9e14d2d0da9 WHIRLPOOL 1036871038b21f9542bd19e2bd287328229bf8d5226881c446b9f0bc915d9703e60fa119e1a3e825e51d6db466145adce7e3088a463fdd379dcd58880443271c
+DIST pylint-0.27.0.tar.gz 224168 SHA256 64506cf00d441fdbc8b9871ca70b8cbe5a8f546ca07fba9ec07890e8ec39cf9e SHA512 fba9351932003bb6c8c3e4d2d600da103857660a1fde5faa5c8ca00251c221f06f5ef9d7fa2b794727cde944b37151fca0aafc69a5b1b58809edf30dd2016c2d WHIRLPOOL d3298a8acfb8f2a99fc6dda101aaed882f805880fbfde568b178b4857cab35a9efac34106d8fa97f6d60cd6bb5f66391bb41816c3ae3ce34f6b734955b1b112b
--- a/dev-python/pylint/pylint-0.27.0.ebuild
+++ b/dev-python/pylint/pylint-0.27.0.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/pylint-0.27.0.ebuild,v 1.1 2013/03/11 06:14:51 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="*:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.7-pypy-*"
+
+inherit distutils eutils
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="http://www.logilab.org/project/pylint http://pypi.python.org/pypi/pylint"
+SRC_URI="ftp://ftp.logilab.org/pub/${PN}/${P}.tar.gz mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="examples"
+
+# Versions specified in __pkginfo__.py.
+RDEPEND=">=dev-python/logilab-common-0.53.0
+	>=dev-python/astng-0.21.1"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+DOCS="doc/*.txt"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.26.0-gtktest.patch
+	distutils_src_prepare
+}
+
+src_test() {
+	testing() {
+		# Test suite broken with Python 3.
+		[[ "${PYTHON_ABI}" == 3.* ]] && return
+
+		PYTHONPATH="build/lib" pytest -v
+	}
+	python_execute_function -s testing
+}
+
+src_install() {
+	distutils_src_install
+
+	doman man/{pylint,pyreverse}.1 || die "doman failed"
+
+	if use examples; then
+		docinto examples
+		dodoc examples/* || die "dodoc failed"
+	fi
+
+	delete_tests() {
+		rm -fr "${ED}$(python_get_sitedir)/pylint/test"
+	}
+	python_execute_function -q delete_tests
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	elog "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled."
+}
--- a/dev-python/sip/sip-4.14.3.ebuild
+++ b/dev-python/sip/sip-4.14.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.3.ebuild,v 1.11 2013/02/21 13:27:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.3.ebuild,v 1.12 2013/03/11 17:50:36 ago Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@ -28,7 +28,7 @@ fi

 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/9"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug doc"

 DEPEND="${PYTHON_DEPS}"
--- a/dev-qt/qtcore/qtcore-4.8.4-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.4-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r2.ebuild,v 1.2 2013/03/03 03:31:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r2.ebuild,v 1.3 2013/03/11 17:49:34 ago Exp $

 EAPI=5

@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+glib iconv icu qt3support ssl"

--- a/dev-qt/qtgui/qtgui-4.8.4-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.4-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.4-r1.ebuild,v 1.1 2013/03/02 15:27:36 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.4-r1.ebuild,v 1.2 2013/03/11 17:50:05 ago Exp $

 EAPI=4

@ -11,7 +11,7 @@ SLOT="4"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"

--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@ -10,21 +10,31 @@ DIST eric4-i18n-tr-4.5.8.tar.gz 357112 SHA256 d3e2cba04180077839ea2191ccefe92dcb
 DIST eric4-i18n-zh_CN.GB2312-4.5.8.tar.gz 390605 SHA256 6fc5d2c1d5f1e0051c2f1d6bbf833c6da733c83dda8962a19d12eb52f8aef900 SHA512 2dadde05955d0fff4d6b7911210a25d3ecbb5c704af418e1bc7b319a24ecf9e8fd239be38182790749c683a99b7518c7708de1081b9f6139b3115831c05547f7 WHIRLPOOL 23c9bec71b4be60b120ae0f7640f90d4bbb7914ec2123243ebe35aee72cdfdec8afbfeaf65f2b0b511c6d3bc46f2e1ca259f4f61425764e0f379ba230722ced7
 DIST eric5-5.2.7.tar.gz 8966287 SHA256 4606f5808a49e99875b35295e416d71417d73f518f400f3795a89e0decceb877 SHA512 e37347c9b335e7d325631cd0cc05fe7b628f94a5695569486d1d0a03b02a437b1554bec2721f6e35966ddd19af89bb9dc43ef48d1ff675c05944673fe27d163d WHIRLPOOL 352bec3c2abea5a82845f607c74bf74704b059508ce47f56060ccf60aa0d514ba4d8039b8dfe16f95053d3141ab8ebb9e9b192ae2b131f0cbd09099d75e38ba2
 DIST eric5-5.3.0.tar.gz 10177882 SHA256 7a696e706d79ff305767cbaf01ee9d8476b6c75bb8395947224a2dd70b83645f SHA512 4dcee264c99dd83bb41b0e437098607302532f0c6cfa331dae76126e0f86746e7c3baee119343314ae92b11736859672a6e546f97e6877a076df4be149872c6d WHIRLPOOL 54e95e22686a7d62cf11e02d70c3d7d63ff565d0d524d2b01cf1644588b6832a88791f08c599efbfd179acff30ec3c5c4b0766ca9406a52d8e7c1a3d3859f8c2
+DIST eric5-5.3.1.tar.gz 10162745 SHA256 e9fb13a6dd67985336a9db593391c88424526ff29eff0a887eebc48fc2d238f0 SHA512 8b41a41ef86fdf9c96df2a2b0fe17c5546a01f843897591bf518f7f46691325ec3a883b01a3a5cf81233e5100787be60953282f7480535859e21d66a5a0718c8 WHIRLPOOL fad8e273b193bb915cb63ce319a8a6eaf644bc79d03bcb67ed14ad1ce629f223cdba7541c2b4eb1db781eeb653893317cda6d67eaf6f9dbb9e5e2405604265a7
 DIST eric5-i18n-cs-5.2.7.tar.gz 530543 SHA256 762cfcc5819bc9a64e33bcaaf1edee9e8e1db54cf7f7fdf9d42c7a8810c12e0e SHA512 eb95cbf9f71644f843bedadab61ca293f285afa81978a140ac6fb0494a623039723d99efc1004b1db98e19d286a2ab89dd2b4a2babdce71f0d190a5209017726 WHIRLPOOL a8489e1bd6e96e03df5bc47dfd401b3f007c3a80cc82ccea1301be6c33e5a5d4d600ce9594cdfd8a8d034299f3323983f328fc3a8b5c218162a1ef327c0b8d7f
 DIST eric5-i18n-cs-5.3.0.tar.gz 559476 SHA256 3172e2da0d2427efa2c373dd6abaab4b82b9f12c68889573e168bd1bba40b632 SHA512 f29f7d7cd5b7e9d0fb738f9aa24eb8e20b2e4bfa9e9707b85fc8e2ede599b1f5610bef3f87491ad37cee977c584e03e547dc0d4d67bd43149fe692fbe1a4309a WHIRLPOOL 7304c814be05cacef1dc8a1126918fe764f2ff2ebe0dfc95f9bcad871c0cb1d06f2cedd01d6a76d537088459c83de5ced3ad76ed4b8ca9c16ec2d977af8edf25
+DIST eric5-i18n-cs-5.3.1.tar.gz 559585 SHA256 d8bc7e68832270d2b8ab24b42a2457938b404214f7ba8488821f45b408f10b0f SHA512 2612c038b756eff34c5c540b6d3688390991ff8ce93ad686e26da4bf4122e3f6288eb74013f0feb8da7fbd537285f658c86ab992b7784d513890a85958dbfa4a WHIRLPOOL e2eea01739162334a3eea0e40feedd8be50f68a03d32e30da26e08a403afba08c2bb6db86b5e954373f6d161deccba600857dad77e2bbeece207071519dfcc55
 DIST eric5-i18n-de-5.2.7.tar.gz 601297 SHA256 9f53bacf3d39b5f8b9d6600a083e7b46db08b8468cf83ddbfb43077810275db0 SHA512 4e45c6cb54176668eecf297ae7d5d3bd404497c948772d96f15a95d56b2d4b9d3af86db4dd284035f815da04e92ecc303fd92c7e1ea04802dbb5542033674d66 WHIRLPOOL fa61391cf9951102f86b6187a503dfeabcc6934b97d50de49111586c82f2801a3ae2f3231bd540f57c376f01e93f8c3ec20961185d270f94b2f3195a023460d5
 DIST eric5-i18n-de-5.3.0.tar.gz 680999 SHA256 4c9211511762bb31797198f06c0c50b56e92c4177178e0892972c75ed0781e9b SHA512 81108247980bc0bf0a07069cac259a3ec6c40646dfa24a2575c9b228633b61fc81351d8bbfdfa9890b61383415e570603f243b2ea983c3a317e8c0b3374bbe54 WHIRLPOOL 468bdeaad5ba9818f91f5859076fd5b1137ac992eec294bcc9c9af53bd7fb6ad83ed13ba59ffda045e5387be3152c5120865a9903b868be4a97d89d31bb554a4
+DIST eric5-i18n-de-5.3.1.tar.gz 681061 SHA256 8244acbf890a1bcfd46f1d69671388b693a150fe80bd67ca571ebd6a6b869a7d SHA512 a3aa0ee909378fe9c6dbb36f7fc993341a74c860ada9f11737a7f0c56a3bf7237e1622ed43f4eeec5bf612587ea4923829449d79668cfc3380964065a29505bb WHIRLPOOL 934f925c01ba11659e2871d33895c78e9785464a23494c7fb90499551ca7a1fbeb24f48c11a82ee7c5fa3d175a6a8265a02b40706c5936b5bc3bdca7d584e1d6
 DIST eric5-i18n-en-5.2.7.tar.gz 163428 SHA256 c16ed90e9be30ec12b0b5fc481739d1e9a362c695c07a1c21fecae6262009b02 SHA512 c6e34887bf4b5ff2a0f6d074e31bf549c7222c15b20f46e987fea286ab6ef826a47384b5326ecd03bb6de3618d115897abc84a6ed616d3398966128ce74f50c4 WHIRLPOOL 6297e1d1fad008966456098549dae2bf3ec83dd58d3a8308b18bb4b4eccb4e60ae12d273c6219e9eaf81cee360374bc99385be4fd9e10149a040cfd1923f0690
 DIST eric5-i18n-en-5.3.0.tar.gz 185613 SHA256 10fde1e77ed5acea58cf8d805e113daa5caa93c2ca922a2f5c75f5e6c3dbfa10 SHA512 a51be06466030375980440ca917d56ccd94e0a3da071bac1296c60b211d824751e678640c6fc9fced8d2abcc931d0ec9c253ccbf39267842955f647e405a702a WHIRLPOOL 32905902758e196ba0c0371190e8b5e51ecdd28741337ad52c06c062f1feafd3457a48780d2058d2903a0138f87646a183b2e28ecbec177056fdffb93e114d8f
+DIST eric5-i18n-en-5.3.1.tar.gz 185613 SHA256 e0f8c09baa56fdc3475b900af1ddac5e125b4479e83c2590aba67e8879e6c844 SHA512 49dc6c9950dec17e1fc3738f848f78cbc9918c6a2b455a8029068dfa4d148c21f94176e94b28421b68769dea4c6975ecc0c2f1094ea0620e3489b4fa006b62b9 WHIRLPOOL f00d3f9e18a4e9f011d2426b610f488fd567e2a44fe0f98463ef7509f5f8199c31e47a46dcc5a6c4b2d97964507a4a6dd5c418a1c1579af35494959ea8cdaf6c
 DIST eric5-i18n-es-5.2.7.tar.gz 605586 SHA256 b8518b522d7fbebc88d551c559480776e4b320841791056acea3d2f6a05e6cfa SHA512 09d54abdf66dad6cd1ae183e86c4315d53518a9eb701e714db5f6b7f66c37a33421d0d1398849e1443ba0d542a2854f6d393eb0c4f0523d58f1b711af5609249 WHIRLPOOL 2e65808b0469e7b653b48ec43c3b4714009a6a37146ae8832848f0e2e9c0719e38dc0689562487b207525e83ba50e46e0c274847c00638b248a2feb010afa33b
 DIST eric5-i18n-es-5.3.0.tar.gz 685444 SHA256 f9786bd44ca3e947f7240b65d56b1aa96a23a03ecc1c792d3b7d5d71619d1fcb SHA512 91a494a9e94f3a74bf1243a0ea43b5b1f1cd22cae21f8b7359ec53641e8671f96dbf92a543e630310a197277d40a34ea61a20701032a5ef5604dc3d00aeaad63 WHIRLPOOL cb42e0fbd8e026f9e5c5711504cf6ced1875f9f8b2541d4a47b61d33a25123f3ffcbcf28f94892077f1c035dee75b3041b0dad7017dd15134d1840ead1f2c8b1
+DIST eric5-i18n-es-5.3.1.tar.gz 685621 SHA256 aad35728e2a2ab1f9b758a18a81d09f9005a2df49158920c2461c78cd4dbec14 SHA512 ea3b0e0e15ddf06641016d7e3a9d17e7e461481179efbb063ae585ab77e8229de04ac896d8d31e77bcbaccb548db7fdcbff52e4c77881fadb970559dde63cd1a WHIRLPOOL 51600ad565bd205f64b9922d748097380a865a82223a47b6658844675d3ad61ea29d2314c16a713dbe6f42262c19bab985ed9e498809ab95cc55d94f1785880d
 DIST eric5-i18n-fr-5.2.7.tar.gz 469738 SHA256 466c13b436f307b312fc6b10ecdf08ed828dea62f0e62934d2a589ffc1df88d1 SHA512 10fd39d20d70e2f9066ad498033204611d1c48497ad421c934c2bb84f9cc57697da5bb5aff48ee83b4d9abcaabbf484942353fdae8390e9ea18466e7c14fe3ea WHIRLPOOL fb95a7108aedc95fa6b5cb0ad227c9eac6ad8dd1f863f14ffbcd12b32d2bfd928976b305e36467fe540ec43d7aefe66bcb95463367f17a918dbf3cf63fdaa5d8
 DIST eric5-i18n-fr-5.3.0.tar.gz 517809 SHA256 bdb39a14e3f1e46d4c59ed59f09214ccbc8524cec50ce9ee19b8d340f837a69c SHA512 104a53e72f2fce8c9fb53415110062565548be20c409b5d6128aa38eca6fc15e06167eb3bc509ce25d7eb7f2912735c7307923193e6bb5136cd6ad9697c0d902 WHIRLPOOL 50721c72a17214e89362594729249a4ed84515a6d77fe3348c0730faf62a743db91b1038e47630cdfadda018effae68ca49b9fcbf40a80566c330b9de1673c8d
+DIST eric5-i18n-fr-5.3.1.tar.gz 517855 SHA256 35234937ff5a69b6de23109649153fa93b398bcf09a3a3cbc1fafa4e307aa78c SHA512 48d7e6b37c14ed9c602487c860b6a5765bfdb36624886a013436ff907b9382f735d28154de17986495d5728d72e7b053c258771fdef869f54eb3d1d5390b4493 WHIRLPOOL 5a67c4550ed00fc642ffe9bd0a387da533faa1be5a4a2229a9657716f0973edf713b45faa59d3739e5d2ae538beae987e9c8b73cbd202e762b7af1a831939fab
 DIST eric5-i18n-it-5.2.7.tar.gz 547563 SHA256 7ed6cbc6e48648c1651e02fe5bd377b659565cb4bf97a82ea1b7570c7a6f341a SHA512 6ca89440e4c3cb7f99f06a27120d6e6ba1f72441f4331b05725730ead0d13e21e227dce103a0fe517e06e28cdb327ed042f98de096a867aa0abe119f6b9f3a90 WHIRLPOOL 33e090f390c5125a20c8d9abae1f26f39345b23bae18d4b8106f67fdf5ad89d9af7e52bfefaa117bd7965c422b7e16110cd63e6af2afcab9b3ea1683e5a95970
 DIST eric5-i18n-it-5.3.0.tar.gz 579134 SHA256 c7b0589eb6530b38965f1e4dcf0eaed217d9e2ee086b4888504a9202ea02b026 SHA512 37eb2ee9ba9ed9d1abb32a6966354316186048c817785626f951da41540d7c49c622206eee6343c8dec79fadc450adf6e4f980f6c72fcb15bb0c9ab41c4a7a0a WHIRLPOOL 210a0e8be05e01b8f1e5f2b83e5b7153e1f4c3beae667ffd2f89d374e0a5e2bb6d821de9057562ba68eac0db2910dc537e9f2e9433dc0d4295c3186691eb70fe
+DIST eric5-i18n-it-5.3.1.tar.gz 579259 SHA256 fe64f407383f40b2eac36ca6397de20328bd9640e2c1127c3afe8a96763fa5fe SHA512 1f1c34d0168fe911e4d87ffbb2e89ef9ea1c91c922c0add0e11a0d14034c1de532d40aa3fa40a151617b5311a4588e534566dabbc101d7d8e87de46aaf53da79 WHIRLPOOL e78e327f98aae1dc482c9ce841e8fe9b6847b04f73d90cd0939edf42503f32fff8119406a68312e417528db5579d4348197c80d64e023c1bd33819a3098d0c2c
 DIST eric5-i18n-ru-5.2.7.tar.gz 577414 SHA256 06edf77e4ab0cec76a916c099eadb11079d2c884ff153bb984f751897ba9e082 SHA512 60c03fef08e863969a24ba55125f79250c29e6b946cb5258e083543684e5654531f8b6ad203ea2e489a56b35d7e8f689f645002512cf764df35ac31b2975ef69 WHIRLPOOL ed5464fd9496aef7d6d156460196587d22142a5bddf6d005e35b9a9459244f3bf45558627491c9d1d69348d0f3d089e89e1c4609e36583aa979b141fc7af6ef1
 DIST eric5-i18n-ru-5.3.0.tar.gz 608117 SHA256 6427eb5c00e8c9fac47c65cab1c05b094fcdffb09d111110d8d6d072666c5d15 SHA512 5a1d6226e9de3a11e421dc4fe87bcf3ce7fad9d5d4cf08ab5353b8381267888736170c2689c87be96687cc563050540ff1603daac05b86aa4524fe9dddf8ccdd WHIRLPOOL 88030a04cdd182cdb309671e276a037bb88682996b7955d445bdcbffbe2f83eb0d7d062dddfc991c69ab812f059eb8ecda5647649d953dd5d2eba74ed64918a6
+DIST eric5-i18n-ru-5.3.1.tar.gz 608269 SHA256 5850023533a3a5e73cfffbf9a57c4109091a53cc543259b254d1a1d10f027549 SHA512 b0df3ec6214acd9a643ed2cd20cd8e2fc67885abdd5c6f3f9694d0e4101b3f670ffd8ae391a97fadb8ac17d2b44d901acc23e38cfacb248db53a4502e4d00cf0 WHIRLPOOL ef9760e0b0305b272584d5714bca50dd4866f463aeceebc6f7c3e99ce8b2855ebd7ce5a565435d6f076bfac6e361ee017805bfd9805645b28c28f23597c3b043
 DIST eric5-i18n-tr-5.2.7.tar.gz 450746 SHA256 2fdbf504e83de53081009f61350fb0f4f781cd5bf6469c415bca77ead4ed0f2c SHA512 98d96dbb0793457bd5ea2cb9658db7de24c991003aa3d9c95cdb749ecf7d4fddb816e81be3365b5924bff16e0ef91b33cf50f66d77b2b08cc86a76a47119035d WHIRLPOOL 1fd0cd73af7262070218ab6d9f1331854c74eea7b87d6ed7b5f2f995727bd6ddc250b05437cac9a58fa636f5ec08b309aa3213b95f5addc47dc9060bb8dcbdf1
 DIST eric5-i18n-tr-5.3.0.tar.gz 480273 SHA256 23207be03616f1b8da96a12309400797e8673eee97fb57472435d20456155976 SHA512 d6068a9c019f6bf5fb1f08b26a40864e158fcbf78578191b615e43838031338a21963b572e450598807301b6c6d2123c133b1ed20886e50cbfd6e99180680102 WHIRLPOOL c39e639f3aae82ade40476990fe6953a9b969903b3d316f547596b3fe3bcf449ec0588cb3d35d0d34ee7af96a0f7c416fde0a4dc66245176de8b9714e46bf1c7
+DIST eric5-i18n-tr-5.3.1.tar.gz 480334 SHA256 67294b79be72cefde4d4e3693bc7c65f1025fc2785dc72c43f5d11e9288f7cc5 SHA512 554533d219d6ba9ca75070dcca1006d29266e4bd547c87502d168ce4b6c063ad425d5c15ba34fa9a1bef824e47f5f5fbd9352c5dce75bcce2be32942bfc7189d WHIRLPOOL 33af83b92debb7ea5afc3542844d00a801e2940167364de532a21f4a6f0fb061afdc3201c5e40debf202f0ed0c90271f7493e2600aa7618590e143130255f669
 DIST eric5-i18n-zh_CN.GB2312-5.2.7.tar.gz 436691 SHA256 a61b3737c5a4621b3f65bdbe4713cf519b93625fe3dc225d1088a76869580d39 SHA512 9f655b960e69d7e8ac7857661ee88ff256451aa2682bf7cb9064e2f570c0211527e0f8afd697b37e7a99512faaa435dff7dc9e97e762ca3d5ef256ad13c760f2 WHIRLPOOL 5d40cc5d836a936b3c84ea66ff1269c99be0111a2ce774717e4f4c5c1c0f35099bc555d868a36e64cdc3e1643b1f3300c2aa7d5936e37e9d00ba70352a72b315
 DIST eric5-i18n-zh_CN.GB2312-5.3.0.tar.gz 464865 SHA256 c33c5d4db7e6d094faccce79fd821055ae586936ac3489e8c567257a4cea6cb1 SHA512 827cecf3e037bfe967515ef931d7b8d512c3fc8d913cbcdc9ab4dd479ca71a662c0e6b0ebee0bb5fd52ce779693c6b194fa6a98f1c6dcd863ee14af85f9f48fc WHIRLPOOL 29959261ebbe1d55bdc51f0d9f9d43efaef5db890a149759bda0fd138abe3be6a5d3025f91ce35d0f902a3a6c89755b97fc12a40b90aa9eaf595586f760630ba
+DIST eric5-i18n-zh_CN.GB2312-5.3.1.tar.gz 464924 SHA256 c4656e2d866ba68cc10dfb63c8191ede90686d2bbb579505b044eabfa03779d7 SHA512 6f60e88f96a6934a74955af4e61d9ab76a9dbe6d4e78e2399a596572939d28a8e9d4c2d43c75ddd53b7e22bd2e4630b6d1e5713cc917c5b65bb5b6ba0cdae43f WHIRLPOOL 1f253bffaff2a40c92f5f3342f3a877d679011f8a42948e5cd6f5cfff1d6b83229118ba655ca6b640cc9e127b8717aa106bf18412f1114027f5fcf0cec5306ed
--- a/dev-util/eric/eric-5.3.1.ebuild
+++ b/dev-util/eric/eric-5.3.1.ebuild
@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.3.1.ebuild,v 1.1 2013/03/11 09:42:20 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="3:3.1"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.* *-jython 2.7-pypy-*"
+
+inherit eutils python
+
+SLOT="5"
+MY_PN="${PN}${SLOT}"
+MY_PV="${PV/_pre/-snapshot-}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
+HOMEPAGE="http://eric-ide.python-projects.org/"
+BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
+SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="spell"
+
+DEPEND="
+	>=dev-python/sip-4.12.4
+	>=dev-python/PyQt4-4.9.6-r1[X,help,sql,svg,webkit]
+	>=dev-python/qscintilla-python-2.6
+"
+RDEPEND="${DEPEND}
+	>=dev-python/chardet-2.0.1
+	>=dev-python/coverage-3.2
+	>=dev-python/pygments-1.5
+"
+PDEPEND="
+	spell? ( dev-python/pyenchant )
+"
+
+LANGS="cs de en es fr it ru tr zh_CN"
+for L in ${LANGS}; do
+	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
+	IUSE+=" linguas_${L}"
+done
+unset L
+
+S=${WORKDIR}/${MY_P}
+
+PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
+
+src_prepare() {
+	# Avoid file collisions between different slots of Eric.
+	sed -e "s/^Icon=eric$/&${SLOT}/" -i eric/${MY_PN}.desktop || die
+	sed -e "s/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/" \
+		-i $(grep -lr "eric\.png" .) || die
+	mv eric/icons/default/eric{,5}.png || die
+	mv eric/pixmaps/eric{,5}.png || die
+	rm -f eric/APIs/Python/zope-*.api
+	rm -f eric/APIs/Ruby/Ruby-*.api
+
+	# Delete internal copies of dev-python/chardet,
+	# dev-python/coverage and dev-python/pygments.
+	rm -fr eric/ThirdParty
+	rm -fr eric/DebugClients/Python{,3}/coverage
+	sed -i -e '\|/coverage/|d' eric/${MY_PN}.e4p || die
+	sed -i -e 's/from DebugClients\.Python3\?\.coverage /from coverage /' \
+		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
+
+	# Fix desktop files (bug 458092).
+	sed -i -e '/^Categories=/s:Python:X-&:' eric/eric5{,_webbrowser}.desktop || die
+}
+
+src_install() {
+	installation() {
+		"$(PYTHON)" install.py \
+			-z \
+			-b "${EPREFIX}/usr/bin" \
+			-i "${T}/images/${PYTHON_ABI}" \
+			-d "${EPREFIX}$(python_get_sitedir)" \
+			-c
+	}
+	python_execute_function installation
+	python_merge_intermediate_installation_images "${T}/images"
+
+	doicon eric/icons/default/${MY_PN}.png || die
+}
+
+pkg_postinst() {
+	python_mod_optimize -x "/eric5/(DebugClients/Python|UtilitiesPython2)/" ${MY_PN}{,config.py,plugins}
+
+	elog
+	elog "If you want to use Eric with mod_python, have a look at"
+	elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
+	elog
+	elog "The following packages will give Eric extended functionality:"
+	elog "  dev-python/pylint"
+	elog "  dev-python/pysvn"
+	elog
+	elog "This version has a plugin interface with plugin-autofetch from"
+	elog "the application itself. You may want to check those as well."
+	elog
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${MY_PN}{,config.py,plugins}
+}
--- a/dev-util/febootstrap/febootstrap-2.11.ebuild
+++ b/dev-util/febootstrap/febootstrap-2.11.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/febootstrap/febootstrap-2.11.ebuild,v 1.1 2012/06/14 17:09:49 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/febootstrap/febootstrap-2.11.ebuild,v 1.2 2013/03/11 15:47:51 maksbotan Exp $

 EAPI="2"

-inherit eutils
+inherit eutils autotools

 DESCRIPTION="Fedora bootstrap scripts"
 HOMEPAGE="http://people.redhat.com/~rjones/febootstrap/"
@ -24,6 +24,14 @@ DEPEND=">=sys-apps/fakeroot-1.11
 RDEPEND="${DEPEND}"
 QA_EXECSTACK="usr/bin/febootstrap-supermin-helper"

+src_prepare() {
+	# https://lists.gnu.org/archive/html/grub-devel/2012-07/msg00051.html
+	sed -i -e '/gets is a security/d' lib/stdio.in.h
+	epatch "${FILESDIR}"/remove_all-static.patch
+
+	eautoreconf
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc TODO README examples/*.sh || die
--- a/dev-util/febootstrap/files/remove_all-static.patch
+++ b/dev-util/febootstrap/files/remove_all-static.patch
@ -0,0 +1,12 @@
+diff --git a/helper/Makefile.am b/helper/Makefile.am
+--- a/helper/Makefile.am
+++ b/helper/Makefile.am
+@@ -40,7 +40,7 @@
+ noinst_PROGRAMS = init
+ init_SOURCES = init.c
+ init_CFLAGS = -static
+-init_LDFLAGS = -all-static
+init_LDFLAGS = -static
+ 
+ # http://www.doof.me.uk/2010/05/07/cute-objcopy-hack/
+ ELF_DEFAULT_ARCH = $(shell $(srcdir)/elf-default-arch | gawk '{ print $$1 }')
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@ -1 +1,2 @@
 DIST geany-1.22.tar.bz2 3198289 SHA256 901a35a7395ef10a80fb10b3ab63bae3871693a4e82d56388e9521a27877577e SHA512 59c411dc8df9f92fd26dc1c4ba65d18c92a2a9e84ae4413153d697ccd90f00d1d437ce63700e3198869dc11dcb8c81920df57a75b5a95cebeb88a364418869cc WHIRLPOOL 8c63308feecf1abb730671c077efc97ee788ac2bed90d0400b7480946eeb9c84e16a3c7b38a46f356eb6f51d68972c8b7b4c0c62b37a3ab95ff003a712a494d0
+DIST geany-1.23.tar.bz2 3622917 SHA256 cdd4a772694803c837ae59e56f7bdc2faba174509317211f522e7d25dfcbe8b0 SHA512 d8e8bc10a488bb1b727e55b710eaf01f944d6c16e5ea93d0ef521a5d9fcaecad85c497314fae8478e6912999bb4c39716f25acfb22852e0f1d813aecb16d054f WHIRLPOOL e70f0bbf70de76566137a03289524bd4521707f80610b7f52f76e969136f89bdae9e2c15795db85079e043d089903341f73fc6f028a4e24dab135ccdeb79346e
--- a/dev-util/geany/geany-1.23.ebuild
+++ b/dev-util/geany/geany-1.23.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/geany/geany-1.23.ebuild,v 1.2 2013/03/11 12:57:48 polynomial-c Exp $
+
+EAPI=5
+inherit eutils fdo-mime gnome2-utils
+
+LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
+NOSHORTLANGS="en_GB zh_CN zh_TW"
+
+DESCRIPTION="GTK+ based fast and lightweight IDE"
+HOMEPAGE="http://www.geany.org"
+SRC_URI="http://download.geany.org/${P}.tar.bz2"
+
+LICENSE="GPL-2+ HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+vte"
+
+RDEPEND=">=x11-libs/gtk+-2.16:2
+	>=dev-libs/glib-2.20:2
+	vte? ( x11-libs/vte:0 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+pkg_setup() {
+	strip-linguas ${LANGS}
+}
+
+src_prepare() {
+	# Syntax highlighting for Portage
+	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
+		data/filetype_extensions.conf || die
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--docdir="/usr/share/doc/${PF}" \
+		$(use_enable vte)
+}
+
+src_install() {
+	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install || die
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
+	prune_libtool_files --all
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
--- a/dev-vcs/git-sh/Manifest
+++ b/dev-vcs/git-sh/Manifest
@ -1 +1,2 @@
 DIST git-sh-1.1.tar.gz 26616 SHA256 2947304d328c9db77268840e29eb19abba7252f84b98f1d5ea957c8b906638ab SHA512 c6704b7340b2da5ca1a0484461cbf6f51c2428254f036254aa6bd2577b8e492ab65dbf7b2c7b2e6c944e3f9df9f3fb8bdca768ed7ce7a26554c821bc3f231882 WHIRLPOOL 22b578c631130bf3f951daf20258b356dfed48a69595383dbf0cbe6ecd6861940a721c03763511b45cf3f25d6334df9f4b85f63b989990343f8618c715bbfcb0
+DIST git-sh-1.3.tar.gz 26757 SHA256 461848dfa52ea6dd6cd0a374c52404b632204dc637cde17c0532529107d52358 SHA512 8ab742d0ff86e8387d03e2e190eec8ffd4725b1bfa58940f6673f5eac8c749931e3b3f8f20b898d933db36f56b323f800dba47a35294f865f456512f19a7846c WHIRLPOOL 01cd40187e0fe5930c1f53fba9708bc56ed14db20a5ecda897bdef1fe8a36bcfddda317a6cddef9297deb8956592c5003f15516afe22b9175354d4f0ac9b4aa4
--- a/dev-vcs/git-sh/git-sh-1.1.ebuild
+++ b/dev-vcs/git-sh/git-sh-1.1.ebuild
@ -1,9 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-sh/git-sh-1.1.ebuild,v 1.2 2011/09/13 21:22:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-sh/git-sh-1.1.ebuild,v 1.3 2013/03/11 16:46:34 jlec Exp $

 EAPI=4

+inherit vcs-snapshot
+
 DESCRIPTION="A customized bash environment suitable for git work"
 HOMEPAGE="http://github.com/rtomayko/git-sh"
 SRC_URI="http://github.com/rtomayko/${PN}/tarball/${PV} -> ${P}.tar.gz"
@ -16,12 +18,10 @@ IUSE=""
 DEPEND=""
 RDEPEND="dev-vcs/git"

-S="${WORKDIR}/rtomayko-${PN}-a59681d"
-
 src_prepare() {
 	sed \
 		-e 's/git-completion\.bash //' \
-	   -e 's:/local::' -i Makefile || die "sed failed"
+		-e 's:/local::' -i Makefile || die "sed failed"
 }

 pkg_postinst() {
--- a/dev-vcs/git-sh/git-sh-1.3.ebuild
+++ b/dev-vcs/git-sh/git-sh-1.3.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-sh/git-sh-1.3.ebuild,v 1.1 2013/03/11 16:46:33 jlec Exp $
+
+EAPI=5
+
+inherit vcs-snapshot
+
+DESCRIPTION="A customized bash environment suitable for git work"
+HOMEPAGE="http://github.com/rtomayko/git-sh"
+SRC_URI="https://github.com/rtomayko/git-sh/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-vcs/git"
+
+src_prepare() {
+	sed \
+		-e 's/git-completion\.bash //' \
+		-e 's:/local::' -i Makefile || die "sed failed"
+}
+
+pkg_postinst() {
+	echo
+	einfo "For bash completion in git commands emerge dev-vcs/git"
+	einfo "with bash-completion USE flag."
+	echo
+}
--- a/Show More
+++ b/Show More