gentoo resync : 11.07.2019

4 files changed, 12 insertions, 9 deletions

diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 8e923475d1d5..24080819139f 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -4,7 +4,7 @@ AUX ocaml-4.03.patch 5140 BLAKE2B 592dbb7bd8bc53e039a0cf806d9e69cbb6e70ca002152c
 AUX ocaml4.patch 547 BLAKE2B e2cb8eb12121beb5cc81ba34dcf8ddd78f2ab9826d4c6cdc028c14b3f04e6bcc041bf153ec1d6aaf2d78c97c9d70e26f4ccbc87e7c2cef2499b22bf157dd2695 SHA512 f99d4050613e210c2092153a7b1a45028ea26d4e90d295b1d19ed3a25b7ae656c15efca84a5f694703dca339c1a5e7baec5d71ad815f96c41620a8ed7c34422c
 DIST mldonkey-3.1.5.tar.bz2 2847382 BLAKE2B 60df6ffba295d0a230f1ca2d143e21529387fb453529cd89e84911b72248c0fec15261b7d3ed54be2c8d1de84bf4e8faaebcfa2019960af845493fb2385e46c8 SHA512 96e75acf91d7ecc41490f898e06d284da27404c7e567f173936d8113885a3b4b6bc93341358f92a30d3f699eef681d97ce56414a37bb02a535ad2da4d4ad13a3
 DIST mldonkey-3.1.6.tar.bz2 2886916 BLAKE2B f92c7195c67e3a9186cb9e691114dc2c1b967dab93a7c280a6fe25c2f3a18d97e849f738d0f4669f0e967c3b717ed0329f40d95c07be13a46fb5a96fc49ff716 SHA512 d0c7256c7c43934bc132183cfe0c8d85c61a874e295b86ba989f43fd4d9f3672bdf18439a9fefce52c30a6a8df08a5a464dcc21d4bf199d1b502fa344683081a
-EBUILD mldonkey-3.1.5-r1.ebuild 4371 BLAKE2B 100cdafa4f0bf3b596897cd24c2929bb5896f36d4f39e3677800756069ffbe75600bef3412d0c5eb45fbf43f020052ad1dbacc6a2f0355cf2503b1e2d3b8c54c SHA512 b92133710918c8091a089f9526b7b35cd1423f931a207148f720316b81c4ddc5cf270f67af19067d88f9edf09ed86ec56d726f50651c6e98765343e3c1cb81d8
-EBUILD mldonkey-3.1.6-r1.ebuild 4475 BLAKE2B 1875dc0fbbf7d985b14b4ab41df8a8f3961b16abdbf6f26a52f658098fc173fe85ee4425171017fe872b8abace3f4d716033bce872cfbcb166e4d2c3fe505044 SHA512 b261107398575c7c59669d2c5d6e78023b9c69a168058574d48120d628723b7dc78da4deebf550d914a6021c50dee8f010cec491fb065f0aef47757750d5bc2f
-EBUILD mldonkey-3.1.6.ebuild 4345 BLAKE2B 685b146a75be2e8bfbb27edd62d6d2c958fcda315c18b4a5e48226c07d4b9d090f5c5bb29153030a860fa6fdfa106404253092c9e9fff16df1ca67bc6dabd2ca SHA512 04d17200855654cb29cd7ccd60efc2d4af85b1951efb324e625e7edd2c9585d413d9bc8f467aab124ce37fd07be87fe8c18c6677dd0947251f2fa57ff5cc407a
+EBUILD mldonkey-3.1.5-r1.ebuild 4356 BLAKE2B 4fffa30f9bda190d601eb0e8e4cc7ab217575d99b8ebf91663ff1b642cf558942abf1e3ed00409428b48d77ab49eb6c491981bd032e4b6599d003437636ac660 SHA512 37c85135b6f346e65513e80733f84f8fd42345b5698322c70e9d5af08fa4e8a70d2ba44155b7bd3f1e9d8e090797d80ca1c104088e57563ad8490dca63320102
+EBUILD mldonkey-3.1.6-r1.ebuild 4463 BLAKE2B 0c67e039fdd1c9fd9571c5f46541baadcadc465460dba345823a2ebe52aa1d9baac529662311dcd8bf08406b1002a7622f65f5d2d1ee258b17b5842503cefc4e SHA512 898892a8884166e050d1205e78bee827f5fcad3a2adad3bbce03badcfb171c5102f0d158b6c26ef3b365e2ef70268b6107fbf8df7fd2e5b492738481aad2ae54
+EBUILD mldonkey-3.1.6.ebuild 4330 BLAKE2B da18da74f5300bc30921ee25049387eac3c9a5cf43518af9bae1fba6bea3cd47328077563beae8655a861eb916c345234c16b7a096a800705b023319effd3fa4 SHA512 3da6cdb7e908c71985c0ecb043fdd810614c60986c18375e6e24b39c26a96b27e37290b262427b82e90cbfc904be22d9c0650f4ac1d07da4c80dfc1eb8c3519e
 MISC metadata.xml 793 BLAKE2B 61001afe516cb624a0ab15b3e2326df537da1eef78c4aa30b983999591a862d71916db4e3198f02782ff2d485341f586a49bc0d20d52c75027950f0e50bb20f8 SHA512 faff7076c4e3f4c6e0972ee0f0ff1a667dc44dd5bce6444b76723c6c3c151633c2598bf2ba3fd12ba64232a7de6d56f46bb1da014b26db7b544cd4cabff2b4e8
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
index 118e1cfae15e..2f99a446acca 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -27,6 +27,8 @@ RDEPEND="dev-lang/perl
 DEPEND="${RDEPEND}
 	>=dev-lang/ocaml-3.10.2[ocamlopt?]"
 
+RESTRICT="!ocamlopt? ( strip )"
+
 MLUSER="p2p"
 
 pkg_setup() {
@@ -111,7 +113,6 @@ src_compile() {
 src_install() {
 	local myext=""
 	use ocamlopt || myext=".byte"
-	use ocamlopt || export STRIP_MASK="*/bin/*"
 	if ! use guionly; then
 		for i in mlnet mld_hash get_range copysources subconv; do
 			newbin $i$myext $i
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
index 242b41314223..a92fc8ae4722 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -29,6 +29,8 @@ RDEPEND="dev-lang/perl
 DEPEND="${RDEPEND}
 	>=dev-lang/ocaml-3.10.2[ocamlopt?]"
 
+RESTRICT="!ocamlopt? ( strip )"
+
 MLUSER="p2p"
 
 pkg_setup() {
@@ -113,7 +115,6 @@ src_compile() {
 src_install() {
 	local myext=""
 	use ocamlopt || myext=".byte"
-	use ocamlopt || export STRIP_MASK="*/bin/*"
 	if ! use guionly; then
 		for i in mlnet mld_hash get_range copysources subconv; do
 			newbin $i$myext $i
diff --git a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
index 861c8017b3ed..06defbcd139a 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -27,6 +27,8 @@ RDEPEND="dev-lang/perl
 DEPEND="${RDEPEND}
 	>=dev-lang/ocaml-3.10.2[ocamlopt?]"
 
+RESTRICT="!ocamlopt? ( strip )"
+
 MLUSER="p2p"
 
 pkg_setup() {
@@ -109,7 +111,6 @@ src_compile() {
 src_install() {
 	local myext=""
 	use ocamlopt || myext=".byte"
-	use ocamlopt || export STRIP_MASK="*/bin/*"
 	if ! use guionly; then
 		for i in mlnet mld_hash get_range copysources subconv; do
 			newbin $i$myext $i