Sync with portage [Sat Jan 28 20:46:25 MSK 2017].

app-admin/consul/Manifest

@@ -1,4 +1,5 @@
 DIST consul-0.7.1.tar.gz 4003354 SHA256 d1498c851df8aa150c7b4398fdbb74467af4949d20ce5b4840b88095fce71135 SHA512 0cc7dfb5b13c9aa5c59f3c74d44c863cb4099108dadc448233edd006bfd1c1ad422c18224d58113bdad1ca6160a89d1a0a04bf1f5e5f645d5499c0c4422d12ba WHIRLPOOL 33ebd4521a3caa0fb84a4d698e05b7f32c59848b90bbab0899661c51dc34c96fbac37f4eb9cb141be079c4419f57ac0da942d764737baf36dafd73230c84feac
 DIST consul-0.7.2.tar.gz 4200076 SHA256 28441273a928d0976a668ca0657ec655b10fffe45be19b879f3731812ec9e1c5 SHA512 62638f652bad421fe6400338f52f6a142dda9bf4838682f5a31c94ebdb3569ed217cfc7ba8b53a38fae44aaaa8e93912a486d445ed7addb2ff58c7c608469322 WHIRLPOOL fff1869c7d20dc6aa50b765d81d07b610187331d53bd9ec1526fcd85bb00b5426ee8b879946534186694bd3da88a2dd10042632c9bb31249ba6eeb9a8ca20b62
+DIST consul-0.7.3.tar.gz 5022341 SHA256 4055c74382e9fd33c34389ed2b0ed00ab48dca19c1ab1f4293ca3d8f842b1d3d SHA512 abb81183118fa3af0e3ef6c46b15441c8ce6b15dbd37e8516a36f2a2fe7eda8f98a11c40e14181392858ba92d86f4148849c15b6afef16439f1b2e250159a717 WHIRLPOOL 04a4fed4f699a25201e036fd086c9375cd8cb54adfb31e1137f45fa24a478bdc8e1e16798354df192e7badffca0ab7ef6af3394aa371d32a3924912cfdc8f33d
 DIST gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 SHA256 826666828f1ec3e535268fa95d983362c6c773e9a87aa94613e7a47805d22e38 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d WHIRLPOOL 89d52013bfb563a11a4042760470ac317398c3f8a61b9e7734c3ac2737d916126ad10a113948eb5a8362de3d77e598e42f4a0510760ae67465bde08658947f7a
 DIST iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a

app-admin/consul/consul-0.7.3.ebuild

@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit systemd user
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="http://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz
+	https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
+"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-lang/go-1.6:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+get_archive_go_package() {
+	local archive=${1} uri x
+	for x in ${SRC_URI}; do
+		if [[ ${x} == http* ]]; then
+			uri=${x}
+		elif [[ ${x} == ${archive} ]]; then
+			break
+		fi
+	done
+	uri=${uri#https://}
+	echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+	local go_package x
+	# Unpack packages to appropriate locations for GOPATH
+	for x in ${A}; do
+		unpack ${x}
+		if [[ ${x} == *.tar.gz ]]; then
+			go_package=$(get_archive_go_package ${x})
+			mkdir -p src/${go_package%/*}
+			mv ${go_package##*/}-* src/${go_package} || die
+		fi
+	done
+}
+
+src_unpack() {
+	mkdir "${S}" || die
+	cd "${S}" || die
+	unpack_go_packages
+}
+
+src_prepare() {
+	eapply_user
+	# Avoid the need to have a git checkout
+	sed -e 's:^GIT.*::' \
+		-e 's:-X main.GitCommit.*:" \\:' \
+		-i "${S}/src/${EGO_PN}/scripts/build.sh" || die
+
+	# go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-i "${S}/src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	export GOPATH="${S}"
+	go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	PATH=${PATH}:${S}/bin \
+		emake -C "${S}/src/${EGO_PN}" dev
+}
+
+src_install() {
+	local x
+
+	dobin "${S}/bin/${PN}"
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}

app-emacs/magit/Manifest

@@ -1,5 +1,6 @@
 DIST magit-1.2.2.tar.gz 111245 SHA256 8ed300887909d0990cf17b1f4a3b902944db2471ca93dbf0202724b3f44e5d0c SHA512 c7817a5231485e593e8f7aab8c01db19f433ff9b77d6635c95eec6beabb45901f1dbd9d02fad718436f9e25516df14714e7ca1b05b53244e8465dcc14a8cee7a WHIRLPOOL 4b7116bf2568f786a859299ed8039bee32fda51322e29f7ddd139a9ee5e3f3a3caa9d245fffed3e6c28f11b0e068c398f424450275de94a4559a9812634639a0
 DIST magit-2.10.0.tar.gz 427032 SHA256 767038229a2290c241231137c799f188815554949c42c4cd8d679a2d69007ca2 SHA512 6bdc55e52338009b04d075daac05bac4a6c61fff60435a87c1f1133024c98b85cd280986e33b864285855232c7113597a72132802c4a6641bcafe6b157dbd862 WHIRLPOOL 7a7ffba1833dcb01329a835acbf17fdb5fb4138937202decb9f6cc0b0b96c980ffeec68db1ca4f814b41d715ea1c3485bde0cb10c9ba8a2359ac7e865763ebdb
+DIST magit-2.10.1.tar.gz 428180 SHA256 5edee654fd8596352afd04f1dbfff1c7c419a997bda13513b41f9261f8d8d659 SHA512 07c508b36e0e7ea5ffb9b84dba6d75cc89252009b3236a536587328cfcfb37c041781b8ed1f220f1e784a8522a20c3e1d7531893387fe1173ebcd1059777c5f0 WHIRLPOOL 74df44d5888acab3a4b2d3cc9aefd98e29bc346721ca89b2293a803629a15d57b309e0454017966707371c738332b53ffd6c6a9454c83b5d4397e3a304c25b3a
 DIST magit-2.6.1.tar.gz 273643 SHA256 b42a11168d95f7538bc72bcfa1c438c861139c29d6806f133d653b26d1595ebe SHA512 c52bb1ffd8697c3d4b728c785bb1031fef030a5a82bf01669446b5d5c6e441d65f2a749ef215d27b012a6977b7b2b90b22e8270b9365eb5f3770cdcc4fa3f110 WHIRLPOOL b0e8fe99785ae30f56627dec511dcb78e4266ea96995286220ce0782d23ed3a21115b68b3fbd8ee1bb5b876473948a3a3dffe6462f2bd0c5adf6554a3d4a5116
 DIST magit-2.6.2.tar.gz 274584 SHA256 c76692d5e7b242dfb9df1f610bdfdd13fbfbc432923a99b355e525c17196a146 SHA512 4b7abd9f4f7457c8a4eee93cd633bcbb1f2ed0f0d80f56ae50ef608eb42a71ae0a377782c0b2f47cac74ccd5f2a8238060106aa6d0f8475858bf5dfb1cd9d5ef WHIRLPOOL 6eb7c6cad43f691933c0b1087a872e6f60a245cfd8abce7e0e94d2e3824fad8bc6d8896f5d2d353ef929632c9d19465bcf9198044386c8c1eecc016ad1da12a9
 DIST magit-2.7.0.tar.gz 282654 SHA256 f4625abbdf9537fb27751f3aa85fafc51cf793686615bb2501995160c544edcf SHA512 9206c93a9314449e1eae7eba2e7a485d80a656c9bc029affaed86dd7f8c4028bb57cd90dae4efb00c727e3ca207875254c87e7e7c7b1c542523f53125cec20bb WHIRLPOOL 145858db3f4b2755f5671f4b8ff98b7e820bd79cc9053d9ec3fe24d531c8ba5f6a4e59f7f9e911991b2b6289c2e130b865b2d7d310d43866750c163999c76a20

app-emacs/magit/magit-2.10.1.ebuild

@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A Git porcelain inside Emacs"
+HOMEPAGE="https://magit.vc/"
+SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${P}/lisp"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="../Documentation/*.texi"
+DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
+
+DEPEND=">=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.5.9"
+RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
+
+src_prepare() {
+	default
+	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
+}

app-misc/mtail/mtail-1.1.1-r3.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$
 
@@ -14,7 +14,7 @@ SRC_URI="http://matt.immute.net/src/mtail/mtail-${PV}.tgz
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 mips ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=${PYTHON_DEPS}

app-misc/socnetv/Manifest

@@ -1 +1,2 @@
 DIST SocNetV-0.90.tar.gz 371285 SHA256 044988db0cb068c61f8310fa6e51fe2db098cc9a040694b69cab495066b35744 SHA512 a2f6972486d5437977f76539ae00fa6400d979285926398629209199d2fb8b8758c1fd18dc88d89e19865072b9749d5183151c93b6714f802589b0fe10ea7791 WHIRLPOOL bec2654fb2c2141d55e4dee4ea41880d451de8f30d23292abf064df3fec691a3df15a2dcd76961685b5ed0a39e4b9ca979227e2be3d120cbd8865c24d7c4ea7b
+DIST SocNetV-2.2.tar.gz 745086 SHA256 736fa636e888638874deaf356b1ebc400bbef6a4dc94b069dc257ba3a247025f SHA512 12f490fd1f7fc1a6b45f77d23d8825117def0b7720595cd203d171fd88c41d5a0194a70359f55cbe2dab9e545f300156b31bb0680e46d7ab584e070e128e457b WHIRLPOOL af271d9e1e4c5179e1e6629a55f23ffad2035f707ac22d202d4a11dbbfc3dc94160e5c3393f62dcf1f72b0d648d50dcb45ef4ffa848518430dae6396f67deda3

app-misc/socnetv/files/socnetv-2.2-deps.patch

@@ -0,0 +1,10 @@
+--- a/socnetv.pro	2017-01-21 16:50:53.000000000 +0100
++++ b/socnetv.pro	2017-01-28 15:05:26.462351261 +0100
+@@ -34,7 +34,6 @@
+ LANGUAGE = C++
+ 
+ # support
+-QT += xml 
+ QT += network
+ QT += widgets
+ QT += printsupport 

app-misc/socnetv/socnetv-2.2.ebuild

@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils qmake-utils toolchain-funcs
+
+MY_PN="SocNetV"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Qt Social Network Visualizer"
+HOMEPAGE="http://socnetv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/socnetv/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}"-deps.patch )
+
+src_configure() {
+	eqmake5 socnetv.pro
+}
+
+src_install() {
+	default
+	dobin socnetv
+	doicon src/images/socnetv.png
+	domenu ${PN}.desktop
+	if use examples; then
+		insinto /usr/share/${PN}/examples
+		doins nets/*
+	fi
+	doman "${S}/man/${PN}.1.gz"
+}

app-mobilephone/past/files/past-0.0.4-gcc-4.7.patch

@@ -1,5 +1,5 @@
---- src/device.cpp
-+++ src/device.cpp
+--- A/src/device.cpp
++++ B/src/device.cpp
 @@ -22,6 +22,7 @@
  
  extern "C" {

app-mobilephone/past/past-0.0.4.ebuild

@@ -1,23 +1,26 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
+
 inherit cmake-utils
 
-DESCRIPTION="A simple SMS tool"
-HOMEPAGE="http://www.kde-apps.org/content/show.php/past+-+SMS+Tool?content=74036"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/74036-${P}.tar.bz2"
+DESCRIPTION="Simple SMS tool"
+HOMEPAGE="https://www.linux-apps.com/content/show.php/past+-+SMS+Tool?content=74036"
+SRC_URI="https://dl.opendesktop.org/api/files/download/id/1466626318/74036-${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-DEPEND="dev-qt/qtcore:4
+DEPEND="
+	app-mobilephone/gnokii[sms]
+	dev-qt/qtcore:4
 	dev-qt/qtdbus:4
 	dev-qt/qtgui:4
-	app-mobilephone/gnokii[sms]"
+"
 RDEPEND="${DEPEND}"
 
 DOCS=( ChangeLog TODO )

app-shells/pdmenu/pdmenu-1.3.4-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$
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/pdmenu_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 mips x86"
+KEYWORDS="amd64 ~mips x86"
 IUSE="nls gpm examples"
 
 DEPEND="

app-text/ghostscript-gpl/Manifest

@@ -1,7 +1,6 @@
-DIST ghostscript-9.10.tar.bz2 30983380 SHA256 6c8d9d1b23bd8ffd238274e342a40ab21762b0aab6355083ca0db673267dd580 SHA512 59f380e52c84b69819ef7d321f323950c22306119cfa7b38809a23e83f9a3af1e35b5d66d9b9e9adef32131aa283a235deec346acced330d7ad7d1201fe7ca04 WHIRLPOOL e4471563d57882bc111f6a0d48a003ee56692f7ae94c53776be4a5f14fe0d43e2671bc04f8af04d65f3e73bd2e7d68961f9d77cbf644cdd327186ee3ed9ed4c2
 DIST ghostscript-9.15.tar.bz2 28826065 SHA256 e65daf25059e2f3dabd3535df3d936a42ca4933d36473a03095e39adcdd5315c SHA512 5c800615bb813f827c218145eb3238773e01f0941efca51abf4233ac6fdb96154b362c65a9567dc6b22794cb2caff69a58eb436c7f9c8e5370a4a64087e50c7e WHIRLPOOL 9e434278560af8fcc92119309eaaf80d615571d971b06d6e26f40317224bd7af49f2115eda4c914ed9c0bd4755439c91929fa3884eca5beb968c73377eab5f28
-DIST ghostscript-9.18.tar.bz2 29460941 SHA256 83daf5bbbb5afbc32cab944a1afa7ceca046dbf0c3712cd5f2bd21a13e484da1 SHA512 1ea0911cbdd6861ddadf4d4ff3b0fa043885162a8a3ce730e3cec2402cc591c1c3abc31680c7444b7e5b59e56d0d567649ac7394dda94ab830fb197b4d277e1f WHIRLPOOL 203ac2628124700180fbb99ac7c91aeb894bc3badbce0f4dfe9397364ddbe0e480035783368ab06fbc65061f2f5aba1b417d7c7d98154c371ca05f8b7870aeae
 DIST ghostscript-9.19.tar.bz2 29616270 SHA256 f67acdcfcde1f86757ff3553cd719f12eac2d7681a0e96d8bdd1f40a0f47b45b SHA512 d92d05c90ab4849ccca0d8aa0c583d41da3fe6089fd724a84f1fbddb3e65e116ee064ae0933b77019609332f765840146b62607e2f94dbfff90aa0597e1271ea WHIRLPOOL fff901a4c9e83a5adffd53a45a767e95eaf7eb407aa07009003bda59ddfcda5934dc070d7845e1a46addda97219e70fa1464d1de8e41d2070288938d91515f20
-DIST ghostscript-gpl-9.10-patchset-1.tar.bz2 5099 SHA256 f5b515295db2ad70a196ff2aee382d1a01c471ba64671f5b05f504f1109c97c1 SHA512 ae984dae5c426c488480c7c3f0e2eaf473c521c47b968ee91880264f5dbf1df8d992398bbf4dfdc82763953a9ad681c098da3561b203e596ed1ac0edc35d84da WHIRLPOOL c3b353f6f102dd79e229a92770720e50729228baaea950a2b5364541631958616b2d3d55c584875efd75f6c31a5b787bdba87ce452779ec9040966e6019a463d
+DIST ghostscript-9.20.tar.xz 26387028 SHA256 3c0f3dc5df6f784850fa4ce7dcc3d6c56ef543af1fbaedd1d9f8d9f8b66de0ab SHA512 3e636f9746303f0d0fbcdfed22e8da4cc2cfd87c2afde38ffef67acb6a9fc2416aaca691d64355294e70f699bcf4acf33b09d3493dc24bc3c368387f066357fd WHIRLPOOL 0c58d8a860093ae856339839aa5012f5e47d87891fc16890cf7730979cb6506c1b686a6c1ca5dfbdcaafc614d989fec09b665d9eacc784f0dc31bca50d341f7f
 DIST ghostscript-gpl-9.12-patchset-1.tar.bz2 4940 SHA256 5c0e99a192a6d0e142c4c5f38a2d80ceeeb4a8e2265264d31360b06f3d94e0b5 SHA512 e3daf758c75ecb6a38dbece91b0f44ae06985920080b376384a9b3ad2ad35295530c144832158af2933d5fc49782c1fc6733efc60106193499c615a502f5e656 WHIRLPOOL e9436e1681e95a4b578a9de577d9b487ad119893c141baf840cd5dae0b89f5eedbde6d2f1225fb97c425a6dc3f3fb7f1ea6a02ab02b799438c3002fb933575c6
+DIST ghostscript-gpl-9.20-patchset-1.tar.xz 3048 SHA256 c61152a457d00418bea5586094b26a496f891e7150d6a1e3fe041e0d34301530 SHA512 b8b0a39d715f2c054d71710c870514af5a9494017ae35393e3c4323357d72411630de0c6ac50ea4a84a9e4537455e21742c6317b3354d5db1769fe5d39392f35 WHIRLPOOL 0ad329ff8262cc5719bc31f995381d15777a7b293573dc50ce75274a2a6809819ffe5cf4fba679333d981c136bc4f01055de797d6bfa917a7fb4708c8ebeda61
 DIST gsdjvu-1.6.tar.gz 207122 SHA256 6236b14b79345eda87cce9ba22387e166e7614cca2ca86b1c6f0d611c26005df SHA512 57f3866f1f863fa31f066b45ee679cfbdf2c6a9bec922f24fa9f50dd3ea52f192b4c9889b0c9657e96ca9e3528d3fea7dcc53b4d1ea87dd49d138ce9c9684884 WHIRLPOOL 66e5222412d9da2d616ba0a3f73548d031b3e6726eff7bc60bea703b02ce4d22e100adad1faf3fabaac379b4ef8324324eabb8b5320f74ebafe929b577dd6c8d

app-text/ghostscript-gpl/ghostscript-gpl-9.10-r2.ebuild

@@ -1,220 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils multilib versionator flag-o-matic
-
-DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="http://ghostscript.com/"
-
-MY_P=${P/-gpl}
-GSDJVU_PV=1.6
-PVM=$(get_version_component_range 1-2)
-SRC_URI="
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${PN}-9.10-patchset-1.tar.bz2
-	djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )"
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="cups dbus djvu gtk idn l10n_de static-libs X"
-RESTRICT="djvu? ( bindist )"
-
-COMMON_DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.9:2=
-	media-libs/jbig2dec
-	>=media-libs/lcms-2.5:2
-	>=media-libs/libpng-1.6.2:0=
-	>=media-libs/tiff-4.0.1:0=
-	>=sys-libs/zlib-1.2.7:=
-	virtual/jpeg:0
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	djvu? ( app-text/djvu )
-	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
-	idn? ( net-dns/libidn )
-	X? ( x11-libs/libXt x11-libs/libXext )
-"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/poppler-data-0.4.5-r1
-	>=media-fonts/urw-fonts-2.4.9
-	l10n_ja? ( media-fonts/kochi-substitute )
-	l10n_ko? ( media-fonts/baekmuk-fonts )
-	l10n_zh-CN? ( media-fonts/arphicfonts )
-	l10n_zh-TW? ( media-fonts/arphicfonts )
-	!!media-fonts/gnu-gs-fonts-std
-	!!media-fonts/gnu-gs-fonts-other
-	!<net-print/cups-filters-1.0.36-r2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-pkg_setup() {
-	if use djvu; then
-		ewarn "With USE=\"djvu\", distribution of binaries is restricted!"
-		ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
-	fi
-}
-
-src_prepare() {
-	# remove internal copies of various libraries
-	rm -rf "${S}"/cups/libs
-	rm -rf "${S}"/expat
-	rm -rf "${S}"/freetype
-	rm -rf "${S}"/jbig2dec
-	rm -rf "${S}"/jpeg{,xr}
-	rm -rf "${S}"/lcms{,2}
-	rm -rf "${S}"/libpng
-	rm -rf "${S}"/tiff
-	rm -rf "${S}"/zlib
-	# remove internal urw-fonts
-	rm -rf "${S}"/Resource/Font
-	# remove internal CMaps (CMaps from poppler-data are used instead)
-	rm -rf "${S}"/Resource/CMap
-
-	# apply various patches, many borrowed from Fedora
-	# http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
-	EPATCH_SOURCE="${WORKDIR}/patches/"
-	epatch
-
-	if use djvu ; then
-		unpack gsdjvu-${GSDJVU_PV}.tar.gz
-		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
-		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base
-		epatch "${WORKDIR}"/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch
-		cp "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu
-		grep -q djvusep "${S}"/contrib/contrib.mak || \
-			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak
-
-		# install ps2utf8.ps, bug #197818
-		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib
-		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \
-			"${S}"/base/unixinst.mak || die "sed failed"
-	fi
-
-	if ! use gtk ; then
-		sed -i -e "s:\$(GSSOX)::" \
-			-e "s:.*\$(GSSOX_XENAME)$::" \
-			"${S}"/base/unix-dll.mak || die "sed failed"
-	fi
-
-	# search path fix
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
-		-e 's:-L$(BINDIR):$(LDFLAGS) &:g' \
-		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/ijs"
-	eautoreconf
-}
-
-src_configure() {
-	local FONTPATH
-	for path in \
-		/usr/share/fonts/urw-fonts \
-		/usr/share/fonts/Type1 \
-		/usr/share/fonts \
-		/usr/share/poppler/cMap/Adobe-CNS1 \
-		/usr/share/poppler/cMap/Adobe-GB1 \
-		/usr/share/poppler/cMap/Adobe-Japan1 \
-		/usr/share/poppler/cMap/Adobe-Japan2 \
-		/usr/share/poppler/cMap/Adobe-Korea1
-	do
-		FONTPATH="$FONTPATH${FONTPATH:+:}$path"
-	done
-
-	econf \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--enable-openjpeg \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--with-system-libtiff \
-		--without-lcms \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups pdftoraster) \
-		$(use_with idn libidn) \
-		$(use_with X x)
-
-	if use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
-			"${S}"/Makefile || die "sed failed"
-	fi
-
-	cd "${S}/ijs"
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	# workaround: -j1 -> see bug #234378
-	emake -j1 so all
-
-	cd "${S}/ijs"
-	emake
-}
-
-src_install() {
-	# workaround: -j1 -> see bug #356303
-	emake -j1 DESTDIR="${D}" install-so install
-
-	if use djvu ; then
-		dobin gsdjvu
-	fi
-
-	# remove gsc in favor of gambit, bug #253064
-	rm -rf "${D}/usr/bin/gsc"
-
-	cd "${S}/ijs"
-	emake DESTDIR="${D}" install
-
-	# rename the original cidfmap to cidfmap.GS
-	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
-	# install our own cidfmap to handle CJK fonts
-	insinto "/usr/share/ghostscript/${PVM}/Resource/Init"
-	doins "${WORKDIR}/fontmaps/CIDFnmap"
-	doins "${WORKDIR}/fontmaps/cidfmap"
-	for X in ${LANGS} ; do
-		if use l10n_${X} ; then
-			doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
-		fi
-	done
-
-	# install the CMaps from poppler-data properly, bug 409361
-	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
-
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	use l10n_de || rm -r "${D}"/usr/share/man/de
-}

app-text/ghostscript-gpl/ghostscript-gpl-9.10-r4.ebuild

@@ -1,220 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils multilib versionator flag-o-matic
-
-DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="http://ghostscript.com/"
-
-MY_P=${P/-gpl}
-GSDJVU_PV=1.6
-PVM=$(get_version_component_range 1-2)
-SRC_URI="
-	mirror://sourceforge/ghostscript/${MY_P}.tar.bz2
-	mirror://gentoo/${PN}-9.10-patchset-1.tar.bz2
-	djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )"
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="cups dbus djvu gtk idn l10n_de static-libs X"
-RESTRICT="djvu? ( bindist )"
-
-COMMON_DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.9:2=
-	media-libs/jbig2dec
-	>=media-libs/lcms-2.5:2
-	>=media-libs/libpng-1.6.2:0=
-	>=media-libs/tiff-4.0.1:0=
-	>=sys-libs/zlib-1.2.7:=
-	virtual/jpeg:0
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	djvu? ( app-text/djvu )
-	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
-	idn? ( net-dns/libidn )
-	X? ( x11-libs/libXt x11-libs/libXext )
-"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/poppler-data-0.4.5-r1
-	>=media-fonts/urw-fonts-2.4.9
-	l10n_ja? ( media-fonts/kochi-substitute )
-	l10n_ko? ( media-fonts/baekmuk-fonts )
-	l10n_zh-CN? ( media-fonts/arphicfonts )
-	l10n_zh-TW? ( media-fonts/arphicfonts )
-	!!media-fonts/gnu-gs-fonts-std
-	!!media-fonts/gnu-gs-fonts-other
-	!<net-print/cups-filters-1.0.36-r2
-"
-
-S="${WORKDIR}/${MY_P}"
-
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-pkg_setup() {
-	if use djvu; then
-		ewarn "With USE=\"djvu\", distribution of binaries is restricted!"
-		ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
-	fi
-}
-
-src_prepare() {
-	# remove internal copies of various libraries
-	rm -rf "${S}"/cups/libs
-	rm -rf "${S}"/expat
-	rm -rf "${S}"/freetype
-	rm -rf "${S}"/jbig2dec
-	rm -rf "${S}"/jpeg{,xr}
-	rm -rf "${S}"/lcms{,2}
-	rm -rf "${S}"/libpng
-	rm -rf "${S}"/tiff
-	rm -rf "${S}"/zlib
-	# remove internal CMaps (CMaps from poppler-data are used instead)
-	rm -rf "${S}"/Resource/CMap
-
-	# apply various patches, many borrowed from Fedora
-	# http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
-	EPATCH_SOURCE="${WORKDIR}/patches/"
-	epatch
-
-	if use djvu ; then
-		unpack gsdjvu-${GSDJVU_PV}.tar.gz
-		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}"
-		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base
-		epatch "${WORKDIR}"/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch
-		cp "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu
-		grep -q djvusep "${S}"/contrib/contrib.mak || \
-			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak
-
-		# install ps2utf8.ps, bug #197818
-		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib
-		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \
-			"${S}"/base/unixinst.mak || die "sed failed"
-	fi
-
-	if ! use gtk ; then
-		sed -i -e "s:\$(GSSOX)::" \
-			-e "s:.*\$(GSSOX_XENAME)$::" \
-			"${S}"/base/unix-dll.mak || die "sed failed"
-	fi
-
-	# search path fix
-	# put LDFLAGS after BINDIR, bug #383447
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
-		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
-		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/ijs"
-	eautoreconf
-}
-
-src_configure() {
-	local FONTPATH
-	for path in \
-		/usr/share/fonts/urw-fonts \
-		/usr/share/fonts/Type1 \
-		/usr/share/fonts \
-		/usr/share/poppler/cMap/Adobe-CNS1 \
-		/usr/share/poppler/cMap/Adobe-GB1 \
-		/usr/share/poppler/cMap/Adobe-Japan1 \
-		/usr/share/poppler/cMap/Adobe-Japan2 \
-		/usr/share/poppler/cMap/Adobe-Korea1
-	do
-		FONTPATH="$FONTPATH${FONTPATH:+:}$path"
-	done
-
-	econf \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--enable-openjpeg \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--with-system-libtiff \
-		--without-lcms \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups pdftoraster) \
-		$(use_with idn libidn) \
-		$(use_with X x)
-
-	if use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
-			"${S}"/Makefile || die "sed failed"
-	fi
-
-	cd "${S}/ijs"
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	# workaround: -j1 -> see bug #234378
-	emake -j1 so all
-
-	cd "${S}/ijs"
-	emake
-}
-
-src_install() {
-	# workaround: -j1 -> see bug #356303
-	emake -j1 DESTDIR="${D}" install-so install
-
-	if use djvu ; then
-		dobin gsdjvu
-	fi
-
-	# move gsc to gs, bug #343447
-	# gsc collides with gambit, bug #253064
-	mv -f "${D}/usr/bin/gsc" "${D}/usr/bin/gs" || die
-
-	cd "${S}/ijs"
-	emake DESTDIR="${D}" install
-
-	# rename the original cidfmap to cidfmap.GS
-	mv "${D}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
-	# install our own cidfmap to handle CJK fonts
-	insinto "/usr/share/ghostscript/${PVM}/Resource/Init"
-	doins "${WORKDIR}/fontmaps/CIDFnmap"
-	doins "${WORKDIR}/fontmaps/cidfmap"
-	for X in ${LANGS} ; do
-		if use l10n_${X} ; then
-			doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
-		fi
-	done
-
-	# install the CMaps from poppler-data properly, bug #409361
-	dosym /usr/share/poppler/cMaps /usr/share/ghostscript/${PVM}/Resource/CMap
-
-	use static-libs || find "${D}" -name '*.la' -delete
-
-	use l10n_de || rm -r "${D}"/usr/share/man/de
-}

app-text/ghostscript-gpl/ghostscript-gpl-9.20.ebuild

@@ -1,27 +1,41 @@
-# 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
 
 inherit autotools eutils multilib versionator flag-o-matic toolchain-funcs
 
 DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
 HOMEPAGE="http://ghostscript.com/"
 
+# Maintainer notes about djvu support:
+# gsdjvu has not seen any commits since July 2016, which was also roughly the time
+# when ghostscript started rearranging internals. Issues I found so far:
+# * gs_state and gs_imager_state got unified into gs_gstate
+# * decode_glyph changed arguments and semantics (it doesnt give you the unicode now,
+#   but the length of the required byte array, which you have to allocate and fill)
+# * gs_text_enum_t has lost its element pis (???)
+
 MY_P=${P/-gpl}
-GSDJVU_PV=1.6
+# GSDJVU_PV=1.9
 PVM=$(get_version_component_range 1-2)
+PVM_S=$(replace_all_version_separators "" ${PVM})
+# SRC_URI="
+#	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz
+#	mirror://gentoo/${PN}-9.20-patchset-1.tar.xz
+#	djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )"
 SRC_URI="
-	http://downloads.ghostscript.com/public/${MY_P}.tar.bz2
-	mirror://gentoo/${PN}-9.12-patchset-1.tar.bz2
-	djvu? ( mirror://sourceforge/djvu/gsdjvu-${GSDJVU_PV}.tar.gz )"
+	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~dilfridge/distfiles/${PN}-9.20-patchset-1.tar.xz
+"
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="cups dbus djvu gtk idn l10n_de static-libs tiff X"
-RESTRICT="djvu? ( bindist )"
+# IUSE="cups dbus djvu gtk idn l10n_de static-libs tiff X"
+IUSE="cups dbus gtk idn l10n_de static-libs tiff X"
+# RESTRICT="djvu? ( bindist )"
 
 COMMON_DEPEND="
 	app-text/libpaper
@@ -30,16 +44,17 @@ COMMON_DEPEND="
 	media-libs/jbig2dec
 	>=media-libs/lcms-2.6:2
 	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/openjpeg-2.1.0:2=
 	>=sys-libs/zlib-1.2.7:=
 	virtual/jpeg:0
 	cups? ( >=net-print/cups-1.3.8 )
 	dbus? ( sys-apps/dbus )
-	djvu? ( app-text/djvu )
 	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
 	idn? ( net-dns/libidn )
 	tiff? ( >=media-libs/tiff-4.0.1:0= )
 	X? ( x11-libs/libXt x11-libs/libXext )
 "
+#	djvu? ( app-text/djvu )
 
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
@@ -64,14 +79,16 @@ for X in ${LANGS} ; do
 	IUSE="${IUSE} l10n_${X}"
 done
 
-pkg_setup() {
-	if use djvu; then
-		ewarn "With USE=\"djvu\", distribution of binaries is restricted!"
-		ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
-	fi
-}
+#pkg_setup() {
+#	if use djvu; then
+#		ewarn "With USE=\"djvu\", distribution of binaries is restricted!"
+#		ewarn "See http://djvu.sourceforge.net/gsdjvu/COPYING for details on licensing issues."
+#	fi
+#}
 
 src_prepare() {
+	default
+
 	# remove internal copies of various libraries
 	rm -rf "${S}"/cups/libs || die
 	rm -rf "${S}"/expat || die
@@ -82,6 +99,7 @@ src_prepare() {
 	rm -rf "${S}"/libpng || die
 	rm -rf "${S}"/tiff || die
 	rm -rf "${S}"/zlib || die
+	rm -rf "${S}"/openjpeg || die
 	# remove internal CMaps (CMaps from poppler-data are used instead)
 	rm -rf "${S}"/Resource/CMap || die
 
@@ -89,30 +107,27 @@ src_prepare() {
 	# http://pkgs.fedoraproject.org/cgit/ghostscript.git
 	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"
 	EPATCH_SOURCE="${WORKDIR}/patches/"
-	EPATCH_EXCLUDE="
-		ghostscript-gpl-8.64-noopt.patch
-		ghostscript-gpl-9.07-wrf-snprintf.patch
-		ghostscript-gpl-9.12-icc-missing-check.patch
-		ghostscript-gpl-9.12-sys-zlib.patch
-	"
 	epatch
 
-	epatch "${FILESDIR}"/${P}-gserrors.h-backport.patch
-
-	if use djvu ; then
-		unpack gsdjvu-${GSDJVU_PV}.tar.gz
-		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}" || die
-		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/base || die
-		epatch "${WORKDIR}"/patches-gsdjvu/gsdjvu-1.3-${PN}-8.64.patch
-		cp "${S}"/contrib/contrib.mak "${S}"/base/contrib.mak.gsdjvu || die
-		grep -q djvusep "${S}"/contrib/contrib.mak || \
-			cat gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/contrib/contrib.mak || die
-
-		# install ps2utf8.ps, bug #197818
-		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib || die
-		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \
-			"${S}"/base/unixinst.mak || die "sed failed"
-	fi
+#	if use djvu ; then
+#		unpack gsdjvu-${GSDJVU_PV}.tar.gz
+#
+#		local gsdjvu_base=devices
+#		local gsdjvu_msed='-e s/@@djvu@@/DEV/g'
+#
+#		cp gsdjvu-${GSDJVU_PV}/gdevdjvu.c "${S}"/${gsdjvu_base} || die
+#
+#		cp gsdjvu-${GSDJVU_PV}/ps2utf8.ps "${S}"/lib || die
+#
+#		cp gsdjvu-${GSDJVU_PV}/gsdjvu "${S}" || die
+#		cp "${S}"/${gsdjvu_base}/contrib.mak "${S}"/${gsdjvu_base}/contrib.mak.gsdjvu || die
+#		grep -q djvusep "${S}"/${gsdjvu_base}/contrib.mak || \
+#			sed ${gsdjvu_msed} < gsdjvu-${GSDJVU_PV}/gsdjvu.mak >> "${S}"/${gsdjvu_base}/contrib.mak || die
+#
+##		# install ps2utf8.ps, bug #197818
+##		sed -i -e '/$(EXTRA_INIT_FILES)/ a\ps2utf8.ps \\' \
+##			"${S}"/base/unixinst.mak || die "sed failed"
+#	fi
 
 	if ! use gtk ; then
 		sed -i -e "s:\$(GSSOX)::" \
@@ -125,20 +140,25 @@ src_prepare() {
 		-e "/^ZLIBDIR=/s:=.*:=${T}:" \
 		configure.ac || die
 	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
 	sed -i \
 		-e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
 		base/lib.mak || die
 
 	# search path fix
 	# put LDFLAGS after BINDIR, bug #383447
-	sed -i -e "s:\$\(gsdatadir\)/lib:/usr/share/ghostscript/${PVM}/$(get_libdir):" \
-		-e "s:exdir=.*:exdir=/usr/share/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=/usr/share/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=/usr/share/doc/${PF}/html:" \
+	sed -i -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
 		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
 		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
 
 	cd "${S}" || die
+	# remove incorrect symlink, bug 590384
+	rm -f ijs/ltmain.sh || die
 	eautoreconf
 
 	cd "${S}/ijs" || die
@@ -157,18 +177,15 @@ src_configure() {
 		/usr/share/poppler/cMap/Adobe-Japan2 \
 		/usr/share/poppler/cMap/Adobe-Korea1
 	do
-		FONTPATH="$FONTPATH${FONTPATH:+:}$path"
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
 	done
 
-	# We force the endian configure flags until this is fixed:
-	# http://bugs.ghostscript.com/show_bug.cgi?id=696498
 	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
 	econf \
 		--enable-dynamic \
 		--enable-freetype \
 		--enable-fontconfig \
 		--enable-openjpeg \
-		--enable-$(tc-endian)-endian \
 		--disable-compile-inits \
 		--with-drivers=ALL \
 		--with-fontpath="$FONTPATH" \
@@ -184,10 +201,10 @@ src_configure() {
 		$(use_with tiff system-libtiff) \
 		$(use_with X x)
 
-	if use djvu ; then
-		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
-			"${S}"/Makefile || die "sed failed"
-	fi
+#	if use djvu ; then
+#		sed -i -e 's!$(DD)bbox.dev!& $(DD)djvumask.dev $(DD)djvusep.dev!g' \
+#			"${S}"/Makefile || die "sed failed"
+#	fi
 
 	cd "${S}/ijs" || die
 	econf \
@@ -206,7 +223,7 @@ src_compile() {
 src_install() {
 	emake -j1 DESTDIR="${D}" install-so install
 
-	use djvu && dobin gsdjvu
+#	use djvu && dobin gsdjvu
 
 	# move gsc to gs, bug #343447
 	# gsc collides with gambit, bug #253064

app-text/mandoc/Manifest

@@ -0,0 +1 @@
+DIST mdocml-1.13.4.tar.gz 370428 SHA256 0a55c1addb188071d6f784599303656b8465e98ec6b2f4f264e12fb96d79e0ef SHA512 1d671651ca1bb81d0de86e34de8b95a3bde5b335bda03d1b83b601e26eed167af6ef8bac6f9935603e57514f2734cd8f979ed556c76db629dd5c685892d71ec2 WHIRLPOOL cba6d6e34d59a772ef6339b91ec57d7f9b0f6b7345567445eedd230d5c7f05971b70789fe4d338e226e863c47ca9f32667ff5ff03eaa8db97add1b1346523194

app-text/mandoc/mandoc-1.13.4.ebuild

@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_PN="mdocml"
+MY_P="${MY_PN}-${PV}"
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Suite of tools compiling mdoc and man"
+HOMEPAGE="http://mdocml.bsd.lv/"
+SRC_URI="http://mdocml.bsd.lv/snapshots/${MY_P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sqlite static"
+
+LIB_DEPEND="sys-libs/zlib[static-libs(+)]
+	sqlite? ( dev-db/sqlite:3[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# The db-install change is to support parallel installs.
+	sed -i \
+		-e '/ar rs/s:ar:$(AR):' \
+		-e '/^db-install:/s:$: base-install:' \
+		Makefile || die
+
+	cat <<EOF > "configure.local"
+PREFIX="${EPREFIX}/usr"
+BINDIR="${EPREFIX}/usr/bin"
+SBINDIR="${EPREFIX}/usr/sbin"
+LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+MANDIR="${EPREFIX}/usr/share/man"
+INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
+EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
+MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
+
+BINM_MAN=mman
+BINM_SOELIM=msoelim
+BINM_APROPOS=mapropos
+BINM_WHATIS=mwhatis
+BINM_MAKEWHATIS=mmakewhatis
+MANM_MAN=mandoc_man
+MANM_MDOC=mandoc_mdoc
+MANM_ROFF=mandoc_roff
+MANM_EQN=mandoc_eqn
+MANM_TBL=mandoc_tbl
+
+HAVE_SQLITE3="$(usex sqlite 1 0)"
+
+CFLAGS="${CFLAGS} ${CPPFLAGS}"
+LDFLAGS="${LDFLAGS} $(usex static -static '')"
+AR="$(tc-getAR)"
+CC="$(tc-getCC)"
+# The STATIC variable is only used by man.cgi.
+STATIC=
+EOF
+}

app-text/mandoc/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+</maintainer>
+</pkgmetadata>

app-text/rpl/rpl-1.5.5-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$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 python_prepare_all() {

app-vim/autoalign/autoalign-14.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$
 
@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: automatically align bib, c, c++, tex and vim code"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=884"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 if [[ ${PV} != 9999* ]] ; then

app-vim/bnf-syntax/bnf-syntax-1.2-r2.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$
 
@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: BNF file syntax highlighting"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=250"
 LICENSE="vim.org"
-KEYWORDS="alpha amd64 ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\

app-vim/closetag/closetag-0.9.1-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$
 
@@ -10,7 +10,7 @@ DESCRIPTION="vim plugin: close HTML/XML tags quickly"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=13"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\

app-vim/cmdalias/cmdalias-3.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$
 
@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: library for alias creation"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=746"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\

app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild

@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: library for extending vim's mode() function"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=745"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 RDEPEND="app-vim/genutils"

app-vim/dbext/dbext-24.0.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$
 
@@ -9,6 +9,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: easy access to databases"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=356"
 LICENSE="GPL-2"
-KEYWORDS="amd64 mips ppc x86"
+KEYWORDS="amd64 ~mips ppc x86"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"

app-vim/detectindent/detectindent-1.0_p20150908.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$
 
@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: automatically detect file indent settings"
 HOMEPAGE="https://github.com/ciaranm/detectindent"
 LICENSE="vim"
-KEYWORDS="amd64 hppa mips ppc sparc x86"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86"
 IUSE=""
 
 if [[ ${PV} != 9999* ]] ; then

app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild

@@ -10,7 +10,7 @@ DESCRIPTION="vim plugin: enhanced comment creation"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=23"
 
 LICENSE="BSD"
-KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPFILES="EnhancedCommentify"
 

app-vim/errsign/errsign-0.1-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$
 
@@ -10,7 +10,7 @@ DESCRIPTION="vim plugin: display marks on lines with errors"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1027"
 
 LICENSE="vim.org"
-KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\

app-vim/foldutil/foldutil-3.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$
 
@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: fold creation utility"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=158"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=app-vim/genutils-2.0"

app-vim/genindent/genindent-1.1-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$
 
@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: library for simplifying indent files"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=678"
 LICENSE="vim"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\

app-vim/locateopen/locateopen-1.3-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$
 
@@ -10,7 +10,7 @@ DESCRIPTION="vim plugin: open a file without supplying a path"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=858"
 
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 RDEPEND="

app-vim/matrix/matrix-1.10-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$
 
@@ -10,7 +10,7 @@ DESCRIPTION="vim plugin: Screensaver inspired by the Matrix"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1189"
 
 LICENSE="vim.org"
-KEYWORDS="amd64 mips ppc sparc x86"
+KEYWORDS="amd64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\

app-vim/pushpop/pushpop-4.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$
 
@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: pushd / popd from the vim commandline"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=129"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 RDEPEND="

app-vim/showmarks/showmarks-2.2-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$
 
@@ -10,7 +10,7 @@ DESCRIPTION="vim plugin: show location marks visually"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=152"
 
 LICENSE="public-domain"
-KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPFILES="showmarks.txt"

app-vim/toggle/toggle-0.5-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$
 
@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: quickly toggle boolean-type keywords"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=895"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\

app-vim/uptime/uptime-1.3-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$
 
@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: display vim uptimes"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=965"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 mips ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPFILES="uptime"

app-vim/wikipedia-syntax/wikipedia-syntax-20101113-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$
 
@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Wikipedia syntax highlighting"
 HOMEPAGE="http://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim"
 LICENSE="CC-BY-SA-3.0"
-KEYWORDS="amd64 hppa mips ppc ppc64 x86"
+KEYWORDS="amd64 hppa ~mips ppc ppc64 x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\

app-vim/xquery-syntax/xquery-syntax-0.1-r2.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 @@ DESCRIPTION="vim plugin: XQuery syntax highlighting"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=803"
 
 LICENSE="vim.org"
-KEYWORDS="alpha amd64 ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\

app-vim/xsl-syntax/xsl-syntax-0.3.11-r2.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$
 
@@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: Syntax for XSLT (with HTML and others)"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=257"
 LICENSE="vim"
-KEYWORDS="alpha amd64 ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=257"
 

dev-db/mongodb/Manifest

@@ -1,6 +1,5 @@
 DIST 20140409-mms-monitoring-agent.zip 40122 SHA256 9c4f89cfba10b4604512ab21eb082248104aeabe7e813b852db2b86f47d7ecb2 SHA512 5290a813c407251b5e4def813ce6fe7e09d6c3a1907fd409e326b15b07aed39f7db3a28710ecdaffe2771136c9433253c5d1857c823844a4b75dd38f1d15eefd WHIRLPOOL ce80870e2618f3d9ed80af41b1069ed5bd97af475089564eed1bc111e820c048bc5cbaa03f859349e772fe232f876127e0627c75c135a9b2e196ab13258ed9f1
 DIST mongodb-src-r2.6.12.tar.gz 16462842 SHA256 2dd51eabcfcd133573be74c0131c85b67764042833e7d94077e86adc0b9406dc SHA512 ceed10f2da50ca390f56cc79d39ea4db7a1ef6764e37dae61c3f3f664708be72de09443bbf94f8e58479e4f2923ff2ab9eee45652e82271b3bad591e03ef7657 WHIRLPOOL 1587ef45ee17f9e3357a92b480ea739192076ead280c44c801650d01d2ae29a627a96db611eac6c9b6b47e5e619e2362df94e1792348709b3ea5a4970a8751a0
-DIST mongodb-src-r2.6.8.tar.gz 14545274 SHA256 1997f60d9de17320f22c604d8aa1cbe5f38d877142cd0e9130fe3dae7b311a06 SHA512 6fa69750debb40d0be4d5d057125320d97e882e30c43c664fcb6ec6a9e6a8bff5e63637fc8952a6d898556b2c2ce84254d135387dc0879bf65dbd5e91b8732ef WHIRLPOOL ba87ca07258ad4df90c92bc300da6cc661117a98f254a8ba62ac362a857ecc2462eb9ddf1d929a6e2187853233053e975aa02139f880d736e47e542a9504bd28
 DIST mongodb-src-r3.0.14.tar.gz 28093922 SHA256 ebbb758ca7ee53e8d25e2410bb7ef61640829566d094cde2487b55e73d0fd880 SHA512 477fab29ca0ad2a0f24b895e30dc4770af8d6a1a57f3c10a02a989b58dd22510db554da0418129d4e81958342ad169696eed4b86bf5aa73916c7cec879db1152 WHIRLPOOL 7fc02969c52954f0fd9b90ace9efd3677a9d6b8d3618b5dedb470343a3ba71789d451cc30a95742b2b9e61b21ffe0f1a23e239e388a497a327f2cc8ed1ed6aef
 DIST mongodb-src-r3.2.11.tar.gz 29113706 SHA256 625eb28fd47b2af63b30343a064de7f42e5265f4c642874ec766ba3643fd80d7 SHA512 8cb63f878d573e2fb2bace57a10d036aebe0cc06e46a3cd5480fb4a8bcd51ac5219c729b5ea85213e0c905906a93780080332fa01dbcd29e01358f5e9051824c WHIRLPOOL fca825400e9ab16e53dfbbd400a9bd87b9a866d56b2a5839ece25b8dbfe55074fa04d40f47c337f67cb3bd3e547b99b4349eeb15a87a9b9659ea0f1a0cc2c526
 DIST mongodb-src-r3.4.1.tar.gz 40161375 SHA256 54f475e553827733fb351ee4b03b470297f0d08e0434fbf7e6661705124da97b SHA512 48400f00ed84922b1e734ad915c376a567af2cd32e9cdcc40819fdfbc0a5c2444e4f325b1a541fc21cf87f4d95f9bdcc64bd59eab9d25e75b28732978feda031 WHIRLPOOL 1dce39c7b36b2c1d3760c7c560c1fefde9ea6d780ef1ef8b5db38f3ed8f0aff9a4ae51ab26381d9330c5b3ad3182ed998ae8e2a0ecc85e9347714ffa853d7734

dev-db/mongodb/mongodb-2.6.8.ebuild

@@ -1,184 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-SCONS_MIN_VERSION="1.2.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
-	mms-agent? ( https://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug kerberos mms-agent ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
-	app-arch/snappy
-	>=dev-cpp/yaml-cpp-0.5.1
-	>=dev-libs/boost-1.50[threads(+)]
-	>=dev-libs/libpcre-8.30[cxx]
-	dev-libs/snowball-stemmer
-	dev-util/google-perftools[-minimal]
-	net-libs/libpcap
-	ssl? ( >=dev-libs/openssl-1.0.1g )"
-DEPEND="${RDEPEND}
-	sys-libs/ncurses
-	sys-libs/readline
-	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
-	scons_opts+=" --disable-warnings-as-errors"
-	scons_opts+=" --use-system-boost"
-	scons_opts+=" --use-system-pcre"
-	scons_opts+=" --use-system-snappy"
-	scons_opts+=" --use-system-stemmer"
-	scons_opts+=" --use-system-tcmalloc"
-	scons_opts+=" --use-system-yaml"
-	scons_opts+=" --usev8"
-
-	if use debug; then
-		scons_opts+=" --dbg=on"
-	fi
-
-	if use prefix; then
-		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
-		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
-	fi
-
-	if use kerberos; then
-		scons_opts+=" --use-sasl-client"
-	fi
-
-	if use ssl; then
-		scons_opts+=" --ssl"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.6.2-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
-	epatch "${FILESDIR}/${PN}-2.6.10-fix-boost-1.57.patch"
-
-	# fix yaml-cpp detection
-	sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct || die
-
-	# bug #462606
-	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-
-	# bug #482576
-	sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
-}
-
-src_configure() {
-	# filter some problematic flags
-	filter-flags "-march=*"
-	filter-flags -O?
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
-	use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r2" ${PN}.conf
-	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	if use mms-agent; then
-		local MY_PN="mms-agent"
-		local MY_D="/opt/${MY_PN}"
-
-		insinto /etc
-		newins "${WORKDIR}/${MY_PN}/settings.py" mms-agent.conf
-		rm "${WORKDIR}/${MY_PN}/settings.py"
-
-		insinto ${MY_D}
-		doins "${WORKDIR}/${MY_PN}/"*
-		dosym /etc/mms-agent.conf ${MY_D}/settings.py
-
-		fowners -R mongodb:mongodb ${MY_D}
-		newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
-	fi
-}
-
-pkg_preinst() {
-	# wrt bug #461466
-	if [[ "$(get_libdir)" == "lib64" ]]; then
-		rmdir "${ED}"/usr/lib/ &>/dev/null
-	fi
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.6 ${v}; then
-			ewarn "!! IMPORTANT !!"
-			ewarn " "
-			ewarn "${PN} configuration files have changed !"
-			ewarn " "
-			ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
-			ewarn "  http://docs.mongodb.org/manual/reference/configuration-options/"
-			ewarn " "
-			ewarn "Make sure you also follow the upgrading process :"
-			ewarn "  http://docs.mongodb.org/master/release-notes/2.6-upgrade/"
-			ewarn " "
-			if use mms-agent; then
-				ewarn "MMS Agent configuration file has been moved to :"
-				ewarn "  /etc/mms-agent.conf"
-			fi
-			break
-		else
-			if use mms-agent; then
-				elog "Edit your MMS Agent configuration file :"
-				elog "  /etc/mms-agent.conf"
-			fi
-		fi
-	done
-}

dev-lang/crystal/crystal-0.20.5-r1.ebuild

@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit multiprocessing toolchain-funcs
+
+BV=0.20.4-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="http://crystal-lang.org"
+SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
+	x86? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples +xml +yaml"
+
+# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
+DEPEND="
+	>=sys-devel/llvm-3.9.0
+	dev-libs/boehm-gc[static-libs,threads]
+	dev-libs/libatomic_ops
+	dev-libs/libevent
+	dev-libs/libpcre
+	sys-libs/libunwind
+	dev-libs/pcl
+	dev-libs/gmp:0
+"
+RDEPEND="${DEPEND}
+	xml? ( dev-libs/libxml2 )
+	yaml? ( dev-libs/libyaml )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-AR.patch
+	"${FILESDIR}"/${P}-verbose.patch
+)
+
+src_compile() {
+	emake \
+		release=1 \
+		stats=1 \
+		threads=$(makeopts_jobs) \
+		verbose=1 \
+		\
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		\
+		PATH="${WORKDIR}"/${PN}-${BV}/bin:"${PATH}" \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV} \
+		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
+	use doc && emake doc
+}
+
+src_test() {
+	emake spec \
+		verbose=1 \
+		\
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV}
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/crystal
+	doins -r src/.
+	dobin .build/crystal
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/completion.zsh _crystal
+
+	use examples && dodoc -r samples
+
+	if use doc ; then
+		docinto api
+		dodoc -r doc/.
+	fi
+}

dev-lang/crystal/crystal-0.20.5-r2.ebuild

@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit multiprocessing toolchain-funcs
+
+BV=0.20.4-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="http://crystal-lang.org"
+SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
+	x86? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc debug examples +xml +yaml"
+
+# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
+DEPEND="
+	>=sys-devel/llvm-3.9.0
+	dev-libs/boehm-gc[static-libs,threads]
+	dev-libs/libatomic_ops
+	dev-libs/libevent
+	dev-libs/libpcre
+	sys-libs/libunwind
+	dev-libs/pcl
+	dev-libs/gmp:0
+"
+RDEPEND="${DEPEND}
+	xml? ( dev-libs/libxml2 )
+	yaml? ( dev-libs/libyaml )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-AR.patch
+	"${FILESDIR}"/${P}-verbose.patch
+	"${FILESDIR}"/${P}-LDFLAGS.patch
+)
+
+src_compile() {
+	emake \
+		$(usex debug "" release=1) \
+		stats=1 \
+		threads=$(makeopts_jobs) \
+		verbose=1 \
+		\
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		\
+		PATH="${WORKDIR}"/${PN}-${BV}/bin:"${PATH}" \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV} \
+		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
+	use doc && emake doc
+}
+
+src_test() {
+	emake spec \
+		$(usex debug "" release=1) \
+		stats=1 \
+		threads=$(makeopts_jobs) \
+		verbose=1 \
+		\
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		AR=$(tc-getAR) \
+		\
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV}
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/crystal
+	doins -r src/.
+	dobin .build/crystal
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/completion.zsh _crystal
+
+	use examples && dodoc -r samples
+
+	if use doc ; then
+		docinto api
+		dodoc -r doc/.
+	fi
+}

dev-lang/crystal/files/crystal-0.20.5-AR.patch

@@ -0,0 +1,9 @@
+diff --git a/Makefile b/Makefile
+index dc675a0..1f53d40 100644
+--- a/Makefile
++++ b/Makefile
+@@ -118,3 +118,3 @@ $(LLVM_EXT_OBJ): $(LLVM_EXT_DIR)/llvm_ext.cc
+ $(LIB_CRYSTAL_TARGET): $(LIB_CRYSTAL_OBJS)
+-	ar -rcs $@ $^
++	$(AR) -rcs $@ $^
+ 

dev-lang/crystal/files/crystal-0.20.5-LDFLAGS.patch

@@ -0,0 +1,9 @@
+diff --git a/Makefile b/Makefile
+index fa71479..d316bbc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,3 +24,3 @@ SOURCES := $(shell find src -name '*.cr')
+ SPEC_SOURCES := $(shell find spec -name '*.cr')
+-FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(verbose),--verbose )
++FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(verbose),--verbose )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )
+ VERBOSE := $(if $(verbose),-v )

dev-lang/crystal/files/crystal-0.20.5-verbose.patch

@@ -0,0 +1,9 @@
+diff --git a/Makefile b/Makefile
+index 1f53d40..fa71479 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,3 +24,3 @@ SOURCES := $(shell find src -name '*.cr')
+ SPEC_SOURCES := $(shell find spec -name '*.cr')
+-FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(threads),--threads $(threads) )$(if $(debug),-d )
++FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(verbose),--verbose )
+ VERBOSE := $(if $(verbose),-v )

dev-lang/crystal/metadata.xml

@@ -19,6 +19,9 @@
 		disallowing certain dynamic aspects of Ruby.
 	</longdescription>
 	<use>
+		<flag name="debug">
+			Build each module as a separate object file. Speeds build up.
+		</flag>
 		<flag name="yaml">
 			Use the <pkg>dev-libs/libyaml</pkg> library to enable Crystal yaml
 			module

dev-libs/libclc/Manifest

@@ -2,3 +2,4 @@ DIST libclc-0.1.0_pre20150305.tar.xz 45492 SHA256 5c221bc70438d50cc5893797ebd59a
 DIST libclc-0.2.0_pre20151006.tar.xz 74584 SHA256 188c013e9115fcef934fdac92bac9f306394742d9e6f82bdc9304e1ddbad8f21 SHA512 2e5231325c06f863bd032c91f44e2f681d4d0e24adde780e5c81114fc6121f762794a6fa8ee398aa379daf1645251cb5c69946ac19f1edc1fec102e2f281cdff WHIRLPOOL d85602cad06052d4b80951b42653fb0444d3f904bd97b5ef2e9071026e14f20764811de297537ddd4e95b5c86f1aa971aa3867c611e7cb720e66d4f0667c0844
 DIST libclc-0.2.0_pre20160209.tar.xz 75756 SHA256 4ed3491997cc524faa0c982a29bc3b4028c1054786e6dfe929d9c43265d78ed7 SHA512 d3edff5e04dc3d34033fdccc0a0d8256ea03515bd98b32818ec181d541141acf9ea06bb7e6bb149ea5e7f5dbcbb76ba13453fb1f461b4737a15ac60c7b3fc4ca WHIRLPOOL 111f75bb89c8288ffefc7a2e1448fd79d41f47990450984537405e423cbf7ea3717e102408774667ac654650db44109c1473a25c2e84d79fa19bc3dad0f7b69c
 DIST libclc-0.2.0_pre20160921.tar.gz 127817 SHA256 82c89bb15f79eaf525d283dda82403b213ef1a11b1ea9d843799fb04e08d190d SHA512 5aae6010f32935c0b8fa510fc27cfd0be2df3d58d73cb5fb280d6758aafe54bd63a0137e59053aa81dca01ad2c5a0591ee1d4a83e3ef9a590a009a1a19062373 WHIRLPOOL 6e29280dfa585999d0aa6720a0a33b329b08be31a9f19246e23cbca723210337f834d14a8064541796b05e27dd999af1d3050f04c4fbcdc1e0fe2af574cdb243
+DIST libclc-0.2.0_pre20170118.tar.gz 130793 SHA256 a2d59b11b710468598f25b968ffd4e36125e6e9fe56e052ab09c9abc9c8fc295 SHA512 d94a58ebcafb7bbdbcded84574676537ae7b4ba86c7c2270cc1cd7aa3113104e018e53396b570e821c2fd473b6dd63677f59d990e36e15a7cdb43cdb96cd058c WHIRLPOOL 1ebddaa0b56171b755df35068bc57dcd54644ab447687bd0f5e47417834065574f614fafb495d0ae497942537474a6c36ff55a787a437f69b56d3734dd7385cf

dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild

@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+EGIT_REPO_URI="http://llvm.org/git/${PN}.git
+	https://github.com/llvm-mirror/${PN}.git"
+EGIT_COMMIT="2ec7d80d5e1c96fb85c694cc6ac0a78faf01a614"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+else
+	GIT_ECLASS="vcs-snapshot"
+fi
+
+inherit python-any-r1 ${GIT_ECLASS}
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="http://libclc.llvm.org/"
+
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="https://github.com/llvm-mirror/libclc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+		${SRC_PATCHES}"
+fi
+
+LICENSE="|| ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sys-devel/clang-4
+	>=sys-devel/llvm-4"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+src_configure() {
+	./configure.py \
+		--with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \
+		--prefix="${EPREFIX}/usr" || die
+}
+
+src_compile() {
+	emake VERBOSE=1
+}

dev-libs/libindicate-qt/files/libindicate-qt-0.2.5.91-optionaltests.patch

@@ -1,7 +1,7 @@
 https://code.launchpad.net/~ballogy/libindicate-qt/make-examples-and-tests-optional/+merge/82829
 === modified file 'CMakeLists.txt'
---- CMakeLists.txt	2010-03-08 09:02:19 +0000
-+++ CMakeLists.txt	2011-11-20 20:28:23 +0000
+--- A/CMakeLists.txt	2010-03-08 09:02:19 +0000
++++ B/CMakeLists.txt	2011-11-20 20:28:23 +0000
 @@ -36,8 +36,16 @@
      DESTINATION lib${LIB_SUFFIX}/pkgconfig)
  

dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild

@@ -1,9 +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=4
-inherit eutils virtualx cmake-utils
+EAPI=6
+
+inherit virtualx cmake-utils
 
 _UBUNTU_REVISION=5
 
@@ -17,24 +18,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RDEPEND=">=dev-libs/libindicate-12.10.0
-	dev-qt/qtgui:4"
+RDEPEND="
+	>=dev-libs/libindicate-12.10.0
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	test? ( dev-qt/qttest:4 )
-	virtual/pkgconfig"
+"
 
 # bug #440042
 RESTRICT="test"
 
 src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches
-	epatch "${FILESDIR}"/${P}-optionaltests.patch
+	eapply "${WORKDIR}"/debian/patches
+	eapply "${FILESDIR}"/${P}-optionaltests.patch
+	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=OFF
-		$(cmake-utils_use_build test TESTS)
+		-DBUILD_TESTS=$(usex test)
 	)
 
 	cmake-utils_src_configure

dev-libs/libproccpuinfo/libproccpuinfo-0.0.8-r1.ebuild

@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Architecture independent C API for reading /proc/cpuinfo"
+HOMEPAGE="https://savannah.nongnu.org/projects/proccpuinfo/"
+SRC_URI="http://download.savannah.nongnu.org/releases/proccpuinfo/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~x86"
+IUSE=""
+
+DEPEND=">=sys-devel/flex-2.5.33"
+RDEPEND=""
+
+DOCS=( AUTHORS ChangeLog HACKING README THANKS TODO )
+
+CMAKE_IN_SOURCE_BUILD="yes"
+
+src_prepare() {
+	sed -i \
+		-e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
+		CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}

dev-libs/softhsm/softhsm-2.2.0-r2.ebuild

@@ -42,8 +42,8 @@ src_configure() {
 		--disable-static \
 		--with-crypto-backend=openssl \
 		--disable-p11-kit \
-		$(use_enable bindist ecc) \
-		$(use libressl && echo --disable-ghost) \
+		$(use bindist && echo --disable-ecc || echo --enable-ecc) \
+		$(use libressl && echo --disable-gost || echo --enable-gost) \
 		$(use_with migration-tool migrate)
 }
 

dev-perl/Capture-Tiny/Capture-Tiny-0.300.0.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$
 
@@ -12,7 +12,7 @@ DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND="

dev-perl/Capture-Tiny/Capture-Tiny-0.420.0.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$
 
@@ -13,7 +13,7 @@ DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="

dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.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 perl-module
 
 DESCRIPTION="check that a command is available"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="

dev-perl/IPTables-libiptc/IPTables-libiptc-0.520.0.ebuild

@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=HAWK
-MODULE_VERSION=0.52
-
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="Perl extension for iptables libiptc library"
-SRC_URI="${SRC_URI}
-https://dev.gentoo.org/~pinkbyte/distfiles/${PN}/${P}-support-for-iptables-1.4.12.patch.bz2
-https://dev.gentoo.org/~pinkbyte/distfiles/${PN}/${P}-support-for-iptables-1.4.16.2.patch.bz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# package dependency on iptables is very fragile
-# see https://rt.cpan.org/Public/Bug/Display.html?id=70639
-RDEPEND="<net-firewall/iptables-1.4.18:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${WORKDIR}/${P}-support-for-iptables-1.4.12.patch"
-	"${WORKDIR}/${P}-support-for-iptables-1.4.16.2.patch"
-	"${FILESDIR}/${P}-respect-cflags.patch"
-)
-
-# Most of tests needs root access, but they do not fail without it
-SRC_TEST="do"
-
-src_prepare() {
-	tc-export CC
-	perl-module_src_prepare
-}

dev-perl/IPTables-libiptc/Manifest

@@ -1,3 +0,0 @@
-DIST IPTables-libiptc-0.52.tar.gz 126058 SHA256 aa06ca77118fd0f8e3c2c7975eaf643b68be677b8085d96b814c31eebb925aca SHA512 df13b852669a0fe5bffe7e7bdcd7f00f22ae1ee73c6f9dcd3f08db5012ed91d48b1dffde6c894fd7d771c4c03ae2195820d019f35b6b3a24b0a2563de9202468 WHIRLPOOL c6755e7c66f6efb6ecbfdf87db5e4b5f82eae5c0120caddab476d61d9058c50e69cf050217bac8d0c29794097ac9fd92394b80b8873178b200ebf4d0525fadee
-DIST IPTables-libiptc-0.520.0-support-for-iptables-1.4.12.patch.bz2 17788 SHA256 422b32467b07846b3ff610cafd3dca0721d474cc86547fc371512f0b6a3b3421 SHA512 7ff2368e3e91df69521ed69cfc5ba8941301d4a229cf9bebed6fa374b41512120cddc4adddfbf76ae6ec1a3aa6ca17ebcaadd08b1afe11509b265e54461f7fa8 WHIRLPOOL d7f59ab420f50c3cbf83640f4583e3294b41def55dbd95e14fda62c5bef00334f11b634d370fa1c47bf05558571b69dc94f5fca9348e30b8268bed4a4fe56523
-DIST IPTables-libiptc-0.520.0-support-for-iptables-1.4.16.2.patch.bz2 17022 SHA256 e7891e2d0977ed5068ad755aeb94e07e42f5ca06d5495dbc102d2e16cfbbde70 SHA512 a9a07820baf185354f30d597bad9c059d53d194f8a534038557a593bb99f73acb9006ab4f66ea9b777cd4980c273f750e44b58f8cb28bf6fad52893d588aa440 WHIRLPOOL d39f33a71832646ec964163523b43e8f94557121f0ab19dde6abc011e131d3c24eacc10475574132701f115f6a529dac28da0cc042447581e810ca1a500f8fb5

dev-perl/IPTables-libiptc/files/IPTables-libiptc-0.520.0-respect-cflags.patch

@@ -1,24 +0,0 @@
---- Makefile.PL.orig	2013-07-10 19:31:29.355162000 +0400
-+++ Makefile.PL	2013-07-10 19:32:28.497557436 +0400
-@@ -256,7 +256,7 @@
-     LDDLFLAGS         => '-shared -L$(PREFIX)/lib',
- ##  LDDLFLAGS         => '-shared $(LOCAL_LIB_IPTC) -L$(PREFIX)/lib',
-     LDFLAGS           => '-L$(PREFIX)/lib',
--    DEFINE            => '-g -DIPTABLES_VERSION=\"$(IPTABLES_VERSION)\" -DXTABLES_LIBDIR=\"\$(XTABLES_LIBDIR)\" -DIPTABLES_VERSION_CODE=\$(IPTABLES_VERSION_CODE)',
-+    DEFINE            => '$(CFLAGS) -DIPTABLES_VERSION=\"$(IPTABLES_VERSION)\" -DXTABLES_LIBDIR=\"\$(XTABLES_LIBDIR)\" -DIPTABLES_VERSION_CODE=\$(IPTABLES_VERSION_CODE)',
-                          # e.g., '-DHAVE_SOMETHING'
-     INC               => '-I/usr/local/include -I./include -I.',
-                          # e.g., '-I. -I/usr/include/other'
-
---- iptables/Makefile.orig	2013-07-10 19:37:00.298563274 +0400
-+++ iptables/Makefile	2013-07-10 19:37:16.786563628 +0400
-@@ -46,8 +46,7 @@
- endif
- LDLIBS=-ldl $(EXTRALIBS)
- 
--COPT_FLAGS:=-O2
--CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include -I$(INCDIR) -I../include/ -fPIC -DXTABLES_INTERNAL -g
-+CFLAGS+=-Wall -Wunused -I$(KERNEL_DIR)/include -I$(INCDIR) -I../include/ -fPIC -DXTABLES_INTERNAL
- #-g -DDEBUG #-pg # -DIPTC_DEBUG
- 
- DEFINES:=-DIPTABLES_VERSION=\"$(IPTABLES_VERSION)\" -DXTABLES_LIBDIR=\"$(XTABLES_LIBDIR)\" -DIPTABLES_VERSION_CODE=\$(IPTABLES_VERSION_CODE)

dev-perl/IPTables-libiptc/metadata.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>perl@gentoo.org</email>
-		<name>Gentoo Perl Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="cpan">IPTables-libiptc</remote-id>
-		<remote-id type="cpan-module">IPTables::libiptc</remote-id>
-	</upstream>
-</pkgmetadata>

dev-perl/Sub-Name/Sub-Name-0.150.0.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$
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="(Re)name a sub"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test suggested"
 
 RDEPEND="

dev-perl/Test-Fatal/Test-Fatal-0.14.0.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$
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Incredibly simple helpers for testing code with exceptions"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="

dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.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$
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Easily test network connectivity"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~x86"
+KEYWORDS="~alpha amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="

dev-perl/Try-Tiny/Try-Tiny-0.240.0.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$
 
@@ -12,7 +12,7 @@ DESCRIPTION="Minimal try/catch with proper localization of \$@"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test minimal"
 
 RDEPEND="

dev-perl/libwww-perl/libwww-perl-6.160.0.ebuild

@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="A collection of Perl Modules for the WWW"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl test"
 
 RDEPEND="

dev-python/click/click-6.6.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$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc examples test"
 
 REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"

dev-python/decorator/decorator-4.0.2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

dev-python/snakeoil/snakeoil-9999.ebuild

@@ -23,6 +23,7 @@ SLOT="0"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' 'python3*')
 	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
 python_configure_all() {

dev-ros/collada_parser/collada_parser-1.12.6.ebuild

@@ -24,3 +24,4 @@ RDEPEND="
 	>=dev-ros/urdf-1.12.6
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/c11.patch" )

dev-ros/collada_parser/collada_parser-9999.ebuild

@@ -24,3 +24,4 @@ RDEPEND="
 	>=dev-ros/urdf-1.12.6
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/c11.patch" )

dev-ros/collada_parser/files/c11.patch

@@ -0,0 +1,13 @@
+Index: collada_parser/src/collada_parser.cpp
+===================================================================
+--- collada_parser.orig/src/collada_parser.cpp
++++ collada_parser/src/collada_parser.cpp
+@@ -67,7 +67,7 @@
+ #include <fcntl.h>
+ #endif
+ 
+-#define FOREACH(it, v) for(typeof((v).begin())it = (v).begin(); it != (v).end(); (it)++)
++#define FOREACH(it, v) for(auto it = (v).begin(); it != (v).end(); (it)++)
+ #define FOREACHC FOREACH
+ 
+ namespace ColladaDOM150 { }

dev-ros/image_cb_detector/files/c11.patch

@@ -0,0 +1,13 @@
+Index: image_cb_detector/src/rgbd_cb_detector_action.cpp
+===================================================================
+--- image_cb_detector.orig/src/rgbd_cb_detector_action.cpp
++++ image_cb_detector/src/rgbd_cb_detector_action.cpp
+@@ -143,7 +143,7 @@ public:
+       for(size_t i = 0; i< features.image_points.size(); i++){
+         geometry_msgs::Point pixel = features.image_points[i];
+         float depth = *(depth_ptr+width*(unsigned int)pixel.y+(unsigned int)pixel.x);
+-        if ( isnan(depth) )
++        if ( std::isnan(depth) )
+         {
+           continue;
+         }

dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild

@@ -29,4 +29,4 @@ RDEPEND="
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" )

dev-ros/image_cb_detector/image_cb_detector-9999.ebuild

@@ -29,4 +29,4 @@ RDEPEND="
 	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/c11.patch" )

dev-ros/laser_filters/files/c11.patch

@@ -0,0 +1,36 @@
+commit a185bb6d0b61cbf8283467770e646241f7cac03e
+Author: Mike Purvis <mpurvis@clearpathrobotics.com>
+Date:   Fri Jul 15 23:47:45 2016 -0400
+
+    Use std:: namespace for c++11 compat.
+
+diff --git a/include/laser_filters/intensity_filter.h b/include/laser_filters/intensity_filter.h
+index 3f175a0..4c9cfbc 100644
+--- a/include/laser_filters/intensity_filter.h
++++ b/include/laser_filters/intensity_filter.h
+@@ -99,8 +99,8 @@ public:
+       // Calculate histogram
+       if (disp_hist_enabled_){
+         // If intensity value is inf or NaN, skip voting histogram
+-        if( isinf((double)filtered_scan.intensities[i]) ||
+-            isnan((double)filtered_scan.intensities[i]) )
++        if( std::isinf((double)filtered_scan.intensities[i]) ||
++            std::isnan((double)filtered_scan.intensities[i]) )
+           continue;
+ 
+         // Choose bucket to vote on histogram,
+diff --git a/test/test_scan_filter_chain.cpp b/test/test_scan_filter_chain.cpp
+index b661f5f..139da60 100644
+--- a/test/test_scan_filter_chain.cpp
++++ b/test/test_scan_filter_chain.cpp
+@@ -60,8 +60,8 @@ sensor_msgs::LaserScan gen_msg(){
+  */
+ void expect_ranges_eq(const std::vector<float> &a, const std::vector<float> &b) {
+   for( int i=0; i<10; i++) {
+-    if(isnan(a[i])) {
+-      EXPECT_TRUE(isnan(a[i]));
++    if(std::isnan(a[i])) {
++      EXPECT_TRUE(std::isnan(a[i]));
+     }
+     else {
+       EXPECT_NEAR(a[i], b[i], 1e-6);

dev-ros/laser_filters/laser_filters-1.8.3.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$
 
@@ -25,3 +25,4 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/c11.patch" )

dev-ros/visp_auto_tracker/Manifest

@@ -1,2 +1,3 @@
 DIST vision_visp-0.8.0.tar.gz 1010996 SHA256 5166e1f17601328d09716879ceb66135e07bdb71a375765a937e3b78a12b0e54 SHA512 2bf2d69b6e19de21b34869858672662162703ff8b2aea85fdb9a6dafa88d8fe1f97d18587e863f3f7c088697e931a1b6e4e2e37f31fc7caff0906e98debbad1a WHIRLPOOL 015778e4cff63a9dbb5bf5812e38f7564b68cb71886e472062be15ec31a87a7299bff7ef9df50124294e22906420f60075cf6cc69f77df1cd29267b401f655e5
 DIST vision_visp-0.9.1.tar.gz 1014625 SHA256 918bf731a2fab8bd9fa082c0d0f86800710c79eeb9ec5e8b0c8d5baaffb7988d SHA512 f9ce23286fd9c7706364e9d63e6fb3881bad759aeea72313e5d2a24347f152ba90aab1c73d1b468ed3319e99f0a2bcb81208302825c83be686b9528f3b07469e WHIRLPOOL 8af772091c1c3fec475f32ff0d7232b728b3154491c4ed56300221c0ca96661c63c19baa50d6cdf010d1ffc304049f0ea1e7f5c403f15fb028b1417e41ed88b4
+DIST vision_visp-0.9.3.tar.gz 1014883 SHA256 bf51470d167b1ee202dc55348ad54f6398f0f951b3af06fd32d0689b2fa98347 SHA512 e5775e410efefaaac00cdfaf07b65f9f77ade0e7d6f40b3d8345d7b594520f46741f56039c1eb0193c57287bafbddf8e755e10d6f85cc12ddefb2b997681f44a WHIRLPOOL 9163c1aa27f405213aa7290d9e7ecb4b4f6d0daf79879708bd9246fac9eeb3c6b816de3505729b17cb72357e684bb7af9db6688441c42b279089fbdd8116acc0

dev-ros/visp_auto_tracker/visp_auto_tracker-0.9.3.ebuild

@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Online automated pattern-based object tracker relying on visual servoing"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/message_filters
+	dev-ros/resource_retriever
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visp_bridge
+	dev-ros/visp_tracker
+	sci-libs/ViSP:=[dmtx,zbar]
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi

dev-ros/visp_auto_tracker/visp_auto_tracker-9999.ebuild

@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="jade-"
+VER_PREFIX="kinetic-"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -29,5 +29,5 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-jade-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
 fi

dev-ros/visp_bridge/Manifest

@@ -1,2 +1,3 @@
 DIST vision_visp-0.8.0.tar.gz 1010996 SHA256 5166e1f17601328d09716879ceb66135e07bdb71a375765a937e3b78a12b0e54 SHA512 2bf2d69b6e19de21b34869858672662162703ff8b2aea85fdb9a6dafa88d8fe1f97d18587e863f3f7c088697e931a1b6e4e2e37f31fc7caff0906e98debbad1a WHIRLPOOL 015778e4cff63a9dbb5bf5812e38f7564b68cb71886e472062be15ec31a87a7299bff7ef9df50124294e22906420f60075cf6cc69f77df1cd29267b401f655e5
 DIST vision_visp-0.9.1.tar.gz 1014625 SHA256 918bf731a2fab8bd9fa082c0d0f86800710c79eeb9ec5e8b0c8d5baaffb7988d SHA512 f9ce23286fd9c7706364e9d63e6fb3881bad759aeea72313e5d2a24347f152ba90aab1c73d1b468ed3319e99f0a2bcb81208302825c83be686b9528f3b07469e WHIRLPOOL 8af772091c1c3fec475f32ff0d7232b728b3154491c4ed56300221c0ca96661c63c19baa50d6cdf010d1ffc304049f0ea1e7f5c403f15fb028b1417e41ed88b4
+DIST vision_visp-0.9.3.tar.gz 1014883 SHA256 bf51470d167b1ee202dc55348ad54f6398f0f951b3af06fd32d0689b2fa98347 SHA512 e5775e410efefaaac00cdfaf07b65f9f77ade0e7d6f40b3d8345d7b594520f46741f56039c1eb0193c57287bafbddf8e755e10d6f85cc12ddefb2b997681f44a WHIRLPOOL 9163c1aa27f405213aa7290d9e7ecb4b4f6d0daf79879708bd9246fac9eeb3c6b816de3505729b17cb72357e684bb7af9db6688441c42b279089fbdd8116acc0

dev-ros/visp_bridge/files/gcc6.patch

@@ -0,0 +1,13 @@
+Index: visp_bridge/CMakeLists.txt
+===================================================================
+--- visp_bridge.orig/CMakeLists.txt
++++ visp_bridge/CMakeLists.txt
+@@ -36,7 +36,7 @@ catkin_package(
+ 
+ include_directories(include)
+ 
+-include_directories(SYSTEM
++include_directories(
+   ${VISP_INCLUDE_DIRS}
+   ${catkin_INCLUDE_DIRS}
+   ${Boost_INCLUDE_DIRS}

dev-ros/visp_bridge/visp_bridge-0.9.3.ebuild

@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts between ROS structures and ViSP structures"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-libs/ViSP:=[xml]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/camera_calibration_parsers
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )

dev-ros/visp_bridge/visp_bridge-9999.ebuild

@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="jade-"
+VER_PREFIX="kinetic-"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -25,5 +25,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-jade-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
 fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )

dev-ros/visp_camera_calibration/Manifest

@@ -1,2 +1,3 @@
 DIST vision_visp-0.8.0.tar.gz 1010996 SHA256 5166e1f17601328d09716879ceb66135e07bdb71a375765a937e3b78a12b0e54 SHA512 2bf2d69b6e19de21b34869858672662162703ff8b2aea85fdb9a6dafa88d8fe1f97d18587e863f3f7c088697e931a1b6e4e2e37f31fc7caff0906e98debbad1a WHIRLPOOL 015778e4cff63a9dbb5bf5812e38f7564b68cb71886e472062be15ec31a87a7299bff7ef9df50124294e22906420f60075cf6cc69f77df1cd29267b401f655e5
 DIST vision_visp-0.9.1.tar.gz 1014625 SHA256 918bf731a2fab8bd9fa082c0d0f86800710c79eeb9ec5e8b0c8d5baaffb7988d SHA512 f9ce23286fd9c7706364e9d63e6fb3881bad759aeea72313e5d2a24347f152ba90aab1c73d1b468ed3319e99f0a2bcb81208302825c83be686b9528f3b07469e WHIRLPOOL 8af772091c1c3fec475f32ff0d7232b728b3154491c4ed56300221c0ca96661c63c19baa50d6cdf010d1ffc304049f0ea1e7f5c403f15fb028b1417e41ed88b4
+DIST vision_visp-0.9.3.tar.gz 1014883 SHA256 bf51470d167b1ee202dc55348ad54f6398f0f951b3af06fd32d0689b2fa98347 SHA512 e5775e410efefaaac00cdfaf07b65f9f77ade0e7d6f40b3d8345d7b594520f46741f56039c1eb0193c57287bafbddf8e755e10d6f85cc12ddefb2b997681f44a WHIRLPOOL 9163c1aa27f405213aa7290d9e7ecb4b4f6d0daf79879708bd9246fac9eeb3c6b816de3505729b17cb72357e684bb7af9db6688441c42b279089fbdd8116acc0

dev-ros/visp_camera_calibration/files/boost.patch

@@ -0,0 +1,24 @@
+Index: visp_camera_calibration/src/camera.cpp
+===================================================================
+--- visp_camera_calibration.orig/src/camera.cpp
++++ visp_camera_calibration/src/camera.cpp
+@@ -62,6 +62,7 @@
+ 
+ #include <visp/vpDisplayX.h>
+ #include "visp/vpTrackingException.h"
++#include <boost/format.hpp>
+ 
+ 
+ namespace visp_camera_calibration
+Index: visp_camera_calibration/src/image_processing.cpp
+===================================================================
+--- visp_camera_calibration.orig/src/image_processing.cpp
++++ visp_camera_calibration/src/image_processing.cpp
+@@ -69,6 +69,7 @@
+ #include "visp/vpDot2.h"
+ #include "visp/vpCalibration.h"
+ #include <iostream>
++#include <boost/format.hpp>
+ 
+ 
+ namespace visp_camera_calibration

dev-ros/visp_camera_calibration/files/gcc6.patch

@@ -0,0 +1,13 @@
+Index: visp_camera_calibration/CMakeLists.txt
+===================================================================
+--- visp_camera_calibration.orig/CMakeLists.txt
++++ visp_camera_calibration/CMakeLists.txt
+@@ -13,7 +13,7 @@ find_package(catkin REQUIRED COMPONENTS
+ 
+ find_package(VISP REQUIRED)
+ 
+-include_directories(SYSTEM
++include_directories(
+   ${BULLET_INCLUDE_DIRS}
+   ${Boost_INCLUDE_DIRS}
+   ${VISP_INCLUDE_DIRS}

dev-ros/visp_camera_calibration/visp_camera_calibration-0.9.3.ebuild

@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_4} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Calibration of cameras using a customizable pattern and ViSP library"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/camera_calibration_parsers
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/visp_bridge
+	sci-libs/ViSP:=
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost.patch" )

dev-ros/visp_camera_calibration/visp_camera_calibration-9999.ebuild

@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="jade-"
+VER_PREFIX="kinetic-"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
 PYTHON_COMPAT=( python{2_7,3_4} )
@@ -24,8 +24,10 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/visp_bridge
 	sci-libs/ViSP:=
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-jade-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
 fi
+PATCHES=( "${FILESDIR}/gcc6.patch" "${FILESDIR}/boost.patch" )

dev-ros/visp_hand2eye_calibration/Manifest

@@ -1,2 +1,3 @@
 DIST vision_visp-0.8.0.tar.gz 1010996 SHA256 5166e1f17601328d09716879ceb66135e07bdb71a375765a937e3b78a12b0e54 SHA512 2bf2d69b6e19de21b34869858672662162703ff8b2aea85fdb9a6dafa88d8fe1f97d18587e863f3f7c088697e931a1b6e4e2e37f31fc7caff0906e98debbad1a WHIRLPOOL 015778e4cff63a9dbb5bf5812e38f7564b68cb71886e472062be15ec31a87a7299bff7ef9df50124294e22906420f60075cf6cc69f77df1cd29267b401f655e5
 DIST vision_visp-0.9.1.tar.gz 1014625 SHA256 918bf731a2fab8bd9fa082c0d0f86800710c79eeb9ec5e8b0c8d5baaffb7988d SHA512 f9ce23286fd9c7706364e9d63e6fb3881bad759aeea72313e5d2a24347f152ba90aab1c73d1b468ed3319e99f0a2bcb81208302825c83be686b9528f3b07469e WHIRLPOOL 8af772091c1c3fec475f32ff0d7232b728b3154491c4ed56300221c0ca96661c63c19baa50d6cdf010d1ffc304049f0ea1e7f5c403f15fb028b1417e41ed88b4
+DIST vision_visp-0.9.3.tar.gz 1014883 SHA256 bf51470d167b1ee202dc55348ad54f6398f0f951b3af06fd32d0689b2fa98347 SHA512 e5775e410efefaaac00cdfaf07b65f9f77ade0e7d6f40b3d8345d7b594520f46741f56039c1eb0193c57287bafbddf8e755e10d6f85cc12ddefb2b997681f44a WHIRLPOOL 9163c1aa27f405213aa7290d9e7ecb4b4f6d0daf79879708bd9246fac9eeb3c6b816de3505729b17cb72357e684bb7af9db6688441c42b279089fbdd8116acc0

dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-0.9.3.ebuild

@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_4} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Estimates the camera position with respect to its effector using the ViSP library"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_proc
+	dev-ros/roscpp
+	dev-ros/sensor_msgs
+	dev-ros/visp_bridge
+	dev-ros/visp_tracker
+	sci-libs/ViSP:=
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi

dev-ros/visp_hand2eye_calibration/visp_hand2eye_calibration-9999.ebuild

@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="jade-"
+VER_PREFIX="kinetic-"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
 PYTHON_COMPAT=( python{2_7,3_4} )
@@ -28,5 +28,5 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-jade-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
 fi

dev-ros/visp_tracker/Manifest

@@ -1,2 +1,3 @@
 DIST vision_visp-0.8.0.tar.gz 1010996 SHA256 5166e1f17601328d09716879ceb66135e07bdb71a375765a937e3b78a12b0e54 SHA512 2bf2d69b6e19de21b34869858672662162703ff8b2aea85fdb9a6dafa88d8fe1f97d18587e863f3f7c088697e931a1b6e4e2e37f31fc7caff0906e98debbad1a WHIRLPOOL 015778e4cff63a9dbb5bf5812e38f7564b68cb71886e472062be15ec31a87a7299bff7ef9df50124294e22906420f60075cf6cc69f77df1cd29267b401f655e5
 DIST vision_visp-0.9.1.tar.gz 1014625 SHA256 918bf731a2fab8bd9fa082c0d0f86800710c79eeb9ec5e8b0c8d5baaffb7988d SHA512 f9ce23286fd9c7706364e9d63e6fb3881bad759aeea72313e5d2a24347f152ba90aab1c73d1b468ed3319e99f0a2bcb81208302825c83be686b9528f3b07469e WHIRLPOOL 8af772091c1c3fec475f32ff0d7232b728b3154491c4ed56300221c0ca96661c63c19baa50d6cdf010d1ffc304049f0ea1e7f5c403f15fb028b1417e41ed88b4
+DIST vision_visp-0.9.3.tar.gz 1014883 SHA256 bf51470d167b1ee202dc55348ad54f6398f0f951b3af06fd32d0689b2fa98347 SHA512 e5775e410efefaaac00cdfaf07b65f9f77ade0e7d6f40b3d8345d7b594520f46741f56039c1eb0193c57287bafbddf8e755e10d6f85cc12ddefb2b997681f44a WHIRLPOOL 9163c1aa27f405213aa7290d9e7ecb4b4f6d0daf79879708bd9246fac9eeb3c6b816de3505729b17cb72357e684bb7af9db6688441c42b279089fbdd8116acc0

dev-ros/visp_tracker/files/gcc6.patch

@@ -0,0 +1,13 @@
+Index: visp_tracker/CMakeLists.txt
+===================================================================
+--- visp_tracker.orig/CMakeLists.txt
++++ visp_tracker/CMakeLists.txt
+@@ -70,7 +70,7 @@ catkin_package(
+      VISP
+    )
+ 
+-include_directories(SYSTEM
++include_directories(
+   ${Boost_INCLUDE_DIRS}
+   ${VISP_INCLUDE_DIRS}
+   ${catkin_INCLUDE_DIRS}

dev-ros/visp_tracker/visp_tracker-0.9.3.ebuild

@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Wraps the ViSP moving edge tracker provided by the ViSP visual servoing library into a ROS package"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-ros/dynamic_reconfigure
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/image_proc
+	dev-ros/image_transport
+	dev-ros/nodelet
+	dev-ros/resource_retriever
+	dev-ros/roscpp
+	dev-ros/sensor_msgs
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/ViSP[opencv,X]
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )

dev-ros/visp_tracker/visp_tracker-9999.ebuild

@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="jade-"
+VER_PREFIX="kinetic-"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
 PYTHON_COMPAT=( python2_7 )
@@ -35,5 +35,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-jade-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
 fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )

dev-ruby/amq-protocol/Manifest

@@ -1,2 +1,3 @@
 DIST amq-protocol-1.9.2.gem 43520 SHA256 79e018cb1a3522967525973ae04d40884620e8d4adca02afeb710f00643a84be SHA512 ea4553b337589589cc89b70e351722ec8af402bd560d73fd35ad41665424a6212e03e26ac86aace5d90f599c7fc2236686fbd83bd75c7023647d95163a2d8573 WHIRLPOOL 5fcfd806b8d84aa64b10bc160fe439dcdff2977b739e04ec23b8f86d94f7a5bee4b95d3688317096b0dcf9214a12921f4b0a4c93c9bd0f6ad3376a6199659189
 DIST amq-protocol-2.0.1.gem 43008 SHA256 fd5c0ef0f01c040529a6ddbc12cbdde3e40f63d5045c08b13a03f803df4ef6e6 SHA512 d723899902338562c9b4ad7fdd625e7efa27380b35e9986dfd31f8d334b7cdba4bea47a0f0306a4d24bd14376011287a98d5f31e2d92f89e9fdce7e267d37818 WHIRLPOOL 17657719885871532e1eb99ef4cf69dba84141c895f038c71f22fc054642a3b45cbbaf57bf0429aa4c239309b0c2c78d0ac1d9c6f3cb5a307672af4facce8f46
+DIST amq-protocol-2.1.0.gem 43520 SHA256 d2404af88d5bee649ecf198e9d33d98fe9b9e69dc5f7441e3cdd77322266c395 SHA512 3111c3233a3fdf830cb95d9161132b96035c3835bcf4acd74ec9a915a44096295f5e0cb6b444db7fc4eba84b218800f9c9d33d1cfa5b2d3dcd80dfc65c92c133 WHIRLPOOL 7fc88f56a2fd310dc2925628c9355209ac461ebb4293fc8ed43071c2f9f47ae10799b0084992c16d21ff0fa220e6e55956080682fca043e68ecc00e5a2a7ce41

dev-ruby/amq-protocol/amq-protocol-2.1.0.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An AMQP 0.9.1 serialization library for Ruby"
+HOMEPAGE="https://github.com/ruby-amqp/amq-protocol"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/bundler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
+}

dev-ruby/msgpack/Manifest

@@ -1,3 +1,4 @@
 DIST msgpack-0.7.6.gem 74752 SHA256 8537beb868cc6e742488c54928961cd79694fa0ef5d10772dd3e3eaf62ccc2ba SHA512 9d30533175118c08f671015a99664e4798c845f63595495933b42f0fa95c160a6708e472da70baeb64537a704dd4768cdc9ab99a19045daabd92555b21f4e389 WHIRLPOOL 879e5b6b3fc6cd82d28cce5c4f91621437b2cfc34caf21bdbad5d1bf48d8f7719c97b7b1f96e5648ddc77cee679911c58711a8804dc30765f1ae3ff7f8e32f94
 DIST msgpack-1.0.1.gem 77312 SHA256 b6b2253658ebea78c3933a72b50463414e9cbcd29daf7ebf070a5d7c6bef195f SHA512 6a8edde5ef049a5fc3304200424d263d1d67b2e4e3c49480c17b3377713beb7f6e83e43b8a7b1358bb511671b6a7f77650fd949e9c7c432b6fe4141a40628c32 WHIRLPOOL f5e680c8064be6a492f7de46d967f0d491d0c50704413910fbe890d59f11fbc2bb8a8f35efdff25df3411def388e8adee9e77279eecd42812c829b657c6068b3
 DIST msgpack-1.0.2.gem 77312 SHA256 8f9a01d2456276e37f29ceb8b5deaf541f98358db3f8bc96a617011992af62b9 SHA512 e821c7057ee3497c833be522c4baa8133ae029ff582bd9892ab20b8981d26c757d6348e8ae9ea4288ef3d4fccc44c5d7304473a9e4c7475a78727811630ccfe9 WHIRLPOOL 68e6c41d7e07abca71096f27f37693beb0991b54483aa95a1d47589a028403739b08f68f9dad81d29f827f266af1e2d4b341c889079bad2f05ede1cea9701ebe
+DIST msgpack-1.0.3.gem 77312 SHA256 6a0de861d6ef51e9155ddac15a476358fbcc21d64be059b7cc2dea076c130623 SHA512 b76db7f5c91128d19677774c7bf8c914a7e85e374fc0149bf5d0b470729fa01f4fdf173f7397e6f8df32af760a622a405cdc6d268f45b776b172bb39b9f1f4f7 WHIRLPOOL 77ee2a14fbcd1245ee8e515df8756b2d37aa7f89b842b5e67726b72b6cc1e8bec3d91bc223107cb03a7402d1b2ea3328900f5d7c6119363fcca059bf9d4278bc

dev-ruby/msgpack/msgpack-1.0.3.ebuild

@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
+HOMEPAGE="https://msgpack.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove jruby-specific specs that are run also for other rubies.
+	rm -rf spec/jruby || die
+
+	sed -i -e '/git ls-files/d' msgpack.gemspec || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
+
+	# rb_num2int is not inlined on 32 bit arches but also not explicitly
+	# defined, bug 582968
+	sed -i -e 's:-Wl,--no-undefined::' ext/${PN}/Makefile || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
+}

dev-util/cmake/Manifest

@@ -1,4 +1,3 @@
 DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84
 DIST cmake-3.6.3.tar.gz 6919949 SHA256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe SHA512 bfcb51bc01f64a6ae5fb9401c037a529e4b2c0216eef68cf862a7495560dfc80589b34af94450baf4561d217dfb8075b14fbf63e3a668943a65e36ea61c5df48 WHIRLPOOL ecf79bb1a4b18df07d15ed5cdeb513420a0b8d46f90154dbdf9a78d3294e202ade040e832f3479fca0889c4af3b3b50e0d9391120191bae390927888e6487b4a
-DIST cmake-3.7.1.tar.gz 7361172 SHA256 449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1 SHA512 0539d70ce3ac77042a45d638443b09fbf368e253622db980bc6fb15988743eacd031ab850a45c821ec3e9f0f5f886b9c9cb0668aeda184cd457b78abbfe7b629 WHIRLPOOL 8b632b4a3f44a7b56952926ad43db45ecd9f26f434816fe29a52c89542edfc2dfea72f4ec814d4faaf990ee535ad80e6238ba2e6d9ffa2ff94cfccd665b1d930
 DIST cmake-3.7.2.tar.gz 7361593 SHA256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d WHIRLPOOL 1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7