Sync with portage [Sun Nov 27 18:07:50 MSK 2016].

8 years ago · 106c010ffa
parent 25ca29af7c
commit 106c010ffa
4966 changed files with 6533 additions and 9605 deletions
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@ -1,3 +1,4 @@
 DIST ddskk-14.3.tar.gz 805289 SHA256 478e2c824cfcd4e956a2e30e0f3967c3e385b3941f13fdd6c8c270d89367d0ef SHA512 6b29c78999a677162de3f86a9a53d363885443022852137665b29fa1a053272f2a50647ec94283cb58cd83d0172cbe85c53a8515d22116bbbd3a0efce408ed62 WHIRLPOOL 1bfa43975976cb487c49d7673f0f0da3c3a9c1c2c4bc95c1a72c3c208ee4070e7321568e5d739fca4d50083037af0c7616fa190cc89425f2117681f923da1ba3
 DIST ddskk-14.4.tar.gz 847188 SHA256 a538c641f3302432aca07ae748bc0e4a7fcc91ff01c3d96b3169d1fbaa5a7d4a SHA512 d44d0afd2557c087549f337acf2778988128e06a82d1f15d080efcad4034cedfbe52fee7bad102d8dee4159ba4f5c89008055a51ce5a564d220fed98e61ef4c9 WHIRLPOOL 4f16a3f82f3c863e6f9df38ff9012507d69d8b16072c94ca953c185a588510aa8c35efc01cd5cc20bd38b2b674cee199e689c3a3572d8020815d8b1ce53a0584
 DIST ddskk-15.1.tar.gz 837942 SHA256 099e087cc92b5ccf62e6cedc81541c5991afdf5c311f391d02630ce87a5abdcf SHA512 8927cde6d55e5d32b5207f03f8385622996818ac279b054ddf2e461364743cd44b658fef388ce9a271af145ebe784b21b4a7dd4f0b063858fb1ffccdf796f777 WHIRLPOOL 875319515ef4d3acb8bca6a96af18c7231ecdb5f101f923df4245244027d9377ccfa40d4bc669b5e93a00e9ee13868890c4e84310248126597714dc8698e820a
 DIST ddskk-16.1.tar.gz 878564 SHA256 fe7229d8ec76e955527878f8bb8a55767a8901069392b403dcc4a9402298803c SHA512 68875f7ad89ce847103bbe4644db3800c84cc5907a4769c37f7aab5bc64577e1ea5f49de41c5708daf3f5f2bb7176237dcec5ea05e52a61f7c78cfb2670ced7b WHIRLPOOL 85ede848eb5d788238d2aadbb81f06b143f5039b8df6952dfe0fa6df00332aa70889f95db449b80e7920d26ef7987a7af394ed40efce40b12ca7432858dedc8c
--- a/app-emacs/ddskk/ddskk-14.3.ebuild
+++ b/app-emacs/ddskk/ddskk-14.3.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=3
+EAPI="6"
 inherit elisp
@ -15,46 +15,50 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
-DEPEND="|| ( ( =virtual/emacs-21 >=app-emacs/apel-10.7 )
+DEPEND="<virtual/emacs-24"
-			 >=virtual/emacs-22 )"
+RDEPEND="|| (
-RDEPEND="${DEPEND}
+		app-i18n/skk-jisyo
-	|| ( app-i18n/skk-jisyo virtual/skkserv )"
+		virtual/skkserv
 	)"
 SITEFILE="50${PN}-gentoo.el"
 src_prepare() {
-	find . -type f | xargs sed -i -e "s:/usr/local:${EPREFIX}/usr:g" || die
+	echo "(setq PREFIX \"${ED}/usr\")" >>SKK-CFG
 	echo "(setq SKK_LISPDIR \"${ED}/${SITELISP}/${PN}\")" >>SKK-CFG
 	echo "(add-to-list 'load-path (expand-file-name \"..\"))" >> nicola/NICOLA-DDSKK-CFG
 	eapply_user
 	rm -f skk-lookup.el
 	mv {bayesian,tut-code}/*.el .
 }
 src_compile() {
-	emake < /dev/null || die "emake failed"
+	emake elc info
-	emake info < /dev/null || die "emake info failed"
+
-	#cd nicola
+	emake -C nicola
 	#emake < /dev/null || die
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L .."
 	cd "${S}/tut-code"
 	elisp-compile *.el || die "elisp-compile tut-code/*.el failed"
 	cd "${S}/bayesian"
 	elisp-compile *.el || die "elisp-compile bayesian/*.el failed"
 }
 src_install () {
-	elisp-install ${PN} *.{el,elc} nicola/*.el tut-code/*.{el,elc} bayesian/*.{el,elc} || die
+	local lispdir=${SITELISP}/${PN}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	emake install-elc
-
+	elisp-compile "${ED}"/${lispdir}/skk-setup.el
-	insinto /usr/share/skk
+	rm -f "${ED}"/${lispdir}/leim-list.el
-	doins etc/*SKK.tut* etc/skk.xpm || die
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	dodoc READMEs/* ChangeLog*
 	doinfo doc/skk.info* || die
-	#docinto nicola
+	dodoc ChangeLog* READMEs/README READMEs/{AUTHORS,CODENAME,Contributors,FAQ,NEWS,PROPOSAL,TODO}*
-	#dodoc nicola/ChangeLog* nicola/README* || die
+	doinfo doc/skk.info
 	docinto tut-code
 	dodoc tut-code/README.tut || die
-	#dobin bayesian/bskk || die
+	local exts=( nicola tut-code bayesian ) d f
 	elisp-install ${PN} nicola/*.{el,elc}
 	for d in ${exts[@]}; do
 		docinto ${d}
 		for f in ${d}/{ChangeLog,README}*; do
 			[[ -s ${f} ]] && dodoc ${f}
 		done
 	done
 	docinto bayesian
-	dodoc bayesian/README.ja bayesian/bskk || die
+	dodoc bayesian/bskk
 }
--- a/app-emacs/ddskk/ddskk-14.4.ebuild
+++ b/app-emacs/ddskk/ddskk-14.4.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=3
+EAPI="6"
 inherit elisp
@ -15,46 +15,50 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
-DEPEND="|| ( ( =virtual/emacs-21 >=app-emacs/apel-10.7 )
+DEPEND="<virtual/emacs-24"
-			 >=virtual/emacs-22 )"
+RDEPEND="|| (
-RDEPEND="${DEPEND}
+		app-i18n/skk-jisyo
-	|| ( app-i18n/skk-jisyo virtual/skkserv )"
+		virtual/skkserv
 	)"
 SITEFILE="50${PN}-gentoo.el"
 src_prepare() {
-	find . -type f | xargs sed -i -e "s:/usr/local:${EPREFIX}/usr:g" || die
+	echo "(setq PREFIX \"${ED}/usr\")" >>SKK-CFG
 	echo "(setq SKK_LISPDIR \"${ED}/${SITELISP}/${PN}\")" >>SKK-CFG
 	echo "(add-to-list 'load-path (expand-file-name \"..\"))" >> nicola/NICOLA-DDSKK-CFG
 	eapply_user
 	rm -f skk-lookup.el
 	mv {bayesian,tut-code}/*.el .
 }
 src_compile() {
-	emake < /dev/null || die "emake failed"
+	emake elc info
-	emake info < /dev/null || die "emake info failed"
+
-	#cd nicola
+	emake -C nicola
 	#emake < /dev/null || die
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L .."
 	cd "${S}/tut-code"
 	elisp-compile *.el || die "elisp-compile tut-code/*.el failed"
 	cd "${S}/bayesian"
 	elisp-compile *.el || die "elisp-compile bayesian/*.el failed"
 }
 src_install () {
-	elisp-install ${PN} *.{el,elc} nicola/*.el tut-code/*.{el,elc} bayesian/*.{el,elc} || die
+	local lispdir=${SITELISP}/${PN}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	emake install-elc
-
+	elisp-compile "${ED}"/${lispdir}/skk-setup.el
-	insinto /usr/share/skk
+	rm -f "${ED}"/${lispdir}/leim-list.el
-	doins etc/*SKK.tut* etc/skk.xpm || die
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	dodoc READMEs/* ChangeLog*
 	doinfo doc/skk.info* || die
-	#docinto nicola
+	dodoc ChangeLog* READMEs/README READMEs/{AUTHORS,CODENAME,Contributors,FAQ,NEWS,PROPOSAL,TODO}*
-	#dodoc nicola/ChangeLog* nicola/README* || die
+	doinfo doc/skk.info
 	docinto tut-code
 	dodoc tut-code/README.tut || die
-	#dobin bayesian/bskk || die
+	local exts=( nicola tut-code bayesian ) d f
 	elisp-install ${PN} nicola/*.{el,elc}
 	for d in ${exts[@]}; do
 		docinto ${d}
 		for f in ${d}/{ChangeLog,README}*; do
 			[[ -s ${f} ]] && dodoc ${f}
 		done
 	done
 	docinto bayesian
-	dodoc bayesian/README.ja bayesian/bskk || die
+	dodoc bayesian/bskk
 }
--- a/app-emacs/ddskk/ddskk-15.1.ebuild
+++ b/app-emacs/ddskk/ddskk-15.1.ebuild
@ -1,10 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=3
+EAPI="6"
 NEED_EMACS="24"
-inherit elisp eutils
+inherit elisp
 DESCRIPTION="One Japanese input methods on Emacs"
 HOMEPAGE="http://openlab.ring.gr.jp/skk/"
@ -15,47 +16,51 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
-DEPEND="|| ( ( =virtual/emacs-21 >=app-emacs/apel-10.7 )
+DEPEND=""
-			 >=virtual/emacs-22 )"
+RDEPEND="|| (
-RDEPEND="${DEPEND}
+		app-i18n/skk-jisyo
-	|| ( app-i18n/skk-jisyo virtual/skkserv )"
+		virtual/skkserv
 	)"
 SITEFILE="50${PN}-gentoo.el"
 src_prepare() {
-	find . -type f | xargs sed -i -e "s:/usr/local:${EPREFIX}/usr:g" || die
+	echo "(setq PREFIX \"${ED}/usr\")" >>SKK-CFG
-	epatch "${FILESDIR}"/${P}-skk-mk.patch
+	echo "(setq SKK_LISPDIR \"${ED}/${SITELISP}/${PN}\")" >>SKK-CFG
 	echo "(add-to-list 'load-path (expand-file-name \"..\"))" >> nicola/NICOLA-DDSKK-CFG
 	eapply "${FILESDIR}"/${P}-skk-mk.patch
 	eapply_user
 	rm -f skk-lookup.el
 	mv {bayesian,tut-code}/*.el .
 }
 src_compile() {
-	emake < /dev/null || die "emake failed"
+	emake elc info
-	emake info < /dev/null || die "emake info failed"
+
-	#cd nicola
+	emake -C nicola
 	#emake < /dev/null || die
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L .."
 	cd "${S}/tut-code"
 	elisp-compile *.el || die "elisp-compile tut-code/*.el failed"
 	cd "${S}/bayesian"
 	elisp-compile *.el || die "elisp-compile bayesian/*.el failed"
 }
 src_install () {
-	elisp-install ${PN} *.{el,elc} nicola/*.el tut-code/*.{el,elc} bayesian/*.{el,elc} || die
+	local lispdir=${SITELISP}/${PN}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	emake install-elc
-
+	elisp-compile "${ED}"/${lispdir}/skk-setup.el
-	insinto /usr/share/skk
+	rm -f "${ED}"/${lispdir}/leim-list.el
-	doins etc/*SKK.tut* etc/skk.xpm || die
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	dodoc READMEs/* ChangeLog*
 	doinfo doc/skk.info* || die
-	#docinto nicola
+	dodoc ChangeLog* READMEs/README READMEs/{AUTHORS,CODENAME,Contributors,FAQ,NEWS,PROPOSAL,TODO}*
-	#dodoc nicola/ChangeLog* nicola/README* || die
+	doinfo doc/skk.info
 	docinto tut-code
 	dodoc tut-code/README.tut || die
-	#dobin bayesian/bskk || die
+	local exts=( nicola tut-code bayesian ) d f
 	elisp-install ${PN} nicola/*.{el,elc}
 	for d in ${exts[@]}; do
 		docinto ${d}
 		for f in ${d}/{ChangeLog,README}*; do
 			[[ -s ${f} ]] && dodoc ${f}
 		done
 	done
 	docinto bayesian
-	dodoc bayesian/README.ja bayesian/bskk || die
+	dodoc bayesian/bskk
 }
--- a/app-emacs/ddskk/ddskk-16.1.ebuild
+++ b/app-emacs/ddskk/ddskk-16.1.ebuild
@ -0,0 +1,70 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="6"
 USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 NEED_EMACS="24"
 inherit elisp ruby-single
 DESCRIPTION="One Japanese input methods on Emacs"
 HOMEPAGE="http://openlab.ring.gr.jp/skk/"
 SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ruby"
 DEPEND=""
 RDEPEND="|| (
 		app-i18n/skk-jisyo
 		virtual/skkserv
 	)
 	ruby? ( ${RUBY_DEPS} )"
 S="${WORKDIR}/${PN}-${P}_Futamata"
 SITEFILE="50${PN}-gentoo.el"
 src_prepare() {
 	echo "(setq PREFIX \"${ED}/usr\")" >>SKK-CFG
 	echo "(setq SKK_LISPDIR \"${ED}/${SITELISP}/${PN}\")" >>SKK-CFG
 	echo "(add-to-list 'load-path (expand-file-name \"..\"))" >> nicola/NICOLA-DDSKK-CFG
 	eapply_user
 	rm -f skk-lookup.el
 	mv {bayesian,tut-code}/*.el .
 }
 src_compile() {
 	emake elc info
 	emake -C nicola
 }
 src_install () {
 	local lispdir=${SITELISP}/${PN}
 	emake install-elc
 	elisp-compile "${ED}"/${lispdir}/skk-setup.el
 	rm -f "${ED}"/${lispdir}/leim-list.el
 	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	dodoc ChangeLog* README.md READMEs/{AUTHORS,CODENAME,Contributors,FAQ,NEWS,PROPOSAL,TODO}*
 	doinfo doc/skk.info
 	local exts=( nicola tut-code ) d f
 	elisp-install ${PN} nicola/*.{el,elc}
 	if use ruby; then
 		dobin bayesian/bskk
 		exts+=( bayesian )
 	fi
 	for d in ${exts[@]}; do
 		docinto ${d}
 		for f in ${d}/{ChangeLog,README}*; do
 			[[ -s ${f} ]] && dodoc ${f}
 		done
 	done
 }
--- a/app-emacs/ddskk/files/50ddskk-gentoo.el
+++ b/app-emacs/ddskk/files/50ddskk-gentoo.el
@ -1,7 +1,4 @@
 (add-to-list 'load-path "@SITELISP@")
-(require 'skk-autoloads)
+(require 'skk-setup)
 (global-set-key "\C-x\C-j" 'skk-mode)
 (global-set-key "\C-xj" 'skk-auto-fill-mode)
 (global-set-key "\C-xt" 'skk-tutorial)
 (setq skk-large-jisyo "/usr/share/skk/SKK-JISYO.L")
--- a/app-emacs/ddskk/metadata.xml
+++ b/app-emacs/ddskk/metadata.xml
@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+  <maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
+    <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
+    <name>Gentoo GNU Emacs project</name>
-</maintainer>
+  </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
-  <email>cjk@gentoo.org</email>
+    <email>cjk@gentoo.org</email>
-  <name>Cjk</name>
+    <name>Cjk</name>
-</maintainer>
+  </maintainer>
  <upstream>
    <remote-id type="github">skk-dev/ddskk</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-emacs/expand-region/Manifest
+++ b/app-emacs/expand-region/Manifest
@ -0,0 +1 @@
 DIST expand-region-0.11.0.tar.gz 31562 SHA256 e085621267b250486856422d13e7ddc3b11601e2328fc239e709ea10880bbe21 SHA512 3469ab0420d85fbaaa1ae9f3d0101c28b6e1786d761ecd186d744537795226917314b8b748d3499b02ea269a46a62350c37fecb34dd4183a73eafc67ce1344a8 WHIRLPOOL 762ceeefaae4728776d493daac6453d00c6ff232dab4130fcb5965a71b4da6bcc046ed3894912b38716a7047f83286335e4b01616dfc8c8e30edd1360869c79d
--- a/app-emacs/expand-region/expand-region-0.11.0.ebuild
+++ b/app-emacs/expand-region/expand-region-0.11.0.ebuild
@ -0,0 +1,24 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit elisp
 DESCRIPTION="Emacs extension to increase selected region by semantic units"
 HOMEPAGE="https://github.com/magnars/expand-region.el"
 SRC_URI="https://github.com/magnars/expand-region.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 S="${WORKDIR}/expand-region.el-${PV}"
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md"
 src_compile() {
 	elisp-compile *.el
 	elisp-make-autoload-file
 }
--- a/app-emacs/expand-region/files/50expand-region-gentoo.el
+++ b/app-emacs/expand-region/files/50expand-region-gentoo.el
@ -0,0 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
 (load "expand-region-autoloads" nil t)
--- a/app-emacs/expand-region/metadata.xml
+++ b/app-emacs/expand-region/metadata.xml
@ -0,0 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
    <email>victor@enise.org</email>
    <name>Victor Gaydov</name>
  </maintainer>
  <maintainer type="project">
    <email>gnu-emacs@gentoo.org</email>
    <name>Gentoo GNU Emacs project</name>
  </maintainer>
  <maintainer type="project">
    <email>proxy-maint@gentoo.org</email>
    <name>Proxy Maintainers</name>
  </maintainer>
 </pkgmetadata>
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@ -1,2 +1,3 @@
 DIST org-8.2.6.tar.gz 4221803 SHA256 a14a20f3d11855758ad8859e8ccdc50922c31bd64b493d44b856d46441362938 SHA512 a64e975738f26b5315584b51332dbcd29eb6e5b03cb505d638d611455beb921c5e0b728b23fb63f380d46d2e33092865b02de01259cff8985693febebcc1a8a3 WHIRLPOOL b834203c48948a84d6458b7f455451cfd3f40fccd0ae55f150cf105ef937f46fb52492642990cf33c90a2464b93d184d85d922680adf4e66a2af5308d3ac631c
 DIST org-8.3.2.tar.gz 4442361 SHA256 8ae811d19546f73306710f70eed8ee1a1ec9981e78b98af077fa224d5e8875b8 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2 WHIRLPOOL 7ae9c53aa116d1e5cf7527959cdb58cdce63d99d0e487979ee02a12bbb21cbbd0b9a25de7dc86364a6e4affa89813557fc58efa8c1693bcfe1a975f836ef6c1c
 DIST org-9.0.1.tar.gz 4439964 SHA256 0b6087cf9a955bc507b69d620c6461a44976479bcd9c31405c1c033348b9b6f7 SHA512 c0a88372787c5b71ec1523fcf58b3cbf80678835c7b0bfe3b2406290da6fc88b977121ca3b35b47abf2c32ef40c0bfb6733170f225ea35ba24f2e801bb634afe WHIRLPOOL 2799373a3e027ba8822350fe389ecacd2e02fabf4ed99153472e7ff3314b717ff02042fe930f094382e0a059964c9abe9274ac4d66fdc889d2305808c89406c9
--- a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
+++ b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
-inherit readme.gentoo elisp
+inherit elisp readme.gentoo-r1
 DESCRIPTION="An Emacs mode for notes and project planning"
 HOMEPAGE="http://www.orgmode.org/"
@ -21,12 +21,6 @@ DEPEND="doc? ( virtual/texi2dvi )"
 S="${WORKDIR}/org-${PV}"
 SITEFILE="50${PN}-gentoo.el"
 DOC_CONTENTS="
 Org mode has a large variety of run-time dependencies, so you may have to
 install one or more additional packages.  A non-exhaustive list of these
 dependencies may be found at <http://orgmode.org/worg/org-dependencies.html>.
 "
 src_compile() {
 	emake datadir="${EPREFIX}${SITEETC}/${PN}"
 	use doc && emake pdf card
@ -55,7 +49,12 @@ src_install() {
 	fi
 	elisp-site-file-install "${T}/${SITEFILE}"
 	readme.gentoo_create_doc
 	dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
 	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
 	DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
 		so you may have to install one or more additional packages.
 		A non-exhaustive list of these dependencies may be found at
 		<http://orgmode.org/worg/org-dependencies.html>."
 	readme.gentoo_create_doc
 }
--- a/app-emacs/org-mode/org-mode-9.0.1.ebuild
+++ b/app-emacs/org-mode/org-mode-9.0.1.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=5
+EAPI=6
-inherit elisp
+inherit elisp readme.gentoo-r1
 DESCRIPTION="An Emacs mode for notes and project planning"
 HOMEPAGE="http://www.orgmode.org/"
@ -49,6 +49,12 @@ src_install() {
 	fi
 	elisp-site-file-install "${T}/${SITEFILE}"
-	dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
+	dodoc README doc/library-of-babel.org etc/ORG-NEWS
 	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
 	DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
 		so you may have to install one or more additional packages.
 		A non-exhaustive list of these dependencies may be found at
 		<http://orgmode.org/worg/org-dependencies.html>."
 	readme.gentoo_create_doc
 }
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@ -1,3 +1,3 @@
 DIST gettext-0.18.3.2.tar.gz 16189249 SHA256 d1a4e452d60eb407ab0305976529a45c18124bd518d976971ac6dc7aa8b4c5d7 SHA512 0cf8f2bb844b9d94f5e63a0f4bddc133e2388d103fd4189614d2fc157a94e27836ec399eb32ab69410e2214425676e6bc195bbf13238cc5ad32b454ec6e2b5ef WHIRLPOOL 0bb2e33788a12fbeaa4756aaa354a308424cdea5008d6b686bbd8601b7b7c513483d79f323904ebaf94e1fd67f65dfa7cb993ba5c5751e16a297b94b3307ae66
 DIST gettext-0.19.3.tar.gz 17414357 SHA256 93952d505a3d3b1ec10c69d340c7d438b1f9c332710d583981c0608be3eeb3f6 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8 WHIRLPOOL cbf86dab685fe3a5f4dbe5bcb39295809511904fdc65d9e0ef188c228bbe38c408ea38c14ac0ad38634ef1f5d79474d38399e95ab50ff6922cb0087ccfe434be
 DIST gettext-0.19.4.tar.gz 17717034 SHA256 8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97 WHIRLPOOL 2eb56c47d76f63b6557ae825538a35ae59f3f77da35321688547d9c420f47879c79ca1ab8ebd6bc6b4a3a8ce59ed620648884cd46455f6218213587f76967918
 DIST gettext-0.19.8.1.tar.gz 19704011 SHA256 ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 WHIRLPOOL ef9aa9eef3067595dc725169075401dfad8ba15d6224d2b563e3421afa7c4dce9336a287147404273b772def811230b3758c005902ec90192e6ee4ac373d9a9a
--- a/app-emacs/po-mode/po-mode-0.19.8.1.ebuild
+++ b/app-emacs/po-mode/po-mode-0.19.8.1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI=5
+EAPI=6
 inherit elisp
@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
 ELISP_REMOVE="start-po.el"
--- a/app-i18n/translate-shell/metadata.xml
+++ b/app-i18n/translate-shell/metadata.xml
@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
+	<maintainer type="person">
-		<email>proxy-maint@gentoo.org</email>
+		<email>erkiferenc@gmail.com</email>
-		<name>Gentoo Proxy Maintainers Project</name>
+		<name>Ferenc Erki</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 	<maintainer type="person">
                <email>patrick@gentoo.org</email>
                <name>Patrick Lauer</name>
        </maintainer>
-	<maintainer type="person">
+	<maintainer type="project">
-		<email>erkiferenc@gmail.com</email>
+		<email>proxy-maint@gentoo.org</email>
-		<name>Ferenc Erki</name>
+		<name>Gentoo Proxy Maintainers Project</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 	<longdescription lang="en">
 		Translate Shell (formerly Google Translate CLI) is a command-line
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@ -1,2 +1 @@
 DIST golly-2.4-src.tar.gz 2612440 SHA256 b5e4fe5dfb9f6b6a514211b31498be886012638e8aaae16a08b50bf2f6d676c4 SHA512 7e49d72ff638c21f7bdf9de6d254e6baa4989735bdc3d9c52ec9eeacce7e9c6261d32f86b9c62478c3192d17aaba0f30994ad8e9be625dfa21de4d2b035493f9 WHIRLPOOL 556b4a319091f34362c66452b898c281620d0c98b71fbe9491a32e08edafea988d850287178d74cb2b2c34e12954f4fdb4477effa80e8f54aa938930383efe01
 DIST golly-2.7-src.tar.gz 3881882 SHA256 9af30afd7b03b3eebcfaec088d67c495609aef72516d9ca8f076b62f32b5e17b SHA512 084919f508b471cc0937d50307410c3f48281e7328e3b9d20e634b9ddfe5909e3b9a000da5a9845a2ba7e45a733fee39e2e6d55902c9af110b5f2d7ea8654d77 WHIRLPOOL 5c391894943593391e2c784f28c00cbbb479068936c6bd754d6c81847d4b0a3c57aad65535a5d8f5f97f789225a6d8d18f52b203ea9340fdd49f641fac8ae42e
--- a/app-misc/golly/golly-2.4-r1.ebuild
+++ b/app-misc/golly/golly-2.4-r1.ebuild
@ -1,44 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 WX_GTK_VER=2.8
 PYTHON_COMPAT=( python2_7 )
 inherit eutils python-single-r1 toolchain-funcs wxwidgets
 DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
 HOMEPAGE="http://golly.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 DEPEND="dev-lang/perl
 	sys-libs/zlib
 	x11-libs/wxGTK:${WX_GTK_VER}[X]"
 RDEPEND="${DEPEND}"
 S=${WORKDIR}/${P}-src
 src_prepare() {
 	sed -e 's:-O2::' -i configure Makefile.{am,in} || die
 }
 src_configure() {
 	econf --with-perl-shlib="libperl.so"
 }
 src_compile() {
 	emake AR=$(tc-getAR)
 }
 src_install() {
 	emake docdir= DESTDIR="${D}" install
 	newicon appicon.xpm ${PN}.xpm
 	dodoc README TODO
 }
--- a/app-misc/golly/golly-2.7-r1.ebuild
+++ b/app-misc/golly/golly-2.7-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 DEPEND="dev-lang/perl
--- a/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.69-adwaita-icon-theme.patch
+++ b/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.69-adwaita-icon-theme.patch
@ -0,0 +1,12 @@
 diff -up ./configure.in.orig ./configure.in
 --- a/configure.in.orig	2014-05-04 09:40:07.973480490 +0300
 +++ b/configure.in	2014-05-04 09:40:26.264727691 +0300
@@ -48,7 +48,7 @@ PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobje
 PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
 	libcanberra-gtk3 gconf-2.0
 	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserver-1.2 >= 3.6
 -	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
 +	gmodule-2.0 dbus-glib-1 adwaita-icon-theme >= 2.19.1
 )
 DBUSLIBDIR="`$PKG_CONFIG dbus-glib-1 --variable=libdir`"
--- a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69-r1.ebuild
+++ b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69-r1.ebuild
@ -1,12 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI=6
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-inherit autotools eutils gnome2
+inherit autotools gnome2
 DESCRIPTION="Allows you to control aspects of your mobile phone from your GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/PhoneManager"
@ -14,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/PhoneManager"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
+IUSE="debug"
 # telepathy support is considered experimental
 RDEPEND="
@ -27,10 +26,10 @@ RDEPEND="
 	>=app-mobilephone/gnokii-0.6.28[bluetooth]
 	net-wireless/bluez
 	dev-libs/dbus-glib
-	dev-libs/openobex
+	dev-libs/openobex:0=
 	media-libs/libcanberra[gtk]
-	>=x11-themes/gnome-icon-theme-2.19.1
+	>=net-wireless/gnome-bluetooth-3.3:2=
-	>=net-wireless/gnome-bluetooth-3.3:2
+	x11-themes/adwaita-icon-theme
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.5
@ -41,8 +40,9 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Fix eds-3.6 building, upstream bug #680927
-	epatch "${FILESDIR}"/0001-Adapt-to-Evolution-Data-Server-API-changes.patch
+	eapply "${FILESDIR}"/0001-Adapt-to-Evolution-Data-Server-API-changes.patch
-
+	eapply "${FILESDIR}"/${P}-adwaita-icon-theme.patch
 	mv configure.in configure.ac || die
 	eautoreconf
 	gnome2_src_prepare
 }
@ -52,5 +52,6 @@ src_configure() {
 	gnome2_src_configure \
 		--disable-bluetooth-plugin \
 		--disable-telepathy \
-		--disable-static
+		--disable-static \
 		$(use_enable debug)
 }
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@ -1,2 +1 @@
 DIST skrooge-2.4.0.tar.xz 18000104 SHA256 132d022337140f841f51420536c31dfe07c90fa3a38878279026825f5d2526fe SHA512 ce2a9aaf67ed8b751ce062bea020c999da0232aca7d1ddcf58294f76435123231c65cc07f818c92499d142941327253f491cbec48fa504541fe91effde8b78c0 WHIRLPOOL 4cc00833e5df03d8d6b071b1ba612258749852f8acf5bf94c2cefd61680516c2a3a53c8d05273c2687886849dac1c562d5a17b1015090876ab9b570130dd73f7
 DIST skrooge-2.5.0.tar.xz 17603860 SHA256 97bebb1b3f1cd791160292bd4689e584c4054db14f0f88039541e67c72ce5e0d SHA512 00fb32f7705c5125803436a21648545154043b6333267ae722c9beac04baf766e1860ce84b4e56d80d81ade1ab3ef8e3ac60a98d0616cae6ec5212d7ad2ef528 WHIRLPOOL 0eef97d2eebcc00155d1505a457e8443df676c93124edbf352b89fa796781ae9e0630294256932e065d2a35eb2d1916ccf733e05bf4f16a237302d0db713073c
--- a/app-office/skrooge/skrooge-2.4.0.ebuild
+++ b/app-office/skrooge/skrooge-2.4.0.ebuild
@ -1,96 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 KDE_GCC_MINIMAL="4.9"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
 HOMEPAGE="http://www.skrooge.org/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 KEYWORDS="amd64 x86"
 IUSE="activities crypt ofx"
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep krunner)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative 'widgets')
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtscript)
 	$(add_qt_dep qtsql)
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	app-crypt/qca:2[qt5]
 	dev-libs/grantlee:5
 	activities? ( $(add_frameworks_dep kactivities) )
 	crypt? ( dev-db/sqlcipher )
 	!crypt? ( dev-db/sqlite:3 )
 	ofx? ( >=dev-libs/libofx-0.9.1 )
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kdesignerplugin)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_qt_dep designer)
 	dev-libs/libxslt
 	virtual/pkgconfig
 	x11-misc/shared-mime-info
 "
 RDEPEND="${COMMON_DEPEND}
 	!app-office/skrooge:4
 "
 # hangs + installs files
 RESTRICT="test"
 DOCS=( AUTHORS CHANGELOG README TODO )
 src_configure() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=$(usex test)
 		-DSKG_CIPHER=$(usex crypt)
 		$(cmake-utils_use_find_package activities KF5Activities)
 		$(cmake-utils_use_find_package ofx LibOfx)
 	)
 	kde5_src_configure
 }
 src_test() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=ON
 	)
 	kde5_src_test
 }
--- a/app-office/skrooge/skrooge-2.5.0.ebuild
+++ b/app-office/skrooge/skrooge-2.5.0.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="http://www.skrooge.org/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="activities crypt designer kde ofx"
 COMMON_DEPEND="
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@ -1,2 +1 @@
 DIST catdoc-0.95.tar.gz 217779 SHA256 514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796 SHA512 dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c WHIRLPOOL 1303c74cc6a13183e2ea8ee2bf616da419a8b9f03f4e2fcdce3b0462306084fab85a1cd68bb4ab07caac40c56a91284103e54084d7f523d9894b0eee9359184c
 DIST catdoc_0.94.4.orig.tar.gz 679156 SHA256 c06fd69d2a218fcc2ed1320988cef07a67cf5555a12f25752766d746e25758ee SHA512 63e492c40e0abb82df0c93c43d1bd63f15d0c8b60579cf3858f26a0814731920ff621b3384035c9a85da5c448b699801ff3376e7a02cf8e7a413195bd9847ba9 WHIRLPOOL 73675ee3b2facf03e894257132ee7766802ee3ab347701dfa7cd313855ebb22976b9e44f1d9d4eceee6f87008160df371a0cda409a623f61a35413d480a2a8d5
--- a/app-text/catdoc/catdoc-0.94.4-r1.ebuild
+++ b/app-text/catdoc/catdoc-0.94.4-r1.ebuild
@ -1,59 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 WANT_AUTOMAKE=none
 inherit autotools eutils
 DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
 HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
 SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="tk"
 DEPEND="tk? ( >=dev-lang/tk-8.1 )"
 DOCS="CODING.STD CREDITS NEWS README TODO"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.94.2-flags.patch
 	epatch "${FILESDIR}"/${PN}-0.94.2+autoconf-2.63.patch
 	epatch "${FILESDIR}"/${P}-destdir.patch
 	epatch "${FILESDIR}"/${P}-desktop.patch
 	# only install wordview.desktop when tk is enabled (bug #522766)
 	if ! use tk ; then
 		sed -i 's/ desktop//' Makefile.in || die
 	fi
 	# Fix for case-insensitive filesystems
 	echo ".PHONY: all install clean distclean dist" >> Makefile.in
 	eautoconf
 }
 src_configure() {
 	econf --with-install-root="${D}" \
 		$(use_with tk wish "${EPREFIX}"/usr/bin/wish) \
 		$(use_enable tk wordview)
 }
 src_compile() {
 	emake LIB_DIR="${EPREFIX}"/usr/share/catdoc
 }
 src_install() {
 	emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install
 	if [[ -e ${ED}/usr/bin/xls2csv ]]; then
 		einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657."
 		mv -vf "${ED}"/usr/bin/xls2csv "${ED}"/usr/bin/xls2csv-${PN} || die
 	fi
 	dodoc ${DOCS}
 }
--- a/app-text/catdoc/catdoc-0.94.4.ebuild
+++ b/app-text/catdoc/catdoc-0.94.4.ebuild
@ -1,54 +0,0 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 WANT_AUTOMAKE=none
 inherit autotools eutils
 DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
 HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
 SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="tk"
 DEPEND="tk? ( >=dev-lang/tk-8.1 )"
 DOCS="CODING.STD CREDITS NEWS README TODO"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.94.2-flags.patch
 	epatch "${FILESDIR}"/${PN}-0.94.2+autoconf-2.63.patch
 	epatch "${FILESDIR}"/${P}-destdir.patch
 	epatch "${FILESDIR}"/${P}-desktop.patch
 	# Fix for case-insensitive filesystems
 	echo ".PHONY: all install clean distclean dist" >> Makefile.in
 	eautoconf
 }
 src_configure() {
 	econf --with-install-root="${D}" \
 		$(use_with tk wish "${EPREFIX}"/usr/bin/wish) \
 		$(use_enable tk wordview)
 }
 src_compile() {
 	emake LIB_DIR="${EPREFIX}"/usr/share/catdoc
 }
 src_install() {
 	emake -j1 mandir="${EPREFIX}"/usr/share/man/man1 install
 	if [[ -e ${ED}/usr/bin/xls2csv ]]; then
 		einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657."
 		mv -vf "${ED}"/usr/bin/xls2csv "${ED}"/usr/bin/xls2csv-${PN} || die
 	fi
 	dodoc ${DOCS}
 }
--- a/app-text/enchant/enchant-1.6.0.ebuild
+++ b/app-text/enchant/enchant-1.6.0.ebuild
@ -3,7 +3,6 @@
 # $Id$
 EAPI=6
 inherit eutils autotools
 DESCRIPTION="Spellchecker wrapping library"
@ -13,26 +12,29 @@ SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="aspell +hunspell static-libs zemberek"
 REQUIRED_USE="|| ( hunspell aspell zemberek )"
 COMMON_DEPENDS="
 	dev-libs/glib:2
 	aspell? ( app-text/aspell )
 	hunspell? ( >=app-text/hunspell-1.2.1:0= )
-	zemberek? ( dev-libs/dbus-glib )"
+	zemberek? ( dev-libs/dbus-glib )
-
+"
 RDEPEND="${COMMON_DEPENDS}
-	zemberek? ( app-text/zemberek-server )"
+	zemberek? ( app-text/zemberek-server )
-
+"
 DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig"
+	virtual/pkgconfig
-
+"
 REQUIRED_USE="|| ( hunspell aspell zemberek )"
 DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
 PATCHES=(
 	# http://bugzilla.abisource.com/show_bug.cgi?id=13772
 	"${FILESDIR}/${P}-hunspell140_fix.patch"
 	"${FILESDIR}/${P}-hunspell150_fix.patch"
 )
 src_prepare() {
@ -40,6 +42,7 @@ src_prepare() {
 	sed -i \
 		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
 		tests/Makefile.am || die
 	mv configure.in configure.ac || die
 	AT_M4DIR=ac-helpers eautoreconf
 }
@ -56,6 +59,5 @@ src_configure() {
 src_install() {
 	default
-
+	prune_libtool_files --modules
 	prune_libtool_files --all
 }
--- a/app-text/enchant/files/enchant-1.6.0-hunspell150_fix.patch
+++ b/app-text/enchant/files/enchant-1.6.0-hunspell150_fix.patch
@ -0,0 +1,12 @@
 diff -upr enchant-1.6.0.orig/src/myspell/myspell_checker.cpp enchant-1.6.0/src/myspell/myspell_checker.cpp
 --- enchant-1.6.0.orig/src/myspell/myspell_checker.cpp	2016-11-26 16:04:05.689051339 +0200
 +++ enchant-1.6.0/src/myspell/myspell_checker.cpp	2016-11-26 16:05:11.380014568 +0200
@@ -431,7 +431,7 @@ MySpellChecker::requestDictionary(const
 	if(myspell == NULL){
 		return false;
 	}
 -	char *enc = myspell->get_dic_encoding();
 +	const char *enc = myspell->get_dic_encoding();
 	m_translate_in = g_iconv_open(enc, "UTF-8");
 	m_translate_out = g_iconv_open("UTF-8", enc);
--- a/app-text/openjade/openjade-1.3.2-r6.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r6.ebuild
@ -52,8 +52,8 @@ src_prepare() {
 src_configure() {
 	# avoids dead-store elimination optimization
 	# leading to segfaults on GCC 6
-	# bug #592590
+	# bug #592590 #596506
-	append-cxxflags -fno-lifetime-dse
+	append-cxxflags $(test-flags-CXX -fno-lifetime-dse)
 	# We need Prefix env, bug #287358
 	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
--- a/app-text/ronn/ronn-0.7.3-r2.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r2.ebuild
@ -1,48 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
 inherit ruby-fakegem
 DESCRIPTION="Ronn converts simple, human readable textfiles to roff for terminal display, and also to HTML"
 HOMEPAGE="https://github.com/rtomayko/ronn/"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 ruby_add_rdepend "
 	>=dev-ruby/hpricot-0.8.2
 	>=dev-ruby/mustache-0.7.0
 	>=dev-ruby/rdiscount-1.5.8"
 ruby_add_bdepend ">=dev-ruby/hpricot-0.8.2 >=dev-ruby/rdiscount-1.5.8"
 all_ruby_prepare() {
 	# Avoid test failing due to changes in hash handling in ruby 1.8.7:
 	# https://github.com/rtomayko/ronn/issues/56
 	sed -i -e '81 s:^:#:' test/test_ronn.rb || die
 }
 each_ruby_prepare() {
 	# Make sure that we always use the right interpreter during tests.
 	sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb
 }
 all_ruby_compile() {
 	PATH="${S}/bin:${PATH}" rake man || die
 }
 all_ruby_install() {
 	all_fakegem_install
 	doman man/ronn.1 man/ronn-format.7
 }
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos"
 IUSE=""
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@ -1,5 +1,5 @@
-DIST phpMyAdmin-4.0.10.15-all-languages.tar.xz 4778232 SHA256 f3aea2e7f048b14499912e8ec0f39cff31bcc690480e3bbc773cb56bdeb5e717 SHA512 a1b1305ad1404a8f842155793e1118a24b4f011349d9d35375970d016e9c044529e5b5b207eee7554f515f6be2c008e73f36a21aae5427a9374bfdba55575774 WHIRLPOOL b525f6c402a391f7e1ec4727d284e89de3b8fe6c12f78a37ed1a4448b1ea047a0605677a2d73b00bdefd73270d46dd37b04be90b3357288d3bbcc23b07ca3b75
+DIST phpMyAdmin-4.0.10.18-all-languages.tar.xz 4769668 SHA256 7c57c21ccb0d913bdd6ee1d57cfd9887204e1be8546595c5957b7d475c59b6d7 SHA512 f81cf0d952ec9777189072f490e9e1409610353bb29355772890f7f5681fd80da771c546d1109a59068fc120a3408f0d0a6101f6d57724e67cd40b9d648d47be WHIRLPOOL 16d557cf3a0d57f8e36f288a1be50632348b552decf866b6b7abf76203ecdc1839559820ba6550309b31b37cbce4e5774185348be1210f00ca235648de85042b
 DIST phpMyAdmin-4.0.10.17-all-languages.tar.xz 4770060 SHA256 c426dc2891ff39568f644df99e34ecbf13700457ea170238a7f6d70494bf4657 SHA512 1a3fbad8dcd714875a7e89faae3843937e6f37f317c4a1a3e01c1b17f9b8d7f43587ad713886652920206a9e12d007b776f12a22c3850165369c04b0628edd71 WHIRLPOOL 2a701923f8de59a20b24029a51155551c24458cf59a4aa282ba5a3898e044447944471c56eff282a5dee77e8db1e34473e32f6d03bd2220b4fbdb67809c4032a
 DIST phpMyAdmin-4.4.15.5-all-languages.tar.xz 5783216 SHA256 6160724fa90ef5cccb67ad897a83586be28e64f5d6acf9bcb3313bc3d7638d8c SHA512 987d95f8352f58d7081aead10ccc7494b054d4041e0cb7454633e885c3217a7c63778d45c2dbf399e82c76159ab6651efeaf9c3cabc96982de83d5a041065e7a WHIRLPOOL b5fb8365817d1521f9e6ad5c60fa1a1ee941fb77062d63975d9f340c4abc681948fb6cd240c4943714d855f6f113baf46241bacf4d421b78f8f740c8bd9ade73
 DIST phpMyAdmin-4.4.15.8-all-languages.tar.xz 5772212 SHA256 aaabba81185da6496eef10eb2ee3fcb47138494bb50ca57a4050ca5a732a67a1 SHA512 4f417d8d371975133b76a9b4c4a4e6d31089281e68c9e0df33107c0d343b8d25ebb03f13ed6327a6024283b3de01dc623e080277acbffa41b46a87d00476c23c WHIRLPOOL 3046b629ecaacd843b130871af38561ac9b0aecbf4a80ceb3ee6b7f5491abf3ae39755ce038b6dcbb53ac0e8145ca3d01bda3b9fd001d5fe46990d805c16ed4e
-DIST phpMyAdmin-4.6.4-all-languages.tar.xz 6137016 SHA256 f2ea32a2971efcab073ad41b6512475af1b6da70cf800a5586a12cf49797d319 SHA512 80ee0180c283c6ea139410289f9aa6535077f68812014dd8c7e334bdae0f49171a47b50274172a153d81e5f3145f906fdcda52751ba703fed8158482a924c6b2 WHIRLPOOL 45672ffbead30a885d4852de3d497001c73820c5777ff2ea397db69240d561b7903397876aa1ce5b3ca519d84abb3bdebeb815052f18a9f3eaab3580b8eafef2
+DIST phpMyAdmin-4.4.15.9-all-languages.tar.xz 5776028 SHA256 0d279bd34e542d3cdf5cb37667cc4617f008f39b5eb7d943e9aa739a2ceca174 SHA512 2dd5a9fcc777627b9bccad340e4e0d7b7736a6e088a9ce5957f7fc22cef909b4c81467dab359b7b597be7977fac08e4632e6f06fd6743f133a14773de6dda05c WHIRLPOOL 3f4597799165bc8773cc279ea5d036fd3036d1019762a3503d68ce28c5efdee9b83864d0bd4f6d4d466c90d71b78ed478cc53084fab84a811e6888208d3decaa
 DIST phpMyAdmin-4.6.5.1-all-languages.tar.xz 6162164 SHA256 e163b08b6d1137fd7c48ea97e8e53be415b1937f5e5f7e070936a60c3b9a3df0 SHA512 e6f90af32b77785ff49d9be4033e29e5b64df84d1a37dbe214df9049ef25ecfaee8e443aa9b789c408993541ea85c8e670b350071bd7f3437711462e164afad8 WHIRLPOOL 7e4f5d8e214192c33700b321343510f23f772c5c1a322749c2aded037be9b5743899fd67965743c5498615ae4cf73d0d2d5954ddd11c71b63724e2225ab3f200
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.18.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.18.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 RDEPEND="
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.15.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.15.ebuild
@ -11,11 +11,11 @@ MY_PN="phpMyAdmin"
 MY_P="${MY_PN}-${MY_PV}-all-languages"
 DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
+HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 RDEPEND="
--- a/dev-db/phpmyadmin/phpmyadmin-4.6.5.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.6.5.1.ebuild
--- a/dev-lang/php/php-5.6.28.ebuild
+++ b/dev-lang/php/php-5.6.28.ebuild
@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
--- a/dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch
+++ b/dev-libs/libmoe/files/libmoe-1.5.8-gcc5.patch
@ -0,0 +1,61 @@
 diff -urN b/iso2mb.c c/iso2mb.c
 --- b/iso2mb.c	2015-07-06 21:38:49.129658661 +0000
 +++ c/iso2mb.c	2015-07-07 18:50:17.211540572 +0000
@@ -513,11 +513,11 @@
   return wc;
 }
 -mb_wchar_t
 +__attribute__ ((gnu_inline)) __inline__ mb_wchar_t
 mb_encode_to_wchar(mb_info_t *info)
 MB_ENCODE_TO_WCHAR
 -mb_wchar_t
 +__attribute__ ((gnu_inline)) __inline__ mb_wchar_t
 mb_fetch_wchar(mb_info_t *info)
 MB_FETCH_WCHAR
 diff -urN b/mb2iso.c c/mb2iso.c
 --- b/mb2iso.c	2015-07-06 21:38:49.133658683 +0000
 +++ c/mb2iso.c	2015-07-07 19:07:47.583244156 +0000
@@ -900,7 +900,7 @@
   return n;
 }
 -size_t
 +__attribute__ ((gnu_inline)) __inline__ size_t
 mb_store_wchar(mb_wchar_t enc, mb_info_t *info)
 MB_STORE_WCHAR
 diff -urN b/mb.h c/mb.h
 --- b/mb.h	2015-07-06 21:38:49.133658683 +0000
 +++ c/mb.h	2015-07-07 18:50:17.211540572 +0000
@@ -434,7 +434,7 @@
 }
 #ifdef __GNUC__
 -extern __inline__ mb_wchar_t mb_encode_to_wchar(mb_info_t *info) MB_ENCODE_TO_WCHAR
 +extern __attribute__ ((gnu_inline))  __inline__ mb_wchar_t mb_encode_to_wchar(mb_info_t *info);
 #else
 extern mb_wchar_t mb_encode_to_wchar(mb_info_t *info);
 #endif
@@ -449,7 +449,7 @@
 }
 #ifdef __GNUC__
 -extern __inline__ mb_wchar_t mb_fetch_wchar(mb_info_t *info) MB_FETCH_WCHAR
 +extern __attribute__ ((gnu_inline))  __inline__ mb_wchar_t mb_fetch_wchar(mb_info_t *info);
 #else
 extern mb_wchar_t mb_fetch_wchar(mb_info_t *info);
 #endif
@@ -552,7 +552,7 @@
 }
 #ifdef __GNUC__
 -extern __inline__ size_t mb_store_wchar(mb_wchar_t enc, mb_info_t *info) MB_STORE_WCHAR
 +extern __attribute__ ((gnu_inline)) __inline__ size_t mb_store_wchar(mb_wchar_t enc, mb_info_t *info);
 #else
 extern size_t mb_store_wchar(mb_wchar_t enc, mb_info_t *info);
 #endif
--- a/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
+++ b/dev-libs/libmoe/libmoe-1.5.8-r3.ebuild
@ -0,0 +1,40 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 inherit toolchain-funcs
 DESCRIPTION="Multi octet character encoding handling library"
 HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/libmoe/"
 SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
 HTML_DOCS=( libmoe.shtml )
 PATCHES=(
 	"${FILESDIR}/${P}-gentoo.patch"
 	"${FILESDIR}/${P}-makefile.patch"
 	"${FILESDIR}/${P}-gcc5.patch"	# taken from Debian
 )
 src_prepare() {
 	default
 	sed -i \
 		-e "/^PREFIX=/s:=.*:=${EPREFIX}/usr:" \
 		-e "/^LIBSODIR=/s:=.*:=\$\{PREFIX}/$(get_libdir):" \
 		-e "/^MANDIR=/s:=.*:=\$\{PREFIX}/share/man:" \
 		-e "/^CF=/s:=:=${CFLAGS} :" \
 		-e "/^LF=/s:=:=${LDFLAGS} :" \
 		-e "s:=gcc:=$(tc-getCC):" \
 		-e "/^AR=/s:=ar:=$(tc-getAR):" \
 		Makefile || die
 }
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@ -1 +1,2 @@
 DIST dominate-2.2.1.zip 46460 SHA256 4aa6a2f458461541f9ceeb58b49da9b42320f80aa2a6f692baea2817431d9953 SHA512 3f79fa4258f98708b1e169693e83f919179c1148f440300426f907e28c26b28c21a1098793a14f7e89e5aba0de61f93c889a4908f0eb6e3641ffe234e215e597 WHIRLPOOL 18b57dfc4d0f825be45a1b248e434a8a013d5b76f065b854c47aab9d99c00f5d1854fbcd3c520de50b11b5d7f079f6e57b2e7167249b7e71ff980ac02dfd8100
 DIST dominate-2.3.1.tar.gz 27887 SHA256 4b8ce6f33633c9dd9175b228d21c00c801b6bd0327747cd5e17fc2da934c3a69 SHA512 599147cd9aabc7c3bc24e6c82a13b690808899107999a3b0d7d3f2f113b38c90f2c720298ffdcdf1933d2573cced05d730dab53265397b7fc010e57feabc10b3 WHIRLPOOL 258b490620bf358829a74bb7586864a078004268e7bd140322d27126484824ccff0533a87f41948bb13ce19cd47b020d16181a4ea7d74c3f12bf18479b047939
--- a/dev-python/dominate/dominate-2.3.1.ebuild
+++ b/dev-python/dominate/dominate-2.3.1.ebuild
@ -0,0 +1,29 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit distutils-r1
 DESCRIPTION="Library for creating and manipulating HTML documents using an elegant DOM API"
 HOMEPAGE="https://github.com/Knio/dominate"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
 	)
 "
 python_test() {
 	py.test || die "Tests failed with ${EPYTHON}"
 }
--- a/dev-python/flaky/flaky-3.1.1.ebuild
+++ b/dev-python/flaky/flaky-3.1.1.ebuild
@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/genty[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)
--- a/dev-python/pillow/pillow-3.4.2.ebuild
+++ b/dev-python/pillow/pillow-3.4.2.ebuild
@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
--- a/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild
@ -1,41 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
 inherit ruby-fakegem
 DESCRIPTION="A distributed application deployment system"
 HOMEPAGE="http://capistranorb.com/"
 LICENSE="MIT"
 SLOT="2"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_rdepend "
 	>=dev-ruby/net-ssh-2.0.14
 	>=dev-ruby/net-sftp-2.0.2
 	>=dev-ruby/net-scp-1.0.2
 	>=dev-ruby/net-ssh-gateway-1.1.0
 	>=dev-ruby/highline-1.2.7"
 ruby_add_bdepend "
 	test? (	dev-ruby/mocha:0.12 )"
 RUBY_PATCHES=( ${P}-sudo-cleanup.patch )
 all_ruby_prepare() {
 	rm Gemfile || die
 	sed -i -e '/[Bb]undler/d' Rakefile test/utils.rb || die
 	sed -i -e '/pry/ s:^:#:' -e '4igem "mocha", "~>0.12.0"' test/utils.rb || die
 	# Avoid copy strategy tests since these fail in some cases due to
 	# complicated (aka unknown) interactions with other parts of the
 	# test suite.
 	rm test/deploy/strategy/copy_test.rb || die
 }
--- a/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r2.ebuild
@ -17,7 +17,7 @@ HOMEPAGE="http://capistranorb.com/"
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_rdepend "
--- a/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
+++ b/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
@ -3,7 +3,7 @@
 # $Id$
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@ -1,4 +1,3 @@
 DIST facter-2.4.1.gem 236544 SHA256 4c8836066378d387c0561e4c3574865fa10d85d7474d472b049ecc7d5e4c67fa SHA512 5690f059961ba981d2e174f45ebdbb4e9b75aad3599cbc896f1c3d25f9b12c36500e09be70c36ebf27aed602c22d811604c344c7ccc71ecb200d4aeb78f28a4b WHIRLPOOL 1b6b4079b0449c646e06e9fd868b1de29a61facdacea956b032fbbef94e8c4c85594f50021b3f78a3668c5a0f6d29c448bd97c34fdb8a215de2ee74b164af6fd
 DIST facter-2.4.6.gem 246272 SHA256 56ffc5fbcd550fcdb4788bc4d7fd0199bff69937d6df1e5a1f61c92d143d78fe SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a WHIRLPOOL fca6165c55d6123e1ab123e5d3459943fda845e696b111520fb6de682ab56fd51a9a4ca072e0a533496c0aedd83b2b26f827147ed01a30dbe72389250437301e
 DIST facter-3.1.4.tar.gz 620501 SHA256 7ca1872edbdc5ffcd11dc292e5e0625c9e0d35aa7966d8803859da0d035c7fcf SHA512 2fcc990c8e26349b9fa87cd1f7c43dffd49ffacf03c3467e836ea0bcd7527e1d40b6240646fd7dd6346121ca802fe86e996e209d838db91e8fe55298fdab4e0e WHIRLPOOL 224b17990fc559fce3a7c9b31c14dd45033127b078d68fac024cb6db192573085187163932c9dacd8fd94a281bd8d58ac1c75229a8e3bce4c4f070ebc81ff0f3
 DIST facter-3.1.8.tar.gz 324710 SHA256 bd393026640baf149507c11d36be144759889d4c90174d7c6bfb35e0a341fbca SHA512 2884c2c0bb3075b2552763dee7f33228b0e70b4eb46367f52c4cbf9e01930ddc5e58d062d06ced4174900fc3eae5214d80471a4fe499bf0f2ac0278640e0e8c7 WHIRLPOOL 465432940e068318da0028ce1c8ea3084392212cfc6a50449a3ba034fe721836c88ba16c2248b4b3f062a890087421c93a3d14574c8d03e1eafe4f4f82b49d0d
--- a/dev-ruby/facter/facter-2.4.1.ebuild
+++ b/dev-ruby/facter/facter-2.4.1.ebuild
@ -1,62 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_BINWRAP="facter"
 inherit ruby-fakegem
 DESCRIPTION="A cross-platform Ruby library for retrieving facts from operating systems"
 HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+dmi +pciutils +virt"
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
 CDEPEND="
 	app-emulation/virt-what
 	sys-apps/net-tools
 	sys-apps/lsb-release
 	dmi? ( sys-apps/dmidecode )
 	pciutils? ( sys-apps/pciutils )"
 RDEPEND+=" ${CDEPEND}"
 DEPEND+=" test? ( ${CDEPEND} )"
 ruby_add_bdepend "test? ( dev-ruby/mocha:0.13 )"
 all_ruby_prepare() {
 	# Provide explicit path since /sbin is not in the default PATH on
 	# Gentoo.
 	sed -i -e 's:arp -an:/sbin/arp -an:' lib/facter/util/ec2.rb spec/unit/util/ec2_spec.rb || die
 	# Ensure the correct version of mocha is used without using bundler.
 	sed -i -e '1igem "mocha", "~>0.13"' spec/spec_helper.rb || die
 	# Avoid because tests try to access outside stuff, e.g. /sys/block
 	sed -i -e '/should load facts on the facter search path only once/,/^  end/ s:^:#:' spec/unit/util/loader_spec.rb || die
 	# Allow specs to work with newer rspec 2.x versions.
 	sed -i -e '1irequire "rspec-expectations"' spec/puppetlabs_spec/matchers.rb || die
 	# Avoid specs specific to macosx requiring cfpropertylist which is
 	# not available anymore.
 	rm spec/unit/util/macosx_spec.rb || die
 	sed -i -e '/macosx/ s:^:#:' \
 		-e '/on Darwin/,/^  end/ s:^:#:' spec/unit/virtual_spec.rb || die
 	sed -i -e '/Facter::Processors::Darwin/,/^end/ s:^:#:' spec/unit/processors/os_spec.rb || die
 }
 all_ruby_install() {
 	all_fakegem_install
 	# Create the directory for custom facts.
 	keepdir /etc/facter/facts.d
 }
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r1.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0-r1.ebuild
@ -1,51 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20"
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
 inherit ruby-fakegem
 DESCRIPTION="fast_xs text escaping library ruby bindings"
 HOMEPAGE="https://github.com/brianmario/fast_xs"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 IUSE=""
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.3.2 )"
 ruby_add_bdepend "test? (
 	>=dev-ruby/hoe-2.3.2
 	dev-ruby/rack
 )"
 RUBY_PATCHES=( "${P}+ruby-1.9.patch" )
 each_ruby_configure() {
 	${RUBY} -Cext/fast_xs extconf.rb || die "extconf.rb failed"
 	${RUBY} -Cext/fast_xs_extra extconf.rb || die "extconf.rb failed"
 }
 each_ruby_compile() {
 	emake -Cext/fast_xs CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
 	cp ext/fast_xs/fast_xs$(get_modname) lib/ || die
 	emake -Cext/fast_xs_extra CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
 	cp ext/fast_xs_extra/fast_xs_extra$(get_modname) lib/ || die
 }
 each_ruby_test() {
 	# the Rakefile tries to run all the tests in a single process, but
 	# this breaks the monkey-patchers, we're forced to run them one by
 	# one.
 	for tu in test/test_*.rb; do
 		${RUBY} -Ilib $tu || die "test $tu failed"
 	done
 }
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/fast_xs"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x86-solaris"
 IUSE=""
 ruby_add_bdepend "test? (
--- a/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r2.ebuild
@ -1,69 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
 inherit ruby-fakegem eutils
 DESCRIPTION="A fast and liberal HTML parser for Ruby"
 HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 ruby_add_bdepend "dev-ruby/rake
 	dev-ruby/rake-compiler"
 # dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
 USE_RUBY="${USE_RUBY/jruby/}" \
 	ruby_add_rdepend "dev-ruby/fast_xs"
 # Probably needs the same jdk as JRuby but I'm not sure how to express
 # that just yet.
 DEPEND+="
 	dev-util/ragel"
 all_ruby_prepare() {
 	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
 	# Fix encoding assumption of environment for Ruby 1.9.
 	# https://github.com/hpricot/hpricot/issues/52
 	# sed -i -e '1 iEncoding.default_external=Encoding::UTF_8 if RUBY_VERSION =~ /1.9/' test/load_files.rb || die
 }
 each_ruby_prepare() {
 	# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
 	[[ ${RUBY} == */jruby ]] && return
 	pushd .. &>/dev/null
 	epatch "${FILESDIR}"/${P}-fast_xs.patch
 	popd .. &>/dev/null
 }
 each_ruby_configure() {
 	# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
 	[[ ${RUBY} == */jruby ]] && return
 	${RUBY} -Cext/hpricot_scan extconf.rb || die "hpricot_scan/extconf.rb failed"
 }
 each_ruby_compile() {
 	local modname=$(get_modname)
 	# dev-ruby/fast_xs does not cover JRuby so still bundle it here for now
 	if [[ ${RUBY} == */jruby ]]; then
 		${RUBY} -S rake compile_java || die "rake compile_java failed"
 		return
 	fi
 	emake V=1 -Cext/hpricot_scan CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "make hpricot_scan failed"
 	cp ext/hpricot_scan/hpricot_scan${modname} lib/ || die
 }
--- a/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 ruby_add_bdepend "dev-ruby/rake
--- a/dev-ruby/maruku/maruku-0.7.2-r1.ebuild
+++ b/dev-ruby/maruku/maruku-0.7.2-r1.ebuild
@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/bhollis/maruku"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight test"
 ruby_add_bdepend "test? ( dev-ruby/nokogiri-diff )"
--- a/dev-ruby/maruku/maruku-0.7.2.ebuild
+++ b/dev-ruby/maruku/maruku-0.7.2.ebuild
@ -1,43 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="docs/div_syntax.md docs/entity_test.md
 	docs/markdown_syntax.md docs/maruku.md docs/math.md docs/other_stuff.md
 	docs/proposal.md"
 RUBY_FAKEGEM_EXTRAINSTALL="data"
 inherit ruby-fakegem
 DESCRIPTION="A Markdown-superset interpreter written in Ruby"
 HOMEPAGE="https://github.com/bhollis/maruku"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="highlight test"
 ruby_add_bdepend "test? ( dev-ruby/nokogiri-diff )"
 ruby_add_rdepend "highlight? ( dev-ruby/syntax )"
 DEPEND+=" test? ( app-text/blahtexml )"
 all_ruby_prepare() {
 	sed -i -e '/[Ss]imple[Cc]ov/ s:^:#:' spec/spec_helper.rb || die
 }
 pkg_postinst() {
 	elog
 	elog "You need to emerge app-text/texlive and dev-texlive/texlive-latexextra if"
 	elog "you want to use --pdf with Maruku. You may also want to emerge"
 	elog "dev-texlive/texlive-latexrecommended to enable LaTeX syntax highlighting."
 	elog
 }
--- a/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
+++ b/dev-ruby/mocha/mocha-0.10.5-r2.ebuild
@ -20,7 +20,7 @@ HOMEPAGE="http://mocha.rubyforge.org/"
 LICENSE="MIT"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_bdepend "
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@ -1,3 +1,2 @@
 DIST mustache-0.99.5.gem 41472 SHA256 c84be205017ada80aa4d4ad16b7af4bd89f840b26125a0e8eead5a914d279005 SHA512 fa85db8a2d0beea5bac93bf4214db0b65d275b7a01b4a16dbfcab0084d6a7701060d7b7cf090901830fbae2db5caa1973af427396407040053af9966782b55ef WHIRLPOOL 2c8562417ecaf1abe3073ba6a47053692f844e4e66bee7c1ea0893f908dd9f2db304a5d0de5ebe25f6866e312a1a8b6c0dfe1d9cfa5654513cb9578060af1bab
 DIST mustache-1.0.2.gem 40960 SHA256 e79dbc8bae087011ace17bfbc4ee1e652b1d5efa5d56316b09b7c2256f447d34 SHA512 4bc50bf67317e9815b125c25cd94b6c6943b4c7cdeeae3118d29b002279386f00f73a38bfcba9072253cd389634c44a8da9aba775989ab235a444796e4634450 WHIRLPOOL 310359b29b8e9a948c92e9e82045ca7b2f8f01e52c63c13d345bc01c4b3ea5949d3f765d301e9cc209facb59748f459fadb98ac91bc6edfe50f1ba9026ab5f32
 DIST mustache-1.0.3.gem 40960 SHA256 4ed9d389e41c54f000ad33bba6d1939a5685c0a0c3eb02d707fc21bddf6e97ec SHA512 2329a8f63fd025cbf2dee7c8034b0914d5348874775a4df9067a8af9aa566c639dfa7a5fabf63c3f48d520d4b5b901ae47e880e5a85213c253780036e1650255 WHIRLPOOL f52f321004de712ee9a768b64d781cea9180277e1fbbd4a2303b5fa5930027be091a31b4c0d5d1f6cc34c469a499e983e60762f8b51d04a97e94397b7324bd53
--- a/dev-ruby/mustache/mustache-0.99.5.ebuild
+++ b/dev-ruby/mustache/mustache-0.99.5.ebuild
@ -1,38 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20"
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC="man:build"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit multilib ruby-fakegem
 DESCRIPTION="Mustache is a framework-agnostic way to render logic-free views"
 HOMEPAGE="https://mustache.github.com/"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 ruby_add_bdepend "doc? ( app-text/ronn )"
 all_ruby_prepare() {
 	sed -i "s#rake/rdoctask#rdoc/task#" Rakefile || die
 }
 each_ruby_test() {
 	${RUBY} -Ilib:. -e "Dir['test/*.rb'].each{|f| require f}"
 }
 all_ruby_install() {
 	all_fakegem_install
 	doman man/mustache.1 man/mustache.5
 }
--- a/dev-ruby/mustache/mustache-1.0.2.ebuild
+++ b/dev-ruby/mustache/mustache-1.0.2.ebuild
@ -18,7 +18,7 @@ HOMEPAGE="https://mustache.github.com/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 ruby_add_bdepend "doc? ( app-text/ronn )"
--- a/dev-ruby/rest-client/rest-client-1.8.0-r1.ebuild
+++ b/dev-ruby/rest-client/rest-client-1.8.0-r1.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/archiloque/rest-client"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 ruby_add_bdepend "test? ( dev-ruby/webmock )"
--- a/dev-ruby/rest-client/rest-client-1.8.0.ebuild
+++ b/dev-ruby/rest-client/rest-client-1.8.0.ebuild
@ -1,35 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20"
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_EXTRADOC="history.md README.rdoc"
 inherit ruby-fakegem
 DESCRIPTION="Simple Simple HTTP and REST client for Ruby"
 HOMEPAGE="https://github.com/archiloque/rest-client"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE=""
 ruby_add_bdepend "test? ( dev-ruby/webmock )"
 ruby_add_rdepend "
 	>=dev-ruby/http-cookie-1.0.2:0
 	>=dev-ruby/mime-types-1.16
 	>=dev-ruby/netrc-0.7:0"
 all_ruby_prepare() {
 	sed -e '/bundler/I s:^:#:' \
 		-e '/namespace :windows/,/^end/ s:^:#:' -i Rakefile || die
 	# Remove spec that requires network access.
 	rm spec/integration/request_spec.rb || die
 }
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@ -1,4 +1,2 @@
 DIST ruby2ruby-2.1.4.gem 24576 SHA256 355e7d8e3c0e2a846c74aace24dfdb8fe3de01311ade2453735f69b6a3e40bc0 SHA512 e436902cdae8628ce49c676350594c220e86a1c356fc6924d845c7774c0de488349050fcbd9df98cb73ed9c66f770b0bed173486d4fab58dab665991fdbe74c9 WHIRLPOOL aaf261aede3c59c1bfec955c5ad7355991136a3ce984160e8cb5d251003d0817735dc8e08312515301699b95ec36c06fbf6d458ff2921f4ebfd710bd7a4856c9
 DIST ruby2ruby-2.2.0.gem 25088 SHA256 f59a681a26f2f2219eca8340064a913ffd6fa2e6a1f4ebbdb4b8263d4001acce SHA512 d5ca1cab8e83f5fef31c5d471e0285fc17ccd1477ce16717d20581868e99fecb3002ff3d9d000782fa7e00b99f9c647c5cae6a5162dafc9613652e86d756fef3 WHIRLPOOL 2d16f5b4e737d1c860159af39798788a7b9ad603b243ff70191f1fbda544513b0ec4f4340106099a6890f866a4aed41865f56fd5cb4d07561504ffbf27c63311
 DIST ruby2ruby-2.3.0.gem 25088 SHA256 19d9648bebce9eb08f279192ba18a03b9776a29fa527f2654191b4a12daad487 SHA512 82630abf24ddf53b5bbd8f9d399f49b043e6f1c418ec83f1ff5011044d3a7b52864a3c7c5f628a9afb5afcf59f7c5126a413e7743ceb1e03bf623d919af1fbda WHIRLPOOL d1b6cca7d61ba149e91c9c407631adf4bc9985e977ca1141c13fdbf169011e5371bf78e8599a63d6111204f7e39786b751f1aa1592b0893c0a647e7914e26027
 DIST ruby2ruby-2.3.1.gem 25088 SHA256 77c36c6ce3f26c1166782c75110d3c3f70b40c85707d9094ab0ff6ef1ca5e011 SHA512 4b6ca39cc469f44697e2924a1074452a9453d7d809d088d89583040e1743dc49c1d5d92b2b74207ee5862565d6293e9563c698ddd53e18157e06a6f7fae6bad0 WHIRLPOOL b73393251d4a9a652f8ce076b4c37f80197edbb6d0f7898c610383e413f055027c4cb9acb244a05fe46184efea59980d5acb15836b4b0fa0c53166346ae88e55
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.1.4.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.1.4.ebuild
@ -1,32 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20"
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
 inherit ruby-fakegem
 DESCRIPTION="Generates readable ruby from ParseTree"
 HOMEPAGE="http://seattlerb.rubyforge.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 ruby_add_rdepend "
 	dev-ruby/sexp_processor:4
 	>=dev-ruby/ruby_parser-3.1:3
 	!<dev-ruby/ruby2ruby-1.3.1-r1"
 ruby_add_bdepend "doc?  ( dev-ruby/hoe dev-ruby/hoe-seattlerb )
 	test? ( >=dev-ruby/minitest-5.3:5 )"
 all_ruby_prepare() {
 	sed -i -e '/plugin :isolate/ s:^:#:' Rakefile || die
 }
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.2.0.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.2.0.ebuild
@ -1,32 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20 ruby21 ruby22"
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
 inherit ruby-fakegem
 DESCRIPTION="Generates readable ruby from ParseTree"
 HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 ruby_add_rdepend "
 	>=dev-ruby/sexp_processor-4.6.0:4
 	>=dev-ruby/ruby_parser-3.1:3
 	!<dev-ruby/ruby2ruby-1.3.1-r1"
 ruby_add_bdepend "doc?  ( dev-ruby/hoe dev-ruby/hoe-seattlerb )
 	test? ( >=dev-ruby/minitest-5.3:5 )"
 all_ruby_prepare() {
 	sed -i -e '/plugin :isolate/ s:^:#:' Rakefile || die
 }
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@ -1,6 +1,2 @@
 DIST ruby_parser-3.6.6.gem 250880 SHA256 d3a3ff8e472f85d769e848caa94938e5c4a7b5d9df75384056431bade8bd2cf5 SHA512 c28fea8970c6449a59c1fed1cb2fec3cd167d45c622a7d7de85cf22f24238cd91e3fae4c20ff0de4bd0f4c3afdfd1979e16ee73f60104bcc39469d13650be02a WHIRLPOOL fdf8abbb6eb1e2c421704effd574b5d7baa21059267fad53b1a4f9e80f46c76afe65065e7b5753769c06159a6bd8c84453b9d8d3989f91492fefb15a7b5a6a64
 DIST ruby_parser-3.7.2.gem 311296 SHA256 7f639194041e51680b530480990c0ca3632507e3740a8ef4516592550e3037e6 SHA512 52c026ebdcc687059818d42bb0f4c8e960209deb19f86bd3204c6b0bd3e06ffa01e9d628587f88c866756a81914d5b3cb7df2947433eb39d214a4a144c168442 WHIRLPOOL 63b3189f5ac5153aee8ce7ff1c2ae2533199b59db016a1159e80ec31b23b87e08e97a6bff9112533216f2b07d28ab16e52f462921a0779d45d0cb1c79b1e613f
 DIST ruby_parser-3.7.3.gem 311296 SHA256 fdcbe21874bfe584ab329bccbc1fc0c2bde9d3c7d0b076b10de18e645117f1ae SHA512 eeb468111152a80fa047dfebbfb29ea94e4b76fc2c88e49f9094a0bdfd0c4d61bd2831a10a2556d4363e6a46093a8209a3599ce16b8f63b88a29b2d850556c16 WHIRLPOOL 5c6ab80d4a18f8b1533941436ef0ab812069159bac76fac087fbcff583d2f3126f118357a25f84027bf361e4471fdf909af8ce4165728afa2732ed1a91275f54
 DIST ruby_parser-3.8.1.gem 360960 SHA256 bccf48faf69b90f4fcb587c86e3cdf3215a9aa30dbd092f09a4c8033366bcb19 SHA512 43f445f5c04a24c7864b7618622a785fac2998e3c241fa7f7171ebea97d88f966be29cde0dd0b5ada247788c3e34a8d041d99db6d1e03722cf963604c4a3961e WHIRLPOOL bf021dad3071b6d29f25d1c12b3c8ba84e7db927ae6a5bf33a5bbd75651ee0c86903fec674a3225e67727c312e059f5d65b966f4b5e7800af1415d79912fc77b
 DIST ruby_parser-3.8.2.gem 360960 SHA256 0c600cdf79a9d925d8c06b65bbefffba34ce7177520d1545659ce03d252f2173 SHA512 c12f1928dfb18e0f3db1bb9b3f0186b37b4add3e4503050eaed5bb44c25e05a10de7e45ab63c0f2a691f0cafb3dfab6137177e9f73e73633dc84a673667a5e75 WHIRLPOOL 53ab19656d58265e94bacbe99826679aac3b6125670b67beca38e6c63511613670b2d5b53955c772bb8160d4211597a803af1de7c57c3d5c65692edba90ab7fb
 DIST ruby_parser-3.8.3.gem 361472 SHA256 482d5eb7ae48dd054d840fcbbddf162fd8beca6c3e666bb6c8166ab82b872a77 SHA512 1d90d9fcd20b3fcfc0b61da118c3f0d8cbec21ffeb6f4a758c291c188383f3a6d5ee68fc3b421c9040e1490688b96e0f551c3b1d85b65f56af7c056b3611ae03 WHIRLPOOL b9b0dcf4d07608f77abb385e86100c5200ffab2dc545bb7671ea023562a3e368e8eca16b139a50d3bf6e092258daeafda4da185ca8bb3c475be94f2f6daa3684
--- a/dev-ruby/ruby_parser/ruby_parser-3.6.6.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.6.6.ebuild
@ -1,35 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20"
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
 inherit ruby-fakegem
 DESCRIPTION="A ruby parser written in pure ruby"
 HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 LICENSE="MIT"
 SLOT="3"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.1:4
 	!<dev-ruby/ruby_parser-2.3.1-r1"
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-4.3 )"
 all_ruby_prepare() {
 	# Remove reference to perforce method that is not in a released
 	# version of hoe-seattlerb.
 	#sed -i -e '/perforce/d' Rakefile || die
 	sed -i -e '/license/d' Rakefile || die
 	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
 }
--- a/dev-ruby/ruby_parser/ruby_parser-3.7.2.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.7.2.ebuild
@ -1,37 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20 ruby21 ruby22"
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
 inherit ruby-fakegem
 DESCRIPTION="A ruby parser written in pure ruby"
 HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 LICENSE="MIT"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.6.0:4
 	!<dev-ruby/ruby_parser-2.3.1-r1"
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
 ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )"
 DEPEND+=" test? ( dev-util/unifdef )"
 all_ruby_prepare() {
 	# Remove reference to perforce method that is not in a released
 	# version of hoe-seattlerb.
 	#sed -i -e '/perforce/d' Rakefile || die
 	sed -i -e '/license/d' Rakefile || die
 	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
 }
--- a/dev-ruby/ruby_parser/ruby_parser-3.7.3.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.7.3.ebuild
@ -1,37 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
 inherit ruby-fakegem
 DESCRIPTION="A ruby parser written in pure ruby"
 HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 LICENSE="MIT"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.6.1:4
 	!<dev-ruby/ruby_parser-2.3.1-r1"
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
 ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )"
 DEPEND+=" test? ( dev-util/unifdef )"
 all_ruby_prepare() {
 	# Remove reference to perforce method that is not in a released
 	# version of hoe-seattlerb.
 	#sed -i -e '/perforce/d' Rakefile || die
 	sed -i -e '/license/d' Rakefile || die
 	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
 }
--- a/dev-ruby/ruby_parser/ruby_parser-3.8.1.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.8.1.ebuild
@ -1,37 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
 inherit ruby-fakegem
 DESCRIPTION="A ruby parser written in pure ruby"
 HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 LICENSE="MIT"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.7.0:4
 	!<dev-ruby/ruby_parser-2.3.1-r1"
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
 ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 )"
 DEPEND+=" test? ( dev-util/unifdef )"
 all_ruby_prepare() {
 	# Remove reference to perforce method that is not in a released
 	# version of hoe-seattlerb.
 	#sed -i -e '/perforce/d' Rakefile || die
 	sed -i -e '/license/d' Rakefile || die
 	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
 }
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@ -2,3 +2,4 @@ DIST selenium-webdriver-2.53.4.gem 897536 SHA256 44b38d9b6a97b39c7d2aa5185ff9585
 DIST selenium-webdriver-3.0.0.gem 817664 SHA256 a538699a9e01ff75590892cb0efaf617aa5bbc94fb932f6594036be0ae5f6e18 SHA512 b1d6a5489d4282b4a89e67389d44278186a0a5e8974e6997fa2843fd4aa0e5c20cb5d1262df093ab85cfb5d4ff61cf0c694a1d3cc6b4e23589b727c2e79f48b3 WHIRLPOOL 3f7d60548bf3e1ec95ecbd6755db741911771cb6a175d92e0052f2bfc25b3f2517e46debb8a9a923154b4285d8524535377873f5cbcec08316d4929b7478e4bd
 DIST selenium-webdriver-3.0.1.gem 818176 SHA256 bdadc0ccc5e7b62091516d1e1ae419327b5f57909213fc73f02040a75728ed55 SHA512 8d89578fed67aac9707014e825e864eac67c3f05bb5c82cd336d617496a8b84894e3cf1b7bf6838da3be7caa28619b5c4b164fb32b0a8349efa35c4004c7c582 WHIRLPOOL a7db9acadca0af5bb59aef461bc8b663463198abb8fc5ef58fa511885d5eaba5c156f9c552e7b7c1ad9c9e96f3f60f14eb46d77d3cfd6172987ef9526ea85aa9
 DIST selenium-webdriver-3.0.2.gem 818176 SHA256 0ac27b904a16948c69fbd9ba884c8e1bb0171b0c0f75f8042173715ff0ecdb65 SHA512 4ad1853a6eeb460856ec9f6b92a523afe8ad79805b6cce437ec64cd78553f7c7add56d0965077408685451a83f3b11c7bf0be4accd1ee5f8ac708ddc668fb616 WHIRLPOOL 78ea8c39946c7644d129915c31c6320f8e66d6b2c46b99390d92279a90d88621fb393bf7af2ddc68bb6d9f4425f506513fe39fbda13e7e8864e3da979e5da020
 DIST selenium-webdriver-3.0.3.gem 818176 SHA256 39c5515b10866308a9bf00e294b462df66d66f47284ed0da90afac2938206ea1 SHA512 e8d0ba7482fe5c68b662774d127711c3bf9938494c83e7430797dfd996ae1c6cc9a1533ee072a0a86f13d866e8c82668bd7867f2395d477ead7d32886ebcf3d4 WHIRLPOOL ef4cece2306a04b174c41af29290128e98cc16d20462ea030ed860118b7d2590137158ea8f4139e1ab8661490ace8049e3f341e06be3862a187cc89abb5c781a
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.0.3.ebuild
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-3.0.3.ebuild
@ -0,0 +1,39 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 # NOTE: this package contains precompiled code. It appears that all
 # source code can be found at https://code.google.com/p/selenium/ but the
 # repository is not organized in a way so that we can easily rebuild the
 # suited shared object. We'll just try our luck with the precompiled
 # objects for now.
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
 QA_PREBUILT="*/x_ignore_nofocus.so"
 inherit ruby-fakegem
 DESCRIPTION="This gem provides Ruby bindings for WebDriver"
 HOMEPAGE="https://github.com/seleniumhq/selenium"
 LICENSE="Apache-2.0"
 SLOT="3"
 KEYWORDS="~amd64"
 IUSE=""
 ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
 	dev-ruby/rubyzip:1"
 all_ruby_prepare() {
 	# Make websocket a development dependency since it is only needed
 	# for the safari driver which we don't support on Gentoo.
 	sed -i -e '/websocket/,/version_requirements/ s/runtime/development/' ../metadata || die
 }
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@ -1,4 +1 @@
 DIST sexp_processor-4.4.4.gem 38912 SHA256 43cab5a67ca409d62411f869ddb7a0a4de0988b489d3f1d610d9b6e521964fd5 SHA512 b17c2a6a5675a5244a935f4d3024bcb6eadb667a189a406b4f890b29361042a5523df55cdb5ee82e60180eacc5999a163f2e88a0b70113aa42aa50cffbdfe1e2 WHIRLPOOL 01d7193d6e3c74d517f108b8aa778fcbd701987d20ee503ae9947ce60a0b3824d1dfae2ca6a0bd4f7b314cfa8c22fb347db0b6fef218833a022f2aec351d37fb
 DIST sexp_processor-4.6.0.gem 39424 SHA256 e2498f90c75bd4c19d1739afadde8c03af26a881c8bd775f71d2f180de65b43f SHA512 48c96a826472029f22e46138831ee9952250e747b9b5e2637d348ae4cba08d4097c88148457d4215e264c556595da44cb7aad8612642a3e49d68888b6d2e0363 WHIRLPOOL 5fd40d5813d957dd304eb3b697b780db23aab24be096fb25fd4448f6b069424f045e3de20d9e5f315901b1bef039371c797377fb5ac837c21204431ca1c77a18
 DIST sexp_processor-4.6.1.gem 39424 SHA256 e2e96c2ee3ea81e1dc7b4b4abee23b6e552e669cfe456ee69126a29a03373cd7 SHA512 25513e71e30c0ded46201d81e454ab628054c2380c4b9715d6b05cf08703ce3cc31e7d127514f2abc12d875d0d53791740b728922f91b85ba579931799de09d7 WHIRLPOOL 6cd94d615eec3858e2fcb920526438a9d6a6c4509da48369812fb5235e62814be6a7fbe63b9c392287938127f00900ec89638173a5b64b85a1f8bc6ac9e80d8a
 DIST sexp_processor-4.7.0.gem 39424 SHA256 963a1f5b21c95595fb3cf1e8531784bf3d8fe30302cf6f271b08aefdc63e453f SHA512 6c48853f2eaca37bcddb097f6677d37835171618e4209d07baa1f361d4cdf4ce95a11f892b6b258cd91e51555aa046c404d8970560618b4e8a86fd0d6dca71c7 WHIRLPOOL cad0c31e6aace9066be2d400d392206c7b9f71b2fbdbe072d0a1d98e241acc15f79c0992d45cffc261284f751d1b5046380254b0f050f62fbdad0132437e3b8a
--- a/dev-ruby/sexp_processor/sexp_processor-4.4.4.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.4.4.ebuild
@ -1,28 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
 inherit ruby-fakegem
 DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
 HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_bdepend "
 	test? (
 		dev-ruby/hoe
 		dev-ruby/hoe-seattlerb
 		dev-ruby/minitest
 	)"
--- a/dev-ruby/sexp_processor/sexp_processor-4.6.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.6.0.ebuild
@ -1,28 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20 ruby21 ruby22"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
 inherit ruby-fakegem
 DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
 HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_bdepend "
 	test? (
 		>=dev-ruby/hoe-3.13
 		dev-ruby/hoe-seattlerb
 		>=dev-ruby/minitest-5.5
 	)"
--- a/dev-ruby/sexp_processor/sexp_processor-4.6.1.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.6.1.ebuild
@ -1,28 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
 inherit ruby-fakegem
 DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
 HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_bdepend "
 	test? (
 		>=dev-ruby/hoe-3.13
 		dev-ruby/hoe-seattlerb
 		>=dev-ruby/minitest-5.5
 	)"
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@ -1,2 +1,3 @@
 DIST Gauche-0.9.3.3.tgz 5042189 SHA256 3d8b70075faa0f7a24f8d112cc102ee3e1066680cdd19d324d59f33fab79caac SHA512 5743781d88454d579d853a50c5c7651c52bdcea8b7b2130408e1c7761cee73edfdebaf258342e837ef7d5a3886e08bbb33b2862d1e19585f519ada5cb7475d1c WHIRLPOOL 7b11d62dc3917c3559897833da1248a3f54644159465df0d628fc5b761773ff59740231f57a7add62f2d0b03952f4f18daaf1be7598940d3b0a4719db2c767ab
 DIST Gauche-0.9.4.tgz 5601987 SHA256 7b18bcd70beaced1e004594be46c8cff95795318f6f5830dd2a8a700410fc149 SHA512 815e719d78950a31c238fd7879e09f40d6b3a83a3ebf9d5f7cd3cc7ada081e5f20fbc6b432900e3455bc59e5e60014bf77605b8c9c5f27def53f89284b9cfca3 WHIRLPOOL 354ef81913c6f617589590299f616a50dc1e1313e00d61f0918c9b6c20c0358878cd505f3fb02efa4615730380a6db6bd790e241871fde6cd6e11a662efb113c
 DIST Gauche-0.9.5.tgz 6458675 SHA256 4c8a53213de112708bbda5fa9648c21497d43ebf809ed5b32b15f21266b4e73c SHA512 6d853d734c7a56a86f0015b1bfef378803d6acc1e0405ed841eab5afc08d1edef736d85df10c86d75fd5fb6b2def684bb1f2095a019133b9f497192f5511197a WHIRLPOOL b29a81a920fac514866dd4a4e2911f2336d37b84ef3b9b3f50a5386f01dacea05580799ff7941e58ba4e29a9eac9289ca5037cd1b49d28a1b05e5bb2a892a907
--- a/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch
+++ b/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch
@ -0,0 +1,25 @@
 commit da2ea76503e8f1784d0f0be26435d4c8e0d1b12f
 Author: Shiro Kawai <shiro@acm.org>
 Date:   Sat Oct 15 11:44:28 2016 -1000
    Avoid preprocessor symbols redefinition on OpenBSD
    https://sourceforge.net/p/gauche/mailman/message/35429549/
 diff --git a/ext/net/gauche-net.h b/ext/net/gauche-net.h
 index d4f1dcd..decba64 100644
 --- a/ext/net/gauche-net.h
 +++ b/ext/net/gauche-net.h
@@ -362,8 +362,12 @@ extern ScmObj Scm_GetAddrinfo(const char *nodename,
                               struct addrinfo *hints);
 extern ScmObj Scm_GetNameinfo(ScmSockAddr *addr, int flags);
 +#ifndef NI_MAXHOST
 #define NI_MAXHOST  1025
 +#endif
 +#ifndef NI_MAXSERV
 #define NI_MAXSERV    32
 +#endif
 #endif /* HAVE_IPV6 */
--- a/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch
+++ b/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch
@ -0,0 +1,19 @@
 commit c26a4836e767807dd8c98d280c4d9e742b759edd
 Author: Shiro Kawai <shiro@acm.org>
 Date:   Sun Oct 9 02:04:19 2016 -1000
    rfc.tls - Detect LibreSSL as well
 diff --git a/ext/tls/test.scm b/ext/tls/test.scm
 index 63a1d04..efbfbca 100644
 --- a/ext/tls/test.scm
 +++ b/ext/tls/test.scm
@@ -37,7 +37,7 @@
      [(not gauche.os.windows)
       (guard (e [(<process-abnormal-exit> e)
                  (no-openssl "couldn't run openssl command")])
 -        (if-let1 m ($ #/OpenSSL\s+([\d\.]+\w*)/
 +        (if-let1 m ($ #/(?:OpenSSL|LibreSSL)\s+([\d\.]+\w*)/
                       $ process-output->string `(,openssl-cmd "version"))
           (let1 vers (m 1)
             (unless (version>=? vers "1.0.1")
--- a/dev-scheme/gauche/files/gauche-0.9.5-main.patch
+++ b/dev-scheme/gauche/files/gauche-0.9.5-main.patch
@ -0,0 +1,116 @@
 commit 97196adb9dab30e7ab610daf4cc486bfc01ed403
 Author: Shiro Kawai <shiro@acm.org>
 Date:   Mon Oct 17 11:00:44 2016 -1000
    Fix main.c to call 'main' proc properly
    https://github.com/shirok/Gauche/issues/244
 diff --git a/src/core.c b/src/core.c
 index 923d116..fc01211 100644
 --- a/src/core.c
 +++ b/src/core.c
@@ -653,9 +653,14 @@ void Scm_SimpleMain(int argc, const char *argv[],
     ScmModule *user = Scm_UserModule();
     ScmObj mainproc = Scm_GlobalVariableRef(user, SCM_SYMBOL(SCM_INTERN("main")), 0);
     if (SCM_PROCEDUREP(mainproc)) {
 -        ScmObj r = Scm_ApplyRec1(mainproc, args);
 -        if (SCM_INTP(r)) Scm_Exit(SCM_INT_VALUE(r));
 -        else             Scm_Exit(70);
 +        static ScmObj run_main_proc = SCM_UNDEFINED;
 +        SCM_BIND_PROC(run_main_proc, "run-main", Scm_GaucheInternalModule());
 +        SCM_ASSERT(SCM_PROCEDUREP(run_main_proc));
 +
 +        ScmEvalPacket epak;
 +        int r = Scm_Apply(run_main_proc, SCM_LIST2(mainproc, args), &epak);
 +        SCM_ASSERT(r == 1 && SCM_INTP(epak.results[0]));
 +        Scm_Exit(SCM_INT_VALUE(epak.results[0]));
     } else {
         Scm_Exit(70);
     }
 diff --git a/src/libeval.scm b/src/libeval.scm
 index 2a2c1fc..279fd7f 100644
 --- a/src/libeval.scm
 +++ b/src/libeval.scm
@@ -370,6 +370,17 @@
        (loop1)))))
 ;;;
 +;;; Kick 'main' procedure
 +;;;   Returns an integer suitable for the exit code.
 +;;;   This is mainly to display proper stack trace in case 'main'
 +;;;   raises an error.
 +(select-module gauche.internal)
 +(define (run-main main args)
 +  (guard (e [else (report-error e) 70])
 +    (let1 r (main args)
 +      (if (fixnum? r) r 70))))
 +
 +;;;
 ;;; Macros
 ;;;
 diff --git a/src/main.c b/src/main.c
 index 46223a6..55660c9 100644
 --- a/src/main.c
 +++ b/src/main.c
@@ -502,22 +502,14 @@ int execute_script(const char *scriptfile, ScmObj args)
                                          SCM_BINDING_STAY_IN_MODULE);
     }
     if (SCM_PROCEDUREP(mainproc)) {
 -#if 0 /* Temporarily turned off due to the bug that loses stack traces. */
 +        static ScmObj run_main_proc = SCM_UNDEFINED;
 +        SCM_BIND_PROC(run_main_proc, "run-main", Scm_GaucheInternalModule());
 +        SCM_ASSERT(SCM_PROCEDUREP(run_main_proc));
 +        
         ScmEvalPacket epak;
 -        int r = Scm_Apply(mainproc, SCM_LIST1(args), &epak);
 -        if (r > 0) {
 -            ScmObj res = epak.results[0];
 -            if (SCM_INTP(res)) return SCM_INT_VALUE(res);
 -            else return 70;  /* EX_SOFTWARE, see SRFI-22. */
 -        } else {
 -            Scm_ReportError(epak.exception);
 -            return 70;  /* EX_SOFTWARE, see SRFI-22. */
 -        }
 -#else
 -        ScmObj r = Scm_ApplyRec1(mainproc, args);
 -        if (SCM_INTP(r)) return SCM_INT_VALUE(r);
 -        else             return 70;
 -#endif
 +        int r = Scm_Apply(run_main_proc, SCM_LIST2(mainproc, args), &epak);
 +        SCM_ASSERT(r == 1 && SCM_INTP(epak.results[0]));
 +        return SCM_INT_VALUE(epak.results[0]);
     }
     return 0;
 }
 diff --git a/test/scripts.scm b/test/scripts.scm
 index 44bb44b..4e6777b 100644
 --- a/test/scripts.scm
 +++ b/test/scripts.scm
@@ -58,6 +58,25 @@
              (process-output->string '("./gosh" "-ftest" "test.o")))
          (delete-files "test.o")))
 +;; This caused assertion failure in 0.9.5, because 'main' was called
 +;; via Scm_ApplyRec without base VM running.
 +;; See https://github.com/shirok/Gauche/issues/244
 +(test* "proper error handling of 'main'" "ok"
 +       (unwind-protect
 +           (begin
 +             (delete-files "test.o")
 +             (with-output-to-file "test.o"
 +               (^[]
 +                 (write
 +                  '(use gauche.partcont))
 +                 (write
 +                  '(define (main args)
 +                     (reset (shift k (call-with-input-file "gauche.h" k)))
 +                     (print 'ok)
 +                     0))))
 +             (process-output->string '("./gosh" "-ftest" "test.o")))
 +         (delete-files "test.o")))
 +
 ;;=======================================================================
 (test-section "gauche-config")
--- a/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch
+++ b/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch
@ -0,0 +1,19 @@
 commit d31eb5c02b65514e695b45c0c01cbd45a36bac4a
 Author: OOHASHI Daichi <dico.leque.comicron@gmail.com>
 Date:   Thu Oct 20 10:48:17 2016 +0900
    (char-general-category #\x20000) should be Lo
 diff --git a/src/gauche/char_utf_8.h b/src/gauche/char_utf_8.h
 index 082e764..5f92d13 100644
 --- a/src/gauche/char_utf_8.h
 +++ b/src/gauche/char_utf_8.h
@@ -294,7 +294,7 @@ static inline unsigned char Scm__LookupCharCategory(ScmChar ch)
 {
     if (ch == SCM_CHAR_INVALID || ch >= 0x10ffff) {
         return SCM_CHAR_CATEGORY_Cn;
 -    } else if (ch <= 0x20000) {
 +    } else if (ch < 0x20000) {
         return ucs_general_category_00000[ch];
     } else {
         return ucs_general_category_20000(ch);
--- a/dev-scheme/gauche/files/gauche-ext-ldflags.patch
+++ b/dev-scheme/gauche/files/gauche-ext-ldflags.patch
@ -0,0 +1,11 @@
 --- a/ext/Makefile.ext.in
 +++ b/ext/Makefile.ext.in
@@ -22,7 +22,7 @@
 LIBS         = $(XLIBS) @LIBS@ 
 CFLAGS       = @CFLAGS@ @SHLIB_SO_CFLAGS@ $(XCFLAGS)
 CPPFLAGS     = @CPPFLAGS@ $(XCPPFLAGS)
 -LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @SHLIB_SO_LDFLAGS@
 +LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @LDFLAGS@ @SHLIB_SO_LDFLAGS@
 # These are set by configure
 DEFS     = @DEFS@
--- a/dev-scheme/gauche/files/gauche-gauche.m4.patch
+++ b/dev-scheme/gauche/files/gauche-gauche.m4.patch
@ -0,0 +1,18 @@
 --- a/m4/gauche.m4
 +++ b/m4/gauche.m4
@@ -103,13 +103,10 @@
   AS_CASE(["$target"],
 	  [i686-*], [I686OPT="-DUSE_I686_PREFETCH"])
   AS_CASE(["$CC"],
 -	  [gcc*], [ dnl some systems may have gcc-2.95, gcc-3, etc.
 +	  [*gcc*], [ dnl some systems may have gcc-2.95, gcc-3, etc.
 		  AS_CASE(["$target"],
 			  [*mingw*], [],
 -				     [GCCOPT="-fomit-frame-pointer"])
 -		  AS_CASE(["$target"],
 -			  [i586-*], [GCCOPT="$GCCOPT -march=i586"],
 -			  [i686-*], [GCCOPT="$GCCOPT -march=i686"])])])
 +				     [GCCOPT="-fomit-frame-pointer"])])])
 OPTFLAGS="$GCCOPT $I686OPT"
 AC_SUBST(OPTFLAGS)
 ])
--- a/dev-scheme/gauche/files/gauche-rfc.tls.patch
+++ b/dev-scheme/gauche/files/gauche-rfc.tls.patch
@ -0,0 +1,12 @@
 --- a/ext/tls/ssltest-mod.scm
 +++ b/ext/tls/ssltest-mod.scm
@@ -53,7 +53,8 @@
      ($ format #t "~a\n" $ regexp-replace-all* line
         #/\.\.\/ssl\// srcpath-replace
         #/openssl /    kicker-replace
 -        #/system/      "safe_system")))
 +        #/system/      "safe_system"
 +        #/(s_server) / "\\1 -4 ")))
   (p "#include <errno.h>"
      "int safe_system(const char *commands)"
--- a/dev-scheme/gauche/files/gauche-rpath.patch
+++ b/dev-scheme/gauche/files/gauche-rpath.patch
@ -0,0 +1,10 @@
 --- a/configure.ac
 +++ b/configure.ac
@@ -709,7 +709,6 @@
   fi
   if test "$RPATH_FLAG" != ""; then
     RPATH_TMP=$RPATH_FLAG'`pwd`'
 -    RPATH_REAL=$RPATH_FLAG'$(LIB_INSTALL_DIR)'
   fi
 fi
 AC_SUBST(RPATH_FLAG)
--- a/dev-scheme/gauche/files/gauche-xz-info.patch
+++ b/dev-scheme/gauche/files/gauche-xz-info.patch
@ -0,0 +1,31 @@
 --- a/lib/gauche/interactive/info.scm
 +++ b/lib/gauche/interactive/info.scm
@@ -137,7 +137,8 @@
                             :paths paths
                             :pred (^p (or (file-is-readable? p)
                                           (file-is-readable? #"~|p|.gz")
 -                                          (file-is-readable? #"~|p|.bz2"))))
 +                                          (file-is-readable? #"~|p|.bz2")
 +                                          (file-is-readable? #"~|p|.xz"))))
         (errorf "couldn't find info file ~s in paths: ~s" *info-file* paths))
     ))
 --- a/lib/text/info.scm
 +++ b/lib/text/info.scm
@@ -64,6 +64,7 @@
 ;; Find bzip2 location
 (define bzip2  (find-file-in-paths "bzip2"))
 +(define xz     (find-file-in-paths "xz"))
 ;; Read an info file FILE, and returns a list of strings splitted by ^_ (#\u001f)
 ;; If FILE is not found, look for compressed one.
@@ -78,6 +79,8 @@
                      (close-input-port zp)))))]
           [(and bzip2 (file-exists? #"~|file|.bz2"))
            (with-input-from-process #"~bzip2 -c -d ~|file|.bz2" thunk)]
 +          [(and xz (file-exists? #"~|file|.xz"))
 +           (with-input-from-process #"~xz -c -d ~|file|.xz" thunk)]
           [else (error "can't find info file" file)]))
   (with-input-from-info
    (lambda ()
--- a/dev-scheme/gauche/gauche-0.9.3.3.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.3.3.ebuild
@ -2,12 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="6"
 inherit autotools eutils
-# Switch to ^g when we switch to EAPI=6.
+MY_P="${P^g}"
 MY_P="G${P:1}"
 DESCRIPTION="A Unix system friendly Scheme Interpreter"
 HOMEPAGE="http://practical-scheme.net/gauche/"
--- a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
@ -2,12 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="6"
 inherit autotools eutils
-# Switch to ^g when we switch to EAPI=6.
+MY_P="${P^g}"
 MY_P="G${P:1}"
 DESCRIPTION="A Unix system friendly Scheme Interpreter"
 HOMEPAGE="http://practical-scheme.net/gauche/"
--- a/dev-scheme/gauche/gauche-0.9.5.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.5.ebuild
@ -0,0 +1,59 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI="6"
 inherit autotools eutils
 MY_P="${P^g}"
 DESCRIPTION="A Unix system friendly Scheme Interpreter"
 HOMEPAGE="http://practical-scheme.net/gauche/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="ipv6 libressl test"
 RDEPEND="sys-libs/gdbm"
 DEPEND="${RDEPEND}
 	test? (
 		!libressl? ( dev-libs/openssl:0 )
 		libressl? ( dev-libs/libressl )
 	)"
 S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-rpath.patch
 	epatch "${FILESDIR}"/${PN}-gauche.m4.patch
 	epatch "${FILESDIR}"/${PN}-ext-ldflags.patch
 	epatch "${FILESDIR}"/${PN}-xz-info.patch
 	epatch "${FILESDIR}"/${PN}-rfc.tls.patch
 	epatch "${FILESDIR}"/${P}-libressl.patch
 	epatch "${FILESDIR}"/${P}-bsd.patch
 	epatch "${FILESDIR}"/${P}-main.patch
 	epatch "${FILESDIR}"/${P}-unicode.patch
 	eapply_user
 	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
 	eautoconf
 }
 src_configure() {
 	econf \
 		$(use_enable ipv6) \
 		--with-libatomic-ops=no \
 		--with-slib="${EPREFIX}"/usr/share/slib
 }
 src_test() {
 	emake -j1 -s check
 }
 src_install() {
 	emake DESTDIR="${D}" install-pkg install-doc
 	dodoc AUTHORS ChangeLog HACKING README
 }
--- a/dev-vcs/mercurial/mercurial-3.8.4.ebuild
+++ b/dev-vcs/mercurial/mercurial-3.8.4.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bugzilla emacs gpg test tk"
 RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
--- a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r1.ebuild
+++ b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r1.ebuild
@ -1,121 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 WX_GTK_VER=2.8
 AUTOTOOLS_AUTORECONF=true
 inherit autotools-utils fdo-mime flag-o-matic multilib python-single-r1 versionator wxwidgets
 MY_PV=$(get_version_component_range 1-2)
 MY_REL="1"
 DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system"
 HOMEPAGE="http://rapidsvn.tigris.org/"
 SRC_URI="
 	http://www.rapidsvn.org/download/release/${PV}/${P}.tar.gz
 	doc? ( https://dev.gentoo.org/~jlec/distfiles/svncpp.dox.xz )"
 LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON_DEP="
 	${PYTHON_DEPS}
 	dev-libs/apr
 	dev-libs/apr-util
 	dev-vcs/subversion
 	x11-libs/wxGTK:${WX_GTK_VER}[X]"
 DEPEND="${COMMON_DEP}
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-sgml-utils
 		app-doc/doxygen
 		app-text/docbook-xsl-stylesheets
 		media-gfx/graphviz
 )"
 RDEPEND="${COMMON_DEP}"
 PATCHES=(
 	"${FILESDIR}/${P}-svncpp_link.patch"
 	"${FILESDIR}/${P}-locale.patch" )
 AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=( HACKING.txt TRANSLATIONS )
 src_prepare() {
 	if use doc; then
 		mv "${WORKDIR}"/svncpp.dox doc/svncpp/ || die
 	fi
 	strip-linguas $(grep ^RAPIDSVN_LANGUAGES src/locale/Makefile.am | sed 's:RAPIDSVN_LANGUAGES=::g')
 	sed \
 		-e "/^RAPIDSVN_LANGUAGES/s:=.*:=${LINGUAS}:g" \
 		-i src/locale/Makefile.am || die
 	autotools-utils_src_prepare
 }
 src_configure() {
 	local myeconfargs=( --with-wx-config=${WX_CONFIG} )
 	if use doc; then
 		myeconfargs+=( --with-manpage=yes )
 	else
 		myeconfargs+=(
 				--without-xsltproc
 				--with-manpage=no
 				--without-doxygen
 				--without-dot )
 	fi
 	append-cppflags $( apr-1-config --cppflags )
 	myeconfargs+=(
 		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
 		--with-svn-include="${EPREFIX}"/usr/include
 		--with-apr-config="${EPREFIX}/usr/bin/apr-1-config"
 		--with-apu-config="${EPREFIX}/usr/bin/apu-1-config"
 		)
 	autotools-utils_src_configure
 }
 src_compile() {
 	autotools-utils_src_compile
 	use doc && autotools-utils_src_compile -C doc/manpage manpage
 }
 src_install() {
 	autotools-utils_src_install
 	doicon src/res/rapidsvn.ico src/res/bitmaps/${PN}*.png
 	make_desktop_entry rapidsvn "RapidSVN ${PV}" \
 		"${EPREFIX}/usr/share/pixmaps/rapidsvn_32x32.png" \
 		"RevisionControl;Development"
 	if use doc ; then
 		doman doc/manpage/${PN}.1
 		dohtml "${S}"/doc/svncpp/html/*
 	fi
 }
 src_test() {
 	pushd "${BUILD_DIR}"/src/tests/svncpp > /dev/null || die
 	emake
 	./svncpptest | grep OK || die
 }
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 }
 pkg_postrm() {
 	fdo-mime_desktop_database_update
 }
--- a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r2.ebuild
+++ b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r2.ebuild
@ -1,126 +0,0 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 WX_GTK_VER=3.0
 AUTOTOOLS_AUTORECONF=true
 inherit autotools-utils fdo-mime flag-o-matic multilib python-single-r1 versionator wxwidgets
 MY_PV=$(get_version_component_range 1-2)
 MY_REL="1"
 DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system"
 HOMEPAGE="http://rapidsvn.tigris.org/"
 SRC_URI="
 	http://www.rapidsvn.org/download/release/${PV}/${P}.tar.gz
 	doc? ( https://dev.gentoo.org/~jlec/distfiles/svncpp.dox.xz )"
 LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc static-libs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON_DEP="
 	${PYTHON_DEPS}
 	dev-libs/apr
 	dev-libs/apr-util
 	dev-vcs/subversion
 	x11-libs/wxGTK:${WX_GTK_VER}[X]"
 DEPEND="${COMMON_DEP}
 	doc? (
 		dev-libs/libxslt
 		app-text/docbook-sgml-utils
 		app-doc/doxygen
 		app-text/docbook-xsl-stylesheets
 		media-gfx/graphviz
 )"
 RDEPEND="${COMMON_DEP}"
 PATCHES=(
 	"${FILESDIR}/${P}-svncpp_link.patch"
 	"${FILESDIR}/${P}-locale.patch"
 	"${FILESDIR}/${P}-wx3.0.patch" )
 AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=( HACKING.txt TRANSLATIONS )
 src_prepare() {
 	need-wxwidgets unicode
 	if use doc; then
 		mv "${WORKDIR}"/svncpp.dox doc/svncpp/ || die
 	fi
 	strip-linguas $(grep ^RAPIDSVN_LANGUAGES src/locale/Makefile.am | sed 's:RAPIDSVN_LANGUAGES=::g')
 	sed \
 		-e "/^RAPIDSVN_LANGUAGES/s:=.*:=${LINGUAS}:g" \
 		-i src/locale/Makefile.am || die
 	mv configure.in configure.ac || die
 	autotools-utils_src_prepare
 }
 src_configure() {
 	local myeconfargs=( --with-wx-config=${WX_CONFIG} )
 	if use doc; then
 		myeconfargs+=( --with-manpage=yes )
 	else
 		myeconfargs+=(
 				--without-xsltproc
 				--with-manpage=no
 				--without-doxygen
 				--without-dot )
 	fi
 	append-cppflags $( apr-1-config --cppflags )
 	myeconfargs+=(
 		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
 		--with-svn-include="${EPREFIX}"/usr/include
 		--with-apr-config="${EPREFIX}/usr/bin/apr-1-config"
 		--with-apu-config="${EPREFIX}/usr/bin/apu-1-config"
 		)
 	autotools-utils_src_configure
 }
 src_compile() {
 	autotools-utils_src_compile
 	use doc && autotools-utils_src_compile -C doc/manpage manpage
 }
 src_install() {
 	autotools-utils_src_install
 	doicon src/res/rapidsvn.ico src/res/bitmaps/${PN}*.png
 	make_desktop_entry rapidsvn "RapidSVN ${PV}" \
 		"${EPREFIX}/usr/share/pixmaps/rapidsvn_32x32.png" \
 		"RevisionControl;Development"
 	if use doc ; then
 		doman doc/manpage/${PN}.1
 		dohtml "${S}"/doc/svncpp/html/*
 	fi
 }
 src_test() {
 	pushd "${BUILD_DIR}"/src/tests/svncpp > /dev/null || die
 	emake
 	./svncpptest | grep OK || die
 }
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 }
 pkg_postrm() {
 	fdo-mime_desktop_database_update
 }
--- a/dev-vcs/tig/files/tig-2.2.1-tinfo.patch
+++ b/dev-vcs/tig/files/tig-2.2.1-tinfo.patch
@ -1,15 +1,32 @@
-commit 585e5d60fb85eff2e7709d63d80c320049393694
+From 5eee0216193ef9e6ca39906aeeb7b7774097a2f7 Mon Sep 17 00:00:00 2001
-Author: Justin Lecher <jlec@gentoo.org>
+From: Justin Lecher <jlec@gentoo.org>
-Date:   Sat Nov 26 12:55:42 2016 +0100
+Date: Sat, 26 Nov 2016 12:55:42 +0100
 Subject: [PATCH] Use pkg-config to detect ncurses
-    Update ax_with_curses.m4 to support pkg-config
+Update ax_with_curses.m4 to latest version and use pkg-config as primary
-    
+detection mechanism for ncurses. Latest version of ax_with_curses.m4
-    Latest version of ax_with_curses.m4 supports pkg-config. This is important
+supports pkg-config. This is important as libcurses is split into
-    as libcurses is split into libcurses.so and libtinfo.so on many distros
+libcurses.so and libtinfo.so on many distros and linking against
-    and linking against libcurses.so is not sufficiant. Pkg-config allows
+libcurses.so is not sufficiant. Pkg-config allows proper detection of
-    proper detection of necessary libs.
+necessary libs.
-    
+
-    Signed-off-by: Justin Lecher <jlec@gentoo.org>
+Signed-off-by: Justin Lecher <jlec@gentoo.org>
 Also include ax_require_defined.m4 to fix issue with undefined macro:
    configure:3751: error: possibly undefined macro: AX_REQUIRE_DEFINED
          If this token and others are legitimate, please use m4_pattern_allow.
          See the Autoconf documentation.
    configure:3751: error: possibly undefined macro: PKG_CHECK_EXISTS
 Signed-off-by: Jonas Fonseca <jonas.fonseca@gmail.com>
 ---
 config.make.in              |   2 +-
 configure.ac                |   2 +-
 tools/ax_require_defined.m4 |  37 ++++++++++++
 tools/ax_with_curses.m4     | 142 ++++++++++++++++++++++++++++++++------------
 4 files changed, 142 insertions(+), 41 deletions(-)
 create mode 100644 tools/ax_require_defined.m4
 diff --git a/config.make.in b/config.make.in
 index bf41d85..a7c9ce3 100644
@ -25,42 +42,61 @@ index bf41d85..a7c9ce3 100644
 ASCIIDOC = @ASCIIDOC@
 XMLTO = @XMLTO@
 diff --git a/configure.ac b/configure.ac
-index 0bcfb3f..d58e2f2 100644
+index 0bcfb3f..8b956ba 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -21,15 +21,23 @@ AC_CHECK_FUNCS([mkstemps], [AC_SUBST([NO_MKSTEMPS], ["#"])])
+@@ -29,7 +29,7 @@ case "$ax_cv_ncursesw" in "no")
- AC_CHECK_FUNCS([setenv], [AC_SUBST([NO_SETENV], ["#"])])
+ 	AC_MSG_WARN([The found ncurses library does not support wide-char.])
- AC_CHECK_FUNCS([strndup], [AC_SUBST([NO_STRNDUP], ["#"])])
+ 	AC_MSG_WARN([This means that tig will not correctly render UTF-8.])
- 
+ esac
 -AX_WITH_CURSES
 -case "$ax_cv_ncurses" in "no")
 -	AC_MSG_ERROR([ncurses not found])
 -esac
 -case "$ax_cv_ncursesw" in "no")
 -	AC_MSG_WARN([The found ncurses library does not support wide-char.])
 -	AC_MSG_WARN([This means that tig will not correctly render UTF-8.])
 -esac
 -AC_SUBST(CURSES_LIB)
-+PKG_CHECK_MODULES([CURSES], [ncursesw],
+AC_SUBST(CURSES_LIBS)
 +	[AC_SUBST(CURSES_LIBS)], [
 +	PKG_CHECK_MODULES([CURSES], [ncurses],
 +		[AC_SUBST(CURSES_LIBS)
 +		AC_MSG_WARN([The found ncurses library does not support wide-char.])
 +		AC_MSG_WARN([This means that tig will not correctly render UTF-8.])],[
 +			AX_WITH_CURSES
 +			case "$ax_cv_ncurses" in "no")
 +				AC_MSG_ERROR([ncurses not found])
 +			esac
 +			case "$ax_cv_ncursesw" in "no")
 +				AC_MSG_WARN([The found ncurses library does not support wide-char.])
 +				AC_MSG_WARN([This means that tig will not correctly render UTF-8.])
 +			esac
 +			AC_SUBST(CURSES_LIBS)
 +		])
 +	])
 AX_LIB_READLINE(6.2)
 diff --git a/tools/ax_require_defined.m4 b/tools/ax_require_defined.m4
 new file mode 100644
 index 0000000..cae1111
 --- /dev/null
 +++ b/tools/ax_require_defined.m4
@@ -0,0 +1,37 @@
 +# ===========================================================================
 +#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
 +# ===========================================================================
 +#
 +# SYNOPSIS
 +#
 +#   AX_REQUIRE_DEFINED(MACRO)
 +#
 +# DESCRIPTION
 +#
 +#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
 +#   been defined and thus are available for use.  This avoids random issues
 +#   where a macro isn't expanded.  Instead the configure script emits a
 +#   non-fatal:
 +#
 +#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
 +#
 +#   It's like AC_REQUIRE except it doesn't expand the required macro.
 +#
 +#   Here's an example:
 +#
 +#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
 +#
 +# LICENSE
 +#
 +#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
 +#
 +#   Copying and distribution of this file, with or without modification, are
 +#   permitted in any medium without royalty provided the copyright notice
 +#   and this notice are preserved. This file is offered as-is, without any
 +#   warranty.
 +
 +#serial 1
 +
 +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
 +  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
 +])dnl AX_REQUIRE_DEFINED
 diff --git a/tools/ax_with_curses.m4 b/tools/ax_with_curses.m4
 index 33a37ac..9461eef 100644
 --- a/tools/ax_with_curses.m4
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@ -517,22 +517,22 @@ enable_cmake-utils_src_configure() {
 		includes="<INCLUDES>"
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die
 		SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
 		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
 		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
 		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
 		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
 		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
 		SET (PKG_CONFIG_EXECUTABLE $(type -P $(tc-getPKG_CONFIG)) CACHE FILEPATH "pkg-config executable" FORCE)
 	_EOF_
 	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
 	cat > ${toolchain_file} <<- _EOF_ || die
-		SET (CMAKE_C_COMPILER $(tc-getCC))
+		SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
-		SET (CMAKE_CXX_COMPILER $(tc-getCXX))
+		SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
 		SET (CMAKE_Fortran_COMPILER $(tc-getFC))
 	_EOF_
 	# Bug 542530, export those instead of setting paths in toolchain file
 	local -x CC=$(tc-getCC) CXX=$(tc-getCXX) FC=$(tc-getFC)
 	local -x PKG_CONFIG=$(tc-getPKG_CONFIG)
 	if tc-is-cross-compiler; then
 		local sysname
 		case "${KERNEL:-linux}" in
--- a/games-board/pychess/Manifest
+++ b/games-board/pychess/Manifest
@ -1,2 +1,2 @@
 DIST pychess-0.10.1.tar.gz 1939605 SHA256 8a8ac9fc6a4605d189a9728f55183130b6a304cbf2dc5b2e923297303fe4ae8a SHA512 1000c840954b93bd3720fd3265b6cc0ac33df22373eb965d4ac03d16f7589af3b10bf2ebc28a2ff555b5e4101bffbfe96d52051e6c51a084229a3cc1691f1dd8 WHIRLPOOL 7554456eea487cefe3d8303aacdfa5748345b9682a8c557a2ed53090cc9a5beacc5b2e874db222b75fc03bcaf61dd9d7c3e2df23a13a4db820d4bd34c2f7b66e
 DIST pychess-0.12.3.tar.gz 4666113 SHA256 11d5e2d447bb945283f0239a407d8069b13afd77d3a2d491c9c352f1b7862e67 SHA512 597fd4c28a970df0d2ce3805eedd7530e259c1b60dd4e51bf1c56eb2376fe6256df30f12b077db3c9f1aab8baed06f023696827b57fb0963b9569b613656d4af WHIRLPOOL 295bf01c221b273abc2a60cdfd77a399af75a2e9f2de43188ea744204dad39220f152d7667699290d88b7dd75b26b5262b513f8ab6a114bb171a702ba184319b
 DIST pychess-0.12.4.tar.gz 4728410 SHA256 0706861dcea811abb80c8db589494e932b4bab931b2a8799fe53a2bd4b6ac372 SHA512 bf2a6cffca50742fbdfba04bc33807b53e4b7485cb6c9b6bb84816e176fd99f3929dbc8e504b46053cdcd30f691d6df948f5153508b2b6d3504f85a31eaccf62 WHIRLPOOL f488f85aaaafc844afd7911a6b92cfa085b66b476596468077746a42038a029df965ada212d04dea95f617d4bdf533442b84c470400715aa52e2756abc3c2d35
--- a/games-board/pychess/pychess-0.10.1-r2.ebuild
+++ b/games-board/pychess/pychess-0.10.1-r2.ebuild
@ -1,75 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 inherit fdo-mime gnome2-utils distutils-r1 games
 DESCRIPTION="A chess client for Gnome"
 HOMEPAGE="http://pychess.googlepages.com/home"
 SRC_URI="https://pychess.googlecode.com/files/${P/_/}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="gstreamer"
 DEPEND="dev-python/librsvg-python
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:2[${PYTHON_USEDEP}]
 	dev-python/pygtk:2[${PYTHON_USEDEP}]
 	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
 	gstreamer? ( dev-python/gst-python:0.10[${PYTHON_USEDEP}] )
 	dev-python/gconf-python
 	x11-themes/gnome-icon-theme"
 RDEPEND=${DEPEND}
 PATCHES=( "${FILESDIR}"/${P}-python.patch )
 S=${WORKDIR}/${P/_/}
 python_install() {
 	distutils-r1_python_install --install-scripts="${GAMES_BINDIR}"
 	# bug 487706
 	sed -i \
 		-e "s/@PYTHON@/${EPYTHON}/" \
 		"${ED%/}/$(python_get_sitedir)"/${PN}/Players/engineNest.py || die
 }
 python_install_all() {
 	distutils-r1_python_install_all
 	dodoc AUTHORS README
 	prepgamesdirs
 }
 src_prepare() {
 	distutils-r1_src_prepare
 }
 src_compile() {
 	distutils-r1_src_compile
 }
 src_install() {
 	distutils-r1_src_install
 }
 pkg_preinst() {
 	games_pkg_preinst
 	gnome2_icon_savelist
 }
 pkg_postinst() {
 	games_pkg_postinst
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 }
 pkg_postrm() {
 	gnome2_icon_cache_update
 	fdo-mime_desktop_database_update
 }
--- a/games-board/pychess/pychess-0.12.3-r1.ebuild
+++ b/games-board/pychess/pychess-0.12.3-r1.ebuild
@ -18,15 +18,17 @@ KEYWORDS="~amd64 ~x86"
 IUSE="gstreamer"
 DEPEND="
 	dev-python/gconf-python
 	dev-python/librsvg-python
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2
 	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
 	x11-libs/gtksourceview:3.0
-	x11-themes/gnome-icon-theme
+	x11-libs/pango
-	gstreamer? ( dev-python/gst-python:0.10[${PYTHON_USEDEP}] )"
+	x11-themes/adwaita-icon-theme
 	gstreamer? (
 		dev-python/gst-python:1.0
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0 )
 "
 RDEPEND=${DEPEND}
 python_install() {
--- a/games-strategy/freeciv/freeciv-2.5.5.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.5.ebuild
@ -162,12 +162,10 @@ src_install() {
 }
 pkg_preinst() {
 	games_pkg_preinst
 	gnome2_icon_savelist
 }
 pkg_postinst() {
 	games_pkg_postinst
 	gnome2_icon_cache_update
 }
--- a/games-strategy/freeciv/freeciv-2.5.6.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.6.ebuild
@ -165,12 +165,10 @@ src_install() {
 }
 pkg_preinst() {
 	games_pkg_preinst
 	gnome2_icon_savelist
 }
 pkg_postinst() {
 	games_pkg_postinst
 	gnome2_icon_cache_update
 }
--- a/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
+++ b/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=dev-util/intltool-0.40
 "
-PDEPEND="x11-themes/gnome-icon-theme"
+PDEPEND="x11-themes/adwaita-icon-theme"
 src_prepare() {
 	if ! use test; then
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild
@ -0,0 +1,91 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 EAPI=6
 PYTHON_COMPAT=( python3_4 )
 inherit autotools gnome2 multilib python-single-r1
 DESCRIPTION="Screensaver for Cinnamon"
 HOMEPAGE="http://cinnamon.linuxmint.com/"
 SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc pam systemd"
 KEYWORDS="~amd64 ~x86"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
 	>=x11-libs/gtk+-3.1.4:3[introspection]
 	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
 	>=gnome-base/libgnomekbd-3.6
 	>=dev-libs/dbus-glib-0.78
 	net-libs/webkit-gtk:4[introspection]
 	sys-apps/dbus
 	x11-libs/libxklavier
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrandr
 	x11-libs/libXScrnSaver
 	x11-libs/libXxf86misc
 	x11-libs/libXxf86vm
 	x11-themes/adwaita-icon-theme
 	x11-libs/xapps
 	${PYTHON_DEPS}
 	pam? ( virtual/pam )
 	systemd? ( >=sys-apps/systemd-31:0= )
 "
 # our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
 RDEPEND="
 	!~gnome-extra/cinnamon-1.8.8.1
 	!systemd? ( sys-auth/consolekit )
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.35
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
 	x11-proto/xextproto
 	x11-proto/randrproto
 	x11-proto/scrnsaverproto
 	x11-proto/xf86miscproto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2
 		app-text/docbook-xml-dtd:4.4 )
 "
 pkg_setup() {
 	python_setup
 }
 src_prepare() {
 	python_fix_shebang screensavers
 	eautoreconf
 	gnome2_src_prepare
 }
 src_configure() {
 	gnome2_src_configure \
 		$(usex debug --enable-debug ' ') \
 	# Do not use --without-console-kit, it would provide no benefit: there is
 	# no build-time or run-time check for consolekit, $PN merely listens to
 	# consolekit's messages over dbus.
 }
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if ! has_version x11-misc/xscreensaver; then
 		elog "${PN} can use screensavers from x11-misc/xscreensaver"
 	fi
 }
--- a/Show More
+++ b/Show More
		`@ -0,0 +1 @@`
							`DIST expand-region-0.11.0.tar.gz 31562 SHA256 e085621267b250486856422d13e7ddc3b11601e2328fc239e709ea10880bbe21 SHA512 3469ab0420d85fbaaa1ae9f3d0101c28b6e1786d761ecd186d744537795226917314b8b748d3499b02ea269a46a62350c37fecb34dd4183a73eafc67ce1344a8 WHIRLPOOL 762ceeefaae4728776d493daac6453d00c6ff232dab4130fcb5965a71b4da6bcc046ed3894912b38716a7047f83286335e4b01616dfc8c8e30edd1360869c79d`
		`@ -0,0 +1,2 @@`
							`(add-to-list 'load-path "@SITELISP@")`
							`(load "expand-region-autoloads" nil t)`
`@ -1,2 +1 @@`
	`DIST golly-2.4-src.tar.gz 2612440 SHA256 b5e4fe5dfb9f6b6a514211b31498be886012638e8aaae16a08b50bf2f6d676c4 SHA512 7e49d72ff638c21f7bdf9de6d254e6baa4989735bdc3d9c52ec9eeacce7e9c6261d32f86b9c62478c3192d17aaba0f30994ad8e9be625dfa21de4d2b035493f9 WHIRLPOOL 556b4a319091f34362c66452b898c281620d0c98b71fbe9491a32e08edafea988d850287178d74cb2b2c34e12954f4fdb4477effa80e8f54aa938930383efe01`
	`DIST golly-2.7-src.tar.gz 3881882 SHA256 9af30afd7b03b3eebcfaec088d67c495609aef72516d9ca8f076b62f32b5e17b SHA512 084919f508b471cc0937d50307410c3f48281e7328e3b9d20e634b9ddfe5909e3b9a000da5a9845a2ba7e45a733fee39e2e6d55902c9af110b5f2d7ea8654d77 WHIRLPOOL 5c391894943593391e2c784f28c00cbbb479068936c6bd754d6c81847d4b0a3c57aad65535a5d8f5f97f789225a6d8d18f52b203ea9340fdd49f641fac8ae42e`	`DIST golly-2.7-src.tar.gz 3881882 SHA256 9af30afd7b03b3eebcfaec088d67c495609aef72516d9ca8f076b62f32b5e17b SHA512 084919f508b471cc0937d50307410c3f48281e7328e3b9d20e634b9ddfe5909e3b9a000da5a9845a2ba7e45a733fee39e2e6d55902c9af110b5f2d7ea8654d77 WHIRLPOOL 5c391894943593391e2c784f28c00cbbb479068936c6bd754d6c81847d4b0a3c57aad65535a5d8f5f97f789225a6d8d18f52b203ea9340fdd49f641fac8ae42e`
`@ -1,2 +1 @@`
	`DIST skrooge-2.4.0.tar.xz 18000104 SHA256 132d022337140f841f51420536c31dfe07c90fa3a38878279026825f5d2526fe SHA512 ce2a9aaf67ed8b751ce062bea020c999da0232aca7d1ddcf58294f76435123231c65cc07f818c92499d142941327253f491cbec48fa504541fe91effde8b78c0 WHIRLPOOL 4cc00833e5df03d8d6b071b1ba612258749852f8acf5bf94c2cefd61680516c2a3a53c8d05273c2687886849dac1c562d5a17b1015090876ab9b570130dd73f7`
	`DIST skrooge-2.5.0.tar.xz 17603860 SHA256 97bebb1b3f1cd791160292bd4689e584c4054db14f0f88039541e67c72ce5e0d SHA512 00fb32f7705c5125803436a21648545154043b6333267ae722c9beac04baf766e1860ce84b4e56d80d81ade1ab3ef8e3ac60a98d0616cae6ec5212d7ad2ef528 WHIRLPOOL 0eef97d2eebcc00155d1505a457e8443df676c93124edbf352b89fa796781ae9e0630294256932e065d2a35eb2d1916ccf733e05bf4f16a237302d0db713073c`	`DIST skrooge-2.5.0.tar.xz 17603860 SHA256 97bebb1b3f1cd791160292bd4689e584c4054db14f0f88039541e67c72ce5e0d SHA512 00fb32f7705c5125803436a21648545154043b6333267ae722c9beac04baf766e1860ce84b4e56d80d81ade1ab3ef8e3ac60a98d0616cae6ec5212d7ad2ef528 WHIRLPOOL 0eef97d2eebcc00155d1505a457e8443df676c93124edbf352b89fa796781ae9e0630294256932e065d2a35eb2d1916ccf733e05bf4f16a237302d0db713073c`
`@ -1,2 +1 @@`
	`DIST catdoc-0.95.tar.gz 217779 SHA256 514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796 SHA512 dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c WHIRLPOOL 1303c74cc6a13183e2ea8ee2bf616da419a8b9f03f4e2fcdce3b0462306084fab85a1cd68bb4ab07caac40c56a91284103e54084d7f523d9894b0eee9359184c`	`DIST catdoc-0.95.tar.gz 217779 SHA256 514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796 SHA512 dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c WHIRLPOOL 1303c74cc6a13183e2ea8ee2bf616da419a8b9f03f4e2fcdce3b0462306084fab85a1cd68bb4ab07caac40c56a91284103e54084d7f523d9894b0eee9359184c`
	`DIST catdoc_0.94.4.orig.tar.gz 679156 SHA256 c06fd69d2a218fcc2ed1320988cef07a67cf5555a12f25752766d746e25758ee SHA512 63e492c40e0abb82df0c93c43d1bd63f15d0c8b60579cf3858f26a0814731920ff621b3384035c9a85da5c448b699801ff3376e7a02cf8e7a413195bd9847ba9 WHIRLPOOL 73675ee3b2facf03e894257132ee7766802ee3ab347701dfa7cd313855ebb22976b9e44f1d9d4eceee6f87008160df371a0cda409a623f61a35413d480a2a8d5`
`@ -1 +1,2 @@`
	`DIST dominate-2.2.1.zip 46460 SHA256 4aa6a2f458461541f9ceeb58b49da9b42320f80aa2a6f692baea2817431d9953 SHA512 3f79fa4258f98708b1e169693e83f919179c1148f440300426f907e28c26b28c21a1098793a14f7e89e5aba0de61f93c889a4908f0eb6e3641ffe234e215e597 WHIRLPOOL 18b57dfc4d0f825be45a1b248e434a8a013d5b76f065b854c47aab9d99c00f5d1854fbcd3c520de50b11b5d7f079f6e57b2e7167249b7e71ff980ac02dfd8100`	`DIST dominate-2.2.1.zip 46460 SHA256 4aa6a2f458461541f9ceeb58b49da9b42320f80aa2a6f692baea2817431d9953 SHA512 3f79fa4258f98708b1e169693e83f919179c1148f440300426f907e28c26b28c21a1098793a14f7e89e5aba0de61f93c889a4908f0eb6e3641ffe234e215e597 WHIRLPOOL 18b57dfc4d0f825be45a1b248e434a8a013d5b76f065b854c47aab9d99c00f5d1854fbcd3c520de50b11b5d7f079f6e57b2e7167249b7e71ff980ac02dfd8100`
		`DIST dominate-2.3.1.tar.gz 27887 SHA256 4b8ce6f33633c9dd9175b228d21c00c801b6bd0327747cd5e17fc2da934c3a69 SHA512 599147cd9aabc7c3bc24e6c82a13b690808899107999a3b0d7d3f2f113b38c90f2c720298ffdcdf1933d2573cced05d730dab53265397b7fc010e57feabc10b3 WHIRLPOOL 258b490620bf358829a74bb7586864a078004268e7bd140322d27126484824ccff0533a87f41948bb13ce19cd47b020d16181a4ea7d74c3f12bf18479b047939`