gentoo resync : 27.03.2018

14 files changed, 13 insertions, 200 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 3802cd17ae10..cff793a22eb4 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/cpipe/Manifest b/app-misc/cpipe/Manifest
index 09164134036d..a89821a1902b 100644
--- a/app-misc/cpipe/Manifest
+++ b/app-misc/cpipe/Manifest
@@ -1,3 +1,3 @@
 DIST cpipe-3.0.3.tar.gz 16392 BLAKE2B 6aadb1b186bbf9aa5d804ca719baaff662116084c1e24c9fac38526e8fd190421189dfb02787f430dd0997b3b1bcba41ba002630a324e508190a0b6bd6b0af91 SHA512 255e3833ddaf27af1768e650a47d0565224ddd22137636ae0fae491a4d03f523b74a76f26b261c71442a7509f42eee64b75fbcf7078641a64b66a2590bb803b3
-EBUILD cpipe-3.0.3.ebuild 656 BLAKE2B 74563ac723b7418aa7867bcbca8573f6b9895f4178b1fe3d07701e70f85c42c7894c471b8ed8c0af5e19b685faeb00f97fa3e86b3dec703e5d35493b81636c2b SHA512 759dfd3af82aed48d535931d33fcb0070c9ecbea713ae2d095805cac25efe49fbd6b0012b11099719da334d242c57e734fedb1d4f2ace9ae946c2ec0f7411775
+EBUILD cpipe-3.0.3.ebuild 649 BLAKE2B 681dbcee08f62a22faf8e5202815d776870923ff5d5e221f034e2ba3c20bdd5e784375ad31f361c5b76322e8809be240b94c39e7893de68dc7e1cf1b3983de2a SHA512 d5664f0b059e092f0e4ca41e8aaf630cbabab2a07c25616b550069355d6570c35737aca7c4211c37943be15a6b968348eed2c43c8b8e71ddcc7a8e481789bd0b
 MISC metadata.xml 330 BLAKE2B ae60f1e0f28436199a2f72cdb7ec2714258a8ba42eca5bee81c54bf3cfdbcaf04f450c737897242d064c611947124b8865d6b2720eea1eaca4e8643a8fd09e9c SHA512 5d888afdae9cd65ef26799a4c311dd11bbe8cbea93d6e8ba4e92086cce3df5708be39ea4c20a1ea0bd76d9e06846dd1f48af120f0812f4be75e9ae1f43e669bb
diff --git a/app-misc/cpipe/cpipe-3.0.3.ebuild b/app-misc/cpipe/cpipe-3.0.3.ebuild
index 6e1c286b1d2d..1f656dc38a49 100644
--- a/app-misc/cpipe/cpipe-3.0.3.ebuild
+++ b/app-misc/cpipe/cpipe-3.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Counting pipe, measures data transfered over pipe"
 HOMEPAGE="https://github.com/HaraldKi/cpipe"
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index ee54314fd912..b696ae94f0b0 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -2,5 +2,5 @@ AUX dtach-0.8-CVE-2012-3368.patch 1040 BLAKE2B ded617740765ca7aa814cc98acb46a368
 DIST dtach-0.8.tar.gz 55472 BLAKE2B 9627075763f02787d7071658d1ae040d0c18dfe91f2954546398431e677b7c90cf67c23af0cc20182b354656d50b579c378f54d9f691853b7707a5761bc69b4f SHA512 ad0a788d10a5e1e1be4c353b64e1e4a0dc8c888492a638b2442d7c59ef31d67975357116435a1059141bfc2c82a3a6e9e490faa87cf81e5fc3bc7457a99c1193
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
 EBUILD dtach-0.8-r1.ebuild 472 BLAKE2B fe7f93c1bb254d2d1115f0cc96ead198ab266712fab96a4dc55bf93e04311cbbeea74b1f25b2bdb16e70520c3f3b70d2c3f4dd167271d1d4ba0c54cb46a28d4e SHA512 cddc92673cb9ab6153c477c2a77f95584edcb4a7140c5e275ddb9ad64773c56084e9609d06c9a00cb226ac3cbe71842114b6fd3522e0db6b624f4adb1fdd216a
-EBUILD dtach-0.9.ebuild 438 BLAKE2B 34c31e7b0631fe3c23ee67a48f4d269302c6b36346f01638a4f2dd9c2c8a24142d4999cdf9bd08b0f65508041839a083297d531369b127ddcf536cc54e3f7b32 SHA512 f06e6fde28cf276dca5bbf97f2a7849f141270b34d9658e839a0b2389ce7570c3f37e9c4735bb5f6ce623291383ae41e12e3b6c40f51bd4bbf38c58057e2b7ef
+EBUILD dtach-0.9.ebuild 452 BLAKE2B 3648892f66fdf17c3d674b9cff31cae0221e1626d3a424bc8e7722791c9072c229e8666260acbf085e3637d29b423103eb6567ab2f178b93d85316677c7f12b6 SHA512 50d75230349a6ea5af4f27c4c00badf443f03bbc3d925693e140e8ce1dec9a7a3a89fbba9f5845498e0d14376fc7e188a69c95e19127da0130862bcac6f2ffca
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index 4a89386b4e9c..6a29ca611e31 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index d1d1dfdb8bf5..39eb1045a1fc 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -1,13 +1,8 @@
-AUX geneweb-6.07-gentoo.patch 781 BLAKE2B 624c73a1b15decda98f980fcf8f799068bf8c3d68742ed35aa6b42262472f9ba7be824cd9ed7e28990d767da3116ce31bde2da4a843abf5da47bc993395686ca SHA512 21408c7a4eba583242d751da6c688c2f175bb81fabac92644c936acd9bde5a9322e21f21306af7f53c261432f941e149219c045f21afab4401da98d7a004d69e
-AUX geneweb-6.07-parallellbuild.patch 2823 BLAKE2B 3830d92f05d1968de9aa311b04dd51e4f59ec21c8b539faa63653d3e259b5e454a9a963156bb811dfb8ee9545d8fcff9d7b038fe6830aa5170f0263827698a5b SHA512 0eced445bff368ebe4f5b8a09653cdc4444c3ae956aeade9b64728136d9334b1cee18e891273308b64ecf819c9ef0937be82b15ee0a9c739ba2c19967f5e2934
 AUX geneweb-6.08-parallellbuild.patch 1264 BLAKE2B fa7e9a94705ce2bf439888b2e64f889a69e29b6897c46e40f4d86c3d6d56d2fc9ab2790b0514b7e52dce93c0774fe3f006d889f3ed4a02342e8694c4e8b95a7d SHA512 2912f591f0c771b9bc039871416bd74364fe4a0c17200ea191033a3d12c4de4e088ddd24829ef07acb918e0f8be91671112ae7ebe0593b96a66945b6c18ecedf
 AUX geneweb-6.08-r1-gentoo.patch 865 BLAKE2B e2ebc31647148ccb18f173088d6fe7da5725e20f5897db5d8f998ad275ca765fc80d19a5f387225e6b2a003e8c0af6b46dfa44c85491d495f150a9c50e5c0659 SHA512 d4e74036384123884487458a5c3ae1f35ab39b87e31239c92f800fa5e758efdb52dc4cf84686295daec78e93cf06099a1738cc1a13add659547a44352999c3b5
 AUX geneweb.confd 67 BLAKE2B 83af31b2708fc64dfba852fce65d6c76bf71bceff40ef5b7ef32a58ea9ae941771569d664f3fc0d555dd8ac9e78740fc0449d1011dbcfeeb66dd320c7b1f44fd SHA512 5d7e373c042ba1de97261807cf3b223157c0f383106b4fb2f2b04de21214218ad3a6e0f097101d45cb61e74d90d060ead93dc6e79a125ad97a0126690ae732b3
 AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d6542aaf930f4e7e34d4f3e3cb844b734ee3e8fbae9950438f1a7d5b7206e9a2d304b77095107e5814 SHA512 8daa663aa7d7f614ddd709616411b2078dad492813de80dd9be9866c61a1ed97c41b28ec94fece79648e2c587b991ab0820e6601891add6d0c6867fe82782eb8
-DIST geneweb-6.07-reduce-utf8.ml.patch.gz 185409 BLAKE2B 38cebdd34860cb92e9b7320c8b0fba4631c2ab6d6f30d7649f6eabc345cc4604426c37baa94fe614988facd97fed7b2e07360175fec6ce0b86b5ff79d4874750 SHA512 d6b71fc6d3a1488f6e96e65ab0c942c08b9e0307b2d06c9bb97fde0c2e35af2fb4b52011024e67550e608603eacfaf5ee312c99c9228edfedc2dbe82745de227
 DIST geneweb-6.08-ocaml-4.patch.gz 22259 BLAKE2B c3471b44bae06db04f51f4fbfacaf5d93388f79673686d0fdd988df482f836bd49f853c5acb3b94c39f890b7d9bd8d118b4042100c466a06a2e57227da9eee3b SHA512 333a9ca899bf454e1c534f6c890b5cbe842821573b39e9d0e432cfbdf30dbe3a495a5ecb5a9b4a00882ee51bbb3ec1ca4b417e34050a7f84e434d0424c126def
 DIST geneweb-6.08.tar.gz 1791450 BLAKE2B 35fcd0a4087892b992b87dd4fb54b458be0e300042a237458fdeea9a4a9b8649f93261d896d6b7ad19b681b95b343013d99d99027d86b1796f74cab916178d32 SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835
-DIST gw-6.07-src.tgz 1855016 BLAKE2B 9ba23961607b399a1d731e163605744f79136af40a51a61cd80f2af04a3c3d388fdc3444c33c740e0c6b4137df0cbfd6145759c50c7c8a7d04b472a5d4505a17 SHA512 719884af80809b25946175731ae20b280e13f6e18471903d2222928c11838a2a92a43f03dd8152b7b01dfcaf45fbd942035f4b54f049899ea134cd161cfc971d
-EBUILD geneweb-6.07.ebuild 2093 BLAKE2B cdb90d602a2f09f0796e9b528560156fbcbfdd6ed54d4fd7f486b26930e5591bfbbbc8a68da81ed9e2070bc943d3218b2f383238883f553608ffea49566f01c9 SHA512 d99d8e7982507a8bf5e693b68661ac295aec991319735300ee5368fa95d4d047aff0ea4306c655f4b92bd72a5a482172f3e20b5a43e45523e275744ce5bc0a24
-EBUILD geneweb-6.08-r1.ebuild 2001 BLAKE2B 8b4d49cb745377212b0ccf7d46e11c3c3370bc69447d42cdc9173b866ce54a816a254fa81439bc7caddda93bc9bffa2e9eeb5b90cd2ec0e1a4be0ea0e89f3cac SHA512 d7473dab32d1725b2f22faad0ca1997b11d41154fd1a7a336b0e84c4e1fd0a3c230dca334a2b7d771543665ba4748382c319654d3634b4f934a18470f713b0e0
+EBUILD geneweb-6.08-r1.ebuild 1986 BLAKE2B 34a9392c6d53cb0c67e76cad2289e92331df30ac812ac028639190a9054e44072929364a1331fc8899065b55ab121414701028500cb3493afe28e8add1588d81 SHA512 802d057ee7a16db7a5060a0388b3d7e5efcb8116f28734f6499756650eb9795ef226bdee6f17514c9435a05d2987636c65b898387222b4083b907c137704cda8
 MISC metadata.xml 652 BLAKE2B 0a523f6b4dd3d65cf1668c16c07d1a9a4547bbcb9a800c4f9f706973d159ce434c2567d5b23609bd33f8c5f3ca4a25d8e7c485e15a640a941d21fd29fd52589d SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973
diff --git a/app-misc/geneweb/files/geneweb-6.07-gentoo.patch b/app-misc/geneweb/files/geneweb-6.07-gentoo.patch
deleted file mode 100644
index a7cdff7a44c5..000000000000
--- a/app-misc/geneweb/files/geneweb-6.07-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- setup/setup.ml.old	2007-08-07 19:25:13.000000000 +0200
-+++ setup/setup.ml	2007-08-07 19:24:59.000000000 +0200
-@@ -5,8 +5,8 @@
- 
- value port = ref 2316;
- value default_lang = ref "en";
--value setup_dir = ref ".";
--value bin_dir = ref "";
-+value setup_dir = ref "/usr/share/geneweb";
-+value bin_dir = ref "/usr/bin";
- value lang_param = ref "";
- value only_file = ref "";
- 
---- tools/Makefile.inc.unix.old	2008-04-23 15:22:50.000000000 +0200
-+++ tools/Makefile.inc.unix	2008-04-23 15:23:04.000000000 +0200
-@@ -5,11 +5,11 @@
- CAMLP5F=-DUNIX
- CAMLP5D=+camlp5
- LIBUNIX=-cclib -lunix
--OCAMLC=ocamlc.opt -warn-error A
--OCAMLOPT=ocamlopt.opt -warn-error A
-+OCAMLC=ocamlc.opt
-+OCAMLOPT=ocamlopt.opt
- OCAMLI=
- OCAMLD=
--STRIP=strip
-+STRIP=true
- RM=/bin/rm -f
- EXE=
- STATIC=-ccopt -static
diff --git a/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch b/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch
deleted file mode 100644
index cb1a5b0125e9..000000000000
--- a/app-misc/geneweb/files/geneweb-6.07-parallellbuild.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- wserver/Makefile.old	2011-03-11 13:47:04.000000000 +0100
-+++ wserver/Makefile	2011-03-11 13:47:20.000000000 +0100
-@@ -4,8 +4,10 @@
- 
- OBJS=wserver.cmo
- 
--all:: pa_macro5.cmo $(OBJS)
-+all:: pa_macro5.cmo
-+	$(MAKE) $(OBJS)
--opt:: pa_macro5.cmo $(OBJS:.cmo=.cmx)
-+opt:: pa_macro5.cmo
-+	$(MAKE) $(OBJS:.cmo=.cmx)
- 
- pa_macro5.cmo: pa_macro5.ml
- 	camlp5r pa_extend.cmo q_MLast.cmo -o pa_macro5.ppo pa_macro5.ml
---- src/Makefile.old	2013-04-18 21:29:52.727049806 +0200
-+++ src/Makefile	2013-04-18 21:30:58.838414496 +0200
-@@ -153,6 +153,8 @@
- 	) | \
- 	sort | uniq | grep -v '^$$' > i18n
- 
-+config.cmi: gwdb.cmi
-+
- always:
- 
- depend:
---- src/.depend.old	2014-07-17 09:18:26.882149121 +0200
-+++ src/.depend	2014-07-17 09:19:07.981770328 +0200
-@@ -162,7 +162,7 @@
-     mutil.cmx notesLinks.cmx progrBar.cmx secure.cmx select.cmx 
- history.cmo: adef.cmi buff.cmo config.cmi date.cmi def.cmi gutil.cmi \
-     gwdb.cmi hutil.cmi mutil.cmi secure.cmi templ.cmi templAst.cmi util.cmi \
--    history_diff.cmi ../wserver/wserver.cmi history.cmi 
-+    history_diff.cmo ../wserver/wserver.cmi history.cmi 
- history.cmx: adef.cmx buff.cmx config.cmi date.cmx def.cmi gutil.cmx \
-     gwdb.cmx hutil.cmx mutil.cmx secure.cmx templ.cmx templAst.cmi util.cmx \
-     history_diff.cmx ../wserver/wserver.cmx history.cmi 
---- ged2gwb/.depend.old	2014-07-17 09:23:02.119612299 +0200
-+++ ged2gwb/.depend	2014-07-17 09:23:53.987134380 +0200
-@@ -1,7 +1,7 @@
- ged2gwb2.cmo: ../src/adef.cmi ../src/ansel.cmo ../src/argl.cmo \
-     ../src/buff.cmo ../src/calendar.cmi ../src/db2link.cmi ../src/def.cmi \
-     ../src/futil.cmi ../src/gwcomp.cmi ../src/lock.cmi ../src/mutil.cmi \
--    ../src/name.cmi ../src/secure.cmi ./utf8.cmi
-+    ../src/name.cmi ../src/secure.cmi ./utf8.cmo
- ged2gwb2.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
-     ../src/buff.cmx ../src/calendar.cmx ../src/db2link.cmx ../src/def.cmi \
-     ../src/futil.cmx ../src/gwcomp.cmx ../src/lock.cmx ../src/mutil.cmx \
-@@ -10,7 +10,7 @@
-     ../src/buff.cmo ../src/calendar.cmi ../src/check.cmi \
-     ../src/checkItem.cmi ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmi \
-     ../src/lock.cmi ../src/mutil.cmi ../src/name.cmi ../src/outbase.cmi \
--    ../src/secure.cmi ./utf8.cmi
-+    ../src/secure.cmi ./utf8.cmo
- ged2gwb.cmx: ../src/adef.cmx ../src/ansel.cmx ../src/argl.cmx \
-     ../src/buff.cmx ../src/calendar.cmx ../src/check.cmx \
-     ../src/checkItem.cmx ../src/dbdisk.cmi ../src/def.cmi ../src/gwdb.cmx \
---- Makefile.old	2014-10-30 08:36:50.308668062 +0100
-+++ Makefile	2014-10-30 08:37:13.204451602 +0100
-@@ -65,7 +65,7 @@
- 
- distrib: new_distrib wrappers
- 
--wrappers:
-+wrappers: new_distrib
- 	if test "$(CAMLP5F)" = "-DWIN95"; then \
- 	  echo -ne 'setlocal enableextensions\r\n' > $(DESTDIR)/gwd.bat; \
- 	  echo -ne 'md bases\r\n' >> $(DESTDIR)/gwd.bat; \
diff --git a/app-misc/geneweb/geneweb-6.07.ebuild b/app-misc/geneweb/geneweb-6.07.ebuild
deleted file mode 100644
index 77ac63d3ce37..000000000000
--- a/app-misc/geneweb/geneweb-6.07.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils user
-
-MY_PN=gw
-MY_PV=${PV/./-}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Genealogy software program with a Web interface"
-HOMEPAGE="http://opensource.geneanet.org/projects/geneweb"
-SRC_URI="http://opensource.geneanet.org/attachments/download/240/${MY_P}-src.tgz
-	mirror://gentoo/${P}-reduce-utf8.ml.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+ocamlopt"
-
-RDEPEND="dev-lang/ocaml[ocamlopt?]
-	dev-ml/camlp5[ocamlopt?]"
-DEPEND="${RDEPEND}
-	!net-p2p/ghostwhitecrab"
-
-S=${WORKDIR}/gw-${PV}-src
-
-src_prepare() {
-	esvn_clean
-	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-parallellbuild.patch \
-		../${P}-reduce-utf8.ml.patch
-}
-
-src_compile() {
-	if use ocamlopt; then
-		emake
-	else
-		emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out
-		# If using bytecode we dont want to strip the binary as it would remove
-		# the bytecode and only leave ocamlrun...
-		export STRIP_MASK="*/bin/*"
-	fi
-}
-
-src_install() {
-	dodoc ICHANGES
-	emake distrib
-	# Install doc
-	cd distribution
-	dodoc CHANGES.txt
-	# Install binaries
-	cd gw
-	dobin gwc gwc1 gwc2 consang gwd gwu update_nldb ged2gwb ged2gwb2 gwb2ged gwsetup
-	insinto /usr/lib/${PN}
-	doins -r gwtp_tmp/*
-	dodoc a.gwf
-	insinto /usr/share/${PN}
-	doins -r etc images lang setup gwd.arg only.txt
-
-	cd ../..
-
-	# Install binaries
-	dobin src/check_base
-	# Install manpages
-	doman man/*
-
-	# Install doc
-	insinto /usr/share/doc/${PF}/contrib
-	doins -r contrib/{gwdiff,misc}
-
-	newinitd "${FILESDIR}/geneweb.initd" geneweb
-	newconfd "${FILESDIR}/geneweb.confd" geneweb
-}
-
-pkg_postinst() {
-	enewuser geneweb "" "/bin/bash" /var/lib/geneweb
-	einfo "A CGI program has been installed in /usr/lib/${PN}. Follow the"
-	einfo "instructions on the README in that directory to use it"
-	einfo "For 64 bits architecture you need to rebuild the database"
-	einfo "\"gwu foo > foo.gw \" will save the database (use the previous"
-	einfo "version to do that). \"gwc2 foo.gw -o bar \" will restore it "
-	einfo "(usiing the current package)"
-}
diff --git a/app-misc/geneweb/geneweb-6.08-r1.ebuild b/app-misc/geneweb/geneweb-6.08-r1.ebuild
index fd05d1690573..7c3a88555903 100644
--- a/app-misc/geneweb/geneweb-6.08-r1.ebuild
+++ b/app-misc/geneweb/geneweb-6.08-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,8 +11,9 @@ SRC_URI="https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ocamlopt"
+RESTRICT="strip"
 
 RDEPEND="dev-lang/ocaml[ocamlopt?]
 	dev-ml/camlp5[ocamlopt?]"
@@ -31,7 +32,6 @@ src_compile() {
 		emake OCAMLC=ocamlc OCAMLOPT=ocamlopt out
 		# If using bytecode we dont want to strip the binary as it would remove
 		# the bytecode and only leave ocamlrun...
-		export STRIP_MASK="*/bin/*"
 	fi
 }
 
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 9e37e413c9c4..b0f8a05c2ee8 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -10,6 +10,6 @@ EBUILD mc-4.8.15.ebuild 2602 BLAKE2B 3b279bf633a0299e11a4ff247c02e4293fb6a221c20
 EBUILD mc-4.8.18-r1.ebuild 2466 BLAKE2B 97822d672464a1956119a1f44c9fb9bfebf39573ff944c70d0a3ce053efa7965fe00418b90352fa9937fafc228f3854eae09fbac27f3e8561be379583c3abeaf SHA512 3bea1c8e2c8aa1e882ccfde6619dff042939290de9075ed111360925a78d6e631bfde6cc47d60bb6e1b287826fe6cc0483201ee317a3698894c3a900fd6af505
 EBUILD mc-4.8.19.ebuild 2722 BLAKE2B fb279a01c7d86133d64f50fe330d7e94e321b9aabbac51583412d49fe2fbe6b5f826bbb2381f1212760e846c05fae2eeccc0e56928491143e0680fa996fce597 SHA512 8c88c706cbed51a95ef9c2577b7dad338c187db961c7365616d4085b856d3b45035251efa86746c48232f02ed83ffe9c8fa24a629463968dd26847e1c019f353
 EBUILD mc-4.8.20-r1.ebuild 2482 BLAKE2B 1bf8934ae7f8d5478804017453efc0a8d16e1f6b2f8bedd8d878202df154fa01138e5284f18a4a5e3a7ca11b70785fcf250275b45941e4b411a045142a3e0705 SHA512 6345f42e21960543ccd50ee95790c017667f73a293386ad28a6107e4575e649902b8e26970185f3ef59d8ef23f4a45b02596d0f99156c704083ab15f54f87384
-EBUILD mc-4.8.20-r2.ebuild 2616 BLAKE2B 47f90ba86acc15004703a6c56839bc5127ec773c37cca21994cfccf8940eefdd4cedfc936b1b090af8dbb3514beb51fa3b2b2ad3d61582367d9538746836f8de SHA512 f74f0f000974f99e2afb21a50732c437fbe19414d8f824ab8aa09fac763834023555f66901e307f8f89f3da9056b7d990c374be20a5d48a0605e61282dc78f23
+EBUILD mc-4.8.20-r2.ebuild 2619 BLAKE2B 818c6c1ab7b190d80566935453e3467479733e266683e17f02c397d6d55bc2ad3a9aeacad91e4c2ad7dd6e26e9a6319b1392726a097415d5302dc49a9daf7843 SHA512 50e29ca64ea1e6172653960220e8bee6b7a298792e7774971a7c3db6a3187646ae84a88291ba0deb898ca6294fd752b827b0213ea7d770a078edd9f506abd0cc
 EBUILD mc-9999.ebuild 2710 BLAKE2B acbcdaf95260df5b4f34ac03e19b2b674f65d3c95083e79eaf916cd62f99ea0d9008c94bb2c0e030bcd8face202c00a646eca1521461058ae009da1f17a4499e SHA512 0388200a8134818d797d79849bc618a222377c33fb1802dcbf2fdafcbc22d85888171fee546ff5a484aeb4d97074afa1fea23ea5ee2078182bf72277658b65bb
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/mc-4.8.20-r2.ebuild b/app-misc/mc/mc-4.8.20-r2.ebuild
index 5b6a3787b528..9b920e68246d 100644
--- a/app-misc/mc/mc-4.8.20-r2.ebuild
+++ b/app-misc/mc/mc-4.8.20-r2.ebuild
@@ -67,7 +67,7 @@ src_configure() {
 		--enable-charset
 		--enable-vfs
 		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w')")
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
 		$(use_enable kernel_linux vfs-undelfs)
 		$(use_enable mclib)
 		$(use_enable nls)
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 832d34e14dd1..8fbad5b7b3da 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -7,5 +7,5 @@ DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c70
 EBUILD pax-utils-1.1.7.ebuild 1472 BLAKE2B ac8f899442a870fe81f1d5c80bd3ccf24082ecb029de9520bd45cf1efccf6e0ced8685af3c16ae25c9d57733a3e2bf57bb5d0e543e7f1e43244867807b35bd2a SHA512 7e166188a86da296040f1407377526f444af689e2aeead564f28089b996b5f34d658b3197b881ef84b3aa7600309f71d54cbbd86fdc61ce71706a64f8bb12368
 EBUILD pax-utils-1.2.2-r2.ebuild 1627 BLAKE2B 4cb00aa04ebbca333f1b1cc3c5db6580f592bd3a7dab1c87a8aa7eaa4250ca1f261442f0d662960e41fc659048672487d5674f930be972732239fe6e48bc4646 SHA512 ef06d06f27ed726e14e196ead496fc72c0f7426d45f35839527ed1fb8c5ebfc3ecca4aa8bf41cc5e35d00cbbe01d77aa45a1dbf8dccf88d72610098fa2e9257c
 EBUILD pax-utils-1.2.3-r1.ebuild 1698 BLAKE2B 3377c2719fbd8e49d50c166d7a10655570197c84bb42c2a57fc0bdc4ea33c4ce29a4094da408189e5fb9ae0ffe830f39aba1e5fc0c5d04679095f81e9b04d05a SHA512 04678abb457a3206152a37e4c563f424ee551038e10e3dd00149eed4503edf27a370e7d1665fff6fdb60a43ff2492a631f8fed2f53cf3e48e03f21ea62ca7c16
-EBUILD pax-utils-1.2.3.ebuild 1485 BLAKE2B 89a425ff1ad32b42b88c2d7e27c11e1c377d964bbf12ebf9e7b60a3a89aa2cfbcbd7130d0c2530317db5951ba4a1e55817ba6fb46b67d25b91eb795a3d6531f0 SHA512 b455dc32000fde7a9a4b081ec9bbebc2aa89711de039c450353ebbca5fc792ee7b104f7a216084b1eabbe24c0fbe2e99752bef4c9b8a8f5fce9dcd46d99c3af9
+EBUILD pax-utils-1.2.3.ebuild 1484 BLAKE2B 5dc90996b13437524baf3f512d3057ae6bdd4cf9989b3800ca018d2e3bad4bf2da9ce5b9978b9826cef89866d667093c734240557e24201e3c77b3486d414c58 SHA512 8a5fdc4e582bc9cc24abe238eb4a958b3b27479d1c46a3e9df5e982060e112f53f7d6ad6d4161f862b9ed2de2d96fd5b08156829e02a00e6cb2ae7e076e8a9c3
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
index 5e84f564e467..3ac27e735eab 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )