gentoo resync : 29.08.2018

17 files changed, 194 insertions, 40 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8925bdaa4129..3fc5722cf6e9 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 271093518328..80949cc2d620 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -5,6 +5,6 @@ DIST dropbox-lnx.x86-45.3.88.tar.gz 108891513 BLAKE2B f72ea5663a2ea46b0c34294eb1
 DIST dropbox-lnx.x86-48.3.56.tar.gz 108876564 BLAKE2B b809a220605265685026657e791aff3e716f7ff51e1fc5074d66df87eb8dc473c63c7513c94ca0715844c600fe71aaa3c42a108be4baee2e3e72baade97e3429 SHA512 3174c41e19a01cbd986c111711bc0df80b68882d595a5c869b81bfa1982b3f219da4cda852168bf7fdc9d67b91f52260017f4d25508f6372efd470536a6b96c8
 DIST dropbox-lnx.x86_64-45.3.88.tar.gz 114967662 BLAKE2B 3276b3b20bc96eff3a756064c64b5a0e8ad28b27d29579dd6dc34043427bb209bc5d86be62651f6642f61af17388113ec9a1a4a211e3149ecb8679a4b8e505ca SHA512 d3a787487084237fff928afd6ec2192f27e196c589bba3c6bd8a501055d1a3d4c8dcb88b15336ea03bed38e2a02d0731bb9725cbb324bb6e00ec95e98ed671ea
 DIST dropbox-lnx.x86_64-48.3.56.tar.gz 114940928 BLAKE2B 7d678344b59aa12bdbd28f3e425c0b80b15feae403911ef25a03150d1dfa47e94da1eb17d4b703feea6721d2fdfa721da54fab92e1a56b6b8f31456482bc3614 SHA512 cbd3eed71286be079aa8c898929dea305a4cefb9b5e2e41b196d07f68bfc3b5f2839f78d676a3fd7df62644fe00b9ad1930121bde88a6eea9c864d956ccb6f8e
-EBUILD dropbox-45.3.88.ebuild 3084 BLAKE2B fc1bc1fe1af2b398ac5dc968e3d6d490885efebddb5c122abc95aaf43bfe6aa5645f45b8e633b83ca11197aec2b4aa465edd4edc0ae8aaa50a08dbff881147e8 SHA512 3ff3239346087b27268891cc4aa315dc57520e5c988780155d68c6554bc5a62a708f782ddfbb793fdcb451d8264b9de38fd8ef97899596dacccc254e629378b3
-EBUILD dropbox-48.3.56.ebuild 3086 BLAKE2B 0862a2529d92b088493d6382fbc30c67172c8902897fcf3265983428013eaeae268e146d023eba23486ab78de418920b9fe5c126491e58957195faac8a5c5070 SHA512 8ae9a3b7e9634cacf5721f736cb5db39213b19a8007eb19ae27ec9d292a81d3fb0ee82eb51134975c52dce4512fafa82c20b8b6ed21b0e155307a5681b130eaa
+EBUILD dropbox-45.3.88.ebuild 3051 BLAKE2B d9cfe69c1692b41279515b7773b843d745617c0353093be3739f293a3451f144001c0f7d32fc09b8cf477faba9dab270aec6254128a7ad6d41bcdf8dbf3251f0 SHA512 8db5dd0e9491cd822308d32f13941512fc2808992bc61c871f86de3600ec20410f0839e63db328a749d7323e482ccca3bb098308cd0154c0f29e323d5eb90ff7
+EBUILD dropbox-48.3.56.ebuild 3053 BLAKE2B 27e2f6dd3db07da139960b26c9ad1e21da10683962bbac501156176177052521ced303d073ecab9b4c94612347ad571b47c562fe18f3ebdd33e6aceb00a69ea4 SHA512 a1ab89b79cbe551ab7df51f94c3ba6949cc1cc37a08330b5d2f59aedeeb4afbd6ae4bd2a5a01d56b5cf547945d4e58506f22e516d4b4104ec1c5b5c1caaa23dc
 MISC metadata.xml 392 BLAKE2B 19f1d26ecc891282c1930e65db36adbfc73c6cc110dbfa1a90a6ed85f87dd1936860dd1710c3c3e2593df22fea34e5aa803a4b46a812e764563dcad19320c466 SHA512 35be87e089ea5aa62a5f90ac1241953df5c5115dc59258c7f5bdbacdb7a11938c79361c07e87d366f1db2af8a172d571cf2c9061885c60b7fa39a802bd31a141
diff --git a/net-misc/dropbox/dropbox-45.3.88.ebuild b/net-misc/dropbox/dropbox-45.3.88.ebuild
index 5a3d903cc0f5..8cdfeeebd379 100644
--- a/net-misc/dropbox/dropbox-45.3.88.ebuild
+++ b/net-misc/dropbox/dropbox-45.3.88.ebuild
@@ -58,10 +58,7 @@ RDEPEND="${PYTHON_DEPS}
 	net-misc/wget
 	>=sys-devel/gcc-4.2.0
 	sys-libs/zlib
-	|| (
-		sys-libs/ncurses:5/5
-		sys-libs/ncurses:0/5
-	)"
+	sys-libs/ncurses:5/5"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/dropbox/dropbox-48.3.56.ebuild b/net-misc/dropbox/dropbox-48.3.56.ebuild
index a69c77c3b6c2..508ca3b746e3 100644
--- a/net-misc/dropbox/dropbox-48.3.56.ebuild
+++ b/net-misc/dropbox/dropbox-48.3.56.ebuild
@@ -58,10 +58,7 @@ RDEPEND="${PYTHON_DEPS}
 	net-misc/wget
 	>=sys-devel/gcc-4.2.0
 	sys-libs/zlib
-	|| (
-		sys-libs/ncurses:5/5
-		sys-libs/ncurses:0/5
-	)"
+	sys-libs/ncurses:5/5"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 50cf828343d0..0df953dd8434 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -7,11 +7,11 @@ DIST kafka_2.12-1.0.1.tgz 44474706 BLAKE2B 59aaa2bb2f1940b4d581882eaedbba091149c
 DIST kafka_2.12-1.1.0.tgz 50326212 BLAKE2B 079118f6e269c028a78700a6d11f70c36b8856a5f4180050c5d4b667f6f719fcffcc50433a687e6b181dd15423dbe28dfdfacd82f6d6046e8839a21d56c6377f SHA512 48d1ddc71f5a5b1b25d111f792553be69be62293640a3c6af985203c6ee88c6aa78e01327066bfad3feae6b0b45d71c0cac6ebd2d08843d92269132741a3791b
 DIST kafka_2.12-1.1.1.tgz 50602117 BLAKE2B acef2456e70278e09fe2a686205829d0c699aab6057ca0ba458bc1ee141e6d9336013e664b02242ad83401f4f71a8ab4b42574ffcaa99b05f55ef68a4b87d72d SHA512 2a1eb9a7c8c8337c424eefed7baae26b3dacba6a4ab8b64d9a7d5c6ee2cdb66cfa76c5b366f23435941569b89bf02482625189016296b2ea2a05fd0f38f6b709
 DIST kafka_2.12-2.0.0.tgz 49405896 BLAKE2B 601ea97c3007e2d09b1520baa86bf9ed7e740ba6e1aaac675cb158dad3e079a253e032ba7e1034526fa04d7f8088043747800b37db59232b45e729b944029f6c SHA512 b28e81705e30528f1abb6766e22dfe9dae50b1e1e93330c880928ff7a08e6b38ee71cbfc96ec14369b2dfd24293938702cab422173c8e01955a9d1746ae43f98
-EBUILD kafka-bin-0.10.2.1-r2.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
-EBUILD kafka-bin-0.11.0.2-r1.ebuild 1492 BLAKE2B bf1ef604907033196656a8b3892fa1c267bfbbbe5faab963b20c1ddbb832c48bc9cb9f254d7a03417635ac9ba82e7be37a33fd005499b7b3137a5dbea299770c SHA512 ba1374b720a1fa8178ba2557d98a4bfe8b9bee0c6ecc598a4ad90d02d5fe16d8b77c24ad3f76382e3bce30a9da979a5d1090667b5889aa2d4dd36873b3f13b88
-EBUILD kafka-bin-1.0.0-r1.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
-EBUILD kafka-bin-1.0.1.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
-EBUILD kafka-bin-1.1.0.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
-EBUILD kafka-bin-1.1.1.ebuild 1473 BLAKE2B a81a81398ba9740a7a63d371ee95e49d85b955da7213ce76e6f79af1dfdd5cb82f435d84e485f175daab0f3bd42a65b0723d26b53f0b96524eb2d61857c5a5c0 SHA512 09183d60d03861587177d48157da6d368a9d6b2e37140021380697decdb5504db39efe9b1b42fe6c372e2f6640fe2d70ba516bb3145db11949e4b6b5c66f753e
-EBUILD kafka-bin-2.0.0.ebuild 1470 BLAKE2B 4aaa459feef046beaa51a9aead391ba79c03f2dd3f2f17bcf19470cb48f387e861d843fefe376afe4cbf4150c2c5c879d30b9f0f7da215403723c4f935ac89a0 SHA512 ffe99368c9a836d63441f34aea7d130de197f5d63de0a92af6c928b3d47dbafdde467bf304f6ab32006ef0eba3bc1c3efcacf5e6d81d064e1997878037204a32
+EBUILD kafka-bin-0.10.2.1-r2.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
+EBUILD kafka-bin-0.11.0.2-r1.ebuild 1466 BLAKE2B 5fc18d046403eeb6c501f70030553b14c5fdc942bd7f504c8cbe40adc9f09a6645e54ca2f1c15ebba261f792db5be8d61b800c756ce3f34a0ac6240e310a6726 SHA512 1ba99aaca03965df8676629e571d61abb2a95aa7bf19ad34f5032d10b947fb5e3bbfbaf8e4cc122809a9c0d0a4b0f8fcddf1611c2ee54a7bec840a5f2fa0647b
+EBUILD kafka-bin-1.0.0-r1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
+EBUILD kafka-bin-1.0.1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
+EBUILD kafka-bin-1.1.0.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
+EBUILD kafka-bin-1.1.1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917
+EBUILD kafka-bin-2.0.0.ebuild 1460 BLAKE2B 0daffcba280aa1d893a6300ee489e09ffb0fe28a81a63e5821532f912642a236a3f5bff850775fa55a9a6f10165a139dbd2eb3c98a02599d61daf1b982c27e99 SHA512 4668e1ca308d2e49db6b1aab86699d94eed2599dc5276a8cc963a1eb0ce192991c5506371e4dfd382b9b0ce608c2da7e0007d23c5b72159fb2acd10ef09e6ac0
 MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6
diff --git a/net-misc/kafka-bin/kafka-bin-0.10.2.1-r2.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.2.1-r2.ebuild
index ae63ac0018b8..e285fe9e87d6 100644
--- a/net-misc/kafka-bin/kafka-bin-0.10.2.1-r2.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-0.10.2.1-r2.ebuild
@@ -21,9 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="internal-zookeeper"
 
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
+RDEPEND="virtual/jre:1.8"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.2-r1.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.2-r1.ebuild
index e16e10cae84f..e550727584b1 100644
--- a/net-misc/kafka-bin/kafka-bin-0.11.0.2-r1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-0.11.0.2-r1.ebuild
@@ -21,9 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="internal-zookeeper"
 
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
+RDEPEND="virtual/jre:1.8"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/kafka-bin/kafka-bin-1.0.0-r1.ebuild b/net-misc/kafka-bin/kafka-bin-1.0.0-r1.ebuild
index ae63ac0018b8..e285fe9e87d6 100644
--- a/net-misc/kafka-bin/kafka-bin-1.0.0-r1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-1.0.0-r1.ebuild
@@ -21,9 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="internal-zookeeper"
 
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
+RDEPEND="virtual/jre:1.8"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/kafka-bin/kafka-bin-1.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-1.0.1.ebuild
index ae63ac0018b8..e285fe9e87d6 100644
--- a/net-misc/kafka-bin/kafka-bin-1.0.1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-1.0.1.ebuild
@@ -21,9 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="internal-zookeeper"
 
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
+RDEPEND="virtual/jre:1.8"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/kafka-bin/kafka-bin-1.1.0.ebuild b/net-misc/kafka-bin/kafka-bin-1.1.0.ebuild
index ae63ac0018b8..e285fe9e87d6 100644
--- a/net-misc/kafka-bin/kafka-bin-1.1.0.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-1.1.0.ebuild
@@ -21,9 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="internal-zookeeper"
 
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
+RDEPEND="virtual/jre:1.8"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/kafka-bin/kafka-bin-1.1.1.ebuild b/net-misc/kafka-bin/kafka-bin-1.1.1.ebuild
index ae63ac0018b8..e285fe9e87d6 100644
--- a/net-misc/kafka-bin/kafka-bin-1.1.1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-1.1.1.ebuild
@@ -21,9 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="internal-zookeeper"
 
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
+RDEPEND="virtual/jre:1.8"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/kafka-bin/kafka-bin-2.0.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.0.0.ebuild
index 3abcc1ad7e01..04dbadb9ac3d 100644
--- a/net-misc/kafka-bin/kafka-bin-2.0.0.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-2.0.0.ebuild
@@ -21,9 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="internal-zookeeper"
 
-RDEPEND="
-	|| ( virtual/jre:1.8 )
-"
+RDEPEND="virtual/jre:1.8"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 223838feb532..69057dab4d0c 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -5,6 +5,6 @@ DIST spice-gtk-0.34.tar.bz2 1480566 BLAKE2B 35350cf930d091fa11df1d573f9eff236967
 DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af730b37f1c37e16ac3042d662373b4e4021808d5ca72440012fb36a5119ad11858cb8cf872b04376518487faebef49 SHA512 f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729
 EBUILD spice-gtk-0.34-r2.ebuild 3752 BLAKE2B e27f8a92b0284f6fa2296f0a5f7cb38d01eec7e7502e6730186094835d9ce3b397f002206a976a861ef9e2ef904b8256d696c6e46783c30875b16781df597875 SHA512 1c756aa20ca07af0bf3796b7e42bf76337a15ac3d5aa794eee24649ff9f503e014e7bfc8ac815b6117f5ceca3c2f8461af94cdb89b8119217ab21dff78bd7b1c
 EBUILD spice-gtk-0.34-r3.ebuild 3838 BLAKE2B 6a3789e5ec78191addbda947d680fe0adf97970c7a2b47f0b9f015e29d1b9c159f23820a025149dc78df56d0d2c46480a27e53651891413a53b7022d78477b10 SHA512 8f9de4514153f47b1c26fd586dd4cd56a9c68140892d194950fa510755ae2f979ccc75d9e4a696a57ccafa0108464e758fb93216cc8f940debb47d7f0c8623d9
-EBUILD spice-gtk-0.35.ebuild 3809 BLAKE2B fffcc99ca1a4a6084fd296bfab2f101fa9924e80fc52dac5ff6f20ac8b3031af51f218e013c9bc4dabaf60c510799feafbfe5baef91947e05a236b431e79a56a SHA512 b35b3eee0f14e0dc7ca9c6b41e3ec989eff48d84074a1aa6cbc1d85339970c1621c223a6f3f0519a6f8c2a7ee88f1bdfc2f412229a4a72cd72442d27a1131f5b
+EBUILD spice-gtk-0.35.ebuild 3809 BLAKE2B 8bd08c0129f60b4a12f95b166b7f773eefc32452a5490350e0002577e4325b6e94249297526099126a95bd25e3a36b6765066248fb590789d1fbce65306ec4a2 SHA512 b4a0eaba4761d9cdd99fbc8d8c81593084f21a62c61961dcfd44bcdfeb76bfddfe4b89cf22966c58359e2e3c712336fe6233f0d3f66844b0e53c2be780db1ec0
 EBUILD spice-gtk-9999.ebuild 3693 BLAKE2B a85fb7bd44fa36252f13c6d5a25fba4eb213e41a0c5b6d77c2bdbfe4e250981970f42c359175d1de41d81feb86e59ce6e524304eb8e3d8111181f1ec36f2e848 SHA512 3dc59d0315a6e4786a9af9d662647dfc056ce4ab4d2f57c1e308f767e19cd49a769b4fbbc9c8bb985f8b873569641f95e7099719df7fea02c894ecb00d4c882d
 MISC metadata.xml 1166 BLAKE2B 37cf826a7a49dc48170fb99e05b191964810eacbf8b13db383a37e70faed6a2b4b70acfd724eeffbbe10d97fab27bfec7d56cfb2cbc2537ac4df7612afdbe8d2 SHA512 5229ddeaf19765abee5b0120b066ac2049f77878b1b8886e2b552f2c56d6049df297b227f0bee36bbe6be7041b9d8e1c1d3d868c34b1e39b49a5c0bc16b2c947
diff --git a/net-misc/spice-gtk/spice-gtk-0.35.ebuild b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
index 336cd853c148..707c9f7ae81b 100644
--- a/net-misc/spice-gtk/spice-gtk-0.35.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
@@ -63,7 +63,7 @@ RDEPEND="
 		>=net-libs/libsoup-2.49.91 )
 "
 DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-0.12.13
+	>=app-emulation/spice-protocol-0.12.14
 	dev-perl/Text-CSV
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40.0
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index ea6ccb78d0ea..6b6b305a9bf8 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -2,5 +2,10 @@ AUX unison-2.48.4-Makefile-dep.patch 542 BLAKE2B b32665bd2562c84aae1a801648c9324
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 8e262e3e28b9f4cbe3925340aa3b08e99f1c30e8d3253cf2c82647e30708d30eb20c544184d54d1683ff9b01ac6913af0df924f0b16431ea2ac79bc95ec4a71f SHA512 c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024
+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 2476 BLAKE2B 7c483145b97e885db2e68d46746bfcae88587cd9a96b2deb415ec4ba3e7df1394bb024b9ec8bee0b3167c7c2d2eabec24ae3769cecca499ffb7769f08f295f66 SHA512 303b82ff2168c1ed583c694bbe9b47d073558e804221d10b8821778f21c3092415389272b5986c94f29cfa6139047ccd8448c11538137b943b4187f3e11f38de
 EBUILD unison-2.48.4.ebuild 2339 BLAKE2B 18690805b5ca16fe8e5ecf7906c464459d3a04a8858592a6fe32d40c616a66b3af38e98f13970dca2200d657ff6cf4627e0420008588c4c5192017934cc39e4b SHA512 daf666874caaa8e991136e7ac67281c75d3572e39c4aebdd6422941411dc59f6b5c339c99660339e284984df5b785c3de47b2fbf1e2d450a0b60144d67b787ef
+EBUILD unison-2.51.2.ebuild 2162 BLAKE2B f17fb736c038d256c9f567ffa06489ad3deba275e85f8293432d53fd1b28902a2ee6e2d543b250c861223882d1c846e9c015f78749d21cdfd32a206a3d722053 SHA512 f72c4026f00b9cd116d45d7aa6b0c869d8d6eb3428e68381f95eae3be8c0196cf456567f54cd98768edcae947825494368e4ec4f58be2749fe95acd524bb11d4
 MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild b/net-misc/unison/unison-2.48.4-r1.ebuild
new file mode 100644
index 000000000000..55e5485844d4
--- /dev/null
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IUSE="gtk doc static debug threads +ocamlopt test"
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+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"
+
+# ocaml version so we are sure it has ocamlopt use flag
+DEPEND="dev-lang/ocaml[ocamlopt?]
+	gtk? ( dev-ml/lablgtk )"
+
+RDEPEND="gtk? ( dev-ml/lablgtk
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	>=app-eselect/eselect-unison-0.4"
+
+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 )
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_compile() {
+	local myconf
+
+	if use threads; then
+		myconf="$myconf THREADS=true"
+	fi
+
+	if use static; then
+		myconf="$myconf STATIC=true"
+	fi
+
+	if use debug; then
+		myconf="$myconf DEBUGGING=true"
+	fi
+
+	if use gtk; then
+		myconf="$myconf UISTYLE=gtk2"
+	else
+		myconf="$myconf UISTYLE=text"
+	fi
+
+	use ocamlopt || myconf="$myconf NATIVE=false"
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake $myconf CFLAGS="" buildexecutable
+}
+
+src_test() {
+	emake selftest CFLAGS=""
+}
+
+src_install () {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	local binname
+	for binname in unison unison-fsmonitor; do
+		newbin ${binname} ${binname}-${SLOT}
+	done
+	if use doc; then
+		DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
+		HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+	fi
+	einstalldocs
+	use ocamlopt || export STRIP_MASK="*/bin/*"
+}
+
+pkg_postinst() {
+	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
+	elog "in your profile files to access exactly this version over ssh."
+	elog "Or you can use 'eselect unison' to set the version."
+	eselect unison update
+}
diff --git a/net-misc/unison/unison-2.51.2.ebuild b/net-misc/unison/unison-2.51.2.ebuild
new file mode 100644
index 000000000000..25776c6fb519
--- /dev/null
+++ b/net-misc/unison/unison-2.51.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+IUSE="gtk doc static debug threads +ocamlopt test"
+
+# ocaml version so we are sure it has ocamlopt use flag
+DEPEND="dev-lang/ocaml[ocamlopt?]
+	gtk? ( dev-ml/lablgtk )"
+
+RDEPEND="gtk? ( dev-ml/lablgtk
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	>=app-eselect/eselect-unison-0.4"
+
+S="${WORKDIR}"/src
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+src_compile() {
+	local myconf
+
+	if use threads; then
+		myconf="$myconf THREADS=true"
+	fi
+
+	if use static; then
+		myconf="$myconf STATIC=true"
+	fi
+
+	if use debug; then
+		myconf="$myconf DEBUGGING=true"
+	fi
+
+	if use gtk; then
+		myconf="$myconf UISTYLE=gtk2"
+	else
+		myconf="$myconf UISTYLE=text"
+	fi
+
+	use ocamlopt || myconf="$myconf NATIVE=false"
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake $myconf CFLAGS="" buildexecutable
+}
+
+src_test() {
+	emake selftest CFLAGS=""
+}
+
+src_install () {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	local binname
+	for binname in unison unison-fsmonitor; do
+		newbin ${binname} ${binname}-${SLOT}
+	done
+	if use doc; then
+		DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
+		HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+	fi
+	einstalldocs
+	use ocamlopt || export STRIP_MASK="*/bin/*"
+}
+
+pkg_postinst() {
+	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
+	elog "in your profile files to access exactly this version over ssh."
+	elog "Or you can use 'eselect unison' to set the version."
+	eselect unison update
+}