gentoo resync : 04.05.2019

6 files changed, 12 insertions, 98 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 0b02f866c279..d3226a26f541 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 4fa68458bd0e..4fd2e6f7f739 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -2,8 +2,6 @@ AUX i3-gaps-4.15-musl.patch 2473 BLAKE2B acb148b7a7f14f7e75523ade9ae4374d6b18d33
 AUX i3-gaps-4.16-musl.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
 DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b SHA512 76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
 DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c SHA512 904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
-DIST i3-gaps-4.16.tar.gz 3985226 BLAKE2B da61ab6b476a30a4acab24590cd5ca51f0f51318988890e66530fdd76d99236378d9c678e1e37da99e22e70b0e5e0e5895b8146bd5a93b23957cb1e0178e08b1 SHA512 64a392d2b4175e063f0740ee04885156dbd2571262c22df6276e8eaac36765cd03822723208118a1998ff6cbbcd973fb7f6305df9744c477262d5d33b792ee23
 EBUILD i3-gaps-4.15.0.1.ebuild 1751 BLAKE2B bd1da83f5652b82ca30f1fe6b3eafcb582f1359d29e88066ef82469e5bb30900ecbc490f9758b1d31455aa204ed859e4e40ccf20d2f5a2b005cf45bdef90afd1 SHA512 57a83814bc1758ef00930c1fd05b1636314360a6f183238920257a1d7870c25b225f2e78477dca2fc9223dfe0b685580662326bd2ffaea8757fc730076d0eb7b
-EBUILD i3-gaps-4.16.1.ebuild 1729 BLAKE2B 917071d2786f9c1dcfb38224e54d277f30bf99d54fe456d47a78c2dfd5f291247aa7b9e4b393282e5f146df093c82483d7260ba3a8521538f27196b928a1bf55 SHA512 a50f94d689a8c336b5c59db41a80231895ec9afcef70236ac1fb8760f2805c357ea59f0a355c6a76ee527652fc5a7c00f9d3084d523d63a9a9eea91f450f454c
-EBUILD i3-gaps-4.16.ebuild 1729 BLAKE2B b2bab05e08b8585a79591731a26459b79402b8911797872fd31e1695e57db587fd3a72c3cb865c9854df8a6010f58622b23f8a457314e02e52848bbb258a90e8 SHA512 e3e8f4ac928561c434c43af45e8a1da107c370b2b6d16ce9b1bfad75dfa4030f18eb695301ea7694010ad53264741d07e399bc007631f2de73f8425c7be26d02
+EBUILD i3-gaps-4.16.1.ebuild 1728 BLAKE2B 63314cf555b99ce93e0449b5f7e37ef7aa598adfbee710a2b1925a48689f86ac1c69aa5e18a86dacbead104d0c2d2c3e64c91f9a253649cd66e7d2f06d216889 SHA512 b656d1844ce8b6f5bc70486f88b980a4914b6103658f8153983d08c73f68e9b0b1db27b96ecab21eff6ebc6213be994b5f9c52fb5998d71b49fb423914a1f973
 MISC metadata.xml 322 BLAKE2B bdba5a4519158f97944784fc4e2813c1b8e8d4f6f90d43b3a935e8b2565ecc5d2444c4b7b4d11266263d25a76b5c2dba55ec6535fdaab03129bb022206abbce2 SHA512 d3ca96f88473d21b81c420795c6eee5dd41f43354de85fd549a9ae8127e46f10d00034730bf850ddd6df8607821d30fce17aa349b1b2575f43fd3303a2da1cf6
diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
index 8ea48ba30b53..7a503f28a2e2 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.ebuild b/x11-wm/i3-gaps/i3-gaps-4.16.ebuild
deleted file mode 100644
index d3e62d0fb172..000000000000
--- a/x11-wm/i3-gaps/i3-gaps-4.16.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="i3 fork with gaps and some more features"
-HOMEPAGE="https://github.com/Airblader/i3"
-SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/cairo[X,xcb]
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbcommon[X]
-	x11-libs/pango[X]
-	x11-libs/startup-notification
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="${DEPEND}
-	dev-lang/perl
-	dev-perl/AnyEvent-I3
-	dev-perl/JSON-XS
-	!x11-wm/i3
-"
-
-S=${WORKDIR}/i3-${PV}
-
-DOCS=( RELEASE-NOTES-$(ver_cut 1-2) )
-
-PATCHES=( "${FILESDIR}/${PN}-$(ver_cut 1-2)-musl.patch" )
-
-src_prepare() {
-	default
-	sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die
-	eautoreconf
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_configure() {
-	# disable sanitizer: otherwise injects -O0 -g
-	local myeconfargs=(
-		--enable-debug=no
-		--disable-sanitizers
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C "${CBUILD}"
-}
-
-src_install() {
-	emake -C "${CBUILD}" DESTDIR="${D}" install
-	einstalldocs
-
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
-	einfo "There are several packages that you may find useful with ${PN} and"
-	einfo "their usage is suggested by the upstream maintainers, namely:"
-	einfo "  x11-misc/dmenu"
-	einfo "  x11-misc/i3lock"
-	einfo "  x11-misc/i3status"
-	einfo "Please refer to their description for additional info."
-}
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index f0a867df6545..4d76f3e054de 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -6,5 +6,5 @@ DIST ratpoison-1.4.8.tar.xz 364700 BLAKE2B 0422606cda247cd6c87f7d661b3a09edd5131
 DIST ratpoison-1.4.9.tar.xz 315584 BLAKE2B 18cff2ed835579b606ea99defda04db6ebaedc8bc71d3f7d12cf859caf908d427f50b345089ca3aae52a407ae763818d91a2dd4026c9b32ead95adfb2d065c25 SHA512 97f705efd2092b8e12528496890c59f613e6fcec010aca94a5a59bd641e22dfc50dd500a4b94af7a07553a8a6359f6bec4eee0db1a7ded29d7f051904b09beef
 EBUILD ratpoison-1.4.8-r1.ebuild 1805 BLAKE2B 0c2019dc6ef6ffb9da23f9080ca73d662ab5acafc9c020770c11da60b2b911560fcc878f95000c023f55b7c5d551ceb52365ee7f3cae75bc992eecedf8ee2dda SHA512 59963dff1a5ffa529180cd8386bce013d0c34acf8141eacefaf798fd219ae4bc18842f5a07453167fb0dcf2823a8e12dfb1313a5fb7c8f55f65ecb93dfd6bbb7
 EBUILD ratpoison-1.4.9.ebuild 1847 BLAKE2B 97cf322b05d5caf5490601807b31aaa42a9e03075661ef1742863d6f7e53a6f91689b4177cd3755018b3dd51258bceb831927a5f7d1b054bbd915de91777727d SHA512 25ce182945ab4dd1d3088e1aa85e6f9b803086dc468bd9c2fca35730c290249cd79ee635998f6c669c9c9699852ccf88d91f4a7622d3805634e2fe67d96b648c
-EBUILD ratpoison-9999.ebuild 1828 BLAKE2B a787426fd010248f132154dbefb9c6ad1f37027bc845ae1c67e5ac76cd1ea95cdacc22c86030257065829a1b2e28a352a2c3e25db99afeb043f64072907dc64c SHA512 550218f84fbf42efc08d61bc30132d71cff23311834447db70a67c786f3edefa97cb2fe76a48c8fee5cc07e56da759bd628dfe927380d7e46ade51aaee3b01d9
+EBUILD ratpoison-9999.ebuild 1836 BLAKE2B 807832764e23876d896b1a2658be846a222d5cf09fc8100b920fd84dbdd6709bc1923a696ba345f794a443fbec6dbae555719de11b7f825c08d97092805c573a SHA512 18cd2b445b2c33a46d9a7ea7a68ea9beabf963f1fdf793dd70fbdc7cc4d62160f739c751a4c4099a98728a251e3d53f555f7f5dc5d9b3b4e92e7a6607b53fd9a
 MISC metadata.xml 1036 BLAKE2B 5982e3f331cef53bcc5b9809dab21e7d6f7cae85665c66650e2b09b66e7a7657511eada8fa450bad6b27804cf20dc56867686222e2cb35edc614ab2ff0ea83a0 SHA512 d40c0383ad7243df552727fda5979063a1138224b3eb4ed85cd730ad61af76fa688a74d023c46562856655f1d0c15af748d933f4cc8b61faa7cbc7eed6f4c149
diff --git a/x11-wm/ratpoison/ratpoison-9999.ebuild b/x11-wm/ratpoison/ratpoison-9999.ebuild
index 7bdbb46304d0..35e96ec0241b 100644
--- a/x11-wm/ratpoison/ratpoison-9999.ebuild
+++ b/x11-wm/ratpoison/ratpoison-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools elisp-common eutils git-r3 toolchain-funcs
+EAPI=7
+inherit autotools elisp-common git-r3 toolchain-funcs
 
 DESCRIPTION="window manager without mouse dependency"
-HOMEPAGE="http://www.nongnu.org/ratpoison/"
-EGIT_REPO_URI="git://git.savannah.nongnu.org/ratpoison.git"
+HOMEPAGE="https://www.nongnu.org/ratpoison/"
+EGIT_REPO_URI="https://git.savannah.gnu.org/git/ratpoison.git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -35,9 +35,12 @@ DOCS=(
 	README
 	TODO
 )
+PATCHES=(
+	"${FILESDIR}"/ratpoison.el-gentoo.patch
+)
 
 src_prepare() {
-	eapply "${FILESDIR}"/ratpoison.el-gentoo.patch
+	default
 
 	eautoreconf
 }