gentoo resync : 15.12.2019

5 files changed, 13 insertions, 16 deletions

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 007a899392ad..6f9f0a216f08 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,7 +5,7 @@ DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 8e262e3e28b9f4cbe3925340aa3b08e99f1c30
 DIST unison-2.51.2-manual.html 311981 BLAKE2B 1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05 SHA512 2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997
 DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0 SHA512 170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
 DIST unison-2.51.2.tar.gz 691251 BLAKE2B 39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f SHA512 9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115
-EBUILD unison-2.48.4-r1.ebuild 2460 BLAKE2B 81491952d6cfba07ae5bb03220c044fc0fa05a1a4d531e6b0909a4265620dc56259c24c6d1268b425d45db44210d2e9b4f181e3a0fd68f57a7c0bf6aafc98613 SHA512 d69e3027788b7c58d5f8e9f09c5f717b856e35ad1290ef8afe3a952d4af695d9a12833ee6d85ac97b7d2bf4d90c1f14a81f0027c1dd926327c618a3f5bbccdd2
-EBUILD unison-2.48.4.ebuild 2323 BLAKE2B 5475474bc071741df4c64773a3c7b4cf54b8f7add458e292fd0d5d9b26489133aad898f1458de50adec34a8df23bf2ca351b4e7a29ae91064141f55766520997 SHA512 e2de48ca76e032d7bb4c13fba8c4d99155f23ba9da3ad80f8f90182bb2898634abedc4f4df987bf014ea24bcdfb5440dd836fa650600d311c4a76d4d03a5bafe
-EBUILD unison-2.51.2.ebuild 2146 BLAKE2B 664753004eacd0bb01836b3ecba8646cac1183b32aab412806152f58afd05c76b333a6a9462f422e5418dc044d5a5b4ca53cde6dcdec49ac98b95df98182e580 SHA512 42f8cfcdbd3310c7f016690eccf56df7e109ebad8610737d78b6617a734197ffd2026fd203f19a4e6cb1e6b87b2feb0e2c5f48161c26e3b50dff31838f653364
-MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
+EBUILD unison-2.48.4-r1.ebuild 2447 BLAKE2B 5024275888237d751a662dab1359b472f4567687d5149b08a473fd83fc6bd8d7a606e19a88c69a4e0a56e83ca870b410e7ad9666d6e1f0fe5b4b3fb13f684684 SHA512 12ea4b576bf8cc91ffb2cb31b3f7994e7271b13d23ace19901478ce6ec8df38abeae5548b9941c83526e298a00e53916478d646b4a3ac6616af249c5f1cbc928
+EBUILD unison-2.48.4.ebuild 2339 BLAKE2B c872c4f22d286f150cca2032130d8d48634f0174a073bb30c735a73724fba192201ccc6433993d18b0c8b972fc36759054647d9a662eb3af61847b1fabb0964e SHA512 f3fc19ba27f706ac34d718b8228f0a187a347783e18173eb4170ebce78fb22ab02191386132ef7f825d914f3396676f847b011a0d076a8ce6f804a4df2acf2b8
+EBUILD unison-2.51.2.ebuild 2162 BLAKE2B 13c270c67910618a119ecdf9c3779c1175b64ab2bc17de2735413120404a7784ff8de8e8b9e48c3b91bed3b5e7aa0e84370a159ce10b5753c28ddff63e4804da SHA512 847b543b1e83d1036e57c4580103ba4c3c0f31c080c8dea96e3261ad87b06bff0a8269a5f861ec559e9e41f977de5ea9f9825aef62e69bd3f666f1b2aa2fd7bd
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml
index ffac4d7ebc01..6f49eba8f496 100644
--- a/net-misc/unison/metadata.xml
+++ b/net-misc/unison/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild b/net-misc/unison/unison-2.48.4-r1.ebuild
index 01f53f133dfd..3cbf95371a25 100644
--- a/net-misc/unison/unison-2.48.4-r1.ebuild
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -7,15 +7,19 @@ IUSE="gtk doc static debug threads +ocamlopt test"
 
 DESCRIPTION="Two-way cross-platform file synchronizer"
 HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
+SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
+	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
+
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 
 # Upstream, for this version, has explicitly disabled test with marker
 # "Skipping some tests -- remove me!". Given the potentially destructive nature
 # of those tests, let's not try to run them (they're re-enabled in subsequent
 # releases).
-RESTRICT="test"
+RESTRICT="test !ocamlopt? ( strip )"
 
 # ocaml version so we are sure it has ocamlopt use flag
 DEPEND="dev-lang/ocaml[ocamlopt?]
@@ -25,10 +29,6 @@ RDEPEND="gtk? ( dev-ml/lablgtk
 	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
 	>=app-eselect/eselect-unison-0.4"
 
-RESTRICT="!ocamlopt? ( strip )"
-SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
-	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
 S="${WORKDIR}"/src
 PATCHES=( "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch )
 
diff --git a/net-misc/unison/unison-2.48.4.ebuild b/net-misc/unison/unison-2.48.4.ebuild
index 1cbadbf207ac..fb513a40f2e3 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -25,7 +25,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
 
 #PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
 
-RESTRICT="!ocamlopt? ( strip )"
+RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
 SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
 	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
 		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
diff --git a/net-misc/unison/unison-2.51.2.ebuild b/net-misc/unison/unison-2.51.2.ebuild
index af6cf20473a2..3be608825bf9 100644
--- a/net-misc/unison/unison-2.51.2.ebuild
+++ b/net-misc/unison/unison-2.51.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="gtk? ( dev-ml/lablgtk
 	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
 	>=app-eselect/eselect-unison-0.4"
 
-RESTRICT="!ocamlopt? ( strip )"
+RESTRICT="!ocamlopt? ( strip ) !test? ( test )"
 S="${WORKDIR}"/src
 
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )