gentoo resync : 14.04.2018

7 files changed, 85 insertions, 4 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 266cf2f786fc..b99a645b83bf 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index 574319339f11..ae1bbecf66bc 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -3,8 +3,10 @@ DIST jwm-2.3.2.tar.xz 325648 BLAKE2B 93654116b0dedff4ad03c7981a9978530a1989edf47
 DIST jwm-2.3.4.tar.xz 332140 BLAKE2B ad2ea9d094b6cded0891176c97900b8491c3d81f64b1df7617c8936d581c849c4515deb8795f3f10018f469c1a97617fa97ec50fb2088dc7ea221ed55af2de97 SHA512 db9f46ced4b1f8128673b551cd865b6c9b6c8d43f839cfe898168251e8326d402a510ce77144273488c1e65a96d66e16124e4b4749a5a96a9057c1eb20c2bee1
 DIST jwm-2.3.5.tar.xz 339792 BLAKE2B dcbaeac2e6842499509651155618821cf302b3e3ae1b013f3811c49e65ac83122e00aff33af4a366ea0c126f2a009a0baba0538e132f00efac306319b94e50c4 SHA512 cb45a5fb349e6c130b89996ba11a99059e95ccedc4ea82ad527676130833fd93297b64fad905a1f22908a4ae69cca544a6353c37160ed8df3e1089f40f9a0565
 DIST jwm-2.3.6.tar.xz 343644 BLAKE2B 44d6156b79957352b52f8f4000f12e655259f2125eeba183a087358b7537d3affd7125a50b0ff93efa9c8d2599d08e7cc3db6c26807ad587481ce689541aaad0 SHA512 ed3556bf2e28bfcf36b2b145e6c08e75c24e47b723b16ce072100d2773338d819c5465e7af2dc6b842e2e35f375ec3a0b85d9987e0a8acecdbe628dc09eabd11
+DIST jwm-2.3.7.tar.xz 350332 BLAKE2B 479d853ae9b1dd2d1a39c9e823f39cd7671b477f6e9878bc6652072bce1ce364f8c392663dc1187a4a4970918c0f68cd506654f6dfe6c91cc5f1f2f275a2021b SHA512 dab0241518e52aa2e3e1ef3f67b6965ceb683bdb0224de7d3a653d76440606d70e86e35047eda40ea53a80aa227408be77739ad7c53d51f53026e3d113ab7efc
 EBUILD jwm-2.3.2.ebuild 1480 BLAKE2B fe30802f9bd47aa25485f4a7c24529f47f48adab3273170a75913733ee4126cad079da60264b2e603397594853ba545e89e286f7f568671b95ac6da14d57a3e4 SHA512 5d77f8d9365f335cac1cbf64328e4f02658604944ee82b1403c32476dc2d757c156aeffd68a15e7d4bd758519f0c0af1618605420fef8bb3feb9786983bb985d
 EBUILD jwm-2.3.4-r1.ebuild 1550 BLAKE2B bdf2910020fbe9226186c508b40d9adc6387c2b055571f20f470901c776fbc4889a4694ae1cd165699c955e9239acac22a9381c45b0e3a01f5bc08e6812fa059 SHA512 c85ff474a7afe9d2a734fcfd330b2ed2ef3b269d4f695fcc64cc3089ccad6b1387764541b7ff388978f0de99fa7cd6d0c2bb0218a275ea4e0acbaf0d503cfe34
 EBUILD jwm-2.3.5.ebuild 1830 BLAKE2B e9b79774818290d1fb05a81d8bdd1941ab6463d11371da255b6f5c211962d16dfd2b612565c886f352cdc7d8f396458b2ade64f2e19fa8e2e0f5ba24a78b1138 SHA512 ffe5f1e92de51b3bc2c545c454910706f662d1f546dde2f05d2ecf539715bd0c5ad1af6f9fff89b26c4a5e0562170d253d489c0281e2fa042704246930433d47
 EBUILD jwm-2.3.6.ebuild 1889 BLAKE2B d8215466d2479aedc1e58c740013db193a561e67d636ad4620174367d2f2cfaaf24b4ae142a96222b50d78325e6eb0caeb7ce601226b1187f23ea47c0e605dfe SHA512 13f2e66a2c02145fa326df6242f49acfdde3436a1c8211d9fa3e1f835dbe0a23e5745a40e837207fc039b412a45945c153d1a3adaf7a7f86959df23c056fe616
+EBUILD jwm-2.3.7.ebuild 1889 BLAKE2B 36ac9faf64506bc8e69ba0d8eea545982852726ee71047f9b17444b7e5acd3b9f4e67a1a0265ca890af18d32754f5eb62e5b1f84cd4c8f26675454e7099d3fed SHA512 eaac2f63e51673c9b7ca371eac4232f9f321803e64d039a56ff71ad65bab776085e13c43d5c3b2f1809cd4db202485c45083cace9aa1b12d1f3438501847a7ab
 MISC metadata.xml 973 BLAKE2B 396dc5d70f98f46e0a2698b893b127cad189762b28a1be2272b560ea4bd174a637cb4a9a01783a69c14797605d74442d221a55d3b5ca4128f343d7e602333096 SHA512 11ce10dace193af664e4939f506adc8311db83c7caa00959ebc7b57ed3084cd1e6ca8dcd8ff141e9ddbb823c485d45696ca3653d2ba9e252401704077dd932f0
diff --git a/x11-wm/jwm/jwm-2.3.7.ebuild b/x11-wm/jwm/jwm-2.3.7.ebuild
new file mode 100644
index 000000000000..891ecda192e7
--- /dev/null
+++ b/x11-wm/jwm/jwm-2.3.7.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Very fast and lightweight still powerful window manager for X"
+HOMEPAGE="http://joewing.net/projects/jwm/"
+SRC_URI="http://joewing.net/projects/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
+IUSE="bidi cairo debug iconv jpeg nls png truetype xinerama xpm"
+
+RDEPEND="dev-libs/expat
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXrender
+	bidi? ( dev-libs/fribidi )
+	cairo? (
+		x11-libs/cairo
+		gnome-base/librsvg
+	)
+	iconv? ( virtual/libiconv )
+	jpeg? ( virtual/jpeg:0= )
+	nls? ( sys-devel/gettext
+		virtual/libintl )
+	png? ( media-libs/libpng:0= )
+	truetype? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+src_configure() {
+	econf \
+		$(use_enable bidi fribidi) \
+		$(use_enable cairo) \
+		$(use_enable debug) \
+		$(use_enable jpeg) \
+		$(use_enable nls) \
+		$(use_enable png) \
+		$(use_enable cairo rsvg) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		$(use_enable xpm) \
+		$(use_with iconv libiconv-prefix /usr) \
+		$(use_with nls libintl-prefix /usr) \
+		--enable-shape \
+		--enable-xrender \
+		--disable-rpath
+}
+
+src_install() {
+	dodir /etc
+	dodir /usr/bin
+	dodir /usr/share/man
+
+	default
+
+	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
+
+	insinto "/usr/share/xsessions"
+	doins "${FILESDIR}"/jwm.desktop
+
+	dodoc README.md example.jwmrc ChangeLog
+}
+
+pkg_postinst() {
+	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
+	einfo "or per-user by creating a configuration file in ~/.jwmrc"
+	einfo
+	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/x11-wm/lwm/Manifest b/x11-wm/lwm/Manifest
index bc7bdde03eaf..b12b0cf2d388 100644
--- a/x11-wm/lwm/Manifest
+++ b/x11-wm/lwm/Manifest
@@ -3,5 +3,5 @@ DIST lwm-1.2.3.tar.gz 47253 BLAKE2B 269016589a07783cc74da16e6c24a33e53a5014a2faa
 DIST lwm-1.2.4.tar.gz 47519 BLAKE2B 209cc24e938978489ba33f940dfc2166880d9c150863f8e1982d5ad21f53a76e95fd71ca461e81a7fdb025c0a957ac2c4623e751de250beec1a2a74e570b9687 SHA512 bb4e394c43020b48dedf8c98702b68be7a580f9851d298ba2c6f0aacbd21719d8c772712e56cbbcc400e81a45ad7f4f29cb6e5f17d6dad76aef65029daf812c5
 EBUILD lwm-1.2.2.ebuild 833 BLAKE2B 3d390cc680d5f8e7e07008fd0c6784a2c51ac8c5571c498bb5c36ead0be16e8a41164dd49610f85c5f7d565736ea137a2bd4fd40d40fdeb5784fa4d0ca48bed5 SHA512 0b6d762db5b32cbe130278d75149a728fbbd9da4f270c9ffe0e433c88f046d651159131915ec4951113fcf712f321f393cb02e60f8803e99f1f0a155e8f018ff
 EBUILD lwm-1.2.3.ebuild 839 BLAKE2B 32dbfd91115f16e244ecc7cb383471bb82a487b14a007ea7b8e256b00720e774943f451655deb4dd667566ebbcb7c0bcf8c67033da60de3491e7668ec8f19aae SHA512 8a886447290cac165f7dec8bbb46f25bc4ba4a2590c74370e83bbac728ee4540f7ffac542c76ce6fee5783c13b523b91ac1a0fb646f2c49ab0b6b07e178bd7c8
-EBUILD lwm-1.2.4.ebuild 866 BLAKE2B d7d17388a9239f23c1ea6e7e71e74de9a8c13bd45bc07839b63e8e0fcccbe82a12c5373c75f7cddb999129a9e7cf31580a944be0c5c7e80ed8c6ec13820fcdc0 SHA512 fa23c366daa61ae18d2351734ee4fe64a5ab4bbe2263b69c22e75c4af75a10f80b446acb947a28e803daac5876467ef24011673af2fd36368860c020c61aa2bc
+EBUILD lwm-1.2.4.ebuild 865 BLAKE2B a7c5f04d50abc50c914c544d2c521e3d6e9db04e7f8ba3270346c2769ce3e7401037760c162eae24f3c668c1bed9f654083c617d92fe9a5a666d1920f84502eb SHA512 21fd4ea52e0896f8a2f278f974912b5f3c627931b4e46dfc99243e9e5e0246b6905493e5cdb01c7428cfc6c4a36f9f5f03f6b7b9ac8867a643890b34b771c674
 MISC metadata.xml 355 BLAKE2B 503762328f2c0793a7febe15e4d4ba88a21a6f577ba817df1a5a4ceb53b6969b4e448b98d3ce5665c91a0abfc06deb8bba59323d6dded0e8050a0bf7eee0dd8d SHA512 9bb07654a69afd045464b0ff8190523a21716d53ad309cc87165c82b699ef7db8cb10caf27a6ccf549cb408f7d1af3f263c5a1e57520856dbcf1f3138807f94f
diff --git a/x11-wm/lwm/lwm-1.2.4.ebuild b/x11-wm/lwm/lwm-1.2.4.ebuild
index 426a9a34f869..ad486586d635 100644
--- a/x11-wm/lwm/lwm-1.2.4.ebuild
+++ b/x11-wm/lwm/lwm-1.2.4.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="The ultimate lightweight window manager"
 SRC_URI="http://www.jfc.org.uk/files/lwm/${P}.tar.gz"
 HOMEPAGE="http://www.jfc.org.uk/software/lwm.html"
 
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 88fdaccde6e7..b521d971b657 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -10,5 +10,5 @@ EBUILD muffin-3.2.0-r1.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975d
 EBUILD muffin-3.2.0.ebuild 2072 BLAKE2B f297b24912e563e831e94406f4afda05751273dd3b422d309682f7b935a63c1fd3bb430dc349fdfdfc54d95b85ca39fc16f42df00db8d9f2398399afb7418365 SHA512 85a1a978cef004b7874c9febecb7ed7723a4c68241fcc2b573b7e0527fd8f78092da3ae21c1f7f91c976a0ea90c1f75fb71e73475bbf29bfde4e2909e65494ac
 EBUILD muffin-3.4.0.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
 EBUILD muffin-3.4.1.ebuild 2074 BLAKE2B b644ff89d1eebda22769e29839749831f975dcaeccd65addab2ac73c46379ee751ea04c01bc4a203bfc4f2bddd9096d6a8facfcf9086f54636fccb39ac472dab SHA512 4093e47d2a93ce7c0e70748b26145b1daf990f39e8558b8d3a8672c66f5cf2f04e19b0a8681495021d05857dd688e2842cb5288d3a68bc6d34af5109a5065bd9
-EBUILD muffin-3.6.0.ebuild 2073 BLAKE2B fc1aed8f1f401196abd8f8bc8ea3cfda0bd1abae9f75e10f1065648c3a3e77001441161f6aa2e2c92236e14aef35e43895ac7c565bfaf2df6d5bfdd03070bbd7 SHA512 fe8fd5ffd715adcaecd5facb3e8b34736d93c364a518c4ee03044e318c97b984b2916f2153d57cc587f1515de2120856c9416f37516ff1c0cf6ce5233b7a2b30
+EBUILD muffin-3.6.0.ebuild 2072 BLAKE2B 1cdc618503123feec486e43853c48cd85caf57ca7a40250b0a435c760e88d51287cc3fb9f7ce9d963579183a6bddd21f5ca33114145aec5002419e10a7be703a SHA512 04a92d3c7314ffbce7170819a1e01972f56fcb8319c7a142b1db447c2b022fbce69713ff3a1f41cf79da3f46fdcc4c6073f8da3eb86178bb8d0bfe198f0df624
 MISC metadata.xml 333 BLAKE2B d29a873cc8702d8251ff425eca5ec16b4ea2a75f4e512c05513c3a6a61e38e0fde4450158503cdb2e71b324c86a7e66e03c1eecba8bff6a6be81244f040ceaad SHA512 42c7d8e82dd95e76e6b72973d53a0a27de2562108b5989092c34804140d336dcb20b331a4c70b1fcf6730ef5f377f366f480271597c63f7ce3e8f7aa8d359555
diff --git a/x11-wm/muffin/muffin-3.6.0.ebuild b/x11-wm/muffin/muffin-3.6.0.ebuild
index 86439be98daf..843e993737d2 100644
--- a/x11-wm/muffin/muffin-3.6.0.ebuild
+++ b/x11-wm/muffin/muffin-3.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection test xinerama"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	>=x11-libs/pango-1.2[X,introspection?]