Sync with portage [Tue Jan 6 11:18:40 MSK 2015].

9 years ago · 1dd2a95162
parent 6a7338089a
commit 1dd2a95162
127 changed files with 1445 additions and 980 deletions
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@ -1,2 +1,3 @@
 DIST augeas-0.10.0.tar.gz 1676906 SHA256 ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca SHA512 4b23c69ce92971ad63cd5829044051a53b7976a7e3ccb9006282333a2dd06789e7c5da671450eb81904d237c36d449ac0924b06d9690dc7e5de4b8b40a58ec8c WHIRLPOOL 8b542cfa1bdcad3508cfd3cf25803ed27304ecdaaab4c9e7ce6ae2b7798c4cdc3d344ab4793cb2a0fd7b1b276eee20385b129d9fcf3b5b3b4596c3b0c96424cc
 DIST augeas-1.1.0.tar.gz 1940928 SHA256 9d81e4228329e2d5cccb018ab06bc8b734fb2dede2c4d9b5c02303d4a690b76b SHA512 ddb06f71993079330fc5b134ccd45476c1ab24f475b7a859c5920a7af3bd00d4dae31bf8110841ded4c4f5197e72911c298d7fcfe32d1d3e6821bca74aa67e26 WHIRLPOOL be1c83ecb1c8c7378374132bdd56be641e1200950e6e6d46e94ef35fc97be98157214b994071cf56f2aaafda29d91993c9a023ded5256c36364abbc9cbb498ca
+DIST augeas-1.3.0.tar.gz 1983656 SHA256 80763031af76515a8ea66013ddc3c466742a15d2e907c7c8e2e3b7410262e2af SHA512 92cc2cf83faa42e83621fe0f73fe9f7247d802f17da781e51d068056d20b1645de1f0ea0d5070c0d5729a3f6554d64a95e31111bf3e44b959386559619843e79 WHIRLPOOL 4e4c3374adca662ce90f94eb204028526ec0c3a9b0bc6644515994b88e289f3e1aa5f2b6ce7c28103a2a64e5185c8ba64d55e1a448e14f745d53aec4bf20e8b3
--- a/app-admin/augeas/augeas-1.3.0.ebuild
+++ b/app-admin/augeas/augeas-1.3.0.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/augeas/augeas-1.3.0.ebuild,v 1.1 2015/01/05 22:39:00 prometheanfire Exp $
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+	dev-libs/libxml2
+	sys-libs/readline"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=app-doc/NaturalDocs-1.40
+	test? ( dev-lang/ruby )"
+
+#PATCHES=(
+#	"${FILESDIR}"/${P}-gets.patch
+#	"${FILESDIR}"/${P}-test.patch
+#	"${FILESDIR}"/${P}-test2.patch
+#	"${FILESDIR}"/${P}-libxml2-pkgconfig.patch
+#	)
+
+src_prepare() {
+	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
+		addwrite /usr/share/NaturalDocs/Config/Languages.txt
+	fi
+	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
+		addwrite /usr/share/NaturalDocs/Config/Topics.txt
+	fi
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# Needs to implemented
+	local myeconfargs=( --without-selinux )
+	autotools-utils_src_configure
+}
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
--- a/app-crypt/gentoo-keys/Manifest
+++ b/app-crypt/gentoo-keys/Manifest
@ -1 +1 @@
-DIST gentoo-keys-201412231301.tar.xz 28844 SHA256 01cf1366f3345e9e44bc1461add4e633b303964a0a3b3e8f88f92337750fd186 SHA512 318c5cf811a9a488368dac8362570fc8ab57c991dd67a9ae39c2d7a184cb1c5cb5513eb4b26292af49890ad0d418ed34fe167ea6c3d3ab1f9a1968ecb3e97dc2 WHIRLPOOL 0712be0d8be0a38ed1dcfbc2599170f6045c93612629cf7c7a3db0ee00855a4a941ae02b267d3b01fb11888ff77c37749818ff53e8dd522d7999f08f86e90f98
+DIST gentoo-keys-201501052117.tar.xz 28936 SHA256 168e430e9cbc2d720a53b2ba04fe1dd54ee667f12b75d8b51d60b8cb11a474f1 SHA512 7e48e4a13f3e431b0f2f48fc4ed4fdca4b8078b725b1a9d9ca30a551178cc229c5e4b6b9018cea5686c310c065091073c7f04ab8eb61a20be1ccd9956c1d8cee WHIRLPOOL bc4d1f71cc9517ba3741bae4727e10480641c81701cb2f91412e30fa055e6ee38ee46e0afed927214370be89308af2516bee311585b5aec8a690ccf3eac3c6e8
--- a/app-crypt/gentoo-keys/gentoo-keys-201501052117.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201501052117.ebuild
@ -1,6 +1,6 @@
-# Copyright 2014-2014 Gentoo Foundation
+# Copyright 2014-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gentoo-keys/gentoo-keys-201412231301.ebuild,v 1.2 2014/12/26 13:23:55 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gentoo-keys/gentoo-keys-201501052117.ebuild,v 1.1 2015/01/05 23:29:39 dolsen Exp $

 EAPI="5"

--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.24 2015/01/04 05:46:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.25 2015/01/06 00:19:52 radhermit Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -316,7 +316,6 @@ src_test() {
 # of these links are "owned" by the vim ebuild when it is installed,
 # but they might be good for gvim as well (see bug 45828)
 update_vim_symlinks() {
-	has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
 	local f syms
 	syms="vimdiff rvim rview"
 	einfo "Calling eselect vi update..."
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.22 2015/01/04 05:46:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.23 2015/01/06 00:18:39 radhermit Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -17,7 +17,7 @@ else
 	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH}
 		http://dev.gentoo.org/~radhermit/vim/vim-${PV}-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="Vim, an improved vi-style text editor"
@ -294,7 +294,6 @@ src_test() {
 # of these links are "owned" by the vim ebuild when it is installed,
 # but they might be good for gvim as well (see bug 45828)
 update_vim_symlinks() {
-	has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
 	local f syms
 	syms="vimdiff rvim rview"
 	einfo "Calling eselect vi update..."
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@ -1,2 +1,3 @@
 DIST gettext-0.18.3.2.tar.gz 16189249 SHA256 d1a4e452d60eb407ab0305976529a45c18124bd518d976971ac6dc7aa8b4c5d7 SHA512 0cf8f2bb844b9d94f5e63a0f4bddc133e2388d103fd4189614d2fc157a94e27836ec399eb32ab69410e2214425676e6bc195bbf13238cc5ad32b454ec6e2b5ef WHIRLPOOL 0bb2e33788a12fbeaa4756aaa354a308424cdea5008d6b686bbd8601b7b7c513483d79f323904ebaf94e1fd67f65dfa7cb993ba5c5751e16a297b94b3307ae66
 DIST gettext-0.19.3.tar.gz 17414357 SHA256 93952d505a3d3b1ec10c69d340c7d438b1f9c332710d583981c0608be3eeb3f6 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8 WHIRLPOOL cbf86dab685fe3a5f4dbe5bcb39295809511904fdc65d9e0ef188c228bbe38c408ea38c14ac0ad38634ef1f5d79474d38399e95ab50ff6922cb0087ccfe434be
+DIST gettext-0.19.4.tar.gz 17717034 SHA256 8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97 WHIRLPOOL 2eb56c47d76f63b6557ae825538a35ae59f3f77da35321688547d9c420f47879c79ca1ab8ebd6bc6b4a3a8ce59ed620648884cd46455f6218213587f76967918
--- a/app-emacs/po-mode/po-mode-0.19.4.ebuild
+++ b/app-emacs/po-mode/po-mode-0.19.4.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/po-mode/po-mode-0.19.4.ebuild,v 1.1 2015/01/06 03:51:27 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="Major mode for GNU gettext PO files"
+HOMEPAGE="http://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+
+S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
+ELISP_REMOVE="start-po.el"
+SITEFILE="50${PN}-gentoo.el"
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@ -1,4 +1,8 @@
 DIST phpMyAdmin-4.0.10.6-all-languages.tar.xz 4774552 SHA256 69098b7eda055c13688429261daca43d500167d12791ab1018df85d0a163cec3 SHA512 7776cfc4810145a9ffd5ed42415693320f0979debe6640634ff42e94e7e700daec5c7ac7cdf0c1a9644a788ddbb71e5a74bec55faab5b8d2ac5626a108f94ed4 WHIRLPOOL 750af40e7d97a9e38f8481b5036c5a7c8743244e025571dfd51a50106c03835c3d79621de623b34d51e3754017bebcbaff1c89d320d3c1862cac2f2b413414e7
+DIST phpMyAdmin-4.0.10.7-all-languages.tar.xz 4774404 SHA256 bbb9d888ef3bb71315488abd4ffbdc8ee8cef15a5d4774f6b76683167906eff7 SHA512 5f16aef50431dde881a07330dd23872bc843678f8a1914bb0c26da0f8582f30aad6f9b26b28e36c3844af55195d43bbe04b2057b877ddc178bb29b4f7f18d80e WHIRLPOOL 9b47de6d191a4e8e851ba145742793fb1f10ddd7a8decf03979dbb77cad87ca030c0faa101397a62fca3e6ee34c088072d97e7444843dc4796197e6bc2332eb9
 DIST phpMyAdmin-4.1.14.7-all-languages.tar.xz 4879304 SHA256 72b954bbf95bacc70436450026915e4740274ee0c71eeb314a9f491788bb63b6 SHA512 03ffdd485b9e7ad4661189bcf3fca8892fb2c34d0b995d44b2c5e88c27b28095f0e8654109741b41543b56872c8b5d6dadb94e929e6332565f4a3ca5c3302383 WHIRLPOOL 850021d72cdec8af74433f8cd9f6c9a92e9950dd893ad96941a2146079f88bbbd3eb95e3fc45e7e81d656f3a952b5fdce6f4dd109804de2d19a78f06d5275ff4
+DIST phpMyAdmin-4.1.14.8-all-languages.tar.xz 4881004 SHA256 e2a2fee1658e3108048907a257b8f291fcfbd5840690e8f4711f9ea28233dce8 SHA512 34d28f04d6a808565ecc3d7187b2719d1e25e55d6248e3ea516e5914bd5a70aab0d9c4df3525cb8e77b37949a78671235af46e22871fe26ba999aa01b01c44d2 WHIRLPOOL a2e236a47154117c1bee3b9a51d4c3da9d1bd5834e3167174cbd80e562b5c14424b7e75de814f85d1ade1f6501b665a2af21cedd1c87be2ea6a9e151c0d8a2cf
 DIST phpMyAdmin-4.2.13-all-languages.tar.xz 5204232 SHA256 1bab6ef2e930ea4a92346c0945908cffba3efa45d6f39413b351cc8a2a017377 SHA512 d3cc81a9fdf212a0e86f88c77a1de195894998a338762ea8896e3c20c17f0faae56cb3752ef6fffdd67f5073b8a7e800001d1a11d8e8475ffe594879348ed0b5 WHIRLPOOL 4b6e69e630ccb350d1e3b5ddae1f0f81008b71ad4f43298c983d45d8a91e8be220adbd4f6a43a2b5cb26e87e0ce32d1bd349099a1634c024fcf0e394cc517b2e
+DIST phpMyAdmin-4.2.13.1-all-languages.tar.xz 5205324 SHA256 bc179dd35f6aa6d01b573f1e11b594d357fb2c09405b7fec06de5059adbec7c4 SHA512 121e6f063d7f4c4e8eaf048c9f68aaff713206ae077090fed671328f3fbd6f7d723309719c38e3a800c149630c1e2038b3f002bff7b48337278925cecf178b58 WHIRLPOOL 0bf85889e37f68907e8565a41d2e9ba804d41f8ad223a6d650117a93bd0900de242bed318a3cb467556b17eb2618d46571908090165cab666a2782a6f7465b3c
 DIST phpMyAdmin-4.3.0-rc1-all-languages.tar.xz 5383944 SHA256 b9ef6c9b743c4cd15319db48f906fc3d14de7b5321865fe754e3471725af032c SHA512 a573e0e030efd6358d5d4417000968b4a65dd893f24a8bfa20fc539ab6c00532e773b57f14dba79b077339b396f4a15bb2d5c6e8803b127b21991ec618210637 WHIRLPOOL d7151975aca7e6d845eb9ee08e2bacddc41b9e5a70f4ec9e34a200ed348a381280765001e94107a92de1a98701d593316fb5e2bd09da2244d830c8b7999ede81
+DIST phpMyAdmin-4.3.5-all-languages.tar.xz 5397680 SHA256 d499fb0c6178dcb488cf522124f84fc5babfcd6ce336706978f4020daf667df8 SHA512 dd8f29e96392a362718b793c3f649ab13f29d443f456a38d2b84c1eebba6bad194609d35329c51449c242fcdb0c5c085e25b6bb75ef8ae01f9b8e6029a616dbb WHIRLPOOL ef796804c4f14f5ddc931414fd9e6f82d4eedcee3e0537ca9cc7580faa9f1c3769387b319e548569f7609d2c9c597fc182d2300dc36abc8ef9ab5aefb6d4a669
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.7.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.7.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.0.10.7.ebuild,v 1.1 2015/01/05 22:01:59 jmbsvicetto Exp $
+
+EAPI="5"
+
+inherit eutils webapp depend.php
+
+MY_PV=${PV/_/-}
+MY_P="phpMyAdmin-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="http://www.phpmyadmin.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="setup"
+
+RDEPEND="
+	dev-lang/php[crypt,ctype,filter,json,session,unicode]
+	|| (
+		dev-lang/php[mysqli]
+		dev-lang/php[mysql]
+	)
+"
+
+need_httpd_cgi
+need_php_httpd
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
+	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
+
+	if ! use setup; then
+		rm -rf setup || die "Cannot remove setup utility"
+		elog "The phpMyAdmin setup utility has been removed."
+		elog "It is a regular target of various exploits. If you need it, set USE=setup."
+	else
+		elog "You should consider disabling the setup USE flag"
+		elog "to exclude the setup utility if you don't use it."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}
--- a/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.1.14.8.ebuild,v 1.1 2015/01/05 22:01:59 jmbsvicetto Exp $
+
+EAPI="5"
+
+inherit eutils webapp depend.php
+
+MY_PV=${PV/_/-}
+MY_P="phpMyAdmin-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="http://www.phpmyadmin.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="setup"
+
+RDEPEND="
+	dev-lang/php[crypt,ctype,filter,json,session,unicode]
+	|| (
+		dev-lang/php[mysqli]
+		dev-lang/php[mysql]
+	)
+"
+
+need_httpd_cgi
+need_php_httpd
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
+	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
+
+	if ! use setup; then
+		rm -rf setup || die "Cannot remove setup utility"
+		elog "The phpMyAdmin setup utility has been removed."
+		elog "It is a regular target of various exploits. If you need it, set USE=setup."
+	else
+		elog "You should consider disabling the setup USE flag"
+		elog "to exclude the setup utility if you don't use it."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}
--- a/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild,v 1.1 2015/01/05 22:01:59 jmbsvicetto Exp $
+
+EAPI="5"
+
+inherit eutils webapp depend.php
+
+MY_PV=${PV/_/-}
+MY_P="phpMyAdmin-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="http://www.phpmyadmin.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="setup"
+
+RDEPEND="
+	dev-lang/php[crypt,ctype,filter,json,session,unicode]
+	|| (
+		dev-lang/php[mysqli]
+		dev-lang/php[mysql]
+	)
+"
+
+need_httpd_cgi
+need_php_httpd
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
+	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
+
+	if ! use setup; then
+		rm -rf setup || die "Cannot remove setup utility"
+		elog "The phpMyAdmin setup utility has been removed."
+		elog "It is a regular target of various exploits. If you need it, set USE=setup."
+	else
+		elog "You should consider disabling the setup USE flag"
+		elog "to exclude the setup utility if you don't use it."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}
--- a/dev-db/phpmyadmin/phpmyadmin-4.3.5.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.3.5.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-4.3.5.ebuild,v 1.1 2015/01/05 22:01:59 jmbsvicetto Exp $
+
+EAPI="5"
+
+inherit eutils webapp depend.php
+
+MY_PV=${PV/_/-}
+MY_P="phpMyAdmin-${MY_PV}-all-languages"
+
+DESCRIPTION="Web-based administration for MySQL database in PHP"
+HOMEPAGE="http://www.phpmyadmin.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="setup"
+
+RDEPEND="
+	dev-lang/php[crypt,ctype,filter,json,session,unicode]
+	|| (
+		dev-lang/php[mysqli]
+		dev-lang/php[mysql]
+	)
+"
+
+need_httpd_cgi
+need_php_httpd
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
+	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
+
+	if ! use setup; then
+		rm -rf setup || die "Cannot remove setup utility"
+		elog "The phpMyAdmin setup utility has been removed."
+		elog "It is a regular target of various exploits. If you need it, set USE=setup."
+	else
+		elog "You should consider disabling the setup USE flag"
+		elog "to exclude the setup utility if you don't use it."
+		elog "It regularly is the target of various exploits."
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
+	webapp_src_install
+}
--- a/dev-perl/Config-Crontab/Config-Crontab-1.400.0.ebuild
+++ b/dev-perl/Config-Crontab/Config-Crontab-1.400.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-Crontab/Config-Crontab-1.400.0.ebuild,v 1.1 2014/02/19 10:53:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-Crontab/Config-Crontab-1.400.0.ebuild,v 1.2 2015/01/05 21:31:29 zlogene Exp $

 EAPI=5

@ -11,6 +11,6 @@ inherit perl-module
 DESCRIPTION="Read/Write Vixie compatible crontab(5) files"

 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 SRC_TEST="do"
--- a/dev-perl/perl-ldap/Manifest
+++ b/dev-perl/perl-ldap/Manifest
@ -1,3 +1,4 @@
 DIST perl-ldap-0.53.tar.gz 293584 SHA256 ec303b7e6cd5798b43a49d5045986e26659086faa077fdccb05c4e9d61420125 SHA512 659204da3107560d3b6f7e134104aea2bf28ea3475f10d6b214a121b33795ed89891bf9e98faa643ac38c05cce492203369aee36312f094f32dab46453ebfaef WHIRLPOOL 3391a232ccaed7d8dd6d67be1c7dacedeeff715a3aa751a95d93f16e85c64f6e45b0b766624b6de92c39db8629451eb7a50de500b6b0e5695b7e89d0d84999ee
 DIST perl-ldap-0.57.tar.gz 302611 SHA256 329469ae8033107fec47f9ed8c969ea3af9e3229a8c081f8ca7b6b223aefec23 SHA512 3be234a55b68355d7dc4824cbbe9c9e36346ff266bf9746156e9a9ad93475b72eb866c987f5257b18b0d665a9a51985df6747dc702fdd624e8f87501c5180a00 WHIRLPOOL 0e3d5648d586aba545e1c23ec70242002c6add01b4c48d2a3d9bea4f66f5d5d3dcd5cdee651e948261deb0a713f9aa1af5963a9db164d69aa0bb333fdff2bf57
 DIST perl-ldap-0.63.tar.gz 310067 SHA256 dbd6f0d85c50f3b19d2c67947dcf81ec21bc08ce819e289af69d64187fc047c1 SHA512 17ed98c43081fdbdb89a1c7ea0e5d60635a3f4cd59eb0a8e077498b7d305e7614250e07938fa86a6b8e90d325426378ad698eec01c789b74f078f2ae5678dd95 WHIRLPOOL 2a39317bc4819afb9f313b670118ce7a1edddbdc871606405ac3eb968c0622ea61c5bf8e2ced86f8ac253e024c6cc63f8c5e9c5d5d18b2f907dbf0f8c269193c
+DIST perl-ldap-0.64.tar.gz 310088 SHA256 9d5d71714f6c969e3a3ef406c1fa276a96028781e8cf38decd9a42f344dbdcb6 SHA512 5ec4fc96e573332f69fa5ae8220a360f60a0b51d9e1252f21092a37dd6c489ce4b28fc0889ec7005af88423698af2e7242f8b95c15fcc4e3bddbc669061b1bbe WHIRLPOOL 203d3300efc18ea26ed1443902c3e7e14221d05532fe8d83144f960cbded099a1310bce1b55a81f01e951730f39446b3fb3f275fd1350b3ce1b034ceded82beb
--- a/dev-perl/perl-ldap/perl-ldap-0.640.0.ebuild
+++ b/dev-perl/perl-ldap/perl-ldap-0.640.0.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-ldap/perl-ldap-0.640.0.ebuild,v 1.1 2015/01/05 22:39:42 zlogene Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=MARSCHAP
+MODULE_VERSION=0.64
+inherit perl-module
+
+DESCRIPTION="A collection of perl modules which provide an object-oriented interface to LDAP servers"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="sasl xml ssl"
+
+RDEPEND="
+	dev-perl/Convert-ASN1
+	dev-perl/URI
+	sasl? (
+		virtual/perl-Digest-MD5
+		dev-perl/Authen-SASL
+	)
+	xml? (
+		dev-perl/XML-Parser
+		dev-perl/XML-SAX
+		dev-perl/XML-SAX-Writer
+	)
+	ssl? (
+		>=dev-perl/IO-Socket-SSL-1.26
+	)"
+DEPEND="${RDEPEND}"
+
+#SRC_TEST=do
--- a/dev-python/python-nss/Manifest
+++ b/dev-python/python-nss/Manifest
@ -1,2 +1 @@
 DIST python-nss-0.12.tar.bz2 167007 SHA256 e1084fef686f5b2f74f47fa46a7403d8b747ad14be7d9b3685b1bb105a4283cb SHA512 7772e45e40b66b241d033338b7f9ec8b0d5e1d814e36d0302c24a3a28569f136556249ed6b4c8a30d8db3dec40882de7cfc67dec1ac5fa68e8e7e95c349537e9 WHIRLPOOL e8e2fe15bdbeb2e549f551722832f4a1f2a27efb8d301e46ae428213c9ccc6e7bdeda217d8969abe63eedcd927b3cfe2a3c00e4a4ba08b9ab378e405e5284b5d
-DIST python-nss-0.8.tar.lzma 108903 SHA256 6af55f01782867b2bc9ce09838c385ba9340c2a0646c3cf1ec1931892f64086a SHA512 e16d95bb10ba336e608958cd23cc1aaaeccb841eb101676b06ea7cf1d3a6c23050e882767a0c54bd7877ee7d453be4fcc6c5525fb4b63934585fd32d0f210091 WHIRLPOOL 5b763febe62e241f22f31c41d3542247bd780bdf316b92990b18d2abc3273d9443600948541260c503092f73ad57c94a5f46ba3a8780b3a444f38a2c89b6e932
--- a/dev-python/python-nss/python-nss-0.12-r1.ebuild
+++ b/dev-python/python-nss/python-nss-0.12-r1.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/python-nss-0.12-r1.ebuild,v 1.1 2015/01/05 23:47:47 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 versionator
+
+MY_PV="$(replace_all_version_separators  '_' )_0"
+DESCRIPTION="Python bindings for Network Security Services (NSS)"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/python-nss/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/${PN}/releases/PYNSS_RELEASE_${MY_PV}/src/${P}.tar.bz2"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND="dev-libs/nss
+	dev-libs/nspr
+	doc? ( dev-python/docutils[${PYTHON_USEDEP}]
+			dev-python/epydoc[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+CFLAGS="${CFLAGS} -fno-strict-aliasing"
+DOCS="README doc/ChangeLog"
+# RHB #754750 ; bgo #390869
+PATCHES=( "${FILESDIR}/python-nss-0.12-rsapssparams.patch" )
+
+python_compile_all() {
+	if use doc; then
+		einfo "Generating API documentation..."
+		mkdir doc/html
+		epydoc --html --docformat restructuredtext -o doc/html \
+			"${BUILD_DIR}"/lib/nss
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && local EXAMPLES=( doc/examples/. )
+
+	distutils-r1_python_install_all
+}
--- a/dev-python/python-nss/python-nss-0.12.ebuild
+++ b/dev-python/python-nss/python-nss-0.12.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/python-nss-0.12.ebuild,v 1.3 2012/02/22 02:48:23 patrick Exp $
-
-EAPI="4"
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils versionator
-
-MY_PV="$(replace_all_version_separators  '_' )_0"
-DESCRIPTION="Python bindings for Network Security Services (NSS)"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/python-nss/"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/${PN}/releases/PYNSS_RELEASE_${MY_PV}/src/${P}.tar.bz2"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-libs/nss
-	dev-libs/nspr
-	doc? ( dev-python/docutils
-			dev-python/epydoc )"
-
-RDEPEND="${DEPEND}"
-
-DOCS="README doc/ChangeLog"
-
-src_prepare() {
-	# RHB #754750 ; bgo #390869
-	epatch "${FILESDIR}/python-nss-0.12-rsapssparams.patch"
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		einfo "Generating API documentation..."
-
-		mkdir "${S}"/doc/html
-		PYTHONPATH="${ED}$(python_get_sitedir -f)" epydoc --html --docformat restructuredtext \
-			-o "${S}"/doc/html \
-			 "$(ls -d build-$(PYTHON -f --ABI)/lib.*)/nss"
-
-		dohtml -r "${S}"/doc/html/
-		insinto /usr/share/doc/"${PF}"
-		doins -r ./test
-		insinto /usr/share/doc/"${PF}"/examples
-		doins doc/examples/*.py
-	fi
-}
--- a/dev-python/python-nss/python-nss-0.8-r1.ebuild
+++ b/dev-python/python-nss/python-nss-0.8-r1.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/python-nss-0.8-r1.ebuild,v 1.3 2012/02/22 02:48:23 patrick Exp $
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils
-
-DESCRIPTION="Python bindings for Network Security Services (NSS)"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/python-nss/"
-SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.lzma"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-libs/nss
-	dev-libs/nspr
-	doc? ( dev-python/docutils
-			dev-python/epydoc )"
-
-RDEPEND="${DEPEND}"
-
-DOCS="README doc/ChangeLog"
-
-src_prepare() {
-	epatch "${FILESDIR}"/*.patch
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		einfo "Generating API documentation..."
-
-		mkdir "${S}"/doc/html
-		PYTHONPATH="${ED}$(python_get_sitedir -f)" epydoc --html --docformat restructuredtext \
-			-o "${S}"/doc/html \
-			 "$(ls -d build-$(PYTHON -f --ABI)/lib.*)/nss"
-
-		dohtml -r "${S}"/doc/html/
-		insinto /usr/share/doc/"${PF}"
-		doins -r ./test
-		insinto /usr/share/doc/"${PF}"/examples
-		doins doc/examples/*.py
-	fi
-}
--- a/dev-python/python-nss/python-nss-0.8.ebuild
+++ b/dev-python/python-nss/python-nss-0.8.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-nss/python-nss-0.8.ebuild,v 1.3 2012/02/22 02:48:23 patrick Exp $
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils
-
-DESCRIPTION="Python bindings for Network Security Services (NSS)"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/python-nss/"
-SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.lzma"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-libs/nss
-	dev-libs/nspr
-	doc? ( dev-python/docutils
-			dev-python/epydoc )"
-
-RDEPEND="${DEPEND}"
-
-DOCS="README doc/ChangeLog"
-
-src_prepare() {
-	epatch "${FILESDIR}"/*.patch
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		einfo "Generating API documentation..."
-
-		PYTHONPATH="${ED}$(python_get_sitedir -f)" epydoc --html --docformat restructuredtext \
-		-o "${S}"/build-2.6/doc/html  "${S}"/build-2.6/lib.linux-x86_64-2.6/nss
-
-		dohtml  -r "${S}/build/doc/"html/*
-		insinto /usr/share/doc/"${PF}"
-		doins -r ./test
-		insinto /usr/share/doc/"${PF}"/examples
-		doins doc/examples/*.py
-	fi
-}
--- a/dev-python/python-oembed/python-oembed-0.2.1-r1.ebuild
+++ b/dev-python/python-oembed/python-oembed-0.2.1-r1.ebuild
@ -1,14 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-oembed/python-oembed-0.2.1.ebuild,v 1.2 2014/08/10 21:19:20 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-oembed/python-oembed-0.2.1-r1.ebuild,v 1.1 2015/01/06 00:15:26 idella4 Exp $

-EAPI=4
-DISTUTILS_SRC_TEST="nosetests"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
+EAPI=5
+PYTHON_COMPAT=( python2_7 )

-inherit distutils
+inherit distutils-r1

 DESCRIPTION="A Python library that implements an OEmbed consumer"
 HOMEPAGE="http://pypi.python.org/pypi/python-oembed"
@ -19,5 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"

-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	nosetests || die "tests failed"
+}
--- a/dev-python/python-prctl/Manifest
+++ b/dev-python/python-prctl/Manifest
@ -1,3 +1 @@
-DIST python-prctl-1.3.1.tar.gz 23304 SHA256 6a6d8989bbe932618f6325a5157c741ea2891b41e76a08e8c6db3ee47cb5cd6e SHA512 8e42e93c68f16720ed8e9badd7fc42d82b30e093517d79906b5618d091931cf06720c736e34ed02211e0efd9ff22b96a3de8b0b9ebcd73f3cfc8c8d8b345f70a WHIRLPOOL e9e7beb319092597900d6fbb676e7149b6882dcaf4b69a10e193ad78956b74c3c921568556bcbdb2889139df5789cbd74323ae764ec0485dd62d4b646533da77
-DIST python-prctl-1.4.0.tar.gz 23993 SHA256 a89590ca981bd6634fa184501b67620e3ccc35636d88ef1f2ed4e533cb358926 SHA512 95170cfc67004d385fe10ed212fee0b65cc1634c2cc6fa9699f0321c9230f7c6d95844b8e8bc498ffe4377d6f2ee7e2552d184a57720e466b3ce45fbaad0a3e2 WHIRLPOOL 6973be6181bc0ed2f7a3ed067c50b271e9f68730deddd7205bbbf6cc5fc4005e406f9ed97091567f4949ce01d60df25d78ddde9fcf504a335f879136069def61
 DIST python-prctl-1.5.0.tar.gz 25024 SHA256 04fb4360b4f60e0ee6e3ae02ab4a478dc9d67486dbfc6e1d176af96b4e456fa7 SHA512 46500432fdeaef5f1ca370db0cbaa4d752d78434d10581a16dd131104db0996a9844fa604763f0220d0ba2250f1a6890ec0cdf1c491c8823f19d601376e6686f WHIRLPOOL c1620790aaf1145eea5e1ec681d2a2765ed6ea023991b24b1115209cd80b6fd49d8c5321f655c227c7a4ecf3c8141895e8f321d05cda4fb901634e3df604d57a
--- a/dev-python/python-prctl/python-prctl-1.3.1.ebuild
+++ b/dev-python/python-prctl/python-prctl-1.3.1.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-prctl/python-prctl-1.3.1.ebuild,v 1.2 2012/02/23 10:21:48 patrick Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Control process attributes through prctl"
-HOMEPAGE="http://github.com/seveas/python-prctl"
-SRC_URI="http://github.com/seveas/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/libcap"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME="prctl.py"
-
-src_unpack() {
-	unpack ${A}
-	mv *-${PN}-* "${S}"
-}
--- a/dev-python/python-prctl/python-prctl-1.4.0.ebuild
+++ b/dev-python/python-prctl/python-prctl-1.4.0.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-prctl/python-prctl-1.4.0.ebuild,v 1.1 2013/01/22 08:19:34 patrick Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Control process attributes through prctl"
-HOMEPAGE="http://github.com/seveas/python-prctl"
-SRC_URI="http://github.com/seveas/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/libcap"
-DEPEND="${RDEPEND}"
-
-PYTHON_MODNAME="prctl.py"
-
-src_unpack() {
-	unpack ${A}
-	mv *-${PN}-* "${S}"
-}
--- a/dev-python/python-prctl/python-prctl-1.5.0-r1.ebuild
+++ b/dev-python/python-prctl/python-prctl-1.5.0-r1.ebuild
@ -1,14 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-prctl/python-prctl-1.5.0.ebuild,v 1.1 2013/01/24 08:55:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-prctl/python-prctl-1.5.0-r1.ebuild,v 1.1 2015/01/06 01:03:48 idella4 Exp $

-EAPI=3
+EAPI=5
+PYTHON_COMPAT=( python2_7 )

-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
+inherit distutils-r1

 DESCRIPTION="Control process attributes through prctl"
 HOMEPAGE="http://github.com/seveas/python-prctl"
@ -22,8 +19,6 @@ IUSE=""
 RDEPEND="sys-libs/libcap"
 DEPEND="${RDEPEND}"

-PYTHON_MODNAME="prctl.py"
-
 src_unpack() {
 	unpack ${A}
 	mv *-${PN}-* "${S}"
--- a/dev-python/python-scw/python-scw-0.4.7-r1.ebuild
+++ b/dev-python/python-scw/python-scw-0.4.7-r1.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-scw/python-scw-0.4.7-r1.ebuild,v 1.1 2015/01/06 02:32:57 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+DESCRIPTION="Python binding for Scw"
+HOMEPAGE="http://scwwidgets.googlepages.com/"
+SRC_URI="http://scwwidgets.googlepages.com/${P}.tar.gz "
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-python/pygtk-2.4[${PYTHON_USEDEP}]
+	>=x11-libs/scw-0.4.0"
+RDEPEND="${DEPEND}"
--- a/dev-python/python-scw/python-scw-0.4.7.ebuild
+++ b/dev-python/python-scw/python-scw-0.4.7.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-scw/python-scw-0.4.7.ebuild,v 1.6 2014/08/10 21:19:47 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-
-inherit python
-
-DESCRIPTION="Python binding for Scw"
-HOMEPAGE="http://scwwidgets.googlepages.com/"
-SRC_URI="http://scwwidgets.googlepages.com/${P}.tar.gz "
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-python/pygtk-2.4
-	>=x11-libs/scw-0.4.0"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	python_src_install
-	python_clean_installation_image
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
--- a/dev-python/python-urljr/python-urljr-1.0.1-r1.ebuild
+++ b/dev-python/python-urljr/python-urljr-1.0.1-r1.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-urljr/python-urljr-1.0.1-r1.ebuild,v 1.1 2015/01/06 03:59:21 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="JanRain's URL Utilities"
+HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/"
+SRC_URI="http://www.openidenabled.com/resources/downloads/python-openid/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl test"
+
+RDEPEND="curl? ( >=dev-python/pycurl-7.15.1[${PYTHON_USEDEP}] )"
+DEPEND=""
+
+REQUIRED_USE="test? ( curl )"
+# test fails if it finds 'localhost' instead of '127.0.0.1'
+PATCHES=( "${FILESDIR}/${P}-gentoo-test_fetchers.patch" )
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" admin/runtests || die "tests failed"
+}
--- a/dev-python/python-urljr/python-urljr-1.0.1.ebuild
+++ b/dev-python/python-urljr/python-urljr-1.0.1.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-urljr/python-urljr-1.0.1.ebuild,v 1.4 2010/07/08 16:08:43 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="JanRain's URL Utilities"
-HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/"
-SRC_URI="http://www.openidenabled.com/resources/downloads/python-openid/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl test"
-
-RDEPEND="curl? ( >=dev-python/pycurl-7.15.1 )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-python/pycurl-7.15.1 )"
-
-PYTHON_MODNAME="urljr"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Test fails if it finds 'localhost' instead of '127.0.0.1'.
-	epatch "${FILESDIR}/${P}-gentoo-test_fetchers.patch"
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" admin/runtests
-	}
-	python_execute_function testing
-}
--- a/dev-python/python-yadis/python-yadis-1.1.0-r1.ebuild
+++ b/dev-python/python-yadis/python-yadis-1.1.0-r1.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-yadis/python-yadis-1.1.0-r1.ebuild,v 1.3 2014/08/10 21:20:00 slyfox Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml(+)"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="Yadis service discovery library"
-HOMEPAGE="http://www.openidenabled.com/yadis/libraries/python/"
-SRC_URI="http://www.openidenabled.com/resources/downloads/python-openid/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/elementtree
-	dev-python/python-urljr"
-DEPEND="${RDEPEND}
-	test? ( >=dev-python/pyflakes-0.2.1 )"
-
-PYTHON_MODNAME="yadis"
-
-src_prepare() {
-	# Fix broken test.
-	epatch "${FILESDIR}/${P}-gentoo-test.patch"
-}
-
-src_test() {
-	testing() {
-		if [[ ${PYTHON_ABI} != "2.7" ]]; then
-			ewarn "Tests are known to fail on ${PYTHON_ABI}"
-		fi
-		./admin/runtests
-	}
-	python_execute_function testing
-
-	einfo "The pyflake output about XML* redefinitions can be safely ignored"
-}
--- a/dev-python/python-yadis/python-yadis-1.1.0-r2.ebuild
+++ b/dev-python/python-yadis/python-yadis-1.1.0-r2.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-yadis/python-yadis-1.1.0-r2.ebuild,v 1.1 2015/01/06 05:33:30 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Yadis service discovery library"
+HOMEPAGE="http://www.openidenabled.com/yadis/libraries/python/"
+SRC_URI="http://www.openidenabled.com/resources/downloads/python-openid/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/elementtree[${PYTHON_USEDEP}]
+	dev-python/python-urljr[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( >=dev-python/pyflakes-0.2.1[${PYTHON_USEDEP}] )"
+
+# Fix broken test
+PATCHES=( "${FILESDIR}/${P}-gentoo-test.patch" )
+
+python_test() {
+	./admin/runtests
+	einfo "The pyflake output about XML* redefinitions can be safely ignored"
+}
--- a/dev-python/txsocksx/Manifest
+++ b/dev-python/txsocksx/Manifest
@ -0,0 +1 @@
+DIST txsocksx-1.13.0.3.tar.gz 19147 SHA256 df1a9e7062c7e3693c39953705b75e0feb7b8746a05135ffb2b8cd98708c9c43 SHA512 86621ea27eb0a8f2043f0ea0746a0716ca5e03d0721adb9e733d8398f105b3a17c37057d69cb3bb929e9348a06bc4064f8fb1149dbb0a06e9fd0f07eab5898b2 WHIRLPOOL 11d87111c06665b3c9330fb548fd9b936d2d3a5c82d305872ffc482011b38ec10624aac94603af89339949e29b5023dda8aaba4596186f916b9062022c70e662
--- a/dev-python/txsocksx/metadata.xml
+++ b/dev-python/txsocksx/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-python/txsocksx/txsocksx-1.13.0.3.ebuild
+++ b/dev-python/txsocksx/txsocksx-1.13.0.3.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/txsocksx/txsocksx-1.13.0.3.ebuild,v 1.1 2015/01/06 03:34:13 mrueg Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Twisted client endpoints for SOCKS{4,4a,5}"
+HOMEPAGE="https://github.com/habnabit/txsocksx"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/vcversioner[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/parsley-1.2[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP},crypt]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
--- a/dev-python/vcversioner/Manifest
+++ b/dev-python/vcversioner/Manifest
@ -0,0 +1 @@
+DIST vcversioner-2.14.0.0.tar.gz 9015 SHA256 acd43686e92e6c8bbeb4f2eef54408567a7adea9692fa72d591eec5357c03b86 SHA512 0d474910f9d0f0dd0c0d0b824bcdf5da7bbb5d2b55691f18107bb0b8a237213a83d8f51f719d4761e1dae9db70e84ef8c264c388ec1995ed0a55a838575e377e WHIRLPOOL b146f1d008b635fc337c2256a7bb9bd0534ecd3a335c349a0518e36ee21e807de1b43ea52dd6a581fa4de64ad6cdb2dca53646051a93afe752a28d4a25bcbec8
--- a/dev-python/vcversioner/metadata.xml
+++ b/dev-python/vcversioner/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/vcversioner/vcversioner-2.14.0.0.ebuild,v 1.1 2015/01/06 01:51:01 mrueg Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Use version control tags to discover version numbers"
+HOMEPAGE="https://github.com/habnabit/vcversioner"
+SRC_URI="mirror://pypi/v/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
--- a/dev-ruby/execjs/Manifest
+++ b/dev-ruby/execjs/Manifest
@ -1,4 +1,2 @@
 DIST execjs-1.4.0-git.tgz 14300 SHA256 76f10e338cfc0e79cb25110db97d6813f6dcce035daa19f66101188607069cfb SHA512 ed41db6f1c95be7bf5b379370c2f06894a0a233aaceeadf45172c0cfa1ab84f4eac7cb91608d02888c35f1dc9355f1fce60a5779535db58066ff1dacab6e0be8 WHIRLPOOL 226db6a8598735ae75ecfb11b2a03f61a75c6f191fe2d3abee3b57c8d76a284d160e3cb7359499ce4af8f9affc88b8d6b8c1499114e8fc28f55271e8266dbfc6
-DIST execjs-2.0.2.tar.gz 14192 SHA256 66cd547ef25b709d57f99d517be80e9f01bc4226e7f238f733c5143d9809a50d SHA512 fba56483a148e3a26e5f468332b3dd7811a517c05c57e8206eda87980c81fd9b81983a710b1279d29ad06c9fafb07f84b7fa08ce6b9563f7f9c8cc598c89d754 WHIRLPOOL 37d665009eed245dd180dc21028f68c4dd9b17e8f6109c2990be82e697a6e7d1a8b8857872be689975403c28c1cbea646434fcfb1d9107cbfba57826fcd3bd61
-DIST execjs-2.2.1.tar.gz 14589 SHA256 88c7abc53b5697c8a59d98639d4cc1e9d6c73e1c055fbd77bcf85c9a738e54c8 SHA512 8b513001e605a5b83cd60e3e4b19d1360cba2c579280b2dac13ef2b2a03ab56eb0d6cde864f086f0d20c80317ffde3846681ea2727fb168cbc0a0ef01d382060 WHIRLPOOL b46290e504f62466706c56ad80c437748a3ae2939503f091a642b739135c8c159f035b8f85c7bd8d0cea1a071589210a7d9f1b155b25930fbf60d571277329ad
 DIST execjs-2.2.2.tar.gz 64585 SHA256 6290e0d10152fe9a0962e7b001d27566a65d620c01fc0378bdd4b343ac671026 SHA512 3887c70bcdf334ae1ebdbdd6a96fc11b4fcab3f3a41883cc086854cf8f0973f7f020ef624476ab844dd4c14fb79a93ab8701099a124695643ff2c4c5802ed3db WHIRLPOOL 0c76a5eae52b6f869801af03fbdb0ad337ba5d8ba6b018c217201c93e444fdb8b01d6ee2ed41d6a0528567aca22bbc1ea78e54dd403e77bb147767adca6e6b31
--- a/dev-ruby/execjs/execjs-2.0.2-r1.ebuild
+++ b/dev-ruby/execjs/execjs-2.0.2-r1.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/execjs/execjs-2.0.2-r1.ebuild,v 1.2 2014/05/28 05:50:08 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-inherit ruby-fakegem
-
-DESCRIPTION="ExecJS lets you run JavaScript code from Ruby"
-HOMEPAGE="https://github.com/sstephenson/execjs"
-SRC_URI="https://github.com/sstephenson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-
-IUSE="test"
-
-# execjs supports various javascript runtimes. They are listed in order
-# as per the documentation. For now only include the ones already in the
-# tree.
-
-# therubyracer, therubyrhino, node.js, spidermonkey (deprecated)
-
-# spidermonkey doesn't pass the test suite:
-# https://github.com/sstephenson/execjs/issues/62
-
-RDEPEND+=" || ( net-libs/nodejs )"
-
-all_ruby_prepare() {
-	# Avoid test requiring network connectivity. We could potentially
-	# substitute dev-ruby/coffee-script-source for this.
-	sed -i -e '/test_coffeescript/,/end/ s:^:#:' test/test_execjs.rb || die
-}
--- a/dev-ruby/execjs/execjs-2.2.1.ebuild
+++ b/dev-ruby/execjs/execjs-2.2.1.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/execjs/execjs-2.2.1.ebuild,v 1.1 2014/06/27 05:57:58 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-inherit ruby-fakegem
-
-DESCRIPTION="ExecJS lets you run JavaScript code from Ruby"
-HOMEPAGE="https://github.com/sstephenson/execjs"
-SRC_URI="https://github.com/sstephenson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-
-IUSE="test"
-
-# execjs supports various javascript runtimes. They are listed in order
-# as per the documentation. For now only include the ones already in the
-# tree.
-
-# therubyracer, therubyrhino, node.js, spidermonkey (deprecated)
-
-# spidermonkey doesn't pass the test suite:
-# https://github.com/sstephenson/execjs/issues/62
-
-RDEPEND+=" || ( net-libs/nodejs )"
-
-all_ruby_prepare() {
-	# Avoid test requiring network connectivity. We could potentially
-	# substitute dev-ruby/coffee-script-source for this.
-	sed -i -e '/test_coffeescript/,/end/ s:^:#:' test/test_execjs.rb || die
-}
--- a/dev-ruby/jquery-rails/Manifest
+++ b/dev-ruby/jquery-rails/Manifest
@ -5,3 +5,4 @@ DIST jquery-rails-3.0.4.gem 185856 SHA256 55aade13e34c6c2c6862faef2ea82ff33d12bc
 DIST jquery-rails-3.1.0.gem 190464 SHA256 9d192f83aaa54196b380753cb20b42ca1ad210715063ef0fb15fac63ec430a8c SHA512 b96a59966d52efc0dd0f8c707fd281c60a7661d0371b491c397ada91f31df78b4b27f0027c7be9ec29ec5e8afb5e070e747b8c8cad625d2f3cd2baa72c1bdbc7 WHIRLPOOL 1c1e4b17c739198407d5d725c825f11e5d9f89e300bfb7b13755c629388c0b99c0c796bef35c9a4bd9c07d200ec4ff269ad618868148f465f40b5494f1edb3e3
 DIST jquery-rails-3.1.1.gem 190464 SHA256 6d30007b8fc343b27df96baec5b37a7bb0459c408fa11c4d27a41e5460fa4068 SHA512 8acc79edc74b4f7d8d9184ecc449d7355d2adfe5f6bcc9a924094ff19c600641cd90bcebdacc2f533314507b6a319cd56c09a0fedadda408d635eada47065044 WHIRLPOOL 50f3a7d8fd8b19283e827093ee391bf6a135c9208f2b5b20844449914278334d33e4e14baf5aba3fb94cf08bb614904440bf72e34f71a1bc63ae5849ab0e9b87
 DIST jquery-rails-3.1.2.gem 190464 SHA256 7ee42bba07bb858c11d81da798c2bfa3641b5afad5d420445b55d0118b29aa40 SHA512 b6beb89fff8fdcb29d8a26da1ce0e82073f18a9643886e9367e7021a65ae8d80080a969b6146d4dea8ebd0a7b6af94fadda56c5a2fc52cd68cfbc2cb0edc1335 WHIRLPOOL 89cbca2c9bd9081a31f2577a7dd3a3ad7a54a6ab165c6c127bc0a5e01bd76ac3fe823554e98850e83697f31189016d8c88472e26e7a2534fcccaa9d8c19e51fe
+DIST jquery-rails-4.0.3.gem 343552 SHA256 3a164ec26aad9d0cb3aca1060c6c61da7ac76f59a5194c6d8726869814ce7360 SHA512 af516f2f4cba05e0a9372bcdada2120fbbef2bea240e7dc910003708d9372c41a2421a2c9d74d73d32246d2e7233e10257ca5e1a62a65f3eaf463e246fe8e994 WHIRLPOOL b535c2740c5b6cbdb1cbb0e3ac1d7c02523a8a85a37cd2556b050b57a49a56ad113e0d2f9ba23153bca3e022be2287d2461cd8760b4b3ec4bf966c66fcb15a91
--- a/dev-ruby/jquery-rails/jquery-rails-4.0.3.ebuild
+++ b/dev-ruby/jquery-rails/jquery-rails-4.0.3.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jquery-rails/jquery-rails-4.0.3.ebuild,v 1.1 2015/01/06 07:25:03 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md VERSIONS.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="jquery-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="jQuery! For Rails! So great"
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/railties-4.2.0
+	>=dev-ruby/thor-0.14
+	dev-ruby/rails-dom-testing:1"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' jquery-rails.gemspec || die
+}
--- a/dev-tex/latexmk/Manifest
+++ b/dev-tex/latexmk/Manifest
@ -1,3 +1,4 @@
 DIST latexmk-435.zip 386766 SHA256 9de9ebdafd5e0cf5c29235ec6316aae2a039a5a6eb6d55e83b4cfbb7374d7fc3 SHA512 ff8f88c261e2b90663d979ddcb373f777fd3ad4b125ab703052867b4896257b34033ed2a07fd4574da526d839449512ccc898bcb9aaf81ae5afb442dcb8622be WHIRLPOOL 0bbf295edd8eb079160af834057abe2e02f536868b3815c265a2f7320eb8122701f062f8c784bf087e1cba9391ff755118c516a9ed1455fbbebab6334c41db6f
 DIST latexmk-437.zip 416907 SHA256 e9872988e5bddc61f73c6c409c4fa0de71437a8d3230329eed9436e3fca1d669 SHA512 a5ec732eb110681b3594ad51e8166d163aca5b8044fd3a56cb60ef78a3602042ef3975b3b2dbb28293236443b37b1aa48cdbec8dbdac62f02578a8e8770b3a22 WHIRLPOOL 21fb66dcbd22a3a9501399bf846135d56b518a27bfdd946dd46cfbef066db433a7e85167f9ddab488e5ce4585108d8c1389342761ccc0a8472811066e67fc2fd
 DIST latexmk-439.zip 418242 SHA256 1a098812a9757b5fd8d0bbd7136a494b81e5c1a359a737c34a8fb127014f5797 SHA512 500c06ec6ae7c64d18a83aea78f2acab88839e63133b84f599eefd00c3de867098c5209ca3edd6f69a214daf3d5b46726de1089b72364628d8aa20457bb8b08e WHIRLPOOL f7e3d05f751afe744a0a5705c49b77a177d0e204367985f86788292601e61a27a27fd011bd5ca6377515dc4b114ba3a4f279aea2bbb6f848c7655d3ca831ab9b
+DIST latexmk-441.zip 425737 SHA256 564b56414ab3a71ab39d01becce95deed4f262e061de167d0cca03c8ba8e5d46 SHA512 b9b65ebda1edc6f1f2692f7c8f02eeeac07dc2bd2f5d96c763615a9e27918069ba65809e5e61580e541420bf1f8d7edc451ad3f1753d43e9596175fdb3571a73 WHIRLPOOL bd48511ebf823709e66be3b82d6b0e8038a8450dfc3217b7e4f0612e6f4ee9d286e38696171337e165fb246464160290cd82e35f7a7e74962037821989e32634
--- a/dev-tex/latexmk/latexmk-441.ebuild
+++ b/dev-tex/latexmk/latexmk-441.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latexmk/latexmk-441.ebuild,v 1.1 2015/01/05 23:30:29 ottxor Exp $
+
+EAPI=5
+
+inherit bash-completion-r1
+
+DESCRIPTION="Perl script for automatically building LaTeX documents"
+HOMEPAGE="http://www.phys.psu.edu/~collins/software/latexmk/"
+SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="virtual/latex-base
+	dev-lang/perl"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_install() {
+	newbin latexmk.pl latexmk
+	doman latexmk.1
+	dodoc CHANGES README latexmk.pdf latexmk.ps latexmk.txt
+	dodoc -r example_rcfiles extra-scripts
+	newbashcomp "${FILESDIR}"/completion.bash-2 ${PN}
+}
--- a/games-board/cockatrice/cockatrice-20120702.ebuild
+++ b/games-board/cockatrice/cockatrice-20120702.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/cockatrice/cockatrice-20120702.ebuild,v 1.6 2014/03/01 22:24:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/cockatrice/cockatrice-20120702.ebuild,v 1.7 2015/01/05 23:07:31 mr_bones_ Exp $

-EAPI=3
+EAPI=5
 inherit cmake-utils eutils gnome2-utils games

 DESCRIPTION="An open-source multiplatform software for playing card games over a network"
--- a/games-board/gnuchess/Manifest
+++ b/games-board/gnuchess/Manifest
@ -1,2 +1,3 @@
 DIST gnuchess-6.1.2.tar.gz 720282 SHA256 14a1128f1cfa7d76a20d4f981d7e0dfc8e9da4548c1d754134a65ce65fe26696 SHA512 ae6625f2a5bd5a8e42fc3983dd42b8908250d4c6629423f84b147c879886163c6b2b7896494017a5242e9d951333941abd1fac6376dd43af28978870da68a043 WHIRLPOOL 1e9b61fe2b27327b47edfa945bf2b86daa23e3fddd370dd03f58dd87a5f955dbb58a35d442c6e16c62b1f1515a9f5903f72385adee32a5cac0cb9d70ce9b5a9e
 DIST gnuchess-6.2.0.tar.gz 731076 SHA256 ccc6db03c317f7010e7206ecf6a84fd81f2ee9bb36d3984d6ced74566c855836 SHA512 f80b8c72e29a612bb06b8fe9f2d05e148fb0d1d398e85ef9db38c0d902badc5f15b14debc1eb30f71b5eb9b11da0a0a98d7b3d578ee18557f06727425ee8905e WHIRLPOOL 235571204b287faf63cacfe6c1eeb62f5ea9de86539c5d9e00ffff7b6221f1f2069e3b531cf2c6b34937961312308ee0db7da86434776353a09e89593896b511
+DIST gnuchess-6.2.1.tar.gz 730761 SHA256 17caab725539447bcb17a14b17905242cbf287087e53a6777524feb7bbaeed06 SHA512 8f7ac477333703743984089e495ae3e61f8b4dd41c89c4141b33a9dcd598c9a5e2374ece50431f9eb72ccea86338ea19077e2e8ee592225c3c0a928a2fc11bc8 WHIRLPOOL fe8c6976f1e20de3e1ee30d9f2663ab32a217a66e88fda273f2381119df9ad616c7229d5647dcaf3225e6a0ba8ba4c5e96cc84e9382a24e4931793fcd469e60f
--- a/games-board/gnuchess/gnuchess-6.2.1.ebuild
+++ b/games-board/gnuchess/gnuchess-6.2.1.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnuchess/gnuchess-6.2.1.ebuild,v 1.1 2015/01/05 21:36:51 sping Exp $
+
+EAPI=5
+inherit flag-o-matic games
+
+DESCRIPTION="Console based chess interface"
+HOMEPAGE="http://www.gnu.org/software/chess/chess.html"
+SRC_URI="mirror://gnu/chess/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+src_configure() {
+	strip-flags # bug #199097
+	egamesconf --without-readline # bug 491088
+}
+
+src_install () {
+	default
+	prepgamesdirs
+}
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@ -1,4 +1,2 @@
-DIST pstoedit-3.50.tar.gz 894115 SHA256 22b16452d7538358f8ecdff1fec29a8b6d4da49dffec9ae436f60bd95d105711 SHA512 2da0df61828f6ca46c1e66ca1dd372e9373594375c61c9b30ee848aa952712720dee14da2134ec62398e3e6224123993c0b2406c5c1b39c55a51ddb0b55fb8fb WHIRLPOOL 2d07c40a1516cd5f78165b7e5b2cd37d9f19f709761dc7eb13aa1b8cdc2960fad923ed03c61b665675601497051ac72bab1372f44ef6ea43331c36acd6ebad42
-DIST pstoedit-3.60.tar.gz 988351 SHA256 118e58aa2c65e4193f1cc5a56c569e160752f654bf35e39f790d27b223b62391 SHA512 925a3f41612e0e557c384eb0d1616ab33d4829f04bef4cafd851b828267596f582559cf8bcc4b65922d55b6fcc4fd9593148e17d4de15409290e683fbd2336ff WHIRLPOOL f4e60210411c56dd94030346e7d31bdd6c4d1ffa49910e59b1147e69884ab89c2ebc2c57b75afe2dc4d0e656ee2570cbc5a1d2f6b0b2679162eecbc68bf8d968
 DIST pstoedit-3.61.tar.gz 989480 SHA256 e9935f5510fc5a3227bd31a74e88911f02a4c8516f3e0fe9fbc0dc780f2460db SHA512 fa7ca567ea5acc95000b9d7582c22605725f5893d2f00412f6e9e59ead1efc6cafbbb019df0a4ae4f849ed50df59cf1f4d187fdd3b560d62173287d6f7e3db72 WHIRLPOOL cf7b252afce0c65ccb9d739df5e4c4b419f7f39f9a76a5ad3f1dfc78cb9a0549b4ac0881dde7400fa51d9f75d479aa0669da76d8c01a628c2d4676cbe56e5287
 DIST pstoedit-3.62.tar.gz 1013477 SHA256 8074c44637d48fa1a9253b263b18a61258bab904df473f803d8a639b6a038148 SHA512 f8c8643c873066026d0ef15a845006cf13928410e1c4b822bdd9a727d5d80f703d3ddabbcde249c72395c3b013dd2e1ef020f4a74f239b118035372ba5e4dda4 WHIRLPOOL 1cd36f55786e060bb66b5f41461edd38b40a5222c0abe9442a7b7223b781922f875271cda99397928ddc137725e236ef53cfb15f070510a770364d822df90ec9
--- a/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch
+++ b/media-gfx/pstoedit/files/pstoedit-3.50-parallel.patch
@ -1,45 +0,0 @@
--- src/Makefile.am
-+++ src/Makefile.am
-@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES=			\
-         $(sample_drivers_src)                   
- libp2edrvstd_la_LIBADD=-L. libpstoedit.la
- libp2edrvstd_la_LDFLAGS=-no-undefined -module
-+libp2edrvstd_la_DEPENDENCIES = libpstoedit.la
- 
- #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp
- #libp2edrvplugins_la_LIBADD=
-@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module
- libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp
- libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la
- libp2edrvlplot_la_LDFLAGS=-no-undefined -module
-+libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la
- 
- libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp
- libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la
- libp2edrvswf_la_LDFLAGS=-no-undefined -module
-+libp2edrvswf_la_DEPENDENCIES = libpstoedit.la
- 
- # note the __ stand for ++ - automake treats all no alphanums chars as _
- libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp
- libp2edrvmagick___la_LIBADD=-L. libpstoedit.la
- libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS}  -module
-+libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la
- # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long
- 
- if USE_EMFBYSOURCE
-@@ -113,6 +117,7 @@ else
- libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp
- libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module
- endif
-+libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la
- 
- libpstoedit_la_SOURCES =			\
- 	dynload.cpp dynload.h			\
-@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined
- 
- pstoedit_SOURCES = cmdmain.cpp
- pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS}
-+pstoedit_DEPENDENCIES = libpstoedit.la
- 
- pkginclude_HEADERS =				\
- 	pstoedit.h				\
--- a/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch
+++ b/media-gfx/pstoedit/files/pstoedit-3.50-plugin-close.patch
@ -1,12 +0,0 @@
-http://bugzilla.redhat.com/507035
-
--- src/dynload.cpp
-+++ src/dynload.cpp
-@@ -147,7 +147,6 @@ void DynLoader::close()
- 
- DynLoader::~DynLoader()
- {
-	close();
- 	libname=0;
- }
- 
--- a/media-gfx/pstoedit/files/pstoedit-3.50-swf.patch
+++ b/media-gfx/pstoedit/files/pstoedit-3.50-swf.patch
@ -1,25 +0,0 @@
-http://bugs.gentoo.org/238803
-
--- configure.ac
-+++ configure.ac
-@@ -181,7 +181,7 @@
- 	[LIBMING_CFLAGS="-DHAVE_LIBMING"])
- if test -n "${LIBMING_LDFLAGS}" && test -n "${LIBMING_CFLAGS}"; then
-    HAVE_LIBMING=yes
-   AC_CHECK_HEADER(util/png2dbl.c,[LIBMING_CFLAGS="$LIBMING_CFLAGS -DHAVE_LIBMINGUTIL"])
-+   AC_CHECK_HEADER(util/png2dbl.c,[LIBMING_CFLAGS="$LIBMING_CFLAGS -DHAVE_LIBMINGUTIL -DUSE_PNG"])
- else
-    LIBMING_LDFLAGS=
-    LIBMING_CFLAGS=
--- src/drvswf.cpp
-+++ src/drvswf.cpp
-@@ -31,8 +31,7 @@
- //static bool trace = false;
- //static bool cubic = false;
- 
-#include "mingpp.h"
-#include "ming_config.h"
-+#include <mingpp.h>
- 
- #if defined(_WIN32)
- extern "C" {
--- a/media-gfx/pstoedit/pstoedit-3.50-r1.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.50-r1.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.50-r1.ebuild,v 1.3 2012/05/05 07:00:18 jdhore Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
-HOMEPAGE="http://sourceforge.net/projects/pstoedit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="emf flash imagemagick plotutils"
-
-RDEPEND=">=media-libs/libpng-1.4.3
-	>=media-libs/gd-2.0.35-r1
-	>=app-text/ghostscript-gpl-8.71-r1
-	emf? ( >=media-libs/libemf-1.0.3 )
-	flash? ( >=media-libs/ming-0.4.3 )
-	imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] )
-	plotutils? ( media-libs/plotutils )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e '/CXXFLAGS="-g"/d' \
-		-e 's:-pedantic::' \
-		configure.ac || die
-
-	epatch "${FILESDIR}"/${P}-parallel.patch \
-		"${FILESDIR}"/${P}-plugin-close.patch \
-		"${FILESDIR}"/${P}-swf.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_with emf) \
-		$(use_with imagemagick magick) \
-		$(use_with plotutils libplot) \
-		$(use_with flash swf)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	doman doc/pstoedit.1 || die
-	dodoc doc/*.txt
-	dohtml doc/*.htm
-}
--- a/media-gfx/pstoedit/pstoedit-3.50.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.50.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.50.ebuild,v 1.10 2012/05/05 07:00:18 jdhore Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
-HOMEPAGE="http://www.pstoedit.net/pstoedit"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-IUSE="emf imagemagick plotutils"
-
-RDEPEND="media-libs/libpng
-	media-libs/gd
-	app-text/ghostscript-gpl
-	emf? ( >=media-libs/libemf-1.0.3 )
-	imagemagick? ( media-gfx/imagemagick[cxx] )
-	plotutils? ( media-libs/plotutils )"
-#	swf? ( >=media-libs/ming-0.3 )" bug 238803
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's:-pedantic ::' -e 's:CXXFLAGS="-g"::' "${S}"/configure.ac
-	epatch "${FILESDIR}"/${P}-parallel.patch
-	epatch "${FILESDIR}"/${P}-plugin-close.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with emf) \
-		$(use_with imagemagick magick) \
-		$(use_with plotutils libplot) \
-		--without-swf \
-		|| die 'econf failed'
-#		$(use_with swf) \ # bug 238803
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die 'make install failed'
-	cd doc
-	dodoc readme.txt || die
-	dohtml *.htm || die
-	doman pstoedit.1 || die
-}
--- a/media-gfx/pstoedit/pstoedit-3.60.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.60.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.60.ebuild,v 1.5 2012/06/28 12:47:18 naota Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
-HOMEPAGE="http://sourceforge.net/projects/pstoedit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="emf flash imagemagick plotutils"
-
-RDEPEND=">=media-libs/libpng-1.4.3
-	>=media-libs/gd-2.0.35-r1
-	>=app-text/ghostscript-gpl-8.71-r1
-	emf? ( >=media-libs/libemf-1.0.3 )
-	flash? ( >=media-libs/ming-0.4.3 )
-	imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] )
-	plotutils? ( media-libs/plotutils )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e '/CXXFLAGS="-g"/d' \
-		-e 's:-pedantic::' \
-		configure.ac || die
-
-	epatch "${FILESDIR}"/${P}-parallel.patch \
-		"${FILESDIR}"/${P}-libdl.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with emf) \
-		$(use_with imagemagick magick) \
-		$(use_with plotutils libplot) \
-		$(use_with flash swf)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman doc/pstoedit.1
-	dodoc doc/*.txt
-	dohtml doc/*.htm
-}
--- a/media-video/flumotion/Manifest
+++ b/media-video/flumotion/Manifest
@ -1 +1,2 @@
-DIST flumotion-0.8.1.tar.bz2 1516513 SHA256 ae53684e504ef8793a08e70d17892a090c53ebf9bd470f8081b9c9949d53db4d
+DIST flumotion-0.10.1.tar.bz2 1640721 SHA256 8c6913a3b2ed7adb6294c644762bebdac4d75b1b752a4ffd3589dcfa5b778d21 SHA512 ef157a73c97de934deaad22e1be8b3f109e47a0898a674f542d17b84edcca50f6ca6c4790419a9514e291ec8e4651ba840491e21439c5342d03a4a46c5805bfb WHIRLPOOL 9796f22e862c69220dabbfd9b9c899d6b5d5e4d6bb20203016f3ab7ac6c8ecd36cdbfea03438384be101407eeddfcfd6fc47337edcd15dd1a4f67dcb222d8e71
+DIST flumotion-0.8.1.tar.bz2 1516513 SHA256 ae53684e504ef8793a08e70d17892a090c53ebf9bd470f8081b9c9949d53db4d SHA512 87fa4b517d9ab59d0fc624e1047aad26d4319cedd36c6cfaab751fc3c984281b18c640caa8a363b39b3df1c2a6d5a4adbe627525dac155ef263b635884300994 WHIRLPOOL 9ceca56fd9d63b0bcceff9354f5f90d7d724d6fc37e218031d4124ee19bad07ed18aca39407d3b75a1cd1f2c54d0892bafc13fb04d8f6208119e463f52239b8b
--- a/media-video/flumotion/files/flumotion-init-3
+++ b/media-video/flumotion/files/flumotion-init-3
@ -0,0 +1,23 @@
+#!/sbin/runscript
+
+depend() {
+    need net
+}
+
+start() {
+    ebegin "Starting Flumotion"
+    if [ ! -d /var/run/flumotion ] ; then
+        mkdir /var/run/flumotion
+        chown flumotion:flumotion /var/run/flumotion
+        chmod 755 /var/run/flumotion
+    fi
+
+    start-stop-daemon -o --start --chuid flumotion:flumotion --exec /usr/sbin/flumotion start
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping Flumotion"
+    /usr/sbin/flumotion stop
+    eend $?
+}
--- a/media-video/flumotion/flumotion-0.10.1.ebuild
+++ b/media-video/flumotion/flumotion-0.10.1.ebuild
@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.10.1.ebuild,v 1.1 2015/01/05 23:47:41 eva Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils fdo-mime flag-o-matic multilib python-single-r1 toolchain-funcs user virtualx # AC_CHECK_PROG for Xvfb
+
+DESCRIPTION="Flumotion Streaming server"
+HOMEPAGE="http://www.flumotion.net/"
+SRC_URI="http://www.flumotion.net/src/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1" # LICENSE.LGPL
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# TODO:
+
+# These would be from 0.6.2's ebuild
+# media-plugins/gst-plugins-libpng:0.10
+# dev-python/twisted-web
+# dev-python/twisted-names
+# dev-python/imaging
+
+# These are from README
+RDEPEND="
+	dev-python/gst-python:0.10[${PYTHON_USEDEP}]
+	dev-python/kiwi[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-ogg:0.10
+	media-plugins/gst-plugins-theora:0.10
+	media-plugins/gst-plugins-vorbis:0.10
+"
+# These are from README and error and trial FEATURES="test" Import's
+DEPEND="${RDEPEND}
+	${PYTHON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
+	test? ( dev-python/icalendar[${PYTHON_USEDEP}]
+		dev-python/pychecker[${PYTHON_USEDEP}]
+		dev-python/twisted-conch[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	# Fix .desktop file
+	sed -e 's/.png//' -i data/flumotion-admin.desktop.in || die
+
+	# Fix shebangs
+	sed -e '1 s:.*:#!/usr/bin/env python:' \
+		-i bin/flu*.in bin/runtest.in misc/flu*.in || die
+	python_fix_shebang bin/flu*.in bin/runtest.in misc/flu*.in
+}
+
+src_configure() {
+	append-cflags -fno-strict-aliasing
+
+	econf \
+		--localstatedir=/var \
+		$(use_enable doc docs)
+}
+
+src_compile() {
+	emake -j1 fdpass_so_LINK="$(tc-getCC) ${LDFLAGS} -shared -o fdpass.so"
+}
+
+src_test() {
+	# FIXME: restrict unittests to flumotion source folder
+	# other tests are failing in weird ways and does not seem to test much of flumotion
+	Xemake -j1 check -C flumotion
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	dodoc RELEASE
+
+	keepdir /var/log/flumotion
+
+	newinitd "${FILESDIR}"/flumotion-init-3 flumotion
+
+	# /usr/share/hal/fdi/policy/20thirdparty/91-flumotion-device-policy.fdi
+	rm -rf "${D}"/usr/share/hal || die
+
+	dodir /etc/flumotion
+	dodir /etc/flumotion/managers
+	dodir /etc/flumotion/managers/default
+	dodir /etc/flumotion/managers/default/flows
+	dodir /etc/flumotion/workers
+
+	pushd conf
+	insinto /etc/flumotion/managers/default
+	doins managers/default/planet.xml
+	insinto /etc/flumotion/workers
+	doins workers/default.xml
+	insinto /etc/flumotion
+	doins default.pem
+	popd
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if ! enewgroup flumotion || ! enewuser flumotion -1 -1 /usr/share/flumotion flumotion,audio,video,sys; then
+		die "Unable to add flumotion user and flumotion group."
+	fi
+
+	for dir in /usr/share/flumotion /var/log/flumotion ; do
+		chown -R flumotion:flumotion "${dir}"
+		chmod -R 755 "${dir}"
+	done
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/media-video/flumotion/flumotion-0.8.1-r1.ebuild
+++ b/media-video/flumotion/flumotion-0.8.1-r1.ebuild
@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.8.1-r1.ebuild,v 1.1 2015/01/05 23:35:15 eva Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils fdo-mime flag-o-matic multilib python-single-r1 toolchain-funcs user virtualx # AC_CHECK_PROG for Xvfb
+
+DESCRIPTION="Flumotion Streaming server"
+HOMEPAGE="http://www.flumotion.net/"
+SRC_URI="http://www.flumotion.net/src/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2" # LICENSE.Flumotion
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# TODO:
+
+# These would be from 0.6.2's ebuild
+# media-plugins/gst-plugins-libpng:0.10
+# dev-python/twisted-web
+# dev-python/twisted-names
+# dev-python/imaging
+
+# These are from README
+RDEPEND="
+	dev-python/gst-python:0.10[${PYTHON_USEDEP}]
+	dev-python/kiwi[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/twisted-core[${PYTHON_USEDEP}]
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-ogg:0.10
+	media-plugins/gst-plugins-theora:0.10
+	media-plugins/gst-plugins-vorbis:0.10
+"
+# These are from README and error and trial FEATURES="test" Import's
+DEPEND="${RDEPEND}
+	${PYTHON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
+	test? ( dev-python/icalendar[${PYTHON_USEDEP}]
+		dev-python/pychecker[${PYTHON_USEDEP}]
+		dev-python/twisted-conch[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	# Fix .desktop file
+	sed -e 's/.png//' -i data/flumotion-admin.desktop.in || die
+
+	# Fix shebangs
+	sed -e '1 s:.*:#!/usr/bin/env python:' \
+		-i bin/flu*.in bin/runtest.in misc/flu*.in || die
+	python_fix_shebang bin/flu*.in bin/runtest.in misc/flu*.in
+}
+
+src_configure() {
+	append-cflags -fno-strict-aliasing
+
+	econf \
+		--localstatedir=/var \
+		$(use_enable doc docs)
+}
+
+src_compile() {
+	emake -j1 fdpass_so_LINK="$(tc-getCC) ${LDFLAGS} -shared -o fdpass.so"
+}
+
+src_test() {
+	# FIXME: restrict unittests to flumotion source folder
+	# other tests are failing in weird ways and does not seem to test much of flumotion
+	Xemake -j1 check -C flumotion
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	dodoc RELEASE
+
+	keepdir /var/log/flumotion
+
+	newinitd "${FILESDIR}"/flumotion-init-3 flumotion
+
+	# /usr/share/hal/fdi/policy/20thirdparty/91-flumotion-device-policy.fdi
+	rm -rf "${D}"/usr/share/hal || die
+
+	dodir /etc/flumotion
+	dodir /etc/flumotion/managers
+	dodir /etc/flumotion/managers/default
+	dodir /etc/flumotion/managers/default/flows
+	dodir /etc/flumotion/workers
+
+	pushd conf
+	insinto /etc/flumotion/managers/default
+	doins managers/default/planet.xml
+	insinto /etc/flumotion/workers
+	doins workers/default.xml
+	insinto /etc/flumotion
+	doins default.pem
+	popd
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if ! enewgroup flumotion || ! enewuser flumotion -1 -1 /usr/share/flumotion flumotion,audio,video,sys; then
+		die "Unable to add flumotion user and flumotion group."
+	fi
+
+	for dir in /usr/share/flumotion /var/log/flumotion ; do
+		chown -R flumotion:flumotion "${dir}"
+		chmod -R 755 "${dir}"
+	done
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Mon, 05 Jan 2015 21:36:52 +0000
+Tue, 06 Jan 2015 07:36:51 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Mon, 05 Jan 2015 21:36:52 +0000
+Tue, 06 Jan 2015 07:36:51 +0000
--- a/metadata/md5-cache/app-admin/augeas-1.3.0
+++ b/metadata/md5-cache/app-admin/augeas-1.3.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libxml2 sys-libs/readline virtual/pkgconfig >=app-doc/NaturalDocs-1.40 test? ( dev-lang/ruby )
+DESCRIPTION=A library for changing configuration files
+EAPI=5
+HOMEPAGE=http://augeas.net/
+IUSE=static-libs test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libxml2 sys-libs/readline
+SLOT=0
+SRC_URI=http://download.augeas.net/augeas-1.3.0.tar.gz
+_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	autotools-utils	3727db64c7b960903d5033280f108080	eutils	f99a767f569b1f0731b3a1edd17c1d11	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=02beb0444f3ad3f7b5013f945ffea702
--- a/metadata/md5-cache/app-crypt/gentoo-keys-201501052117
+++ b/metadata/md5-cache/app-crypt/gentoo-keys-201501052117
@ -5,5 +5,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Gentoo-keys
 KEYWORDS=alpha amd64 arm hppa ia64 ppc64 ppc sparc x86 ~arm64 ~x86-fbsd ~amd64-fbsd ~m68k ~mips ~s390 ~sh
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~dolsen/releases/keyrings/gentoo-keys-201412231301.tar.xz
-_md5_=92331502567414d90e1a9d55b1a36e22
+SRC_URI=http://dev.gentoo.org/~dolsen/releases/keyrings/gentoo-keys-201501052117.tar.xz
+_md5_=4e686571539cb76c86cd30fed57cc37c
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@ -9,4 +9,4 @@ RDEPEND=~app-editors/vim-core-9999 >=app-admin/eselect-vi-1.1 >=sys-libs/ncurses
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) luajit? ( lua )
 SLOT=0
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	f99a767f569b1f0731b3a1edd17c1d11	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	mercurial	2fbda5894dda6392b71334ee9a92de0b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	prefix	21058c21ca48453d771df15500873ede	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
-_md5_=b45f458fce63c0afd8987f0ae4d46638
+_md5_=891c2de14a1035d5a894bf7d359a114d
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@ -9,4 +9,4 @@ RDEPEND=>=app-admin/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2 nls? ( virtual/libi
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) luajit? ( lua )
 SLOT=0
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	f99a767f569b1f0731b3a1edd17c1d11	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	mercurial	2fbda5894dda6392b71334ee9a92de0b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f	vim-doc	1c18baeec98cec3287524cbf2fee2bd2
-_md5_=5483aafb41e0388e6e7878e0718e25cf
+_md5_=d4c502cf83a5606ff9c2530e7eed071b
--- a/metadata/md5-cache/app-emacs/po-mode-0.19.4
+++ b/metadata/md5-cache/app-emacs/po-mode-0.19.4
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-23
+DESCRIPTION=Major mode for GNU gettext PO files
+EAPI=5
+HOMEPAGE=http://www.gnu.org/software/gettext/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-3+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=mirror://gnu/gettext/gettext-0.19.4.tar.gz
+_eclasses_=elisp	b7ff113c97bf466ace6f3235f80af600	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	f99a767f569b1f0731b3a1edd17c1d11	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=37ce244cb0a168994c5149192726ad8e
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.0.10.7
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.0.10.7
@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web-based administration for MySQL database in PHP
+EAPI=5
+HOMEPAGE=http://www.phpmyadmin.net/
+IUSE=setup vhosts
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+SLOT=4.0.10.7
+SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.0.10.7-all-languages.tar.xz
+_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	f99a767f569b1f0731b3a1edd17c1d11	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=bf7763392448f097dd6c3b99c0c60fa2
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.1.14.8
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.1.14.8
@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web-based administration for MySQL database in PHP
+EAPI=5
+HOMEPAGE=http://www.phpmyadmin.net/
+IUSE=setup vhosts
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+SLOT=4.1.14.8
+SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.1.14.8-all-languages.tar.xz
+_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	f99a767f569b1f0731b3a1edd17c1d11	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=d3ebc8b5dd549917bbc8582e1c73d7c7
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.2.13.1
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.2.13.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web-based administration for MySQL database in PHP
+EAPI=5
+HOMEPAGE=http://www.phpmyadmin.net/
+IUSE=setup vhosts
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+SLOT=4.2.13.1
+SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.2.13.1-all-languages.tar.xz
+_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	f99a767f569b1f0731b3a1edd17c1d11	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=8136abc3ac4472d698ef9a1536ce47d4
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.3.5
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.3.5
@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Web-based administration for MySQL database in PHP
+EAPI=5
+HOMEPAGE=http://www.phpmyadmin.net/
+IUSE=setup vhosts
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+SLOT=4.3.5
+SRC_URI=mirror://sourceforge/phpmyadmin/phpMyAdmin-4.3.5-all-languages.tar.xz
+_eclasses_=depend.php	df169a364e191b840b695604097e3c21	eutils	f99a767f569b1f0731b3a1edd17c1d11	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	phpconfutils	e108303831029e5b8a9d24b991b1d62a	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	webapp	25b9b1696f5e698711f47d45c3d45e3e
+_md5_=0a93ffef4abf375b4be217f2e62edab4
--- a/metadata/md5-cache/dev-perl/Config-Crontab-1.400.0
+++ b/metadata/md5-cache/dev-perl/Config-Crontab-1.400.0
@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Read/Write Vixie compatible crontab(5) files
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Config-Crontab/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SC/SCOTTW/Config-Crontab-1.40.tar.gz
 _eclasses_=eutils	f99a767f569b1f0731b3a1edd17c1d11	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	4e599aab78ebadca09ce51369fa9019d	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=5b63b5a282d7357eebf4bb9ace02803d
+_md5_=dd4d05dff1a0d2199a17e702422042e2
--- a/metadata/md5-cache/dev-perl/perl-ldap-0.640.0
+++ b/metadata/md5-cache/dev-perl/perl-ldap-0.640.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/Convert-ASN1 dev-perl/URI sasl? ( virtual/perl-Digest-MD5 dev-perl/Authen-SASL ) xml? ( dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-SAX-Writer ) ssl? ( >=dev-perl/IO-Socket-SSL-1.26 ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=A collection of perl modules which provide an object-oriented interface to LDAP servers
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/perl-ldap/
+IUSE=sasl xml ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Convert-ASN1 dev-perl/URI sasl? ( virtual/perl-Digest-MD5 dev-perl/Authen-SASL ) xml? ( dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-SAX-Writer ) ssl? ( >=dev-perl/IO-Socket-SSL-1.26 ) dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.64.tar.gz
+_eclasses_=eutils	f99a767f569b1f0731b3a1edd17c1d11	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	4e599aab78ebadca09ce51369fa9019d	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=185faccbd8cff85c64869105c606505e
--- a/metadata/md5-cache/dev-python/python-nss-0.12
+++ b/metadata/md5-cache/dev-python/python-nss-0.12
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-libs/nss dev-libs/nspr doc? ( dev-python/docutils dev-python/epydoc ) dev-lang/python
-DESCRIPTION=Python bindings for Network Security Services (NSS)
-EAPI=4
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/python-nss/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2 )
-RDEPEND=dev-libs/nss dev-libs/nspr doc? ( dev-python/docutils dev-python/epydoc ) dev-lang/python
-SLOT=0
-SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/python-nss/releases/PYNSS_RELEASE_0_12_0/src/python-nss-0.12.tar.bz2
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	f99a767f569b1f0731b3a1edd17c1d11	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=800a0ecb8f6caac082f84d651a197cc2
--- a/metadata/md5-cache/dev-python/python-nss-0.12-r1
+++ b/metadata/md5-cache/dev-python/python-nss-0.12-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/nss dev-libs/nspr doc? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Python bindings for Network Security Services (NSS)
+EAPI=5
+HOMEPAGE=http://www.mozilla.org/projects/security/pki/python-nss/
+IUSE=doc examples python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2 )
+RDEPEND=dev-libs/nss dev-libs/nspr doc? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/python-nss/releases/PYNSS_RELEASE_0_12_0/src/python-nss-0.12.tar.bz2
+_eclasses_=distutils-r1	6d697abf6c0c1d32af2c025a6b75e775	eutils	f99a767f569b1f0731b3a1edd17c1d11	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	5e9a53457b774d41e731613823baeb37	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=327bbee6a78fa7447604e1aa93b09196
--- a/metadata/md5-cache/dev-python/python-nss-0.8
+++ b/metadata/md5-cache/dev-python/python-nss-0.8
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-libs/nss dev-libs/nspr doc? ( dev-python/docutils dev-python/epydoc ) dev-lang/python
-DESCRIPTION=Python bindings for Network Security Services (NSS)
-EAPI=3
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/python-nss/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2 )
-RDEPEND=dev-libs/nss dev-libs/nspr doc? ( dev-python/docutils dev-python/epydoc ) dev-lang/python
-SLOT=0
-SRC_URI=http://rion-overlay.googlecode.com/files/python-nss-0.8.tar.lzma
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	f99a767f569b1f0731b3a1edd17c1d11	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=92c563d67bb4b096b8ba60f91c798740
--- a/metadata/md5-cache/dev-python/python-nss-0.8-r1
+++ b/metadata/md5-cache/dev-python/python-nss-0.8-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-libs/nss dev-libs/nspr doc? ( dev-python/docutils dev-python/epydoc ) dev-lang/python
-DESCRIPTION=Python bindings for Network Security Services (NSS)
-EAPI=3
-HOMEPAGE=http://www.mozilla.org/projects/security/pki/python-nss/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2 )
-RDEPEND=dev-libs/nss dev-libs/nspr doc? ( dev-python/docutils dev-python/epydoc ) dev-lang/python
-SLOT=0
-SRC_URI=http://rion-overlay.googlecode.com/files/python-nss-0.8.tar.lzma
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	f99a767f569b1f0731b3a1edd17c1d11	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=fb5c7d3da9080090347e11f804a9441a
--- a/metadata/md5-cache/dev-python/python-oembed-0.2.1
+++ b/metadata/md5-cache/dev-python/python-oembed-0.2.1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=dev-python/setuptools =dev-lang/python-2* test? ( dev-python/nose )
-DESCRIPTION=A Python library that implements an OEmbed consumer
-EAPI=4
-HOMEPAGE=http://pypi.python.org/pypi/python-oembed
-IUSE=test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools =dev-lang/python-2*
-SLOT=0
-SRC_URI=mirror://pypi/p/python-oembed/python-oembed-0.2.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=c657afb24f2b7df212d721e53ee0692b
--- a/metadata/md5-cache/dev-python/python-oembed-0.2.1-r1
+++ b/metadata/md5-cache/dev-python/python-oembed-0.2.1-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A Python library that implements an OEmbed consumer
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/python-oembed
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-oembed/python-oembed-0.2.1.tar.gz
+_eclasses_=distutils-r1	6d697abf6c0c1d32af2c025a6b75e775	eutils	f99a767f569b1f0731b3a1edd17c1d11	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	5e9a53457b774d41e731613823baeb37	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=aa737a812330712b9c5ad14f97ad2c6d
--- a/metadata/md5-cache/dev-python/python-prctl-1.3.1
+++ b/metadata/md5-cache/dev-python/python-prctl-1.3.1
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sys-libs/libcap || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Control process attributes through prctl
-EAPI=3
-HOMEPAGE=http://github.com/seveas/python-prctl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/libcap || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://github.com/seveas/python-prctl/tarball/v1.3.1 -> python-prctl-1.3.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=77bad90c01e60d4c28ffd6bf02e066f1
--- a/metadata/md5-cache/dev-python/python-prctl-1.4.0
+++ b/metadata/md5-cache/dev-python/python-prctl-1.4.0
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sys-libs/libcap || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Control process attributes through prctl
-EAPI=3
-HOMEPAGE=http://github.com/seveas/python-prctl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/libcap || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://github.com/seveas/python-prctl/tarball/v1.4.0 -> python-prctl-1.4.0.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=d99f39a6641e1b30a88e46ea7e9dafb0
--- a/metadata/md5-cache/dev-python/python-prctl-1.5.0
+++ b/metadata/md5-cache/dev-python/python-prctl-1.5.0
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=sys-libs/libcap || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Control process attributes through prctl
-EAPI=3
-HOMEPAGE=http://github.com/seveas/python-prctl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/libcap || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://github.com/seveas/python-prctl/tarball/v1.5.0 -> python-prctl-1.5.0.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=aa45e572c1725470c942e048f1187458
--- a/metadata/md5-cache/dev-python/python-prctl-1.5.0-r1
+++ b/metadata/md5-cache/dev-python/python-prctl-1.5.0-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-libs/libcap python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Control process attributes through prctl
+EAPI=5
+HOMEPAGE=http://github.com/seveas/python-prctl
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/libcap python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://github.com/seveas/python-prctl/tarball/v1.5.0 -> python-prctl-1.5.0.tar.gz
+_eclasses_=distutils-r1	6d697abf6c0c1d32af2c025a6b75e775	eutils	f99a767f569b1f0731b3a1edd17c1d11	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	5e9a53457b774d41e731613823baeb37	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=845ffe9426949fbf4315d9f564918ba0
--- a/metadata/md5-cache/dev-python/python-scw-0.4.7
+++ b/metadata/md5-cache/dev-python/python-scw-0.4.7
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pygtk-2.4 >=x11-libs/scw-0.4.0 =dev-lang/python-2*
-DESCRIPTION=Python binding for Scw
-EAPI=3
-HOMEPAGE=http://scwwidgets.googlepages.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-python/pygtk-2.4 >=x11-libs/scw-0.4.0 =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://scwwidgets.googlepages.com/python-scw-0.4.7.tar.gz
-_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=1dea39d7d60f02b8055be2c62b2d6841
--- a/metadata/md5-cache/dev-python/python-scw-0.4.7-r1
+++ b/metadata/md5-cache/dev-python/python-scw-0.4.7-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=-
+DEPEND=>=dev-python/pygtk-2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/scw-0.4.0
+DESCRIPTION=Python binding for Scw
+EAPI=5
+HOMEPAGE=http://scwwidgets.googlepages.com/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-python/pygtk-2.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/scw-0.4.0
+SLOT=0
+SRC_URI=http://scwwidgets.googlepages.com/python-scw-0.4.7.tar.gz
+_eclasses_=eutils	f99a767f569b1f0731b3a1edd17c1d11	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-r1	5e9a53457b774d41e731613823baeb37	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=b4c4a3065e7b5f582cd398755f32459a
--- a/metadata/md5-cache/dev-python/python-urljr-1.0.1
+++ b/metadata/md5-cache/dev-python/python-urljr-1.0.1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=curl? ( >=dev-python/pycurl-7.15.1 ) test? ( >=dev-python/pycurl-7.15.1 ) =dev-lang/python-2*
-DESCRIPTION=JanRain's URL Utilities
-EAPI=3
-HOMEPAGE=http://www.openidenabled.com/openid/libraries/python/
-IUSE=curl test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=curl? ( >=dev-python/pycurl-7.15.1 ) =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.openidenabled.com/resources/downloads/python-openid/python-urljr-1.0.1.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	f99a767f569b1f0731b3a1edd17c1d11	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=5397bd554133bda42812f3b02ff5d4f6
--- a/metadata/md5-cache/dev-python/python-urljr-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/python-urljr-1.0.1-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=JanRain's URL Utilities
+EAPI=5
+HOMEPAGE=http://www.openidenabled.com/openid/libraries/python/
+IUSE=curl test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=curl? ( >=dev-python/pycurl-7.15.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=test? ( curl ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://www.openidenabled.com/resources/downloads/python-openid/python-urljr-1.0.1.tar.gz
+_eclasses_=distutils-r1	6d697abf6c0c1d32af2c025a6b75e775	eutils	f99a767f569b1f0731b3a1edd17c1d11	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	5e9a53457b774d41e731613823baeb37	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=c8634e7d1853aa2b0118acc9074cac0b
--- a/metadata/md5-cache/dev-python/python-yadis-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/python-yadis-1.1.0-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=dev-python/elementtree dev-python/python-urljr test? ( >=dev-python/pyflakes-0.2.1 ) =dev-lang/python-2* =dev-lang/python-2*[xml(+)]
-DESCRIPTION=Yadis service discovery library
-EAPI=4
-HOMEPAGE=http://www.openidenabled.com/yadis/libraries/python/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-python/elementtree dev-python/python-urljr =dev-lang/python-2* =dev-lang/python-2*[xml(+)]
-SLOT=0
-SRC_URI=http://www.openidenabled.com/resources/downloads/python-openid/python-yadis-1.1.0.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	eutils	f99a767f569b1f0731b3a1edd17c1d11	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	cd022f89fef846d083fc994b9e3d8c04	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=9b7c0191ef045d684d6efb06ee37c2bb
--- a/metadata/md5-cache/dev-python/python-yadis-1.1.0-r2
+++ b/metadata/md5-cache/dev-python/python-yadis-1.1.0-r2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/elementtree[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-urljr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/pyflakes-0.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Yadis service discovery library
+EAPI=5
+HOMEPAGE=http://www.openidenabled.com/yadis/libraries/python/
+IUSE=test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/elementtree[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-urljr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://www.openidenabled.com/resources/downloads/python-openid/python-yadis-1.1.0.tar.gz
+_eclasses_=distutils-r1	6d697abf6c0c1d32af2c025a6b75e775	eutils	f99a767f569b1f0731b3a1edd17c1d11	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	5e9a53457b774d41e731613823baeb37	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=649976687e648fd5d45c764e3ce2c108
--- a/metadata/md5-cache/dev-python/txsocksx-1.13.0.3
+++ b/metadata/md5-cache/dev-python/txsocksx-1.13.0.3
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/vcversioner[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Twisted client endpoints for SOCKS{4,4a,5}
+EAPI=5
+HOMEPAGE=https://github.com/habnabit/txsocksx
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/parsley-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-),crypt] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/t/txsocksx/txsocksx-1.13.0.3.tar.gz
+_eclasses_=distutils-r1	6d697abf6c0c1d32af2c025a6b75e775	eutils	f99a767f569b1f0731b3a1edd17c1d11	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	5e9a53457b774d41e731613823baeb37	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=1653e800223a16a9e50f42b6b52c6a13
--- a/metadata/md5-cache/dev-python/vcversioner-2.14.0.0
+++ b/metadata/md5-cache/dev-python/vcversioner-2.14.0.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Use version control tags to discover version numbers
+EAPI=5
+HOMEPAGE=https://github.com/habnabit/vcversioner
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=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_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/v/vcversioner/vcversioner-2.14.0.0.tar.gz
+_eclasses_=distutils-r1	6d697abf6c0c1d32af2c025a6b75e775	eutils	f99a767f569b1f0731b3a1edd17c1d11	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	5e9a53457b774d41e731613823baeb37	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=d7d4f8cde040cc07d12c609fa54910c8
--- a/metadata/md5-cache/dev-ruby/execjs-2.0.2-r1
+++ b/metadata/md5-cache/dev-ruby/execjs-2.0.2-r1
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=ExecJS lets you run JavaScript code from Ruby
-EAPI=5
-HOMEPAGE=https://github.com/sstephenson/execjs
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=https://github.com/sstephenson/execjs/archive/v2.0.2.tar.gz -> execjs-2.0.2.tar.gz
-_eclasses_=eutils	f99a767f569b1f0731b3a1edd17c1d11	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a0f0fa8e5c6839a1d1360f790222f442
--- a/metadata/md5-cache/dev-ruby/execjs-2.2.1
+++ b/metadata/md5-cache/dev-ruby/execjs-2.2.1
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=ExecJS lets you run JavaScript code from Ruby
-EAPI=5
-HOMEPAGE=https://github.com/sstephenson/execjs
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=|| ( net-libs/nodejs ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=https://github.com/sstephenson/execjs/archive/v2.2.1.tar.gz -> execjs-2.2.1.tar.gz
-_eclasses_=eutils	f99a767f569b1f0731b3a1edd17c1d11	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6da56c6e56e0c507f1765d5f5657d5b1
--- a/metadata/md5-cache/dev-ruby/jquery-rails-4.0.3
+++ b/metadata/md5-cache/dev-ruby/jquery-rails-4.0.3
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby19] >=dev-ruby/thor-0.14[ruby_targets_ruby19] dev-ruby/rails-dom-testing:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby20] >=dev-ruby/thor-0.14[ruby_targets_ruby20] dev-ruby/rails-dom-testing:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] dev-ruby/rails-dom-testing:1[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=jQuery! For Rails! So great
+EAPI=5
+HOMEPAGE=http://www.rubyonrails.org
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby19] >=dev-ruby/thor-0.14[ruby_targets_ruby19] dev-ruby/rails-dom-testing:1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby20] >=dev-ruby/thor-0.14[ruby_targets_ruby20] dev-ruby/rails-dom-testing:1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby21] >=dev-ruby/thor-0.14[ruby_targets_ruby21] dev-ruby/rails-dom-testing:1[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=4
+SRC_URI=mirror://rubygems/jquery-rails-4.0.3.gem
+_eclasses_=eutils	f99a767f569b1f0731b3a1edd17c1d11	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	c79a9fd7644eefe8009be02a82648e1f	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=89705ca14a85e8a73b57df23c1bcc083
--- a/metadata/md5-cache/dev-tex/latexmk-441
+++ b/metadata/md5-cache/dev-tex/latexmk-441
@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=virtual/latex-base dev-lang/perl app-arch/unzip
+DESCRIPTION=Perl script for automatically building LaTeX documents
+EAPI=5
+HOMEPAGE=http://www.phys.psu.edu/~collins/software/latexmk/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=virtual/latex-base dev-lang/perl
+SLOT=0
+SRC_URI=http://www.phys.psu.edu/~collins/software/latexmk/latexmk-441.zip
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=1411377bb60960bf9189e8dcd4ea4b26
--- a/metadata/md5-cache/games-board/cockatrice-20120702
+++ b/metadata/md5-cache/games-board/cockatrice-20120702
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=dev-libs/libgcrypt:0 dev-libs/protobuf dev-qt/qtcore:4 dev-qt/qtsql:4 !dedicated? ( dev-qt/qtmultimedia:4 dev-qt/qtsvg:4 dev-qt/qtgui:4 ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
 DESCRIPTION=An open-source multiplatform software for playing card games over a network
-EAPI=3
+EAPI=5
 HOMEPAGE=http://cockatrice.de/
 IUSE=dedicated server
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libgcrypt:0 dev-libs/protobuf dev-qt/qtcore:4 dev-qt/qtsql:4 !dedicated? ( dev-qt/qtmultimedia:4 dev-qt/qtsvg:4 dev-qt/qtgui:4 ) games-misc/games-envd
+RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=http://cockatrice.de/files/cockatrice_source_20120702.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-utils	0e29eadbd656185bce30d2449ab48035	eutils	f99a767f569b1f0731b3a1edd17c1d11	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=314f52035c55c79525d6237c968981c7
+_md5_=f705bf6aeb21651dbc428d6e4cb52440
--- a/metadata/md5-cache/games-board/gnuchess-6.2.1
+++ b/metadata/md5-cache/games-board/gnuchess-6.2.1
@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Console based chess interface
+EAPI=5
+HOMEPAGE=http://www.gnu.org/software/chess/chess.html
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://gnu/chess/gnuchess-6.2.1.tar.gz
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	f99a767f569b1f0731b3a1edd17c1d11	flag-o-matic	c263990f1b677b0f0be0a3299f179762	games	bc8839608d26ccd57ca4f2f01c67460f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=6682e8295c945758df595a11172176b3
--- a/metadata/md5-cache/media-gfx/pstoedit-3.50
+++ b/metadata/md5-cache/media-gfx/pstoedit-3.50
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libpng media-libs/gd app-text/ghostscript-gpl emf? ( >=media-libs/libemf-1.0.3 ) imagemagick? ( media-gfx/imagemagick[cxx] ) plotutils? ( media-libs/plotutils ) 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.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Translate PostScript and PDF graphics into other vector formats
-EAPI=2
-HOMEPAGE=http://www.pstoedit.net/pstoedit
-IUSE=emf imagemagick plotutils
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng media-libs/gd app-text/ghostscript-gpl emf? ( >=media-libs/libemf-1.0.3 ) imagemagick? ( media-gfx/imagemagick[cxx] ) plotutils? ( media-libs/plotutils )
-SLOT=0
-SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	f99a767f569b1f0731b3a1edd17c1d11	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=e7158dd80b5e36824ddbff38c2c7ed7f
--- a/metadata/md5-cache/media-gfx/pstoedit-3.50-r1
+++ b/metadata/md5-cache/media-gfx/pstoedit-3.50-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libpng-1.4.3 >=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils ) 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.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Translate PostScript and PDF graphics into other vector formats
-EAPI=2
-HOMEPAGE=http://sourceforge.net/projects/pstoedit/
-IUSE=emf flash imagemagick plotutils
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libpng-1.4.3 >=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils )
-SLOT=0
-SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	f99a767f569b1f0731b3a1edd17c1d11	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=b9bf0403dc84ef9f40be5d5d43d14d66
--- a/metadata/md5-cache/media-gfx/pstoedit-3.60
+++ b/metadata/md5-cache/media-gfx/pstoedit-3.60
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libpng-1.4.3 >=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils ) 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.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Translate PostScript and PDF graphics into other vector formats
-EAPI=4
-HOMEPAGE=http://sourceforge.net/projects/pstoedit/
-IUSE=emf flash imagemagick plotutils
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libpng-1.4.3 >=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils )
-SLOT=0
-SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.60.tar.gz
-_eclasses_=autotools	c118b9a8e93bfef124f2d7a2fe56a95e	eutils	f99a767f569b1f0731b3a1edd17c1d11	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=a4984d102a0f6d55bd472ca8568bad0c
--- a/metadata/md5-cache/media-video/flumotion-0.10.1
+++ b/metadata/md5-cache/media-video/flumotion-0.10.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-python/gst-python:0.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/kiwi[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-theora:0.10 media-plugins/gst-plugins-vorbis:0.10 dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) test? ( dev-python/icalendar[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pychecker[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/twisted-conch[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Flumotion Streaming server
+EAPI=5
+HOMEPAGE=http://www.flumotion.net/
+IUSE=doc test python_targets_python2_7 test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/gst-python:0.10[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/kiwi[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-theora:0.10 media-plugins/gst-plugins-vorbis:0.10
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://www.flumotion.net/src/flumotion/flumotion-0.10.1.tar.bz2
+_eclasses_=eutils	f99a767f569b1f0731b3a1edd17c1d11	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	ed2ee20dc74a34be60f5b1b500e92a5b	python-utils-r1	7d5f4ad9ba85664d8c5f56041a70f4c3	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=473f696a926ba382cf1c72f80eb26a92
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST txsocksx-1.13.0.3.tar.gz 19147 SHA256 df1a9e7062c7e3693c39953705b75e0feb7b8746a05135ffb2b8cd98708c9c43 SHA512 86621ea27eb0a8f2043f0ea0746a0716ca5e03d0721adb9e733d8398f105b3a17c37057d69cb3bb929e9348a06bc4064f8fb1149dbb0a06e9fd0f07eab5898b2 WHIRLPOOL 11d87111c06665b3c9330fb548fd9b936d2d3a5c82d305872ffc482011b38ec10624aac94603af89339949e29b5023dda8aaba4596186f916b9062022c70e662`
				`@ -0,0 +1 @@`
				`DIST vcversioner-2.14.0.0.tar.gz 9015 SHA256 acd43686e92e6c8bbeb4f2eef54408567a7adea9692fa72d591eec5357c03b86 SHA512 0d474910f9d0f0dd0c0d0b824bcdf5da7bbb5d2b55691f18107bb0b8a237213a83d8f51f719d4761e1dae9db70e84ef8c264c388ec1995ed0a55a838575e377e WHIRLPOOL b146f1d008b635fc337c2256a7bb9bd0534ecd3a335c349a0518e36ee21e807de1b43ea52dd6a581fa4de64ad6cdb2dca53646051a93afe752a28d4a25bcbec8`