Sync with portage [Tue Feb 11 16:30:18 MSK 2014].

10 years ago · c592ed5671
parent f1e2fc593b
commit c592ed5671
92 changed files with 1057 additions and 616 deletions
--- a/app-emacs/sokoban/Manifest
+++ b/app-emacs/sokoban/Manifest
@ -1 +1,2 @@
 DIST sokoban-1.04_p20030614.tar.bz2 10103 SHA256 5414d61938eb8eb094e9e33a3bd994c1b69a00a11f51610d9735b687bba85e66 SHA512 bc75b429b8c208ae9a4c583a0b7a90a43246cb19b7b6eab0093675acb7422f1ce1b55028af076727564bcf8fe149d13f63bd69c12da7cf79a2c432a94ef35e15 WHIRLPOOL 4406e6151099fe637bad7c69f01adc98bad4f0dcda8a2358410a02b6aba67ebb65640ef7d39aec317395eed385bb5f0b86865fa03f8c49bab24dddeab7f05231
+DIST sokoban-1.4.tar 61440 SHA256 8127798c25bb19ae8d9a4d8d9d3e24b43a5a1ec45b0c79f1003a66991157d3f9 SHA512 8c04f509013e1d8f6e8cc1e182ec253fc84870e5733623038ea03f2447952dcbc77236c64b158ea4e4613dafce192f2c4b50aac3e1e219a049a6a951a44a7ac1 WHIRLPOOL ca5cde6a3418a05c289b03352add8a9c615381c93e2ec13238e2955de8b3c06267ac351c873cdc0eba1abdc125d02d57275a72d1f4a1b4318434d437ec737e2f
--- a/app-emacs/sokoban/sokoban-1.4.ebuild
+++ b/app-emacs/sokoban/sokoban-1.4.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/sokoban/sokoban-1.4.ebuild,v 1.1 2014/02/11 07:47:37 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Implementation of Sokoban for Emacs"
+HOMEPAGE="http://elpa.gnu.org/packages/sokoban.html"
+SRC_URI="http://elpa.gnu.org/packages/${P}.tar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ELISP_REMOVE="sokoban-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog"
+
+src_install() {
+	elisp_src_install
+	insinto "${SITEETC}/${PN}"
+	doins sokoban.levels
+}
--- a/app-text/aspell/aspell-0.60.6.1.ebuild
+++ b/app-text/aspell/aspell-0.60.6.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.11 2014/01/02 18:06:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.12 2014/02/11 06:47:09 nerdboy Exp $

 EAPI=4

@ -44,7 +44,12 @@ RDEPEND="${COMMON_DEPEND}
 	!=app-dicts/aspell-en-0.5*"

 src_prepare() {
-	#epatch "${FILESDIR}/${PN}-0.60.3-templateinstantiations.patch"
+	# fix for bug #467602
+	if has_version ">=sys-devel/automake-1.13" ; then
+		sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
+			"${S}"/configure.ac || die "sed failed"
+	fi
+
 	epatch "${FILESDIR}/${PN}-0.60.5-nls.patch"
 	epatch "${FILESDIR}/${PN}-0.60.5-solaris.patch"
 	epatch "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
@ -58,10 +63,20 @@ src_prepare() {
 	# This has to be after automake has run so that we don't clobber
 	# the default target that automake creates for us.
 	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in
+
 }

 src_configure() {
-	econf \
+	# if ncurses is built with separate tinfo libs, then...
+	if built_with_use sys-libs/ncurses tinfo ; then
+		if built_with_use sys-libs/ncurses unicode ; then
+			CURSES_LIB="-lncursesw -ltinfow"
+		else
+			CURSES_LIB="-lncurses -ltinfo"
+		fi
+	fi
+
+	CURSES_LIB="${CURSES_LIB}" econf \
 		$(use_enable nls) \
 		--disable-static \
 		--sysconfdir="${EPREFIX}"/etc/aspell \
--- a/dev-libs/elfutils/elfutils-0.158.ebuild
+++ b/dev-libs/elfutils/elfutils-0.158.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.158.ebuild,v 1.5 2014/02/08 13:00:40 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.158.ebuild,v 1.6 2014/02/11 05:41:38 mattst88 Exp $

 EAPI="4"

@ -14,7 +14,7 @@ SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2

 LICENSE="GPL-2-with-exceptions"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils zlib"

 # This pkg does not actually seem to compile currently in a uClibc
--- a/dev-perl/Test-SharedFork/Test-SharedFork-0.210.0.ebuild
+++ b/dev-perl/Test-SharedFork/Test-SharedFork-0.210.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-SharedFork/Test-SharedFork-0.210.0.ebuild,v 1.2 2012/12/17 18:31:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-SharedFork/Test-SharedFork-0.210.0.ebuild,v 1.3 2014/02/11 11:17:23 jer Exp $

 EAPI=4

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="fork test"

 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86"
 IUSE="test"

 RDEPEND=""
--- a/dev-perl/Test-TCP/Test-TCP-1.210.0.ebuild
+++ b/dev-perl/Test-TCP/Test-TCP-1.210.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-TCP/Test-TCP-1.210.0.ebuild,v 1.1 2013/03/17 17:33:24 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-TCP/Test-TCP-1.210.0.ebuild,v 1.2 2014/02/11 11:17:54 jer Exp $

 EAPI=5

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Testing TCP program"

 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.40.0.ebuild
+++ b/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.40.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.40.0.ebuild,v 1.3 2014/01/19 16:58:38 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ZMQ-LibZMQ2/ZMQ-LibZMQ2-1.40.0.ebuild,v 1.4 2014/02/11 11:18:23 jer Exp $

 EAPI=5

@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A libzmq 2.x wrapper for Perl"

 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86"
 IUSE="test"

 RDEPEND="
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@ -1,2 +1,3 @@
 DIST graph-tool-2.2.28.tar.bz2 29643913 SHA256 fa6c46aee82302e3366c7f8f2a4028fcbac4f7ebcc4d05739b9e4e266b418999 SHA512 4e4cbd2ec5c780b5d0e74de51e390c7a6d409371e79ed828a62d87f5183600f8553428e16e13674f9311af471346aeb96b84dff2154ce8b5cf1f835cd1c468fe WHIRLPOOL dd69f2980f654d55f3e45ef8e9a5dd3bace9aef13fb1c21bfaa779b70c94a620a2613af96310b5ab34e996795a471445b067ab07d7801c0ab8fbfa60a5994a95
+DIST graph-tool-2.2.29.1.tar.bz2 29643832 SHA256 42c7bf800f3a6591307a041a69c796ab8ac4c46cb8fd3d9d61dffd3f5a74de7a SHA512 ab30c0cf0987ab04ffe4dd03b6fa2cb54f1a47a5d87a674666e60bca15fc5b563b5eb382c6ca9c3f2e9fbf3a124ea5bd1e946207ccb3ba6aaf240948e29b2f9b WHIRLPOOL c7639598e9656658547ad11c1bf07b01f118ba8e93723ecad2efd9abb0306d75062a8c30c679b971daedc08b535eb8bd42aa1778ad6bd80a3a9f0f97189aff5e
 DIST graph-tool-2.2.29.tar.bz2 29644025 SHA256 9d988ba684404197c7193891ff83e801334528cf540313d63b9d7f71fe06c813 SHA512 dc09da1f7d299ce3bebb2eb5e9f1d2434bcdfb792c853cee26b524b166db617c51e53303adfab4a0b21f041c2eae7932140fac0c54b474caa91a23bdb4fb0cea WHIRLPOOL 442dfb8df3c607e08640c7644acaaee5d144f81e031273141aef3f3fd65fe272640646e83b69c6172f6b7c3eb22a50541d8b5a6e8f7195fb64278bcbf6b8054c
--- a/dev-python/graph-tool/graph-tool-2.2.29.1.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.2.29.1.ebuild
@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.29.1.ebuild,v 1.1 2014/02/11 05:59:59 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+
+inherit check-reqs eutils toolchain-funcs python-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.skewed.de/graph-tool"
+	inherit git-2
+else
+	SRC_URI="http://downloads.skewed.de/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
+HOMEPAGE="http://graph-tool.skewed.de/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+
+CDEPEND="${PYTHON_DEPS}
+	>=dev-libs/boost-1.46.0[python,${PYTHON_USEDEP}]
+	dev-libs/expat
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	>=sci-mathematics/cgal-3.5
+	cairo? (
+		dev-cpp/cairomm
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}
+	dev-python/matplotlib[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-cpp/sparsehash
+	virtual/pkgconfig"
+
+# most machines don't have enough ram for parallel builds
+MAKEOPTS="${MAKEOPTS} -j1"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+	check-reqs_pkg_pretend
+}
+
+src_prepare() {
+	>py-compile
+	python_copy_sources
+}
+
+src_configure() {
+	python_parallel_foreach_impl run_in_build_dir \
+		econf \
+			--disable-static \
+			--disable-optimization \
+			$(use_enable openmp) \
+			$(use_enable cairo)
+}
+
+src_compile() {
+	python_parallel_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_parallel_foreach_impl run_in_build_dir default
+	prune_libtool_files --modules
+
+	# remove unwanted extra docs
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null
+	"$@"
+	popd > /dev/null
+}
--- a/dev-python/itsdangerous/itsdangerous-0.23.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-0.23.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/itsdangerous/itsdangerous-0.23.ebuild,v 1.2 2014/02/06 05:38:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/itsdangerous/itsdangerous-0.23.ebuild,v 1.3 2014/02/11 06:26:57 bicatali Exp $

 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )

 inherit distutils-r1

--- a/dev-python/networkx/metadata.xml
+++ b/dev-python/networkx/metadata.xml
@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <longdescription lang="en">NetworkX is a Python-based package for the creation, manipulation, and
+<herd>python</herd>
+<longdescription lang="en">
+  NetworkX is a Python-based package for the creation, manipulation, and
  study of the structure, dynamics, and functions of complex networks.
  The structure of a graph or network is encoded in the edges (connections,
  links, ties, arcs, bonds) between nodes (vertices, sites, actors). If
@ -10,8 +11,9 @@
  self-loops and no multiple edges are allowed. By a network we usually
  mean a graph with weights (fields, properties) on nodes and/or edges.
  The potential audience for NetworkX includes: mathematicians, physicists,
-  biologists, computer scientists, social scientists.</longdescription>
-  <upstream>
-    <remote-id type="pypi">networkx</remote-id>
-  </upstream>
+  biologists, computer scientists, social scientists.
+</longdescription>
+<upstream>
+  <remote-id type="pypi">networkx</remote-id>
+</upstream>
 </pkgmetadata>
--- a/dev-python/networkx/networkx-1.8.1.ebuild
+++ b/dev-python/networkx/networkx-1.8.1.ebuild
@ -1,15 +1,15 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.8.1.ebuild,v 1.4 2014/01/30 15:04:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/networkx/networkx-1.8.1.ebuild,v 1.5 2014/02/11 06:21:18 bicatali Exp $

 EAPI=5

-PYTHON_COMPAT=( python{2_6,2_7,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )

 inherit distutils-r1

 DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="http://networkx.lanl.gov http://pypi.python.org/pypi/networkx"
+HOMEPAGE="http://networkx.github.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
--- a/dev-python/pykit/Manifest
+++ b/dev-python/pykit/Manifest
@ -0,0 +1 @@
+DIST pykit-0.1.0.tar.gz 96379 SHA256 a9acc4210b5852a021c6317ee51de819c291146924122404fc065170b5128b69 SHA512 739f253d463ddf0da5b5fd4f74f73df416787af1ebd6cca46bdc88c9a1d733b9a6663f0abe74e23c7da7967e5b14ca4fd0acbb0bb08fcf1cfa57697f714d6726 WHIRLPOOL d681be515632fd962e6b55818c10477ebf3e350f776e73a32db683425bd809e68f4b062e22cff48d3a0969e48543486d376aa7ec22712a6ac5c3512aeb77a7a2
--- a/dev-python/pykit/metadata.xml
+++ b/dev-python/pykit/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang="en">
+  Backend compiler for high-level typed code with first-class support
+  for multi-dimensional arrays, list tuples and dicts. High-level
+  operations are optimized and must be lowered to a runtime
+  implementation. Provided runtime implementations are in place for
+  memory management and garbage collection, exceptions and threads.
+</longdescription>
+</pkgmetadata>
--- a/dev-python/pykit/pykit-0.1.0.ebuild
+++ b/dev-python/pykit/pykit-0.1.0.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pykit/pykit-0.1.0.ebuild,v 1.1 2014/02/11 06:23:05 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend compiler for high-level typed code"
+HOMEPAGE="http://pykit.github.io/pykit/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/llvmmath[${PYTHON_USEDEP}]
+	dev-python/llvmpy[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${PYTHON} -c "import sys, pykit; sys.exit(pykit.test())" || die
+}
--- a/dev-python/robotframework/Manifest
+++ b/dev-python/robotframework/Manifest
@ -3,3 +3,4 @@ DIST robotframework-2.7.7.tar.gz 543913 SHA256 dd528dfbe26b260367ee91d2ab1a1e2e4
 DIST robotframework-2.8.1.tar.gz 555530 SHA256 dcbe5614cc155a291477a8b4f5446d75c18502a33d78b8ae1bfe16196296fc13 SHA512 c30d592bb2370b6bceb41edb3ef849570ec02e4d4c53a728aae458268ce33dcd8c45a27096bc97a49c1333a6e2c437ed41e1d40095ab8827fb462993ee5186ba WHIRLPOOL d5ef47ebc1bf8f219a52fe7c24b7a653c499f2b97fea58ca7ea2657e40b15d3acca731509dfbf7fbcb751f87cac863d402432b06f792a8c550902a7a5d5ac49a
 DIST robotframework-2.8.2.tar.gz 568721 SHA256 da1cb3318a349a7c359a4f0c78d75c87561791f12235dc48551400bee2bf6c5f SHA512 5adf68de8716901ef240eba2b0ab7489456b502477af6d5aae7dde6c93a581a91209fccb1154538e1472241812d3b7442355ea2d8c3d813723a19df25232cba5 WHIRLPOOL 84661a71015efede475e96c6ec9332f07e86626ff3745ef3de565e6ee7c9e49c5a0e4d3a43825213902b7a4203c6bbbfa4f570603185c3651f6b365f1db12409
 DIST robotframework-2.8.3.tar.gz 570523 SHA256 bb8ca9bad5152a3ac19e4dfc6e097324b31a4a8879d66c268e61d3eb577fd2f4 SHA512 ac724d5738f792471cb32a3f51d43c77c6375e5933d178fe6f47095ef9eae079b4e25274f1ca313dfdf391de878d8463c22fa1e03313fcb64b3351d8ab3604ce WHIRLPOOL 1e0b005b9d1fb389fa0141e5a1ee80be9ca6cc048ed149aa4326afc11057eb4e69d17149d07c9e897fa17bf8aaddb7820c1707a21d38b5a4776f4700b5e1a9c1
+DIST robotframework-2.8.4.tar.gz 579857 SHA256 563c2992eff8b08116b3285150682e7163e5c68a2988423667a180c0ca08b367 SHA512 1a57d46a0af806b693f7c6695ad49ad33e21f6147a1d3432a239213d1cf7eb7252ad6d10954b6ff21419450f4117b7b39c9005eba5511c417f90299b1b1256f7 WHIRLPOOL 92645fa133bc08d6f1ed483ee921afb7e637590f5de286bf6dad9c40c832d445c7fa3c5cd6fb3b42653c2726ec4c5b8aa185abf9aa171b8675da5f3bbf5965c6
--- a/dev-python/robotframework/robotframework-2.8.4.ebuild
+++ b/dev-python/robotframework/robotframework-2.8.4.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/robotframework/robotframework-2.8.4.ebuild,v 1.1 2014/02/11 05:51:45 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A generic test automation framework for acceptance testing and acceptance test-driven development"
+HOMEPAGE="http://robotframework.org/ https://pypi.python.org/pypi/robotframework/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
--- a/dev-python/simplejson/simplejson-3.3.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.3.0.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.3.0.ebuild,v 1.10 2013/09/05 18:46:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.3.0.ebuild,v 1.11 2014/02/11 06:50:50 bicatali Exp $

 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )

 inherit distutils-r1 flag-o-matic

--- a/dev-python/simplejson/simplejson-3.3.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.3.2.ebuild
@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.3.2.ebuild,v 1.1 2014/01/25 09:36:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.3.2.ebuild,v 1.2 2014/02/11 06:30:22 bicatali Exp $

 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )

 inherit distutils-r1 flag-o-matic

--- a/dev-ruby/org-ruby/Manifest
+++ b/dev-ruby/org-ruby/Manifest
@ -1 +1,2 @@
 DIST org-ruby-0.8.2.tar.gz 82786 SHA256 fe43b092201a42795b991c52971fc83fa90097525453e16a73369c3de99c941e SHA512 8c61ca183063675f0f73aa77221841eb6a5fbd07347bf83dcb6afb98ef171ed7a59a09ee9de893cafd0b6622e48e1c532766aaac3eb513cf44a71671ddb8f364 WHIRLPOOL d8e1bee8bd8db45f7f9923ed870134ec2160429fb4639ff876357d6b4ab45c56aba1ac5106812c23a42284b7d9cd0c9d342035e2f3276ad1d225d3074e781249
+DIST org-ruby-0.9.0.tar.gz 108096 SHA256 6eef7397a6cb181919d9c9becc8137ec975f7aa1224c35e0582ca4458ea58aed SHA512 2f4a549189754c04f38b871ea6487d12ea63871519b958c8b670180f7dc099a940b18c84d838a168b67f8083342407d5ae3a710f2f890dbe0db7aa0f175e3483 WHIRLPOOL 12c9b2ad580e998dfddcc5c9d82ecedde287d94cc54e8cafb89aacdb289e90a36d3697dcb0d55da338781ea64628cc2fe2873efae3cb7e458e061e06ba201059
--- a/dev-ruby/org-ruby/org-ruby-0.9.0.ebuild
+++ b/dev-ruby/org-ruby/org-ruby-0.9.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/org-ruby/org-ruby-0.9.0.ebuild,v 1.1 2014/02/11 06:55:24 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby routines for parsing org-mode files"
+HOMEPAGE="https://github.com/bdewey/org-ruby"
+SRC_URI="https://github.com/bdewey/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_S="${PN}-version-${PV}"
+
+ruby_add_rdepend "dev-ruby/rubypants"
+ruby_add_bdepend "test? ( dev-ruby/tilt )"
--- a/dev-util/glade/files/glade-3.16.1-underlinking.patch
+++ b/dev-util/glade/files/glade-3.16.1-underlinking.patch
@ -0,0 +1,71 @@
+ gladeui/Makefile.am | 4 ++--
+ src/Makefile.am     | 2 +-
+ tests/Makefile.am   | 6 +++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
+index 87d610c..8fc02a0 100644
+--- a/gladeui/Makefile.am
+++ b/gladeui/Makefile.am
+@@ -19,7 +19,7 @@ glade_previewer_CFLAGS =   \
+ 
+ glade_previewer_LDFLAGS = $(AM_LDFLAGS)
+ 
+-glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS)
+glade_previewer_LDADD = libgladeui-2.la $(GTK_MAC_LIBS) -lm
+ 
+ glade_previewer_SOURCES = \
+ 	glade-previewer.c \
+@@ -263,7 +263,7 @@ introspection_sources = $(libgladeui_2_la_SOURCES) $(libgladeuiinclude_HEADERS)
+ Gladeui-2.0.gir: libgladeui-2.la
+ Gladeui_2_0_gir_INCLUDES = Gtk-3.0
+ Gladeui_2_0_gir_CFLAGS = $(INCLUDES)
+-Gladeui_2_0_gir_LIBS = libgladeui-2.la
+Gladeui_2_0_gir_LIBS = libgladeui-2.la m
+ Gladeui_2_0_gir_FILES = $(introspection_sources)
+ INTROSPECTION_GIRS += Gladeui-2.0.gir
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 89e597e..83dd436 100644
+--- a/src/Makefile.am
+++ b/src/Makefile.am
+@@ -18,7 +18,7 @@ glade_CFLAGS =           \
+ 
+ glade_LDFLAGS = $(AM_LDFLAGS) $(GMODULE_EXPORT_LDFLAGS)
+ 
+-glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS)
+glade_LDADD = $(top_builddir)/gladeui/libgladeui-2.la $(GTK_MAC_LIBS) -lm
+ 
+ BUILT_SOURCES = glade-resources.c glade-resources.h
+ 
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index fc96195..3099186 100644
+--- a/tests/Makefile.am
+++ b/tests/Makefile.am
+@@ -28,7 +28,7 @@ progs_ldadd = $(top_builddir)/gladeui/libgladeui-2.la
+ create_widgets_CPPFLAGS = $(progs_cppflags)
+ create_widgets_CFLAGS   = $(progs_cflags)
+ create_widgets_LDFLAGS  = $(progs_libs)
+-create_widgets_LDADD    = $(progs_ldadd)
+create_widgets_LDADD    = $(progs_ldadd) -lm
+ create_widgets_SOURCES  = create-widgets.c
+ 
+ # Test that various types of container widgets
+@@ -37,7 +37,7 @@ create_widgets_SOURCES  = create-widgets.c
+ add_child_CPPFLAGS = $(progs_cppflags)
+ add_child_CFLAGS   = $(progs_cflags)
+ add_child_LDFLAGS  = $(progs_libs)
+-add_child_LDADD    = $(progs_ldadd)
+add_child_LDADD    = $(progs_ldadd) -lm
+ add_child_SOURCES  = add-child.c
+ 
+ TOPLEVEL_ORDER_FILES = \
+@@ -63,7 +63,7 @@ toplevel-order-resources.c: $(TOPLEVEL_ORDER_FILES)
+ toplevel_order_CPPFLAGS = $(progs_cppflags)
+ toplevel_order_CFLAGS   = $(progs_cflags)
+ toplevel_order_LDFLAGS  = $(progs_libs)
+-toplevel_order_LDADD    = $(progs_ldadd)
+toplevel_order_LDADD    = $(progs_ldadd) -lm
+ toplevel_order_SOURCES  = \
+ 	toplevel-order.c \
+ 	toplevel-order-resources.c
--- a/dev-util/glade/glade-3.16.1.ebuild
+++ b/dev-util/glade/glade-3.16.1.ebuild
@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.16.1.ebuild,v 1.1 2014/02/09 20:28:44 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.16.1.ebuild,v 1.2 2014/02/11 08:32:02 jlec Exp $

 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_6,2_7} )

-inherit eutils gnome2 python-single-r1 versionator virtualx
+inherit autotools eutils gnome2 python-single-r1 versionator virtualx

 DESCRIPTION="A user interface designer for GTK+ and GNOME"
 HOMEPAGE="http://glade.gnome.org/"
@ -48,7 +48,11 @@ pkg_setup() {
 src_prepare() {
 	# To avoid file collison with other slots, rename help module.
 	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	epatch "${FILESDIR}/${PN}-3.14.1-doc-version.patch"
+	epatch \
+		"${FILESDIR}/${PN}-3.14.1-doc-version.patch" \
+		"${FILESDIR}"/${P}-underlinking.patch
+
+	eautoreconf

 	gnome2_src_prepare
 }
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@ -1,12 +1,6 @@
-DIST darktable-1.1.4.tar.xz 2231272 SHA256 fb6bc7d5a672b1b493921e80aae8cff2a94e66da7acee9e2cdbd83fa11ececaf SHA512 6ab94c4d49697fc32727ab6f62a37ea56b40968e29a737863640b486054116e21596c440432a81e41368957d9b2eca34ff466b1e0ba494091f4fee97c6350b80 WHIRLPOOL 2813334c4f5e84adf7917e63c4342532fbcb97630885e49957aba017365db516ceda4278eb7d873bcf45f1353bf9b523d178c1bbf913be7910b1ce9081266a21
-DIST darktable-1.2.1.tar.xz 2273260 SHA256 b1756295dfda78fc828603033a58f233ced1908b8a50ec97d2e600d6eacf8e2a SHA512 d9e36ebd9d6b452a645a0b510ec54cc51694a29c90e1ca4435ac5cd1591c048092bab39820a5a733622ed3ce5400c5320e6e828c5fc3964aa8e2b0e77ebc03ff WHIRLPOOL 756d2e4a37d17069364769043c708924b1f9f78a3a4784b3683df09e29ee43b4543c8a1ae75876a98c4cf7c6ea67a5b4d9c5421641eca3fd6b4be61cb22386dc
-DIST darktable-1.2.2.tar.xz 2307300 SHA256 12902e8c3ef185d2167ce3a5f9d11eddde763c5a3cb0e9267f4b470a252fc859 SHA512 d8ec6535119eb0a275efd13c53ec218d08c50595a7417ededf7766208fdbaf44296fbd9044d91f92521d910aff6a5df0ae97a63f87027f972443dabdddb0878e WHIRLPOOL 5ab068c82cbc0c9503a08af2a19e7a2cff9e522b55a6984ad8012ed621bdb2be0ce6dbef48409814b35328401dd1b7d8ddb779117de08a0738e390e9bd34cee7
 DIST darktable-1.2.3.tar.xz 2348864 SHA256 686b62e020c13e64d18c9b465742ddec8604cfee36e06c8858301735c29f7316 SHA512 abd01ecadfd54504e90b50181cc84991e623379d003c445134f60c067e35acb93db2cbdb3a4324d8d4545bde84edff116c2241fcf514b372cf57afeb04e6f58f WHIRLPOOL 1a66753618a1c6d261f2456e8d915bea34e592e7045133f00122425955c0190bb74ba7341420a540b717d670ebcdcf975a7feefd0baa4294e0c006889c5e0ff5
-DIST darktable-1.2.tar.xz 2399856 SHA256 dc52582b5c5dfbd22e936f1d441e192a4aa53ac6533fe2c53aaa59433ccd5450 SHA512 3a0e10bfeeade0225c7f07a0419a7c7f6f99d6e6a81618e63edf42a00ba3ffa1699c221ade61626f2a1c49e66d275b4351f6dcdb4db8786e6d28b36b68c5758e WHIRLPOOL dc45e15927f015e6c6fcd1e277d46cdeb6efcf5d3eb8b3cf25ccb4a9448f55774022fc1ac1d613251c957a337438c7f7abd1fda53d1ae10d79575f44bb6c9b08
+DIST darktable-1.4.1.tar.xz 2808136 SHA256 cde1394d75f9b6ff6b9f82c5e0c8199dd197d45b6a4fda48e7a54bef23ec71de SHA512 c4e2c880592407d85f7fcb10045b22e0e0e4117baa95e213593214660572c3a406c8272e5d86d7c8c105f556465179cd8322f1c3a82544dc081db29bf21b4b25 WHIRLPOOL 5092df00170be2071ec78c8e50b543e1fce1bb227f751b8c9ec949aa0f41e22032ee77d0b8a6ac37f9acc79b46b3321b3906b5557363ce58143b7104c4a291bf
 DIST darktable-1.4.tar.xz 2791544 SHA256 2d5f2e44ffd71789d268cb72e789225bf3f8bce5d85095a411ea658527c5c9dd SHA512 3261d75b591eb91df9b144207dc81c35579c758e90c52717f749accada0e7229e942994112714f1f18b4254e8a248c9a7d35c6a14764e76378cd4d616078e9b8 WHIRLPOOL 572d3ccead3d9cf247899f5dfabfea308ac15c42c65ccc5a6c0f2f6425115f961ff7c8acf29b2e3ac8674b7bcb6aaf7be26de86e85a5435391fd29837faa523c
-DIST darktable-usermanual-1.1.2.pdf 8513151 SHA256 a33d4e7bb87c8d7f748f99badb12bd923ba798d205bbddbac85a648d6c9d866f SHA512 1e2b22fc8fb4db7b99dfc8b228310951b04d52a42781f8f83f96ce2e86b24ddc1d3075b246a4d9e73f566a0b57999582daf40f04fd166ab979f8abebe6582275 WHIRLPOOL 5c9733bc155e93fc6c475f93af7246a7123a9257e4ffe1da057845a7d2d9bd4c29a5d61ea172acdb7739abb466c7325502d73b72cbe03d7f4553118bfee5c6f2
-DIST darktable-usermanual-1.2.1.pdf 10016945 SHA256 d82a2de84cbcbfee30f86b22ca5f7c08292b3de6faf54ad130252ddd47d7574a SHA512 f9de8e0bf47eb5a0f84f6abf32f55e87d4275c1dc6447f1a6cfa5b5442f98239d48f377ab760803d07542e9120e25e9ba1d2959575899116b8bb6b1138402ef1 WHIRLPOOL 1e5fe61b7c7c8a63e693f2b748c25f0559ad38ad6b7fdf06564167792be6a833c695825c62a353f4c52abde53a044be3bdb4bc0c737039ebc48c5cf5c9bb417e
-DIST darktable-usermanual-1.2.2.pdf 10016945 SHA256 d82a2de84cbcbfee30f86b22ca5f7c08292b3de6faf54ad130252ddd47d7574a SHA512 f9de8e0bf47eb5a0f84f6abf32f55e87d4275c1dc6447f1a6cfa5b5442f98239d48f377ab760803d07542e9120e25e9ba1d2959575899116b8bb6b1138402ef1 WHIRLPOOL 1e5fe61b7c7c8a63e693f2b748c25f0559ad38ad6b7fdf06564167792be6a833c695825c62a353f4c52abde53a044be3bdb4bc0c737039ebc48c5cf5c9bb417e
 DIST darktable-usermanual-1.2.3.pdf 10016945 SHA256 d82a2de84cbcbfee30f86b22ca5f7c08292b3de6faf54ad130252ddd47d7574a SHA512 f9de8e0bf47eb5a0f84f6abf32f55e87d4275c1dc6447f1a6cfa5b5442f98239d48f377ab760803d07542e9120e25e9ba1d2959575899116b8bb6b1138402ef1 WHIRLPOOL 1e5fe61b7c7c8a63e693f2b748c25f0559ad38ad6b7fdf06564167792be6a833c695825c62a353f4c52abde53a044be3bdb4bc0c737039ebc48c5cf5c9bb417e
-DIST darktable-usermanual-1.2.pdf 10016945 SHA256 d82a2de84cbcbfee30f86b22ca5f7c08292b3de6faf54ad130252ddd47d7574a SHA512 f9de8e0bf47eb5a0f84f6abf32f55e87d4275c1dc6447f1a6cfa5b5442f98239d48f377ab760803d07542e9120e25e9ba1d2959575899116b8bb6b1138402ef1 WHIRLPOOL 1e5fe61b7c7c8a63e693f2b748c25f0559ad38ad6b7fdf06564167792be6a833c695825c62a353f4c52abde53a044be3bdb4bc0c737039ebc48c5cf5c9bb417e
+DIST darktable-usermanual-1.4.1.pdf 11861765 SHA256 3b604e8de32488c4c9294ee19df2b3bc41f060fc4721a1c5f661b25c52f5b054 SHA512 c94e134137778d57822c1b0e1b876bc0358f2c32bf7978e518c32ae600af60f74f95f6c49ed6c07ff0aa4e035d6108000ceaedda39a900afd0de46632f4c3fd3 WHIRLPOOL 29db2f68cde6b7a2a1ce78a81deb1173a5cbaa643b6593ee8a5b7a55aef9156ed11a3f048f253f0ce47a3f08b37b9f4630f117797be4b15368882a9366f8d6f9
 DIST darktable-usermanual-1.4.pdf 11861765 SHA256 3b604e8de32488c4c9294ee19df2b3bc41f060fc4721a1c5f661b25c52f5b054 SHA512 c94e134137778d57822c1b0e1b876bc0358f2c32bf7978e518c32ae600af60f74f95f6c49ed6c07ff0aa4e035d6108000ceaedda39a900afd0de46632f4c3fd3 WHIRLPOOL 29db2f68cde6b7a2a1ce78a81deb1173a5cbaa643b6593ee8a5b7a55aef9156ed11a3f048f253f0ce47a3f08b37b9f4630f117797be4b15368882a9366f8d6f9
--- a/media-gfx/darktable/darktable-1.1.4.ebuild
+++ b/media-gfx/darktable/darktable-1.1.4.ebuild
@ -1,118 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.1.4.ebuild,v 1.1 2013/03/15 19:04:24 radhermit Exp $
-
-EAPI="5"
-
-inherit cmake-utils toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://www.darktable.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	doc? ( mirror://sourceforge/${PN}/${PN}-usermanual-1.1.2.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colord doc facebook flickr geo gnome-keyring gphoto2 kde
-nls opencl openmp pax_kernel +rawspeed +slideshow"
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.28:2
-	dev-libs/libxml2:2
-	colord? ( x11-misc/colord )
-	facebook? ( dev-libs/json-glib )
-	flickr? ( media-libs/flickcurl )
-	geo? ( net-libs/libsoup:2.4 )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	gnome-base/librsvg:2
-	gphoto2? ( media-libs/libgphoto2 )
-	kde? (
-		dev-libs/dbus-glib
-		kde-base/kwalletd
-	)
-	media-gfx/exiv2[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3
-	media-libs/libpng:0
-	media-libs/openexr
-	media-libs/tiff:0
-	net-misc/curl
-	opencl? ( virtual/opencl )
-	slideshow? (
-		media-libs/libsdl
-		virtual/glu
-		virtual/opengl
-	)
-	virtual/jpeg
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
-		-e "s:LICENSE::" \
-		-i doc/CMakeLists.txt || die
-
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_use colord COLORD)
-		$(cmake-utils_use_use facebook GLIBJSON)
-		$(cmake-utils_use_use flickr FLICKR)
-		$(cmake-utils_use_use geo GEO)
-		$(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
-		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
-		$(cmake-utils_use_use kde KWALLET)
-		$(cmake-utils_use_use nls NLS)
-		$(cmake-utils_use_use opencl OPENCL)
-		$(cmake-utils_use_use openmp OPENMP)
-		$(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
-		$(cmake-utils_use_build slideshow SLIDESHOW)
-		-DCUSTOM_CFLAGS=ON
-		-DINSTALL_IOP_EXPERIMENTAL=ON
-		-DINSTALL_IOP_LEGACY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-1.1.2.pdf
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
--- a/media-gfx/darktable/darktable-1.2-r1.ebuild
+++ b/media-gfx/darktable/darktable-1.2-r1.ebuild
@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.2-r1.ebuild,v 1.2 2013/06/13 12:28:27 xmw Exp $
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://www.darktable.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	doc? ( mirror://sourceforge/${PN}/${PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colord doc flickr geo gnome-keyring gphoto2 graphicsmagick
-jpeg2k kde nls opencl openmp pax_kernel +rawspeed +slideshow web-services"
-
-CDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.28:2
-	dev-libs/libxml2:2
-	colord? ( x11-misc/colord )
-	flickr? ( media-libs/flickcurl )
-	geo? ( net-libs/libsoup:2.4 )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	gnome-base/librsvg:2
-	gphoto2? ( media-libs/libgphoto2 )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	media-gfx/exiv2[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3
-	media-libs/libpng:0
-	media-libs/openexr
-	media-libs/tiff:0
-	net-misc/curl
-	opencl? ( virtual/opencl )
-	slideshow? (
-		media-libs/libsdl
-		virtual/glu
-		virtual/opengl
-	)
-	virtual/jpeg
-	web-services? ( dev-libs/json-glib )
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango"
-RDEPEND="${CDEPEND}
-	kde? ( kde-base/kwalletd )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
-		-e "s:LICENSE::" \
-		-i doc/CMakeLists.txt || die
-
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_use colord COLORD)
-		$(cmake-utils_use_use flickr FLICKR)
-		$(cmake-utils_use_use geo GEO)
-		$(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
-		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
-		$(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
-		$(cmake-utils_use_use jpeg2k OPENJPEG)
-		$(cmake-utils_use_use nls NLS)
-		$(cmake-utils_use_use opencl OPENCL)
-		$(cmake-utils_use_use openmp OPENMP)
-		$(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
-		$(cmake-utils_use_build slideshow SLIDESHOW)
-		$(cmake-utils_use_use web-services GLIBJSON)
-		-DCUSTOM_CFLAGS=ON
-		-DINSTALL_IOP_EXPERIMENTAL=ON
-		-DINSTALL_IOP_LEGACY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-1.2.pdf
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
--- a/media-gfx/darktable/darktable-1.2.1.ebuild
+++ b/media-gfx/darktable/darktable-1.2.1.ebuild
@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.2.1.ebuild,v 1.2 2013/06/13 12:28:27 xmw Exp $
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://www.darktable.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	doc? ( mirror://sourceforge/${PN}/${PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colord doc flickr geo gnome-keyring gphoto2 graphicsmagick
-jpeg2k kde nls opencl openmp pax_kernel +rawspeed +slideshow web-services"
-
-CDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.28:2
-	dev-libs/libxml2:2
-	colord? ( x11-misc/colord )
-	flickr? ( media-libs/flickcurl )
-	geo? ( net-libs/libsoup:2.4 )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	gnome-base/librsvg:2
-	gphoto2? ( media-libs/libgphoto2 )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	media-gfx/exiv2[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3
-	media-libs/libpng:0
-	media-libs/openexr
-	media-libs/tiff:0
-	net-misc/curl
-	opencl? ( virtual/opencl )
-	slideshow? (
-		media-libs/libsdl
-		virtual/glu
-		virtual/opengl
-	)
-	virtual/jpeg
-	web-services? ( dev-libs/json-glib )
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango"
-RDEPEND="${CDEPEND}
-	kde? ( kde-base/kwalletd )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
-		-e "s:LICENSE::" \
-		-i doc/CMakeLists.txt || die
-
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_use colord COLORD)
-		$(cmake-utils_use_use flickr FLICKR)
-		$(cmake-utils_use_use geo GEO)
-		$(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
-		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
-		$(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
-		$(cmake-utils_use_use jpeg2k OPENJPEG)
-		$(cmake-utils_use_use nls NLS)
-		$(cmake-utils_use_use opencl OPENCL)
-		$(cmake-utils_use_use openmp OPENMP)
-		$(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
-		$(cmake-utils_use_build slideshow SLIDESHOW)
-		$(cmake-utils_use_use web-services GLIBJSON)
-		-DCUSTOM_CFLAGS=ON
-		-DINSTALL_IOP_EXPERIMENTAL=ON
-		-DINSTALL_IOP_LEGACY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-1.2.1.pdf
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
--- a/media-gfx/darktable/darktable-1.4.1.ebuild
+++ b/media-gfx/darktable/darktable-1.4.1.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.2.2.ebuild,v 1.1 2013/07/03 09:43:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.4.1.ebuild,v 1.1 2014/02/11 05:43:49 radhermit Exp $

 EAPI=5

@ -14,46 +14,52 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+LANGS=" cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
+# TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord doc flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde
-nls opencl openmp pax_kernel +rawspeed +slideshow +squish web-services"
+nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services webp
+${LANGS// / linguas_}"

 CDEPEND="
 	dev-db/sqlite:3
 	>=dev-libs/glib-2.28:2
 	dev-libs/libxml2:2
-	colord? ( x11-misc/colord )
-	flickr? ( media-libs/flickcurl )
-	geo? ( net-libs/libsoup:2.4 )
-	gnome-keyring? ( gnome-base/gnome-keyring )
 	gnome-base/librsvg:2
-	gphoto2? ( media-libs/libgphoto2 )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	media-gfx/exiv2[xmp]
+	media-gfx/exiv2:0=[xmp]
 	media-libs/lcms:2
 	>=media-libs/lensfun-0.2.3
-	media-libs/libpng:0
-	media-libs/openexr
+	media-libs/libpng:0=
 	media-libs/tiff:0
 	net-misc/curl
+	virtual/jpeg
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+	colord? ( x11-misc/colord:0= )
+	flickr? ( media-libs/flickcurl )
+	geo? ( net-libs/libsoup:2.4 )
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:0 )
 	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
 	slideshow? (
 		media-libs/libsdl
 		virtual/glu
 		virtual/opengl
 	)
-	virtual/jpeg
 	web-services? ( dev-libs/json-glib )
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango"
+	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
 	kde? ( kde-base/kwalletd )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"

+PATCHES=( "${FILESDIR}"/${P}-automagic-openexr.patch )
+
 pkg_pretend() {
 	if use openmp ; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
@ -65,7 +71,7 @@ src_prepare() {
 		-e "s:LICENSE::" \
 		-i doc/CMakeLists.txt || die

-	epatch_user
+	cmake-utils_src_prepare
 }

 src_configure() {
@ -79,11 +85,14 @@ src_configure() {
 		$(cmake-utils_use_use jpeg2k OPENJPEG)
 		$(cmake-utils_use_use nls NLS)
 		$(cmake-utils_use_use opencl OPENCL)
+		$(cmake-utils_use_use openexr OPENEXR)
 		$(cmake-utils_use_use openmp OPENMP)
 		$(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
 		$(cmake-utils_use_use squish SQUISH)
 		$(cmake-utils_use_build slideshow SLIDESHOW)
 		$(cmake-utils_use_use web-services GLIBJSON)
+		$(cmake-utils_use_use webp WEBP)
+		-DUSE_LUA=OFF
 		-DCUSTOM_CFLAGS=ON
 		-DINSTALL_IOP_EXPERIMENTAL=ON
 		-DINSTALL_IOP_LEGACY=ON
@ -95,6 +104,10 @@ src_install() {
 	cmake-utils_src_install
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${PV}.pdf

+	for lang in ${LANGS} ; do
+		use linguas_${lang} || rm -r "${ED}"/usr/share/locale/${lang}
+	done
+
 	if use pax_kernel && use opencl ; then
 		pax-mark Cm "${ED}"/usr/bin/${PN} || die
 		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.12 2014/01/21 20:35:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.13 2014/02/11 05:43:49 radhermit Exp $

 EAPI=5

@ -10,11 +10,9 @@ EGIT_REPO_URI="git://github.com/darktable-org/darktable.git"

 DESCRIPTION="A virtual lighttable and darkroom for photographers"
 HOMEPAGE="http://www.darktable.org/"
-SRC_URI=""

 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS=""
 LANGS=" cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord doc flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde
@ -70,7 +68,7 @@ src_prepare() {
 		-e "s:LICENSE::" \
 		-i doc/CMakeLists.txt || die

-	epatch_user
+	cmake-utils_src_prepare
 }

 src_configure() {
--- a/media-gfx/darktable/files/darktable-1.4.1-automagic-openexr.patch
+++ b/media-gfx/darktable/files/darktable-1.4.1-automagic-openexr.patch
@ -0,0 +1,35 @@
+--- darktable-1.4.1/CMakeLists.txt
+++ darktable-1.4.1/CMakeLists.txt
+@@ -26,6 +26,7 @@
+ option(BINARY_PACKAGE_BUILD "Sets march optimization to generic" OFF)
+ option(APRIL_FOOLS "Add the \"file manager\" (a shell) to lighttable mode" OFF)
+ option(USE_XMLLINT "Run xmllint to test if darktableconfig.xml is valid" ON)
+option(USE_OPENEXR "Enable OpenEXR support" ON)
+ option(USE_OPENJPEG "Enable JPEG 2000 support" ON)
+ option(USE_WEBP "Enable WebP export support" ON)
+ option(BUILD_CMSTEST "Build a test program to check your system's color management setup" OFF)
+--- darktable-1.4.1/src/CMakeLists.txt
+++ darktable-1.4.1/src/CMakeLists.txt
+@@ -152,13 +152,15 @@
+   add_definitions(${INOTIFY_DEFINITIONS})
+ endif(INOTIFY_FOUND)
+ 
+-find_package(OpenEXR)
+-if(OPENEXR_FOUND)
+-  include_directories(${OpenEXR_INCLUDE_DIRS})
+-  list(APPEND LIBS ${OpenEXR_LIBRARIES})
+-  add_definitions(${OpenEXR_DEFINITIONS})
+-  list(APPEND SOURCES "common/imageio_exr.cc")
+-endif(OPENEXR_FOUND)
+if(USE_OPENEXR)
+  find_package(OpenEXR)
+  if(OPENEXR_FOUND)
+    include_directories(${OpenEXR_INCLUDE_DIRS})
+    list(APPEND LIBS ${OpenEXR_LIBRARIES})
+    add_definitions(${OpenEXR_DEFINITIONS})
+    list(APPEND SOURCES "common/imageio_exr.cc")
+  endif(OPENEXR_FOUND)
+endif(USE_OPENEXR)
+ 
+ find_package(WebP 0.3.0)
+ if(WEBP_FOUND)
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@ -9,7 +9,6 @@
 	<use>
 		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
 		<flag name="graphicsmagick">Use <pkg>media-gfx/graphicsmagick</pkg> for image importing</flag>
-		<flag name="facebook">Add support for uploading photos to facebook</flag>
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
 		<flag name="geo">Enable geotagging support</flag>
 		<flag name="opencl">Enable opencl support</flag>
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@ -1,3 +1,4 @@
 DIST gmic_1.5.8.0.tar.gz 2257558 SHA256 94382a599c23dd0be2ed9bf539072c057b7f780a8ac63b391a27522fec28f1e9 SHA512 46c7d46da2fd1f063dbb23df9cc8e894ff741871cc8d7ee570de54c5313ed101a3352915a71d952913e5bca97e35074fb025646aa05fd087d1575383ac2972b8 WHIRLPOOL 33ea1d72619bb40cc89357732b0f12c14377c9a5c7ab61d40300f9e81570d4e7fb01089597b9bb45e09358c67bbcf0ca2e25841e5e5e7c7b998feb870fccbad9
 DIST gmic_1.5.8.1.tar.gz 2265467 SHA256 2b0b813253e8c409a8535d350894245b35836cd849af31986055e0a09b8d1cea SHA512 6fea97ae18abe770ba827946457955c74cb4180a272e7fb0a6e2a0f612bec6f8fd83daa4c1010eb236886ebacef331d9b1b0a4f0c64dbde27261e76f71244ef7 WHIRLPOOL f9fc34c21f87c222b081bcef2ae819cbe6f25c1b66a890a569ffae667acbdc5f334496ba8d1d5ddf811550ec0844bd2936ee3564f131bb7f5b1b35ba7a70dcde
 DIST gmic_1.5.8.2.tar.gz 2319666 SHA256 459d0f8cf6ee0a9e8b2254ef93be18cf985bbec699de5354b52671e15f67c3b4 SHA512 5f54147a8903d49667c825afb28564753b0636d21812bc8f12fc1effc3586063c95fe5676c7e69924c69cd790cc4399c5a87a535195bbbecc1656d3de8bc398c WHIRLPOOL 07601508c81be6d3cc8b79ef0f524a36c507696148ec11524f978ae2df4c1326035de908f5d467d24b6482544a5a02f77f7a2847f74cef8806b50213d937e5a9
+DIST gmic_1.5.8.3.tar.gz 2341936 SHA256 ed200f839c6b7cfa7df37a5b286d6dc106708a4466fe8d5e316b0a92681ad983 SHA512 70824a618365c9a0a46604ee3892f48284199b34888fc020860091e7ec9f93f5754d030427faa164c3542fa85a198f1dda82e4b7ee598958acfb48269c255663 WHIRLPOOL a0d677dead2038bf286d0e03a000c8c95971ab0868f375febf6637caddf7f1a0bdd90f49e5a9e71b1234a6b1711afa1559d9da37b589e07de7e2255f1c1d1e38
--- a/media-plugins/gimp-gmic/files/gmic-1.5.8.3-makefile.patch
+++ b/media-plugins/gimp-gmic/files/gmic-1.5.8.3-makefile.patch
@ -0,0 +1,106 @@
+--- gmic-1.5.8.3/src/Makefile
+++ gmic-1.5.8.3/src/Makefile
+@@ -77,7 +77,6 @@
+ 
+ # Flags that are mandatory to compile 'gmic'.
+ MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include
+-MANDATORY_LDFLAGS += -L$(USR)/lib
+ ifeq ($(CC),g++)
+ MANDATORY_CFLAGS += -Wall -W
+ MANDATORY_LDFLAGS += -lm
+@@ -118,14 +117,14 @@
+ # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
+ # This requires the presence of the X11 include and library files.
+ # (package 'libx11-dev' on Debian).
+-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
+-X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
+X11_LDFLAGS = -lX11 -lpthread #-lXrandr
+ 
+ # Flags to enable fast display, using XShm.
+ # This requires the presence of the X11 extension include and library files.
+ # (package 'libx11-dev' on Debian).
+ XSHM_CFLAGS = -Dcimg_use_xshm
+-XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext
+XSHM_LDFLAGS = -lXext
+ 
+ # Flags to enable image display, using GDI32.
+ # This requires the presence of the GDI32 include and library files.
+@@ -160,7 +159,7 @@
+ # This requires the presence of the FFMPEG include and library files.
+ # (packages 'libavcodec-dev', 'libavutil-dev', 'libavformat-dev' and 'libswscale-dev' on Debian).
+ FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I$(USR)/include/libavcodec -I$(USR)/include/libavformat -I$(USR)/include/libswscale -I$(USR)/include/ffmpeg
+-FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale
+FFMPEG_LDFLAGS = -lavcodec -lavformat -lavutil -lswscale
+ 
+ # Flags to enable native support for compressed .cimgz files, using the Zlib library.
+ # This requires the presence of the Zlib include and library files.
+@@ -171,14 +170,8 @@
+ # Flags to enable native support of webcams, using the OpenCV library.
+ # This requires the presence of the OpenCV include and library files.
+ # (package 'libcv3-2-dev' on Debian).
+-ifeq ($(OS),Darwin)
+ OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
+ OPENCV_LDFLAGS = `pkg-config opencv --libs`   #-> Use this for OpenCV 2.2.0 !
+-else
+-OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
+-# OPENCV_LDFLAGS = -lcv -lhighgui
+-OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui   #-> Use this for OpenCV >= 2.2.0 !
+-endif
+ 
+ # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
+ # This requires the presence of the GraphicsMagick++ include and library files.
+@@ -311,10 +304,10 @@
+ endif
+ 
+ gimp:
+-	$(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
+	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp
+ 
+ lib:
+-	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
+	$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
+ 
+ zart: lib
+ ifneq ($(OS),Darwin)
+@@ -334,10 +327,10 @@
+ 	$(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_UNIX_LDFLAGS)" gmic_minimal
+ 
+ linux:
+-	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
+	$(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_gmic
+ 
+ custom:
+-	$(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
+	$(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_gmic
+ 
+ solaris:
+ 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic
+@@ -355,10 +348,9 @@
+ gmic_lib.o: gmic.cpp gmic_def.h
+ 	$(CC) -o gmic_lib.o -c gmic.cpp -fPIC $(CFLAGS) -Dgmic_float_only
+ gmic_lib: gmic_lib.o
+-	ar rcs libgmic.a gmic_lib.o
+	$(AR) rcs libgmic.a gmic_lib.o
+ ifneq ($(OS),Darwin)
+ 	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LDFLAGS)
+-	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(FFTW_LDFLAGS)
+ else
+ 	$(CC) -shared -o libgmic.so gmic_lib.o $(LDFLAGS)
+ endif
+@@ -367,7 +359,6 @@
+ 	$(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp -Dgmic_float_only
+ gmic_gimp : gmic_gimp.o gmic_gimp.cpp
+ 	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LDFLAGS)
+-	strip gmic_gimp$(EXE)
+ 
+ gmic_minimal: gmic.cpp
+ 	$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS)
+@@ -392,7 +383,6 @@
+ 	$(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double
+ gmic_gmic: gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o gmic_def.h
+ 	$(CC) -o gmic gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LDFLAGS)
+-	strip gmic$(EXE)
+ 
+ def:
+ 	@echo "#ifndef gmic_gimp" > gmic_def.h
--- a/media-plugins/gimp-gmic/gimp-gmic-1.5.8.3.ebuild
+++ b/media-plugins/gimp-gmic/gimp-gmic-1.5.8.3.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/gimp-gmic-1.5.8.3.ebuild,v 1.1 2014/02/11 05:38:56 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="G'MIC GIMP plugin"
+HOMEPAGE="http://gmic.sourceforge.net/gimp.shtml"
+SRC_URI="mirror://sourceforge/gmic/gmic_${PV}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-gfx/gimp-2.4.0
+	media-libs/libpng:0=
+	sci-libs/fftw:3.0[threads]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/gmic-${PV}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/gmic-${PV}-makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= gimp
+}
+
+src_install() {
+	exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
+	doexe gmic_gimp
+	dodoc ../README
+}
+
+pkg_postinst() {
+	elog "The G'MIC plugin is accessible from the menu:"
+	elog "Filters -> G'MIC"
+}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 11 Feb 2014 05:37:02 +0000
+Tue, 11 Feb 2014 11:37:04 +0000
--- a/metadata/glsa/glsa-201402-15.xml
+++ b/metadata/glsa/glsa-201402-15.xml
@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="/xsl/glsa.xsl" type="text/xsl"?>
+<?xml-stylesheet href="/xsl/guide.xsl" type="text/xsl"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201402-15">
+  <title>Roundcube: Arbitrary code execution</title>
+  <synopsis>A vulnerability in Roundcube could result in arbitrary code
+    execution, SQL injection, or reading of arbitrary files.
+  </synopsis>
+  <product type="ebuild">roundcube</product>
+  <announced>February 11, 2014</announced>
+  <revised>February 11, 2014: 1</revised>
+  <bug>488954</bug>
+  <access>remote</access>
+  <affected>
+    <package name="mail-client/roundcube" auto="yes" arch="*">
+      <unaffected range="ge">0.9.5</unaffected>
+      <unaffected range="rge">0.8.7</unaffected>
+      <vulnerable range="lt">0.9.5</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Roundcube is a browser-based multilingual IMAP client with an
+      application-like user interface.
+    </p>
+  </background>
+  <description>
+    <p>A vulnerability in steps/utils/save_pref.inc allows remote attackers to
+      use the _session parameter to change configuration settings.
+    </p>
+  </description>
+  <impact type="high">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process, inject SQL code, or read arbitrary files.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Roundcube 0.9 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=mail-client/roundcube-0.9.5"
+    </code>
+    
+    <p>All Roundcube 0.8 users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=mail-client/roundcube-0.8.7"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2013-6172">CVE-2013-6172</uri>
+  </references>
+  <metadata tag="requester" timestamp="Thu, 28 Nov 2013 07:52:58 +0000">
+    pinkbyte
+  </metadata>
+  <metadata tag="submitter" timestamp="Tue, 11 Feb 2014 09:18:22 +0000">
+    pinkbyte
+  </metadata>
+</glsa>
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Tue, 11 Feb 2014 05:37:03 +0000
+Tue, 11 Feb 2014 11:37:04 +0000
--- a/metadata/md5-cache/app-admin/eselect-1.4
+++ b/metadata/md5-cache/app-admin/eselect-1.4
@ -4,11 +4,11 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=4
 HOMEPAGE=http://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 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 ~arm64 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
 LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-2.5 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=!app-admin/eselect-news sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ulm/eselect/eselect-1.4.tar.xz
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c90e97cedd82331c4f8344c348046d2d
+_md5_=0bd3be95d694bda56bce45611c6ae169
--- a/metadata/md5-cache/app-emacs/sokoban-1.4
+++ b/metadata/md5-cache/app-emacs/sokoban-1.4
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-21
+DESCRIPTION=Implementation of Sokoban for Emacs
+EAPI=5
+HOMEPAGE=http://elpa.gnu.org/packages/sokoban.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-21
+SLOT=0
+SRC_URI=http://elpa.gnu.org/packages/sokoban-1.4.tar
+_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	cec01e54df1bfd2fcca76a13ce2b2d27	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=24fffa954d8b78e131c898da76ca0e69
--- a/metadata/md5-cache/app-text/aspell-0.60.6.1
+++ b/metadata/md5-cache/app-text/aspell-0.60.6.1
@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.2 nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.
 SLOT=0
 SRC_URI=mirror://gnu/aspell/aspell-0.60.6.1.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=34cc3bbc9506ee9e465c24a7e7505b60
+_md5_=4b1713b27034b4705dcf1962110a0d48
--- a/metadata/md5-cache/dev-libs/elfutils-0.158
+++ b/metadata/md5-cache/dev-libs/elfutils-0.158
@ -4,10 +4,10 @@ DESCRIPTION=Libraries/utilities to handle ELF objects (drop in replacement for l
 EAPI=4
 HOMEPAGE=https://fedorahosted.org/elfutils/
 IUSE=bzip2 lzma nls static-libs test +threads +utils zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha ~amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha ~amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2-with-exceptions
 RDEPEND=zlib? ( >=sys-libs/zlib-1.2.2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.158/elfutils-0.158.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.158/elfutils-portability.patch -> elfutils-0.158-portability.patch https://fedorahosted.org/releases/e/l/elfutils/0.158/elfutils-robustify.patch -> elfutils-0.158-robustify.patch
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	198e1c7095dbce1ca2848aed0f96bf60	multilib-minimal	a481090a413ba6970bd9643494ef982f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=f9a84e611f48506e12520cf520d48e17
+_md5_=7c3d51a977e714593cd0076a4bc48181
--- a/metadata/md5-cache/dev-perl/Test-SharedFork-0.210.0
+++ b/metadata/md5-cache/dev-perl/Test-SharedFork-0.210.0
@ -4,10 +4,10 @@ DESCRIPTION=fork test
 EAPI=4
 HOMEPAGE=http://search.cpan.org/dist/Test-SharedFork/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-SharedFork-0.21.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=7ff9a4321e74f489d357cfc0c88ccd78
+_md5_=6c580b9debc7305fd2d232804fab5781
--- a/metadata/md5-cache/dev-perl/Test-TCP-1.210.0
+++ b/metadata/md5-cache/dev-perl/Test-TCP-1.210.0
@ -4,10 +4,10 @@ DESCRIPTION=Testing TCP program
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Test-TCP/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=>=dev-perl/Test-SharedFork-0.190.0 >=virtual/perl-IO-1.23 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-TCP-1.21.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=fc1881e816d9bee0e27c155582ea3282
+_md5_=061e42730bad9149db8e916fd14158d4
--- a/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.40.0
+++ b/metadata/md5-cache/dev-perl/ZMQ-LibZMQ2-1.40.0
@ -4,10 +4,10 @@ DESCRIPTION=A libzmq 2.x wrapper for Perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/ZMQ-LibZMQ2/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 hppa ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND==net-libs/zeromq-2* >=dev-perl/ZMQ-Constants-1.0.0 >=virtual/perl-XSLoader-0.20.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DM/DMAKI/ZMQ-LibZMQ2-1.04.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	1d50a6ea2d8d319e3205b005b3ed0dfa	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e2dd20ec23f8fbac6fe3dc0628aa52fe
+_md5_=7822254a02e4f73a9fadde7fe28c28d4
--- a/metadata/md5-cache/dev-python/graph-tool-2.2.29.1
+++ b/metadata/md5-cache/dev-python/graph-tool-2.2.29.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-libs/boost-1.46.0[python,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=sci-mathematics/cgal-3.5 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) dev-cpp/sparsehash virtual/pkgconfig userland_GNU? ( >=sys-apps/coreutils-8.5 )
+DESCRIPTION=An efficient python module for manipulation and statistical analysis of graphs
+EAPI=5
+HOMEPAGE=http://graph-tool.skewed.de/
+IUSE=+cairo openmp python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-libs/boost-1.46.0[python,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-libs/expat dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=sci-mathematics/cgal-3.5 cairo? ( dev-cpp/cairomm dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+SLOT=0
+SRC_URI=http://downloads.skewed.de/graph-tool/graph-tool-2.2.29.1.tar.bz2
+_eclasses_=check-reqs	0efdf29c9002a1995388968bf54e9d3d	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=ba6b2ef663dc2385b13057569e56e7a6
--- a/metadata/md5-cache/dev-python/itsdangerous-0.23
+++ b/metadata/md5-cache/dev-python/itsdangerous-0.23
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=Various helpers to pass trusted data to untrusted environments and back.
 EAPI=5
 HOMEPAGE=http://pythonhosted.org/itsdangerous/ http://pypi.python.org/pypi/itsdangerous
-IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_targets_pypy2_0
+IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_targets_pypy2_0 )
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/i/itsdangerous/itsdangerous-0.23.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=bb9d7916864a2be766c0424ef71fe2de
+_md5_=a0bae64ecea9fcb55fb6e36d82615bfe
--- a/metadata/md5-cache/dev-python/networkx-1.8.1
+++ b/metadata/md5-cache/dev-python/networkx-1.8.1
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] doc? ( dev-python/matplotlib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pygraphviz[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) test? ( dev-python/matplotlib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] sci-libs/scipy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] doc? ( dev-python/matplotlib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pygraphviz[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) test? ( dev-python/matplotlib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] sci-libs/scipy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 DESCRIPTION=Python tools to manipulate graphs and complex networks
 EAPI=5
-HOMEPAGE=http://networkx.lanl.gov http://pypi.python.org/pypi/networkx
-IUSE=doc examples test python_targets_python2_6 python_targets_python2_7 python_targets_python3_3
+HOMEPAGE=http://networkx.github.io/
+IUSE=doc examples test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=examples? ( dev-python/matplotlib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pygraphviz[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] sci-libs/scipy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 )
+RDEPEND=examples? ( dev-python/matplotlib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pygraphviz[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pyyaml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] sci-libs/scipy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-1.8.1.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=bdbc1e8673c716c0cfa2617328e7ed4e
+_md5_=128f6351b12687e2bfedd1afdc07ae04
--- a/metadata/md5-cache/dev-python/pykit-0.1.0
+++ b/metadata/md5-cache/dev-python/pykit-0.1.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/llvmmath[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/llvmpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/networkx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/numpy-1.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/ply[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=Backend compiler for high-level typed code
+EAPI=5
+HOMEPAGE=http://pykit.github.io/pykit/
+IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/llvmmath[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/llvmpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/networkx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/numpy-1.6[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/ply[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+SLOT=0
+SRC_URI=https://github.com/pykit/pykit/archive/0.1.0.tar.gz -> pykit-0.1.0.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=52d163ae22a276eaa6bd18055d61a294
--- a/metadata/md5-cache/dev-python/robotframework-2.8.4
+++ b/metadata/md5-cache/dev-python/robotframework-2.8.4
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DESCRIPTION=A generic test automation framework for acceptance testing and acceptance test-driven development
+EAPI=5
+HOMEPAGE=http://robotframework.org/ https://pypi.python.org/pypi/robotframework/
+IUSE=python_targets_python2_6 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/r/robotframework/robotframework-2.8.4.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=93fb30004f32d7684b24bd986ed8c4b8
--- a/metadata/md5-cache/dev-python/simplejson-3.3.0
+++ b/metadata/md5-cache/dev-python/simplejson-3.3.0
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
 EAPI=5
 HOMEPAGE=http://undefined.org/python/#simplejson http://pypi.python.org/pypi/simplejson
-IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_targets_pypy2_0
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
 KEYWORDS=amd64 arm hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( MIT AFL-2.1 )
-RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_targets_pypy2_0 )
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.3.0.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=70b5d16233b33d7faa0ed2051f003b46
+_md5_=2600e42a73f34bc000372bb5c617999a
--- a/metadata/md5-cache/dev-python/simplejson-3.3.2
+++ b/metadata/md5-cache/dev-python/simplejson-3.3.2
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+DEPEND=userland_GNU? ( >=sys-apps/coreutils-8.5 ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
 EAPI=5
 HOMEPAGE=http://undefined.org/python/#simplejson http://pypi.python.org/pypi/simplejson
-IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_targets_pypy2_0
+IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( MIT AFL-2.1 )
-RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_targets_pypy2_0 )
+RDEPEND=python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy2_0? ( >=virtual/pypy-2.0.2:2.0 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.3.2.tar.gz
 _eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multibuild	56d4120419072116417e8de1bd1040ff	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	3bb814ab7959a36067101a6bef683b6f	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a1f60aad38e48c08142ad2ce05116b0a
+_md5_=879421adaed5c21e342d8a3977ff9d13
--- a/metadata/md5-cache/dev-ruby/org-ruby-0.9.0
+++ b/metadata/md5-cache/dev-ruby/org-ruby-0.9.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/rubypants[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/tilt[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DESCRIPTION=Ruby routines for parsing org-mode files
+EAPI=5
+HOMEPAGE=https://github.com/bdewey/org-ruby
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/rubypants[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=https://github.com/bdewey/org-ruby/archive/version-0.9.0.tar.gz -> org-ruby-0.9.0.tar.gz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	java-utils-2	8d0d93b7a8605ea346cce4604f6db516	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	4021487250c740e3dc16b181228db818	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=9a2d15d4cb5c41c5e8e4eb95f48a8bbb
--- a/metadata/md5-cache/dev-util/glade-3.16.1
+++ b/metadata/md5-cache/dev-util/glade-3.16.1
@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.10:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-3.8:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.10:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-3.8:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A user interface designer for GTK+ and GNOME
 EAPI=5
 HOMEPAGE=http://glade.gnome.org/
@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.10:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32 ) python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygobject-3.8:3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 SLOT=3.10/6
 SRC_URI=mirror://gnome/sources/glade/3.16/glade-3.16.1.tar.xz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=768f03ec2d60cc1711e56d1f9929c351
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	774182647ff84c6a2365bbcd9635044c	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	82a55861314bbcedaf1e08ed4dd651b3	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=2075388f64ce3c84e116785e8df8bb2c
--- a/metadata/md5-cache/media-gfx/darktable-1.1.4
+++ b/metadata/md5-cache/media-gfx/darktable-1.1.4
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 colord? ( x11-misc/colord ) facebook? ( dev-libs/json-glib ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gnome-keyring? ( gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) kde? ( dev-libs/dbus-glib kde-base/kwalletd ) media-gfx/exiv2[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0 media-libs/openexr media-libs/tiff:0 net-misc/curl opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) virtual/jpeg x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
-DESCRIPTION=A virtual lighttable and darkroom for photographers
-EAPI=5
-HOMEPAGE=http://www.darktable.org/
-IUSE=colord doc facebook flickr geo gnome-keyring gphoto2 kde nls opencl openmp pax_kernel +rawspeed +slideshow
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 colord? ( x11-misc/colord ) facebook? ( dev-libs/json-glib ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gnome-keyring? ( gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) kde? ( dev-libs/dbus-glib kde-base/kwalletd ) media-gfx/exiv2[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0 media-libs/openexr media-libs/tiff:0 net-misc/curl opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) virtual/jpeg x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango
-SLOT=0
-SRC_URI=mirror://sourceforge/darktable/darktable-1.1.4.tar.xz doc? ( mirror://sourceforge/darktable/darktable-usermanual-1.1.2.pdf )
-_eclasses_=cmake-utils	db5236989678f4de51b2588767b5b69d	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=efd2b5acd162157e19b8b41da7a5604f
--- a/metadata/md5-cache/media-gfx/darktable-1.2-r1
+++ b/metadata/md5-cache/media-gfx/darktable-1.2-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 colord? ( x11-misc/colord ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gnome-keyring? ( gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) media-gfx/exiv2[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0 media-libs/openexr media-libs/tiff:0 net-misc/curl opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) virtual/jpeg web-services? ( dev-libs/json-glib ) x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
-DESCRIPTION=A virtual lighttable and darkroom for photographers
-EAPI=5
-HOMEPAGE=http://www.darktable.org/
-IUSE=colord doc flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde nls opencl openmp pax_kernel +rawspeed +slideshow web-services
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 colord? ( x11-misc/colord ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gnome-keyring? ( gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) media-gfx/exiv2[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0 media-libs/openexr media-libs/tiff:0 net-misc/curl opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) virtual/jpeg web-services? ( dev-libs/json-glib ) x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango kde? ( kde-base/kwalletd )
-SLOT=0
-SRC_URI=mirror://sourceforge/darktable/darktable-1.2.tar.xz doc? ( mirror://sourceforge/darktable/1.2/darktable-usermanual.pdf -> darktable-usermanual-1.2.pdf )
-_eclasses_=cmake-utils	db5236989678f4de51b2588767b5b69d	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=dfe0f45339ebefda141a76a28bebdbef
--- a/metadata/md5-cache/media-gfx/darktable-1.2.1
+++ b/metadata/md5-cache/media-gfx/darktable-1.2.1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 colord? ( x11-misc/colord ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gnome-keyring? ( gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) media-gfx/exiv2[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0 media-libs/openexr media-libs/tiff:0 net-misc/curl opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) virtual/jpeg web-services? ( dev-libs/json-glib ) x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
-DESCRIPTION=A virtual lighttable and darkroom for photographers
-EAPI=5
-HOMEPAGE=http://www.darktable.org/
-IUSE=colord doc flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde nls opencl openmp pax_kernel +rawspeed +slideshow web-services
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 colord? ( x11-misc/colord ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gnome-keyring? ( gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) media-gfx/exiv2[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0 media-libs/openexr media-libs/tiff:0 net-misc/curl opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) virtual/jpeg web-services? ( dev-libs/json-glib ) x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango kde? ( kde-base/kwalletd )
-SLOT=0
-SRC_URI=mirror://sourceforge/darktable/darktable-1.2.1.tar.xz doc? ( mirror://sourceforge/darktable/1.2.1/darktable-usermanual.pdf -> darktable-usermanual-1.2.1.pdf )
-_eclasses_=cmake-utils	db5236989678f4de51b2588767b5b69d	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0f639bbcefa52cfa944214f1c1147575
--- a/metadata/md5-cache/media-gfx/darktable-1.2.2
+++ b/metadata/md5-cache/media-gfx/darktable-1.2.2
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 colord? ( x11-misc/colord ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gnome-keyring? ( gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) media-gfx/exiv2[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0 media-libs/openexr media-libs/tiff:0 net-misc/curl opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) virtual/jpeg web-services? ( dev-libs/json-glib ) x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
-DESCRIPTION=A virtual lighttable and darkroom for photographers
-EAPI=5
-HOMEPAGE=http://www.darktable.org/
-IUSE=colord doc flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde nls opencl openmp pax_kernel +rawspeed +slideshow +squish web-services
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 CC-BY-3.0
-RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 colord? ( x11-misc/colord ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gnome-keyring? ( gnome-base/gnome-keyring ) gnome-base/librsvg:2 gphoto2? ( media-libs/libgphoto2 ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) media-gfx/exiv2[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0 media-libs/openexr media-libs/tiff:0 net-misc/curl opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) virtual/jpeg web-services? ( dev-libs/json-glib ) x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango kde? ( kde-base/kwalletd )
-SLOT=0
-SRC_URI=mirror://sourceforge/darktable/darktable-1.2.2.tar.xz doc? ( mirror://sourceforge/darktable/1.2.2/darktable-usermanual.pdf -> darktable-usermanual-1.2.2.pdf )
-_eclasses_=cmake-utils	db5236989678f4de51b2588767b5b69d	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=a8931efe5e764c64fad310b6a209c2af
--- a/metadata/md5-cache/media-gfx/darktable-1.4.1
+++ b/metadata/md5-cache/media-gfx/darktable-1.4.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/exiv2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0= media-libs/tiff:0 net-misc/curl virtual/jpeg x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango colord? ( x11-misc/colord:0= ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gnome-keyring? ( gnome-base/gnome-keyring ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) web-services? ( dev-libs/json-glib ) webp? ( media-libs/libwebp:0= ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
+DESCRIPTION=A virtual lighttable and darkroom for photographers
+EAPI=5
+HOMEPAGE=http://www.darktable.org/
+IUSE=colord doc flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services webp linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_fr linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ru linguas_sq linguas_sv linguas_uk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 CC-BY-3.0
+RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/exiv2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0= media-libs/tiff:0 net-misc/curl virtual/jpeg x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango colord? ( x11-misc/colord:0= ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gnome-keyring? ( gnome-base/gnome-keyring ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) web-services? ( dev-libs/json-glib ) webp? ( media-libs/libwebp:0= ) kde? ( kde-base/kwalletd )
+SLOT=0
+SRC_URI=mirror://sourceforge/darktable/darktable-1.4.1.tar.xz doc? ( mirror://sourceforge/darktable/1.4.1/darktable-usermanual.pdf -> darktable-usermanual-1.4.1.pdf )
+_eclasses_=cmake-utils	db5236989678f4de51b2588767b5b69d	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=fa07d7fd719dd398f4d8d9bb9e450ca0
--- a/metadata/md5-cache/media-gfx/darktable-9999
+++ b/metadata/md5-cache/media-gfx/darktable-9999
@ -8,4 +8,4 @@ LICENSE=GPL-3 CC-BY-3.0
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.28:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/exiv2:0=[xmp] media-libs/lcms:2 >=media-libs/lensfun-0.2.3 media-libs/libpng:0= media-libs/openexr:0= media-libs/tiff:0 net-misc/curl virtual/jpeg x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango colord? ( x11-misc/colord:0= ) flickr? ( media-libs/flickcurl ) geo? ( net-libs/libsoup:2.4 ) gnome-keyring? ( gnome-base/gnome-keyring ) gphoto2? ( media-libs/libgphoto2:= ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg2k? ( media-libs/openjpeg:0 ) opencl? ( virtual/opencl ) slideshow? ( media-libs/libsdl virtual/glu virtual/opengl ) web-services? ( dev-libs/json-glib ) webp? ( media-libs/libwebp:0= ) kde? ( kde-base/kwalletd )
 SLOT=0
 _eclasses_=cmake-utils	db5236989678f4de51b2588767b5b69d	eutils	40081e8c7e7f7c4f9db349a1d6d52925	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	git-2	2027b81a576527fa16bece425941e094	git-r3	f089608c770d9ad72a2c92b547d2b20d	gnome2-utils	d7c71c6a7d871f567b416a363d65c3dc	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6a49483bbb6667c075e0364e1e1f8e25
+_md5_=0364d521b829845a0d18f706555bda8e
--- a/metadata/md5-cache/media-plugins/gimp-gmic-1.5.8.3
+++ b/metadata/md5-cache/media-plugins/gimp-gmic-1.5.8.3
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=>=media-gfx/gimp-2.4.0 media-libs/libpng:0= sci-libs/fftw:3.0[threads] sys-libs/zlib
+DESCRIPTION=G'MIC GIMP plugin
+EAPI=5
+HOMEPAGE=http://gmic.sourceforge.net/gimp.shtml
+KEYWORDS=~amd64 ~x86
+LICENSE=CeCILL-2
+RDEPEND=>=media-gfx/gimp-2.4.0 media-libs/libpng:0= sci-libs/fftw:3.0[threads] sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/gmic/gmic_1.5.8.3.tar.gz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=cc48c41ee738a5072e09a779fda2ec0e
--- a/metadata/md5-cache/net-libs/libssh-0.6.0
+++ b/metadata/md5-cache/net-libs/libssh-0.6.0
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=zlib? ( >=sys-libs/zlib-1.2 ) !gcrypt? ( >=dev-libs/openssl-0.9.8 ) gcrypt? ( >=dev-libs/libgcrypt-1.5 ) kerberos? ( virtual/krb5 ) doc? ( app-doc/doxygen ) test? ( dev-util/cmocka ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=zlib? ( >=sys-libs/zlib-1.2 ) !gcrypt? ( >=dev-libs/openssl-0.9.8 ) gcrypt? ( >=dev-libs/libgcrypt-1.5 ) gssapi? ( virtual/krb5 ) doc? ( app-doc/doxygen ) test? ( dev-util/cmocka ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=5
 HOMEPAGE=http://www.libssh.org/
-IUSE=debug doc examples gcrypt kerberos pcap +sftp ssh1 server static-libs test zlib
+IUSE=debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib
 KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=zlib? ( >=sys-libs/zlib-1.2 ) !gcrypt? ( >=dev-libs/openssl-0.9.8 ) gcrypt? ( >=dev-libs/libgcrypt-1.5 ) kerberos? ( virtual/krb5 )
+RDEPEND=zlib? ( >=sys-libs/zlib-1.2 ) !gcrypt? ( >=dev-libs/openssl-0.9.8 ) gcrypt? ( >=dev-libs/libgcrypt-1.5 ) gssapi? ( virtual/krb5 )
 SLOT=0/4
 SRC_URI=https://red.libssh.org/attachments/download/71/libssh-0.6.0.tar.xz -> libssh-0.6.0.tar.xz
 _eclasses_=cmake-utils	db5236989678f4de51b2588767b5b69d	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e1df1faf3c176d4159bbd7efbf9951b4
+_md5_=b14a91d70cbb8df81f6b9ac5c737a657
--- a/metadata/md5-cache/net-libs/libssh-0.6.1
+++ b/metadata/md5-cache/net-libs/libssh-0.6.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=zlib? ( >=sys-libs/zlib-1.2 ) !gcrypt? ( >=dev-libs/openssl-0.9.8 ) gcrypt? ( >=dev-libs/libgcrypt-1.5 ) gssapi? ( virtual/krb5 ) doc? ( app-doc/doxygen ) test? ( dev-util/cmocka ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Access a working SSH implementation by means of a library
+EAPI=5
+HOMEPAGE=http://www.libssh.org/
+IUSE=debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=zlib? ( >=sys-libs/zlib-1.2 ) !gcrypt? ( >=dev-libs/openssl-0.9.8 ) gcrypt? ( >=dev-libs/libgcrypt-1.5 ) gssapi? ( virtual/krb5 )
+SLOT=0/4
+SRC_URI=https://red.libssh.org/attachments/download/81/libssh-0.6.1.tar.xz -> libssh-0.6.1.tar.xz
+_eclasses_=cmake-utils	db5236989678f4de51b2588767b5b69d	eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=cbc56bf2764e341efd71d8fde43faee2
--- a/metadata/md5-cache/sys-apps/cpuid-20130610
+++ b/metadata/md5-cache/sys-apps/cpuid-20130610
@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Utility to get detailed information about the CPU(s) using the CPUID instruction
 EAPI=5
 HOMEPAGE=http://www.etallen.com/cpuid.html
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.etallen.com/cpuid/cpuid-20130610.src.tar.gz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e3e5f161b636d1a0021c8fbbfd252125
+_md5_=d8b29b77f4db98b8c3df0e3215d4129a
--- a/metadata/md5-cache/sys-apps/udevil-0.4.3
+++ b/metadata/md5-cache/sys-apps/udevil-0.4.3
@ -3,10 +3,10 @@ DEPEND=>=app-shells/bash-4.0 dev-libs/glib:2 sys-apps/util-linux virtual/acl >=v
 DESCRIPTION=mount and unmount removable devices without a password
 EAPI=5
 HOMEPAGE=http://ignorantguru.github.com/udevil/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-shells/bash-4.0 dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/udevil/archive/0.4.3.tar.gz -> udevil-0.4.3.tar.gz
 _eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	eutils	40081e8c7e7f7c4f9db349a1d6d52925	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3a8622c80d36c1c177e4bce766e80368
+_md5_=d802af91c175b981e9119343742ad003
--- a/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.24
+++ b/metadata/md5-cache/sys-fs/reiserfsprogs-3.6.24
@ -2,9 +2,9 @@ DEFINED_PHASES=configure
 DESCRIPTION=Reiserfs Utilities
 EAPI=5
 HOMEPAGE=http://www.kernel.org/pub/linux/utils/fs/reiserfs/
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/fs/reiserfs/reiserfsprogs-3.6.24.tar.xz mirror://kernel/linux/kernel/people/jeffm/reiserfsprogs/v3.6.24/reiserfsprogs-3.6.24.tar.xz
 _eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1602842b65c026620660322556827b31
+_md5_=c7727ca1a3192d65a4183348670b812c
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.10.29
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.10.29
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.10 kernel tree and aufs3 support
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=deblob experimental module vanilla symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=>=sys-fs/aufs-util-3.9 !build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.10.29
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-3.10 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.10.N/deblob-check -> deblob-check-3.10 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.10.x_p20140127.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.10-36.base.tar.xz mirror://gentoo/genpatches-3.10-36.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-36.experimental.tar.xz ) )
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	kernel-2	263afd0e4a90481352469cff577efe1b	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	ceb3e4c3ba203e28bb02eeb182d88acf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=ea3a64bec4f47ebdff6c7f184d2213f6
--- a/metadata/md5-cache/x11-plugins/wmbattery-2.19-r1
+++ b/metadata/md5-cache/x11-plugins/wmbattery-2.19-r1
@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-apps/apmd x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXpm x11-proto/xextproto
-DESCRIPTION=A dockable app to report APM battery stats.
-HOMEPAGE=http://joeyh.name/code/wmbattery/
-KEYWORDS=x86 amd64 -sparc ~ppc
-LICENSE=GPL-2
-RDEPEND=sys-apps/apmd x11-libs/libX11 x11-libs/libXext x11-libs/libXt x11-libs/libXpm
-SLOT=0
-SRC_URI=http://kitenet.net/programs/wmbattery/wmbattery_2.19.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=97ecfba1911d102e02068b5bb986e811
--- a/metadata/md5-cache/x11-plugins/wmbattery-2.42
+++ b/metadata/md5-cache/x11-plugins/wmbattery-2.42
@ -0,0 +1,11 @@
+DEFINED_PHASES=prepare
+DEPEND=sys-apps/apmd sys-power/upower x11-libs/libX11 x11-libs/libXext x11-libs/libXpm !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A dockable app to report APM, ACPI, or SPIC battery status
+EAPI=5
+HOMEPAGE=http://joeyh.name/code/wmbattery/
+KEYWORDS=~amd64 ~ppc -sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://debian/pool/main/w/wmbattery/wmbattery_2.42.tar.gz
+_eclasses_=autotools	d76ee21296238133bd2df8dea7f33a05	libtool	b9b3340e3a19510f0d9f05cfccbf209f	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=3efc58e5c423ab1a2604d7c03350f921
--- a/metadata/md5-cache/x11-plugins/wmsystemtray-1.3
+++ b/metadata/md5-cache/x11-plugins/wmsystemtray-1.3
@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXmu
+DESCRIPTION=a system tray dockapp with the ability to display more than just four tray icons
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/wmsystemtray/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXext x11-libs/libXfixes x11-libs/libXmu
+SLOT=0
+SRC_URI=mirror://sourceforge/wmsystemtray/wmsystemtray-1.3.tar.gz
+_md5_=715669f737b1a795e10927e6a3ee044e
--- a/metadata/md5-cache/x11-plugins/wmweather+-2.11
+++ b/metadata/md5-cache/x11-plugins/wmweather+-2.11
@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-wm/windowmaker dev-libs/libpcre >=net-misc/curl-7.17.1 x11-libs/libXpm x11-libs/libXext x11-libs/libX11
-DESCRIPTION=A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts
-HOMEPAGE=http://www.sourceforge.net/projects/wmweatherplus/
-KEYWORDS=amd64 ~mips ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-wm/windowmaker dev-libs/libpcre >=net-misc/curl-7.17.1 x11-libs/libXpm x11-libs/libXext x11-libs/libX11
-SLOT=0
-SRC_URI=mirror://sourceforge/wmweatherplus/wmweather+-2.11.tar.gz
-_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=92f5bf4adc185f04c55546a24222980c
--- a/metadata/md5-cache/x11-plugins/wmweather+-2.15
+++ b/metadata/md5-cache/x11-plugins/wmweather+-2.15
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/libpcre >=net-misc/curl-7.17.1 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-wm/windowmaker
+DESCRIPTION=A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts
+EAPI=5
+HOMEPAGE=http://www.sourceforge.net/projects/wmweatherplus/
+KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libpcre >=net-misc/curl-7.17.1 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-wm/windowmaker
+SLOT=0
+SRC_URI=mirror://sourceforge/wmweatherplus/wmweather+-2.15.tar.gz
+_eclasses_=eutils	40081e8c7e7f7c4f9db349a1d6d52925	flag-o-matic	9a539029fe1d390c1828ff633baf26b5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=7b3ea72787499c66cb77508979b12416
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Tue, 11 Feb 2014 05:37:05 +0000
+Tue, 11 Feb 2014 11:37:06 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Tue Feb 11 05:37:02 UTC 2014
+Tue Feb 11 11:37:04 UTC 2014
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Tue, 11 Feb 2014 06:00:01 +0000
+Tue, 11 Feb 2014 12:00:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1392096901 Tue Feb 11 05:35:01 2014 UTC
+1392118501 Tue Feb 11 11:35:01 2014 UTC
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@ -1,2 +1,3 @@
 DIST libssh-0.5.5.tar.gz 321583 SHA256 c0df0f05fc812dbe26fd4118bec0776aa9e892c0719590f3971130489c6b8e9d SHA512 114a8d078b9530fe37f12c769283213ceacdd8cbf0c1c3e64e09c07d38b3886bc8c9a78816562ab1bc44c55c604fcc4ed85cdb2a8203962c9331f9d10977e802 WHIRLPOOL c12f543b5613641cd52a29f57e540a2ed0aa91e538172755966d440f0e0905e48c9c4ff3f263dcdfe8f3e925045856650e2f5ededc232be4bdd731853646764b
 DIST libssh-0.6.0.tar.xz 275664 SHA256 4c6de7caa23debbe4639f83fa2ff411924643e65356d6af048daa31e4a1a2f71 SHA512 6680e351b22ce6629047929dfcb7ac02dd7c332af5995191dcb72037ef727bc8c9394760517f79a58f8f7e489c29581fc41f6c7bc08c187ef5cb6091b66ab6a7 WHIRLPOOL ec64381cd80300945cba5a64f057dca8cd7a983f5fac8a06138aee2b6451f6e8619aed97e98487cbe860d488458139faab467155924ae2d55f8e58db88eb4a66
+DIST libssh-0.6.1.tar.xz 279324 SHA256 0dcced0faa74bcededfbaeb14898ab85bfcd39e736f9b7b589cf9c833ca4b1fe SHA512 b057008406f6992242f360d9de8cbcdc42a87feb5ef0f6ff33295978a39ca3e0332351f1f9fb059d6270a43680403ab625a0a6d5851d61ad713f62cff6267470 WHIRLPOOL b28ceb649dbe2504786445c90666adac1e4fae1affa6a976b06dfa5de552ae720ecccb82f357debbc079e723f4d017a34dfb05c34ddb6fc27ef022e518560282
--- a/net-libs/libssh/libssh-0.6.0.ebuild
+++ b/net-libs/libssh/libssh-0.6.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild,v 1.2 2014/01/09 07:56:12 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.0.ebuild,v 1.3 2014/02/11 10:23:20 polynomial-c Exp $

 EAPI=5

@ -14,14 +14,14 @@ SRC_URI="https://red.libssh.org/attachments/download/71/${MY_P}.tar.xz -> ${P}.t
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt kerberos pcap +sftp ssh1 server static-libs test zlib"
+IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake

 RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.2 )
 	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
 	gcrypt? ( >=dev-libs/libgcrypt-1.5 )
-	kerberos? ( virtual/krb5 )
+	gssapi? ( virtual/krb5 )
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
@ -51,7 +51,7 @@ src_configure() {
 		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
 		$(cmake-utils_use_with debug DEBUG_CRYPTO)
 		$(cmake-utils_use_with gcrypt)
-		$(cmake-utils_use_with kerberos gssapi)
+		$(cmake-utils_use_with gssapi)
 		$(cmake-utils_use_with pcap)
 		$(cmake-utils_use_with server)
 		$(cmake-utils_use_with sftp)
--- a/net-libs/libssh/libssh-0.6.1.ebuild
+++ b/net-libs/libssh/libssh-0.6.1.ebuild
@ -0,0 +1,83 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.1.ebuild,v 1.1 2014/02/11 10:23:20 polynomial-c Exp $
+
+EAPI=5
+
+MY_P=${PN}-${PV/_rc/rc}
+inherit eutils cmake-utils multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="http://www.libssh.org/"
+SRC_URI="https://red.libssh.org/attachments/download/81/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RDEPEND="
+	zlib? ( >=sys-libs/zlib-1.2 )
+	!gcrypt? ( >=dev-libs/openssl-0.9.8 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5 )
+	gssapi? ( virtual/krb5 )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cmocka )
+"
+
+DOCS=( AUTHORS README ChangeLog )
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.0-tests.patch"
+)
+
+src_prepare() {
+	# just install the examples do not compile them
+	sed -i \
+		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+		CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with debug DEBUG_CALLTRACE)
+		$(cmake-utils_use_with debug DEBUG_CRYPTO)
+		$(cmake-utils_use_with gcrypt)
+		$(cmake-utils_use_with gssapi)
+		$(cmake-utils_use_with pcap)
+		$(cmake-utils_use_with server)
+		$(cmake-utils_use_with sftp)
+		$(cmake-utils_use_with ssh1)
+		$(cmake-utils_use_with static-libs STATIC_LIB)
+		$(cmake-utils_use_with test STATIC_LIB)
+		$(cmake-utils_use_with test TESTING)
+		$(cmake-utils_use_with zlib)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/*
+
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,cpp}
+	fi
+}
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@ -7,6 +7,7 @@
 <use>
  <flag name='gcrypt'>Prefer <pkg>dev-libs/libgcrypt</pkg> over
    <pkg>dev-libs/openssl</pkg> for encryption</flag>
+  <flag name='gssapi'>Enable gssapi support</flag>
  <flag name='pcap'>Build with PCAP output support</flag>
  <flag name='sftp'>Build with SFTP support</flag>
  <flag name='ssh1'>Build with SSH1 support</flag>
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -3047,7 +3047,6 @@ media-gfx/blender:tweak-mode - This flag allows you to model without confirming
 media-gfx/brlcad:benchmarks - Run benchmarks during test phase (need test option enabled)
 media-gfx/comix:rar - Pulls app-arch/unrar for rar file support
 media-gfx/darktable:colord - Support color management using x11-misc/colord
-media-gfx/darktable:facebook - Add support for uploading photos to facebook
 media-gfx/darktable:flickr - Add support for uploading photos to flickr
 media-gfx/darktable:geo - Enable geotagging support
 media-gfx/darktable:graphicsmagick - Use media-gfx/graphicsmagick for image importing
@ -4946,6 +4945,7 @@ net-libs/libsrtp:aesicm - Use AES ICM cryptographic algorithm
 net-libs/libsrtp:console - Use /dev/console instead of stdout for error messages
 net-libs/libsrtp:syslog - Use syslog for error messages
 net-libs/libssh:gcrypt - Prefer dev-libs/libgcrypt over dev-libs/openssl for encryption
+net-libs/libssh:gssapi - Enable gssapi support
 net-libs/libssh:pcap - Build with PCAP output support
 net-libs/libssh:server - Build with SSH server support
 net-libs/libssh:sftp - Build with SFTP support
--- a/sys-apps/cpuid/cpuid-20130610.ebuild
+++ b/sys-apps/cpuid/cpuid-20130610.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpuid/cpuid-20130610.ebuild,v 1.1 2013/07/20 17:11:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpuid/cpuid-20130610.ebuild,v 1.2 2014/02/11 10:43:50 nimiux Exp $

 EAPI="5"

@ -11,7 +11,7 @@ CPUID instruction"
 HOMEPAGE="http://www.etallen.com/cpuid.html"
 SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"

-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
--- a/sys-apps/udevil/udevil-0.4.3.ebuild
+++ b/sys-apps/udevil/udevil-0.4.3.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/udevil/udevil-0.4.3.ebuild,v 1.1 2013/12/14 12:09:52 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/udevil/udevil-0.4.3.ebuild,v 1.2 2014/02/11 11:03:13 nimiux Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar

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

 RDEPEND=">=app-shells/bash-4.0
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.24.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.24.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/reiserfsprogs-3.6.24.ebuild,v 1.3 2014/02/02 11:04:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/reiserfsprogs-3.6.24.ebuild,v 1.5 2014/02/11 10:34:12 nimiux Exp $

 EAPI="5"

@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/fs/reiserfs/${P}.tar.xz

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

 src_configure() {
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@ -1,3 +1,4 @@
+DIST aufs-sources-3.10.x_p20140127.tar.xz 151480 SHA256 01b3337fd849cd9798b882e85a7509a873ce77a61bd23f8ec5a07e8427778789 SHA512 48619aa25baad97c36b51e633662592fb82b09c06f746752e9265094d5e6ade5cd8f8fc8bb6b97593ac3f432b2b2b4cc4422251de5317eb9d6ae33722826aef4 WHIRLPOOL 9828fed5d6056b3ab5f7582230435647e71aa73e3f7373e56bff7e9c6940849707e67ac8d9728e7e45fa4ca2496049faddb420beeabe170073bb90b6ce64fa2f
 DIST aufs-sources-3.10_p20131007.tar.xz 150600 SHA256 7f8866e1f602602d1214d959e60eb7739448901fdd000b492a1b52101253081a SHA512 1279d447f3f0efc57fb360217d42add4706e25f9f67f6ad93cf097869cf57d847a2fbaba3c983492de1cdd64b503d35e4866b4b31cb65c32e0ea80781e547d22 WHIRLPOOL 4b99254b4cf8d4c0ed950b0abe6f22581eb9e4f77af1ca472bd96515043cbbc4c2e328fc99f6768eae3b8126345a4809a14e65b8d0f2cababa3cd77a433bfc27
 DIST aufs-sources-3.10_p20131111.tar.xz 151456 SHA256 a5229c12e9cf62a04bc84458df88d4fdb3c4e30e38c184cd2e236b22efe01e6f SHA512 421ac913b40c66dab4ca01da1c08204d1ed78a93e4dba09795f0a081a1af5c30bd82863fafdd034defb840b7961e49713242549c2bbe4d8bddc4c81663b27ff0 WHIRLPOOL c215c4ca78409efe48dea1cae373b645452d16ee8711a00913b52c4796756e90960e3d4a61c0a2b1ddf693aee3e206401f6bf648f0d5af0404cda710ee3d8339
 DIST aufs-sources-3.10_p20140119.tar.xz 151516 SHA256 35ca8722d7dfbf1183aee0042daad89bc4ead90f6c93ce8bb711e0dddfe68ade SHA512 d90eb547ac475c89447ebf90097ac573aa8447056d18e75591b3ea5d18c93f27a904125502f0617eeeaf220b80988c90cc5c6844225e7e5277878e38bb4f50de WHIRLPOOL 41b1255a87a0457f754b9515c8a031ae16a591ad04a3e3a6cdb6170ea7ade2492c5fb82f267aed1e674f5cd5052e577d92304e39786a82c139679ed19a25c85a
@ -22,6 +23,9 @@ DIST genpatches-3.10-32.extras.tar.xz 17760 SHA256 c9beea4242a8429553991400ed43b
 DIST genpatches-3.10-35.base.tar.xz 552000 SHA256 fd730b556986e9a6f6f59cde1f158b9c4ca6f93917a102d983cc4359835e54e4 SHA512 c6b471f124fccc731562b6c632a51a273a004b8dc5f756cca3a018e43aa8ef378ee97e93ded13b886639e2ed3b1a7a05a2b9922abb632dbadc0806b0d994f2ce WHIRLPOOL 3ac78dce99b8aeaefb213342ac5f255f52431f96bb953aa4180d42b8140be3f12fa4b0a1ec3bd3799475d9e5c1186a47528c1f6f4ad155142c78363d59ac148e
 DIST genpatches-3.10-35.experimental.tar.xz 45576 SHA256 00524a6e8bab9e6be6233ee194de93ecbd81b93fe5c3595b25002af6271b1176 SHA512 cd98ac5a0232f28b63aea231f78590d33b5a708e7fba3f8e8093997a69ab0b76d6f05d3a4a861ab8870aac71f9e5d9a41ec615cecf5fbafd0570282b7abf26f2 WHIRLPOOL cf160ca6f7c10ba0179e9922b81533750b61dc4d2bbcd23adf0f427df722162148df6e26cfb94e91370536cd3d4ca89bc54528d11bbdc87cfd5cbc5c730ac12a
 DIST genpatches-3.10-35.extras.tar.xz 17764 SHA256 bd473f3468a46c273cebc80e24b86a89871d8ceb2c4e9421e97e5cc9057de50c SHA512 df9a806655f66b3ff62d48aa609cc3350c4fd1c0a2c2926412bb1ce394c0ea693a06ae2900dcc9e479cb1a6d509e7cfe3afe1204948972cc814c332f0bf119e2 WHIRLPOOL ec032cd967277df84d4d9641ff8d35b790b48fb4c06eba7569bd0bb5df0170ab1b4f6dbac339d064a12ae1795546b3958dc92baef8710a00cab0152af9de5ec6
+DIST genpatches-3.10-36.base.tar.xz 580316 SHA256 aacf8d6f4ab1d6d76e7b09ac507e1c50b59e4a4359f8566a5914df40dd0541ce SHA512 3e247665b79a5b472ac3676f6f0e68a7da28ed9544c96148846948b6e3b7a31a1ac84434d1668be02a01699bf3861fcb4fc6c0ff42778b694bbd888224db6a5e WHIRLPOOL 18d29db13597192063c4a76ff9e3fe0330b261f1eaec34ea42309642abeb7585fa0acc98360ed015f9f12c8d0fe8fd2e94e9413cf9e593f2a46aa6f0c9276e6b
+DIST genpatches-3.10-36.experimental.tar.xz 45584 SHA256 5776a59da1a985a7a4cece53f79565a8c7509fed88e1b077ea20c0e715302110 SHA512 e27d58584306da5d59b5f7f8cab04ccc21a58822c665878ce974c0b2e40b8f4102df374fe8b33ac367aea2b376175baad913537548bf55f06a1231ab19554f9b WHIRLPOOL 1943e1e7481412f7a7657e36ae16de8089100ce5fdb371d9357e9b382cce92304fd07ddd5c29231be9e395304f5347a8f5b79005fbbfc6ff275b084fb19466e8
+DIST genpatches-3.10-36.extras.tar.xz 17756 SHA256 611b96b571e93f9e708529e35dbfb3977b1f1bb4f0178ae7a2935b28d110aa2e SHA512 08347a5f186bd90420b2d7354f3e94fcd78f6853257deb41ec0e52aea0e15c8455e9173d61611064c83a09887b601647102ba57d59315413040800b17d8cd18b WHIRLPOOL 1d9d3d66dbdb98ea3c48bfdc16e4ed3cef9afceee4ac66f6c2c5d8da398226fe98ceba09a90d22fed164a0157f1b461d501def88ed512768a0e7237becd2b68b
 DIST genpatches-3.11-14.base.tar.xz 207496 SHA256 c9ea16218b729be7709d411690281a019dfab611471e668e42dce3330906c5ed SHA512 cad7f628a8b4d04bd545270f4cd2900d15ca7525c4d5b6baa5aaf8210b44a1065d34b4855bc805892547775af2009c96521ed176118e5256db2eae14a3af008a WHIRLPOOL fa652a4002906c17bbbcca79e351b189e047c096fb344eea4372c42f7cae94435f662edaf3f1263f978edbae18452864466c69d04bfd28da52d8c735b03b0027
 DIST genpatches-3.11-14.experimental.tar.xz 45276 SHA256 0f2297d5ae40c532ec823ca95de977e55bfd9adef076a91564def0e876a31d0f SHA512 3098f9e6ad8a41389307dafe5674f1680c7169f031c951dcd8acbf02432a632e5de149059893daeb024847bb1bf63f5cd07ae7302c63bdc3934e47e9518c97ef WHIRLPOOL 139068f19f16143be570d7341f892b271e4005aef8dabd7b488ca6322cab252c9d3d21c77f932bc638b3a95a8ce9b8d1baaa898d268400881d9add464f324a46
 DIST genpatches-3.11-14.extras.tar.xz 18164 SHA256 d54e3c6b4261ddeeb1932b2884599162e3351e1474e2e5e263fe4ff1ae8e4d16 SHA512 011a18ef564c719d4d25611fccf2f0842f28b28b27a7a9c934fc4de9aa76e469ee50777300995f85b214b338cea4078e3cddb38fd7298db1c0e46e3fb1d9dc25 WHIRLPOOL f03eac8c7b870b99668ee307e4ed5f50d4dc8497b849687954bb6f18dc336829025b00cb938553c4f3a58b8203304f7fc40c8954a16edb2d537ce5b80d6f0846
--- a/sys-kernel/aufs-sources/aufs-sources-3.10.29.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.10.29.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.10.29.ebuild,v 1.1 2014/02/11 08:38:06 jlec Exp $
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="36"
+K_DEBLOB_AVAILABLE="1"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils
+detect_version
+detect_arch
+
+AUFS_VERSION=3.10.x_p20140127
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs3-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND=">=sys-fs/aufs-util-3.9"
+
+src_unpack() {
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs3-kbuild.patch
+		"${WORKDIR}"/aufs3-base.patch
+		"${WORKDIR}"/aufs3-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util && \
+		einfo "In order to use aufs FS you need to install sys-fs/aufs-util"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@ -1,3 +1,3 @@
-DIST wmbattery_2.19.tar.gz 66379 SHA256 d30b2f55e3e073fc6dd343e8ff9232a2b44b6547d2b7ec9545934c0360b652ae
 DIST wmbattery_2.40.tar.gz 37070 SHA256 1e94be618e0b103054ac897d7fcca7972dfc11ec65abda5dec3f0439a30a85a5
 DIST wmbattery_2.41.tar.gz 37971 SHA256 1dd3ec541d55558e14161d2d6219c6242b50fb00faf2a23e2c3d9fcad2237e18 SHA512 123b965d3e35c5f4b4d77a1a57b82e9d2e8cf021386e00716adb52776ec6094bc3f62652ef70b3c667adf75c7633be91884422809c0669c2f714ed667c557114 WHIRLPOOL 20b9b50b65b0555683353c4e8e9e0c4a8425715d55b95836386d2193d79a4c5582e8bfed1dc6b8a4440c0cb41a4659df4804d12d59ff3392c0660c97cc8f7282
+DIST wmbattery_2.42.tar.gz 38881 SHA256 6e57d163443e2d31951d2238eeaadbbe71dbcc0a92c44e7e1f27598eb2c87b75 SHA512 f59b721bd6c59da7730bdee5a092036713c9e3fa4ed8b58d331a9ba67a2fc9e08095c98d77356bb9a95833284fc53f1ff38cb1c818ddbbbc23c756d2cbbd2b8f WHIRLPOOL 2137a80d92939e2307883a598188e282dbb9e279ba335d326754f8fbe5934caeca1dca0d95803f95926364d5b238d6f2486b8ce502b372582be88507e0451be0
--- a/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild,v 1.8 2012/07/08 15:24:35 jer Exp $
-
-inherit eutils
-
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="A dockable app to report APM battery stats."
-SRC_URI="http://kitenet.net/programs/wmbattery/${P/-/_}.tar.gz"
-HOMEPAGE="http://joeyh.name/code/wmbattery/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64 -sparc ~ppc"
-
-RDEPEND="sys-apps/apmd
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-src_compile() {
-	econf || die "Configuration failed"
-	emake icondir="/usr/share/pixmaps/wmbattery" || die "Compilation failed"
-}
-
-src_install () {
-	dobin wmbattery
-	dodoc README TODO
-
-	mv wmbattery.1x wmbattery.1
-	doman wmbattery.1
-
-	insinto /usr/share/pixmaps/wmbattery
-	doins *.xpm
-}
--- a/x11-plugins/wmbattery/wmbattery-2.42.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-2.42.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.42.ebuild,v 1.1 2014/02/11 09:42:47 voyageur Exp $
+
+EAPI=5
+inherit autotools
+
+DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery status"
+HOMEPAGE="http://joeyh.name/code/wmbattery/"
+SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+IUSE=""
+
+DEPEND="sys-apps/apmd
+	sys-power/upower
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( README TODO )
+
+src_prepare() {
+	sed -i \
+		-e '/^icondir/s:icons:pixmaps:' \
+		autoconf/makeinfo.in || die
+
+	eautoconf
+}
--- a/x11-plugins/wmsystemtray/Manifest
+++ b/x11-plugins/wmsystemtray/Manifest
@ -1 +1,2 @@
-DIST wmsystemtray-1.2.tar.gz 139802 RMD160 7aaf4798d4ab4b7e0a4926e98da846ca504297e6 SHA1 66f7b19a8937af7f4b27c7786e363a827aad3a3a SHA256 5a5b89a574de8e8cd988519784f57999cd9e2dca2e0a96be9483d5b28bc6c32d
+DIST wmsystemtray-1.2.tar.gz 139802 SHA256 5a5b89a574de8e8cd988519784f57999cd9e2dca2e0a96be9483d5b28bc6c32d SHA512 c5d063231f061d785fea0cf89721a86dd46094e05a55dd8de6c371ddab8cecbe09157be878982434b77e77a70c16fd26a5e5f2139bfd87d1222d1943829c02d2 WHIRLPOOL 0fea43bcbe13944fd8943d4726e6a4b25415f2e10daf8a90860d9914f531050f26255b5a8eda76447efa5c01465a6580dc2cf4865dd43e2b5b43054961824af6
+DIST wmsystemtray-1.3.tar.gz 131764 SHA256 c3c053bc709954c0b52173802ce190fe6df5757a912f094fe7c2b230cb081b91 SHA512 8a89e2bb63ecb7661e2e0756e07bef59eb6fd89e7221e399af45b0a98d7d0dd45224b6b6a356432642cfec239d245e1e05943ff0f15d2dbbf93545a4a1094969 WHIRLPOOL d028aad492c0d5a03957a3054eab0488d1469fc72c7220ad18fabc08010f81ce28319b043da98de56d9c4d50c61237ecc1054796f286cfbb8cb98861b5ec6f24
--- a/x11-plugins/wmsystemtray/wmsystemtray-1.3.ebuild
+++ b/x11-plugins/wmsystemtray/wmsystemtray-1.3.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystemtray/wmsystemtray-1.3.ebuild,v 1.1 2014/02/11 09:29:09 voyageur Exp $
+
+EAPI=5
+
+DESCRIPTION="a system tray dockapp with the ability to display more than just four tray icons"
+HOMEPAGE="http://sourceforge.net/projects/wmsystemtray/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXmu"
+RDEPEND="${DEPEND}"
--- a/x11-plugins/wmweather+/Manifest
+++ b/x11-plugins/wmweather+/Manifest
@ -1,2 +1,2 @@
-DIST wmweather+-2.11.tar.gz 193596 RMD160 d8b2e383b6e10cd10feb695d41d01ca580540458 SHA1 7fe01c72eb4a34f6682bd477006e894d042d24aa SHA256 bab0d2d2cac65db51bb25f70b028ee7c55642119d2b38441aff65553a35566f9
-DIST wmweather+-2.13.tar.gz 195094 RMD160 e92dbb2bbfa5b253f12e2ffa22d6eaa5ed5c82a8 SHA1 e89ee3b313b9cbc071a812888511763f8cd7700d SHA256 d15d8f491022e2f092d91a3a463b3200a4ac620ac93b0ecff796751d28e997d2
+DIST wmweather+-2.13.tar.gz 195094 SHA256 d15d8f491022e2f092d91a3a463b3200a4ac620ac93b0ecff796751d28e997d2
+DIST wmweather+-2.15.tar.gz 209258 SHA256 3e7931527a1b5e8def17abc2987ec43508a2cc3394c2f340b6e0062e5bfadbd1 SHA512 9096a337d50586e9d5fdb28a0cd6e882fd58cace1e148cb0e2c14239f2f5121a5cdad5ed63a1c8cd2c3f1907c4aee772cea3f55656437a7ee319226efbf6f82a WHIRLPOOL ae3c66b9dcec2c6fa6f142176612f8fb44cf3941e7c5351451da18b5c0b9852e8a6e680672a4f539948b85a78adbe638e8106c2490e373bb4b1b93f85015e663
--- a/x11-plugins/wmweather+/wmweather+-2.15.ebuild
+++ b/x11-plugins/wmweather+/wmweather+-2.15.ebuild
@ -1,32 +1,30 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather+/wmweather+-2.11.ebuild,v 1.4 2012/06/18 16:24:17 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather+/wmweather+-2.15.ebuild,v 1.1 2014/02/11 09:52:16 voyageur Exp $

+EAPI=5
 inherit flag-o-matic

-IUSE=""
 DESCRIPTION="A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts"
 HOMEPAGE="http://www.sourceforge.net/projects/wmweatherplus/"
 SRC_URI="mirror://sourceforge/wmweatherplus/${P}.tar.gz"

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

-DEPEND="x11-wm/windowmaker
-	dev-libs/libpcre
+DEPEND="dev-libs/libpcre
 	>=net-misc/curl-7.17.1
 	x11-libs/libXpm
 	x11-libs/libXext
-	x11-libs/libX11"
-
+	x11-libs/libX11
+	x11-wm/windowmaker"
 RDEPEND="${DEPEND}"

-src_compile() {
+src_configure() {
 	append-flags "-fno-optimize-sibling-calls"
-
-	econf || die
-	emake || die
+	econf
 }

 src_install() {
				`@ -0,0 +1 @@`
				`DIST pykit-0.1.0.tar.gz 96379 SHA256 a9acc4210b5852a021c6317ee51de819c291146924122404fc065170b5128b69 SHA512 739f253d463ddf0da5b5fd4f74f73df416787af1ebd6cca46bdc88c9a1d733b9a6663f0abe74e23c7da7967e5b14ca4fd0acbb0bb08fcf1cfa57697f714d6726 WHIRLPOOL d681be515632fd962e6b55818c10477ebf3e350f776e73a32db683425bd809e68f4b062e22cff48d3a0969e48543486d376aa7ec22712a6ac5c3512aeb77a7a2`