Sync with portage [Mon Feb 6 12:32:48 MSK 2017].

2017-02-06 12:32:48 +03:00 · 2017-02-06 12:32:48 +03:00 · d90640c4bb
commit d90640c4bb
parent ebb7e1f5aa
366 changed files with 2772 additions and 4067 deletions
--- a/app-arch/createrepo/createrepo-0.10.4.ebuild
+++ b/app-arch/createrepo/createrepo-0.10.4.ebuild
@ -1,18 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='xml'

-inherit python-single-r1 bash-completion-r1 eutils
+inherit python-single-r1 bash-completion-r1

 DESCRIPTION="Creates a common rpm-metadata repository"
 HOMEPAGE="http://createrepo.baseurl.org/"
-SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz
-	https://dev.gentoo.org/~pacho/maintainer-needed/${PN}-0.9.9-head.patch.bz2"
+SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
@ -28,28 +27,24 @@ RDEPEND=">=dev-python/urlgrabber-2.9.0[${PYTHON_USEDEP}]
 	${PYTHON_DEPS}"
 DEPEND="${PYTHON_DEPS}"

-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.3-ten-changelog-limit.patch"
+)

 pkg_setup() {
 	python-single-r1_pkg_setup
 	python_export PYTHON_SITEDIR
 }

-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.10.3-ten-changelog-limit.patch"
-}
-
-src_compile() {
-	:
-}
-
 src_install() {
 	emake install \
 		DESTDIR="${ED}" \
 		PYTHON=true \
 		compdir="$(get_bashcompdir)" \
 		PKGDIR="${PYTHON_SITEDIR}/${PN}"
-	dodoc ChangeLog README
+	einstalldocs
 	python_fix_shebang "${ED}"
 	python_optimize
 	python_optimize "${ED}/usr/share/createrepo"
--- a/app-arch/createrepo/files/createrepo-0.10.3-ten-changelog-limit.patch
+++ b/app-arch/createrepo/files/createrepo-0.10.3-ten-changelog-limit.patch
@ -1,5 +1,5 @@
--- createrepo/__init__.py~	2011-01-26 12:14:30.000000000 -0500
-+++ createrepo/__init__.py	2011-01-26 12:34:17.291441719 -0500
+--- a/createrepo/__init__.py	2011-01-26 12:14:30.000000000 -0500
+++ b/createrepo/__init__.py	2011-01-26 12:34:17.291441719 -0500
@@ -96,7 +96,7 @@
         self.mdtimestamp = 0
         self.directory = None
--- a/app-arch/deltarpm/deltarpm-3.6.ebuild
+++ b/app-arch/deltarpm/deltarpm-3.6.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 PYTHON_COMPAT=( python2_7 )

@ -34,6 +34,9 @@ pkg_setup() {
 		prefix=/usr
 		mandir=/usr/share/man
 		PYTHONS=$(use python && echo python)
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		CC="$(tc-getCC)"
 	)
 	use system-zlib && MAKE_EXTRA_FLAGS+=(
 		zlibbundled=
@ -43,10 +46,10 @@ pkg_setup() {
 }

 src_compile() {
-	emake "${MAKE_EXTRA_FLAGS[@]}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" all $(use python && echo python)
+	emake "${MAKE_EXTRA_FLAGS[@]}" all $(use python && echo python)
 }

 src_install() {
-	emake "${MAKE_EXTRA_FLAGS[@]}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" DESTDIR="${ED}" install
+	emake "${MAKE_EXTRA_FLAGS[@]}" DESTDIR="${ED}" install
 	python_optimize
 }
--- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN/-utils}-${PV/_}"
 	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/${MY_P}
 	EXTRA_DEPEND=
 fi
--- a/app-backup/rdup/Manifest
+++ b/app-backup/rdup/Manifest
@ -0,0 +1 @@
+DIST rdup-1.1.15.tar.gz 333646 SHA256 787b8c37e88be810a710210a9d9f6966b544b1389a738aadba3903c71e0c29cb SHA512 e377ec29e0dacae306ee58c935c9738f32d177e1c2575e4fa3618d2753d248f2898633dde46da81410271205458ccf0d3d885e3eebc5f1948afc5cd9e99ce7c3 WHIRLPOOL a82eac7a80ab02436343687f62bbab643027854771e2031d577abc71495aa7e63c0185580466527704906035e023372809088b8a08686ce438211ddffb7b5521
--- a/app-backup/rdup/metadata.xml
+++ b/app-backup/rdup/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">miekg/rdup</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/app-backup/rdup/rdup-1.1.15.ebuild
+++ b/app-backup/rdup/rdup-1.1.15.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+
+inherit eutils autotools
+
+DESCRIPTION="Generate a file list suitable for full or incremental backups"
+HOMEPAGE="https://github.com/miekg/rdup/releases"
+SRC_URI="https://github.com/miekg/rdup/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+
+RDEPEND="
+	app-arch/libarchive
+	dev-libs/glib:2
+	dev-libs/libpcre
+	dev-libs/nettle"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )"
+
+src_prepare() {
+	default_src_prepare
+	sed -i -e 's/ -Werror//' GNUmakefile.in || die "Failed to fix Makefile"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_test() {
+	if use debug; then
+		ewarn "Test phase skipped, as it is known to fail with USE=\"debug\"."
+	else
+		default_src_test
+	fi
+}
--- a/app-emacs/python-mode/Manifest
+++ b/app-emacs/python-mode/Manifest
@ -1,5 +1,3 @@
-DIST python-mode-5.2.0.tgz 73566 SHA256 84ee977fb7c639bc96cd4e8db0145c7a182489456e4d95a71c3612258b5013ac SHA512 cc31962bd99f76d5a250418ce53a88d6b06282810389d737c383637fba867716a8845a72390c0f87213963647315af34de857e5beb674b921461bf02212b62ca WHIRLPOOL 38e2097f65737bcf0e208bd50b2e34b8d2478160344806b8fcbddebb74f7622ffda97014be551515b996235900a7973fae912930853b1fb362dbb3d763de449d
-DIST python-mode.el-6.0.12.tar.gz 297981 SHA256 85a1ae9b8514330613887ef2cd305cef22c8338192942c09a82c6feab211cd39 SHA512 1b9c86e994d3e607a13cbfe743f5a7b527c00def756ad9a21d04681a755707580919517e5957cb16e64cf31e9204bc56e490e8d11c00d016590d04061a9ecb42 WHIRLPOOL 385296fd06b0c055e25d113f43a5bbf0a0cbc7280234508af7d334d5ae992551f1e4d8dec02eafc4c080650b071b4c36cf4bcc2e2c7ab75b249dacf493b7d3d9
-DIST python-mode.el-6.1.1.tar.gz 313595 SHA256 3eea9722d8407024dcad38b26029992333b357009c9f0d755e2ef7ac06c55a85 SHA512 66226db207421cd33812505e74b986b279534876386fa1b2bc90d58fb35cacfb9fd2790a3dd760becd2797a390d0960035f2ee0d5636c83daf6d0c699d122609 WHIRLPOOL a020e7ce9ceccb8e8d34e88e45bcee668462d286463a6b87ce26c14108c6c66b862bcd78ea7a962ff3f6644a6d4c8ffa06e290eff2a8fb828a21d5f45b44f441
 DIST python-mode.el-6.1.2.tar.gz 330107 SHA256 ae1223bba504c6db08b7a4fc5ef2e148ad861048b4146f5966ddb4ce39e244e3 SHA512 967ad7fdb3503c2dc37df79ba9f45ed7627a5b8e287cae9e8963a259a6568282c16d509e873c7d8b97e4acaafbd71dcec00e5ac71ed695b20ecddca5da20ba96 WHIRLPOOL 05a9f6f60fa0dca16695c1b9fd43fe5c9d9304cc564292412df12d1894f971c119b0d4a57c297684968e58e0bb4a5e9f4472700d7d9fff461f20294c4c5faabe
 DIST python-mode.el-6.2.0.tar.gz 393046 SHA256 3238df550a4dec1523efbbba6090e3bb6cb9d4d31973b8a9a4852d6640a0e8a9 SHA512 0280649fa646e071a756a657be91dc3b4ab0a227105eeba7601b98fbac1916af0607add20c58c74434eb2fa139a996736e963783b1500ca6f3656a90deaa427e WHIRLPOOL ed829a8f3c1ca1f1f06ef7aa562fa74bb31f202b067a309c341f257aa609f15d767473fdbd6279776422a0660bf339aee4583ecae1df7439e41d61ad4764fcf0
+DIST python-mode.el-6.2.3.tar.gz 314461 SHA256 40098432ca1b3e3dcd8fa0a7d23bd8f2e57471587911d448b9c5cde0569d3335 SHA512 4aeb33d4054d582cd2a3f4834472c7d0cb3fe5e12e10f5117dcbcd90ec2ca490964c774918c83697f283c68e57766c3c67d3853ddbaa3408777fdafc7f2674f2 WHIRLPOOL ec36db8a39ee8e5722a05ddc333ea8bc36479cdae623ea821cfbc0f2b89d628f96a5bc8b66044d4a183eda21c18a157e78ba0f8899d11405e558ac3b21f09437
--- a/app-emacs/python-mode/python-mode-5.2.0.ebuild
+++ b/app-emacs/python-mode/python-mode-5.2.0.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit elisp
-
-DESCRIPTION="An Emacs major mode for editing Python source"
-HOMEPAGE="https://launchpad.net/python-mode"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tgz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-# doctest-mode has its own package, pycomplete is not yet ready for production
-ELISP_REMOVE="doctest-mode.el pycomplete.el"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="NEWS"
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "Note that doctest support is split out to app-emacs/doctest-mode."
-}
--- a/app-emacs/python-mode/python-mode-6.0.12.ebuild
+++ b/app-emacs/python-mode/python-mode-6.0.12.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit elisp
-
-MY_P="${PN}.el-${PV}"
-DESCRIPTION="An Emacs major mode for editing Python source"
-HOMEPAGE="https://launchpad.net/python-mode"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="NEWS README"
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "Note that doctest and pymacs are in their own packages,"
-	elog "app-emacs/doctest-mode and app-emacs/pymacs, respectively."
-}
--- a/app-emacs/python-mode/python-mode-6.2.3.ebuild
+++ b/app-emacs/python-mode/python-mode-6.2.3.ebuild
@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

-inherit readme.gentoo elisp
+inherit elisp readme.gentoo-r1

 MY_P="${PN}.el-${PV}"
 DESCRIPTION="An Emacs major mode for editing Python source"
@ -13,10 +13,10 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
-DOCS="NEWS README"
+DOCS="NEWS README_DEVEL.org"
 DOC_CONTENTS="Note that doctest and pymacs are in their own packages,
 	app-emacs/doctest-mode and app-emacs/pymacs, respectively."
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@ -1 +1,2 @@
 DIST fish-2.4.0.tar.gz 3455874 SHA256 06bbb2323360439c4044da762d114ec1aa1aba265cec71c0543e6a0095c9efc5 SHA512 b27a2291c284fda7a12b3cd5dcba8dfcbf2738f50de40d9aac1500afa3bd98be04b4f67d7e6d3bb2f808c11a8c2dd6b1b5cc2dfe3e8e0e7d1bc88f8d8994d57b WHIRLPOOL abb9c31237a33553b25920fe3284f4ca90941aed2b8f1ec4b69fdb4231f7b2585f0292bc647ffe3acf88f6b01ac61931f615fa9a56ede35a8182e3a69aa11861
+DIST fish-2.5.0.tar.gz 3496831 SHA256 f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5 SHA512 6d94bb70a5f1cefaada4d10ac845992f87c9bfc8c253f38bdfcc3a573a35503d825c9487d2ce8ef3819713594ab7b54ebf6c89fe3362c7010c63dbefc99b424d WHIRLPOOL a16d5f75e95573f2b766527fb124d99083a7ab84522a4826cd5b3aaf3a73ae6728f30defbd0598698b496f279f686eddcb4e81779767e89888037abe0b908849
--- a/app-shells/fish/files/profile-env.fish
+++ b/app-shells/fish/files/profile-env.fish
@ -1,15 +1,23 @@
+# only apply env for login shells, as we'd like fish to
+# inherit existing shell environment without overriding it
+# using csh env, as it's cleaner and less too parse/strip
+
+if status --is-login
 	# since fish supports export via upstream provided function
 	# we can source directly, only ommiting $PATH and comments.
-grep -Ev "^(#|export (PATH|ROOTPATH)=)" /etc/profile.env | source
+	string match -r -v '^(#|setenv (PATH|ROOTPATH) )' < /etc/csh.env | source

-# strip unneded stuff from bash export lines
+	# strip unneded stuff from setenv lines
 	# apply paths and cleanup
 	if [ "$EUID" = "0" ] ; or [ "$USER" = "root" ]
-	set _rootpath (grep -o " ROOTPATH='.*'" /etc/profile.env | sed "s@.*'\(.*\)'@\1@;s@:@\n@g")
-	set -xg PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $_rootpath
-	set -e _rootpath
+		string match -r '^setenv ROOTPATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source
+		set -gx PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $ROOTPATH
+		set -e ROOTPATH
 	else
-	set _userpath (grep -o " PATH='.*'" /etc/profile.env | sed "s@.*'\(.*\)'@\1@;s@:@\n@g")
-	set -xg PATH /usr/local/bin /usr/bin /bin $_userpath
-	set -e _userpath
+		string match -r '^setenv PATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source
+		set -gx PATH /usr/local/bin /usr/bin /bin $PATH
+	end
+
+	# re-prepend $fish_user_paths
+	__fish_reconstruct_path
 end
--- a/app-shells/fish/fish-2.4.0-r1.ebuild
+++ b/app-shells/fish/fish-2.4.0-r1.ebuild
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="emacs latex linguas_ja nls static-libs userland_BSD userland_GNU vanilla"

 RESTRICT=test
--- a/app-text/jmupdf/Manifest
+++ b/app-text/jmupdf/Manifest
@ -1,2 +1 @@
-DIST 2012-01-24-src-jmupdf-0.3.0.7z 4171032 SHA256 e2687e779de545c3c0692e3c19cf5ceb70fa1b04ce0dba2e3f5d0956113b817f SHA512 c4c296998f4c837accc5219e617176748f141fef42eb49f1a89638f915331bae0d87684d2e02b590691dae6684095083e329734ecdd578edd6d15ba9981aab5c WHIRLPOOL c6dd8da8452e749c8126ac488ed9ac527f898dcec9c3694a5be529d90a08d08f1362294f567a84075b9595049607619621cbf3b1055f4de7d64e76703e944aac
 DIST 2012-02-23-source-jmupdf-0.4.1.7z 4212084 SHA256 cb7311021dce6e1e7425b088f4d60c12f43c0e26eff794b057d78e105cdbbbc0 SHA512 f16190d02f9c3f6fe9aa2acd7bd270b6e807b61e926cd1bc4e17628f2d62a45d0f024c2748e4eb0a20e7da55895289f6c74685cb371e101a0901235a48eb1f42 WHIRLPOOL e8e93d303e925d1c1313d9951b3306d01abcb9ce1bca50fb40054e807c67f0347ee7c2375de11fde4f957f56fdc98e70620698fb3a02ff8a9f651fb6a21ffe86
--- a/app-text/jmupdf/jmupdf-0.3.0.ebuild
+++ b/app-text/jmupdf/jmupdf-0.3.0.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-2 java-ant-2 multilib
-EANT_BUILD_TARGET=${PN}
-
-DESCRIPTION="Java library for rendering PDF, XPS and CBZ (Comic Book) documents"
-HOMEPAGE="https://code.google.com/p/jmupdf/"
-SRC_URI="https://jmupdf.googlecode.com/files/2012-01-24-src-${P}.7z"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="system-mupdf"
-
-REQUIRED_USE="!system-mupdf"
-
-RDEPEND="system-mupdf? ( >=app-text/mupdf-1.2 )
-	virtual/jdk:1.7"
-DEPEND="${RDEPEND}
-	app-arch/p7zip
-	media-libs/libbmp"
-
-S=${WORKDIR}/${PN}/${PN}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.4.1-build-xml.patch
-
-	edos2unix ../mupdf/jni/*
-
-	sed -e "/^JVM_INCLUDES/s:=.*:= $(java-pkg_get-jni-cflags):" \
-		-i ../mupdf/MakeJNI2 || die
-	sed -e "s:-pipe -O2::" \
-		-i ../mupdf/Makerules || die
-
-	rm -r ../mupdf/thirdparty || die
-	if use system-mupdf ; then
-		for i in android apps cbz cmaps debian draw fitz fonts ios pdf scripts viewer win32 xps ; do
-			einfo remove mupdf/${i}
-			rm -r ../mupdf/${i} || die
-		done
-	fi
-}
-
-src_compile() {
-	local system-fitz=$(usex system-mupdf "FITZ_LIB=\"${EROOT}usr/$(get_libdir)/libfitz.so\"" "" )
-	emake -C ../mupdf \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		SYS_FREETYPE_INC="$($(tc-getPKG_CONFIG) --cflags freetype2)" \
-		"${system-fitz}" \
-		JNI_DLL=build/libjmupdf.so \
-		JNI_CMD="-shared -Wl,-soname -Wl,lib${PN}.so" \
-		build/libjmupdf.so
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	dolib.so ../mupdf/build/lib${PN}.so
-
-	java-pkg_dojar build/${PN}{,-viewer}.jar
-
-	dodoc Readme
-}
--- a/app-text/jmupdf/jmupdf-0.4.1.ebuild
+++ b/app-text/jmupdf/jmupdf-0.4.1.ebuild
@ -1,70 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-2 java-ant-2 multilib
-EANT_BUILD_TARGET=${PN}
-
-DESCRIPTION="Java library for rendering PDF, XPS and CBZ (Comic Book) documents"
-HOMEPAGE="https://code.google.com/p/jmupdf/"
-SRC_URI="https://jmupdf.googlecode.com/files/2012-02-23-source-${P}.7z"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="system-mupdf"
-
-REQUIRED_USE="!system-mupdf"
-
-RDEPEND="system-mupdf? ( >=app-text/mupdf-1.2 )
-	virtual/jdk:1.7"
-DEPEND="${RDEPEND}
-	app-arch/p7zip
-	media-libs/libbmp"
-
-S=${WORKDIR}/${PN}/${PN}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build-xml.patch \
-		"${FILESDIR}"/${P}-umlaut.patch
-
-	edos2unix ../mupdf/jni/*
-
-	sed -e "/^JVM_INCLUDES/s:=.*:= $(java-pkg_get-jni-cflags):" \
-		-i ../mupdf/MakeJNI2 || die
-	sed -e "s:-pipe -O2::" \
-		-i ../mupdf/Makerules || die
-
-	rm -r ../mupdf/thirdparty || die
-	if use system-mupdf ; then
-		for i in android apps cbz cmaps debian draw fitz fonts ios pdf scripts viewer win32 xps ; do
-			einfo remove mupdf/${i}
-			rm -r ../mupdf/${i} || die
-		done
-	fi
-}
-
-src_compile() {
-	local system-fitz=$(usex system-mupdf "FITZ_LIB=\"${EROOT}usr/$(get_libdir)/libfitz.so\"" "" )
-	emake -C ../mupdf \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		SYS_FREETYPE_INC="$($(tc-getPKG_CONFIG) --cflags freetype2)" \
-		"${system-fitz}" \
-		JNI_DLL=build/libjmupdf.so \
-		JNI_CMD="-shared -Wl,-soname -Wl,lib${PN}.so" \
-		build/libjmupdf.so
-
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	dolib.so ../mupdf/build/lib${PN}.so
-
-	java-pkg_dojar build/${PN}{,-viewer}.jar
-
-	dodoc Readme
-}
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@ -1,4 +1 @@
 DIST mupdf-1.10a-source.tar.gz 42264707 SHA256 aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836 SHA512 8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec WHIRLPOOL f3dc7fbddd2ee140226f17b444f184138dbff5d626033a295a7b335119fae5eb49eae680fb392068935610cdbed21267016af8afaa080fffba4f320b82209fbb
-DIST mupdf-1.5.tar.gz 7485699 SHA256 946393c7abf78e50fa9815f18a9e91f275a1a96a7ea14ae39b5237944070d1f5 SHA512 bfb79838eba629295ab164cf37e49edc8846689598fbad9312409535022a2e747bd062718b899909564c6cf5826fb46a2b4b579ced8c7a3896d6098e7e5ccf40 WHIRLPOOL ebcaf5f677984a78aecf9eeb72e7a79e6e2a6388db5024427d8bf55f31b3690844dd291ada3cd578a5bb9a370ea21cb2a044656c21a0ef47cdf7bfc42c842beb
-DIST mupdf-1.8.tar.gz 7706473 SHA256 d4e06644caad381d1dc88401dae12ee614809a7b95f6dcbf6fd086d5b594dcc4 SHA512 6adc30330c61d0bb8c9ee09488ef31701e9a7425cbac76e072eae9816c14a1190a1e2bd1e9155b6892d4198f7d8692661582cc1b82c7caab7b3ba4fddfcc7461 WHIRLPOOL 9fceca049cf5eaffd1520a0077c78bd8647d8e5b384eb2c1bc968a16349b46909b592cb8cbd5ee0546e798434afbece39a258e175ba02d0454b8edc35e179dd7
-DIST mupdf-1.9a.tar.gz 13282205 SHA256 2a7d6d73cd1f6de8f70792dff9936b84c54c127feecd485675e0d0c17debc98d SHA512 aa268484371597f2082bff61052b3f80e30b8d41018bf0477b8975e4520849090b75e6c4be6be15d6af9cea6d9315deb28f82c6afc8b6f3c5bfc3498eca91140 WHIRLPOOL b552e68d0412e723e23c645516e87d695e00af0c88b14ab1ebc6b65e374f525fab6df2b5f81fe72fc8a61a8a9f616712ef0d215a07327745d33fb0238509eac9
--- a/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
+++ b/app-text/mupdf/files/mupdf-1.3-CFLAGS.patch
@ -1,11 +0,0 @@
--- mupdf-1.3/Makerules
-+++ mupdf-1.3/Makerules
-@@ -6,7 +6,7 @@
- CFLAGS += -Wall
- 
- ifeq "$(build)" "debug"
-CFLAGS += -pipe -g -DDEBUG
-+CFLAGS += -DDEBUG
- else ifeq "$(build)" "profile"
- CFLAGS += -pipe -O2 -DNDEBUG -pg
- LDFLAGS += -pg
--- a/app-text/mupdf/files/mupdf-1.3-pkg-config.patch
+++ b/app-text/mupdf/files/mupdf-1.3-pkg-config.patch
@ -1,20 +0,0 @@
-no pkgconfig data for jbig2dec and jpeg
-http://bugs.ghostscript.com/show_bug.cgi?id=694301
-
-openjpeg-2
-http://bugs.ghostscript.com/show_bug.cgi?id=693518
-
--- mupdf-1.3/platform/debian/mupdf.pc
-+++ mupdf-1.3/platform/debian/mupdf.pc
-@@ -4,9 +4,9 @@
- includedir=${prefix}/include
- 
- Name: mupdf
- Description: Library for rendering PDF documents
-Requires.private: freetype2
-+Requires: freetype2 libopenjp2 libcrypto
- Version: 0.5.0
- Libs: -L${libdir} -lmupdf
-Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
-+Libs.private: -lmupdf-js-none
- Cflags: -I${includedir}
--- a/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch
+++ b/app-text/mupdf/files/mupdf-1.5-Makerules-openssl-curl.patch
@ -1,27 +0,0 @@
--- mupdf-1.5/Makerules
-+++ mupdf-1.5/Makerules
-@@ -58,17 +58,23 @@
- 
- HAVE_X11 ?= yes
- 
-+WANT_OPENSSL ?= yes
-+ifeq "$(WANT_OPENSSL)" "yes"
- ifeq "$(shell pkg-config --exists libcrypto && echo yes)" "yes"
- SYS_OPENSSL_CFLAGS = -DHAVE_OPENSSL $(shell pkg-config --cflags libcrypto)
- SYS_OPENSSL_LIBS = $(shell pkg-config --libs libcrypto)
- endif
-+endif
- 
-+WANT_CURL ?= yes
-+ifeq "$(WANT_CURL)" "yes"
- ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
- HAVE_CURL = yes
- SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl)
- SYS_CURL_LIBS = $(shell pkg-config --libs libcurl)
-endif
- SYS_CURL_DEPS = -lpthread -lrt
-+endif
-+endif
- 
- SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
- SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
--- a/app-text/mupdf/files/mupdf-1.5-format-security-error.patch
+++ b/app-text/mupdf/files/mupdf-1.5-format-security-error.patch
@ -1,22 +0,0 @@
-From: =?utf-8?q?=22Kan-Ru_Chen_=28=E9=99=B3=E4=BE=83=E5=A6=82=29=22?=
- <koster@debian.org>
-Date: Sat, 20 Sep 2014 13:12:16 +0800
-Subject: Fix -Werror=format-security error
-
---
- source/pdf/pdf-op-run.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/pdf/pdf-op-run.c b/source/pdf/pdf-op-run.c
-index 2bea94b..da881b2 100644
--- a/source/pdf/pdf-op-run.c
-+++ b/source/pdf/pdf-op-run.c
-@@ -1729,7 +1729,7 @@ run_xobject(pdf_csi *csi, void *state, pdf_obj *resources, pdf_xobject *xobj, co
- 
- 	/* Rethrow postponed errors */
- 	if (errmess[0])
-		fz_throw(ctx, FZ_ERROR_GENERIC, errmess);
-+		fz_throw(ctx, FZ_ERROR_GENERIC, "%s", errmess);
- }
- 
- static void pdf_run_BDC(pdf_csi *csi, void *state)
--- a/app-text/mupdf/files/mupdf-1.5-old-debian-files.patch
+++ b/app-text/mupdf/files/mupdf-1.5-old-debian-files.patch
@ -1,533 +0,0 @@
--- /dev/null
-+++ platform/debian/mupdf.desktop
-@@ -0,0 +1,15 @@
-+[Desktop Entry]
-+Name=MuPDF
-+GenericName=PDF file viewer
-+Exec=mupdf %f
-+TryExec=mupdf
-+Icon=mupdf
-+Terminal=false
-+Type=Application
-+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff
-+Categories=Viewer;Graphics;
-+Actions=View
-+
-+[Desktop Action View]
-+Name=View with mupdf
-+Exec=mupdf %f
--- /dev/null
-+++ platform/debian/mupdf.pc
-@@ -0,0 +1,12 @@
-+prefix=/usr
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: mupdf
-+Description: Library for rendering PDF documents
-+Requires.private: freetype2
-+Version: 0.5.0
-+Libs: -L${libdir} -lmupdf
-+Libs.private: -lopenjpeg -ljbig2dec -ljpeg -lz -lm
-+Cflags: -I${includedir}
--- /dev/null
-+++ platform/debian/mupdf.xpm
-@@ -0,0 +1,497 @@
-+/* XPM */
-+static char *mupdf[] = {
-+/* width height ncolors chars_per_pixel */
-+"48 48 442 2",
-+/* colors */
-+"   c #000000",
-+" . c #2E4558",
-+" X c #252121",
-+" o c #AFAFAF",
-+" O c #28313B",
-+" + c #231F1F",
-+" @ c #686666",
-+" # c #98BDD7",
-+" $ c #201B1C",
-+" % c #7CABCC",
-+" & c #4487B6",
-+" * c #DFDEDE",
-+" = c #4285B4",
-+" - c #615E5F",
-+" ; c #605E5E",
-+" : c #23262C",
-+" > c #D9D8D8",
-+" , c #F7FAFC",
-+" < c #D7D6D6",
-+" 1 c #BFD6E6",
-+" 2 c #6BA0C5",
-+" 3 c #232122",
-+" 4 c #555253",
-+" 5 c #CDCCCC",
-+" 6 c #E7EFF6",
-+" 7 c #4786B2",
-+" 8 c #CADDEA",
-+" 9 c #4085B5",
-+" 0 c #AECBDF",
-+" q c #CBCACA",
-+" w c #92B9D4",
-+" e c #365F7D",
-+" r c #5A95BE",
-+" t c #3E83B3",
-+" y c #304B60",
-+" u c #C7C6C6",
-+" i c #4D8EBB",
-+" p c #F1F6F9",
-+" a c #C1C0C0",
-+" s c #454243",
-+" d c #669CC3",
-+" f c #81AECD",
-+" g c #7A7777",
-+" h c #434041",
-+" j c #3E779F",
-+" k c #272E36",
-+" l c #413E3F",
-+" z c #3F3C3D",
-+" x c #5895BF",
-+" c c #3D3A3B",
-+" v c #C6DBE9",
-+" b c #B8B6B7",
-+" n c #4282B0",
-+" m c #FDFDFE",
-+" M c #B7B6B6",
-+" N c #8DB5D2",
-+" B c #242529",
-+" V c #B3B2B2",
-+" C c #222327",
-+" Z c #B0AEAF",
-+" A c #EDF4F8",
-+" S c #686565",
-+" D c #488AB9",
-+" F c #9ABED8",
-+" G c #7EACCD",
-+" H c #ECF2F7",
-+" J c #211C1C",
-+" K c #666363",
-+" L c #F1F1F2",
-+" P c #ABAAAA",
-+" I c #4588B6",
-+" U c #A9A8A8",
-+" Y c #2D2A2B",
-+" T c #A7A6A6",
-+" R c #615D5E",
-+" E c #2B2829",
-+" W c #8DB7D5",
-+" Q c #F9FBFD",
-+" ! c #DDE9F2",
-+" ~ c #F8FBFC",
-+" ^ c #DCE9F1",
-+" / c #A5C5DC",
-+" ( c #89B3D1",
-+" ) c #5C5959",
-+" _ c #A4C5DB",
-+" ` c #335A76",
-+" ' c #518FBB",
-+" ] c #E6E7E7",
-+" [ c #5A5757",
-+" { c #232021",
-+" } c #33536C",
-+" | c #98BED9",
-+".  c #E0E1E1",
-+".. c #7CACCE",
-+".X c #4488B8",
-+".o c #2D3F4F",
-+".O c #999898",
-+".+ c #4388B7",
-+".@ c #5E98C1",
-+".# c #CDCDCB",
-+".$ c #524F4F",
-+".% c #B0CCE0",
-+".& c #979696",
-+".* c #78A8CA",
-+".= c #5C96BF",
-+".- c #969495",
-+".; c #4084B4",
-+".: c #252930",
-+".> c #949293",
-+"., c #929091",
-+".< c #417FAB",
-+".1 c #4F8FBC",
-+".2 c #F3F7FA",
-+".3 c #D3D3D4",
-+".4 c #D7E5EF",
-+".5 c #222023",
-+".6 c #9FC1D9",
-+".7 c #679DC3",
-+".8 c #37678A",
-+".9 c #4B8BB8",
-+".0 c #3E769E",
-+".q c #3C749C",
-+".w c #403D3D",
-+".e c #92BAD6",
-+".r c #C8DCEA",
-+".t c #FEFEFE",
-+".y c #3D393A",
-+".u c #3B3738",
-+".i c #355974",
-+".p c #353132",
-+".a c #7A7879",
-+".s c #498BB9",
-+".d c #9BBFD8",
-+".f c #4E8AB4",
-+".g c #787677",
-+".h c #F2F2F2",
-+".j c #F0F0F0",
-+".k c #2F2B2C",
-+".l c #EEEEEE",
-+".z c #727071",
-+".x c #26282D",
-+".c c #ECECEC",
-+".v c #2B2728",
-+".b c #FAFCFD",
-+".n c #EAEAEA",
-+".m c #DEEAF2",
-+".M c #E9EAE9",
-+".N c #C2D8E7",
-+".B c #6E6C6D",
-+".V c #5390BC",
-+".C c #E8E8E8",
-+".Z c #6EA2C6",
-+".A c #272324",
-+".S c #E7E6E7",
-+".D c #E6E6E6",
-+".F c #252122",
-+".G c #29333D",
-+".H c #E4E4E4",
-+".J c #3F7AA5",
-+".K c #231F20",
-+".L c #E2E2E2",
-+".P c #211D1E",
-+".I c #E0E0E0",
-+".U c #EAF1F7",
-+".Y c #6099C2",
-+".T c #1F1B1C",
-+".R c #E9F1F6",
-+".E c #CDDFEB",
-+".W c #4387B6",
-+".Q c #96BBD6",
-+".! c #B1CDE0",
-+".~ c #DEDEDE",
-+".^ c #79A9CA",
-+"./ c #4285B5",
-+".( c #272A31",
-+".) c #5D97BF",
-+"._ c #4185B4",
-+".` c #DCDCDC",
-+".' c #959393",
-+".] c #DADADA",
-+".[ c #314B5F",
-+".{ c #D8D8D8",
-+".} c #D7D8D7",
-+".| c #D6D6D6",
-+"X  c #F5F8FB",
-+"X. c #D4D4D4",
-+"XX c #6AA0C5",
-+"Xo c #BDD4E5",
-+"XO c #3A6A8C",
-+"X+ c #232123",
-+"X@ c #D3D4D3",
-+"X# c #D2D2D2",
-+"X$ c #D0D0D0",
-+"X% c #CECECE",
-+"X& c #CCCCCC",
-+"X* c #CADDEB",
-+"X= c #37617F",
-+"X- c #242A31",
-+"X; c #CACACA",
-+"X: c #C8DBE9",
-+"X> c #90B7D3",
-+"X, c #817F7F",
-+"X< c #3F7EAB",
-+"X1 c #548FB9",
-+"X2 c #355873",
-+"X3 c #7D7B7B",
-+"X4 c #C2C2C2",
-+"X5 c #4B8CBA",
-+"X6 c #C0C0C0",
-+"X7 c #D4E4EE",
-+"X8 c #81AECE",
-+"X9 c #659CC3",
-+"X0 c #787576",
-+"Xq c #4788B6",
-+"Xw c #252C35",
-+"Xe c #757373",
-+"Xr c #BABABA",
-+"Xt c #FCFDFE",
-+"Xy c #B6B6B6",
-+"Xu c #C4D9E8",
-+"Xi c #706D6E",
-+"Xp c #8CB5D2",
-+"Xa c #70A3C7",
-+"Xs c #8BB5D1",
-+"Xd c #5491BC",
-+"Xf c #5391BB",
-+"Xg c #282424",
-+"Xh c #272223",
-+"Xj c #6C696A",
-+"Xk c #2F4659",
-+"Xl c #6B6969",
-+"Xz c #407BA5",
-+"Xx c #6A6768",
-+"Xc c #E4E3E3",
-+"Xv c #3E79A3",
-+"Xb c #231E1F",
-+"Xn c #221E1E",
-+"Xm c #E2E1E1",
-+"XM c #211C1D",
-+"XN c #EBF2F7",
-+"XB c #201C1C",
-+"XV c #CFE0EC",
-+"XC c #4588B7",
-+"XZ c #B3CEE1",
-+"XA c #366384",
-+"XS c #5F98C0",
-+"XD c #4386B5",
-+"XF c #DEDDDD",
-+"XG c #2B3D4B",
-+"XH c #615F5F",
-+"XJ c #5F5D5D",
-+"XK c #5E5B5C",
-+"XL c #DCE9F2",
-+"XP c #407DA8",
-+"XI c #86B1CF",
-+"XU c #D4D3D3",
-+"XY c #3A698B",
-+"XT c #3E7BA6",
-+"XR c #232022",
-+"XE c #545152",
-+"XW c #999899",
-+"XQ c #79AACC",
-+"X! c #524F50",
-+"X~ c #CCCDCB",
-+"X^ c #3D749B",
-+"X/ c #93BAD5",
-+"X( c #77A8CA",
-+"X) c #37607E",
-+"X_ c #5B96BF",
-+"X` c #3F84B4",
-+"X' c #CAC9C9",
-+"X] c #C6C5C5",
-+"X[ c #3F7DAA",
-+"X{ c #F2F7FA",
-+"X} c #C2C1C1",
-+"X| c #212023",
-+"o  c #9EC1D9",
-+"o. c #444142",
-+"oX c #3F78A0",
-+"oo c #90B8D5",
-+"oO c #FEFEFF",
-+"o+ c #E2ECF4",
-+"o@ c #2B3A47",
-+"o# c #25262A",
-+"o$ c #B1AFB0",
-+"o% c #28313A",
-+"o& c #221D1D",
-+"o* c #262F38",
-+"o= c #629BC2",
-+"o- c #302D2E",
-+"o; c #6199C1",
-+"o: c #201B1B",
-+"o> c #4587B6",
-+"o, c #F0F0F1",
-+"o< c #2D3E4C",
-+"o1 c #2E2B2C",
-+"o2 c #4385B4",
-+"o3 c #A8A7A7",
-+"o4 c #A7A5A6",
-+"o5 c #3D7197",
-+"o6 c #4183B2",
-+"o7 c #4083B1",
-+"o8 c #A5A3A4",
-+"o9 c #3B6F95",
-+"o0 c #5290BC",
-+"oq c #A4C4DB",
-+"ow c #E9F1F7",
-+"oe c #4387B7",
-+"or c #E7EFF5",
-+"ot c #CBDDEA",
-+"oy c #4185B5",
-+"ou c #5B95BE",
-+"oi c #3F83B3",
-+"op c #939192",
-+"oa c #929191",
-+"os c #2B3743",
-+"od c #4C4849",
-+"of c #2A3742",
-+"og c #F4F8FB",
-+"oh c #D8E6F0",
-+"oj c #4C8CB9",
-+"ok c #211F22",
-+"ol c #CFD0D0",
-+"oz c #444041",
-+"ox c #262C34",
-+"oc c #413E3E",
-+"ov c #403C3D",
-+"ob c #3B739B",
-+"on c #858384",
-+"om c #FFFFFF",
-+"oM c #E3EDF4",
-+"oN c #5995BF",
-+"oB c #3E3A3B",
-+"oV c #C7DBE9",
-+"oC c #2F4B61",
-+"oZ c #5793BD",
-+"oA c #3C3839",
-+"oS c #2A3945",
-+"oD c #7E7D7D",
-+"oF c #345873",
-+"oG c #363233",
-+"oH c #7B797A",
-+"oJ c #EFF4F9",
-+"oK c #EEF4F8",
-+"oL c #F3F3F3",
-+"oP c #9ABED7",
-+"oI c #4788B7",
-+"oU c #629AC1",
-+"oY c #ACAAAA",
-+"oT c #F1F1F1",
-+"oR c #EFEFEF",
-+"oE c #737172",
-+"oW c #EDEDED",
-+"oQ c #A9C9DF",
-+"o! c #FBFDFE",
-+"o~ c #EBEBEB",
-+"o^ c #DFEBF3",
-+"o/ c #4581AB",
-+"o( c #6F6D6E",
-+"o) c #EAE9EA",
-+"o_ c #E9E9E9",
-+"o` c #C1D7E6",
-+"o' c #E7E7E7",
-+"o] c #E6E7E6",
-+"o[ c #E5E5E5",
-+"o{ c #3F7BA5",
-+"o} c #242021",
-+"o| c #E3E3E3",
-+"O  c #3E79A4",
-+"O. c #221E1F",
-+"OX c #26303A",
-+"Oo c #9C9A9A",
-+"OO c #E1E1E1",
-+"O+ c #201C1D",
-+"O@ c #4488B7",
-+"O# c #DFDFDF",
-+"O$ c #7BAACC",
-+"O% c #356384",
-+"O& c #1E1A1B",
-+"O* c #4386B6",
-+"O= c #4286B5",
-+"O- c #95BAD5",
-+"O; c #DDDDDD",
-+"O: c #1C1819",
-+"O> c #DBDBDB",
-+"O, c #D9D9D9",
-+"O< c #D7D7D7",
-+"O1 c #417FAA",
-+"O2 c #DAE7F1",
-+"O3 c #F5F9FB",
-+"O4 c #D5D5D5",
-+"O5 c #242224",
-+"O6 c #D4D3D4",
-+"O7 c #85B1CF",
-+"O8 c #D3D3D3",
-+"O9 c #699FC4",
-+"O0 c #4D8DB9",
-+"Oq c #222022",
-+"Ow c #34556F",
-+"Oe c #D1D1D1",
-+"Or c #D0CFD0",
-+"Ot c #8A8888",
-+"Oy c #CFCFCF",
-+"Ou c #CDCDCD",
-+"Oi c #CCCDCC",
-+"Op c #CADEEB",
-+"Oa c #E5EEF5",
-+"Os c #C9DCEA",
-+"Od c #ADCADF",
-+"Of c #C8DCE9",
-+"Og c #91B8D4",
-+"Oh c #5994BE",
-+"Oj c #3D82B3",
-+"Ok c #5894BD",
-+"Ol c #3C82B2",
-+"Oz c #4181AD",
-+"Ox c #3B3737",
-+"Oc c #C5C5C5",
-+"Ov c #293643",
-+"Ob c #3E7DAA",
-+"On c #C1C1C1",
-+"Om c #353131",
-+"OM c #D4E3EE",
-+"ON c #B8D1E3",
-+"OB c #BFBFBF",
-+"OV c #9CBFD8",
-+"OC c #80ADCD",
-+"OZ c #649BC2",
-+"OA c #4889B7",
-+"OS c #BDBDBD",
-+"OD c #2E292A",
-+"OF c #4283B1",
-+"OG c #B7B7B7",
-+"OH c #4183B0",
-+"OJ c #5794BF",
-+"OK c #A7C6DC",
-+"OL c #365B77",
-+"OP c #8BB4D1",
-+"OI c #282324",
-+"OU c #272323",
-+"OY c #6C6A6A",
-+"OT c None",
-+/* pixels */
-+"  oToToToT L.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h LoToToToT  ",
-+"o,.joToToToToToToToToToToToToToToToToToToToT.h.h.h.hoToToToToToToToToToToToToToToToToToToToT.j.j",
-+".j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.joToLoLoR.D.~ > >.~.DoRoLoLoT.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j",
-+"oRoRoRoRoRoRoRoRoRoRoRoRoRoRoRoT.hXcOBoaXjX!oz c cozX!XjoaOBXc.hoToRoRoRoRoRoRoRoRoRoRoRoRoRoRoR",
-+".l.l.l.l.l.l.l.l.l.l.l.l.loR.j <.'X! Y.P.To: $ J J $o:.T.P YX!.' <.joR.l.l.l.l.l.l.l.l.l.l.l.l.l",
-+".l.l.l.l.l.l.l.l.l.l.l.l.jXm.&oz + $o& 3.x OoSXGXGoS O.x 3o& $ +oz.&Xm.j.l.l.l.l.l.l.l.l.l.l.l.l",
-+"oWoWoWoWoWoWoWoWoWoWoWoR uXK X $XRo% yXA.qo/.fX1X1.fo/.qXA yo%XR $ XXK uoRoWoWoWoWoWoWoWoWoWoWoW",
-+".c.c.c.c.c.c.c.c.c.coW Z z $ {os eXTo0..oQX*XLoMoMXLOpoQ..o0XT eos { $ z ZoW.c.c.c.c.c.c.c.c.c.c",
-+"o~o~o~o~o~o~o~o~o~.co3.p $.(X2X[OJ FOM !Of 0.d wOg.d 0Os.mOM FOJObX2.( $.po3.co~o~o~o~o~o~o~o~o~",
-+".n.n.n.n.n.n.n.noW VoGXMoso9XC G.N.!.^XfXD tOjOlOlOj tXDXd.^.% 1O$O@o9osXMoG VoW.n.n.n.n.n.n.n.n",
-+".n.n.n.n.n.n.n.c qo.XBo<XvX5 No oUO0 fOPXpXpXpXpXpXpXpXpOP ( NOdo^OV.sXvo<XBo. q.c.n.n.n.n.n.n.n",
-+"o_o_o_o_o_o_.M.L @ $o@o{.s.^.Z & t.* ~omomomomomomomomomomomom.toO.b _ D.Jo@ $ @.Lo)o_o_o_o_o_o_",
-+".C.C.C.C.C.Co~o8Xg kX^oeoZXf._XDXD 0omomomomomomomomomomomomomomomom.b #XCX^ kXgo8o~.C.C.C.C.C.C",
-+"o'o'o'o'o'.CO>.$okX=oeXDo>O=XD./Xd.momomomomomomomomomomomomomom pX7.NOK 'oeX=ok.$O>.Co'o'o'o'o'",
-+" ]o'o'o'.So_ TXh.o nXDXDXDXDXD.; %.bomomomomomomomomomomomomoOo`O9ojo>XDXDXD n.oXh To_ ]o'o'o'.S",
-+".D.D.D.D.Do| SX|XY.+XDXDXDXDXDXDXZomomomomomomomomomomomomom.4Xd.;O=XDXDXDXD.+XYX| So|.D.D.D.D.D",
-+"o[o[o[o[.D 5OxOvOzO*XDXDXDXD =oZo+omomomomomomomomomomomomomoP.;XDXDXDXDXDXDO*OzOvOx 5o]o[o[o[o[",
-+".H.H.H.Ho' POU }oeXDXDXDXDXD.;X8o!omomomomomomomomomomomom.bX(.;XDXDXDXDXDXDXDoe }OU Po'.H.H.H.H",
-+"o|o|o|o|.DOt.5XO.+XDXDXDXDXD &ONomomomomomomomomomomomomom.2.7._XDXDXDXDXDXDXD.+XO.5Ot.Do|o|o|o|",
-+"o|o|o|o|o|Xi : j.WXDXDXDXD = rOaomomomomomomomomomomomomom AXS._XDXDXDXDXDXDXD.W j :Xio|o|o|o|o|",
-+".L.L.L.L.I RXwXP.WXDXDXDXD.;XI momomomomomomomomomomomomomXN.=._XDXDXDXDXDXDXD.WXPXw R.I.L.L.L.L",
-+"OOOOOOOOO; [OX.<O*XDXDXDXD IXoomomomomomomomomomomomomomom.UX_._XDXDXDXDXDXDXDO*.<OX [O;OOOOOOOO",
-+".I.I.I.IO; )o*O1O*XDXDXD._.).Romomomomomog ~omomomomomomom.UX_._XDXDXDXDXDXDXDO*O1o* )O;.I.I.I.I",
-+"O#O#O#O#O# KX-Xz.WXDXDXD.;XsoOomomomomom vowomomomomomomom.UX_._XDXDXDXDXDXDXD.WXzX- KO#O#O#O#O#",
-+"O#O#O#O#.  g Co5oeXDXDXDXq.Nomomomomom ,X>oromomomomomomom.UX_._XDXDXDXDXDXDXDoeo5 C gOOO#O#O#O#",
-+".~.~.~.~OO.- {X).XXDXD._o; HomomomomomohO9.Romomomomomomom.UX_._XDXDXDXDXDXDXD.XX) {.-OO.~.~.~.~",
-+"O;O;O;O;O#XyOD .o2XDXD.;Ogomomomomomom / r.Uomomomomomomom.UX_._XDXDXDXDXDXDXDo2 .ODXyO#O;O;O;O;",
-+".`.`.`.`O;Oeod.:oX.WXDOAoVomomomomomO3XaOk.Uomomomomomomom.UX_._XDXDXDXDXDXD.WoX.:odOeO;.`.`.`.`",
-+"O>O>O>O>O>O;X,.POw.W._ doJomomomomomOMoj r.Uomomomomomomom.UX_._XDXDXDXDXDXD.WOw.PX,O;O>O>O>O>O>",
-+"O>O>O>O>O>O;XrOmox.0 9X8Xtomomomomom.6X`ou.Uomomomomomomom.UX_._XDXDXDXDXDoe.0oxOmXrO;O>O>O>O>O>",
-+".].].].].].]O,.z JXkOH.VotomomomomX{ 2oiou.Uomomomomomomom.UX_._XDO= &O0 &OFXk J.zO,.].].].].].]",
-+"O,O,O,O,O,O,O>OS.yOq.i._OZ ^omomom.E.9._ou.Uomomomomomomom.UX_._._.9.ZXdO=.iOq.yOSO>O,O,O,O,O,O,",
-+".{.{.{.{.{.{.{.].,.A BX)oyXXO2omom.Q.;._ou.Uomomomomomomom.UOh._ dO-X9O=X) BOI.,.].{.{.{.{.{.{.{",
-+"O<O<O<O<O<O<O<.{O8o(Xno#OLo7.YXuX O7oIoiOk.Romomomomomomom HOCoqOdo=o6OLo#Xno(O8.{O<O<O<O<O<O<O<",
-+"O<O<O<O<O<O<O<O<.{X'XJ.PO5.[O  iOgXVX:OVXsoKomomomomomomom.bOMX/.1O .[O5.PXJX'.{O<O<O<O<O<O<O<O<",
-+".|.|.|.|.|.|.|.|.|.}X]XH.KXn.G eX<oN.e 8 6 Qomomomom.bXN.roo xX< e.GXn.KXHX].}.|.|.|.|.|.|.|.|.|",
-+"O4O4O4O4O4O4O4O4O4O4O<X;Xe.vXBX+ofoFob 7.@XQ W | | WXQ.@ 7oboFofX+XB.vXeX;O<O4O4O4O4O4O4O4O4O4O4",
-+"X.X.X.X.X.X.X.X.X.X.X.O4X#XW sO. J.K.xo@oC `O%.8.8O% `oCo@.x.K JO. sXWX#O4X.X.X.X.X.X.X.X.X.X.X.",
-+"O8O8O8O6O8XUXUO8O8XUXUO8X..|OnX,oc.F $ Jo&XbXRO5O5XRXbo& J $.FocX,On.|X.O8XUX@X@O8.3O8O8O8O8O8X@",
-+"O8O8O8O8O8O8O8O8O8O8O8O8O8O8X.X. aop ; c Eo}.PXMXM.Po} E c ;op aX.X.O8O8O8O8O8O8O8O8O8O8O8O8O8O8",
-+"X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#O8O4X$X6 P.-onX3X3on.- PX6X$O4O8X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#",
-+"OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeO8X4OGOnOcOcX} MOSX#OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOe",
-+"X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$O8ono-oAov.w.u.koEX#X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$",
-+"X$X$X$X$X$X$X$X$X$olX$X$X$X$X$X$X$X$X$X#oD l.>o1O+.P.T.BOeX$X$X$X$X$X$X$OrOrX$X$X$X$X$X$X$X$X$X$",
-+"OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyX#oHXEXFoBO&.TO:OYX$OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOy",
-+"X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%Oy POo.CX0 -Xx.g TOyX%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%",
-+"X%X%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX% oo$.h boYo4.O UX%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX%X%",
-+"  Ou.#OuOuOiX&X&X&X&X&X&X&X&X&X&X&X&X&Oy.a 4 * h.K.KO&XlX%X&X&X&X&X&X&X&X&X&X&X&X&X&X&OuOuX~Ou  "
-+};
--- a/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch
+++ b/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch
@ -1,51 +0,0 @@
-From: =?utf-8?q?=22Kan-Ru_Chen_=28=E9=99=B3=E4=BE=83=E5=A6=82=29=22?=
- <koster@debian.org>
-Date: Sat, 20 Sep 2014 12:33:08 +0800
-Subject: Fix build with libopenjp2
-
---
- Makerules              |  4 ++--
- source/fitz/load-jpx.c | 10 +---------
- 2 files changed, 3 insertions(+), 11 deletions(-)
-
-diff --git a/Makerules b/Makerules
-index 766ad53..a93b9cf 100644
--- a/Makerules
-+++ b/Makerules
-@@ -105,8 +105,8 @@ SYS_HARFBUZZ_CFLAGS = $(shell pkg-config --cflags harfbuzz)
- SYS_HARFBUZZ_LIBS = $(shell pkg-config --libs harfbuzz)
- SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
- SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
-SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
-SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
-+SYS_OPENJPEG_CFLAGS = -I/usr/include/openjpeg-2.1
-+SYS_OPENJPEG_LIBS = -lopenjp2
- SYS_JBIG2DEC_LIBS = -ljbig2dec
- SYS_JPEG_LIBS = -ljpeg
- SYS_ZLIB_LIBS = -lz
-diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
-index 6b92e5c..72dea50 100644
--- a/source/fitz/load-jpx.c
-+++ b/source/fitz/load-jpx.c
-@@ -1,13 +1,5 @@
- #include "mupdf/fitz.h"
- 
-/* Without the definition of OPJ_STATIC, compilation fails on windows
- * due to the use of __stdcall. We believe it is required on some
- * linux toolchains too. */
-#define OPJ_STATIC
-#ifndef _MSC_VER
-#define OPJ_HAVE_STDINT_H
-#endif
-
- #include <openjpeg.h>
- 
- static void fz_opj_error_callback(const char *msg, void *client_data)
-@@ -117,7 +109,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs
- 	opj_stream_set_read_function(stream, fz_opj_stream_read);
- 	opj_stream_set_skip_function(stream, fz_opj_stream_skip);
- 	opj_stream_set_seek_function(stream, fz_opj_stream_seek);
-	opj_stream_set_user_data(stream, &sb);
-+	opj_stream_set_user_data(stream, &sb, NULL);
- 	/* Set the length to avoid an assert */
- 	opj_stream_set_user_data_length(stream, size);
--- a/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch
+++ b/app-text/mupdf/files/mupdf-1.7a-system-mujs.patch
@ -1,11 +0,0 @@
--- mupdf-1.7a/Makefile
-+++ mupdf-1.7a/Makefile
-@@ -98,7 +98,7 @@
- ifeq "$(HAVE_MUJS)" "yes"
- PDF_OBJ += $(OUT)/pdf/js/pdf-js.o
- PDF_OBJ += $(OUT)/pdf/js/pdf-jsimp-mu.o
-THIRD_LIBS += $(MUJS_LIB)
-+THIRD_LIBS +=
- LIBS += $(MUJS_LIBS)
- CFLAGS += $(MUJS_CFLAGS)
- else ifeq "$(HAVE_JSCORE)" "yes"
--- a/app-text/mupdf/files/mupdf-1.9a-no-thirdlibs.patch
+++ b/app-text/mupdf/files/mupdf-1.9a-no-thirdlibs.patch
@ -1,113 +0,0 @@
--- mupdf-1.9a/Makefile
-+++ mupdf-1.9a/Makefile
-@@ -142,15 +141,12 @@
- # --- Library ---
- 
- MUPDF_LIB = $(OUT)/libmupdf.a
-THIRD_LIB = $(OUT)/libmupdfthird.a
- 
- MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
-THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(JPEG_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
- 
- $(MUPDF_LIB) : $(MUPDF_OBJ)
-$(THIRD_LIB) : $(THIRD_OBJ)
- 
-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB)
- 
- # --- Rules ---
- 
-@@ -251,19 +247,19 @@
- MUTOOL := $(addprefix $(OUT)/, mutool)
- MUTOOL_OBJ := $(addprefix $(OUT)/tools/, mutool.o mudraw.o murun.o pdfclean.o pdfcreate.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o pdfpages.o pdfmerge.o)
- $(MUTOOL_OBJ): $(FITZ_HDR) $(PDF_HDR)
-$(MUTOOL) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MUTOOL) : $(MUPDF_LIB)
- $(MUTOOL) : $(MUTOOL_OBJ)
- 	$(LINK_CMD)
- 
- MJSGEN := $(OUT)/mjsgen
-$(MJSGEN) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MJSGEN) : $(MUPDF_LIB)
- $(MJSGEN) : $(addprefix $(OUT)/tools/, mjsgen.o)
- 	$(LINK_CMD)
- 
- MUJSTEST := $(OUT)/mujstest
- MUJSTEST_OBJ := $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o)
- $(MUJSTEST_OBJ) : $(FITZ_HDR) $(PDF_HDR)
-$(MUJSTEST) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MUJSTEST) : $(MUPDF_LIB)
- $(MUJSTEST) : $(MUJSTEST_OBJ)
- 	$(LINK_CMD)
- 
-@@ -271,7 +267,7 @@
- MUVIEW_X11 := $(OUT)/mupdf-x11
- MUVIEW_X11_OBJ := $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o)
- $(MUVIEW_X11_OBJ) : $(FITZ_HDR) $(PDF_HDR)
-$(MUVIEW_X11) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MUVIEW_X11) : $(MUPDF_LIB)
- $(MUVIEW_X11) : $(MUVIEW_X11_OBJ)
- 	$(LINK_CMD) $(X11_LIBS)
- 
-@@ -279,7 +275,7 @@
- MUVIEW_GLFW := $(OUT)/mupdf-gl
- MUVIEW_GLFW_OBJ := $(addprefix $(OUT)/platform/gl/, gl-font.o gl-input.o gl-main.o)
- $(MUVIEW_GLFW_OBJ) : $(FITZ_HDR) $(PDF_HDR) platform/gl/gl-app.h
-$(MUVIEW_GLFW) : $(MUPDF_LIB) $(THIRD_LIB) $(GLFW_LIB)
-+$(MUVIEW_GLFW) : $(MUPDF_LIB) $(GLFW_LIB)
- $(MUVIEW_GLFW) : $(MUVIEW_GLFW_OBJ)
- 	$(LINK_CMD) $(GLFW_LIBS)
- endif
-@@ -288,7 +284,7 @@
- MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl
- MUVIEW_X11_CURL_OBJ := $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o)
- $(MUVIEW_X11_CURL_OBJ) : $(FITZ_HDR) $(PDF_HDR)
-$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIB) $(CURL_LIB)
-+$(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(CURL_LIB)
- $(MUVIEW_X11_CURL) : $(MUVIEW_X11_CURL_OBJ)
- 	$(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS)
- endif
-@@ -298,7 +294,7 @@
- MUVIEW_WIN32 := $(OUT)/mupdf
- MUVIEW_WIN32_OBJ := $(addprefix $(OUT)/platform/x11/, win_main.o pdfapp.o win_res.o)
- $(MUVIEW_WIN32_OBJ) : $(FITZ_HDR) $(PDF_HDR)
-$(MUVIEW_WIN32) : $(MUPDF_LIB) $(THIRD_LIB)
-+$(MUVIEW_WIN32) : $(MUPDF_LIB)
- $(MUVIEW_WIN32) : $(MUVIEW_WIN32_OBJ)
- 	$(LINK_CMD) $(WIN32_LIBS)
- endif
-@@ -312,9 +308,9 @@
- 
- examples: $(OUT)/example $(OUT)/multi-threaded
- 
-$(OUT)/example: docs/example.c $(MUPDF_LIB) $(THIRD_LIB)
-+$(OUT)/example: docs/example.c $(MUPDF_LIB)
- 	$(LINK_CMD) $(CFLAGS)
-$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIB)
-+$(OUT)/multi-threaded: docs/multi-threaded.c $(MUPDF_LIB)
- 	$(LINK_CMD) $(CFLAGS) -lpthread
- 
- # --- Update version string header ---
-@@ -343,7 +339,6 @@
- mandir ?= $(prefix)/share/man
- docdir ?= $(prefix)/share/doc/mupdf
- 
-third: $(THIRD_LIB)
- extra: $(CURL_LIB) $(GLFW_LIB)
- libs: $(INSTALL_LIBS)
- apps: $(INSTALL_APPS)
-@@ -376,7 +371,7 @@
- java:
- 	$(MAKE) -C platform/java
- 
-tags: $(shell find include source platform thirdparty -name '*.[ch]' -or -name '*.cc' -or -name '*.hh')
-+tags: $(shell find include source platform -name '*.[ch]' -or -name '*.cc' -or -name '*.hh')
- 	ctags $^
- 
- cscope.files: $(shell find include source platform -name '*.[ch]')
-@@ -397,4 +392,4 @@
- debug:
- 	$(MAKE) build=debug
- 
-.PHONY: all clean nuke install third libs apps generate
-+.PHONY: all clean nuke install libs apps generate
--- a/app-text/mupdf/mupdf-1.10a.ebuild
+++ b/app-text/mupdf/mupdf-1.10a.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://mupdf.com/downloads/${P}-source.tar.gz"

 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript libressl opengl +openssl static static-libs vanilla"

 LIB_DEPEND="
--- a/app-text/mupdf/mupdf-1.5-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.5-r1.ebuild
@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbbcd7c290f3a144423741906;sf=tgz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-MY_SOVER=1.5
-SLOT="0/${MY_SOVER}"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla +curl +openssl static static-libs"
-
-LIB_DEPEND="dev-libs/openssl[static-libs?]
-	media-libs/freetype:2[static-libs?]
-	media-libs/jbig2dec[static-libs?]
-	media-libs/openjpeg:2[static-libs?]
-	net-misc/curl[static-libs?]
-	virtual/jpeg[static-libs?]
-	X? ( x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?] )"
-RDEPEND="${LIB_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-	static? ( ${LIB_DEPEND//?}
-		app-arch/bzip2[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libxcb[static-libs] )"
-
-src_prepare() {
-	rm -rf thirdparty || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
-		"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
-		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
-		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
-		"${FILESDIR}"/${PN}-1.5-format-security-error.patch
-
-	if has_version ">=media-libs/openjpeg-2.1:2" ; then
-		epatch \
-			"${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
-	fi
-
-	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
-		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
-		-i platform/debian/${PN}.pc || die
-
-	use vanilla || epatch \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
-	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
-	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
-		-i platform/debian/${PN}.desktop || die
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iLD = $(tc-getCC)" \
-		-e "1iAR = $(tc-getAR)" \
-		-e "1iverbose = yes" \
-		-e "1ibuild = debug" \
-		-e "1iprefix = ${ED}usr" \
-		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
-	    -e "1iHAVE_X11 = $(usex X)" \
-		-e "1iWANT_OPENSSL = $(usex openssl)" \
-		-e "1iWANT_CURL = $(usex curl)" \
-		-i Makerules || die
-
-	if use static-libs || use static ; then
-		cp -a "${S}" "${S}"-static || die
-		#add missing Libs.private for xcb and freetype
-		sed -e 's:\(pkg-config --libs\):\1 --static:' \
-		    -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-		    -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-			-i "${S}"-static/Makerules || die
-	fi
-
-	my_soname=libmupdf.so.${MY_SOVER}
-	my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
-	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-		-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
-		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/install/s: COPYING : :" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake XCFLAGS="-fpic"
-	use static-libs && \
-		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
-	use static && \
-		emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
-	if use X ; then
-		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
-	else
-		rm docs/man/${PN}.1
-	fi
-
-	emake install
-	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
-	if use static ; then
-		dobin "${S}"-static/build/debug/mu{tool,draw}
-		use X && dobin "${S}"-static/build/debug/${PN}-x11
-	fi
-	use X && dosym ${PN}-x11 /usr/bin/${PN}
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README docs/*.{txt,c}
-}
--- a/app-text/mupdf/mupdf-1.8.ebuild
+++ b/app-text/mupdf/mupdf-1.8.ebuild
@ -1,141 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=179403598244f069b56e60866c13a0b840c5932e;sf=tgz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-MY_SOVER=1.8
-SLOT="0/${MY_SOVER}"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla +curl javascript libressl opengl +openssl static static-libs"
-
-LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0[static-libs?] )
-	libressl? ( dev-libs/libressl[static-libs?] )
-	media-libs/freetype:2[static-libs?]
-	media-libs/jbig2dec[static-libs?]
-	media-libs/openjpeg:2[static-libs?]
-	net-misc/curl[static-libs?]
-	virtual/jpeg[static-libs?]
-	X? ( x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?] )
-	javascript? ( <dev-lang/mujs-0_p20160504 )
-	opengl? ( >=media-libs/glfw-3 )"
-RDEPEND="${LIB_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-	static? ( ${LIB_DEPEND//?}
-		app-arch/bzip2[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libxcb[static-libs] )"
-
-REQUIRED_USE="opengl? ( X !static !static-libs )"
-
-src_prepare() {
-	use hppa && append-cflags -ffunction-sections
-
-	rm -rf thirdparty || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
-		"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
-		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
-		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
-		"${FILESDIR}"/${PN}-1.7a-system-mujs.patch \
-		"${FILESDIR}"/${PN}-1.8-system-glfw.patch
-
-	if has_version ">=media-libs/openjpeg-2.1:2" ; then
-		epatch \
-			"${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
-	fi
-
-	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
-		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
-		-i platform/debian/${PN}.pc || die
-
-	use vanilla || epatch \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
-	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
-	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
-		-i platform/debian/${PN}.desktop || die
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iLD = $(tc-getCC)" \
-		-e "1iAR = $(tc-getAR)" \
-		-e "1iverbose = yes" \
-		-e "1ibuild = debug" \
-		-e "1iprefix = ${ED}usr" \
-		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
-		-e "1iHAVE_X11 = $(usex X)" \
-		-e "1iWANT_OPENSSL = $(usex openssl)" \
-		-e "1iWANT_CURL = $(usex curl)" \
-		-e "1iHAVE_MUJS = $(usex javascript)" \
-		-e "1iMUJS_LIBS = -lmujs" \
-		-e "1iMUJS_CFLAGS =" \
-		-e "1iHAVE_GLFW = $(usex opengl yes no)" \
-		-i Makerules || die
-
-	if use static-libs || use static ; then
-		cp -a "${S}" "${S}"-static || die
-		#add missing Libs.private for xcb and freetype
-		sed -e 's:\(pkg-config --libs\):\1 --static:' \
-		    -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-		    -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-			-i "${S}"-static/Makerules || die
-	fi
-
-	my_soname=libmupdf.so.${MY_SOVER}
-	my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
-	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-		-e "/^MUPDF_LIB :=/s:=.*:= \$(OUT)/${my_soname}:" \
-		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/install/s: COPYING : :" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake XCFLAGS="-fpic"
-	use static-libs && \
-		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
-	use static && \
-		emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
-	if use X ; then
-		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
-	else
-		rm docs/man/${PN}.1
-	fi
-
-	emake install
-	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
-	if use static ; then
-		dobin "${S}"-static/build/debug/mu{tool,draw}
-		use X && dobin "${S}"-static/build/debug/${PN}-x11
-	fi
-	use X && dosym ${PN}-x11 /usr/bin/${PN}
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README docs/*.{txt,c}
-}
--- a/app-text/mupdf/mupdf-1.9a.ebuild
+++ b/app-text/mupdf/mupdf-1.9a.ebuild
@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="http://mupdf.com/"
-SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=027860688eafc89ca3d57937a77a43a9bb96f590;sf=tgz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-MY_SOVER=1.9
-SLOT="0/${MY_SOVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X vanilla +curl libressl opengl +openssl static static-libs"
-
-LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0[static-libs?] )
-	libressl? ( dev-libs/libressl[static-libs?] )
-	>=dev-lang/mujs-0_p20160504
-	media-libs/freetype:2[static-libs?]
-	media-libs/harfbuzz[static-libs?]
-	media-libs/jbig2dec[static-libs?]
-	media-libs/libpng:0[static-libs?]
-	media-libs/openjpeg:2[static-libs?]
-	net-misc/curl[static-libs?]
-	virtual/jpeg[static-libs?]
-	X? ( x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?] )
-	opengl? ( >=media-libs/glfw-3 )"
-RDEPEND="${LIB_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-	static? ( ${LIB_DEPEND//?}
-		app-arch/bzip2[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libxcb[static-libs] )"
-
-REQUIRED_USE="opengl? ( X !static !static-libs )"
-
-src_prepare() {
-	use hppa && append-cflags -ffunction-sections
-
-	rm -rf thirdparty || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.9a-CFLAGS.patch \
-		"${FILESDIR}"/${PN}-1.9a-debug-build.patch \
-		"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
-		"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
-		"${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
-		"${FILESDIR}"/${PN}-1.9a-no-thirdlibs.patch \
-		"${FILESDIR}"/${PN}-1.8-system-glfw.patch
-
-	if has_version ">=media-libs/openjpeg-2.1:2" ; then
-		epatch \
-			"${FILESDIR}"/${PN}-1.5-openjpeg-2.1.patch
-	fi
-
-	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
-		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
-		-i platform/debian/${PN}.pc || die
-
-	use vanilla || epatch \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
-	#http://bugs.ghostscript.com/show_bug.cgi?id=693467
-	sed -e '/^\(Actions\|MimeType\)=/s:\(.*\):\1;:' \
-		-i platform/debian/${PN}.desktop || die
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iLD = $(tc-getCC)" \
-		-e "1iAR = $(tc-getAR)" \
-		-e "1iverbose = yes" \
-		-e "1ibuild = debug" \
-		-e "1iprefix = ${ED}usr" \
-		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
-		-e "1iHAVE_X11 = $(usex X)" \
-		-e "1iWANT_OPENSSL = $(usex openssl)" \
-		-e "1iWANT_CURL = $(usex curl)" \
-		-e "1iHAVE_MUJS = yes" \
-		-e "1iMUJS_LIBS = -lmujs" \
-		-e "1iMUJS_CFLAGS =" \
-		-e "1iHAVE_GLFW = $(usex opengl yes no)" \
-		-i Makerules || die
-
-	if use static-libs || use static ; then
-		cp -a "${S}" "${S}"-static || die
-		#add missing Libs.private for xcb and freetype
-		sed -e 's:\(pkg-config --libs\):\1 --static:' \
-		    -e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-		    -e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-			-i "${S}"-static/Makerules || die
-	fi
-
-	my_soname=libmupdf.so.${MY_SOVER}
-	my_soname_js_none=libmupdf-js-none.so.${MY_SOVER}
-	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-		-e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
-		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/install/s: COPYING : :" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake XCFLAGS="-fpic"
-	use static-libs && \
-		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
-	use static && \
-		emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
-	if use X ; then
-		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
-	else
-		rm docs/man/${PN}.1
-	fi
-
-	emake install
-	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
-	if use static ; then
-		dobin "${S}"-static/build/debug/mu{tool,draw}
-		use X && dobin "${S}"-static/build/debug/${PN}-x11
-	fi
-	use X && dosym ${PN}-x11 /usr/bin/${PN}
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README docs/*.{txt,c}
-}
--- a/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
@ -4,7 +4,7 @@

 EAPI=5

-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs readme.gentoo-r1
 [[ ${PV} == 9999* ]] && inherit git-2

 DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
@ -24,17 +24,12 @@ KEYWORDS=""
 fi
 IUSE=""

-COMMON_DEPEND=">=app-text/zathura-0.3.1
+RDEPEND=">=app-text/zathura-0.3.1
 	dev-libs/glib:2=
 	app-arch/libarchive:=
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:="
-RDEPEND="${COMMON_DEPEND}
-	app-arch/p7zip
-	app-arch/tar
-	app-arch/unrar
-	app-arch/unzip"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 pkg_setup() {
@ -53,4 +48,13 @@ src_compile() {
 src_install() {
 	emake "${myzathuraconf[@]}" install
 	dodoc AUTHORS
+	readme.gentoo_create_doc
 }
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+FORCE_PRINT_ELOG=1
+DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
+app-arch/unzip for additional file support."
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs readme.gentoo-r1
 [[ ${PV} == 9999* ]] && inherit git-2

 DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
@ -24,17 +24,12 @@ KEYWORDS=""
 fi
 IUSE=""

-COMMON_DEPEND=">=app-text/zathura-0.3.1
+RDEPEND=">=app-text/zathura-0.3.1
 	dev-libs/glib:2=
 	app-arch/libarchive:=
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:="
-RDEPEND="${COMMON_DEPEND}
-	app-arch/p7zip
-	app-arch/tar
-	app-arch/unrar
-	app-arch/unzip"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 pkg_setup() {
@ -53,4 +48,13 @@ src_compile() {
 src_install() {
 	emake "${myzathuraconf[@]}" install
 	dodoc AUTHORS
+	readme.gentoo_create_doc
 }
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+FORCE_PRINT_ELOG=1
+DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
+app-arch/unzip for additional file support."
--- a/dev-db/mysql/mysql-5.6.35.ebuild
+++ b/dev-db/mysql/mysql-5.6.35.ebuild
@ -15,7 +15,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
--- a/dev-lang/mujs/mujs-0_p20161202.ebuild
+++ b/dev-lang/mujs/mujs-0_p20161202.ebuild
@ -12,7 +12,7 @@ SRC_URI="http://git.ghostscript.com/?p=mujs.git;a=snapshot;h=fd003eceda531e13fbd

 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""

 DEPEND=""
--- a/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild
+++ b/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild
@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
 LICENSE="Sleepycat"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="doc ldap odbc python test"
+IUSE="doc ldap odbc python static-libs test"

 S="${WORKDIR}"

@ -34,9 +34,11 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${P}-build.patch"
 	"${FILESDIR}/${P}-zlib.patch"
-	"${FILESDIR}/${P}-tests.patch"
 )

+# test access the network
+RESTRICT="test"
+
 src_unpack() {
 	# we need the -a option, so we can not use 'unpack'
 	unzip -qoa "${DISTDIR}/cl${MY_PV}.zip" || die
@ -68,19 +70,12 @@ src_prepare() {
 }

 src_compile() {
-	# At least -O2 is needed.
-	replace-flags -O  -O2
-	replace-flags -O0 -O2
-	replace-flags -O1 -O2
-	replace-flags -Os -O2
-	is-flagq -O* || append-flags -O2
-
 	use ldap && append-cppflags -DHAS_LDAP
 	use odbc && append-cppflags -DHAS_ODBC

 	export DISABLE_AUTODETECT=1
-	emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" default
 	emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" shared
+	use static-libs && emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" default
 	use test && emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" stestlib

 	#
@ -94,10 +89,6 @@ src_compile() {
 	ln -s "${solibname}" libcl.so || die

 	if use python; then
-
-		# Python bindings don't work with -O2 and higher.
-		replace-flags -O* -O1
-
 		wrap_python ${FUNCNAME}
 	fi
 }
@ -112,7 +103,7 @@ src_install() {
 	doheader cryptlib.h

 	dolib.so libcl.so*
-	dolib.a libcl.a
+	use static-libs && dolib.a libcl.a

 	if use doc; then
 		newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf"
--- a/dev-libs/cryptlib/files/cryptlib-3.4.3.1-tests.patch
+++ b/dev-libs/cryptlib/files/cryptlib-3.4.3.1-tests.patch
@ -1,52 +0,0 @@
-From c25dad21f5b1db106e4fe42f38a0dac6290b8a41 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 4 Feb 2017 05:48:54 +0200
-Subject: [PATCH] tests: disable online tests
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
---
- test/testfunc.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/test/testfunc.c b/test/testfunc.c
-index 79d7148..017a4a8 100644
--- a/test/testfunc.c
-+++ b/test/testfunc.c
-@@ -1119,6 +1119,7 @@ BOOLEAN testSessions( void )
- 		}
- 	if( !testSessionAttributes() )
- 		return( FALSE );
-+#if 0
- 	if( !testSessionSSH() )
- 		return( FALSE );
- 	if( !testSessionSSHPubkeyAuth() )
-@@ -1127,6 +1128,7 @@ BOOLEAN testSessions( void )
- 		return( FALSE );
- 	if( !testSessionSSHExec() )
- 		return( FALSE );
-+#endif
- 	if( !testSessionSSL() )
- 		return( FALSE );
- 	if( !testSessionSSLLocalSocket() )
-@@ -1147,14 +1149,18 @@ BOOLEAN testSessions( void )
- 	if( !testSessionTLS12ClientCert() )
- 		return( FALSE );
- #endif /* 0 */
-+#if 0
- 	if( !testSessionOCSP() )
- 		return( FALSE );
-+#endif
-+#if 0
- 	if( !testSessionTSP() )
- 		return( FALSE );
- 	if( !testSessionEnvTSP() )
- 		return( FALSE );
- 	if( !testSessionCMP() )
- 		return( FALSE );
-+#endif
- 
- 	return( TRUE );
- 	}
-- 
-2.10.2
-
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@ -1,3 +1,4 @@
 DIST libinput-1.4.2.tar.xz 900776 SHA256 8c38826a785594811bef6a9daadbfa2e172e3f070f8863393d6fb7ca4c68e451 SHA512 ecd1ddc737b8207d9e494f809340e2c0ac2927db80cf4c325ba12fb84387138d0128df7e841c87feafe425d6382f87f123f28531f7045fbcdd1176559895b79b WHIRLPOOL 99f18e00e2a4a284b7995f677053501989b526e16f41e508023638a1c0e660940d0cb991f399480a30a49073063aab1651e52bdea7861266300d9db885806ac4
 DIST libinput-1.5.4.tar.xz 927448 SHA256 6f9ad1ede468bd54ec4469b8a4eb93a6f62f7fe6480c7a43e36c5d58cc2822b7 SHA512 114f436806fd27ece2b19577eefd3f6299cc88612f8437fd07ba1862c0bf4347ac5cc09fad9f798a5e242abd176cfb271fa52af04b0ef88da3210a96fd57a086 WHIRLPOOL d7c2ffd8212c4808641b65f553ea6c1553188a30279f8e3491767a8ba159d42dbd30a0cebc3a727542a83cf216c17d1b5f1504dc8fbb4f7b5664aac35b8032dc
 DIST libinput-1.6.0.tar.xz 927656 SHA256 b7534f518d735c643aedca2fb4694683dfddc8d0600cfb628c87a18e65255832 SHA512 0e52f70fc5b1aa1e9c0621770ba2530f1652611aff1a557ac8083559e22293942d7c468f9bafe9e97e4f71e71df6f3828f9949d8897bea26982045340e3edc92 WHIRLPOOL b41858d727eb27dbcd4025212731fe93e3970f7d36e8654bc5b121b3a6a3d6c1ca6117750d02b54db908d118d1b84a0eec5581b88a517635ffece5fb1378dae2
+DIST libinput-1.6.1.tar.xz 926988 SHA256 9d816f13eee63bcca0e9c3bb652c52ab55f39be4d1b90b54e4bfd1dc92ef55a8 SHA512 b18fdbfa58c14d6a5d183da3c1097d31f7dd9cce41ea69ddfa0bbd1bf8572aaa8e1ecaacdc30e3cc5e21cd320ea106ec86800a24e8f571bce61a02ddc7d43511 WHIRLPOOL bf7ca3c5968827fd73592f56d1e3a1c7897b1bd12fc431e98550ad36aa147f4c39ccb41092ef84d0cb739960c53bfa1b3a62cf7f30fdf7a77da90ba91e6db96e
--- a/dev-libs/libinput/libinput-1.6.1.ebuild
+++ b/dev-libs/libinput/libinput-1.6.1.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="input_devices_wacom test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.12 )
+	>=dev-libs/libevdev-0.4
+	>=sys-libs/mtdev-1.1
+	virtual/libudev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+src_prepare() {
+	default
+	# Doc handling in kinda strange but everything
+	# is available in the tarball already.
+	sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
+		-i Makefile.am Makefile.in || die
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	# building documentation silently fails with graphviz syntax errors
+	econf \
+		--disable-documentation \
+		--disable-event-gui \
+		$(use_enable input_devices_wacom libwacom) \
+		$(use_enable test tests) \
+		--with-udev-dir="$(get_udevdir)"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc -r doc/html
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@ -1,2 +1,2 @@
 DIST libixion-0.11.1.tar.xz 366660 SHA256 c9e9f52580d618fa969fc0293f55af21a9c74bfb802e655c6bf239202f95bede SHA512 e205a5cf532e0522291f5f2a52c2e2c0cdf8d2ed094e5553943650744359d67adf629229a6ffff3c8fa90b15dde7765fee14d4f147fe51a6cdf79b2855509858 WHIRLPOOL aff1350bd1e3a5fec3f0a0cd3f51a88c873bd28469884b48d3fc316782819465f7d193e019fc753474663326b27680c1d12ce3050e6a082a75073040147dfbd8
-DIST libixion-0.12.1.tar.xz 406300 SHA256 000820ba51109ec21cbdb7ea83c1fdb0acbcfeb55b4a6a80fe02b71d45c587c2 SHA512 b3ba4c09f3f12df7fe9e6ef19d35e618d0effce2cf0866acdb23c72754ac7168c24cc979d6a49c756cf70b1e4a79e58b33ec6a05b8155b43a1682375eea9d022 WHIRLPOOL 14ae7725312894aca74a8df0a7dcfa6e9800526024d35259cfcf7a6e2cae9aa3564dfe9605ce61ce88972d1436f36e71343c2980c17253c12d603974f26e2249
+DIST libixion-0.12.2.tar.xz 407280 SHA256 8b44008836bb4e1a3dff4d3e40afec6c73037e3518e72cc85b5cc675fbc2daae SHA512 0a85120a08c79c73a252a997c8b3df461fe1f8ce8b2334aee0e50bfd887a440a220b44922edd18fbd402b1c8ea8be629e6181493bc618eda198f35159813ddcd WHIRLPOOL 3090887ffaa1222a3f15e4d5b96932d50392684ffaa4ea1022f14aeac7fc43972ed84fe6986c58360621e4ab1ad2ca5aa31694fbf081e8014de38b9ade1a060b
--- a/dev-libs/libixion/libixion-0.12.2.ebuild
+++ b/dev-libs/libixion/libixion-0.12.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@ -1 +1,2 @@
 DIST camlimages-4.2.2.tar.bz2 789441 SHA256 eb96aa60afb139797836c2569ba1d4e3f2d0e4dbb025c117d7325468ce6c9633 SHA512 672e192255a9335c45d208b7589a344f712baa798dfc7bc7ccee7d3bda71e603bc06c7b012761f9c6372c683560c67ffa9d2af2742552884211ad4ffb541e3dd WHIRLPOOL dfe61d34da78b1d70feba1c2cf2717430ae4c99386d39fde3cfe14163665bd35a02947fcbc05f67c03de56b2fba1a13cd60a40031e1adbf6320ac239c1485c15
+DIST camlimages-4.2.3.tar.bz2 789523 SHA256 eb1fcbbe3eaebf74f5ecacc68dc428e584f297f023267b305f5cb5e0fc389d8e SHA512 c67775394ab97d0c0111d3e4e49ceb8213a405d48e133c321db920e291dc2ad79e1e7876a0bdff8fe1ad3b3f27ea0effe79bd26d29f92d5bb1ebd74f03d13bd5 WHIRLPOOL 1596a84baf80883ed543ce0c3bc0b734cec1ad46a445bef2a69fcbe99db4f6fe1b2b258ccd03f780d59fe96d6b92b44629c1fe00ce2d7fa06a618fac9c1d021f
--- a/dev-ml/camlimages/camlimages-4.2.3.ebuild
+++ b/dev-ml/camlimages/camlimages-4.2.3.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils vcs-snapshot findlib multilib
+
+DESCRIPTION="An image manipulation library for ocaml"
+HOMEPAGE="http://gallium.inria.fr/camlimages/"
+SRC_URI="https://bitbucket.org/camlspotter/camlimages/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc exif gif gtk jpeg png postscript tiff truetype X xpm"
+
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt]
+	exif? ( media-libs/libexif )
+	gif? ( media-libs/giflib )
+	gtk? ( dev-ml/lablgtk )
+	jpeg? ( virtual/jpeg )
+	tiff? ( media-libs/tiff )
+	png? ( >=media-libs/libpng-1.4:0 )
+	postscript? ( app-text/ghostscript-gpl )
+	truetype? ( >=media-libs/freetype-2 )
+	xpm? ( x11-libs/libXpm )
+	X? ( x11-apps/rgb )
+	sys-libs/zlib
+	"
+DEPEND="${DEPEND}
+	doc? ( dev-python/sphinx[latex] )
+	dev-util/omake
+	virtual/pkgconfig
+	dev-ml/findlib"
+
+camlimages_arg_want() {
+	echo "ARG_WANT_${2}=$(usex $1 1 0)"
+}
+
+src_compile() {
+	omake \
+		$(camlimages_arg_want exif        EXIF    ) \
+		$(camlimages_arg_want gif         GIF     ) \
+		$(camlimages_arg_want png         PNG     ) \
+		$(camlimages_arg_want jpeg        JPEG    ) \
+		$(camlimages_arg_want tiff        TIFF    ) \
+		$(camlimages_arg_want xpm         XPM     ) \
+		$(camlimages_arg_want postscript  GS      ) \
+		$(camlimages_arg_want gtk         LABLGTK2) \
+		$(camlimages_arg_want X           GRAPHICS) \
+		$(camlimages_arg_want truetype    FREETYPE) \
+		PATH_GS=/bin/true \
+		--force-dotomake || die
+
+	if use doc ; then
+		sphinx-build doc/sphinx sphinxdoc || die
+	fi
+}
+
+src_install() {
+	findlib_src_preinst
+	omake --force-dotomake DESTDIR="${D}" install || die
+	dodoc README.md
+	use doc && dohtml -r sphinxdoc/*
+}
--- a/dev-ml/ppx_driver/ppx_driver-113.33.04.ebuild
+++ b/dev-ml/ppx_driver/ppx_driver-113.33.04.ebuild
@ -20,7 +20,7 @@ DEPEND="dev-ml/ppx_tools:=
 	dev-ml/ocamlbuild:=[ocamlopt?]
 	dev-ml/ppx_optcomp:="
 RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/opam"
+DEPEND="${DEPEND} dev-ml/opam dev-ml/js-build-tools"

 src_configure() {
 	emake setup.exe
--- a/dev-ml/ppx_here/Manifest
+++ b/dev-ml/ppx_here/Manifest
@ -1,2 +1 @@
-DIST ppx_here-113.33.00.tar.gz 53046 SHA256 76ff5a098f6028a3d08e97fe6e2dca1125ad2727e839ced777cd73ffac47e9b4 SHA512 9b6be574dfc714a303106b53fd62639fe3ef50797fd0cbde3562ebb34693fc4bdb8ea49852e0e915379600f03c32603a9f4c3dd0f7e9a9552ed4df506fc5bb78 WHIRLPOOL caee170892c2de80dd80ad97bb3ee6ca39a8bc210558807227f3603b7b1e30d0c59b9b1835dd1d2f22052bb2910309ee2b7ab84440bda5e7699299cdfe7e8aa6
 DIST ppx_here-113.33.03.tar.gz 52064 SHA256 671bf487c5beaf0596fa4f9cf255aff28d89378004f2f9c58ae36110bba3c8ab SHA512 478e5638aaa6cd5ca28d3f4f85b94b5f98e2dec92c7c26dd7a35cd6df639a6e264f1983266352f927eac1cc7e960d65e1d37c2233ce5a96c125afe98da8b8e88 WHIRLPOOL 51f4abe23a5e25b04b554e69126c5d4481a95851f1d72c3ae0c68791d443270c8bb8a2879b95fc3206e608eb7394476239c931f4b7a02545a20f97693e603a43
--- a/dev-ml/ppx_here/ppx_here-113.33.00.ebuild
+++ b/dev-ml/ppx_here/ppx_here-113.33.00.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit oasis
-
-DESCRIPTION="Expands [%here] into its location"
-HOMEPAGE="http://www.janestreet.com/ocaml"
-SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-ml/ppx_tools:=
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_core:="
-
-RDEPEND="${DEPEND}"
-DEPEND="${RDEPEND} dev-ml/opam"
-
-src_configure() {
-	emake setup.exe
-	OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		${PN}.install || die
-	dodoc CHANGES.md
-}
--- a/dev-ml/ppx_here/ppx_here-113.33.03.ebuild
+++ b/dev-ml/ppx_here/ppx_here-113.33.03.ebuild
@ -20,7 +20,7 @@ DEPEND="dev-ml/ppx_tools:=
 	dev-ml/ppx_core:="

 RDEPEND="${DEPEND}"
-DEPEND="${RDEPEND} dev-ml/opam"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/js-build-tools"

 src_configure() {
 	emake setup.exe
--- a/dev-python/cryptography-vectors/Manifest
+++ b/dev-python/cryptography-vectors/Manifest
@ -1,7 +1,3 @@
-DIST cryptography_vectors-1.1.2.tar.gz 25028810 SHA256 a928dff1af28551ae89376d6789a6754af658f89613e7f9e0e491d643f4e1222 SHA512 0416f4c9b43d9a21a808316deaa5532853d04be441b9ab890174c3bbb92c89744b89c3b4ab751699f6c63b56a46b09d6144cdc79d22322669eeaf24f4ba517c5 WHIRLPOOL 08593c9ae6aa61b34c38457e74f2f6286f40a6ebc4c1967ab74f071a0f18cb3ef3a162bbb5de6626f679d70dd062bfc3bab84a4d6432036a6f742a8bc8d6067b
-DIST cryptography_vectors-1.3.1.tar.gz 25820368 SHA256 6bb1f939826b57fa7e7f726f4845e20110d5c9f164d1545a7f768d7ffda08484 SHA512 f45471b1262980d5918206111102ea5909c42e7cb2a5cb71fa4d19686971bbc2cd2b278350170b3bb93fd184edb2ddfa47026fa199bc77c3252762f79e8490c7 WHIRLPOOL 8ba8090da63bf14cd980c72581a1ce0cd710110c3e9f76e73ed6fc5f2f5fd189b638ada52ffe2343e2ae6001fc4ed86dc12edd65a0c74e540e75ae8c63a4d7d7
 DIST cryptography_vectors-1.3.4.tar.gz 25820443 SHA256 4414bce0a3d7f0a3cdbf44da75ae5c7c586fd765c777d99023eb5a3ac58f0196 SHA512 5b93fb7c50b93449ab15f62943f944c352e3a375c3a89f494cdd34c5c317b8d435ca0079a74fc6a924a1fc235e3c9cdf0d50baf0905d6a7d6161c07aecefe3fe WHIRLPOOL ce2589f31bff099ab73bc33ca42a51bbb505f514623197fcfada375d29bb1bc33c6beca5759c57fb925b3ea68a106891e884328c55116487a4c10abfab9c6db9
-DIST cryptography_vectors-1.5.2.tar.gz 26648251 SHA256 d63c1bf182f9d9feb872594f2bf9ed2d98981c925bea45b019fe892047a35535 SHA512 f5ea04b02550177834d295b013ab7dc513358ea71e2d002c7a3be69a9bc8d3ff4ea7ac82d4043ce46a8b23e7429fbcefb72ffb2657e988ac2ad1079a3b6a8440 WHIRLPOOL 244dd9b201bc68c11d51e0109daa108053d5c630be4ed68e36213b90465580fca2a4bf8569b39238b10c7265696caf1513ad45d58eebf528d5504f3437178352
-DIST cryptography_vectors-1.5.3.tar.gz 26648498 SHA256 e513fecd146a844da19022abd1b4dfbf3335c1941464988f501d7a16f30acdae SHA512 17b94f1157ce7d99bec4ed7199de66258ecb13a3d8f4d59dea93f5599f4f00380487cca73a3850558c1c98858883ee06be9b5323f96fc7575c8a936c5bc7c049 WHIRLPOOL 5693b7fc256610c6f6879c4476575dcfeb36fd1b51fd61ae5e9dc2069b494dad9deb8b4a372aa90bb4080fc39bee57db2e8e2d0c6b51d909d3f22b93f09ae171
-DIST cryptography_vectors-1.6.tar.gz 26646378 SHA256 01ccb07c95d128a70732f274bd16af479bcc344e43cac745d2b9ec4ab71ff675 SHA512 6ee76a36efc4f8eb7045b58c97f459420e42b47a0599709e6009fd07bf10edad0cd105bfb096805bdfd4f4ac9a8b91dd1b010c4eced0afa9115acaeec36fe0e2 WHIRLPOOL d245f0a9829f02e296280cf5923e8e4ee93422738e9285505b7d4b4530da8164eb59736d4dada07663a54d7444f8a57c760f7ff17731ddb50c947286cf2aa0bf
 DIST cryptography_vectors-1.7.1.tar.gz 26652514 SHA256 47e91b70bbf6852cb96a478cb715ca9234e5ff049c1956088c45c9f738f955f4 SHA512 2edaa91198adcf5e2523ea8d3d25a8cd7df85e6f6c06618301f87af6f0133f5d4672721082205a9a3c0c648390ee772e6107eb6ba76e96649bc2832676df8283 WHIRLPOOL 56e880f97605676dab714ef36bdf93032772b28b977a2ea74101179a20f704645cdb2670613d68eff340149142323d6ef6adf1fe066fd31e85e5e0ccacec34d6
+DIST cryptography_vectors-1.7.2.tar.gz 26652633 SHA256 4be4eee8a11deee5c2f00e389b49de8ce2642130282d1cd0adffb2f7dbe0acdc SHA512 997aa703649cb4b1dc7df37ed2843a6c06a3871df3d1bcf9ebde6466c32103512225d668e6eee62c89e20b74a5885aa2974d82b2cbf3065a902d059268bf1137 WHIRLPOOL 41f9aad77f27c0a0c6bb14ac2b87606a2a316640369e1abccaab82b827759f9f67519b320fade72ea12c46ea4306e8fce4cd5604c9174d62f475d859199b52ac
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.1.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.1.2.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.3.1.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.3.1.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.5.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.5.2.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.5.3.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.5.3.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Test vectors for the cryptography package"
-HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
--- a/dev-python/cryptography-vectors/cryptography-vectors-1.7.2.ebuild
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.7.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@ -1,4 +1,3 @@
-DIST cryptography-1.3.1.tar.gz 383852 SHA256 b4b36175e0f95ddc88435c26dbe3397edce48e2ff5fe41d504cdb3beddcd53e2 SHA512 8b833619d0aec5e6630c8e069e886f6b708b0b3a4f4ca4e37797a24c69be4cacf162f20c068deaecc3222ee0323583582d384e49fa3dbaeaeefc0d7d8c92918a WHIRLPOOL f9e7c75e910699afdf4adc4fb7257135b97c357c967bbca95f332e1f2ed262716ebba6a648427f86a524e75f6ac46aea7f891fe42100c9d7cf8ffcc317fb7905
 DIST cryptography-1.3.4.tar.gz 384109 SHA256 423ff890c01be7c70dbfeaa967eeef5146f1a43a5f810ffdc07b178e48a105a9 SHA512 abbc027433658702d2331282c9f63d99ea2eb42f5cdfe066b2b0ae6d9b86a35e23891716bb2e9e2ca707aa0d38fb69cba22ec5d95d2b9073047444fdae7a9224 WHIRLPOOL 5bd007cfe304620a7237b0f63fbe87ab22bd1cc252941f4815398382122b1c56c5a22e2dc35ce86aba2c2b2d9403de3313bafde23a3695bd26e4eb0f23c9dea9
-DIST cryptography-1.5.2.tar.gz 400673 SHA256 eb8875736734e8e870b09be43b17f40472dc189b1c422a952fa8580768204832 SHA512 7f50edfe7a7270a7acef52b7c55a32eca1845c5e410f078c42690a2e18fce001ed5dfd268fb18a2219011eff073914f1e2271d8e957c58b5200615a815a4b4c0 WHIRLPOOL 2625cbe43d7b0ce41cfcb4a1a9f8127b5933abe86bf30151cfd0b2dc8de0aeea01dc19649528474989ec0121c8b6e6e2e9c8fe72a60e1f2eb10536d7042ea272
 DIST cryptography-1.7.1.tar.gz 420673 SHA256 953fef7d40a49a795f4d955c5ce4338abcec5dea822ed0414ed30348303fdb4c SHA512 fb88b0ee9e314526fcdbb6d35da409b7335c7408a69d2350c58379471d2b9d76021010955629cf776d26312f22d4f8aa3f135955a19dfbff9d602176c9bbfd40 WHIRLPOOL 24b705889b95b568000600662ec82e3f5571582525db3571f3285b99f985b0a21eefd14dccc577700bc082891f7d3c563ac78a8bfd8d810da3ff38914ae5a86d
+DIST cryptography-1.7.2.tar.gz 420867 SHA256 878cb68b3da3d493ffd68f36db11c29deee623671d3287c3f8d685117ffda9a9 SHA512 8ddd119385064e1f8288ff318ec16f500b5c125a3811ccb306aeb2664fac495fcdd3cb5a7cbacd10156505c9526b9cdbd66860b35bbcd2f9a6bb285dd6cba8c5 WHIRLPOOL 531265115a6573c54e2cf85a03f1ed0ebe033fd7818168a3bcda938458f9a32464d7de0c226f46a300635ee52e4995285889bb693bc56f77f816bc81d52bfc61
--- a/dev-python/cryptography/cryptography-1.3.1.ebuild
+++ b/dev-python/cryptography/cryptography-1.3.1.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="libressl test"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl )
-	$(python_gen_cond_dep '>=dev-python/cffi-1.4.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-	test? (
-		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-python_test() {
-	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
-}
--- a/dev-python/cryptography/cryptography-1.7.2.ebuild
+++ b/dev-python/cryptography/cryptography-1.7.2.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI="5"
+EAPI=6

-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy{,3} )
 PYTHON_REQ_USE="threads(+)"

 inherit distutils-r1
@ -15,14 +15,14 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="libressl test"

 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl )
 	$(python_gen_cond_dep '>=dev-python/cffi-1.4.1:=[${PYTHON_USEDEP}]' 'python*')
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy{,3})
 	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
 	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
@ -45,5 +45,7 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )

 python_test() {
+	distutils_install_for_testing
+
 	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
 }
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@ -1,3 +1,3 @@
 DIST greenlet-0.4.10.zip 82616 SHA256 9a98d49f63259b16d3627976b69dd856888a376c498b091c8e9ead56d5098ca8 SHA512 7fc78b14dca079f838647fd99878850cf9e83af781c985362146a11f71c5a700fbac8148273cd1c0ec4ac6ead4cf5bd389e001b8fc1225e87e9b51919d7ecc6c WHIRLPOOL 19490879ceb1ca3407cd84beea6a9dc741ac5d2783df3a867f69e249d16cd5b0ec9fafb5b27a22c71e1984dea85fcdeacd915a5a3fd3759e3c873fb02c515127
 DIST greenlet-0.4.11.tar.gz 58293 SHA256 3095bda0db92736c3197912c9f7f8065e5630a03b2f6c431617338228d9811f6 SHA512 03c91784ee32569fb1896fcc110a4c4dbfd7f194c651bbb29ecf38cb566c0c0e31fad1843b01a6af8d33abeda34259c04c6530b78ab01c3b2804625eaa2f37f9 WHIRLPOOL 08561e6afd6d7839903b8d2454eb9e0203216fbfdc524ac9274997af49a6071cd926747096b0fdd2bfaf97ff8bb0fcdbd39afb41e8aac13d981bd73f80e21b0c
-DIST greenlet-0.4.5.zip 77396 SHA256 b990f00f120c4cfb6672eec2acd32210990a2c7b70b815c034d1d8cbf08e2dbe SHA512 bdef004299e6d9ac457c0884aea69a882f7ee66135ea5da9a231c7f05024413db8ee5bc1e15c4bbc17379130eda5b38948662178fc34c00f96449a6ada6d3e78 WHIRLPOOL 01e06febe2537dd71478f5404d8f545df19af761b13fcd88c8edc1ab6e4a28da48183084800523d603ca9d58f74b7d675ec4f412b635af961be637f6a22a3f82
+DIST greenlet-0.4.12.tar.gz 57319 SHA256 e4c99c6010a5d153d481fdaf63b8a0782825c0721506d880403a3b9b82ae347e SHA512 f3bf0f82b6e3bc687fc9b89469339cfb05e64518d1e49bc96066e8d47b8559f1c1aa53692cd25d839437a2f1b81df6fd9a4509a1b4063ec4ce1d97b73842e9f6 WHIRLPOOL bd6eeca3614487c864c1bd3adadcef714c6fb6358e64bd4e9c3c41d2104a3e1d9f31ace7fcbc13a5cb5f482313baf2085385454e9e65129c9c88359798afecbe
--- a/dev-python/greenlet/greenlet-0.4.12.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.12.ebuild
@ -1,26 +1,28 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 # Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{4,5} )

 inherit distutils-r1 flag-o-matic

 DESCRIPTION="Lightweight in-process concurrent programming"
 HOMEPAGE="https://pypi.python.org/pypi/greenlet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm -hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 -hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"

-DEPEND="app-arch/unzip
+DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
 DISTUTILS_IN_SOURCE_BUILD=1

 python_compile() {
--- a/dev-python/ipython/ipython-5.1.0-r1.ebuild
+++ b/dev-python/ipython/ipython-5.1.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -35,6 +35,7 @@ CDEPEND="
 	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"

 RDEPEND="${CDEPEND}
+	virtual/python-pathlib[${PYTHON_USEDEP}]
 	notebook? (
 		dev-python/notebook[${PYTHON_USEDEP}]
 		dev-python/ipywidgets[${PYTHON_USEDEP}]
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@ -1 +1,2 @@
 DIST line_profiler-1.0.tar.gz 65862 SHA256 a9e0c9ffa814f1215107c86c890afa8e63bec5a37d951f6f9d3668c1df2b1900 SHA512 15dd7ee10951287a5030eaff28e729e82094ec41d8e8dec803d5e44c6b9036ecbf1198365ef43c1fdd28451dec260c6491d118f1762d99fe037bb85eb7908dda WHIRLPOOL 1fd56ea4777a3c569807a124c708018fc77e68521d1f1ecdb13c343ddad3fcd881353cd71a0af36d06a12f1dd17be0f2731040fca5e827a4936298057dabf917
+DIST line_profiler-2.0.tar.gz 68478 SHA256 739f8ad0e4bcd0cb82e99afc09e00a0351234f6b3f0b1f7f0090a8a2fbbf8381 SHA512 c0335fc69fb47c150fa5555af4f7fdf4b172ca12ee6512e04ba854c4a81f3e6ee5594e484d11c8ea7e9e8048e3f3b8661db52332d4ac645195a0e050acea4ecb WHIRLPOOL 6f4a3816fb22c86fe1c691a3e949be41da7680055db5c0909dbfb9af4052cfa50640eca43e0e918e903c23c9e6b8858ebff76e4fa21d8648084ade74f45a2915
--- a/dev-python/line_profiler/line_profiler-2.0.ebuild
+++ b/dev-python/line_profiler/line_profiler-2.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/rkern/line_profiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v "${S}"/tests/ \
+		|| die "Tests failed with ${EPYTHON}"
+}
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@ -1,4 +1,3 @@
-DIST ply-3.4.tar.gz 138342 SHA256 af435f11b7bdd69da5ffbc3fecb8d70a7073ec952e101764c88720cdefb2546b SHA512 6f6ee528393ff83eff2530ca468caf12e4c89b817a38302738597f1478dd41758036c8f32f88f60d1a26e70d9cfceab5530ddcfd3f058c1ee722be95c27e6bcc WHIRLPOOL f2f58e2d0c1170d35554999ca643c102d6821a7535b5782ee7317a4100cf56b5648d643c274cefd66a7b484ae3a9e952bcf4b98d50e7fd1ff220853f982a2f4c
+DIST ply-3.10.tar.gz 150926 SHA256 96e94af7dd7031d8d6dd6e2a8e0de593b511c211a86e28a9c9621c275ac8bacb SHA512 67fa60ea3fe2cafe165b7c105eb4b08c0c75c98720bbbb19da275215b333d3ce0742c90e558fbe97df396c6faaf85da744063728ab211651beae10e0cad01d44 WHIRLPOOL efcf25e904e1a511f659de720afb34b5ca85414285276232427ff5034be03321bd32fa7dec9e666480fc0d7df283412219f7c3d15ad3fb945275949d06731e31
 DIST ply-3.6.tar.gz 281690 SHA256 61367b9eb2f4b819f69ea116750305270f1df8859992c9e356d6a851f25a4b47 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55 WHIRLPOOL 2868a0046519750a446b683a85966650407afc1ea32ab6d8209b46b280529ca6aa8c47816782020b4c90f6f92d4733dd07565b6518e20c7a036d743edc629496
-DIST ply-3.8.tar.gz 157286 SHA256 e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8 SHA512 2c8cf0ee49ca6dec9ec8d5146e98885e871c26125fb5764988fbefae984ee94b4240f265762aaab26d6ec24989b35a4fd6905c3c0d14aac8a085e89b7d6159ef WHIRLPOOL f4258065a479033d2100c2fe9f725a8fbdfb278dabc71a6aa27d7846352dc11496cf34596a0ca0669ce72238702978f1c8a587313410218aa014b80bc98dec37
 DIST ply-3.9.tar.gz 150750 SHA256 0d7e2940b9c57151392fceaa62b0865c45e06ce1e36687fd8d03f011a907f43e SHA512 c3beca6f70e9fdfd11f9fc7beb18efb03f0b32be3cdc949e96c4df3d060e7e9da3ee42d1f58f7a9225d333cb7864a4253fd3a9b75c496364276fe9969ebd7641 WHIRLPOOL bb8371a8a6c95770ba66fd60e1447110ca06fdd124800811c31d9012f99b31bd87cb7aedd0de3f900627135a10556438cc8e0f1a37818d4cea754aceec73f282
--- a/dev-python/ply/ply-3.10.ebuild
+++ b/dev-python/ply/ply-3.10.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )

@ -39,6 +39,6 @@ python_test() {

 python_install_all() {
 	local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( example/. )
+	use examples && dodoc -r example
 	distutils-r1_python_install_all
 }
--- a/dev-python/ply/ply-3.4-r1.ebuild
+++ b/dev-python/ply/ply-3.4-r1.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
-SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="examples"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-# See bug #458648 for reference
-RESTRICT="test"
-
-DOCS=( ANNOUNCE CHANGES README TODO )
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}"/test || die
-
-	local t
-	for t in testlex.py testyacc.py; do
-		"${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@ -1,5 +1,5 @@
 DIST psutil-1.2.1.tar.gz 167397 SHA256 508e4a44c8253a386a0f86d9c9bd4a1b4cbb2f94e88d49a19c1513653ca66c45 SHA512 9faec6c4139f677252b30f4a8793484658d888535428dfb4e316821bb5f246e1832baedd8704279a7e0da7096d539f1a8dcd49f2d61d943f9299e9204ff47d81 WHIRLPOOL e6b13df0c6f70e5d92a88bd540ad2e2f4d670463e1ec815a3eb3b6b009715dd7c0a96b73a03c5819fb3eb3b30f63a1299d6668ffef992a408d8d1b78d33dea43
 DIST psutil-2.1.3.tar.gz 224008 SHA256 b434c75f01715777391f10f456002e33d0ca14633f96fdbd9ff9139b42d9452c SHA512 12a566c2c53897d858bd75455da8f52d9d9279e28dc0df40594275626f75da716d82c8f67d1fc37df4bd3bc05fef401391cb6c52380c819d1e82fb4edd11f843 WHIRLPOOL 75c8475fc55c5a04858ba8acba0e57f9daa06aed6badf68b484d5ff0dc9c6e52066472bb78350113c1ebe755baf4ab205e347cbb5b2bac3eb4857a2fe0dd8f3f
 DIST psutil-4.4.2.tar.gz 1832052 SHA256 1c37e6428f7fe3aeea607f9249986d9bb933bb98133c7919837fd9aac4996b07 SHA512 fff19f729b3f6b9c7015b0830d08d7b6443c9a7062b328c5b52077a035266a9d4657fe61f52a5e4618dcf1d0406d6421c329417605d5807eb3764fb0a7d49d22 WHIRLPOOL 854d5b691c0640104f951ed77c894948fd3362ae3b3337d1f7ff20c04f4a2f49a2fb9cf80f9af6a346a560a3e87a9f42a943d9d9d091c9974b6df9731b0fa2b5
-DIST psutil-5.0.0.zip 374074 SHA256 5411e22c63168220f4b8cc42fd05ea96f5b5e65e08b93b675ca50653aea482f8 SHA512 fda1e6b0a1d54943ceb6e94b4f892d3a3758d947589fd2ada5631f9cfffec4ab7925632d814572cef527b437ea24e0a37244475d634fe86cc0daf5adc2933b27 WHIRLPOOL e1a1c243d45e2e16a665ab1c717b1293b30d55742d8a0af186c25e28891db87df3c3ca1f19833240aae53395400d16f4bd990dee77399bca3bf2cad8fbbb4c99
 DIST psutil-5.0.1.tar.gz 326693 SHA256 9d8b7f8353a2b2eb6eb7271d42ec99d0d264a9338a37be46424d56b4e473b39e SHA512 b455f84da45ee7bfe4d32479bf4c26e293e0d1f71315906677ef72d734bc5fbe4f763f3a140ecff0833f320fb617cac4993e93269365dcaafed606ba90067f79 WHIRLPOOL 702a92a5c6a63172b57212d62c34d6a2ace6a09a72c6a11bfcf601a85302bdf105e9a4cfc0674b8554db82758571161189546626d885fd118ac8027bd574b9a1
+DIST psutil-5.1.1.tar.gz 341006 SHA256 ece06401d719050a84cca97764ff5b0e41aafe6b6a2ec8a1d0bb89ca5e206d0f SHA512 7f23c5eb883c76581371e3382975a34645cddc4f8a4904a6988f9255c6e3799f1fcdf6ac16a9885fbc3a0971864eb2dc727bd7195747ad1d1b1460615397a452 WHIRLPOOL bc6f055a7aa6a2bcfefac67875cbcfaa64c2ba79a0f3143fed15844ddac170abcc5a2baba8660e8723d40b58adff4b53f1a32a286ba3b5d7d035da9c2306f97f
--- a/dev-python/psutil/psutil-5.1.1.ebuild
+++ b/dev-python/psutil/psutil-5.1.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -10,7 +10,7 @@ inherit distutils-r1

 DESCRIPTION="Retrieve information on running processes and system utilization"
 HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.python.org/pypi/psutil/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
--- a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"

 LICENSE="PSF-2 public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp test"

 RDEPEND="gmp? ( dev-libs/gmp:0= )"
--- a/dev-python/pylint/pylint-1.6.5.ebuild
+++ b/dev-python/pylint/pylint-1.6.5.ebuild
@ -50,7 +50,10 @@ python_test() {

 python_install_all() {
 	doman man/{pylint,pyreverse}.1
-	use examples && local EXAMPLES=( examples/. )
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
 	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
 	distutils-r1_python_install_all
 }
--- a/dev-ros/rqt_action/Manifest
+++ b/dev-ros/rqt_action/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_action/rqt_action-0.4.5.ebuild
+++ b/dev-ros/rqt_action/rqt_action-0.4.5.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Introspect all available ROS action (from actionlib) types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rqt_msg[${PYTHON_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_bag/Manifest
+++ b/dev-ros/rqt_bag/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_bag/rqt_bag-0.4.5.ebuild
+++ b/dev-ros/rqt_bag/rqt_bag-0.4.5.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+"
--- a/dev-ros/rqt_bag_plugins/Manifest
+++ b/dev-ros/rqt_bag_plugins/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.5.ebuild
+++ b/dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.5.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for displaying and replaying ROS bag files"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rqt_bag[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_console/Manifest
+++ b/dev-ros/rqt_console/Manifest
@ -1,2 +1,3 @@
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_console/rqt_console-0.4.5.ebuild
+++ b/dev-ros/rqt_console/rqt_console-0.4.5.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for displaying and filtering ROS messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	dev-ros/rqt_logger_level[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_dep/Manifest
+++ b/dev-ros/rqt_dep/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_dep/rqt_dep-0.4.5.ebuild
+++ b/dev-ros/rqt_dep/rqt_dep-0.4.5.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for visualizing the ROS dependency graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
+	dev-ros/qt_gui[${PYTHON_USEDEP}]
+	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
+	dev-ros/rqt_graph[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
--- a/dev-ros/rqt_graph/Manifest
+++ b/dev-ros/rqt_graph/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_graph/rqt_graph-0.4.5.ebuild
+++ b/dev-ros/rqt_graph/rqt_graph-0.4.5.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for visualizing the ROS computation graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosnode[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosservice[${PYTHON_USEDEP}]
+	dev-ros/rostopic[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_image_view/Manifest
+++ b/dev-ros/rqt_image_view/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_image_view/rqt_image_view-0.4.5.ebuild
+++ b/dev-ros/rqt_image_view/rqt_image_view-0.4.5.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for displaying images using image_transport"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge[${PYTHON_USEDEP}]
+	dev-ros/image_transport
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	>=dev-ros/rqt_gui_cpp-0.3
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_launch/Manifest
+++ b/dev-ros/rqt_launch/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_launch/rqt_launch-0.4.5.ebuild
+++ b/dev-ros/rqt_launch/rqt_launch-0.4.5.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Easy view of .launch files"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+	dev-ros/roslaunch[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rqt_console[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_logger_level/Manifest
+++ b/dev-ros/rqt_logger_level/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_logger_level/rqt_logger_level-0.4.5.ebuild
+++ b/dev-ros/rqt_logger_level/rqt_logger_level-0.4.5.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for configuring the logger level of ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/rosnode[${PYTHON_USEDEP}]
+	dev-ros/rosservice[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_msg/Manifest
+++ b/dev-ros/rqt_msg/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_msg/rqt_msg-0.4.5.ebuild
+++ b/dev-ros/rqt_msg/rqt_msg-0.4.5.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python GUI plugin for introspecting available ROS message types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+	dev-ros/rqt_console[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_plot/Manifest
+++ b/dev-ros/rqt_plot/Manifest
@ -1,2 +1,3 @@
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_plot/rqt_plot-0.4.5.ebuild
+++ b/dev-ros/rqt_plot/rqt_plot-0.4.5.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin visualizing numeric values in a 2D plot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	|| ( dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/pyqwt:5[${PYTHON_USEDEP}] )
+	dev-python/pyqtgraph[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/rostopic[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_publisher/Manifest
+++ b/dev-ros/rqt_publisher/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_publisher/rqt_publisher-0.4.5.ebuild
+++ b/dev-ros/rqt_publisher/rqt_publisher-0.4.5.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for publishing arbitrary messages with fixed or computed field values"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_py_common/Manifest
+++ b/dev-ros/rqt_py_common/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_py_common/rqt_py_common-0.4.5.ebuild
+++ b/dev-ros/rqt_py_common/rqt_py_common-0.4.5.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common functionality for rqt plugins written in Python"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/qt_gui[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rostopic[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_py_console/Manifest
+++ b/dev-ros/rqt_py_console/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_py_console/rqt_py_console-0.4.5.ebuild
+++ b/dev-ros/rqt_py_console/rqt_py_console-0.4.5.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python GUI plugin providing an interactive Python console"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/qt_gui[${PYTHON_USEDEP}]
+	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_reconfigure/Manifest
+++ b/dev-ros/rqt_reconfigure/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.5.ebuild
+++ b/dev-ros/rqt_reconfigure/rqt_reconfigure-0.4.5.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rqt_console[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/dev-ros/rqt_service_caller/Manifest
+++ b/dev-ros/rqt_service_caller/Manifest
@ -5,3 +5,4 @@ DIST rqt_common_plugins-0.4.1.tar.gz 239721 SHA256 0fc1b6d443e346157baa7814f23e8
 DIST rqt_common_plugins-0.4.2.tar.gz 241741 SHA256 6647c4cf40ed49804beca8a45927f78ac0274c37bd4e9f0ed629d20f92549173 SHA512 e83b4f50aadb3ee1b5c696b95b024ea55d39eaff113da8ecdc9f7f28ba97853c92b88438e02c18c3650874e13b14aacb5be0c6f426552e41c85b8cfe5ff48992 WHIRLPOOL fac39062a4a093877040c2cb21c8fbb83e7bf820ea8a18a95183c447622699927f0edb5e9beab2c907f927a4476c292f4906a9f8af6b0f995b377f752f1a8ce7
 DIST rqt_common_plugins-0.4.3.tar.gz 242040 SHA256 a11a7cf416e6493776575e3795291a2a4cd215ce5c8090e4cd7cb361055db9c2 SHA512 91957bd70fe157e479ad982de7335210244479e238b814233f29b15f44f52cd443d890c0f626dccff69b55b462d514b879bb9e1321f4f9d169e28a42acba9ca7 WHIRLPOOL af7073935d6d7013342975ff8809dd0060c35d8a1fa92b289183f6e870246b4a3ab2214bdda545ed9644900b89822bedbf842284d34ee5b6b5fe8741537d4c24
 DIST rqt_common_plugins-0.4.4.tar.gz 245149 SHA256 926b7835d4feea276518e9331de9bc3d25f8484ceb89d893948e6f2bf432cc7e SHA512 faa1e435aed0e158c802ac3b7cdf04a0fbf4cb340f2ed598970990827d384c5153a52657a474bf95af022166e5f6fb9acc926d1943b0093fea16c86699922d81 WHIRLPOOL 34848b6364af474072ef937f77deb583705db62a0e4ade7cc3b060e22af1a419c9beae4951791d81f0750619836cbbb9097956f9ec25f5768113dba253553d91
+DIST rqt_common_plugins-0.4.5.tar.gz 245843 SHA256 11edfe5c636957714ca7ac9a525f5cee6e7cf39048fbdf8a6484ca5cc3f6a926 SHA512 713cd232a12019026fae66cee1f2169b375ff8e359204b723057761953d5e15fc4aaffe99ded71cc237abe1d73d011454a8ba321c8a5401a0eceb9479e577325 WHIRLPOOL a2d1644651a79132087def58dbfdf39e333de26b5339767a72b4ac4af1baf7ce9af93908a57bf5fcc7f39c7e7d2464b12685727e2c48107723af43a9e759d8b0
--- a/dev-ros/rqt_service_caller/rqt_service_caller-0.4.5.ebuild
+++ b/dev-ros/rqt_service_caller/rqt_service_caller-0.4.5.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for calling arbitrary services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/rosservice[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST rdup-1.1.15.tar.gz 333646 SHA256 787b8c37e88be810a710210a9d9f6966b544b1389a738aadba3903c71e0c29cb SHA512 e377ec29e0dacae306ee58c935c9738f32d177e1c2575e4fa3618d2753d248f2898633dde46da81410271205458ccf0d3d885e3eebc5f1948afc5cd9e99ce7c3 WHIRLPOOL a82eac7a80ab02436343687f62bbab643027854771e2031d577abc71495aa7e63c0185580466527704906035e023372809088b8a08686ce438211ddffb7b5521`