gentoo resync : 16.01.2018

8 files changed, 27 insertions, 34 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 11d207bb5d67..8ac565888a5e 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index cc769fd8037a..faa4cc77d250 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -4,7 +4,7 @@ DIST i3-4.13.tar.bz2 1121298 BLAKE2B 94f3940406d43083c8dc577b4216a32a08ad4c4b58e
 DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba SHA512 ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
 DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 EBUILD i3-4.13-r1.ebuild 1898 BLAKE2B ee0a771f9735272a28285c38b30d9693d6eea70c4238142a271c2a31f3a54f874fb88b22acde07895577aeccf98f0ab124ae14cbc81249316c4a2f00cc88c1a1 SHA512 fa0fc10c2989175051e86ff329a560ad07ba0aac2c16e19f9e7426d7a74b96be4dda9146a899f4498858fdc9558ba27b3281c7df9ad936988310a441002aee0d
-EBUILD i3-4.14.1.ebuild 2378 BLAKE2B b1a492918c2473fe3ac05189022111c94d192474900c09301d3d53561d32511666103d27ceb1e8f704e50d5f2cd5dbd33074629e6baf2adca7ec538abbbcf798 SHA512 eca6107b9ca9eed35745dd2e4ef8aebe4a95a53327b33da3ba501a30080c6d4fc8825714562185278a5779b5dfc6084c1cb2f5224a43c9ae4d65d592e029c223
+EBUILD i3-4.14.1.ebuild 2288 BLAKE2B 8b61896ae179c7130cfe4e220347af27d68401a18703017036032c7100976541a240f65e10465bdb359cca6c1dc86717dab041b80507825f84e89ee6bfc84c0e SHA512 3a66ade6582d9c4a5c45b76eb0dc4d1c1278c51f4e55ddda5d80da65ae1154b13b7e02fecc663ae2605191366eb82affd10a885bf33240a9598f5e27effe915c
 EBUILD i3-4.14.ebuild 2018 BLAKE2B 1623ddaf5351872074ec15137bbe61ee855d65ea31915c8090346164e574af4b9d9180f0f8665d931a0cf6464c9ee40b2702f38919559a0851a5f560d1c94fac SHA512 1f6e635f080952aa55416e367f9bbbca4929a73cde2080e121fd76dd1396f01d43199871d09fed71f5b6680f0d94cef5d07c2b8f86675d63763464b6e3d95c2d
 EBUILD i3-9999.ebuild 1716 BLAKE2B 46975a8704867cb17347dc1a2abc133e1d12a1ad2db0f6e27d2e6cbd68fbcf1e52b6c7dc9da4a5da1f99958fedbe1eb6fe5329bf46778b868b656fe9f19a8558 SHA512 da9b92fdc17543284b129956fbb517f49d670121f2e3d0cd5fcec2239612810030a4d45f6d2178c22d6c939d3528bc97ca38c35c2073d45f8b208b56c6dcd505
 MISC metadata.xml 578 BLAKE2B f7f67f561bb427395103450b3e3c40d80001b4bc820b9c33fada9017e7c030d14940b4ca74669ded3f474ab1f4ae72b89ea640304752888212d86ba17c5b5405 SHA512 b0585d5a5d421e8176d1f47e250e049e41cbd375a19f4769d291108e81847dff71c1ded0cd22b25df50af69896941cb439c4c39317414784df57cfeb33dc946e
diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index 1d884372499b..df485534f2f4 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 AEVER=0.17
 
-inherit autotools virtualx
+inherit autotools out-of-source virtualx
 
 DESCRIPTION="An improved dynamic tiling window manager"
 HOMEPAGE="https://i3wm.org/"
 SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
@@ -53,10 +54,6 @@ RDEPEND="${CDEPEND}
 # in type-punned pointers - which in turn causes test failures.
 REQUIRED_USE="test? ( debug )"
 
-DOCS=(
-	"RELEASE-NOTES-${PV}"
-	docs
-)
 PATCHES=(
 	"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
 )
@@ -64,18 +61,6 @@ PATCHES=(
 # https://github.com/i3/i3/issues/3013
 RESTRICT="test"
 
-src_test() {
-	emake -C "${CBUILD}" \
-		test.commands_parser \
-		test.config_parser \
-		test.inject_randr15
-
-	virtx perl \
-		-I "${S}/testcases/lib" \
-		-I "${CBUILD}/testcases/lib" \
-		"${CBUILD}/testcases/complete-run.pl"
-}
-
 src_prepare() {
 	default
 
@@ -87,22 +72,30 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
+my_src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
 	)
 	econf "${myeconfargs[@]}"
 }
 
-src_compile() {
-	emake -C "${CBUILD}"
+my_src_test() {
+	emake \
+		test.commands_parser \
+		test.config_parser \
+		test.inject_randr15
+
+	virtx perl \
+		-I "${S}/testcases/lib" \
+		-I "${BUILD_DIR}/testcases/lib" \
+		testcases/complete-run.pl
 }
 
-src_install() {
-	emake -C "${CBUILD}" DESTDIR="${D}" install
-	doman "${S}"/man/*.1
+my_src_install_all() {
+	doman man/*.1
 
-	use doc && einstalldocs
+	einstalldocs
+	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
 
 	exeinto /etc/X11/Sessions
 	doexe "${T}/i3wm"
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index ac22cda95850..46953bb07ae0 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,10 +1,10 @@
 DIST marco-1.12.1.tar.xz 1163996 BLAKE2B ff133af6d56a7c91c0b104fdbfe82ce16492429ec24a06251d106b76b52b3cf4c560ec1c304b398ced61350d79410aceb5e004fc4cd8d9893faae6743788cf34 SHA512 d271c4627fc50643d8e1a2faec33b5327999ad16a3975d62ea3ded956bccf3d5e015ed8085d43a200a34f1ea78f17d7e4ea4afaa9111e5f2e3a2230b51752945
 DIST marco-1.14.2.tar.xz 1244076 BLAKE2B a1f88f49a2d5048ba6fec2c5c5b86ff1ed546638256782ef1e9fa27f5253e65d67055e96d8d337d4bcc41fbe614164695483e76c2f2fac6bccd1f842548ab795 SHA512 6ca782f5dbbc01f5df4be901a1a6bf5b23398716e5802118482a0bf98e35f4dc544a6070358a931ca11f2d8b71cbbfb7e8768e0535c6605433a202be348ddf84
-DIST marco-1.16.0.tar.xz 1245540 BLAKE2B 11bd58e79f73f294edc808a9b0128dbba92f4bce190996a924fe15d4b0d9c718ab398f83d148e9e8c759fc9093c15eac554f5db65d1abcdd5c38894f8f5420cb SHA512 f353514dc69543e97fe08f9c67275c195ddc1c52b8b98dfb956351580b541a20b9f3a63d0b41939aca59e2416e58bb384206bbe2b8f56a26435b9760d23665b4
+DIST marco-1.16.1.tar.xz 1247072 BLAKE2B 71959f5b37a2e499ae7a304de279d0b87b56618ffb135e6792dccbbdf0fe4dbff091257d6c6e856162a0c80d3c08c0aae8233e94d8526af3072479b4d06a02b5 SHA512 c5f88d71378a210e6490edab2db8bedf12eb013ce89fe232863c6538b240f38b7393474893bcead6904aad1835d1dc8794328e71235f17194ba3f0c3c426de36
 DIST marco-1.18.1.tar.xz 1251108 BLAKE2B 8ef3a6f2fb8a412b99be2f721bc3484a11e5267c6a988a949162f939453868d559aab3fe2d9a5b926c70058ca6ab3a9accbd343548e5cdb05dfb99db81ef9a27 SHA512 d6851c8c1c5bc25993dc72de7e5090736d236942ad37124ef52d0c23cc66faa1e4288273160bb9c1d1c303c99e3e096dcf031b2ea70bde93858627f31034708c
 EBUILD marco-1.12.1-r1.ebuild 1565 BLAKE2B 52aa8d582b335fa717f24f6eea05a6b9b4c6458028cf3d369cfefd7afa9b710f3ddaa41732caabe107ead2503fb7248923688d3cee47dca90908361a8e112bf1 SHA512 f67061e9d5a4db1b1fab69e9895057148316ec31e085bb33cbc78501e6e77df5306d5fe16478f080680294767aa531eb9db7466c4ba839efc44e5cd438c026eb
 EBUILD marco-1.12.1.ebuild 1523 BLAKE2B 5309f6ea4d04f2d1d89cd93bcc5bc71e732ed302a4c8b725c568d4ca4733576011e85335ab149451134b6a12bf9b7fb40355ebb85cb283f7ce9ba9e750c46d12 SHA512 a032aa7dd3eaaef4b6a5dd38330ddebabd61b1f6dd6ebc9569e036368cc5b23e66dbde8f89886fa0a27115c4ba128767b479828bf52a9216d3d06095a9dcbe4d
 EBUILD marco-1.14.2-r1.ebuild 1606 BLAKE2B 9baad655deceb177686f705b5666c41de4913ef05e4d2127d00c4eae99e589fc53117e68ca20d1585834bbf0ebcfb745c35d36cb56f3c1255cc906a90cb7747d SHA512 4f67f7f03ff5efeb95c262ec9b22b2d202b8a884f1a183773600941171ec185142676458bbba96930c82d96bdd8963814eb77bf9c877501320091d63d53c0231
-EBUILD marco-1.16.0-r1.ebuild 1606 BLAKE2B 9baad655deceb177686f705b5666c41de4913ef05e4d2127d00c4eae99e589fc53117e68ca20d1585834bbf0ebcfb745c35d36cb56f3c1255cc906a90cb7747d SHA512 4f67f7f03ff5efeb95c262ec9b22b2d202b8a884f1a183773600941171ec185142676458bbba96930c82d96bdd8963814eb77bf9c877501320091d63d53c0231
+EBUILD marco-1.16.1.ebuild 1606 BLAKE2B 9baad655deceb177686f705b5666c41de4913ef05e4d2127d00c4eae99e589fc53117e68ca20d1585834bbf0ebcfb745c35d36cb56f3c1255cc906a90cb7747d SHA512 4f67f7f03ff5efeb95c262ec9b22b2d202b8a884f1a183773600941171ec185142676458bbba96930c82d96bdd8963814eb77bf9c877501320091d63d53c0231
 EBUILD marco-1.18.1.ebuild 1480 BLAKE2B 8e9c8a30b52686f628db419f22e4fdab76959f1a03c9b6083d9be265c477505febd88a2c469af064d161f1eeb37c3edcbd278a8935c68dfadc4a37fb47e46639 SHA512 242ca3e45e8f4c7ceebd32234e5ab6a749bd464d4714a86c21607b8cc6e9651d367f56fdee18083caa832625828d650a4527d602089e76c1de544cf0b3abe80e
 MISC metadata.xml 410 BLAKE2B 11d9345ad1a0ebbb5b537c27a3447cfb56cdcb621bb3df330f163612415a48e542a78c563689c33e52ee81eb19a9654a2ed45f27f45604b5f6cc2e6ef04953d5 SHA512 3736e03b4952f45354445560aa2aa6118a3257fe8b00d8d39df7946f65cfee017ef04f48447807387a9a4b6f37641bc55074efa7cadd944e1243feb183ab1d84
diff --git a/x11-wm/marco/marco-1.16.0-r1.ebuild b/x11-wm/marco/marco-1.16.1.ebuild
index 5cdf56cdaaf6..5cdf56cdaaf6 100644
--- a/x11-wm/marco/marco-1.16.0-r1.ebuild
+++ b/x11-wm/marco/marco-1.16.1.ebuild
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 02ab9fdcda51..4f227de7f530 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -8,8 +8,8 @@ DIST xpra-2.0.2.tar.xz 1926876 BLAKE2B 2bd681ebbe6a7041975033c9a30e5b5fdf69352e8
 DIST xpra-2.1.3.tar.xz 2070192 BLAKE2B b1f54705c877317bf0a3397303af2a516f6e7deb6baa252065f768bd3fd07ec87991b04c14a3aa054da0655543185dfdb99fa2972fb1cd8a2a04d72bb31fafc6 SHA512 aa916953d34477c2c80d99a4d5733586b4122edbc18f2c9952a5d3c9581f7b8e8c55cb1ed4077989876a9a7431faa9c4f7f96f82fc007034f92cacad16429ef8
 DIST xpra-2.2.1.tar.xz 2195508 BLAKE2B 5f94e96ddce7df0001ca3ffbc64570c59f02b1b49fc45c364999f47d188b1ef349018e36ed070cf8c26f60efc77c24741f44856f307b68535c982e6082dc0d7a SHA512 fca213a72805b6b1d533f91cd5e4186bd881e083663488b697c71c79fb4a3bf312fd1491aef78cf363e429c5841d706e444c9e69c72351b1551ea7fc9395c0c6
 EBUILD xpra-1.0.6.ebuild 3954 BLAKE2B 374018a2ec481759522c31243937e4d81b8b58fa0334414bac81e0affc26869290af8842245cdca25a642a2e1c1c112421d4e099b28f98618b237c98d8196155 SHA512 adfc00b39fa458b1a178d723ff589f151a488c97ed4a35dd834d6beb3d8334150dce2cf59c189a6d6fe75d0117ea34d641560c14f0ca75c41b8c42396dc45ccc
-EBUILD xpra-1.0.9.ebuild 3978 BLAKE2B e5804682d43b89132eb8d563f02ce337369eb47bcbe8bdb3e603886bea09e56bd09a739226c5c2b3a745e0b17a11a53b0c1d74af9adcede4650d8d483dcaa939 SHA512 981a2483d631b46cd42ffa125d4b6889e9d6407b8d553613e4975487d7ffce4e667c9229db7e75b9009c44347dfc5e6b9d8570c10fb33c412336524b41c4aa33
+EBUILD xpra-1.0.9.ebuild 3977 BLAKE2B 947784a1b008925f090e4d914eff598f23629f391f56ba9fac2bb7dfb3a912f9189cd9a13ece1eb7ae929ad5d718e530a0e8738ea5218135020624fa28d2ecce SHA512 82b11382f3f4226871d1127c916da7c317bf1e0b4c68bf4d304fb468ea46a1e27b04f18c1682882201053269455752dafff6c18332c8a7bfc078f6289d97ca78
 EBUILD xpra-2.0.2.ebuild 3940 BLAKE2B b3cf94307d0b79fbf4f932d1992e185a4a4fd709af02090b10655fdafe0212ed774b7223f5a037f207b5d4b372ddb853e521b466910738cda475a2fc9f607fab SHA512 de48c1d149d6aed26a4bfa9609b25de384a67ff65e24340a1091f10d6a07ce98d33acdcca18ec7ef5e915154a06f33e4f7bd73f91b3bf179c235ed52a0d792a7
-EBUILD xpra-2.1.3.ebuild 3911 BLAKE2B 1bce77e2ca8e54af2d8238e1a98cfa5740c3dbf9ac217c18c91a2c508d6ec8e56c9c9f236b0fa8aa907f97b778d5a6891cea6f6d74fdfe834f6038abd279d181 SHA512 d425e3321a3e5cab6fca8f0604fd7e779a9707538e09eb9b3ec30b028de73514b1aea1c3e5f5ca44454883dc3cbc72f8aa8ef3de3210eb837d5c8cf49b85d40d
+EBUILD xpra-2.1.3.ebuild 3910 BLAKE2B 42d4229ec8a11ede29899809dabd5c87420a0ac866dafde20ddecfb821be1ff4d3fa40153f2c4c11d77f183340101b02913ed73d86dc8eeff5a5f2b22b2a22a6 SHA512 d7494e2ac2120d4f865e6167842f87301ca9813f8702268dabec8578db66611c3a0675f06f9d613de3973880f4b44bc45b2ad97a73d3935bb0442f6f6d5e0eec
 EBUILD xpra-2.2.1.ebuild 3966 BLAKE2B 5838f6f85d385dcaf9581a1120afd877b894dd3f4d7425ca03a6d5a04ed2ab2c70cdb6cfe8a1d9b55fab8947abb0d661bde00402161034703757adc9403a0c33 SHA512 570d920ad621117e8da3c618b52456c0502937fc2458fc6b68653619b89ac83e2f0578a284be62bb70b9ff54ab151153ad28912564f10a95b61552a6d2729b2d
 MISC metadata.xml 1087 BLAKE2B d8378019afa40ddee2d56f31ac3482374a018dbd2294a9163b2e85adbdb65b46d49872948cfc95915d0f1b986266be9c088ba5daf85ae74b9bb76275f3175b10 SHA512 8bf4ba96000fdf8b0c66d655194d4e5bf2f41f3e06754a7411cf5dc9c130d80519419cad73fff69418d01ae59db07b15aa96acd4ec4581958c22572abec6031c
diff --git a/x11-wm/xpra/xpra-1.0.9.ebuild b/x11-wm/xpra/xpra-1.0.9.ebuild
index e1fbabaa5fd3..92ba444e0a60 100644
--- a/x11-wm/xpra/xpra-1.0.9.ebuild
+++ b/x11-wm/xpra/xpra-1.0.9.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
@@ -13,7 +13,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/x11-wm/xpra/xpra-2.1.3.ebuild b/x11-wm/xpra/xpra-2.1.3.ebuild
index 2f9cea7ce6aa..a557140e32c0 100644
--- a/x11-wm/xpra/xpra-2.1.3.ebuild
+++ b/x11-wm/xpra/xpra-2.1.3.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
@@ -13,7 +13,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}