Sync with portage [Thu Sep 26 18:08:39 MSK 2013].

2013-09-26 18:08:46 +04:00 · 2013-09-26 18:08:46 +04:00 · 36d6939f68
commit 36d6939f68
parent aadfe681a7
3517 changed files with 8817 additions and 8908 deletions
--- a/app-accessibility/speechd-el/speechd-el-2.5.ebuild
+++ b/app-accessibility/speechd-el/speechd-el-2.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/speechd-el-2.5.ebuild,v 1.3 2013/09/22 06:50:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/speechd-el-2.5.ebuild,v 1.4 2013/09/25 17:29:54 ago Exp $

 EAPI="4"
 NEED_EMACS=23
@ -12,7 +12,7 @@ SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"

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

 DEPEND=""
--- a/app-admin/eselect/eselect-1.3.8.ebuild
+++ b/app-admin/eselect/eselect-1.3.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.8.ebuild,v 1.8 2013/09/23 19:22:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.8.ebuild,v 1.9 2013/09/25 17:31:30 ago Exp $

 EAPI=4

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

 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-2.5 )"
 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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"

 RDEPEND="sys-apps/sed
--- a/app-admin/glance/files/glance-2.initd
+++ b/app-admin/glance/files/glance-2.initd
@ -0,0 +1,71 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance-2.initd,v 1.1 2013/09/26 00:58:07 prometheanfire Exp $
+
+depend() {
+    need net
+}
+
+BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
+SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2)
+SERVICES=( api registry scrubber )
+if [ ${SVCNAME} == 'glance' ]; then
+    SERVERNAME='all'
+fi
+
+checkconfig() {
+    if [ ! -r /etc/conf.d/$BASENAME ]; then
+        eerror "No glance conf.dfile found: /etc/conf.d/$BASENAME)"
+        return 1
+    fi
+    if [ ${SVCNAME} == 'glance' ]; then
+        for service in ${SERVICES[*]}; do
+            if [ ! -r /etc/glance/glance-${service}.conf ]; then
+                eerror "No glance-${SERVICE} config file found: /etc/glance/glance-${SERVICE}.conf)"
+                return 1
+            fi
+        done
+    elif [ ! -r /etc/glance/${SVCNAME}.conf ]; then
+        eerror "No ${BASENAME} config file found: /etc/glance/${SVCNAME}.conf)"
+        return 1
+    fi
+    return 0
+}
+
+
+start() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Starting ${SVCNAME}"
+    if [ ! -d ${PID_PATH} ]; then
+        mkdir ${PID_PATH}
+    fi
+    
+    start-stop-daemon --start --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" --exec /usr/bin/glance-control ${SERVERNAME} start 
+    
+    eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Stopping ${SVCNAME}"
+    
+    if [ ${SVCNAME} == 'glance' ]; then
+        for service in ${SERVICES[*]}; do
+            start-stop-daemon --stop --quiet --pidfile "${PID_PATH}/glance-${service}.pid" \
+                    --exec /usr/bin/glance-control ${service} stop /etc/glance/glance-${service}.conf
+        done
+    else
+        start-stop-daemon --stop --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" \
+                --exec /usr/bin/glance-control ${SERVERNAME} stop /etc/glance/glance-${SERVERNAME}.conf
+    fi
+    eend $? "Failed to stop ${SVCNAME}"
+}
+
+#restart() {
+#
+#}
--- a/app-admin/glance/glance-2013.1.9999.ebuild
+++ b/app-admin/glance/glance-2013.1.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.9999.ebuild,v 1.4 2013/09/14 09:35:34 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.9999.ebuild,v 1.5 2013/09/26 00:58:07 prometheanfire Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -61,7 +61,7 @@ PATCHES=(
 python_install() {
 	distutils-r1_python_install
 	newconfd "${FILESDIR}/glance.confd" glance
-	newinitd "${FILESDIR}/glance.initd" glance
+	newinitd "${FILESDIR}/glance-2.initd" glance

 	for function in api registry scrubber; do
 		dosym /etc/init.d/glance /etc/init.d/glance-${function}
--- a/app-admin/glance/glance-9999.ebuild
+++ b/app-admin/glance/glance-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-9999.ebuild,v 1.5 2013/09/12 04:47:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-9999.ebuild,v 1.6 2013/09/26 00:58:07 prometheanfire Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -57,7 +57,7 @@ RDEPEND="${DEPEND}
 python_install() {
 	distutils-r1_python_install
 	newconfd "${FILESDIR}/glance.confd" glance
-	newinitd "${FILESDIR}/glance.initd" glance
+	newinitd "${FILESDIR}/glance-2.initd" glance

 	for function in api registry scrubber; do
 		dosym /etc/init.d/glance /etc/init.d/glance-${function}
--- a/app-admin/tripwire/files/tripwire
+++ b/app-admin/tripwire/files/tripwire
@ -3,7 +3,7 @@ HOST_NAME=`uname -n`
 if [ ! -e /var/lib/tripwire/${HOST_NAME}.twd ] ; then
 	echo "****    Error: Tripwire database for ${HOST_NAME} not found.  ****"
 	echo "**** Check tripwire.txt file for instructions or install      ****"
-	echo "**** app-admin/mktwpol package (if you used the \"setup\"  ****"
+	echo "**** app-admin/mktwpol package (if you used the \"tools\"  ****"
 	echo "**** USE flag, this has been done for you already.            ****"
 else
        test -f /etc/tripwire/tw.cfg &&  /usr/sbin/tripwire --check --quiet
--- a/app-admin/tripwire/files/tripwire-2.4.2.2-twpol-GENERIC.patch
+++ b/app-admin/tripwire/files/tripwire-2.4.2.2-twpol-GENERIC.patch
--- a/app-admin/tripwire/metadata.xml
+++ b/app-admin/tripwire/metadata.xml
@ -22,8 +22,9 @@
 		que se pueden adoptar medidas de control de forma periódica.
 	</longdescription>
 	<use>
-		<flag name="setup">Installs mktwpol package including scripts for
-		tripwire installation/setup and tripwire database maintenance</flag>
+		<flag name="tools">Installs app-admin/mktwpol, providing scripts
+		for the installation/setup of tripwire, including generating the
+		tripwire policy file and maintenance of the tripwire database</flag>
 		<flag name="ssl">Adds support for Secure Socket Layer connections</flag>
 		<flag name="static">Builds the package statically</flag>
 	</use>
--- a/app-admin/tripwire/tripwire-2.4.2.2-r2.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.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/app-admin/tripwire/tripwire-2.4.2.2-r2.ebuild,v 1.1 2013/09/25 08:45:54 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.2-r2.ebuild,v 1.2 2013/09/26 10:46:50 nimiux Exp $

 EAPI=5

@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tripwire/tripwire-${PV}-src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="ssl static setup"
+IUSE="ssl static +tools"

 DEPEND="sys-devel/automake
 	sys-devel/autoconf
@ -21,7 +21,7 @@ DEPEND="sys-devel/automake
 RDEPEND="virtual/cron
 	virtual/mta
 	ssl? ( dev-libs/openssl )"
-PDEPEND="setup? ( app-admin/mktwpol )"
+PDEPEND="tools? ( app-admin/mktwpol )"

 S="${WORKDIR}"/tripwire-"${PV}"-src

@ -29,7 +29,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/"${P}"-fix-configure.patch
 	epatch "${FILESDIR}"/"${P}"-buildnum.patch
 	epatch "${FILESDIR}"/"${P}"-gcc-4.7.patch
-	epatch "${FILESDIR}"/"${P}"-twpol-GENERIC.patch
+	epatch "${FILESDIR}"/"${PN}"-twpol-GENERIC.patch

 	eautoreconf
 }
@ -69,11 +69,12 @@ pkg_postinst() {
 		elog "in tripwire.txt file to help you with this."
 		elog "To configure tripwire automatically, you can use the twsetup.sh"
 		elog "script provided by the app-admin/mktwpol package. This package is"
-		elog "installed for you if you append \"setup\" to your USE flags."
+		elog "installed for you by the \"tools\" USE flag (which is enabled by"
+		elog "default."
 else
 		elog "Maintenance of tripwire policy files as packages are added"
 		elog "and deleted from your system can be automated by the mktwpol.sh"
 		elog "script provided by the app-admin/mktwpol package. This package"
-		elog "is installed for you if you append \"setup\" to your USE flags"
+		elog "is installed for you if you append \"tools\" to your USE flags"
 	fi
 }
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-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/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild,v 1.7 2013/08/23 13:14:52 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild,v 1.8 2013/09/26 10:13:20 idella4 Exp $

 EAPI=4
 PYTHON_DEPEND="2:2.6"
@ -84,7 +84,7 @@ src_prepare() {
 	epatch 	"${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch

 	# fix jobserver in Makefile
-	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.2.0-jserver.patch
+	epatch "${FILESDIR}"/${PN}-4.2-jserver.patch

 	# gcc warnings/QA fix
 	epatch "${FILESDIR}"/${PN}-4-qa.patch
--- a/app-forensics/openscap/openscap-9999.ebuild
+++ b/app-forensics/openscap/openscap-9999.ebuild
@ -0,0 +1,155 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-9999.ebuild,v 1.1 2013/09/26 08:19:06 swift Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit bash-completion-r1 eutils multilib python-r1
+
+DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
+HOMEPAGE="http://www.open-scap.org/"
+if [[ "${PV}" != "9999" ]];
+then
+	SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-2 autotools
+	EGIT_REPO_URI="git://git.fedorahosted.org/git/openscap.git"
+	EGIT_SOURCEDIR="${WORKDIR}/openscap"
+	KEYWORDS=""
+	S="${WORKDIR}/${PN}"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="bash-completion debug doc ldap nss perl python rpm selinux sce sql test"
+RESTRICT="test"
+
+RDEPEND="!nss? ( dev-libs/libgcrypt )
+	nss? ( dev-libs/nss )
+	ldap? ( net-nds/openldap )
+	rpm? ( >=app-arch/rpm-4.9 )
+	sql? ( dev-db/opendbx )
+	dev-libs/libpcre
+	dev-libs/libxml2
+	dev-libs/libxslt
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	test? (
+		app-arch/unzip
+		dev-perl/XML-XPath
+		net-misc/ipcalc
+		sys-apps/grep )"
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]];
+	then
+		git-2_src_unpack
+	fi
+}
+
+src_prepare() {
+#	uncoment for debugging test
+#	sed -i 's,set -e,&;set -x,'	tests/API/XCCDF/unittests/test_remediate_simple.sh || die
+	sed -i 's,^    bash,    LC_ALL=C bash,'	tests/probes/process/test_probes_process.sh || die
+
+	sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
+
+	#probe runlevel for non-centos/redhat/fedora is not implemented
+	sed -i 's,.*runlevel_test.*,echo "runlevel test bypassed",' tests/mitre/test_mitre.sh || die
+	sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
+
+	#According to comment of theses tests, we must modify it. For the moment disable it
+	sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
+	sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
+
+	# theses tests are hardcoded for checking hald process...,
+	# but no good solution for the moment, disabling them with a fake echo
+	# because encased in a if then
+#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process_test.xml || die
+#	sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process58_test.xml || die
+	sed -i 's,.*process_test.*,echo "process test bypassed",' tests/mitre/test_mitre.sh || die
+	sed -i 's,.*process58_test.*,echo "process58 test bypassed",' tests/mitre/test_mitre.sh || die
+
+	#This test fail
+	sed -i 's,.*generate report: xccdf,#&,' tests/API/XCCDF/unittests/all.sh ||	die
+
+	if [[ "${PV}" == "9999" ]];
+	then
+		eautoreconf
+	fi
+
+	if ! use rpm ; then
+		sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
+		sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
+		sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
+		sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
+		sed -i 's,^probe_rpm.*_deps_missing=,&disabled_by_USE_flag,' configure || die
+		sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
+	fi
+	if ! use selinux ; then
+		einfo "Disabling SELinux probes"
+		sed -i 's,.*selinux.*,	echo "SELinux test bypassed",' tests/mitre/test_mitre.sh || die
+		#process58 need selinux
+		sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
+	fi
+	if ! use ldap; then
+		einfo "Disabling LDAP probes"
+		sed -i 's,ldap.h,ldapp.h,g' configure || die
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+	if use debug ; then
+		myconf+=" --enable-debug"
+	fi
+	if use python ; then
+		myconf+=" --enable-python"
+	else
+		myconf+=" --enable-python=no"
+	fi
+	if use perl ; then
+		myconf+=" --enable-perl"
+	fi
+	if use nss ; then
+		myconf+=" --with-crypto=nss3"
+	else
+		myconf+=" --with-crypto=gcrypt"
+	fi
+	if use sce ; then
+		myconf+=" --enable-sce"
+	else
+		myconf+=" --enable-sce=no"
+	fi
+	econf ${myconf}
+}
+
+src_compile() {
+	emake
+	if [[ "${PV}" == "9999" ]] && use doc ; then
+		einfo "Building HTML documentation using Doxygen (which will take a while)"
+		cd docs && doxygen Doxyfile
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	find "${D}" -name '*.la' -delete || die
+	if use doc ; then
+		dohtml -r docs/html/* || die
+		dodoc docs/examples/* || die
+	fi
+	if use bash-completion ; then
+		dobashcomp "${D}"/etc/bash_completion.d/oscap
+	fi
+	rm -rf "${D}"/etc/bash_completion.d || die
+}
--- a/app-forensics/ovaldi/files/disable-acl.patch
+++ b/app-forensics/ovaldi/files/disable-acl.patch
@ -0,0 +1,23 @@
+--- src/probes/unix/FileProbe.cpp.old	2013-01-14 16:28:33.000000000 +0100
+++ src/probes/unix/FileProbe.cpp	2013-01-14 16:30:33.000000000 +0100
+@@ -427,19 +427,8 @@
+ 	   5) If a file doesn't have an ACL, or it matches the standard UNIX permissions, the value will be 'false' (this is covered by acl_extended_file() - thank you openscap)
+ 	   6) If a file has an ACL, the value will be 'true'.
+ 	*/
+-	
+-	int hasExtendedAcl = acl_extended_file(filePath.c_str());
+-	if(hasExtendedAcl > -1){ // behavior 4, 5, and 6
+-          item->AppendElement(new ItemEntity("has_extended_acl",Common::ToString(hasExtendedAcl),OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_EXISTS,0));
+-	}else{
+-	  if(errno == EOPNOTSUPP){ // behavior 3
+-	    item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_DOES_NOT_EXIST,0));
+-          }else{ // behavior 2
+-	    item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_ERROR,0));
+-            item->AppendMessage(new OvalMessage(string("Error reading ACL data: ") + strerror(errno)));
+-          }
+-	}
+ 
+	item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_NOT_COLLECTED,0));
+ # else
+ 	// behavior 1
+ 	item->AppendElement(new ItemEntity("has_extended_acl","",OvalEnum::DATATYPE_BOOLEAN,OvalEnum::STATUS_NOT_COLLECTED,0));
--- a/app-laptop/easy-slow-down-manager/metadata.xml
+++ b/app-laptop/easy-slow-down-manager/metadata.xml
@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>angelos@gentoo.org</email>
-		<name>Christoph Mende</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">easy-slow-down-manager</remote-id>
--- a/app-laptop/nvidiabl/Manifest
+++ b/app-laptop/nvidiabl/Manifest
@ -1,2 +1,3 @@
 DIST nvidiabl-0.80-source-only.dkms.tar.gz 12735 SHA256 91c6f41b42f0f53938aacdaf426a7d76fce5c396ecf39a42d068a3de2e3c75a6 SHA512 ba206d5bf88cb8d4ee1e35938d85291668365a1237d2954287d7ba2014faa9210d32072d10fbcbbf1489efd5cd60480f5bad34e45975cced2468946437339c0d WHIRLPOOL 203a698f9f31c43ab14e5e8489a5189531b81e7aebc7da75d52029b8a45d3a8a5cdad45449ef31e1fb0c6e0d2414789af7b61d523dd573dbfe29b3cfe5321923
 DIST v0.81.tar.gz 14280 SHA256 2e8224f4720f312879a3cdaada66b762c574d88178ea24f1dda4016c54921b55 SHA512 29bce4d57f89db7664ad780785ef98db50f2c6394d2c012cc9e165c6c0c54a8798d51a18fd83cc5e1a2be34ab3d1d9447d24998a78cfa4d6a4bb1bb548384f28 WHIRLPOOL 237280df6e9b9a62318c6291e03698c772678d7d8ae633077ab276ae387fcc72e020e00f6e5c056d03f45d1c129fa23712eed1ef3b5b73f6e166e9d2063d853c
+DIST v0.83.tar.gz 448594 SHA256 0ea79770c02ae297fb6d660ee28ecf7a7acc346de0a55e3231ce499d4184db0f SHA512 cbf4f042acb9005c25d8d008973220f4d42fe890bfd86a34b72c0e56129dfcdcad2383acacf048e5e9da33aaf759053cdadeddac9e0946ae49a8a29ed03447dd WHIRLPOOL 4d1e13ffe1bed36ffee1c498c6384a9ff3fcc561e3aa443c15106baa9711523b8798f0283e42d6365afa57f8d7b4a394835bbea2eb8c6d41a8910c38d661012b
--- a/app-laptop/nvidiabl/metadata.xml
+++ b/app-laptop/nvidiabl/metadata.xml
@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>angelos@gentoo.org</email>
-		<name>Christoph Mende</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
--- a/app-laptop/nvidiabl/nvidiabl-0.83.ebuild
+++ b/app-laptop/nvidiabl/nvidiabl-0.83.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/nvidiabl/nvidiabl-0.83.ebuild,v 1.1 2013/09/25 18:26:47 angelos Exp $
+
+EAPI=5
+inherit linux-mod
+
+DESCRIPTION="Linux driver for setting the backlight brightness on laptops using
+NVIDIA GPU"
+HOMEPAGE="https://github.com/guillaumezin/nvidiabl"
+SRC_URI="https://github.com/guillaumezin/${PN}/archive/v${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+RESTRICT="test"
+
+BUILD_TARGETS="modules"
+MODULE_NAMES="nvidiabl()"
+
+pkg_pretend() {
+	CONFIG_CHECK="FB_BACKLIGHT"
+	ERROR_FB_BACKLIGHT="Your kernel does not support FB_BACKLIGHT. To enable you
+it you can enable any frame buffer with backlight control or nouveau.
+Note that you cannot use FB_NVIDIA with nvidia's proprietary driver"
+	linux-mod_pkg_setup
+}
+
+src_compile() {
+	BUILD_PARAMS="KVER=${KV_FULL}"
+	MAKEOPTS+=" V=1"
+	linux-mod_src_compile
+}
--- a/app-laptop/samsung-tools/metadata.xml
+++ b/app-laptop/samsung-tools/metadata.xml
@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>angelos@gentoo.org</email>
-		<name>Christoph Mende</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>

--- a/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild
+++ b/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild,v 1.7 2013/09/24 18:10:49 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild,v 1.8 2013/09/25 11:10:59 pinkbyte Exp $

 EAPI="5"

@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="debug doc astrality +acetamide +adiumstyles +autoidler +autopaste +birthdaynotifier
 		+chathistory +crypt +depester +embedmedia +herbicide +hili +isterique
 		+juick +keeso +lastseen	+metacontacts media +msn +murm +latex +nativeemoticons
-		+otroid +p100q +spell shx +standardstyles +vader +xmpp +xtazy"
+		+otroid +p100q +spell shx +standardstyles +vader +woodpecker +xmpp +xtazy"

 COMMON_DEPEND="~app-leechcraft/lc-core-${PV}
 		dev-libs/qjson
@ -24,9 +24,13 @@ COMMON_DEPEND="~app-leechcraft/lc-core-${PV}
 		media? ( dev-qt/qtmultimedia:4 )
 		msn? ( net-libs/libmsn )
 		spell? ( app-text/hunspell )
-		xmpp? ( =net-libs/qxmpp-9999 media-libs/speex )
+		woodpecker? ( dev-libs/kqoauth )
+		xmpp? (
+			=net-libs/qxmpp-9999
+			media? ( =net-libs/qxmpp-9999[speex] )
+		)
 		xtazy? (
-			app-leechcraft/lc-xtazy
+			~app-leechcraft/lc-xtazy-${PV}
 			dev-qt/qtdbus:4
 		)
 		crypt? ( app-crypt/qca app-crypt/qca-gnupg )"
@ -78,6 +82,7 @@ src_configure() {
 		$(cmake-utils_use_enable shx AZOTH_SHX)
 		$(cmake-utils_use_enable standardstyles AZOTH_STANDARDSTYLES)
 		$(cmake-utils_use_enable vader AZOTH_VADER)
+		$(cmake-utils_use_enable woodpecker AZOTH_WOODPECKER)
 		$(cmake-utils_use_enable xmpp AZOTH_XOOX)
 		$(cmake-utils_use_enable xtazy AZOTH_XTAZY)
 	)
--- a/app-leechcraft/lc-azoth/metadata.xml
+++ b/app-leechcraft/lc-azoth/metadata.xml
@ -27,6 +27,7 @@
 	<flag name="shx">Build shell command executor plugin</flag>
 	<flag name="standardstyles">Build support for standard Azoth styles engine</flag>
 	<flag name="vader">Bulid Vader, the MRIM (Mail.Ru Agent) protocol support plugin</flag>
+	<flag name="woodpecker">Build Woodpecker, the Twitter client plugin</flag>
 	<flag name="xtazy">Build Xtazy for publishing currently playing tune</flag>
 </use>
 </pkgmetadata>
--- a/app-leechcraft/lc-laure/lc-laure-9999.ebuild
+++ b/app-leechcraft/lc-laure/lc-laure-9999.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-laure/lc-laure-9999.ebuild,v 1.1 2013/03/08 22:00:34 maksbotan Exp $
-
-EAPI="4"
-
-inherit leechcraft
-
-DESCRIPTION="VLC-based audio/video player for LeechCraft"
-
-SLOT="0"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="~app-leechcraft/lc-core-${PV}
-	sys-apps/file
-	>=media-video/vlc-2.0.0"
-RDEPEND="${DEPEND}"
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@ -3,3 +3,4 @@ DIST byobu_5.55.orig.tar.gz 604844 SHA256 372ce92426971bed38bf1db9169e6307142c08
 DIST byobu_5.56.orig.tar.gz 604796 SHA256 ac96c386279a805b9612c47cc6658f5cc1d8ae60c783288e20415fa759dfecef SHA512 5b8d0d219dfcc206c91018f0f192d480101ab6bc8812954619b2ff15f1d84e557ddf4a84e21a825ac974b1dfc53ce03be7bb052624f3469a89f0d482d7fcc448 WHIRLPOOL 8c124590e740c722530880d4cbafab3775369efb5cc844fa9860d01042ff1eb443d4023ca9c5cdf857246c31b01fd6537c57eb4f9882c16bc860f2349e61682d
 DIST byobu_5.58.orig.tar.gz 604999 SHA256 9e08c27d1cfd56574414794579e9555b7951ec09b8de02bf731e4da860ae1baf SHA512 d88da0c3bd1379ca69d6c0b8a1591b27f10272b6560425fc4607e9b19fbcf8311147230aae0370848e3ecbba8d03428237505af3758c2d25f396e18893e37f3b WHIRLPOOL 556777f6d7d3be62061111efc077f3843a6ab9efca157166279c05f1e1ee90f1ea3817c9fc6feb00b98bbf5a6534ec21fd4ca10165870bfcd860d5a17428e3d0
 DIST byobu_5.59.orig.tar.gz 605479 SHA256 c56a601113b8810459ea9a99089d930a9620296e7021f26c9e9a13ae52363117 SHA512 8ae8db18500ee7887f8ba177e8085d1e460712f1233a38fe51f29cab0a3f99d0f6c1c43fb3feecc0dca36bdf11cf4bea4e656f39d0211c343f39fbb1b13f6696 WHIRLPOOL 84e722f6bb1f9587c8be2c60e790fe97529e86e93e3ac235b742826c6766d5766b17cc635f0cb8af55557fcec498c8b255fd17ec1ecc320190530c317a8aaf91
+DIST byobu_5.60.orig.tar.gz 605674 SHA256 e87ade7d4121ccf4747605137af001c403b82fdec93167b5fb83c2821c25cad9 SHA512 78ebc15768c164db959c1175e5be1285a16b7089357a4d4d457c80aecfdb42283ded814393f7d5bbe67a29550ceb48506b61a380de5aee81af2cb7bd701e1a0c WHIRLPOOL 69a249a84411c0174badccae69372d539f49c0d33e778d83a44b18193e14e166886ca98a3b540c5669b781f3b20ab13966367e1ff3fe8352ce8c78be610edcf4
--- a/app-misc/byobu/byobu-5.60.ebuild
+++ b/app-misc/byobu/byobu-5.60.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/byobu/byobu-5.60.ebuild,v 1.1 2013/09/26 07:28:38 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/newt[${PYTHON_USEDEP}]
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
--- a/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild
+++ b/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild,v 1.1 2013/09/25 19:38:03 ottxor Exp $
+
+EAPI="5"
+
+inherit eutils autotools texlive-common
+
+MY_PN=${PN/ctive-/}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A DVI previewer and a presenter for slides written in LaTeX"
+SRC_URI="http://gallium.inria.fr/advi/${MY_P}.tar.gz"
+HOMEPAGE="http://gallium.inria.fr/advi/"
+LICENSE="LGPL-2.1"
+
+IUSE="+ocamlopt"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]
+	>=dev-ml/camlimages-4.0.1:=[truetype,tiff,jpeg,postscript,X]
+	virtual/latex-base
+	app-text/ghostscript-gpl
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	dev-texlive/texlive-pstricks
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-latexextra
+	x11-proto/xineramaproto
+	dev-ml/findlib
+	app-text/htmlc
+	dev-tex/hevea"
+
+DOCS=( "README" "TODO" )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.9-htmlcflags.patch"
+	AT_M4DIR="." eautoreconf
+}
+
+src_configure() {
+	TEXMFMAIN="${EPREFIX}"/usr/share/texmf-site econf $(use_enable ocamlopt native-program) \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
+
+src_compile() {
+	emake
+	cd doc || die
+	VARTEXFONTS="${T}/fonts" emake splash.dvi scratch_write_splash.dvi scratch_draw_splash.dvi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PACKAGE="${PF}" install
+
+	# now install the documentation
+	dodoc ${DOCS}
+
+	export STRIP_MASK="*/bin/advi.byt"
+}
+
+pkg_postinst() {
+	etexmf-update
+}
+
+pkg_postrm() {
+	etexmf-update
+}
--- a/app-text/jadetex/jadetex-3.13-r6.ebuild
+++ b/app-text/jadetex/jadetex-3.13-r6.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/jadetex/jadetex-3.13-r6.ebuild,v 1.2 2013/09/26 11:44:35 nimiux Exp $
+
+EAPI=5
+
+inherit latex-package texlive-common
+
+DESCRIPTION="TeX macros used by Jade TeX output"
+HOMEPAGE="http://jadetex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jadetex/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+RESTRICT="test"
+
+DEPEND=">=app-text/openjade-1.3.1
+	dev-texlive/texlive-fontsrecommended
+	dev-texlive/texlive-genericrecommended"
+
+src_compile() {
+	VARTEXFONTS="${T}/fonts" emake
+	VARTEXFONTS="${T}/fonts" TEXMFHOME="${S}" env -u TEXINPUTS \
+		fmtutil --cnffile "${FILESDIR}/format.jadetex.cnf" --fmtdir "${S}/texmf-var/web2c" --all\
+				|| die "failed to build format"
+}
+
+src_install() {
+	# Runtime files
+	insinto /usr/share/texmf-site/tex/jadetex
+	doins dsssl.def jadetex.ltx jadetex.cfg {pdf,}jadetex.ini *.sty
+
+	insinto /var/lib/texmf
+	doins -r texmf-var/*
+
+	etexlinks "${FILESDIR}/format.jadetex.cnf"
+
+	# Doc/manpages
+	dodoc ChangeLog*
+	doman *.1
+	dohtml -r .
+
+	# Support for our latex setup
+	insinto /etc/texmf/texmf.d
+	doins "${FILESDIR}/80jadetex.cnf"
+	insinto /etc/texmf/fmtutil.d
+	doins "${FILESDIR}/format.jadetex.cnf"
+}
+
+pkg_postinst() {
+	etexmf-update
+	elog
+	elog "If jadetex fails with \"TeX capacity exceeded, sorry [save size=5000]\","
+	elog "increase save_size in /etc/texmf/texmf.d/80jadetex.cnf and."
+	elog "remerge jadetex. See bug #21501."
+	elog
+}
+
+pkg_postrm() {
+	etexmf-update
+}
--- a/app-text/poppler/poppler-0.22.5.ebuild
+++ b/app-text/poppler/poppler-0.22.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.5.ebuild,v 1.8 2013/09/23 17:38:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.5.ebuild,v 1.9 2013/09/25 17:22:09 ago Exp $

 EAPI=5

@ -11,7 +11,7 @@ HOMEPAGE="http://poppler.freedesktop.org/"
 SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"

 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0/37"
 IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils"

--- a/app-vim/checkattach/Manifest
+++ b/app-vim/checkattach/Manifest
@ -0,0 +1 @@
+DIST checkattach-0.15.tar.bz2 6242 SHA256 29b99fafbd5e03bb7815f865724c75b550c23aa5ee32abdd7bcd803df82363f2 SHA512 c9204641da2beb33d361d42cafacac39de40dc652f97568993d64dc1b1f776ce725aa088102c3f0d057648c6dbc06ed3d871b6ac715d4c90ac42fc18348f3101 WHIRLPOOL 2145c2501847a7a419e0831a6da3d826924d173b24ee74a35b22aec2a2283e67bbdd7611790d90d4129c3b80669bc60e8347ba3ab26380825be9fc31095b6cb2
--- a/app-vim/checkattach/checkattach-0.15.ebuild
+++ b/app-vim/checkattach/checkattach-0.15.ebuild
@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/checkattach/checkattach-0.15.ebuild,v 1.1 2013/09/26 08:34:28 radhermit Exp $
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: check for attachments when writing mails with mutt"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2796 https://github.com/chrisbra/CheckAttach"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="CheckAttach.txt"
--- a/app-vim/checkattach/metadata.xml
+++ b/app-vim/checkattach/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>vim</herd>
+</pkgmetadata>
--- a/app-vim/command-t/Manifest
+++ b/app-vim/command-t/Manifest
@ -1,3 +1,4 @@
 DIST command-t-1.3.1.tar.bz2 24190 SHA256 920dd603fa940ee43277a9a36b3c7c69cadf17b19bb82a8faa34cc9b2cd33faa SHA512 05dc813e814564ac260ebef63ac781b6c3c9f88c94bea35f3a088cfefc26fed21b0fccc323df12684e69a0f876b9bcd3d76dcf52fb328f55d22bcada8b188b6c WHIRLPOOL acec78802f54949b6b3761d516b74b601852d73f3add4ce92c7095149707b18fef97d40137bf87e0d9399e8f5f3d77e8eaf6a5e2152fc403d05981bcc227e8d4
 DIST command-t-1.4.tar.bz2 26328 SHA256 9068775e016a56b1a77d9352002e891a4f44ffa24f7a7d35e97a321ed7b5723a SHA512 5adb7a68de085f3cec20ff96f1259a1741ca1df92f334c1987dd822d35a3ccca7624d089bfdd8742350e95cff1c1bf438be5444a8fcb227789e26aae1f9e41ea WHIRLPOOL c3868498f8cdd59fd47d466e5bcbd574361dfdc9a682d616c431e0215578e5fdc482e3129625e5133e9e8bdd59840d2c12b8535bd57d0348b0e88821537017d5
+DIST command-t-1.5.1.tar.bz2 27478 SHA256 7f319d2c842b01cde613f57d6a84937d92393dbc8444da4dba08dce5c1e7b9f9 SHA512 55c0d46ff4cb97ec8edc151a720ea9e63313b97ba3dcdf8df867956c1984736bf86b049fe44aa33b4905167e436b0c902deaa08f23b4088e18c14a2197845f6f WHIRLPOOL 596cae2c32a8028e97027aaa0a811e73741b9ed7c4d27faf092d3df5dd830c31e6e42fe651123d7e9fa8f5d9530d07e265114bd59d129bf40b7b0085a455d722
 DIST command-t-1.5.tar.bz2 27494 SHA256 ddffdc1fadd0128523ac564645de544bcb9428ee4ad1236985d045ecd35866bb SHA512 d7ff149a4ba62e7dbc121db48a11e0de4f44788e677c56e9045ad48144f931ce8801d8ed83fbd69baf78b2afa61445f5f0e54c581c1451cdae4bbaaed2758bf5 WHIRLPOOL f2b22d690a72eb0c020563b1706c577bb43e62ce7163730d7155d0e0430e2e8a502a4c6cc43ce9b17de671da17bfc0068dfa80110738f957512b86791490e264
--- a/app-vim/command-t/command-t-1.5.1.ebuild
+++ b/app-vim/command-t/command-t-1.5.1.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/command-t/command-t-1.5.1.ebuild,v 1.1 2013/09/26 07:54:36 radhermit Exp $
+
+EAPI="5"
+USE_RUBY="ruby18 ruby19 ruby20"
+
+inherit vim-plugin ruby-ng
+
+DESCRIPTION="vim plugin: fast file navigation for vim"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3025
+	https://wincent.com/products/command-t"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="|| ( app-editors/vim[ruby] app-editors/gvim[ruby] )"
+
+each_ruby_configure() {
+	cd ruby/${PN}
+	${RUBY} extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	cd ruby/${PN}
+	emake V=1
+	rm *.o *.c *.h *.log extconf.rb depend Makefile || die
+}
+
+each_ruby_install() {
+	local sitelibdir=$(ruby_rbconfig_value "sitelibdir")
+	insinto ${sitelibdir}/${PN}
+	doins -r ruby/${PN}/*
+}
+
+all_ruby_install() {
+	rm -r ruby || die
+	vim-plugin_src_install
+}
--- a/app-vim/dbext/Manifest
+++ b/app-vim/dbext/Manifest
@ -1,2 +1,3 @@
 DIST dbext-18.0.tar.bz2 94127 SHA256 e9100bf15cae64c9a814314035a79ff3e0495eb0ed90fc1c473536b09a924295 SHA512 44a1c8db65113c48778343dd7b47a8efc87b0c14cef4683572cfab1f8d1972edbaf569a58ec4ec736f67995d50227ddb0c1379f51e404e07157e7a1ca553a7f3 WHIRLPOOL ad447b671c8b12e92ecc1f4a67d0216bf19f84542a4ca0e2719fa4d692a27f2ff9cbbe052e37881d7c42447ac2384ef752457ea7653d9f9906b8d3f5eebeca4d
 DIST dbext-19.0.tar.bz2 94922 SHA256 6fd27c86bd378e8116fc5790cc1bfa4a74959b65d21100086eb5f25d07cef3bb SHA512 cd5cdd47a38658147b8c162db7a08fd40cff740991e375602d249e93abbdc72aa3cf30ab5b7bf0d3420d1aae2f2a4924db4cbf28e794c492ab63f9120b21c3ff WHIRLPOOL 53be4c01de81f07610d5b0ef5c65e597017dd352e7825684c51f2b5188f9f04218197139cd4f0a31d7ebaa3addd385d793802a552f806670292ce5cb28fb82ed
+DIST dbext-20.0.tar.bz2 97286 SHA256 e3f19c08db25067c6a21452864a3fa56e95a9100c417c4445d230780c29f2cab SHA512 88e7edb002255e26df7df8c58452b54ea2c460ec9061918577367a35eca95d472a46c61a76d22ccc2ac0a9d4723cf98e0ddc2491f6782ba8d62cbc6ed362276b WHIRLPOOL 0afa44ffe1b69d3dbbcf50b89c76ced4f1d394060278b00538474b99f1dafc09b00745baff08d5356893f2c3cfbe3b7ad0e443ae19fa6f77dd2e0d0e6638291b
--- a/app-vim/dbext/dbext-20.0.ebuild
+++ b/app-vim/dbext/dbext-20.0.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/dbext/dbext-20.0.ebuild,v 1.1 2013/09/26 04:09:41 radhermit Exp $
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easy access to databases"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=356"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/notes/Manifest
+++ b/app-vim/notes/Manifest
@ -1,3 +1,4 @@
 DIST notes-0.12.10.tar.gz 35582 SHA256 0c9b82feb68360dcd5ea21432ec61901c6f132bedc30e0644a62d725cf559970 SHA512 a875c88e721a661959eaf3dc03b743acf0b65eda1ba42858d932ae28ea42ba68cbcb2100dc95dedda45a95b18e01cf32ef15f53c041af0f2cb115b8515d46c3d WHIRLPOOL 41204127bcea051f9d5262456d0038dd0e6f49d31eb50ac64e6b33c09dbbfd824e894d67341bce7661c5dc00cc5be7fc6c3db9f0691e4d11848ae472bc08f7cd
 DIST notes-0.16.17.tar.gz 44587 SHA256 48654f200f4b37ff2d85b0240ace86c44965b1cda1be085acdaddc06fd663a8d SHA512 5fc9f9062cec6e1972c2163926cde805dbe9fc9d17dcbd9bdbec471f0a02a8fcaf89a59315fa263707e7cca5170c1fd09e3153208a512074ba6739d09883bf02 WHIRLPOOL f8420f41fe08a9f0d482377c91fb6afd80f8be1987d8d2f7395462140efff6af2cab2410993b9cd21c70a7452c055fef32c58a41530cc8991d43e2065850a9f4
 DIST notes-0.23.2.tar.gz 50420 SHA256 31ed259e2fa975ab99c9861ef2a7732268e35901d56d9d26ae3092e7b95f4464 SHA512 911c4947acb4f03bcff067876a1c9270f01c0004c7b1dadd2696e5569f85d94a1e37cd0dac12c7258933587d6b98e9fd5559976e7aefd9921979dcedd78a9124 WHIRLPOOL cf571bf0e973cec62b0b0387f8e49b0ac6bf38af32404e65686834997412a5f6ba14b246ba0b4c6dcd7d0a55651e5ad91b8bd666e52d6ac0bb3425cf6fe4eb6c
+DIST notes-0.23.4.tar.gz 50584 SHA256 7a451ed17f9270ca20711b4e96d55e14ccb9db10faefeeec01f18d1b86b93ba8 SHA512 2bdcf967846d910a2bcc8cdf6987b6658a3614e63556eb9e7521d9559a19e49a131be0e8e26f09d88e533d7d5dae283c18aedfe47e829e30315dbd5416f935fb WHIRLPOOL 17248cd88721fc08fe246a50e445b46f33c36316ffb9f24aad7a78d9b81bfef22e603bd7dfbf5c184cbf651ebf75b03ad171390ef092914d07e523af33c2e130
--- a/app-vim/notes/notes-0.23.4.ebuild
+++ b/app-vim/notes/notes-0.23.4.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/notes/notes-0.23.4.ebuild,v 1.1 2013/09/26 04:13:14 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: easy note taking in vim"
+HOMEPAGE="http://peterodding.com/code/vim/notes/"
+SRC_URI="https://github.com/xolox/vim-notes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-vim/vim-misc-1.8.5"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/vim-${P}
+
+src_prepare() {
+	# remove unnecessary files
+	rm addon-info.json INSTALL.md README.md || die
+
+	python_fix_shebang .
+}
--- a/app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild
+++ b/app-vim/puppet-syntax/puppet-syntax-3.0.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-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild,v 1.5 2013/09/23 19:17:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild,v 1.6 2013/09/25 17:28:08 ago Exp $

 EAPI=4

@ -10,7 +10,7 @@ DESCRIPTION="vim plugin: Puppet configuration files syntax"
 HOMEPAGE="http://puppetlabs.com/"
 SRC_URI="http://dev.gentoo.org/~tampakrap/tarballs/${P}.tar.gz"
 LICENSE="Apache-2.0 GPL-2"
-KEYWORDS="amd64 hppa ~ppc sparc x86"
+KEYWORDS="amd64 hppa ppc sparc x86"

 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides syntax highlighting for Puppet configuration
--- a/app-vim/recover/Manifest
+++ b/app-vim/recover/Manifest
@ -0,0 +1 @@
+DIST recover-0.18.tar.bz2 8137 SHA256 9fcd1d440ef0709b4c9719c758d67ba349970b08027b16341290170a4b27cde4 SHA512 fe31626bd9bfacf299536f4943b65d61262da8bfec9c83b085e67a52833d8fe8c5ecc81fade50c451cfe2889e0cfa938401635a2c9471ebd31191fc1c7beeb71 WHIRLPOOL e1d159a1c182f514a625c9dceadb6ecba6f2a9b9b9f335654cdc53ef4758bb9922a46a441ac8079590d1ba1196548c5a275f31d8ff580510616c5d93e9160f35
--- a/app-vim/recover/metadata.xml
+++ b/app-vim/recover/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>vim</herd>
+</pkgmetadata>
--- a/app-vim/recover/recover-0.18.ebuild
+++ b/app-vim/recover/recover-0.18.ebuild
@ -0,0 +1,13 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/recover/recover-0.18.ebuild,v 1.1 2013/09/26 08:20:29 radhermit Exp $
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: show differences for recovered files"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3068 https://github.com/chrisbra/Recover.vim"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/tcomment/Manifest
+++ b/app-vim/tcomment/Manifest
@ -0,0 +1 @@
+DIST tcomment-2.08.tar.gz 23070 SHA256 d34a7fd2736ca63752cc90f9749dd4897150fdef490f3841c38d0f95272ec769 SHA512 f3067aab71684e3b6f1ace5b2472e312f517545760e7e0a9f350a1b0756d529b6c4184197b61aacf22bfed6bef06839ff9ef839c28702d6fd0c02101659d64c8 WHIRLPOOL 0c8f6b421ffd45d0d26de618d4fcebbc534e316fead7e0fb87d8701dcd0e005aeaad151f9c5abb21cd6cd82292ce40f9c65f5c7e1494f08f052c30a715cc4c81
--- a/app-vim/tcomment/metadata.xml
+++ b/app-vim/tcomment/metadata.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>vim</herd>
+</pkgmetadata>
--- a/app-vim/tcomment/tcomment-2.08.ebuild
+++ b/app-vim/tcomment/tcomment-2.08.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/tcomment/tcomment-2.08.ebuild,v 1.1 2013/09/26 07:56:34 radhermit Exp $
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN="tcomment_vim"
+DESCRIPTION="vim plugin: an extensible and universal comment toggler"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim"
+SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	rm -r README spec ${PN}-addon* || die
+}
--- a/app-vim/vim-r/Manifest
+++ b/app-vim/vim-r/Manifest
@ -1,2 +1,3 @@
 DIST vim-r-0.9.9.2.tar.bz2 125721 SHA256 4e6f73f9c2c9032e5e0480b0ffc52e8967bf24188545599ad5eda6021a449340 SHA512 c6e4ad970e0f80c35883cb059a7649b182c3c89587725a992b0e5190b113b7bbe4a130ff6d99c6f5d480f21e9dfcd241d87b57e59a2fe6e02ac7ee7a630f38f4 WHIRLPOOL 257445cba31341523c3c245f92e36705783539015c61caeb3bb38b228fd2ecc2586dc0e2dcd5050b66ab414dc55ea1d46a70a8bad158f8a7754ea09ff5065499
 DIST vim-r-0.9.9.3.tar.bz2 126223 SHA256 e395b346c755da4f7844d914641d03af315860d8d0f70afe9b4519e254e2d3c6 SHA512 6660e34cdaa14613cdc7b4a6992001b615740bddc4fafd15ffb3d10a51c055dbc8cb18a4ec7013f2587e7075de3826d7c24eed79571efdf466420a8bbea30bab WHIRLPOOL 62e9292af83c6ec987140b76834dd9958301ee8a9e3ba57a83cd246ea09599e85bf8ff8937c485629f614c24a3412c54c59b88fd0629a60b1c505985695321ad
+DIST vim-r-0.9.9.4.tar.bz2 124665 SHA256 cc7a88d1b7eb810586d184e3a13424226da5c38c46480faaccad2143feb8283e SHA512 90a5239e8a581f31168e81f651dfb8a650b5400cccb24d1b4a4a4eda51c317e8f9d917779b6a7d174e4e4b7a032bf43982d787b8351a425721169cec579d0a67 WHIRLPOOL 8ed5ac058069aab31edcd39b6c77e476b38903f97625fb97ec1fdf29e285d723be5eba384f0baa132e52cc00ab3f12077d8227c9f973cb6b14cb3939a32f4d8d
--- a/app-vim/vim-r/vim-r-0.9.9.4.ebuild
+++ b/app-vim/vim-r/vim-r-0.9.9.4.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vim-r/vim-r-0.9.9.4.ebuild,v 1.1 2013/09/26 04:05:36 radhermit Exp $
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: integrate vim with R"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2628"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/R
+	|| ( app-vim/conque app-vim/screen )"
+
+VIM_PLUGIN_HELPFILES="r-plugin.txt"
--- a/app-vim/yankring/Manifest
+++ b/app-vim/yankring/Manifest
@ -2,3 +2,4 @@ DIST yankring-12.0.tar.gz 39957 SHA256 c497a2a74df0aade1eadeb8becabb96eeb968da46
 DIST yankring-14.0.tar.bz2 35248 SHA256 b9e5e6fb7db09fc55dee8773c2e8f8e738d46656b7d0b9d95046239481b93988 SHA512 81d8e9fa2082c86c741b236174af877f27c3c4d4a93cb836919b42c044ecb57e86114d9c7eadb63a03780874fbf0f5592ff43d0145c8378b001af1fd87dea076 WHIRLPOOL 37c82a276f63e3d87384e755b385f6da1f6bb8ebd8f39157cb6cae42f98f469f3a2bd67185d99c0454a14969d9ab45a89808d368cf5892f7fc9047a88ca6e0fc
 DIST yankring-15.0.tar.bz2 36057 SHA256 8a5d68f2483f9a71f6a595f5e23e0e7dc6466991525103c663a0b60da1eeff8a SHA512 f65ee24c2c845f957eca4a7a2b2362effbdebe1b875ebd4b83c2be49c10b06c0f07e795caf013ee4e66535364b5696c8fdfd6be00a23597691b002e4220f69dd WHIRLPOOL 22d6409d2a26ae9e500faabcae0915f9a9db1127f26cdf028b771213105b240dc9199c8bced6df21e8c089d8cb4984ea18475105ff4aa3137deb968f01e361dd
 DIST yankring-17.0.tar.bz2 36605 SHA256 72f0cf64bf0ce181e4695f39fa858716f085377f61b4fb664f91b188ca5fcce9 SHA512 e0e112a834b029078a5f81ad53ecb503e69daa799974bffa309690f071f0baf37a09be49f79dacceeb6e183845b7884575bf32e59f9e5c8ae5e2165fc74505a0 WHIRLPOOL 933a8f097d61d6493322c1142589e0bb3fcb08064cbd488a0d7366d49f7c8be9983489e352dc0086830c2264c5faeb0377bc3f6c159031e8701ca4e14a611e5f
+DIST yankring-18.0.tar.bz2 36694 SHA256 b48b0a3515664d7d77c3fd142412ca5fb9f49ee18d1ece50572fab015c4417ed SHA512 5ae4310d3f8944f9e24afd6b5edbd54ecbdfe16cd8d0f5a2840023441ecc4cc2217e73ab54ece4be0e99f8921b67651b66e58d043afdf1454dd82e264827aa67 WHIRLPOOL f054026c4e00813d934f9d56cdfd2eb7472e0c3cf187650d30e2ed017a7d59395e4f6358574405ad260e83d410447268965ca14fbbfea4027d08c40c70f3b703
--- a/app-vim/yankring/yankring-18.0.ebuild
+++ b/app-vim/yankring/yankring-18.0.ebuild
@ -0,0 +1,12 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-vim/yankring/yankring-18.0.ebuild,v 1.1 2013/09/26 04:07:23 radhermit Exp $
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: maintains a history of previous yanks and deletes"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1234"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@ -1 +1,2 @@
 DIST pgadmin3-1.16.1.tar.gz 13783723 SHA256 d4ba243dc24dc28e6d0db4104baec373ab3bec11c6dc0e6cfa4bd665a5b7c28e SHA512 f5f110f99d15801dc2b2253c803cf038871461909cb63f114ee769ff0977183d6825f3bf13f378822f874fc15aa593f52cd999ccb97370b786b6e02f45ce4a81 WHIRLPOOL 375f444147e2ff850d1fdffe8d88bbd9296aff652f1008447242e7cbe5995ad1ba37822fafe5012d09bf963cf4485183f72087c3ade3740c2eab974e931fb5b1
+DIST pgadmin3-1.18.0.tar.gz 14257838 SHA256 58f29f5a380a49065e4b97bd9c8effd12ae99f464fa8834ba403baa2a658278d SHA512 dbf052269e4c0478239f111bca2e09b430a590778d19460f24b1f39c0204dad4a182ee93df06675c5640fd532ad289f5425468e5c08d11d833429e3076e2ed7b WHIRLPOOL 30a07cfb3a6fd0525fe1677186f9cb95f232c65e7851807abf0e929ccc4e34a36ec7fcb4f9f0df8ff5e1fdcc93b8f67ee9acb4c90a8ce33337bcb8ae15c5999f
--- a/dev-db/pgadmin3/files/pgadmin3-desktop.patch
+++ b/dev-db/pgadmin3/files/pgadmin3-desktop.patch
@ -0,0 +1,13 @@
+diff -Naruw a/pkg/pgadmin3.desktop b/pkg/pgadmin3.desktop
+--- a/pkg/pgadmin3.desktop	2013-02-22 17:21:19.000000000 +0000
+++ b/pkg/pgadmin3.desktop	2013-09-25 14:34:27.717913730 +0000
+@@ -4,7 +4,7 @@
+ Exec=/usr/bin/pgadmin3
+ Icon=/usr/share/pgadmin3/pgAdmin3.png
+ Type=Application
+-Categories=Application;Development;
+-MimeType=text/html
+Categories=Development;
+MimeType=text/html;
+ DocPath=/usr/share/pgadmin3/docs/en_US/index.html
+ Comment=PostgreSQL Tools
--- a/dev-db/pgadmin3/pgadmin3-1.18.0.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.18.0.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.18.0.ebuild,v 1.1 2013/09/25 17:37:46 titanofold Exp $
+
+EAPI="4"
+
+WX_GTK_VER="2.8"
+
+inherit multilib versionator wxwidgets
+
+DESCRIPTION="wxWidgets GUI for PostgreSQL."
+HOMEPAGE="http://www.pgadmin.org/"
+SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE="debug +databasedesigner"
+
+DEPEND="x11-libs/wxGTK:2.8[X,debug=]
+	>=dev-db/postgresql-base-8.4.0
+	>=dev-libs/libxml2-2.6.18
+	>=dev-libs/libxslt-1.1"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	local pgslot=$(postgresql-config show)
+
+	if [[ ${pgslot//.} < 84 ]] ; then
+		eerror "PostgreSQL slot must be set to 8.4 or higher."
+		eerror "    postgresql-config set 8.4"
+		die "PostgreSQL slot is not set to 8.4 or higher."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/pgadmin3-desktop.patch"
+}
+
+src_configure() {
+	econf --with-wx-version=2.8 \
+		$(use_enable debug) \
+		$(use_enable databasedesigner)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newicon "${S}/pgadmin/include/images/pgAdmin3.png" ${PN}.png
+
+	# icon location for the desktop file provided in pkg folder
+	insinto /usr/share/pgadmin3
+	doins "${S}/pgadmin/include/images/pgAdmin3.png"
+
+	domenu "${S}/pkg/pgadmin3.desktop"
+
+	# Fixing world-writable files
+	fperms -R go-w /usr/share
+}
--- a/dev-db/tora/tora-2.1.3-r2.ebuild
+++ b/dev-db/tora/tora-2.1.3-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/tora/tora-2.1.3-r2.ebuild,v 1.3 2013/09/08 09:09:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-2.1.3-r2.ebuild,v 1.4 2013/09/25 17:30:59 ago Exp $

 EAPI=2

@ -13,7 +13,7 @@ IUSE="debug mysql oracle oci8-instant-client postgres"

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

 DEPEND="
 	dev-libs/ferrisloki
--- a/dev-java/classmate/Manifest
+++ b/dev-java/classmate/Manifest
@ -0,0 +1 @@
+DIST classmate-0.9.0.tar.gz 57752 SHA256 6667a959b282b037aaed328fca3131a89c7649a347a72e1d2d4dd40bc8b393f2 SHA512 7fb331c462458c8aab143f23c0d128a0e4e976f9d12bd181eb5658961b217bd1fe0871d056fc38bff794522c8b3118a2a017eab265afffc1d60b5580df1237a2 WHIRLPOOL ecfa56a57d07c1486f92c1a635d5b294b9664994504649a5234daff34935c0f42dc590f55ee1fa3a780399a923728a30e083a809871777e68e78deaf3f6dd45c
--- a/dev-java/classmate/classmate-0.9.0.ebuild
+++ b/dev-java/classmate/classmate-0.9.0.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-java/classmate/classmate-0.9.0.ebuild,v 1.1 2013/09/25 17:40:20 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple vcs-snapshot
+
+DESCRIPTION="Library for introspecting generic type information of types, member/static methods, fields"
+HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
+SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	rm pom.xml || die
+}
+
+src_test() {
+	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
+
+	mkdir target/tests || die
+	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
+
+	tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
+			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+			| grep -vP '\$');
+	ejunit4 -cp "${testcp}" ${tests}
+}
--- a/dev-java/classmate/metadata.xml
+++ b/dev-java/classmate/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="github">cowtowncoder/java-classmate</remote-id>
+	</upstream>
+</pkgmetadata>
+
--- a/dev-java/guava/Manifest
+++ b/dev-java/guava/Manifest
@ -1,3 +1,4 @@
 DIST guava-13.0.1-sources.jar 1060992 SHA256 6968729f41bd225c00ce6c9212674fe5fa64346ca267072860253c87156507d3 SHA512 07b29cf199229e82a6ec42aad4a6f700c4230ae4b3d41d64f46786619884d572b71dace9f2b521b5f0a50359b460ae6f123dafc80bc982b04856a0dd3a9a0663 WHIRLPOOL dc1a1b978b57d8a36747d03ef88778cb9f4060313c7377c5188948cf4d58cae7e9cb0b304e7a449730955235f1f744a8d4b96b82f0844eb37857824f920faad7
 DIST guava-14.0.1-sources.jar 1170076 SHA256 a41f35daf37667524bf76c33f8d14ff2a2bb8bfb38e876327628f62f7592e53e SHA512 0a495da0fcc460308faa017b4754a3460eeff08cbfcbfa1cb976fccf3cf9a0fb191e1b88a6c7a753b816b878dd4368f5ba27d5644bbe4c3132dc44e940a8372c WHIRLPOOL 7f2c1d694e54378b81046c0162b1bcc68951d2e37601fbf44d517b6205a3fb42ac0b107f504d533230595d7f7c9c3228294a3f1ccf07b1da7d0d1b10616969ec
+DIST guava-15.0-sources.jar 1234606 SHA256 1a3f78cfd4a44f63af00afe36f2175d41ed24d25aedf3542f47664f81815a211 SHA512 fe4fcc723115fbc4f824a1358d81e98565b92b6d682b86d25b566f1e9b6c266fac42a3502e6d49d1faa87fdfbadf206043b4d8965402dd821333dda00b93819e WHIRLPOOL e9f3466073542b4d93d6f934e241e5244a5f39b0b35a83836721524bacb8e259d4f0a05cf32c53932f8decf6589e6e896873cb5bec141b0f029fd2c1f667b15a
 DIST guava-r07.zip 3044916 SHA256 3d0da5843235b26dc5d47b75df48a6f06f0cc428534580762352b3b00fa45c40 SHA512 1ea4c0b4a7747fb555150283eb851da9d96ec705f1b8e05709b533e923a2615dd82979afbf729093c493e0c11a5f7841f576a6a56a4e9fd5a7e8af224aca956f WHIRLPOOL 3718e030038eaf597b1d35e318eeb708df8d5b66a606d5ffa1fc0e7a742f22f271d6fa6d72d1ce138fcd206e32c7680c5bccf4400f3fc969f41623a7d1f88013
--- a/dev-java/guava/guava-15.0.ebuild
+++ b/dev-java/guava/guava-15.0.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-java/guava/guava-15.0.ebuild,v 1.1 2013/09/25 23:40:47 radhermit Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A collection of Google's core Java libraries"
+HOMEPAGE="http://code.google.com/p/guava-libraries/"
+SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/${PN}/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="15"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+COMMON_DEP="
+	dev-java/javax-inject:0
+	dev-java/jsr305:0
+	java-virtuals/jdk-with-com-sun:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+	app-arch/unzip
+	>=virtual/jdk-1.7" # http://code.google.com/p/guava-libraries/issues/detail?id=635
+
+JAVA_GENTOO_CLASSPATH="jsr305,javax-inject"
--- a/dev-java/guice/Manifest
+++ b/dev-java/guice/Manifest
@ -0,0 +1,2 @@
+DIST guice-2.0-src.zip 17342981 SHA256 7f836156d9d6b7688d373a4c70971b8b42e3a553e26a8f98a110a868eb749394 SHA512 61e1c5b6bbd7db5017a99b2998b706071717781360ab8d622d163be2cc954d9b34ab8b68d2ab02f29bb1a8b640ac25350dca302c390855641ca3e4cc4438a1b9 WHIRLPOOL 7be8673b603ad1aa722ddb76cefaec5e1d03e9a4199d25cbb1a58a31f89c33ac1d9e0a479951b5412cc2c94504d46afd56f42a57f3d87ef3915554fbf821d506
+DIST guice-3.0-src.zip 24396399 SHA256 aaa4da9c2d588018b69a757879966da7fcaa02b4a6b208f1300a313c1a426eba SHA512 2918a2ec1c355025d789c6de4275e1b87fa0263e4529813b9758f219d9faeb08cdcba5a82962c3ec632fbdb31376c03198d12599ce6b2ae872cf8b252edd7a05 WHIRLPOOL e2b602bff8e85c6223f05bc750b912e1068f8546cc78fc31957107b6e9e8d0d23e99ea9e94b51562882ccabab14485245207f6754137d33d5e8cc6358e3e9402
--- a/dev-java/guice/files/2.0-build.xml.patch
+++ b/dev-java/guice/files/2.0-build.xml.patch
@ -0,0 +1,16 @@
+--- /tmp/guice-2.0-src.orig/build.xml	2012-08-23 23:04:55.759642915 +0300
+++ build.xml	2012-08-23 23:30:05.899593954 +0300
+@@ -13,11 +13,8 @@
+   </path>
+ 
+ 
+-  <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
+-    <jar jarfile="${build.dir}/dist/guice-${version}.jar"
+-        manifest="${build.dir}/META-INF/MANIFEST.MF">
+-      <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"/>
+-    </jar>
+  <target name="jar" depends="jar.withdeps" description="Build jar.">
+	<echo>${build.dir}/${ant.project.name}</echo>
+   </target>
+ 
+   <target name="dist" depends="distjars, javadoc"
--- a/dev-java/guice/files/2.0-common.xml.patch
+++ b/dev-java/guice/files/2.0-common.xml.patch
@ -0,0 +1,21 @@
+--- /tmp/guice-2.0-src.orig/common.xml	2012-08-23 23:28:51.056596381 +0300
+++ common.xml	2012-08-23 23:28:14.416597570 +0300
+@@ -108,17 +108,7 @@
+   <target name="jar.withdeps" depends="compile"
+       description="Build jar with dependencies embedded.">
+     <mkdir dir="${build.dir}/dist"/>
+-    <dirname property="common.basedir" file="${ant.file.common}"/>
+-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+-        classpath="${common.basedir}/lib/build/jarjar-1.0rc8.jar"/>
+-    <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
+-      <fileset dir="${build.dir}/classes"/>
+-      <zipfileset src="${common.basedir}/lib/build/cglib-2.2.1-snapshot.jar"/>
+-      <zipfileset src="${common.basedir}/lib/build/asm-3.1.jar"/>
+-      <rule pattern="net.sf.cglib.**" result="com.google.inject.internal.cglib.@1"/>
+-      <rule pattern="org.objectweb.asm.**" result="com.google.inject.internal.asm.@1"/>
+-      <keep pattern="com.google.inject.**"/>
+-    </jarjar>
+	<jar destfile="${build.dir}/${ant.project.name}.jar"  basedir="${build.dir}/classes" />
+   </target>
+ 
+ </project>
--- a/dev-java/guice/files/3.0-build.xml.patch
+++ b/dev-java/guice/files/3.0-build.xml.patch
@ -0,0 +1,55 @@
+diff --git a/guice-3.0-src/build.xml b/guice-3.0-src/build.xml
+index a66a186..da1dd76 100644
+--- a/guice-3.0-src/build.xml
+++ b/guice-3.0-src/build.xml
+@@ -10,11 +10,7 @@
+   </path>
+ 
+ 
+-  <target name="jar" depends="jar.withdeps, manifest" description="Build jar.">
+-    <jar jarfile="${build.dir}/dist/guice-${version}.jar"
+-        manifest="${build.dir}/META-INF/MANIFEST.MF">
+-      <zipfileset src="${build.dir}/${ant.project.name}-with-deps.jar"/>
+-    </jar>
+  <target name="jar" depends="jar.withdeps" description="Build jar.">
+   </target>
+ 
+   <target name="dist" depends="distjars, javadoc"
+@@ -166,10 +162,7 @@
+   <target name="javadoc">
+     <javadoc packagenames="com.google.*"
+              destdir="build/docs"
+-    	     docletpath="lib/build/doclava.jar"
+-             bootclasspath="${java.home}/lib/rt.jar"
+-             maxmemory="512M"
+-    	     classpath="lib/javax.inject.jar${path.separator}lib/aopalliance.jar">
+             maxmemory="512M">
+       <fileset dir="${src.dir}" defaultexcludes="yes">
+         <include name="com/google/**"/>
+         <exclude name="com/google/inject/internal/**"/>
+@@ -183,25 +176,7 @@
+       <fileset dir="${multibindings.src.dir}"/>
+       <fileset dir="${persist.src.dir}"/>
+     	<fileset dir="${grapher.src.dir}"/>
+-      <!-- TODO: this breaks Doclava for some reason
+-      <fileset dir="${struts2.src.dir}"/> -->
+-
+-      <doclet name="com.google.doclava.Doclava">
+-        <param name="-hdf"/> <param name="project.name"/> <param name="Guice"/>
+-        <param name="-since"/> <param name="lib/build/guice-1.0.xml"/> <param name="Guice_1.0" />
+-        <param name="-since"/> <param name="lib/build/guice-2.0.xml"/> <param name="Guice_2.0" /> 
+-        <param name="-apiversion" value="Guice_${new.api}"/>
+-        <param name="-assetsdir" value="javadoc/assets"/>
+-      	<param name="-apixml" value="build/docs/guice-${new.api}.xml"/>
+-        <!-- TODO: fix doclava federation
+-          http://aopalliance.sourceforge.net/doc
+-          http://www.springframework.org/docs/api/
+-          <param name="-federate"/><param name="JDK"/><param name="http://download.oracle.com/javase/6/docs/api/index.html?"/>
+-          <param name="-federationxml"/><param name="JDK"/><param name="http://doclava.googlecode.com/svn/static/api/openjdk-6.xml"/>
+-        -->
+-      </doclet>
+     </javadoc>
+-    <move todir="build/docs/javadoc"><fileset dir="build/docs/reference"/></move>
+   </target>
+ 
+   <target name="no_aop"
--- a/dev-java/guice/files/3.0-common.xml.patch
+++ b/dev-java/guice/files/3.0-common.xml.patch
@ -0,0 +1,26 @@
+diff --git a/guice-3.0-src/common.xml b/guice-3.0-src/common.xml
+index a318ab3..62cadce 100644
+--- a/guice-3.0-src/common.xml
+++ b/guice-3.0-src/common.xml
+@@ -137,20 +137,6 @@
+   <target name="jar.withdeps" depends="compile"
+       description="Build jar with dependencies embedded.">
+     <mkdir dir="${build.dir}/dist"/>
+-    <dirname property="common.basedir" file="${ant.file.common}"/>
+-    <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
+-        classpath="${common.basedir}/lib/build/jarjar-snapshot.jar"/>
+-    <jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
+-      <fileset dir="${build.dir}/classes"/>
+-      <zipfileset src="${common.basedir}/lib/build/cglib-2.2.1-snapshot.jar"/>
+-      <zipfileset src="${common.basedir}/lib/build/asm-3.1.jar"/>
+-      <rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
+-      <rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/>
+-      <rule pattern="org.objectweb.asm.*" result="com.google.inject.internal.asm.$@1"/>
+-      <rule pattern="org.objectweb.asm.**.*" result="com.google.inject.internal.asm.@1.$@2"/>
+-      <rule pattern="com.google.inject.internal.util.*" result="com.google.inject.internal.util.$@1"/>    	
+-      <rule pattern="com.google.inject.internal.util.**.*" result="com.google.inject.internal.util.@1.$@2"/>
+-      <keep pattern="com.google.inject.**"/>
+-    </jarjar>
+    <jar destfile="${build.dir}/${ant.project.name}.jar"  basedir="${build.dir}/classes" />
+   </target>
+ </project>
--- a/dev-java/guice/guice-2.0.ebuild
+++ b/dev-java/guice/guice-2.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-java/guice/guice-2.0.ebuild,v 1.1 2013/09/25 17:20:14 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above"
+HOMEPAGE="http://code.google.com/p/google-guice/"
+SRC_URI="http://google-guice.googlecode.com/files/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEPEND="dev-java/aopalliance:1
+	dev-java/asm:3
+	dev-java/cglib:2.2"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}-src/"
+
+RESTRICT="test"
+
+JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="aopalliance-1,asm-3,cglib-2.2"
+
+java_prepare() {
+	find . -name '*.jar' -delete || die
+	find . -name '*.class' -delete || die
+	epatch "${FILESDIR}"/${PV}-common.xml.patch
+	epatch "${FILESDIR}"/${PV}-build.xml.patch
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+
+	use doc && java-pkg_dojavadoc javadoc/
+	use source && java-pkg_dosrc src/com
+}
--- a/dev-java/guice/guice-3.0.ebuild
+++ b/dev-java/guice/guice-3.0.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/guice/guice-3.0.ebuild,v 1.1 2013/09/25 17:22:05 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above."
+HOMEPAGE="http://code.google.com/p/google-guice/"
+SRC_URI="http://google-guice.googlecode.com/files/${P}-src.zip"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEPEND="dev-java/aopalliance:1
+	dev-java/javax-inject:0
+	dev-java/asm:3
+	dev-java/cglib:2.2"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}-src/"
+
+JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="aopalliance-1,asm-3,cglib-2.2,javax-inject"
+
+java_prepare() {
+	find . -name '*.jar' -exec rm -v {} + || die
+	find . -name '*.class' -exec rm -v {} + || die
+	epatch "${FILESDIR}"/${PV}-common.xml.patch
+	epatch "${FILESDIR}"/${PV}-build.xml.patch
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	use source && java-pkg_dosrc core/src/com
+}
--- a/dev-java/guice/metadata.xml
+++ b/dev-java/guice/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="google-code">google-guice</remote-id>
+	</upstream>
+</pkgmetadata>
+
--- a/dev-java/java-gnome/java-gnome-4.1.3.ebuild
+++ b/dev-java/java-gnome/java-gnome-4.1.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-java/java-gnome/java-gnome-4.1.3.ebuild,v 1.2 2013/09/22 06:40:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.1.3.ebuild,v 1.3 2013/09/25 17:25:02 ago Exp $

 EAPI="5"

@ -18,7 +18,7 @@ SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${MY_P}

 LICENSE="GPL-2-with-linking-exception"
 SLOT="4.1"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"

 COMMON_DEP="
 	app-text/enchant:0
--- a/dev-java/jsoup/Manifest
+++ b/dev-java/jsoup/Manifest
@ -0,0 +1 @@
+DIST jsoup-1.7.2.tar.gz 292926 SHA256 b778e2b3687c4ca2255e9a9f5038f54470c0dfee8f9758937afc1f50fac78b38 SHA512 de400a755b4ecf7962b66f2a3f232895c5ce365c18e9c4af4dc654094357248e7f694217a33b8a0415767c1c50c532f6d70f01e04475ecf0c7d1b5607432967f WHIRLPOOL 67ae0eb1459161a46a5bb2c2ce8c646febe0fe5c8f0cbae8c4d620d713c2d6cf982fd4d8364204c72d07fbef0a9df32b5226cb65a718e3b811912b09b7a15911
--- a/dev-java/jsoup/jsoup-1.7.2.ebuild
+++ b/dev-java/jsoup/jsoup-1.7.2.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-java/jsoup/jsoup-1.7.2.ebuild,v 1.1 2013/09/25 17:36:28 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple vcs-snapshot
+
+DESCRIPTION="Java HTML parser that makes sense of real-world HTML soup"
+HOMEPAGE="http://jsoup.org/"
+SRC_URI="https://github.com/jhy/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+java_prepare() {
+	rm pom.xml || die
+	mkdir -p target/classes/org/jsoup/nodes/ || die
+	cp src/main/java/org/jsoup/nodes/*.properties target/classes/org/jsoup/nodes/ || die
+}
+
+src_test() {
+	testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"
+
+	mkdir target/tests || die
+	ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")
+	cp -r src/test/resources/* target/tests || die
+
+	tests=$(find target/tests -name "*Test.class" \
+			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
+			| grep -vP '\$');
+	ejunit4 -cp "${testcp}" ${tests}
+}
--- a/dev-java/jsoup/metadata.xml
+++ b/dev-java/jsoup/metadata.xml
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<upstream>
+		<remote-id type="github">jhy/jsoup</remote-id>
+	</upstream>
+	<longdescription>
+		jsoup is a Java library for working with real-world HTML. It provides a
+		very convenient API for extracting and manipulating data, using the best
+		of DOM, CSS, and jquery-like methods.
+		It implements the WHATWG HTML5 specification (http://whatwg.org/html),
+		and parses HTML to the same DOM as modern browsers do. It's designed to
+		deal with all varieties of HTML found in the wild; from pristine and
+		validating, to invalid tag-soup; jsoup will create a sensible parse tree.
+	</longdescription>
+</pkgmetadata>
+
--- a/dev-java/minlog/minlog-1.2.ebuild
+++ b/dev-java/minlog/minlog-1.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/minlog/minlog-1.2.ebuild,v 1.1 2013/09/11 17:33:34 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/minlog/minlog-1.2.ebuild,v 1.2 2013/09/26 02:29:33 radhermit Exp $

 EAPI="5"

@ -12,7 +12,7 @@ DESCRIPTION="Minimal overhead Java logging"
 HOMEPAGE="https://code.google.com/p/minlog/"
 SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"

-LICENSE="BSD-2"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
--- a/dev-lang/python/python-3.3.2-r2.ebuild
+++ b/dev-lang/python/python-3.3.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-lang/python/python-3.3.2-r2.ebuild,v 1.4 2013/09/05 03:46:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.2-r2.ebuild,v 1.6 2013/09/26 04:20:27 floppym Exp $

 EAPI="3"
 WANT_AUTOMAKE="none"
@ -27,6 +27,7 @@ IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqli
 # patchset. See bug 447752.

 RDEPEND="app-arch/bzip2
+	app-arch/xz-utils
 	>=sys-libs/zlib-1.1.3
 	virtual/libffi
 	virtual/libintl
@ -62,6 +63,11 @@ src_prepare() {
 	rm -fr Modules/_ctypes/libffi*
 	rm -fr Modules/zlib

+	if tc-is-cross-compiler; then
+		# Invokes BUILDPYTHON, which is built for the host arch
+		local EPATCH_EXCLUDE="05_all_regenerate_platform-specific_modules.patch"
+	fi
+
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"

 	epatch "${FILESDIR}/python-3.3-CVE-2013-2099.patch"
@ -128,27 +134,6 @@ src_configure() {
 		use hardened && replace-flags -O3 -O2
 	fi

-	# Run the configure scripts in parallel.
-	multijob_init
-
-	mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}}
-
-	if tc-is-cross-compiler; then
-		(
-		multijob_child_init
-		cd "${WORKDIR}"/${CBUILD} >/dev/null
-		OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \
-		"${S}"/configure \
-			--{build,host}=${CBUILD} \
-			|| die "cross-configure failed"
-		) &
-		multijob_post_fork
-
-		# The configure script assumes it's buggy when cross-compiling.
-		export ac_cv_buggy_getaddrinfo=no
-		export ac_cv_have_long_long_format=yes
-	fi
-
 	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
 	tc-export CXX
 	# The configure script fails to use pkg-config correctly.
@ -165,8 +150,11 @@ src_configure() {
 		dbmliborder+="${dbmliborder:+:}gdbm"
 	fi

-	cd "${WORKDIR}"/${CHOST}
-	ECONF_SOURCE=${S} OPT="" \
+	BUILD_DIR="${WORKDIR}/${CHOST}"
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	ECONF_SOURCE="${S}" OPT="" \
 	econf \
 		--with-fpectl \
 		--enable-shared \
@ -180,41 +168,13 @@ src_configure() {
 		--enable-loadable-sqlite-extensions \
 		--with-system-expat \
 		--with-system-ffi
-
-	if tc-is-cross-compiler; then
-		# Modify the Makefile.pre so we don't regen for the host/ one.
-		# We need to link the host python programs into $PWD and run
-		# them from here because the distutils sysconfig module will
-		# parse Makefile/etc... from argv[0], and we need it to pick
-		# up the target settings, not the host ones.
-		sed -i \
-			-e '1iHOSTPYTHONPATH = ./hostpythonpath:' \
-			-e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \
-			-e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \
-			Makefile{.pre,} || die "sed failed"
-	fi
-
-	multijob_finish
 }

 src_compile() {
-	if tc-is-cross-compiler; then
-		cd "${WORKDIR}"/${CBUILD}
-		# Disable as many modules as possible -- but we need a few to install.
-		PYTHON_DISABLE_MODULES=$(
-			sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \
-				egrep -v '(unicodedata|time|cStringIO|_struct|binascii)'
-		) \
-		PTHON_DISABLE_SSL="1" \
-		SYSROOT= \
-		emake || die "cross-make failed"
-		# See comment in src_configure about these.
-		ln python ../${CHOST}/hostpython || die
-		ln Parser/pgen ../${CHOST}/Parser/hostpgen || die
-		ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die
-	fi
+	# Avoid invoking pgen for cross-compiles.
+	touch Include/graminit.h Python/graminit.c || die

-	cd "${WORKDIR}"/${CHOST}
+	cd "${BUILD_DIR}" || die
 	emake CPPFLAGS="" CFLAGS="" LDFLAGS="" || die "emake failed"

 	# Work around bug 329499. See also bug 413751 and 457194.
@ -232,7 +192,7 @@ src_test() {
 		return
 	fi

-	cd "${WORKDIR}"/${CHOST}
+	cd "${BUILD_DIR}" || die

 	# Skip failing tests.
 	local skipped_tests="gdb"
@ -265,7 +225,8 @@ src_test() {
 src_install() {
 	local libdir=${ED}/usr/$(get_libdir)/python${SLOT}

-	cd "${WORKDIR}"/${CHOST}
+	cd "${BUILD_DIR}" || die
+
 	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"

 	sed \
@ -314,9 +275,8 @@ src_install() {

 	# if not using a cross-compiler, use the fresh binary
 	if ! tc-is-cross-compiler; then
-		local PYTHON=./python \
-			LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
-		export LD_LIBRARY_PATH
+		local PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}.
 	fi

 	echo "EPYTHON='${EPYTHON}'" > epython.py
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@ -1,4 +1,6 @@
 DIST tcl-core8.6.0-src.tar.gz 5719946 SHA256 c53915996bb3ddda05d765f848bbd55111d44b74406a9b67a02070078a645964 SHA512 c5f78b80d9c83ac7dfd4dd05e54d8e678e5968df3cbd39d450e6923cdf370c17cdf0654580c649f4876d26cd527f965f0cecd2034cc6bc44d29a3579bc1d181f WHIRLPOOL 842f2ae04d5083cb78ffe04bafa6c132c135bb689d6609a3bbe5955492f1853692e20ff1b44bea81c1920022ef2dfa4397f69380befc8c911f51c05a76fd23a0
+DIST tcl-core8.6.1-src.tar.gz 5773335 SHA256 00a25fcd70e0be65f85e996353c2a0717eaaf51dc547cf6e499bb05257e20764 SHA512 d3f4c3200017f3afcc50c19619d79a31cac5441b4aac341524a6dfdda3e6f2eada1e0a70875d24f29afc733998aedf6fa14826cba61fceda496aaf2a2a4a3c5b WHIRLPOOL dbd53216ee28bb9a3fbaa7aa5c07ca5931f098d6761eaa859d74ab5dda409e6dc77a28ee43a312267ceff74d04fb723484b6ea8afccf429c28cea5fd6c64521e
 DIST tcl8.5.10-src.tar.gz 4498413 SHA256 f582063edd5419a39ee8f7b5c8f95d557b5daad13efb0ed2f0967ca185613bb7 SHA512 d48c5e74e1dcdae92cf71d9f557eee581fadbc552b458d50034d412a07434b58a3302f64d4ef0af91e92cab10f3f86a18cd64bc9e5be906e1807f40cc20cb344 WHIRLPOOL 0e7d2ae1a275c1f0e669beaf5a55dceced34829f43c0e3e275e1cbb99b4fd2325a1fa43993959dcbed2abd27d6317a0eca2702115068a2d35ebacda9d5e56a8c
 DIST tcl8.5.13-src.tar.gz 4513204 SHA256 9b868dd563e65671a26fcf518b6b86c1bb1b6756f48fdc90f04301d4f3a6596a SHA512 e1c9f36dd0e1afd81f42d249fe0191f10d6e0eab73042e32c9c0af09063ebf19bc2a24364743fa7b6798c588e77fa81654e6e7eb7591e1aaf4b222e20ecc6c84 WHIRLPOOL f1c1b67508c5d5c85de7d76d075a577ef14b5df05ca5bb0a0d0d78261134e8d85accb82a27f135877585820d52f0d363ebde74cfd890dbfafbf3766985315b61
 DIST tcl8.5.14-src.tar.gz 4528533 SHA256 7494e94f1e195a505c542a3c50e01589d2f8bfd19597382827a895fa1c471f2d SHA512 3cc8a39d2f5d7bd086c041e11aeb3c7b755c943fa0f761a1f38ce6d625d7be557792352878b514d817628a57392604e401bd598bbf5a395deffda078b294ae8d WHIRLPOOL 99a5430f6f0375be2489344e0b1cef7c2f2cbc1f4c23087d3419588f9d71dd5018e0b0aeea63286e0fb0fa4c404e9c4b2b59bae4fb3e9ebe0ff8597615d89843
+DIST tcl8.5.15-src.tar.gz 4536117 SHA256 f24eaae461795e6b09bf54c7e9f38def025892da55f26008c16413cfdda2884e SHA512 44c8a975ffaeca1f954fbc160fed966064340b5de883e53321691c6c457283716c4ab5c87c7c754ff5c1bd293d46eb14bbf356a0bf6a5ed0078d8789703df3df WHIRLPOOL da369146ccc1a449eae6b2fddc7802457c267b1ed047dba665b2684f27105a0763646b6a985e697891b3da9b3531a89f1ffb78168dc386c27889bcdaaa175e1c
--- a/dev-lang/tcl/files/tcl-8.6.1-conf.patch
+++ b/dev-lang/tcl/files/tcl-8.6.1-conf.patch
@ -0,0 +1,11 @@
+--- tcl8.5.0/unix/tcl.m4.conf	2007-12-20 10:48:05.000000000 +0100
+++ tcl8.5.0/unix/tcl.m4	2007-12-20 10:48:52.000000000 +0100
+@@ -1427,7 +1427,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -fPIC -Wl,-soname,${@}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
--- a/dev-lang/tcl/tcl-8.5.15.ebuild
+++ b/dev-lang/tcl/tcl-8.5.15.ebuild
@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.15.ebuild,v 1.1 2013/09/25 14:57:41 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug threads"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+pkg_setup() {
+	if use threads ; then
+		echo
+		ewarn "PLEASE NOTE: You are compiling ${P} with"
+		ewarn "threading enabled."
+		ewarn "Threading is not supported by all applications"
+		ewarn "that compile against tcl. You use threading at"
+		ewarn "your own discretion."
+		echo
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
+
+	# Bug 354067
+	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+src_install() {
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins "${S}"/*.h
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	dosym tclsh${v1} /usr/bin/tclsh
+
+	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+}
+
+pkg_postinst() {
+	for version in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 8.5 ${version}; then
+			echo
+			ewarn "You're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
+			ewarn "packages on your system that link with tcl after the upgrade"
+			ewarn "completes. To perform this action, please run revdep-rebuild"
+			ewarn "in package app-portage/gentoolkit."
+			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
+			ewarn "upgrade them before this recompilation, too,"
+			echo
+		fi
+	done
+}
--- a/dev-lang/tcl/tcl-8.6.1.ebuild
+++ b/dev-lang/tcl/tcl-8.6.1.ebuild
@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.1.ebuild,v 1.1 2013/09/25 14:57:41 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug +threads"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+src_prepare() {
+	find \
+		"${SPARENT}"/compat/* \
+		"${SPARENT}"/doc/try.n \
+		-delete || die
+
+	epatch "${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${P}-conf.patch
+
+	# Bug 354067
+	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+src_install() {
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins "${S}"/*.h
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	dosym tclsh${v1} /usr/bin/tclsh
+
+	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+}
+
+pkg_postinst() {
+	for version in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 8.6 ${version}; then
+			echo
+			ewarn "You're upgrading from <${P}, you must recompile the other"
+			ewarn "packages on your system that link with tcl after the upgrade"
+			ewarn "completes. To perform this action, please run revdep-rebuild"
+			ewarn "in package app-portage/gentoolkit."
+			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
+			ewarn "upgrade them before this recompilation, too,"
+			echo
+		fi
+	done
+}
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@ -1,3 +1,5 @@
 DIST tk8.5.13-src.tar.gz 4086092 SHA256 9e83ba2704ad73a65986eb7cdc51e432a5db6eca8d8691e33caceef40ed0c563 SHA512 5b705026d3d80c35bd60311c3df5489a7970c1648f98d843d6ee57c9336de5e63aed488f670f15f2c0bffccbc2402cc98c383c057b7d86f1db4c36340e34e209 WHIRLPOOL e523bfa0ce407f4d5157df7fee93c6d60012bf5b46a4cbd4e4692ad0ce872650563d12db11bfa94ba19b0a5aad1ef9fdd4b02dfb11f0de253839c69adb26a718
 DIST tk8.5.14-src.tar.gz 4093990 SHA256 9a7ba8ce73f8a329bde894954e70f9345cbb07aac1d7e674683c47270b32e1a1 SHA512 06bc8bd720aceb60995c829609d0f78fd5378ed6b0c3eb3c44e7bea3022502cdb8acec29ae9dc332fa43c838eea06b591ed0f6c5a67c7e20cd8b888316d857a6 WHIRLPOOL 3692acebe8bc0c4b9cd379e1dfe4a7e3f29c3aaddca4dcb988b2090826600b340605e5e1d6e554a29fdd2927e64c4d128d89dff979fb792c7f02a53ae739fa46
+DIST tk8.5.15-src.tar.gz 4086650 SHA256 815c6706d0b4fdd432fe16b82e7b9adfa1f057c44edd11d28f7c4b0ac104323f SHA512 9c8c42135b918f551e3e5ce479f2c8583749d34db5985a21e583c8f0aa2637eaa4ae0f47ce7b395f72ec929edd758c53326c96a23dac5f70a6f86eb63584dca5 WHIRLPOOL 6aca2bfab54155f573bfa9b07ce0767ff8f6da227e2845c03a81d964808e25b9a6483301692934a40ea2d9ddfc7d7193c2131ef775f84c9b164f35a6a0900008
 DIST tk8.6.0-src.tar.gz 4239836 SHA256 5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6 SHA512 e78c3f3a8dacd6c1aaa4587f7e4e2a2a6a5adf3957c89bf450cea82d85701242729ccf6232cef71138685926f6a44fe683aa6425d0c4738326637e88b3d9e38d WHIRLPOOL 8344adaa74913eb3dd13d8240a451ebdfe0225a67ea7516e18d4a3920b2e448380c53fe6d2916e36518b3e9b02df0e15c41c9e1a6f1ca30f1b6790a408fdf30b
+DIST tk8.6.1-src.tar.gz 4244010 SHA256 b691a2e84907392918665fe03a0deb913663a026bed2162185b4a9a14898162c SHA512 f05879924371bae7059ccf84b49b16748b3c2c1438ddcfbc4797a7552779947b0c733ada8c9abd739b3b00d16e9e76b407269213f87b6fc81bb29796581a8447 WHIRLPOOL 5d95b5ec0d9c778b445c60ac24b056306e7c32086cd073ecaef000327c9c5d6f639ce1c3762b3047192a3859249714f434a0e05ce9275624b1a3f6d5127c905c
--- a/dev-lang/tk/tk-8.5.15.ebuild
+++ b/dev-lang/tk/tk-8.5.15.ebuild
@ -0,0 +1,124 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.15.ebuild,v 1.1 2013/09/25 15:14:20 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug threads truetype aqua xscreensaver"
+
+RDEPEND="
+	!aqua? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		x11-libs/libX11
+		x11-libs/libXt
+		truetype? ( x11-libs/libXft )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+	)
+	~dev-lang/tcl-${PV}"
+DEPEND="${RDEPEND}
+	!aqua? ( x11-proto/xproto )"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
+		"${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
+	eprefixify Makefile.in
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
+
+	# Bug 354067 : the same applies to tcl, since the patch is about tcl.m4, just
+	# copy the tcl patch
+	epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch
+
+	# Make sure we use the right pkg-config, and link against fontconfig
+	# (since the code base uses Fc* functions).
+	sed \
+		-e 's/FT_New_Face/XftFontOpen/g' \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e 's:xft freetype2:xft freetype2 fontconfig:' \
+		-i configure.in || die
+	rm -f configure || die
+
+	tc-export CC
+
+	eautoconf
+}
+
+src_configure() {
+	local mylibdir=$(get_libdir)
+
+	econf \
+		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
+		$(use_enable threads) \
+		$(use_enable aqua) \
+		$(use_enable truetype xft) \
+		$(use_enable xscreensaver xss) \
+		$(use_enable debug symbols)
+}
+
+src_test() {
+	Xemake test
+}
+
+src_install() {
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# normalize $S path, bug #280766 (pkgcore)
+	local nS="$(cd "${S}"; pwd)"
+
+	# fix the tkConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TK_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
+		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tk${v1}/include/unix
+	doins "${S}"/*.h
+	insinto /usr/${mylibdir}/tk${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+
+	dosym wish${v1} /usr/bin/wish
+
+	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+}
--- a/dev-lang/tk/tk-8.6.1.ebuild
+++ b/dev-lang/tk/tk-8.6.1.ebuild
@ -0,0 +1,134 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.6.1.ebuild,v 1.1 2013/09/25 15:14:20 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug +threads truetype aqua xscreensaver"
+
+RDEPEND="
+	!aqua? (
+		media-libs/fontconfig
+		x11-libs/libX11
+		x11-libs/libXt
+		truetype? ( x11-libs/libXft )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+	)
+	~dev-lang/tcl-${PV}"
+DEPEND="${RDEPEND}
+	!aqua? ( x11-proto/xproto )"
+
+# Not bumped to 8.6
+#RESTRICT=test
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+src_prepare() {
+	find \
+		"${SPARENT}"/compat/* \
+		-delete || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \
+		"${FILESDIR}"/${PN}-8.5.13-multilib.patch
+
+	epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch
+	eprefixify Makefile.in
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${PN}-8.5.14-conf.patch
+
+	# Bug 354067 : the same applies to tcl, since the patch is about tcl.m4, just
+	# copy the tcl patch
+	epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch
+
+	# Make sure we use the right pkg-config, and link against fontconfig
+	# (since the code base uses Fc* functions).
+	sed \
+		-e 's/FT_New_Face/XftFontOpen/g' \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e 's:xft freetype2:xft freetype2 fontconfig:' \
+		-i configure.in || die
+	rm -f configure || die
+
+	tc-export CC
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	eautoconf
+}
+
+src_configure() {
+	local mylibdir=$(get_libdir)
+
+	econf \
+		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
+		$(use_enable threads) \
+		$(use_enable aqua) \
+		$(use_enable truetype xft) \
+		$(use_enable xscreensaver xss) \
+		$(use_enable debug symbols)
+}
+
+src_test() {
+	Xemake test
+}
+
+src_install() {
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# normalize $S path, bug #280766 (pkgcore)
+	local nS="$(cd "${S}"; pwd)"
+
+	# fix the tkConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TK_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
+		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tk${v1}/include/unix
+	doins "${S}"/*.h
+	insinto /usr/${mylibdir}/tk${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+
+	dosym wish${v1} /usr/bin/wish
+
+	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+}
--- a/dev-libs/libnfc/libnfc-1.7.0-r1.ebuild
+++ b/dev-libs/libnfc/libnfc-1.7.0-r1.ebuild
@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnfc/libnfc-1.7.0.ebuild,v 1.1 2013/09/24 13:37:47 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnfc/libnfc-1.7.0-r1.ebuild,v 1.1 2013/09/26 02:58:50 mrueg Exp $

-EAPI="4"
+EAPI=5

-inherit eutils toolchain-funcs
+inherit toolchain-funcs

 DESCRIPTION="Near Field Communications (NFC) library"
 HOMEPAGE="http://www.libnfc.org/"
@ -22,13 +22,9 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"

 src_configure() {
-	# Upstream doesn't use the right macro, so we need to force this.
-	# https://code.google.com/p/libnfc/issues/detail?id=249
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	local drivers="arygon,pn532_uart"
-	use pcsc-lite && drivers+=",acr122"
-	use usb && drivers+=",pn53x_usb"
+	local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
+	use pcsc-lite && drivers+=",acr122_pcsc"
+	use usb && drivers+=",pn53x_usb,acr122_usb"
 	econf \
 		--with-drivers="${drivers}" \
 		$(use_enable doc) \
--- a/dev-libs/libwacom/libwacom-0.7.1.ebuild
+++ b/dev-libs/libwacom/libwacom-0.7.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.7.1.ebuild,v 1.7 2013/09/23 19:21:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwacom/libwacom-0.7.1.ebuild,v 1.8 2013/09/25 17:21:51 ago Exp $

 EAPI=4

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

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
 IUSE="doc static-libs"

 RDEPEND="dev-libs/glib:2
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@ -1 +1,2 @@
 DIST nanomsg-0.1-alpha.tar.gz 523031 SHA256 e506ffed4e2daf40b782d6bc10ed6c267507f59ebc583a5af6744571341c7420 SHA512 8c4e7a81c9ec31003833d8670105c8e11d783959fd59e490cae1d36fa3e9a111fe43990087a1ac97879d56c40b71103497b38cbc94d6d761eeb86cd4f090b324 WHIRLPOOL 91077f2b6ee8f75c8cdbae41d2a48df987d6fe602948dca17cd6f573858b5c08ee32b600fd080e15d0a248dd56a6703f78cab013bbaa37d3cd5ae6711407b21b
+DIST nanomsg-0.2-alpha.tar.gz 549229 SHA256 6d5498156f454a32af1b425be0c9715aaeb8ea5ca55ac227bb2125157a90f22d SHA512 0b4704dcbe2105cb1f249d693d55e8fe84757fe4bdade6b5688ebbd829b3368dd31a4166a3977d6d34a932abe656064d6e23aaafbd9e6d81d55c2d8a63434d3a WHIRLPOOL 9007b9b0c79ef9b305eda0010e0cacfaea8c2856fa5a26ab7c7a515cd6e66787f33c3b862acaf258fe168e9e2c59732afac5c0b60da354de2fac651837901174
--- a/dev-libs/nanomsg/nanomsg-0.2.ebuild
+++ b/dev-libs/nanomsg/nanomsg-0.2.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nanomsg/nanomsg-0.2.ebuild,v 1.1 2013/09/25 13:04:39 djc Exp $
+
+EAPI=5
+
+DESCRIPTION="High-performance messaging interface for distributed applications"
+HOMEPAGE="http://nanomsg.org/"
+SRC_URI="http://download.nanomsg.org/${P}-alpha.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${P}-alpha"
--- a/dev-libs/nss/files/nss-3.15.1-fipstest-warnings.patch
+++ b/dev-libs/nss/files/nss-3.15.1-fipstest-warnings.patch
@ -0,0 +1,26 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=920899
+
+diff -r 279078670022 security/nss/cmd/fipstest/fipstest.c
+--- a/security/nss/cmd/fipstest/fipstest.c	Wed Mar 27 17:03:34 2013 -0400
+++ b/security/nss/cmd/fipstest/fipstest.c	Thu Sep 26 00:58:04 2013 -0400
+@@ -3616,10 +3616,10 @@ void hmac_test(char *reqfn)
+         goto loser;
+     }      
+     msg = PORT_ZAlloc(msgLen);
+-    memset(msg, 0, msgLen);
+     if (msg == NULL) {
+         goto loser;
+     } 
+    memset(msg, 0, msgLen);
+ 
+     req = fopen(reqfn, "r");
+     resp = stdout;
+@@ -3677,7 +3677,7 @@ void hmac_test(char *reqfn)
+             keyLen = 0; 
+             TLen = 0;
+             memset(key, 0, sizeof key);     
+-            memset(msg, 0, sizeof msg);  
+            memset(msg, 0, msgLen);
+             memset(HMAC, 0, sizeof HMAC);
+             continue;
+         }
--- a/dev-libs/nss/nss-3.15.1-r2.ebuild
+++ b/dev-libs/nss/nss-3.15.1-r2.ebuild
@ -0,0 +1,264 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.15.1-r2.ebuild,v 1.1 2013/09/26 06:02:24 vapier Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+NSPR_VER="4.10"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch
+	http://dev.gentoo.org/~anarchy/patches/${PN}-3.15-pem-support-20130617.patch.xz"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="utils"
+
+DEPEND="virtual/pkgconfig
+	>=dev-libs/nspr-${NSPR_VER}"
+
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}
+	>=dev-db/sqlite-3.5
+	sys-libs/zlib"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+src_setup() {
+	export LC_ALL="C"
+}
+
+src_prepare() {
+	# Custom changes for gentoo
+	epatch "${FILESDIR}/${PN}-3.15-gentoo-fixups.patch"
+	epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
+	epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
+	epatch "${DISTDIR}/${PN}-3.15-pem-support-20130617.patch.xz"
+	epatch "${FILESDIR}/${PN}-3.15-x32.patch"
+	epatch "${FILESDIR}/${PN}-3.15.1-fipstest-warnings.patch"
+	cd coreconf
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" "${S}"/config/Makefile
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		"${S}"/config/Makefile
+
+	epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			"${S}"/cmd/shlibsign/sign.sh
+	fi
+
+	# dirty hack
+	cd "${S}"
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+	hppa*)   echo "parisc";;
+	i?86*)   echo "i686";;
+	x86_64*) echo "x86_64";;
+	*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	echo > "${T}"/test.c || die
+	${!cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}"/test.o || die
+	case $(file "${T}"/test.o) in
+	*32-bit*x86-64*) echo USE_x32=1;;
+	*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+	*32-bit*|*ppc*|*i386*) ;;
+	*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+src_compile() {
+	strip-flags
+
+	tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG}
+	local makeargs=(
+		CC="${CC}"
+		AR="${AR} rc \$@"
+		RANLIB="${RANLIB}"
+		OPTIMIZER=
+		$(nssbits)
+	)
+
+	# Take care of nspr settings #436216
+	append-cppflags $(${PKG_CONFIG} nspr --cflags)
+	append-ldflags $(${PKG_CONFIG} nspr --libs-only-L)
+	unset NSPR_INCLUDE_DIR
+	export NSPR_LIB_DIR=${T}/fake-dir
+
+	# Do not let `uname` be used.
+	if use kernel_linux ; then
+		makeargs+=(
+			OS_TARGET=Linux
+			OS_RELEASE=2.6
+			OS_TEST="$(nssarch)"
+		)
+	fi
+
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export XCFLAGS="${CFLAGS} ${CPPFLAGS}"
+	export FREEBL_NO_DEPEND=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	emake -j1 -C coreconf \
+		CC="${BUILD_CC}" \
+		$(nssbits BUILD_) \
+		|| die
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		emake -j1 "${makeargs[@]}" -C ${d} || die "${d} make failed"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+src_install() {
+	cd "${S}"/dist
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	# We generate these after stripping the libraries, else they don't match.
+	#cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed"
+	cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.h
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils="shlibsign"
+	if use utils; then
+		# The tests we do not need to install.
+		#nssutils_test="bltest crmftest dbtest dertimetest
+		#fipstest remtest sdrtest"
+		nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
+		cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
+		nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
+		pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
+		symkeyutil tstclnt vfychain vfyserv"
+	fi
+	cd "${S}"/dist/*/bin/
+	for f in ${nssutils}; do
+		dobin ${f}
+	done
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	local l libs=() liblist
+	for l in ${NSS_CHK_SIGN_LIBS} ; do
+		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
+	done
+	liblist=$(printf '%s:' "${libs[@]}")
+	echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss"
+	doenvd "${T}/90nss"
+}
+
+pkg_postinst() {
+	# We must re-sign the libraries AFTER they are stripped.
+	local shlibsign="${EROOT}/usr/bin/shlibsign"
+	# See if we can execute it (cross-compiling & such). #436216
+	"${shlibsign}" -h >&/dev/null
+	if [[ $? -gt 1 ]] ; then
+		shlibsign="shlibsign"
+	fi
+	generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+}
+
+pkg_postrm() {
+	cleanup_chk "${EROOT}"/usr/$(get_libdir)
+}
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild,v 1.9 2013/09/23 19:14:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild,v 1.10 2013/09/25 17:21:07 ago Exp $

 EAPI=5

@ -12,7 +12,7 @@ DESCRIPTION="Crypt::SSLeay module for perl"

 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"

 # Disabling tests for now. Opening a port always leads to mixed results for
--- a/dev-perl/Socket6/Socket6-0.230.0.ebuild
+++ b/dev-perl/Socket6/Socket6-0.230.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Socket6/Socket6-0.230.0.ebuild,v 1.10 2013/09/23 19:14:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Socket6/Socket6-0.230.0.ebuild,v 1.11 2013/09/25 17:19:39 ago Exp $

 EAPI=4

@ -12,7 +12,7 @@ DESCRIPTION="IPv6 related part of the C socket.h defines and structure manipulat

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

 SRC_TEST="do"
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@ -1 +1,2 @@
 DIST fixtures-0.3.12.tar.gz 34405 SHA256 6e70e85f822303f046ad93a15072ba9b98e31a61732642b658f0b7ea68588aa0 SHA512 ede02b5158719c57de8b445f8b840d7b27ca7cc12e5dfa47b99de2cd39be9319c538ee487898c99cccfa6d694839c50619bf3f4811200a949eb4a39056841f9d WHIRLPOOL 837f27bca29806b6bed0b4a6a0779c4233165ff45aa2d5e78bc198b287170ab3456b0941dbf19502edaee24b293606e4782101d06cdd923f85dfb93b6e555cd1
+DIST fixtures-0.3.14.tar.gz 34586 SHA256 4cc3313e52519d2671bd22aacd4b3fde9d96b31eb49db04a7cd5ccc61fec5139 SHA512 096466bfd2d2c2bb73461145e060d351fb4cba4ab52885ee7dc376ce68aced190d4f8d9969e7a94fcf90dcafd9bd6579a3ce2bcccfee33218571cb84c87ac795 WHIRLPOOL ee32650518e8a0fa86f7064d7a4952caed8a4f51a69de959014f82c58ac60765b13e02486261dca118194c683d056d5f3fb2ff0cdccd9abec7316e095862b7a5
--- a/dev-python/fixtures/fixtures-0.3.14.ebuild
+++ b/dev-python/fixtures/fixtures-0.3.14.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fixtures/fixtures-0.3.14.ebuild,v 1.1 2013/09/26 00:43:09 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixtures, reusable state for writing clean tests and more."
+HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# nose not listed but provides coverage output of tests
+# run of test files by python lacks any output except on fail
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/testtools-0.9.22"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	pushd "${BUILD_DIR}"/ > /dev/null
+	ln -sf ../README .
+	nosetests lib/${PN}/tests/{test_callmany.py,test_fixture.py,test_testcase.py} \
+		 || die "Tests failed under ${EPYTHON}"
+}
--- a/dev-python/matplotlib/files/matplotlib-1.3.0-setup_without_X11.patch
+++ b/dev-python/matplotlib/files/matplotlib-1.3.0-setup_without_X11.patch
@ -0,0 +1,42 @@
+https://bugs.gentoo.org/show_bug.cgi?id=481564
+https://github.com/matplotlib/matplotlib/commit/1b3106c1bcd6017455232e8c974f1af8383a010c
+
+--- a/setupext.py
+++ b/setupext.py
+@@ -1463,7 +1463,7 @@ def backend_gtk3agg_internal_check(x):
+ 
+     try:
+         from gi.repository import Gtk, Gdk, GObject
+-    except ImportError:
+    except (ImportError, RuntimeError):
+         return (False, "Requires pygobject to be installed.")
+ 
+     return (True, "version %s.%s.%s" % (
+@@ -1489,9 +1489,14 @@ def check(self):
+             p = multiprocessing.Pool()
+         except:
+             return "unknown (can not use multiprocessing to determine)"
+-        success, msg = p.map(backend_gtk3agg_internal_check, [0])[0]
+-        p.close()
+-        p.join()
+        try:
+            success, msg = p.map(backend_gtk3agg_internal_check, [0])[0]
+        except:
+            success = False
+            msg = "Could not determine"
+        finally:
+            p.close()
+            p.join()
+         if success:
+             BackendAgg.force = True
+ 
+@@ -1521,7 +1526,7 @@ def backend_gtk3cairo_internal_check(x):
+ 
+     try:
+         from gi.repository import Gtk, Gdk, GObject
+-    except ImportError:
+    except (RuntimeError, ImportError):
+         return (False, "Requires pygobject to be installed.")
+ 
+     return (True, "version %s.%s.%s" % (
+
--- a/dev-python/matplotlib/matplotlib-1.3.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.3.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.3.0.ebuild,v 1.4 2013/09/22 01:50:30 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.3.0.ebuild,v 1.5 2013/09/25 12:34:22 xarthisius Exp $

 EAPI=5

@ -101,6 +101,11 @@ python_prepare_all() {
 		lib/matplotlib/{mathtext,fontconfig_pattern}.py \
 		|| die "sed pyparsing failed"

+	local PATCHES=(
+		# avoid checks needing a X display
+		"${FILESDIR}"/${P}-setup_without_X11.patch
+	)
+
 	distutils-r1_python_prepare_all
 }

--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@ -1,2 +1,3 @@
 DIST oslo.config-1.1.0.tar.gz 74650 SHA256 fe5dedb9b47c508eb886a7b9b96eb7667597af407ff42853db82b4b9e949ea82 SHA512 22eb8eb1f1e84cb7227ca4d269af52b54859eeb442a3c74466c907759c9b6cc9ddd90ec2103295fd0403e99231531c296ee5e09fe24b613b93c5bdb22abe012a WHIRLPOOL 58893e926f99b814b0f8ff4279c9f37323f9985cc3741d693006b00e123279c16a01003e772f6f9b1d6e48d2c7a900d7aadf9c0d29f27b34c46ca9890e5db532
 DIST oslo.config-1.1.1.tar.gz 75310 SHA256 5c5f3a178fe158b828885729e7e15471e6f095471a15ca69834c114353478e70 SHA512 7b38b24c246e31824736d5743d5566816744801f84425814a93c23d6aaf274f4100768a75d3d8eea5602bed6a03dbad10d8bf2ffd776221b820a3ca94758b2ed WHIRLPOOL 51e0b51b1afade75d392e3207f54a3d0b80fd4c642f7c6402abe51170bf288ba8f34521aa23e21af7c3cec51d17af59a35f4470b75ffb020ad437ffae16bd8b0
+DIST oslo.config-1.2.0.tar.gz 74645 SHA256 9016dd8ed81dc52b6d417bafc2d294fe66cf14b28055638c76a0ad5f44437795 SHA512 c6efeb68dfdc07256853bbeebe8686c25c6d775b75c7a3215faa498a99ffdfb0a5810ecedd65b1f58f46853f490d6e42661a6de6b4cf4055d14326d31e78c933 WHIRLPOOL 327597097846eda8a353511f4ebb2af434e8e4d505f47671de7293de5bc7af6b952e970675b99558edae3438213319edc37dfd9de5605e7acfa8e56f0709cb41
--- a/dev-python/oslo-config/oslo-config-1.2.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-1.2.0.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-config/oslo-config-1.2.0.ebuild,v 1.1 2013/09/26 00:45:40 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="The Oslo configuration API supports parsing command line arguments
+and ini style configuration files"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.config/oslo.config-${PV}.tar.gz"
+S="${WORKDIR}/oslo.config-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.8[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		dev-python/subunit[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}] )"
+RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]"
+
+# This time half the doc files are missing; Do you want them?
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
--- a/dev-python/oslo-sphinx/Manifest
+++ b/dev-python/oslo-sphinx/Manifest
@ -0,0 +1 @@
+DIST oslo.sphinx-1.0.tar.gz 21823 SHA256 222b76cc39ca6ed947049d348ff228cd851789827d31891dbfc61ada87704635 SHA512 fe786b1fb7072ebf72174453c0418e24679a70afc1f7674943d409a6be0ddb7386df0cdd7a402b826f5d56d42cc3087a4cf83557ae7fea2017b403a93e03f9d4 WHIRLPOOL 8b1edcd6255752d292dd55b4e5d7e61fa18de76bcb8ae04d72e34d88dc950dc97698c88753682d08967e9e83d21d1fd1f211531f69f39829d96543601b1c04d1
--- a/dev-python/oslo-sphinx/metadata.xml
+++ b/dev-python/oslo-sphinx/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
+    Theme and extension support for Sphinx documentation from the OpenStack project.
+  </longdescription>
+</pkgmetadata>
+
--- a/dev-python/oslo-sphinx/oslo-sphinx-1.0.ebuild
+++ b/dev-python/oslo-sphinx/oslo-sphinx-1.0.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-sphinx/oslo-sphinx-1.0.ebuild,v 1.1 2013/09/26 00:37:33 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Theme and extension support for Sphinx documentation from the OpenStack project."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.sphinx/oslo.sphinx-${PV}.tar.gz"
+S="${WORKDIR}/oslo.sphinx-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/pbr[${PYTHON_USEDEP}]
+	test? ( >=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.8[${PYTHON_USEDEP}] )"
--- a/dev-python/pyparsing/pyparsing-2.0.1.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.0.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-2.0.1.ebuild,v 1.9 2013/09/23 19:21:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-2.0.1.ebuild,v 1.10 2013/09/25 17:23:26 ago Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

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

 RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
--- a/dev-python/python-neutronclient/python-neutronclient-2.2.6-r2.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-2.2.6-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-neutronclient/python-neutronclient-2.2.6-r1.ebuild,v 1.1 2013/09/13 20:36:10 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-neutronclient/python-neutronclient-2.2.6-r2.ebuild,v 1.2 2013/09/26 00:14:50 floppym Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -27,8 +27,12 @@ RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]

 python_install() {
 	distutils-r1_python_install
-	cd "${D%/}$(python_get_sitedir)" || die
+	#stupid stupid
+	local SITEDIR="${D%/}$(python_get_sitedir)" || die
+	cd "${SITEDIR}" || die
 	local egg=( python_neutronclient*.egg-info )
 	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
 	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
+	ln -s neutronclient quantumclient || die
+	ln -s neutron quantumclient/quantum || die
 }
--- a/dev-python/python-neutronclient/python-neutronclient-2.3.0-r2.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-2.3.0-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/python-neutronclient/python-neutronclient-2.3.0-r1.ebuild,v 1.1 2013/09/13 20:36:10 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-neutronclient/python-neutronclient-2.3.0-r2.ebuild,v 1.2 2013/09/26 00:14:50 floppym Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -29,8 +29,12 @@ RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]

 python_install() {
 	distutils-r1_python_install
-	cd "${D%/}$(python_get_sitedir)" || die
+	#stupid stupid
+	local SITEDIR="${D%/}$(python_get_sitedir)" || die
+	cd "${SITEDIR}" || die
 	local egg=( python_neutronclient*.egg-info )
 	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
 	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
+	ln -s neutronclient quantumclient || die
+	ln -s neutron quantumclient/quantum || die
 }
--- a/dev-python/reportlab/reportlab-2.6.ebuild
+++ b/dev-python/reportlab/reportlab-2.6.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/reportlab/reportlab-2.6.ebuild,v 1.13 2013/09/23 19:16:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.6.ebuild,v 1.14 2013/09/25 17:27:36 ago Exp $

 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@ -15,7 +15,7 @@ SRC_URI="http://www.reportlab.com/ftp/${P}.tar.gz

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples"

 RDEPEND="virtual/python-imaging
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@ -1,4 +1,5 @@
 DIST requests-0.13.1.tar.gz 68474 SHA256 31f3ae96787fe74a78c7dd9626bf997fd4eabacc040b7b33fbd8632d2c2a97f6 SHA512 97472d56a2da10216e735b575610d9aa7f97f1d4705fb20e72a79f520090dec59b91d5b5059e9966bc2fd05982b6b8f3e2a1c794e9cf9042713ae8d481162df8 WHIRLPOOL f50251d2d71262118f208da14c4f3067ff904893416e22a8b3cbc1817d53709efef79e23a6c05b63b497f0cd105f1e106fa8eb751a4cd78d4733be027a663966
 DIST requests-0.14.2.tar.gz 361488 SHA256 0e3345a8ac0d712bf17bd9d3276415050c5f972265ab62993cd4540a3a1aaaef SHA512 d791f68b2fdc46ad6abaf2bcd49a038a335fddb476f89c6b7023370c716f0165a8ad09e8d0d1f3d145255d604c2d10f810e4090facd2381515b43f2306ca0365 WHIRLPOOL ed71a4a4db8279e1587d32dfb3dc2c219a87267e484bf23915db158c8843eea4d396d439e12919c29cb37677bb0b2615c87cabbd602a7de25a0273aca302c6ba
+DIST requests-1.2.2.tar.gz 348851 SHA256 56929d7b5dec9b37a9a8520f15202bada0ad55d2888a7c3243b9b194f2ef603d SHA512 9033cf874fa87e75a0d170e52858ddfd958d17a9aee524a7c230abc96e1202108598c7ed02d0a1c97bea1086a5e01ba2ecc82e2e54cec0ce6e2b71405c62c36f WHIRLPOOL 7cdbb2ee625cd587b03e40b81d5c2973bee9cc0b2324d32b2441b4442bfbd6fd596691144a6246e654a4039eb8b161303eff75a387b018605cbbab9c673a164a
 DIST requests-1.2.3.tar.gz 348854 SHA256 156bf3ec27ba9ec7e0cf8fbe02808718099d218de403eb64a714d73ba1a29ab1 SHA512 b1e273b0665976bf652f3a7cade7a23ddaa107cddbae54263234c6b7141c3e33e07eb1031f29a8c5f746434d03370928653a891227b553e77d78740a0261a839 WHIRLPOOL f54c909ae0100668526846d3d242dbe9ccbb8fefec44fdbe6af2dbc9d467002b3551463c04bc113319e2b20c7dc1a9f56fe3220e24932e1117c39211307d3c2b
 DIST requests-2.0.0.tar.gz 362994 SHA256 78536038f54cff6ade3be6863403146665b5a3923dd61108c98d8b64141f9d70 SHA512 17694f4240840a1f9fcb3d662032a67858d8d08ff5af47d2baeffe0d1b07693f3777e6f0f72501f5744fbe9d8b36968ae64a1d17fcc27960a41e3589f7e69a44 WHIRLPOOL 4575210b102240e548689601908e811782657836a55da8478a5eff69360894b6c791f7786bcdcf8469c5a082b2d1f279c032d6e07a281bcaabbce1b34c7664fe
--- a/dev-python/requests/requests-1.2.2.ebuild
+++ b/dev-python/requests/requests-1.2.2.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/requests/requests-1.2.2.ebuild,v 1.4 2013/09/25 22:59:40 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ http://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+# bundles dev-python/urllib3 snapshot
+RDEPEND="app-misc/ca-certificates
+	dev-python/charade[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+DOCS=( README.rst HISTORY.rst )
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.2.0-system-cacerts.patch
+		"${FILESDIR}"/${PN}-1.2.0-system-libs.patch
+		"${FILESDIR}"/${PN}-1.2.1-urllib3-py3.patch
+	)
+
+	# use system charade
+	rm -r requests/packages/charade || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild
+++ b/dev-python/sepolgen/sepolgen-1.1.9-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/sepolgen/sepolgen-1.1.9-r2.ebuild,v 1.2 2013/06/16 18:06:29 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r2.ebuild,v 1.3 2013/09/25 18:36:00 swift Exp $

 EAPI="3"
 PYTHON_DEPEND="*"
@ -20,7 +20,8 @@ KEYWORDS="amd64 x86"
 IUSE=""

 DEPEND=">=sys-libs/libselinux-2.0[python]
-		app-admin/setools[python]"
+		app-admin/setools[python]
+		sec-policy/selinux-base"
 RDEPEND="${DEPEND}"

 src_prepare() {
--- a/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild
+++ b/dev-python/sepolgen/sepolgen-1.1.9-r3.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/sepolgen/sepolgen-1.1.9-r3.ebuild,v 1.1 2013/07/19 20:16:05 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sepolgen/sepolgen-1.1.9-r3.ebuild,v 1.2 2013/09/25 18:36:00 swift Exp $

 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@ -19,6 +19,7 @@ IUSE=""

 DEPEND=">=sys-libs/libselinux-2.0[python]
 		app-admin/setools[python]
+		sec-policy/selinux-base
 		${PYTHON_DEPS}"
 RDEPEND="${DEPEND}"

--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST checkattach-0.15.tar.bz2 6242 SHA256 29b99fafbd5e03bb7815f865724c75b550c23aa5ee32abdd7bcd803df82363f2 SHA512 c9204641da2beb33d361d42cafacac39de40dc652f97568993d64dc1b1f776ce725aa088102c3f0d057648c6dbc06ed3d871b6ac715d4c90ac42fc18348f3101 WHIRLPOOL 2145c2501847a7a419e0831a6da3d826924d173b24ee74a35b22aec2a2283e67bbdd7611790d90d4129c3b80669bc60e8347ba3ab26380825be9fc31095b6cb2`
				`@ -0,0 +1 @@`
				`DIST recover-0.18.tar.bz2 8137 SHA256 9fcd1d440ef0709b4c9719c758d67ba349970b08027b16341290170a4b27cde4 SHA512 fe31626bd9bfacf299536f4943b65d61262da8bfec9c83b085e67a52833d8fe8c5ecc81fade50c451cfe2889e0cfa938401635a2c9471ebd31191fc1c7beeb71 WHIRLPOOL e1d159a1c182f514a625c9dceadb6ecba6f2a9b9b9f335654cdc53ef4758bb9922a46a441ac8079590d1ba1196548c5a275f31d8ff580510616c5d93e9160f35`
				`@ -0,0 +1 @@`
				`DIST tcomment-2.08.tar.gz 23070 SHA256 d34a7fd2736ca63752cc90f9749dd4897150fdef490f3841c38d0f95272ec769 SHA512 f3067aab71684e3b6f1ace5b2472e312f517545760e7e0a9f350a1b0756d529b6c4184197b61aacf22bfed6bef06839ff9ef839c28702d6fd0c02101659d64c8 WHIRLPOOL 0c8f6b421ffd45d0d26de618d4fcebbc534e316fead7e0fb87d8701dcd0e005aeaad151f9c5abb21cd6cd82292ce40f9c65f5c7e1494f08f052c30a715cc4c81`
				`@ -0,0 +1 @@`
				`DIST classmate-0.9.0.tar.gz 57752 SHA256 6667a959b282b037aaed328fca3131a89c7649a347a72e1d2d4dd40bc8b393f2 SHA512 7fb331c462458c8aab143f23c0d128a0e4e976f9d12bd181eb5658961b217bd1fe0871d056fc38bff794522c8b3118a2a017eab265afffc1d60b5580df1237a2 WHIRLPOOL ecfa56a57d07c1486f92c1a635d5b294b9664994504649a5234daff34935c0f42dc590f55ee1fa3a780399a923728a30e083a809871777e68e78deaf3f6dd45c`
				`@ -0,0 +1 @@`
				`DIST jsoup-1.7.2.tar.gz 292926 SHA256 b778e2b3687c4ca2255e9a9f5038f54470c0dfee8f9758937afc1f50fac78b38 SHA512 de400a755b4ecf7962b66f2a3f232895c5ce365c18e9c4af4dc654094357248e7f694217a33b8a0415767c1c50c532f6d70f01e04475ecf0c7d1b5607432967f WHIRLPOOL 67ae0eb1459161a46a5bb2c2ce8c646febe0fe5c8f0cbae8c4d620d713c2d6cf982fd4d8364204c72d07fbef0a9df32b5226cb65a718e3b811912b09b7a15911`
				`@ -0,0 +1 @@`
				`DIST oslo.sphinx-1.0.tar.gz 21823 SHA256 222b76cc39ca6ed947049d348ff228cd851789827d31891dbfc61ada87704635 SHA512 fe786b1fb7072ebf72174453c0418e24679a70afc1f7674943d409a6be0ddb7386df0cdd7a402b826f5d56d42cc3087a4cf83557ae7fea2017b403a93e03f9d4 WHIRLPOOL 8b1edcd6255752d292dd55b4e5d7e61fa18de76bcb8ae04d72e34d88dc950dc97698c88753682d08967e9e83d21d1fd1f211531f69f39829d96543601b1c04d1`