gentoo resync : 11.07.2019

4 files changed, 12 insertions, 9 deletions

diff --git a/dev-util/omake/Manifest b/dev-util/omake/Manifest
index 445cd5d92bc0..6d181f61b82c 100644
--- a/dev-util/omake/Manifest
+++ b/dev-util/omake/Manifest
@@ -4,7 +4,7 @@ AUX omake-0.9.8.6.0_rc1-warnerror.patch 287 BLAKE2B 20b28db41f662e8f3fa75a65fd9e
 DIST omake-0.10.2.tar.gz 2434316 BLAKE2B f8ca58058ddee39f4e803b91fce061041adfdd71644c17282353b9057acddf23dcc25f836d0ae4014dd44d9c3889c32e5b14788916bcc07015aa6d93e6b5ebdb SHA512 22c454825287dd54272874ec3aa7c5a79f7eac79e18a3eefd4b2e90a08f9767307b0f627d71049a4c08776c85318ce096e89fcc5619d3ec78cc073744efd0fbd
 DIST omake-0.10.3.tar.gz 2438877 BLAKE2B c14adc4da9849b369a2cf5e3676260a2efeb6339939de95965f708b93ac5964af0a8b7e79ebaf98a20061c45530a20ca3825e7a432a3d8b86cdef3ab661cd5d9 SHA512 77eb87b819048d7d9cb9b89a73c5f922ba3adc93f0d58536b3cfa20abdbf1d2a4c576b77921c52e8ea5f80171e8a503b573bf2a92b65fa0579f6492574079733
 DIST omake-0.9.8.6-0.rc1.tar.gz 3254283 BLAKE2B 0fbb77932178e067ff771ed4d448fa2342f56e281799915ab559a606bc195f7817f710caaa44b2debb6243aabf73ebc3d11e0fa010fdfcca14060c8e6e808b15 SHA512 10a7ef6746c656d25852d408fafdd67a95acc59b73c892f0dbc316f2a01949b5349d5203c9fe2400cc7c05e14a7b1bc075603bd462ab74b60427d944f8e177d0
-EBUILD omake-0.10.2.ebuild 1155 BLAKE2B e10d07acab60a438a76828e7a180d794341750d8640574e8ce36af08b4ca621a5866267bfcfff8d868b64c21585356e8dace0b8fb21118610af17fc90838ac5c SHA512 79b90c2feab16dc5520897f752e771ab0c1578d92f0d7d8fd6a6e88e298c7e6493334ad10895efef98158d7f4e42e0971954a81ab4a0037f5aa89dc72e895c06
-EBUILD omake-0.10.3.ebuild 1163 BLAKE2B 9532cf33dcd65052d797fe6aea845b2a6851fcd9a88975ebe09170cee1de994d0a1cb47a6d25ff72cf55ecfd88b383451c4ade3d015c7d73c5709fe141867b45 SHA512 43625219b14f8e501af79cddb0ee180c12c2c7320343e7138bdea3d7e661a89949ca5ab7da1d0179aa8eac28d1476a937821ea8bdae646efeb4037ff20108727
-EBUILD omake-0.9.8.6.0_rc1.ebuild 2000 BLAKE2B 86ed7b64f461cb3069d74b79cc30d28a295b26923f3b8649ba88d84d4514d3461a4bbfcc1e64c384ccbea39004441b3d54e9e2f1a6cbc95473122b98bc65c0e6 SHA512 b1ca3e4b4687a1535fb4908cd02235706f8138ee6f2b2de66e3363c6800b3b4eb63c5389fba03e8e630848edbe03ca74ac3f1351c20f148595554095cd5cc25e
+EBUILD omake-0.10.2.ebuild 1140 BLAKE2B f235dc6d18f9974359130d7b8012c5236c71524629f5edfad6404675c2242109b75f87e4939f175d8b4b3076de0bf44b4a944d6a60e698632f26e4994d23ee47 SHA512 01468ee64d45d6bb09956c0ba5d9a42a8140ac190cc311d3303814b370fd722acf0d99adf37d78b420d0ee3c412963d81d54f1036fd0ea158bfb560ed959727a
+EBUILD omake-0.10.3.ebuild 1148 BLAKE2B c7affb6ea4041ad65f3732f13799fded819aa2a8532d8d6a98e2c66caeffb4873228a48735ce1773151ed75600aa3f391b3f0f31d4fdd2d37fdca42b6f8e1737 SHA512 af19ccadd72b19416811d9210b483affd6d28dc09adab713e48875610a576cf5aba26592401b613663907357c5b6b11e1e4a9cb862ebdb3e71ef868ea0624ba7
+EBUILD omake-0.9.8.6.0_rc1.ebuild 1985 BLAKE2B 0f9446bd08c27b34840e59b31e9c3ebc6fdb8b7a714c90b153990458f204f08cf118bc982d26c3590e56f0033765883e81adc9641bb46e00a15a20e317a8133b SHA512 453d1380f3df9b214e13246468deb1174a44214168f277b50203ee295eb6789cb72cd7be3782b1b52b8c94779b2a56d672e1cf8714abb0a69853c8657b85c167
 MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/dev-util/omake/omake-0.10.2.ebuild b/dev-util/omake/omake-0.10.2.ebuild
index 46e34cdb6a51..d8f2abbc56cc 100644
--- a/dev-util/omake/omake-0.10.2.ebuild
+++ b/dev-util/omake/omake-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,8 @@ DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"
 
+RESTRICT="!ocamlopt? ( strip )"
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${P}-cflags.patch"
@@ -45,5 +47,4 @@ src_install() {
 		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
 		dohtml -r doc/html/*
 	fi
-	use ocamlopt || export STRIP_MASK="*/bin/*"
 }
diff --git a/dev-util/omake/omake-0.10.3.ebuild b/dev-util/omake/omake-0.10.3.ebuild
index 019e3e3775e7..430979c1cfbd 100644
--- a/dev-util/omake/omake-0.10.3.ebuild
+++ b/dev-util/omake/omake-0.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,6 +20,8 @@ DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"
 
+RESTRICT="!ocamlopt? ( strip )"
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-0.10.2-cflags.patch"
@@ -45,5 +47,4 @@ src_install() {
 		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
 		dohtml -r doc/html/*
 	fi
-	use ocamlopt || export STRIP_MASK="*/bin/*"
 }
diff --git a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
index daa7fd04918a..2ca918e00a10 100644
--- a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
+++ b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,6 +21,8 @@ DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"
 
+RESTRICT="!ocamlopt? ( strip )"
+
 S=${WORKDIR}/${PN}-${MY_PV%-*}
 
 use_boolean() {
@@ -77,5 +79,4 @@ src_install() {
 		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
 		dohtml -r doc/html/*
 	fi
-	use ocamlopt || export STRIP_MASK="*/bin/*"
 }