Sync with portage [Sat Nov 11 16:52:37 MSK 2017].

app-admin/tripwire/tripwire-2.4.3.6.ebuild

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE="libressl selinux ssl static +tools"
 
 DEPEND="sys-devel/automake

app-backup/spideroak-bin/Manifest

@@ -1,2 +1,4 @@
 DIST spideroak-bin-6.3.0_amd64.deb 26863968 SHA256 553aa6fb4d1b5ed105a67adfdd56b817f5236b0a8fe3f278a45f80e74d3ff806 SHA512 d1eadf017a63bf328ae25d3d4bd6d6d7a69b6d04917ae8f1bd913c4276c477effb397d254c94526c81ae8e0f08d6d13ab98d607389d1f3df8fb02b7acb5e0661 WHIRLPOOL bf6101dd6b496dfa3f9c3a2a3addb870a01187545251ef8e2610b22b2f7966177f1170e6d06163c4670aaa6b664af7d64464d2f6a63411c0c2a90c9aad578afe
 DIST spideroak-bin-6.3.0_x86.deb 26385528 SHA256 91e83928bf3259f43c8aeea67ec70288b4b56221b1434a7ce9b723f99e5f2b28 SHA512 356b00f730fdbbf6a88a720bd0f546c8dec231c7601c1a8c2a78f085e972ea087b96eb6670ede7e593cf508ed56bda571af65a23560baf0869148d66057bc9bd WHIRLPOOL 81747c30f75f55d5586bd53be068c79b14c2c173fdbf5a5969ad682872e2fbda43a3919662221fb945b1a46fead04dd5eb8dee27c2919aa6dc030b2e2b7b2b98
+DIST spideroak-bin-6.4.0_amd64.deb 26882606 SHA256 a94d4ad3657d7437ee4ef5b7a5feb2687b78dafab45f94c6cb2fb5f246c9dcfe SHA512 23283574955833199cc86be9eec3781c190da8a0885c31b20bfb7f73976c8e3663c76571ddf5f2c9e9d2377d71121f605ce7698788704b482dbce8290e77a7e2 WHIRLPOOL bb01e1af96612d36baa15d9e7ab22c400e702c1b04d9afadab78b8318fa7a47de7524d3d1b50825542f16bd5ee86069f9b50d79a459521e3aebb73284fd80d08
+DIST spideroak-bin-6.4.0_x86.deb 26402134 SHA256 63252488965c5098d0b0a68be6118276a546ca61ae6ef8495d4db820e3a15319 SHA512 3945d671f0dff0e193bf0cd951d2380f50f28921ab3166d26cebf2564caef03e46967c0032b2da02b012ab4c71332af869d117e0ac7c5dfde99dc1e9d9399d5e WHIRLPOOL 1af45020968e4416f85c5dcd619b77a56aea3a13043e529deb7a899e93cf5614a33b959ad1b8424c518905d0f2317b6157a31603ca3cdf4ae866a5d86b570836

app-backup/spideroak-bin/spideroak-bin-6.4.0.ebuild

@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils unpacker
+
+DESCRIPTION="Secure free online backup, storage, and sharing system"
+HOMEPAGE="https://spideroak.com"
+
+SRC_URI_BASE="https://spideroak.com/release/spideroak"
+SRC_URI="x86? ( ${SRC_URI_BASE}/deb_x86 -> ${P}_x86.deb )
+	amd64? ( ${SRC_URI_BASE}/deb_x64 -> ${P}_amd64.deb )"
+
+RESTRICT="mirror strip"
+
+LICENSE="spideroak"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus X"
+
+DEPEND="dev-util/patchelf"
+RDEPEND="
+	app-crypt/mit-krb5[keyutils]
+	media-libs/libpng:1.2
+	dbus? ( sys-apps/dbus )
+	X? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		dev-libs/glib:2
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_prepare() {
+	# Set RPATH for preserve-libs handling (bug #400979).
+	cd "${S}/opt/SpiderOakONE/lib" || die
+	local x
+	for x in `find` ; do
+		# Use \x7fELF header to separate ELF executables and libraries
+		[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+		patchelf --set-rpath '$ORIGIN' "${x}" || \
+			die "patchelf failed on ${x}"
+	done
+
+	#Remove the libraries that break compatibility in modern systems
+	#SpiderOak will use the system libs instead
+	rm -f "${S}/opt/SpiderOakONE/lib/libstdc++.so.6"
+	rm -f "${S}/opt/SpiderOakONE/lib/libgcc_s.so.1"
+	rm -f "${S}/opt/SpiderOakONE/lib/libpng12.so.0"
+	rm -f "${S}/opt/SpiderOakONE/lib/libz.so.1"
+
+	eapply_user
+}
+
+src_install() {
+	#install the wrapper script
+	exeinto /usr/bin
+	doexe usr/bin/SpiderOakONE
+
+	# inotify_dir_watcher needs to be marked executable, bug #453266
+	#chmod a+rx opt/SpiderOakONE/lib/inotify_dir_watcher
+
+	#install the executable
+	exeinto /opt/SpiderOakONE/lib
+	doexe opt/SpiderOakONE/lib/SpiderOakONE
+	doexe opt/SpiderOakONE/lib/inotify_dir_watcher
+	rm -f opt/SpiderOakONE/lib/{SpiderOakONE,inotify_dir_watcher}
+
+	#install the prebundled libraries
+	insinto /opt/SpiderOakONE
+	doins -r opt/SpiderOakONE/lib
+
+	#install the config files
+	use dbus || rm -rf etc/dbus-1
+	insinto /
+	doins -r etc
+
+	#install the manpage
+	doman usr/share/man/man1/SpiderOakONE.1.gz
+
+	if use X; then
+		domenu usr/share/applications/SpiderOakONE.desktop
+		doicon usr/share/pixmaps/SpiderOakONE.png
+	fi
+}
+
+pkg_postinst() {
+	if ! use X; then
+		einfo "For instructions on running SpiderOakONE without a GUI, please read the FAQ:"
+		einfo "  https://spideroak.com/faq/questions/62/how_do_i_install_spideroak_on_a_headless_linux_server/"
+		einfo "  https://spideroak.com/faq/questions/67/how_can_i_use_spideroak_from_the_commandline/"
+	fi
+}

app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild

@@ -14,7 +14,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +keyutils libressl nls openldap +pkinit selinux +threads test xinetd"
 
 CDEPEND="

app-emulation/qemu/qemu-2.10.0-r1.ebuild

@@ -164,6 +164,14 @@ X86_FIRMWARE_DEPEND="
 		>=sys-firmware/seabios-1.10.2[seavgabios]
 		sys-firmware/sgabios
 	)"
+PPC64_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.10.2[binary,seavgabios]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+	)
+"
 
 CDEPEND="
 	!static? (
@@ -171,7 +179,9 @@ CDEPEND="
 		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
 	)
 	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )"
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
+"
 DEPEND="${CDEPEND}
 	dev-lang/perl
 	=dev-lang/python-2*
@@ -698,7 +708,8 @@ src_install() {
 		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
 		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
 		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		# PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
 			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
 			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
 			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin

app-emulation/qemu/qemu-9999.ebuild

@@ -164,6 +164,14 @@ X86_FIRMWARE_DEPEND="
 		>=sys-firmware/seabios-1.10.2[seavgabios]
 		sys-firmware/sgabios
 	)"
+PPC64_FIRMWARE_DEPEND="
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.10.2[binary,seavgabios]
+	)
+	!pin-upstream-blobs? (
+		>=sys-firmware/seabios-1.10.2[seavgabios]
+	)
+"
 
 CDEPEND="
 	!static? (
@@ -171,7 +179,9 @@ CDEPEND="
 		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
 	)
 	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
-	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )"
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
+"
 DEPEND="${CDEPEND}
 	dev-lang/perl
 	=dev-lang/python-2*
@@ -695,7 +705,8 @@ src_install() {
 		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
 		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
 		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+		# PPC64 loads vgabios-stdvga
+		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
 			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
 			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
 			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin

app-emulation/wine-any/wine-any-2.0-r1.ebuild

@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.bz2"
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.bz2"
 	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"

app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild

@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.bz2"
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.bz2"
 	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"

app-emulation/wine-staging/wine-staging-2.0-r1.ebuild

@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.bz2"
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.bz2"
 	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"

app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild

@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.bz2"
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.bz2"
 	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"

app-emulation/wine-vanilla/wine-vanilla-2.0.ebuild

@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(get_version_component_range 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.bz2"
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.bz2"
 	KEYWORDS="-* amd64 x86 ~x86-fbsd"
 fi
 S="${WORKDIR}/${MY_P}"

app-i18n/anthy/anthy-9100h-r2.ebuild

@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="canna-2ch emacs static-libs"
 
 RDEPEND="canna-2ch? ( app-dicts/canna-2ch )

app-misc/activylircd/metadata.xml

@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>vdr@helmutauer.de</email>
-  <name>Helmut Auer</name>
-  <description>Proxy maintaining</description>
-</maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

app-office/libreoffice/libreoffice-5.4.3.2.ebuild

@@ -71,7 +71,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip

app-office/libreoffice/libreoffice-5.4.9999.ebuild

@@ -71,7 +71,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip

app-office/libreoffice/libreoffice-9999.ebuild

@@ -70,7 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip

app-office/skrooge/Manifest

@@ -1,3 +1,3 @@
-DIST skrooge-2.10.3.tar.xz 19313088 SHA256 1bb973c4e21fd5614b5f2822d8405e5c2e3707ba9b9f0fc92c80995efbbe530f SHA512 13a6f133507bf54ea6cdceb7358ccc6e53be856420d5d473bd98ef8dabe256ac185e9aa514e9649ec01d2454d247ec7277b69fe45e0887fb2f99952a4672b5c2 WHIRLPOOL 275c83c8b28cbe2896e634e8eb7df86a6407be23b522b5c7078a2cb678404674aaccb2a84dd892d746b903cdb995909d3288f2da881106687e0d494590b0d1a2
+DIST skrooge-2.10.5.tar.xz 19309980 SHA256 56a0124dec34e6e96a5e71ff0e825a7ec79f32a69ef0ccdc5f0f9b753d8c3eb0 SHA512 02fdee00b430ffba8c05222b87da31f5d2390634e816e141806fc4e3cceab83134ccda9619ff944f70eb704af4d2ee08338bf196ad7dcea8221a05d13e1b4c8e WHIRLPOOL 362d2269ec371a50dd1f15e7a21f2fcfe3341e49a446f4668b49ad32c895835ed8115b183b2c00ce2959046f545951570ab303b06c5f97764f03a70f19185c4c
 DIST skrooge-2.8.1.tar.xz 19299556 SHA256 8f166db74a27db0ce0ea197f89dfd021224afc3e4875e36438a4496f10746460 SHA512 864de0c9e8876b87ab4100b0d48ea8e573655ebad5175333230ff715faa46077b96e25b91e767da864196960de14df9b9fee5b561e4d51b03a80fb58a070755f WHIRLPOOL 12d1455493fd32dd61cb0543a2365444f0fd1fa5b08214760f7c3b58836c3ac55a480f322cbea61eb13675b9698531fa860f8a2b4c9a915a789fc95bedc8b269
 DIST skrooge-2.9.0.tar.xz 19310412 SHA256 ad02403026b649203f0381cc599a7754d36f41cc75cc03d14e63bfdb666e7bb5 SHA512 cbcd1e9c00509d6aa387f83f3a245b20c856e936095d8bb16ec7ab6898131a24edda8a4e9ee20323c7d04ab56194b8d4720a77b8d10699e64e8dbacbe9bb868c WHIRLPOOL 2ecc558add9160c724e2ff9623baa205e54ce45b385f63cc1d2151ce75dc79c65e7608abf419721761c19f3cffbe80a16db9876bdc4cc756d531a85a42bbec28

app-text/libabw/libabw-0.1.1.ebuild

@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="Library parsing abiword documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
-SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
+SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"

app-text/libexttextcat/libexttextcat-3.4.5.ebuild

@@ -9,7 +9,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""

app-text/libstaroffice/Manifest

@@ -1,3 +1,2 @@
-DIST libstaroffice-0.0.3.tar.xz 679800 SHA256 bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6 SHA512 ea60576537761a5b969a861ac43c8d4a9da5e5261d0a31f3d7743f8507e6979ccd4cba1784e8c3d909c08b692349ae11e87428834fd3df5b8d56e423caa7bcd8 WHIRLPOOL c8ba69eb347aa0c77f886511d79dba5011aa0ff25c3e9f4ec4af31b8b9303fd9dc1df32742bbc3c87d2a7fba32a7f830fdc3a38ca391559038388f4d97afe9af
 DIST libstaroffice-0.0.4.tar.xz 681828 SHA256 6e728784d002144716b10fe122973b3e4edda9004538386b0b58bb303404903a SHA512 d591e554ce108165f1952ae82835241df0f986ce51f1a4fe43d282733358bb8d72418621f91f431367a5c09f9a40a9784666ffa2da303c5543ee000b1d6abf38 WHIRLPOOL ac295aa290f92bc2071a56439dafb4280c52e2de8e36e6e686cdf31150bff8c87989bbc693cc4175d96c1ae5a155f21bb8f9344b0ed10920ebec161ba20a7110
 DIST libstaroffice-0.0.5.tar.xz 682380 SHA256 315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982 SHA512 937fc618bef79c9e25957f25f39bc829621b0a2da0213cbfb1b56c2b00d44f61bcd9db67d3e6329a4bd700a2c88fc743088381f58a96a87712b040c0ffc17fde WHIRLPOOL 13d97a0253020fcf485841fe7657fd1a8de54d0afddbcfb16624eb63bc0983b028cdfe5ba5c6666b570ac6e4578c47a452c9b6f1b79016989d7896045db70625

app-text/libstaroffice/libstaroffice-0.0.3.ebuild

@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-DESCRIPTION="Import filter for old StarOffice documents"
-HOMEPAGE="https://github.com/fosnola/libstaroffice"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="debug doc tools +zlib"
-
-RDEPEND="
-	dev-libs/librevenge
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable tools) \
-		$(use_enable zlib zip)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}

app-text/xapian-omega/xapian-omega-1.4.4.ebuild

@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30

app-text/xapian-omega/xapian-omega-1.4.5.ebuild

@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30

dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch

@@ -0,0 +1,35 @@
+Bug: https://bugs.gentoo.org/608294
+PR: https://github.com/FirebirdSQL/firebird/pull/104
+
+--- a/src/common/classes/alloc.h
++++ b/src/common/classes/alloc.h
+@@ -498,10 +498,14 @@ using Firebird::MemoryPool;
+
+ inline static MemoryPool* getDefaultMemoryPool() { return Firebird::MemoryPool::processMemoryPool; }
+
++#if (( ! __GNUC__ ) || ( __GNUC__ < 6 ))
++
+ // Global versions of operators new and delete
+ void* operator new(size_t s) THROW_BAD_ALLOC;
+ void* operator new[](size_t s) THROW_BAD_ALLOC;
+
++#endif
++
+ void operator delete(void* mem) throw();
+ void operator delete[](void* mem) throw();
+
+--- a/src/dudley/exe.epp
++++ b/src/dudley/exe.epp
+@@ -2884,9 +2884,9 @@ static USHORT get_prot_mask( const TEXT * relation, TEXT * field)
+ 		blr_parameter, 0, 0, 0,
+ 		blr_parameter, 0, 1, 0,
+ 		blr_parameter, 1, 0, 0,
+-		blr_end,
+-		blr_end,
+-		blr_end,
++		static_cast<SCHAR>(blr_end),
++		static_cast<SCHAR>(blr_end),
++		static_cast<SCHAR>(blr_end),
+ 		blr_eoc
+ 	};
+ 	static FB_API_HANDLE req_handle;

dev-db/firebird/firebird-2.5.7.27050.0.ebuild

@@ -35,7 +35,10 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="userpriv"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
 
 S="${WORKDIR}/${MY_P}"
 

dev-db/m17n-db/m17n-db-1.7.0.ebuild

@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh ~sparc x86"
 IUSE=""
 
 DEPEND="sys-devel/gettext"

dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild

@@ -8,15 +8,15 @@ MYSQL_PV_MAJOR="5.6"
 #fails to build with ninja
 CMAKE_MAKEFILE_GENERATOR=emake
 
-inherit mysql-multilib-r1
+inherit java-utils-2 mysql-multilib-r1
 # only to make repoman happy. it is really set in the eclass
 IUSE="$IUSE numa"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~amd64 ~x86"
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) numa? ( sys-process/numactl )"
-RDEPEND="!media-sound/amarok[embedded]  numa? ( sys-process/numactl )"
+COMMON_DEPEND="numa? ( sys-process/numactl ) dev-libs/libevent:0= ${JAVA_PKG_E_DEPEND}"
+DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=virtual/jdk-1.6"
+RDEPEND="${COMMON_DEPEND} !media-sound/amarok[embedded] >=virtual/jre-1.6"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 
@@ -30,12 +30,20 @@ PATCHES=(
 	"${MY_PATCH_DIR}"/30000_all_mysql-cluster-multilib-property.patch
 )
 
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/storage/ndb/ndb_types.h )
+
 # Please do not add a naive src_unpack to this ebuild
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
+pkg_setup() {
+	mysql-multilib-r1_pkg_setup
+	java-pkg_init
+}
+
 src_prepare() {
 	mysql-multilib-r1_src_prepare
+	java-utils-2_src_prepare
 	if use libressl ; then
 		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
 			"${S}/cmake/ssl.cmake" || die
@@ -45,10 +53,19 @@ src_prepare() {
 src_configure() {
 	# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
 	# disable until we see what happens with it
-	local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 -DWITH_NUMA=$(usex numa ON OFF) )
+	local MYSQL_CMAKE_NATIVE_DEFINES=(
+		-DWITHOUT_VALIDATE_PASSWORD=1
+		-DWITH_NUMA=$(usex numa ON OFF)
+		-DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1
+		-DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
 	mysql-multilib-r1_src_configure
 }
 
+pkg_preinst() {
+	java-utils-2_pkg_preinst
+	mysql-multilib-r1_pkg_preinst
+}
+
 # Official test instructions:
 # USE='extraengine perl openssl' \
 # FEATURES='test userpriv -usersandbox' \
@@ -61,6 +78,14 @@ multilib_src_test() {
 		return 0;
 	fi
 
+	_disable_test() {
+		local rawtestname reason
+		rawtestname="${1}" ; shift
+		reason="${@}"
+		ewarn "test '${rawtestname}' disabled: '${reason}'"
+		echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
+	}
+
 	local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test"
 	local retstatus_unit
 	local retstatus_tests
@@ -91,6 +116,7 @@ multilib_src_test() {
 		# create symlink for the tests to find mysql_tzinfo_to_sql
 		ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
 
+		touch "${T}/disabled.def"
 		# These are failing in MySQL 5.5/5.6 for now and are believed to be
 		# false positives:
 		#
@@ -118,16 +144,16 @@ multilib_src_test() {
 			main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
 			perfschema.binlog_edge_mix \
 			perfschema.binlog_edge_stmt \
-			rpl.rpl_plugin_load ndb.ndb_tools_connect main.mysql \
-			main.mysql_upgrade unit_tests \
+			rpl.rpl_plugin_load main.mysql \
+			main.mysql_upgrade \
 		; do
-				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo"
+				_disable_test  "$t" "False positives in Gentoo"
 		done
 		# ndb.ndbinfo, ndb_binlog.ndb_binlog_index: latin1/utf8
 		for t in \
-			ndb.ndbinfo \
+			ndb.ndbinfo ndb.ndb_tools_connect \
 			ndb_binlog.ndb_binlog_index ; do
-				mysql-multilib-r1_disable_test  "$t" "False positives in Gentoo (NDB)"
+				_disable_test  "$t" "False positives in Gentoo (NDB) (Latin1/UTF8)"
 		done
 
 		# Set file limits higher so tests run
@@ -138,7 +164,8 @@ multilib_src_test() {
 
 		# run mysql-test tests
 		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--suite-timeout=5000 --reorder
+			--suite-timeout=5000 --reorder --skip-test-list="${T}/disabled.def" \
+			--nounit-tests
 		retstatus_tests=$?
 
 		popd > /dev/null || die

dev-db/postgresql/postgresql-9.2.24.ebuild

@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 

dev-db/postgresql/postgresql-9.3.20.ebuild

@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 

dev-db/postgresql/postgresql-9.4.15.ebuild

@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 

dev-db/postgresql/postgresql-9.5.10.ebuild

@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 

dev-db/postgresql/postgresql-9.6.6.ebuild

@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 

dev-libs/hyphen/Manifest

@@ -1,2 +1 @@
-DIST hyphen-2.8.6.tar.gz 636800 SHA256 155cc1be5f406a4f3e55cd5154dd30353652f4da6cff0f600be4f1f67c127208 SHA512 37ca403af59b1e5b254dff69bdf46f933818385517bbd93c3f9b3c177a05408d971b14d2e4b98922a0c274e490a1e23fc468a12984a2802f42c5e67fc0f9ad34 WHIRLPOOL a4a2a40e94925a96af89b70ea980f399eab90dfb640a11aa04617ee5d3a41026c59f2120473fc69b72c0a678590f53979b2e3773474b4c4506a5f104609aa5bf
 DIST hyphen-2.8.8.tar.gz 638369 SHA256 304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705 SHA512 ee514952be56869840b70fb74f60eba14dc4de246733ff8705492367e8cf00c485f8778a9d5a7ba374c988d4ac9fedbe75826dc559e1b62465dbfba21f6ce7de WHIRLPOOL a864236d9182e5c336a0d37f1740b698754900422bc034199cb9be628bdb141072edd24a220388c2e995e82e032709fdd5e61377c36322523e9d7591c656f0e1

dev-libs/hyphen/hyphen-2.8.6.ebuild

@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="ALTLinux hyphenation library"
-HOMEPAGE="http://hunspell.github.io/"
-SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="app-text/hunspell"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	rm -f "${ED}"usr/lib*/libhyphen.la
-}

dev-libs/libressl/libressl-2.6.3-r2.ebuild

@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="http://www.libressl.org/"
+SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/44"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+asm static-libs"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	eapply_user
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}

dev-libs/libressl/libressl-2.6.3.ebuild

@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="https://www.libressl.org"
-SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/44"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm nc static-libs"
-
-RDEPEND="
-	!dev-libs/openssl:0
-	nc? ( !net-analyzer/openbsd-netcat )"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	# Correct hardcoded paths to use ca-certificates instead of cert.pem
-	find "${S}"/{apps,crypto,tls} -type f -exec \
-		sed -e 's|/cert.pem|/certs/ca-certificates.crt|' -i {} \; || die
-
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_ASM=$(usex asm)
-		-DENABLE_NC=$(usex nc)
-		-DOPENSSLDIR="${EPREFIX}"/etc/ssl
-		-DUSE_SHARED=1
-	)
-
-	cmake-multilib_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# Delete cert.pem
-	rm "${ED}"/etc/ssl/cert.pem || die
-
-	if ! use static-libs ; then
-		find "${D}" -name '*.a' -exec rm -f {} + || die
-	fi
-}

dev-libs/libressl/metadata.xml

@@ -11,7 +11,6 @@
 	</longdescription>
 	<use>
 		<flag name="asm">Enables assembly</flag>
-		<flag name="nc">Installs the libtls-based netcat binary</flag>
 	</use>
 	<upstream>
 		<changelog>http://www.libressl.org/releases.html</changelog>

dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild

@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
 
 RDEPEND="~dev-db/m17n-db-${PV}

dev-libs/oniguruma/oniguruma-6.6.1.ebuild

@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/4"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"

dev-libs/openssl/openssl-1.0.2m.ebuild

@@ -12,7 +12,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 

dev-libs/xapian-bindings/xapian-bindings-1.4.4.ebuild

@@ -20,7 +20,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
 

dev-libs/xapian/xapian-1.4.4.ebuild

@@ -13,7 +13,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
 
 DEPEND="sys-libs/zlib"

dev-ml/bin-prot/Manifest

@@ -1,2 +1,3 @@
 DIST bin-prot-0.9.0.tar.gz 338958 SHA256 1fc88602788a802570ba81376a71dd76a1815b74ce80245e3fc4cfd7e259817e SHA512 111e0a9d07bdf22db6e3e7e9a165d196a264a3652e4cc363ec8f49c4ef385b8b76982a9d42fa8e0954e15a4a80c35ca6876c70fe6f20d7497fd8a2d53fab24c1 WHIRLPOOL 2d0fe47a957023d99bcde79146bef54c6e15801427db83697d16506d508231e95d6983f506502661740636ede95d2b36144c6d2f0953169785b27abe4d894764
 DIST bin-prot-0.9.1.tar.gz 338969 SHA256 b301a350fc951cbaba711c28395802121752a0ee927f0ec14fdd74ba4af1cb42 SHA512 6575f51931c6dfb0f640bc6eb8bb789fd1ca4b1ca95876df906bd5d5c3320dc8aebedd44b5c6feee6b66b40007bd0077da6cc628c791daba0c8cf806d7af7b9c WHIRLPOOL b6113a806457f7982b0e018d7fd828eb57156bc6e541fa0812565710861de5a1c4d955e194f7ca1da77fb8f9c9dd6db2d6a9d18d6db92bd024bd045c93a5e676
+DIST bin-prot-0.9.2.tar.gz 339008 SHA256 abf3743bf22584c905d3bdb1130aae8fa6cb970f0645d61cbcde3eb807068b86 SHA512 a4aa453ff4d2037b8ed0e53186fafa876a96ecb970ef25e99cf133afa4615b8fc53de75234454519a4f7c11f771f98e8117f8fa37682dbb8f73d4fda8a1805f7 WHIRLPOOL c54c3aec6e2f500793b008a6a3401c69d6525113c98fc6ae1d0bf6c6dd1c4dce120299d8635c7292c14261409d7a00f4b4e868192a73f4f2f17568cd7986ab4d

dev-ml/bin-prot/bin-prot-0.9.2.ebuild

@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Binary protocol generator"
+HOMEPAGE="https://github.com/janestreet/bin_prot"
+SRC_URI="https://github.com/janestreet/bin_prot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-lang/ocaml:=
+	dev-ml/base:=
+	dev-ml/ppx_compare:=
+	dev-ml/ppx_custom_printf:=
+	dev-ml/ppx_core:=
+	dev-ml/ppx_driver:=
+	dev-ml/ppx_fields_conv:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_type_conv:=
+	dev-ml/ppx_variants_conv:=
+	dev-ml/sexplib:=
+	dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+S="${WORKDIR}/bin_prot-${PV}"
+
+src_test() {
+	jbuilder runtest || die
+}
+
+src_install() {
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		${PN/-/_}.install || die
+	dodoc CHANGES.md README.md
+}

dev-ml/core/Manifest

@@ -1 +1,2 @@
 DIST core-0.9.1.tar.gz 735006 SHA256 a8d34b76afd8ad5ac525471e7f01d4291203a4b83b9e3051314af13cb169a3ba SHA512 2d4a7ff753cb0415cc6a957fff53037aad65053d3c3531070663b4bcf4462982c811a586a39ea3a223aca02cae9212c300b6788266ac60213437dc99ecc0a29a WHIRLPOOL c6e6a9f2e9f29ad04b5850706f116ae23d2cb26550dc1113653c0c857f9f183a9dc6644121aeff2526ef7fd48a4fadc7b8407d615fe3395cf0f526891aaa6699
+DIST core-0.9.2.tar.gz 735027 SHA256 6549b3312f68c84049d3389747406cf41d9c66148b7dc3e2af8563985d2b95df SHA512 8cef59c353ff6f98b11bb007b99a583b64ee23f960a0de6559866c8ab59a58dd3ca4dae16275c87b780494b64ced7aaa24db8f9a6e6d309662e9d9206f04e335 WHIRLPOOL 18df0d7956bd18ac6afb91e9ae60db54937d35083fd48950ef142d0f137ea64adfe8d9241cfae30850afa1baaf26c4d9275748c6ed820e4ddc36862496bbb246

dev-ml/core/core-0.9.2.ebuild

@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="https://github.com/janestreet/core"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-ml/base:=
+	dev-ml/configurator:=
+	dev-ml/core_kernel:=
+	dev-ml/ppx_assert:=
+	dev-ml/ppx_driver:=
+	dev-ml/ppx_jane:=
+	dev-ml/sexplib:=
+	dev-ml/spawn:=
+	dev-ml/stdio:=
+	dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND} dev-ml/jbuilder"

dev-ml/core_kernel/Manifest

@@ -1 +1,2 @@
 DIST core_kernel-0.9.0.tar.gz 502937 SHA256 41a4784443751eac917ed3c92f21afa8515a2785a7ae4ec83697192b463b8364 SHA512 c262f25636d7a5105810c9588774a56e21e58cd156302781db3463898be0a42d9c8b1984ead739d0659d6f3eece4a305fc45c7cad4ed57149d26344affbdb668 WHIRLPOOL f54ac9cbce0caa8a1597035e4beb595f1fc0cf7f9070907a8d666cc4d17f1d19a7aba9e590f780ad7142360d9dc59cdc665584bb171364384e499736c9950c2e
+DIST core_kernel-0.9.1.tar.gz 502985 SHA256 820076d9e045c1f58f90ee28ceadfa5b42ed3b70b86e48a3d29251cc841319c7 SHA512 ec0c3f72c52b975ef3d28b89190e0de3d9a60a842cde13f9a71f2d90101af3ccced06b4640d061362b89127140fe761dc19733da3f7dfabab189faef78343b7b WHIRLPOOL e32c19ea89cb01c7d43f9681b126cccb62cdb6f57876e1f65eb5b2806bfd191186d15c6c1ff021379d7c5ef53c368572ecacff03e94fc3cb2bea272d4d4149d7

dev-ml/core_kernel/core_kernel-0.9.1.ebuild

@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="System-independent part of Core"
+HOMEPAGE="https://github.com/janestreet/core_kernel"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-lang/ocaml:=
+	dev-ml/base:=
+	dev-ml/bin-prot:=
+	dev-ml/configurator:=
+	dev-ml/fieldslib:=
+	dev-ml/jane-street-headers:=
+	dev-ml/ppx_assert:=
+	dev-ml/ppx_base:=
+	dev-ml/ppx_driver:=
+	dev-ml/ppx_hash:=
+	dev-ml/ppx_inline_test:=
+	dev-ml/ppx_jane:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_sexp_message:=
+	dev-ml/sexplib:=
+	dev-ml/stdio:=
+	dev-ml/typerep:=
+	dev-ml/variantslib:=
+	dev-ml/ocaml-migrate-parsetree:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/opam
+	dev-ml/jbuilder
+"
+
+src_install() {
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		${PN}.install || die
+}

dev-ml/onanomsg/onanomsg-1.0-r2.ebuild

@@ -19,6 +19,7 @@ RDEPEND="
 	dev-lang/ocaml:=[ocamlopt?]
 	dev-ml/ocaml-ctypes:=
 	dev-ml/ocaml-ipaddr:=[ocamlopt?]
+		dev-ml/sexplib:=
 	dev-ml/ppx_deriving:=[ocamlopt?]
 	dev-ml/ocaml-containers:=[ocamlopt?]
 	dev-ml/ocaml-bigstring:=

dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild

@@ -16,6 +16,7 @@ IUSE=""
 
 DEPEND="
 	dev-ml/ppx_core:=
+	  dev-ml/stdio:=
 	dev-ml/ppx_optcomp:=
 	dev-ml/ocaml-migrate-parsetree:=
 	dev-ml/ocamlbuild:="

dev-ml/re2/Manifest

@@ -1 +1,2 @@
 DIST re2-0.9.0.tar.gz 388868 SHA256 9bc1b404c15e8cb399ce84f91d17e867e55e50792e3bc432926a84531aa84e94 SHA512 d11cde52c151486025e05318930253f37312eb6498698ffd3b271f4ba0c83cae0ff8c0c1a11e01b6ab333770400108f3de33fd68f73ab6df1c832e7edffb5e77 WHIRLPOOL 168d42bc449d532a80ebcc0b8c5ea2ca1041761c745a4d6683f168c0c928cc39a4df96c4f366280808e1a937b554765622e4215311bd68c93c76ef21eb3c4dca
+DIST re2-0.9.1.tar.gz 388911 SHA256 ada97fd3f0263cc4b17d27cd28298bc153b56dd748f8d7516f206312796f2d23 SHA512 a92dc39a1d263dd2bbfad88f0ea0936fcadd1d03cd735d9db151412919713cfb4d8329f1e0fa454917d8faa49480e8dd60af9331b0863548ab267b647bd1e192 WHIRLPOOL 95aa565e93d710783d993f5fdf828e574ce2b57e3c26f801ac56662adead9b6516e4e1b72f49e9c46bf3fde6e6340d5f978bbea201c9140c7c4f3f6fe5e6cd7e

dev-ml/re2/re2-0.9.1.ebuild

@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="OCaml bindings for RE2"
+HOMEPAGE="https://github.com/janestreet/re2"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-ml/core_kernel:=
+	dev-ml/ppx_driver:=
+	dev-ml/ppx_jane:=
+	dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/jbuilder"

dev-perl/Expect/Expect-1.320.0-r1.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Expect for Perl"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="test minimal"
 
 RDEPEND="

dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild

@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Change and print terminal line settings"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND=""

dev-python/clang-python/clang-python-9999.ebuild

@@ -25,13 +25,12 @@ RDEPEND="
 	!sys-devel/llvm:0[clang(-),python(-)]
 	!sys-devel/clang:0[python(-)]
 	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${P}/bindings/python
 
 src_test() {
-	python_foreach_impl nosetests -v || die
+	python_foreach_impl python -m unittest discover -v || die
 }
 
 src_install() {

dev-python/matplotlib/Manifest

@@ -1,4 +1,5 @@
 DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad
 DIST matplotlib-1.5.3.tar.gz 51606089 SHA256 a0a5dc39f785014f2088fed2c6d2d129f0444f71afbb9c44f7bdf1b14d86ebbc SHA512 553be9f661a1923d8ec7504a11dd3317e5ffb429c19339c58047715f4c28358d6d2ac38d46bd27ecd1dcf7159f157aab80d90713fbc4071e2e395bbf11ee6385 WHIRLPOOL 7e2b0472bb7d913e78260da95c93c3243562e76352790318286e5d194f88ac05a9f51fa029a7b0ad17bbbbd0dc9658769fe6301b544ec03f1ab5c205835ea894
 DIST matplotlib-2.0.2.tar.gz 53879938 SHA256 0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1 SHA512 39d68aee87fac2c246cdee7941ffaae1b8d586fa75c351bc94f963def66df32c3aba13fa0be94e1f8d21f06e068565b1a79c6d4f65589d8dd23cd48b32ab474f WHIRLPOOL 5ab8f9edb4591205d61bd47c5125520c0d24b8ce44e0041b99a5a0c692ffd3ff581cd6e092d18a64ddf6fb4f43ace6ee8c2bce19f5acd01d022d8a46e472b2df
+DIST matplotlib-2.1.0.tar.bz2 33051088 SHA256 0ab32ed55311dccdb42a488e1e7be5029695adf9219bc2b545ee0443dcf365c7 SHA512 872ff86e989b4e9352663f4abde1768aa05b1adea3e1b234efdb301429d421718314b27950e508d92df8fc9136764b07e8a6861b66512e9695a496993076bb5f WHIRLPOOL 0fb7d7e7e2b45ca6ae9ece32fa413f9c5b47fc59f64b877fad1f8becff4828a3be948f6433222008256c469b7760075c1d694b13ea771dfcd4193c2cda405aa6
 DIST matplotlib-2.1.0.tar.gz 35727251 SHA256 4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387 SHA512 8f512400f1f15d5400e23dd8e402783c54f62567d412863530a982c6513206d49fb91fadb3ef477648a4a38d6dd032eb90741ff4495d2be71911f83677d768b4 WHIRLPOOL 4795f3d49e3a624a22debe738cbe42ce3594c91880b3e6273f7ee05ecb7016353550cb39367f1edc6588d0e75d227d79f29af709e9471147171dd7ea5b6aa687

dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild

@@ -0,0 +1,249 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	dev-python/functools32[${PY2_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	dev-python/subprocess32[${PY2_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/colorspacious[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/backports-functools-lru-cache[${PY2_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup pyside)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${EPYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}

dev-python/pyinotify/pyinotify-0.9.6.ebuild

@@ -14,7 +14,7 @@ SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ia64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

dev-python/sip/Manifest

@@ -1,3 +1,3 @@
 DIST sip-4.19.1.tar.gz 1000644 SHA256 501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e SHA512 fd98002117e9526f7f981b46362c41171e703a0e18e57112fcabf33d71fa13a4a091fdcb05c879ea721da59fa8c03087b8dc983fb2f832f764e5ad950c9bbecf WHIRLPOOL 87deee5786ca5009ca139bf6993e82231b1dd5be9bf7ee1d94eb5c8aabf5bda980f6b0fa4571e838275ac7cd8615757a58d0b9d7e776705834db35a1dc92125d
-DIST sip-4.19.2.tar.gz 1000746 SHA256 432b4aad25254e6997913e33b1ca3cf5fd21d5729a50a3ce2edccbea82c80533 SHA512 6f14f387a899130cf15820d2b58d937d134a2eefd53c65a82af060e88a6ca039442b21f822880c4a3742d6f26328853a552239873c55d7b22de62a6cc5037b3e WHIRLPOOL e6a59dfde801b38c5ab2524e8142cf5f87edcd8171512241f88096bdfc43734cc0346d2d6a607ea2a14a41b7f05c820af30aa0b125a3f06be263d65b99c7b239
 DIST sip-4.19.3.tar.gz 1007481 SHA256 740df844f80cc45dcc9b23294a92492923bc403ce88e68c35783f27c177c4b74 SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc WHIRLPOOL 6283491e6baf6b7806a9fd68e77463983c475f7ea721832e573dc86158e226428d5bd9da084a554180ac4308ccf23d98f4c51f9af11fcfb5ecda8bf4dee028f7
+DIST sip-4.19.5.tar.gz 1019157 SHA256 391b7bf08f1cd12d8a25ed5608ca36ee9b759eee1690d8156e35d92f9a74b456 SHA512 15d0c0daacf11534a61cd3961613e0015afb9f61fd484094008d1b3d344765d03a2bed2eb08c92a347bbe6868622ab1f7dc0a3bd3e2e662a8e08a53ac8e88463 WHIRLPOOL 0470942c3c8267ee58d430dfe99d7e3d895b9cd27c69660dfdb8e9506a090d9422ef8a1cb498ae6c47be4abe0d3c6802798179bcfe75a70d0b60860ffae67f72

dev-python/xdis/Manifest

@@ -1,3 +1,4 @@
 DIST xdis-3.2.4.tar.gz 127507 SHA256 b311253b97a321ab45625089a729ccbf8bcb1319a8c4c0167b719f81c081543c SHA512 6c9274e10f2a41ab4a173c8ae4462374fc7ab444a589ab572172550d0f5284906f7d9c9cf4a640f163f6012d17f40bc5e1c36e5963f8b6106a9c37e420027a97 WHIRLPOOL 5a0910f04e3d9ec70129d5d3b659fe06034e7a6298692d2a776f2616a8b895a539efa7f96972b2adc6986c2475e697552ea071d33bdd22c60bb1e0fec1950dd4
 DIST xdis-3.3.0.tar.gz 146531 SHA256 32eeb690e9376ad404c1fb18c1f87a09345f9beca31cee1ea8f21dd0f0dcaa07 SHA512 ebd7656c04d5583243eae4442409bde910146f7c5f6b66d58933d4b62818345401523428a596f00cca31a9d6fcd2eea877da57ab3e796dc04c92842456454b3c WHIRLPOOL 784c88d905d47d22a0d0ffb0206f57250f535abce9df6b02be16492c47ffe199ebf5f900eb3199e0be2b89a1d96f951971de5ba8ae33be57013870c1e25f828f
 DIST xdis-3.3.1.tar.gz 154152 SHA256 d6e5439269a2abe1fa71ac4cb670ac6dfc9e18a09e0c4acb2f6457f0542d5383 SHA512 93b1a092ae7790e84dfd8dc4128659d48be85c4e00d9914bbd748fad5ec4246bbfc6c19a5c5de366f4bd6d91847dad4ce3c1c3affe8f7608652f2f6e343650e1 WHIRLPOOL d137511eb788cdb43ef5e9165415fb4c7fa4885b9e293d4da7a7c4360e0dad7b00c8ea8df299161cff539a9f7a390d8b39ff6c5697804862259717d54c21f38b
+DIST xdis-3.6.0.tar.gz 144766 SHA256 3ea226c201f4be86000b1d09f8585c2de39757325d0b686e3fb14a7dad21c832 SHA512 8b45ccd6976204004f27ee5b1a9da9b29ec0e28f4b462d862be5a1238d3ebd4a5d6f3df5607f3e2f037d80b2d3ae77ec4246ab1aa0671466c1e07e3a65453f3b WHIRLPOOL 156874ee1918eab2e096aa36be0bafd87a32d843d76875bf4eea9366b22616a8aa93610bb959e5ab47f74627f0abc4144a8be345ccf3550858138a860121e793

dev-python/xdis/xdis-3.3.1.ebuild

@@ -25,9 +25,9 @@ DEPEND="
 	)
 "
 
-#PATCHES=( "${FILESDIR}/xdis-test_magic_bytes_error.patch"
-#	"${FILESDIR}/xdis-3.3.0-remove-pytest-runner-dep.patch"
-#)
+PATCHES=(
+	"${FILESDIR}/xdis-3.3.0-remove-pytest-runner-dep.patch"
+)
 
 python_test() {
 	# Need to rm any pyc files to prevent test failures.

dev-python/xdis/xdis-3.6.0.ebuild

@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
+HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.python.org/pypi/xdis"
+# bad pypi source tarball - test failures
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/rocky/python-xdis/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/xdis-3.3.0-remove-pytest-runner-dep.patch"
+)
+
+S="${WORKDIR}/python-xdis-release-${PV}"
+
+python_test() {
+	# Need to rm any pyc files to prevent test failures.
+	rm -R "${S}"/test/__pycache__
+	PYTHONPATH="${S}/test:${S}/test_unit:${BUILD_DIR}/lib" \
+		esetup.py test || die "Tests failed under ${EPYTHON}"
+}

dev-ros/actionlib/Manifest

@@ -1,2 +1,3 @@
 DIST actionlib-1.11.10.tar.gz 98375 SHA256 8a4e9d71e23916abcab9892bd6c9890a691267d73ec4eed2034c307d57409619 SHA512 afb28c568910a2786ea3e97c89ee6b02b4c33335b05f466219bc17cd5bd8e021de3bbbd3ae0cef0b46915442549dba84e9a655169e9c95e1ae62071d015e00e3 WHIRLPOOL 85d84684ec7d64a34b13ca08ef337af83e15738901ad273445487e7977b1fb6677a92d33d7e2d5314407c986aee7e54aa862e4b2599be0739e1110a369abdbd1
+DIST actionlib-1.11.11.tar.gz 98427 SHA256 26958223b952eb7ad692d701b3ff44e0be110b4501ca23ed70939cf57acb81b9 SHA512 a2a02abfb3e192082143d83ceab6a612f501bbd1ec38d108e3a841afb331d1a98e8a602fac7d627a62c336a52ffe70331d2001394b134511c89349567b49d83d WHIRLPOOL 37d4c7d1472d1ebe4a9671774786cf4d551b50697881a7235d2f397e4e87ea1d5472fb82ae5c1e7dda0688ad3b990534632b768eb8c0c5a9046751bbb42ebbc3
 DIST actionlib-1.11.9.tar.gz 98000 SHA256 0e0eb18e964cfd25490875295950760fb468fd30cab707c0138ddada131be7c6 SHA512 a331f10aeeaf33b5074c637866157a317af0a8bf4ff17960cc5dc6e12970ab59cdf9bc032d3aea2704b00ee0d3404572f83ddbfc9d68cf41430300ed885af60b WHIRLPOOL ccf24dade14dd4da1a370a05cfe22c94424a2cb63449657350c783dc9f94bec72d3ec723ef7a9b5fcf518bdd4a502cf05268578d6a08d730373a1b7516807ec5

dev-ros/actionlib/actionlib-1.11.11.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/actionlib"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a standardized interface for interfacing with preemptable tasks"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/boost:=[threads]
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+RDEPEND="${RDEPEND}
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rostopic[${PYTHON_USEDEP}]
+"

dev-ros/openni2_camera/Manifest

@@ -1,2 +1,3 @@
 DIST openni2_camera-0.2.7.tar.gz 23033 SHA256 29e0875b9a22fb9e0908f1b59acc496de1ecebef09a0c0ba7a3b7a7b328882aa SHA512 cb13672970c5c66b4756dcfd246d102a123f2b5f42afabeed56bff78013e244ea64a784c629c85de1d5291d3ca7737d41bd114e62bd9e1b7bba2a5546fe2f828 WHIRLPOOL 98b832e21c852e9799bfbdf2e4ccd2fc1c029c79cfc3f65d0bacd37724392f10179721ee71b36d8e97f1b418280c8df3671bd4fe072956cca41761d781e589c3
 DIST openni2_camera-0.2.8.tar.gz 23264 SHA256 ca02040bfc9e7212cd18d5d683a8d269685bf5eef93d9e3ca903038e9b60425d SHA512 11e1714a5a3f716a69a26cf8f632a2064f19213b50b3cc4bf1bcf5b81a7a8e87550d3c5d49a238e3a0ce889c5d557a6b3581bfb036cf6bf2d20f0658050820c5 WHIRLPOOL bf7de3e92309644bc676328a96dff859155f3df9c469012572301332f3f6b5d79d486480b558738a9ebfff6562dd2895d668906ce9c34ddf03668f9566a13912
+DIST openni2_camera-0.3.0.tar.gz 36450 SHA256 cf429514b0f43fb01cc70f08fd62ac39c314ff7db8e25fb2dec61f110aac3a63 SHA512 0e5737e8ea06fb0c73b2a99905e472f6634f024f5a50de9b94761ae3ca9879cf47a029b1906d01b31cb8081b73292af871eff581aeddb56584951824edd0007c WHIRLPOOL 8340d2f4483694694475e5d6d0571c272b20b9c32b1f45662e8b6c49c638df994d9d588db585ec6e48a8a52a3cf870cf2ca734338f150dd3b66bc53f3b6b0726

dev-ros/openni2_camera/openni2_camera-0.3.0.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/camera_info_manager
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nodelet
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/OpenNI2
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"

dev-ros/openni2_camera/openni2_camera-9999.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
 
 EAPI=5
@@ -6,6 +6,7 @@ ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
 PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 

dev-ros/openni2_launch/Manifest

@@ -1,2 +1,3 @@
+DIST openni2_camera-0.3.0.tar.gz 36450 SHA256 cf429514b0f43fb01cc70f08fd62ac39c314ff7db8e25fb2dec61f110aac3a63 SHA512 0e5737e8ea06fb0c73b2a99905e472f6634f024f5a50de9b94761ae3ca9879cf47a029b1906d01b31cb8081b73292af871eff581aeddb56584951824edd0007c WHIRLPOOL 8340d2f4483694694475e5d6d0571c272b20b9c32b1f45662e8b6c49c638df994d9d588db585ec6e48a8a52a3cf870cf2ca734338f150dd3b66bc53f3b6b0726
 DIST openni2_launch-0.2.2.tar.gz 3754 SHA256 a8b7b28b82bb5d58accb96e4710e257547324a1f9131cf425d792b6f20535810 SHA512 1bdbccb6b29f1f3a1909faf959e0a2faca48c8229f5c7469b2b279d962f161940ef0d5b879d1c915d725e8c8cab3173c76aabe67bdacce970727cdfd6cb4073e WHIRLPOOL 56b862f859459543140947c8c0d43972c8c709dbb1f72aa2e8b6aa1878c64dcb149385d56c9c5c2b6b92e4422f34d0d2e88b5d81aabbaba74c5ed0729dc0e034
 DIST openni2_launch-0.2.3.tar.gz 4565 SHA256 8b43a4b15f334f07efbf0fffdfdacc4387e08ef69b7df71b5165fb6a271e5226 SHA512 5f76201fceaa07edacc06e7732bb12cc37ccd4e04da20815abab3226fa7fdac763df2a401c4f1682dcabfa48bc337ee94ba6a5b3a14869a8348efa1c8624752d WHIRLPOOL 6a41290f39cb60e03e2ba9ab4e77f0622da1518f2eb21fe91844ad63dfb48ca0e931457e16dbf10ae311c783987f7462406a144b372dc85c9f6da83cc63e67f8

dev-ros/openni2_launch/openni2_launch-0.3.0.ebuild

@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rgbd_launch
+	dev-ros/depth_image_proc
+	dev-ros/image_proc
+	dev-ros/nodelet
+	dev-ros/openni2_camera
+	dev-ros/tf
+"
+DEPEND="${RDEPEND}"

dev-ros/openni2_launch/openni2_launch-9999.ebuild

@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/openni2_launch"
+ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
 KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 

dev-ros/pluginlib/Manifest

@@ -1,2 +1 @@
-DIST pluginlib-1.10.5.tar.gz 21470 SHA256 53a0ccb7a4654d464271189fc44ba23d6be8d3ecdfb40506b9d9fb4a87f19d6c SHA512 619c552c7f6d59f02f580204477e789e2adf15ea53dfdf1d3fe3fc6e65e34dbfe1d7e7ae60b833bbf589c2afd49dc09187222e989de902758475509b8cf7cd88 WHIRLPOOL c441fbee18fa152d900e0b49198cc2b0f75a85f801bc756bc1d56f4153360e2ddfc3c63223a57fbc7ee299aef4313bd55c147fe614d6fcca708f7302ac9c52fd
-DIST pluginlib-1.11.0.tar.gz 21555 SHA256 f5acf838cdf15538505b670dfdf93a0c5e453d222464d729d71a22513a60e2ca SHA512 2ef27759a6fb3db0354ffd28f2de5781405d4515dad028cbba6e108aa2eb79da56bbcb8ad4dab5686a9dc59d031bfd06ca713382e99258ecdf78fc45a877e588 WHIRLPOOL 71fa457e3bd0c93f2ea68729086b6f9b1b2653f126bdec3f461ad26cb37237c27397cca8d1c5dcf74e96b72988c025738d20ef303ac6d12ae7fc17d4b3bb8a02
+DIST pluginlib-1.11.1.tar.gz 21621 SHA256 bee838a9e62c8e889e8354f6ec5c76493f3aa6df5d19c30110068c82feb927c0 SHA512 1bafbc35334a482b2fc08afb7c1ed53ddbc579b121b728b96893c8b82a7070d9ecd8e6e6cffa54b3539def84db9dac79fe59feb93b2de6b8f113e0bfc10a8c00 WHIRLPOOL 1d05ddb55c800e0272e6c203804fdd0cdc966a6213df55a999e2ab5f14ff157ec84654d6155a1de77cdd15821776ad51918e0fa1072efbc1c08e539dd10ebce3

dev-ros/pluginlib/files/catkin_prefix_path.patch

@@ -0,0 +1,15 @@
+Honour CATKIN_PREFIX_PATH at runtime instead of ROS' hack to use CMAKE_PREFIX_PATH.
+
+Index: pluginlib-1.11.1/include/pluginlib/class_loader_imp.h
+===================================================================
+--- pluginlib-1.11.1.orig/include/pluginlib/class_loader_imp.h
++++ pluginlib-1.11.1/include/pluginlib/class_loader_imp.h
+@@ -66,7 +66,7 @@ namespace
+ std::vector<std::string> catkinFindLib()
+ {
+   std::vector<std::string> lib_paths;
+-  const char * env = std::getenv("CMAKE_PREFIX_PATH");
++  const char * env = std::getenv("CATKIN_PREFIX_PATH");
+   if (env) {
+     std::string env_catkin_prefix_paths(env);
+     std::vector<std::string> catkin_prefix_paths;

dev-ros/pluginlib/files/gentoo.patch

@@ -1,34 +0,0 @@
-Find package.xml in ros_packages/package_name too as we moved it here.
-
-Index: pluginlib-1.10.4/include/pluginlib/class_loader_imp.h
-===================================================================
---- pluginlib-1.10.4.orig/include/pluginlib/class_loader_imp.h
-+++ pluginlib-1.10.4/include/pluginlib/class_loader_imp.h
-@@ -444,6 +444,7 @@ namespace pluginlib
-     std::string package_name;
-     boost::filesystem::path p(plugin_xml_file_path);
-     boost::filesystem::path parent = p.parent_path();
-+    boost::filesystem::path basename = p.filename();
- 
-     //Figure out exactly which package the passed XML file is exported by.
-     while (true)
-@@ -453,6 +454,11 @@ namespace pluginlib
-         std::string package_file_path = (boost::filesystem::path(parent / "package.xml")).string();
-         return(extractPackageNameFromPackageXML(package_file_path));
-       }
-+      else if(boost::filesystem::exists(parent / "ros_packages" / basename / "package.xml"))
-+      {
-+        std::string package_file_path = (boost::filesystem::path(parent / "ros_packages" / basename / "package.xml")).string();
-+        return(extractPackageNameFromPackageXML(package_file_path));
-+      }
-       else if (boost::filesystem::exists(parent / "manifest.xml"))
-       {
- #if BOOST_FILESYSTEM_VERSION >= 3
-@@ -470,6 +476,7 @@ namespace pluginlib
-       }
- 
-       //Recursive case - hop one folder up
-+      basename = parent.filename();
-       parent = parent.parent_path().string();
- 
-       //Base case - reached root and cannot find what we're looking for

dev-ros/pluginlib/pluginlib-1.10.5.ebuild

@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/pluginlib"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Provides tools for writing and dynamically loading plugins using the ROS build infrastructure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/class_loader-0.3.5
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/tinyxml
-	dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gentoo.patch" )

dev-ros/pluginlib/pluginlib-1.11.1-r1.ebuild

@@ -24,4 +24,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )

dev-ros/pluginlib/pluginlib-9999.ebuild

@@ -24,4 +24,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path.patch" )

dev-ros/python_qt_binding/Manifest

@@ -1 +1,2 @@
 DIST python_qt_binding-0.3.2.tar.gz 12047 SHA256 1ef3a85cc304028711f35de983c78fdc1f78d476e1239519bd8883cbe99aba16 SHA512 777d7ba00652d34994648615125f6c426170a1723570de35b9e5a060d0f077b563a57c9b0cbe7bd85a7ed2f5f011797e9102918a27df4f0096831cce0bb80304 WHIRLPOOL 3490e9229d675a8a753363a91fc785ab255385b358c7829824d50abae389b214aa88f49970d60a7bbda255c430fd8202b63c7586f2342808c85b8fe55bc8edae
+DIST python_qt_binding-0.3.3.tar.gz 12114 SHA256 3c83d03aa1663052daa7819fd20e15f4061cd4e37a82a71b27798f801252f8d6 SHA512 0dfd698b390a87e0619e93a291656c329ff37713411c5a805e720aeedf9fefd43fc780bbdba351cd1a73e30d67ce8e93a98b5ba6b5584a807d829611ac232263 WHIRLPOOL b6a075d0c69a0856e88d74b79e9e2d20de34a2cd18dd0573a5b069c2b434a1fe1b3f47dd16a1647c58c4efd4df9bef62033a323d63836b58dd1df8b27500417f

dev-ros/python_qt_binding/python_qt_binding-0.3.3.ebuild

@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit ros-catkin
+
+DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"

dev-ros/realtime_tools/Manifest

@@ -1,3 +1,2 @@
 DIST realtime_tools-1.10.0.tar.gz 9069 SHA256 ecc9a0734a6ac91df530ae461335ec67a7504918413fc4a9e1cfb70770b6b351 SHA512 e9e87813249078f9dc0375eac61432d14f54a572060b99bdf312a7c06cc7b8b562dd1bb541b7636ab3c68aeafc87a74e084b1719e661eb48bb74e5f778a3eff4 WHIRLPOOL 2d20ac34e8775f8840ec50154f88f2b232b710d236b0b21730f1d8c570fdbeecb26c5d9ac385f288c45f2189443aa370d6286f3954a4d5c4543413c35ca1fa9d
-DIST realtime_tools-1.9.1.tar.gz 8820 SHA256 1de97577326d4f87932eec94b4a46587c20f8989a69997ef613a0a79c375da2d SHA512 7aa007acc922ecade003a1002be31905fa109ac827989f78df74e6c160a64107356f9e2a0153576b8ca993f3812be39661677aaae37fe690b327e5c3511f5a07 WHIRLPOOL 38d9d92df0d6cba3ab2cbfad7ae82d6e456cfdcde6c67b88b92c134acd2487e73ec48a253460a04d42c972d7dc8ae63acd27dd76924c6862004c6ceea7281166
-DIST realtime_tools-1.9.2.tar.gz 8973 SHA256 3b30b87a9aaa9310f1deb96f5d38f6cf17ec67a77472bec78dc1f2c22f2d6301 SHA512 85d23c0f13899bd2b203309a68a197e0a51865a7a1db1d9428be254eb085d0cf6d20c2baef957287915a7e1e2d11dcbb71451bfe8b70b48078154e8a3f75cba2 WHIRLPOOL 525ef436592382851cfd2c753c4b87908b6cfd8ad4113b9eab42281e795e561788007d30b500a387de9d6862577842e3c83e10f04300df0c3585411bdc1856a7
+DIST realtime_tools-1.11.0.tar.gz 8770 SHA256 9553239ca14f0e1af3fa3a6ed2af6710dc4d6ce934b5f859a867fbae15d8f495 SHA512 93f17646587a1094bf10d94539d727d5da56656b60041544006c5ad520f454adb98440f9cf2c1fa3f95027a3d296b13594117bcb111766e85fe60d1363fd98f5 WHIRLPOOL 03cc18d638fef41db345fd33d79593b65b40d1412c808ea6c2a090b4508892acead06d3365080d6fa11b2c55d548be348b535cbf907a40f0a233d8c4d2c91549

dev-ros/realtime_tools/realtime_tools-1.11.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5

dev-ros/realtime_tools/realtime_tools-1.9.2.ebuild

@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/realtime_tools"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Set of tools that can be used from a hard realtime thread, without breaking the realtime behavior"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"

dev-ros/rosconsole_bridge/Manifest

@@ -1,3 +1,2 @@
-DIST rosconsole_bridge-0.4.2.tar.gz 3974 SHA256 0834456f97e97f30ed27a6a234dac4e829970bffc20b439f4fcf442f0ba04d0c SHA512 ee44f0967d6325bdd20a6c0716502f93a39b5ac22ce9abbde906328ebb1e6fa61f1f4170f6a7fe2ea83cde255b9cb5159153ab23c911524743f0e63e6656330a WHIRLPOOL 3daee3baf0c80993596238304efb30ab59946e42de178db3b3c743eaa4f964a8b440b63120e87976d9af6372fcdf658f12a6e4a88b52af28583778915246cab1
-DIST rosconsole_bridge-0.4.3.tar.gz 3997 SHA256 1ccfa064f22115f30aab29137ee07a0e01bfdce0bb4e5d257d423bf28ae3f747 SHA512 6ed259e19c965af82373f9ca70b34639e6cadccddfe64564025d3003045906efc42374e0e38b3a9d7d8fa1f5d20b9370150b1f8a3253589106dc1aa81e531211 WHIRLPOOL f1baf38ee4caf18af45db8f181b64b909ac4715809f399afd4930831ce34f2bf63e8ecdf8b754053d8f800b44aaea94278746b1b8de2e98668801d9e254f2082
 DIST rosconsole_bridge-0.4.4.tar.gz 4426 SHA256 6133c7fc466b4440973d459bde5fb3e1ef4352d4644060965b7fa289530921fc SHA512 47a96f30f31773f61c9c84845c698bb3f473ffbb183201963dc8d24643298988fa604ad2b8c702004d05f70cd7fc985cff844aba0c2153f22b4fcd3be44527ab WHIRLPOOL 54011917d49dd95763dc6d55a942adde4201965e0c8b137fc7d970e6baec709736a801d72b2bc15c3ce262b1ba03bcdd9471ea50301b226a651f1958a09dcfea
+DIST rosconsole_bridge-0.5.1.tar.gz 4604 SHA256 eeaf5826b1238b03052aebb52ac858285c9e4ade8eb0f7c4004a6af714700713 SHA512 f581d923c427a6181c0573d6c28935d17c58f27ccc201a5eba7b6a6d3abe7c17bece773a8d1f660527ec3030e0df0769b4edb36fe1bf3e9e6a9c685e7528abac WHIRLPOOL 51325ec94da6db7ff44cb5350e6aa74914bdb32a404b1f68c0a95230a84e88586360bfcb1ccc94abbd09400cae419c710a492ac8e6b646d09d2ea1972bc8ccf9

dev-ros/rosconsole_bridge/rosconsole_bridge-0.4.2.ebuild

@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/rosconsole_bridge"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Connects console_bridge-based logging to rosconsole-based logging"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/console_bridge
-	dev-ros/rosconsole"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# fix libdir
-	sed -i \
-		-e 's:DESTINATION lib:DESTINATION ${CMAKE_INSTALL_LIBDIR}:' \
-		CMakeLists.txt || die
-	ros-catkin_src_prepare
-}

dev-ros/rosconsole_bridge/rosconsole_bridge-0.5.1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5

dev-ros/rqt_bag/Manifest

@@ -1 +1,2 @@
+DIST rqt_bag-0.4.11.tar.gz 50276 SHA256 b93c2874fbe5129e14c679b83e6af58af6661521f13aa4e67c6e48a735325eb8 SHA512 d345d4a1900b06bdf7649e0123780ad33f116dffe832f3492029ba3a25843984014cb2c7ac2d848df7c4c9683f14c14d3f9acb528e4ed04a12d3dd017b5df9c1 WHIRLPOOL 23d1e694390fb75d71a779056541aa4c36f1352b5d1096582d2e7bf0e48e4f808e6b4bdc131b340d7b6f317e2c6e26d5339a4bafe0e4f97791b85e3f0af0822b
 DIST rqt_bag-0.4.9.tar.gz 50135 SHA256 a46a7ecacd7117a5b1e94558c2480401873c9b9f31555282b28bd92ce6646596 SHA512 1734db3cb7ed34dcddadaf875c13ac97c7b5a86e8028e744d55e5d7bba13a6a4fbe3db628975c847d100332642410d2eb84c2d47cc439b367d9be94c205aabdb WHIRLPOOL a546f6fac051f81ed7eba32511d83189566353aacb565f99a427cf65c221b69eee14751d04962ec481ecdb720d7760015ea17011707a5f73edebb6a3943e321f

dev-ros/rqt_bag/rqt_bag-0.4.11.ebuild

@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
+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}]
+"

dev-ros/rqt_bag_plugins/Manifest

@@ -1 +1,2 @@
+DIST rqt_bag-0.4.11.tar.gz 50276 SHA256 b93c2874fbe5129e14c679b83e6af58af6661521f13aa4e67c6e48a735325eb8 SHA512 d345d4a1900b06bdf7649e0123780ad33f116dffe832f3492029ba3a25843984014cb2c7ac2d848df7c4c9683f14c14d3f9acb528e4ed04a12d3dd017b5df9c1 WHIRLPOOL 23d1e694390fb75d71a779056541aa4c36f1352b5d1096582d2e7bf0e48e4f808e6b4bdc131b340d7b6f317e2c6e26d5339a4bafe0e4f97791b85e3f0af0822b
 DIST rqt_bag-0.4.9.tar.gz 50135 SHA256 a46a7ecacd7117a5b1e94558c2480401873c9b9f31555282b28bd92ce6646596 SHA512 1734db3cb7ed34dcddadaf875c13ac97c7b5a86e8028e744d55e5d7bba13a6a4fbe3db628975c847d100332642410d2eb84c2d47cc439b367d9be94c205aabdb WHIRLPOOL a546f6fac051f81ed7eba32511d83189566353aacb565f99a427cf65c221b69eee14751d04962ec481ecdb720d7760015ea17011707a5f73edebb6a3943e321f

dev-ros/rqt_bag_plugins/rqt_bag_plugins-0.4.11.ebuild

@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_bag"
+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}"

dev-ros/rqt_image_view/Manifest

@@ -1,2 +1,3 @@
 DIST rqt_image_view-0.4.10.tar.gz 12574 SHA256 e169e769a7f7bfdb2c8ba9d1c532f5d559b210632fd952c56ea786d9bda367a7 SHA512 214ca5d932add218e18ed8cdc5167a4d72296a8f442197b7abc93bc19dc3263c0595165cf453152c6050b23c4871c5f3bb7080c752c0b7044fb24cb7b8c3a830 WHIRLPOOL 6154bba05f4c420b766786b89fe4b58451160a7f7fa2765569ff326b27230eab125ca00e4187872a4f9ba1b32b1b000bd91009e3f934abd9e91b9fb8cdce9f21
+DIST rqt_image_view-0.4.11.tar.gz 12610 SHA256 0f85e8451e7f430ae1c75e798994f230c09f3f5ae27ed6feadb0beec575cc560 SHA512 5f6bf27e277d2c3486a9cae5a007cb71d57e846d958a27cc0bf447728e6c72ca368ab56b5d4b092f1c48d0017bb74e54cf64468b8f7c4fbaebc05c642afaad21 WHIRLPOOL affc168e3b75cf4474fc5f8293aa92fb0a11b68839ae8b673b0fb6990bc3c4f984ac0c0067dcd9f47e02e6414d8cf0da95f96b448022eee98f905c97a5544eab
 DIST rqt_image_view-0.4.9.tar.gz 11717 SHA256 58b27e7cc97b28ef8d9121b34f14b2a0ddba4ba8540019465fbcd48724bfa634 SHA512 52bb5b6962802b8995108909f6ff2d2781bb4df9f124acec706d1e969dae8cc8ca9675d971e9508613da44be3fa6f8af30fa9cf157061c2a4c3ffc15e37a6c03 WHIRLPOOL b95e4b6d78614002dc803a491fb5225b7243ce4a97b4c05f70a47d564a3e06836b9c29b2f20d7d9f5fb4965733f90d55570ab85fe6911c49239fd5842273b570

dev-ros/rqt_image_view/rqt_image_view-0.4.11.ebuild

@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_image_view"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for displaying images using image_transport"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge[${PYTHON_USEDEP}]
+	media-libs/opencv:=
+	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
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"

dev-ros/rqt_topic/Manifest

@@ -1,2 +1,3 @@
 DIST rqt_common_plugins-0.4.7.tar.gz 246977 SHA256 83153ad89c67551c3fb4f36cad7f056d90c559958ac80203e2aa4605beb49a7f SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7 WHIRLPOOL b002f836ee0f5ea213ec31be8e59910c7c3c9508301389309e60eeb7dd35989ae4e4dfa5fa9ee592371f05e6cd842a6e3b0ccd6ac4ed7a9efd8d60c36b1e6d65
 DIST rqt_topic-0.4.8.tar.gz 8743 SHA256 2ceb9f052df8b5af149d15ccf4e0482d3b7b3932f32fe955784be1a5f5d07a4c SHA512 bc2874821aec9ce85e8a2d574dabc4c09ae41f77e6dc063af5a79841e80e781cf3a467df4c9094c74667d87bbc0720c355437ae43200ced623679e6fbeda1b27 WHIRLPOOL b22bec58797d7788a0d68a2a39d2f1c36d4b131c52d0c36e0cc480d288e6751f89a6008a49d358b27fa1f72917167dbc9ae6657f6474112d42ea904fd56018c5
+DIST rqt_topic-0.4.9.tar.gz 8794 SHA256 8a0eb1455f9ba2570e3fab2dcd59df75581490f8ee670e4cec37f6dc78f505b4 SHA512 ca7b9a9459406dbafcf58b23fe6695b7f5627326cf0c5f2b5d5bb61475c34200181d4702270a6bad59e23ea0706463e15839624d128f063db167cc5fb60182b9 WHIRLPOOL 0689d1e8fe45e0fc3781cd09fdfd4e69f079351a0cba4e7f605c7ed527992b88d457c84e0b6668108c62ee4b2e7886adc22a613aeefebd15957e0cf9a05e3b54

dev-ros/rqt_topic/rqt_topic-0.4.9.ebuild

@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_topic"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for displaying debug information about ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/rostopic[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"

dev-ros/rviz/rviz-1.12.13.ebuild

@@ -25,6 +25,7 @@ RDEPEND="
 	dev-cpp/eigen:3
 	dev-cpp/yaml-cpp
 	dev-libs/urdfdom:=
+	dev-libs/tinyxml:=
 
 	dev-ros/angles
 	dev-ros/image_geometry

dev-ros/rviz/rviz-9999.ebuild

@@ -25,6 +25,7 @@ RDEPEND="
 	dev-cpp/eigen:3
 	dev-cpp/yaml-cpp
 	dev-libs/urdfdom:=
+	dev-libs/tinyxml:=
 
 	dev-ros/angles
 	dev-ros/image_geometry

dev-ros/urg_node/Manifest

@@ -1 +1,2 @@
 DIST urg_node-0.1.10.tar.gz 13661 SHA256 0b5bca6266eac68375230e9448a813a5ced348b06cda4bf9bbec7ac54071d6e1 SHA512 578e7ae98de82b1563806319c0b47a22a878470479434a9c205f3bf3f087dc9108619f17aa86e591a9fb5b88029b6de8711d8388bcaf259601cf88bef5c1f889 WHIRLPOOL dedcd0cedd8ac1491231e82de0ee7d4da10048d6855d1f1b0d4189fd1bf954eac5c3ba77c0d8fa445785a1f55927c2d57c370ec73c8e230125210d490b90160b
+DIST urg_node-0.1.11.tar.gz 19367 SHA256 b2c9fb64d3a84eda7d034b70ea4b71a3d95028e5480624d5039e0c0af1f62f8a SHA512 41981323ea08e81abca70375793153bdcb52eb54df388978a2e54bdb798c89be3fd4b80c5bf7c28cce62ec3b937f950738bdf4d1e24c9b37e72ee2ca048c542d WHIRLPOOL a092767cf1cbd9552a54a71612280b1a36600cac4535645beb7a406c5be9f9a059038ee3b92e98c602e2bff526396d04608f113f2c9760af5573966848a4d1e5

dev-ros/urg_node/urg_node-0.1.11.ebuild

@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/urg_node"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="ROS wrapper for the Hokuyo urg_c library"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/urg_c
+	dev-ros/tf
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/nodelet
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/diagnostic_updater
+	dev-ros/laser_proc
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"

dev-ros/urg_node/urg_node-9999.ebuild

@@ -5,6 +5,7 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros-drivers/urg_node"
 KEYWORDS="~amd64 ~arm"
 PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
 
 inherit ros-catkin
 
@@ -23,6 +24,7 @@ RDEPEND="
 	dev-ros/diagnostic_updater
 	dev-ros/laser_proc
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"

dev-ruby/childprocess/Manifest

@@ -1,4 +1,3 @@
-DIST childprocess-0.5.3.gem 28160 SHA256 9cebed1bd68f7ba0deb54683a5c05a8c3e79037f682b5d0a6ecd1d4472bbb289 SHA512 f48ab94dc3da7ca82551f480cb18214ec65f9550ef053b25216239ed92c289a7353c632fff53148b1d6ce0c7bf70188bcecbdeede3df9b8130f815599a45ac05 WHIRLPOOL 68f7e9585c39a2628c4cb162d02c7d332d116be96ce8f325308e15d530e00139d43b9dcfcdfd490c6a252057947eed4c91843d8f37b96201d95b6ff3078055da
 DIST childprocess-0.6.3.gem 31744 SHA256 7b319509275e326d6b673c2f82ad21db7c3598fe854fe16bffa9ffc6f4206edc SHA512 93d2dbd23dfbaa6eb7eaf1c5791802180aece373aa912e78b1c3652e4e96f0e73ef948e484715863eef95e6af6daa1292944ebe987c331ce0d59ba086c803db5 WHIRLPOOL b5ec03b784d3576d6ad666a980c367638693786d932705b5520ba6094414fdd8e7b6c9c515846b9339b741c37b67eef28bc09106b50efe2635f9bedcc0951706
 DIST childprocess-0.7.0.gem 32256 SHA256 0da6258189a05d975727395c04e42d5ea2336fdc4c4cc615226b81fd4a2a0e67 SHA512 f06203ffecc09f5ab2dd2fe003de0e1f96906b1c5966c2dd630cccae046fd4b4efc6f8c96d4c825af2b4ab2e0e8dd63f6dee97701627d0ad311f0d8395c89c8a WHIRLPOOL 6ce3e7256deb415fbc46a06347b89cb7f216fda49520807b3b24732bdaf2b97f6b67f180d19cd2fe29ed22b9034f08665ca5fd306acf1ab535665128f1f74cea
 DIST childprocess-0.7.1.gem 32256 SHA256 411abbefacab4d769d20ab2b69fe6dff855b7ee4b7b6b2d22d5211ef79bd9e11 SHA512 c8e22a3244b5f6315ea003b20feb3f5a576c73938d8eb730f3aea99dc63662497a954531139983ffce74ebc089609e9ecc665144cfa6f05c699804615ca68902 WHIRLPOOL 750f0d5b5fa90cbbb86b80e5112c6a8269a6723ebeaec63800e76ee1e094c92aa4fe3b762c4a9dc55adc5106b219f915bd0e43dbdd77a2b7d1dd9a127ca1dba7