gentoo resync : 18.03.2018

8 files changed, 24 insertions, 527 deletions

diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index d6b7dff23eac..ffa5e1133578 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -11,19 +11,11 @@ AUX awesome-gnome.session 220 BLAKE2B ea84c3a24feb5c9921940dedd6f3fa05a6987b6aab
 AUX awesome-session 1999 BLAKE2B c7c784fba884ff0e579eb60cb049e695022be162a535065a172c461ec60d369415faa26be7cd60645e671ae8b2861b192ff962b803473746b567ef874bc706e9 SHA512 b6e7cc0813569b448b030cb8516d0272ebcf60b96f680b7de43dc4374e6e2d85b9bd841c6f1ab62caca52120c303332653e3de38eca0fe6a813b9bc5b68ac8b7
 AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5abf5f8fa7467694226bdcd1441bd5c601f0f27e7d2c8656bb4c75cb364cd6d8d641a648611ed2658b27cd389 SHA512 1d19f3ac5e9f8fd1084fd5e092d52ffbabb06fc3dc94f6f8e62834a3a03bd5bcb04adc698ac3a022c5446a07a847be35e3f3003e8bc9e7d35c6c82350517233d
 DIST awesome-3.5.6.tar.xz 720112 BLAKE2B 38836f4a90181335ffa282af57bf738635f3935b81b3bea5ec4e7c4b5142eb5031a642fd6252999557deb73cf7ed6d725d1900c157f894fd40c8b250c5895aaf SHA512 8d89bf46956276a8bcf106bb255c051e8382b08617e17691134a8f3e5db3ec9f7773581c02ce62d23e72499f7b1e60fe4322c211e41219b5bffd1897a96f6cf6
-DIST awesome-3.5.7.tar.xz 722864 BLAKE2B f39ba45a9f23a68de770dc0327a5e324ba703cc10cec5bcef39b855bc67e16ffbc0caf9247e97c2b47b375332e570b405c246a7b02ed2938be76bcf07f2342a7 SHA512 0b57efa6ba55e28fee56bec96dbf3c47249b2d70b21e1a7760d4367a0ba42d9936c1c6b78afa4aa3050a60cf34189551ea53b208ec8ec9f6563a905463550515
-DIST awesome-3.5.8.tar.xz 723000 BLAKE2B 76faf07e8084f233654141bbd05c723b67da621e30f3c5e92d846ddd3c0dbbda94923cb672f3b4532b52dde8b24028ce23b194531cf98b78079961eeec8fb730 SHA512 be5604821e256e36067750c341ca6f8669e159527b93654c8fc41bcd161da6d87fa0e3c5fccc51821586d163535ac78363d12d99ed81b6fb14e26da59136d5ef
 DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f2222969599486c2f79b73ba36cfa237270cd5972d4e10e0a4f774a54dfa92948bba5d2e0438687d36739e12c3f5ecc SHA512 6a4c679b293e8cd85d1f7e13f6dea704cbb267e42b9260496a54b657a66d6148aae51521d802d61baaeb23df0d4a8ad0b28d9dc922ea5da2a347b4251cce5e25
-DIST awesome-4.0.tar.xz 930664 BLAKE2B b30f410272b1d1224a1a145523f71ac6779c9592b572f798ff924bc26e62bd55ee5a0d45bc9d0ea8faa8362333b8eea51fccf954a49c71ee3090a4ebbf7e4de7 SHA512 80bdfe5f9166f5e9b0266cd630b48607d17605330d0f172666dbfa3f239ef04aeafafebe8949c3bf1c31a7bd372b60252d56c815048a24e015858585c3d0432b
-DIST awesome-4.1.tar.xz 960768 BLAKE2B e3d77fdbfca7ddb041069fa6a9bf1406b4bfbe96b09b26b6ecf7a7ea081e4f6d7d7766b2f06a7e3cd4c59bb7e16450bdde5bfb9d9c0b6a3760500b25fe44b733 SHA512 e0c1ed5fc8f0455258ec2566e430b24e52b78d1ae54357f5de1bf08f2e44682e9b2c5548905a90cc4526d98d2b6700e087b679abc9e620d3751ea420df9434f6
 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09
 EBUILD awesome-3.5.6-r2.ebuild 3296 BLAKE2B 175df7a0d594d5e75bbfab520e08279a1bd5457f2db16350f94c298489591362c56ef863b835aee5f2cfc4cc06b3230a6cc5118d222c1a47987f2db410a7dc16 SHA512 c86b35ccb4a459bcef7c63af82a0de219148d2f0da1cad713c605e762a6d9ea3bc191807cf3994643989c12a341d08c5223122c406470ae60fa5c68bc39b092a
-EBUILD awesome-3.5.7.ebuild 3328 BLAKE2B 366e1c3659ae3236d2f1a0560710ab30f29c8b0e13a775906f61d19c429ff5b54c34f105b5afaa16097308bae8cc4eb78fe08aa32d09c4f59e8b5d08fabd2ba3 SHA512 bc152185f11d256b872c113a9fda5db94e1d7916c5afa7d0cfa0872b0abc00d21f8d7f104c35fdb330b5ce366d47b44b9aa07dd5bf28d2f82bd80a34d7c8a179
-EBUILD awesome-3.5.8.ebuild 3328 BLAKE2B 366e1c3659ae3236d2f1a0560710ab30f29c8b0e13a775906f61d19c429ff5b54c34f105b5afaa16097308bae8cc4eb78fe08aa32d09c4f59e8b5d08fabd2ba3 SHA512 bc152185f11d256b872c113a9fda5db94e1d7916c5afa7d0cfa0872b0abc00d21f8d7f104c35fdb330b5ce366d47b44b9aa07dd5bf28d2f82bd80a34d7c8a179
-EBUILD awesome-3.5.9-r1.ebuild 3328 BLAKE2B 366e1c3659ae3236d2f1a0560710ab30f29c8b0e13a775906f61d19c429ff5b54c34f105b5afaa16097308bae8cc4eb78fe08aa32d09c4f59e8b5d08fabd2ba3 SHA512 bc152185f11d256b872c113a9fda5db94e1d7916c5afa7d0cfa0872b0abc00d21f8d7f104c35fdb330b5ce366d47b44b9aa07dd5bf28d2f82bd80a34d7c8a179
-EBUILD awesome-4.0-r1.ebuild 3076 BLAKE2B 030077553d5d7c1cd1ddc10ba96dc4f69108ca024c94734dd4bbfbb94f5b2cfb2873a6263a9c039beb5aff944e7ffe7e2ab7302dc5b4ba95ecfdbe158e6eb44a SHA512 f5034489d448cf22e5109f3b72a6c124f4abcaeb848bc38ad6e1c26e7abd6eaa4dc362c4811b3f2acba36be1db4aa7b176e78e905882f64bad242da66078f532
-EBUILD awesome-4.0.ebuild 2877 BLAKE2B da62c6f864b75b4b01fbdef8b84eb29e6d0165d4676cbaa8672887be39d8653718d561372cc1645a5e6ef8bc0356da3af2b75355c8110a3e8a1595fcd3bcd332 SHA512 acc26e8d979e7d0b823021d0036b903907eb8706bf9937d49a33bd797f6fdfdea4680052cdb0c68c898aaa82a7554b04e449276a9080495a3ba16d83bc1eff44
-EBUILD awesome-4.1.ebuild 3060 BLAKE2B d54dfc50dad0cc9c6ac1ec30c6a3b47c80139a7f129a490b316b3fb6ee8a41d1724569ab919b9aca189285e6f5381cf99320924faf4005d70d78a718bf4a216a SHA512 3badbe13e5fc9a4036cde1453ce9dd91c7201ae8ff791763164dbabae4640bcd145759a4ed5a28b211edc43e49dcfe70424517e6874593dd5e74421e13310a21
-EBUILD awesome-4.2.ebuild 3065 BLAKE2B a33abec87e5eff8b561ade7a2f251749860b2a1930e14cd68c6730fb9141062d3e4b6c96e8c24630c79639264af96a4850edc346f93f789fe279f5b4a2aec973 SHA512 afb5a47b4c9031ffd6a243069b572234e29934cc9a0adc8ef0d99a17f0676382ca8e6b11950f711dafb36826e9d1b710a811eaa5eadecb4723080f050679720d
+EBUILD awesome-3.5.9-r2.ebuild 3131 BLAKE2B 8d3b6edfdb9d06c06a83c8f18df367ab19e5fee0b2643e186b2b1c17865bb7b0ca8a6ed3af3366f7f9f310c6c0623dfee17c402fad9820920ebf6da907b2f459 SHA512 e6d3978f9dba5b06f3165bd57da11ae75e43ef4e6002918b09c63873f4466a26d45b748409e4a53525dc1963fd42c42d1b5aad891bb00d892296cd285c7f3279
+EBUILD awesome-4.2-r1.ebuild 3449 BLAKE2B 40e730587fc582b25cbd6a623a976a5b45c7f5b34afe1677f0ba2d9dd2df218f1b2f0efd1625e238eb3708549d7a8fb038c6250a42b26375cbc96e98538c9c72 SHA512 2c89f851ddb74f81c5d75f917d9bd18279753d41d1ee4e21ca5249df086ecc2e4c26c1f397f6e567a7a31c2d3539c57f0141d8b24840e67e9b10236ec7bc0647
+EBUILD awesome-4.2.ebuild 3095 BLAKE2B 49ee43f2bbfb1cac33aa4b578572ba9a587a11a70188a607a4ed2ee91ebc44df591baf8731a064f0bff90d717733e03983f8a1f21d18c0c33a2cb14e37ff2c1a SHA512 eb5cfe31b1f06b26392f0963dac10857dee8fb8fd7ee6b07dddcca411028198b1f2e063c47aa4dc477fa3d238aa1c1905ae1d2e9e3fa05f7257a68f6918ca232
 EBUILD awesome-9999.ebuild 3036 BLAKE2B 5d5697c6cf1e558131aaa87617c1d95d8e4730e7bc27e05682156aecdfc101f27c3ba93ed597e93fb2b42a6a61c3c4b7a93e791bc93fd7290550922f53c370a5 SHA512 8741e66a1e5667485b017925d4b1648c2ecd2fe108bbb2d18d0c3c301849d9d3eaea643bb2c600e3a9f003711eabc167cb313485d2932cc478cadaae3c3d79ab
 MISC metadata.xml 678 BLAKE2B 4ef555e57fed17cdc504cb597fbc7702d617d506dcefc3a25471bdaf947209e9a973ef21b49dbf46c678b6da7a1d2a9881e6439a438ac842e4b325b789b62759 SHA512 c50888d616bc887cdf1aec26469da7d8a0041f7f1904e7aeed4b763866827def72f5a06d30ac2da3d04b7d0c05929d87fac60b45c9e6aa5d107e464b92ee6ff9
diff --git a/x11-wm/awesome/awesome-3.5.8.ebuild b/x11-wm/awesome/awesome-3.5.8.ebuild
deleted file mode 100644
index 839456e65e9c..000000000000
--- a/x11-wm/awesome/awesome-3.5.8.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-COMMON_DEPEND="
-	>=dev-lang/lua-5.1:0
-	dev-libs/glib:2
-	>=dev-libs/libxdg-basedir-1
-	>=dev-lua/lgi-0.7
-	x11-libs/cairo[xcb]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libxcb-1.6
-	>=x11-libs/pango-1.19.3[introspection]
-	>=x11-libs/startup-notification-0.10_p20110426
-	>=x11-libs/xcb-util-0.3.8
-	x11-libs/xcb-util-cursor
-	x11-libs/libXcursor
-	>=x11-libs/libX11-1.3.99.901
-	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
-	>=app-text/asciidoc-8.4.5
-	app-text/xmlto
-	dev-util/gperf
-	virtual/pkgconfig
-	media-gfx/imagemagick[png]
-	>=x11-proto/xcb-proto-1.5
-	>=x11-proto/xproto-7.0.15
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
-	# bug #408025
-	epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
-	epatch "${FILESDIR}/${PN}-xsession.patch"
-
-	# bug #507604
-	epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
-	# bug #509658
-	epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
-
-	# bug #571544
-	# Merged upstream
-	#epatch "${FILESDIR}/${PN}-3.5.6-fix-multi-instances-focus.patch"
-
-	epatch_user
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		$(cmake-utils_use_with dbus DBUS)
-		$(cmake-utils_use doc GENERATE_DOC)
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	local myargs="all"
-
-	if use doc ; then
-		myargs="${myargs} doc"
-	fi
-	cmake-utils_src_make ${myargs}
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		(
-			cd "${CMAKE_BUILD_DIR}"/doc
-			mv html doxygen
-			dohtml -r doxygen || die
-		)
-	fi
-	rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN} || die
-
-	# GNOME-based awesome
-	if use gnome ; then
-		# GNOME session
-		insinto /usr/share/gnome-session/sessions
-		newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
-		# Application launcher
-		domenu "${FILESDIR}/${PN}-gnome.desktop" || die
-		# X Session
-		insinto /usr/share/xsessions/
-		doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
-	fi
-}
-
-pkg_postinst() {
-	# bug #447308
-	if use gnome; then
-		elog
-		elog "You have enabled the gnome USE flag."
-		elog "Please note that quitting awesome won't kill your gnome session."
-		elog "To really quit the session, you should bind your quit key"
-		elog "to the following command:"
-		elog "  gnome-session-quit --logout"
-		elog "For more info visit"
-		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
-	fi
-
-	# bug #440724
-	elog
-	elog "If you are having issues with Java application windows being"
-	elog "completely blank, try installing"
-	elog "  x11-misc/wmname"
-	elog "and setting the WM name to LG3D."
-	elog "For more info visit"
-	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
-	elog
-}
diff --git a/x11-wm/awesome/awesome-3.5.9-r1.ebuild b/x11-wm/awesome/awesome-3.5.9-r1.ebuild
deleted file mode 100644
index 839456e65e9c..000000000000
--- a/x11-wm/awesome/awesome-3.5.9-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-COMMON_DEPEND="
-	>=dev-lang/lua-5.1:0
-	dev-libs/glib:2
-	>=dev-libs/libxdg-basedir-1
-	>=dev-lua/lgi-0.7
-	x11-libs/cairo[xcb]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libxcb-1.6
-	>=x11-libs/pango-1.19.3[introspection]
-	>=x11-libs/startup-notification-0.10_p20110426
-	>=x11-libs/xcb-util-0.3.8
-	x11-libs/xcb-util-cursor
-	x11-libs/libXcursor
-	>=x11-libs/libX11-1.3.99.901
-	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${COMMON_DEPEND}
-	>=app-text/asciidoc-8.4.5
-	app-text/xmlto
-	dev-util/gperf
-	virtual/pkgconfig
-	media-gfx/imagemagick[png]
-	>=x11-proto/xcb-proto-1.5
-	>=x11-proto/xproto-7.0.15
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-src_prepare() {
-	# bug #408025
-	epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
-	epatch "${FILESDIR}/${PN}-xsession.patch"
-
-	# bug #507604
-	epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
-	# bug #509658
-	epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
-
-	# bug #571544
-	# Merged upstream
-	#epatch "${FILESDIR}/${PN}-3.5.6-fix-multi-instances-focus.patch"
-
-	epatch_user
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		$(cmake-utils_use_with dbus DBUS)
-		$(cmake-utils_use doc GENERATE_DOC)
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	local myargs="all"
-
-	if use doc ; then
-		myargs="${myargs} doc"
-	fi
-	cmake-utils_src_make ${myargs}
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		(
-			cd "${CMAKE_BUILD_DIR}"/doc
-			mv html doxygen
-			dohtml -r doxygen || die
-		)
-	fi
-	rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed"
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN} || die
-
-	# GNOME-based awesome
-	if use gnome ; then
-		# GNOME session
-		insinto /usr/share/gnome-session/sessions
-		newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die
-		# Application launcher
-		domenu "${FILESDIR}/${PN}-gnome.desktop" || die
-		# X Session
-		insinto /usr/share/xsessions/
-		doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die
-	fi
-}
-
-pkg_postinst() {
-	# bug #447308
-	if use gnome; then
-		elog
-		elog "You have enabled the gnome USE flag."
-		elog "Please note that quitting awesome won't kill your gnome session."
-		elog "To really quit the session, you should bind your quit key"
-		elog "to the following command:"
-		elog "  gnome-session-quit --logout"
-		elog "For more info visit"
-		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
-	fi
-
-	# bug #440724
-	elog
-	elog "If you are having issues with Java application windows being"
-	elog "completely blank, try installing"
-	elog "  x11-misc/wmname"
-	elog "and setting the WM name to LG3D."
-	elog "For more info visit"
-	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
-	elog
-}
diff --git a/x11-wm/awesome/awesome-3.5.7.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
index 839456e65e9c..e23c873b33e6 100644
--- a/x11-wm/awesome/awesome-3.5.7.ebuild
+++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="dbus doc elibc_FreeBSD gnome"
 
 COMMON_DEPEND="
@@ -48,22 +48,12 @@ RDEPEND="${COMMON_DEPEND}"
 
 DOCS="AUTHORS BUGS PATCHES README STYLE"
 
-src_prepare() {
-	# bug #408025
-	epatch "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
-	epatch "${FILESDIR}/${PN}-xsession.patch"
-
-	# bug #507604
-	epatch "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
-	# bug #509658
-	epatch "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
-
-	# bug #571544
-	# Merged upstream
-	#epatch "${FILESDIR}/${PN}-3.5.6-fix-multi-instances-focus.patch"
-
-	epatch_user
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-3.5_rc1-convert-path.patch"
+	"${FILESDIR}/${PN}-xsession.patch"
+	"${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch"
+	"${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch"
+)
 
 src_configure() {
 	mycmakeargs=(
diff --git a/x11-wm/awesome/awesome-4.0-r1.ebuild b/x11-wm/awesome/awesome-4.0-r1.ebuild
deleted file mode 100644
index 826268e38185..000000000000
--- a/x11-wm/awesome/awesome-4.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils pax-utils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="https://awesomewm.org/"
-SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus doc elibc_FreeBSD gnome luajit"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0
-	dev-libs/glib:2
-	>=dev-libs/libxdg-basedir-1
-	>=dev-lua/lgi-0.7
-	x11-libs/cairo[xcb]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libxcb-1.6
-	>=x11-libs/pango-1.19.3[introspection]
-	>=x11-libs/startup-notification-0.10_p20110426
-	>=x11-libs/xcb-util-0.3.8
-	x11-libs/xcb-util-cursor
-	>=x11-libs/xcb-util-keysyms-0.3.4
-	>=x11-libs/xcb-util-wm-0.3.8
-	>=x11-libs/xcb-util-xrm-1.0
-	x11-libs/libXcursor
-	x11-libs/libxkbcommon[X]
-	>=x11-libs/libX11-1.3.99.901
-	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${RDEPEND}
-	>=app-text/asciidoc-8.4.5
-	app-text/xmlto
-	dev-util/gperf
-	virtual/pkgconfig
-	media-gfx/imagemagick[png]
-	>=x11-proto/xcb-proto-1.5
-	>=x11-proto/xproto-7.0.15
-	doc? ( dev-lua/ldoc )
-	luajit? ( dev-lang/luajit:2 )"
-
-DOCS=( docs/{00-authors,01-readme,02-contributing}.md )
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0-convert-path.patch"  # bug #408025
-	"${FILESDIR}/${PN}-xsession.patch"          # bug #408025
-	"${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
-	)
-	if [ $(usex luajit) = "yes" ]; then
-		mycmakeargs+=('-DLUA_INCLUDE_DIR=/usr/include/luajit-2.0')
-		mycmakeargs+=('-DLUA_LIBRARY=/usr/lib/libluajit-5.1.so')
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	pax-mark m "${ED%/}"/usr/bin/awesome
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-
-	# GNOME-based awesome
-	if use gnome; then
-		# GNOME session
-		insinto /usr/share/gnome-session/sessions
-		newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session
-
-		# Application launcher
-		domenu "${FILESDIR}"/${PN}-gnome.desktop
-
-		# X Session
-		insinto /usr/share/xsessions
-		doins "${FILESDIR}"/${PN}-gnome-xsession.desktop
-	fi
-}
-
-pkg_postinst() {
-	# bug #447308
-	if use gnome; then
-		elog "You have enabled the gnome USE flag."
-		elog "Please note that quitting awesome won't kill your gnome session."
-		elog "To really quit the session, you should bind your quit key"
-		elog "to the following command:"
-		elog "  gnome-session-quit --logout"
-		elog "For more info visit"
-		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
-	fi
-
-	# bug #440724
-	elog "If you are having issues with Java application windows being"
-	elog "completely blank, try installing"
-	elog "  x11-misc/wmname"
-	elog "and setting the WM name to LG3D."
-	elog "For more info visit"
-	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
-}
diff --git a/x11-wm/awesome/awesome-4.0.ebuild b/x11-wm/awesome/awesome-4.0.ebuild
deleted file mode 100644
index ee9a7cf8b691..000000000000
--- a/x11-wm/awesome/awesome-4.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils pax-utils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="https://awesomewm.org/"
-SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus doc elibc_FreeBSD gnome"
-
-RDEPEND="
-	>=dev-lang/lua-5.1:0
-	dev-libs/glib:2
-	>=dev-libs/libxdg-basedir-1
-	>=dev-lua/lgi-0.7
-	x11-libs/cairo[xcb]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libxcb-1.6
-	>=x11-libs/pango-1.19.3[introspection]
-	>=x11-libs/startup-notification-0.10_p20110426
-	>=x11-libs/xcb-util-0.3.8
-	x11-libs/xcb-util-cursor
-	>=x11-libs/xcb-util-keysyms-0.3.4
-	>=x11-libs/xcb-util-wm-0.3.8
-	>=x11-libs/xcb-util-xrm-1.0
-	x11-libs/libXcursor
-	x11-libs/libxkbcommon[X]
-	>=x11-libs/libX11-1.3.99.901
-	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${RDEPEND}
-	>=app-text/asciidoc-8.4.5
-	app-text/xmlto
-	dev-util/gperf
-	virtual/pkgconfig
-	media-gfx/imagemagick[png]
-	>=x11-proto/xcb-proto-1.5
-	>=x11-proto/xproto-7.0.15
-	doc? ( dev-lua/ldoc )"
-
-DOCS=( docs/{00-authors,01-readme,02-contributing}.md )
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0-convert-path.patch"  # bug #408025
-	"${FILESDIR}/${PN}-xsession.patch"          # bug #408025
-	"${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	pax-mark m "${ED%/}"/usr/bin/awesome
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-
-	# GNOME-based awesome
-	if use gnome; then
-		# GNOME session
-		insinto /usr/share/gnome-session/sessions
-		newins "${FILESDIR}"/${PN}-gnome-3.session ${PN}-gnome.session
-
-		# Application launcher
-		domenu "${FILESDIR}"/${PN}-gnome.desktop
-
-		# X Session
-		insinto /usr/share/xsessions
-		doins "${FILESDIR}"/${PN}-gnome-xsession.desktop
-	fi
-}
-
-pkg_postinst() {
-	# bug #447308
-	if use gnome; then
-		elog "You have enabled the gnome USE flag."
-		elog "Please note that quitting awesome won't kill your gnome session."
-		elog "To really quit the session, you should bind your quit key"
-		elog "to the following command:"
-		elog "  gnome-session-quit --logout"
-		elog "For more info visit"
-		elog "  https://bugs.gentoo.org/show_bug.cgi?id=447308"
-	fi
-
-	# bug #440724
-	elog "If you are having issues with Java application windows being"
-	elog "completely blank, try installing"
-	elog "  x11-misc/wmname"
-	elog "and setting the WM name to LG3D."
-	elog "For more info visit"
-	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
-}
diff --git a/x11-wm/awesome/awesome-4.1.ebuild b/x11-wm/awesome/awesome-4.2-r1.ebuild
index 2e8cefe90f62..9e84ef199bfc 100644
--- a/x11-wm/awesome/awesome-4.1.ebuild
+++ b/x11-wm/awesome/awesome-4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils eutils pax-utils
+inherit cmake-utils eutils pax-utils versionator
 
 DESCRIPTION="A dynamic floating and tiling window manager"
 HOMEPAGE="https://awesomewm.org/"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="dbus doc elibc_FreeBSD gnome luajit"
 
 RDEPEND="
@@ -61,8 +61,8 @@ src_configure() {
 		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
 	)
 	if use luajit; then
-		mycmakeargs+=('-DLUA_INCLUDE_DIR=/usr/include/luajit-2.0')
-		mycmakeargs+=('-DLUA_LIBRARY=/usr/lib/libluajit-5.1.so')
+		mycmakeargs+=("-DLUA_INCLUDE_DIR=${EPREFIX}/usr/include/luajit-2.0")
+		mycmakeargs+=("-DLUA_LIBRARY=${EPREFIX}/usr/$(get_libdir)/libluajit-5.1.so")
 	fi
 	cmake-utils_src_configure
 }
@@ -109,4 +109,12 @@ pkg_postinst() {
 	elog "and setting the WM name to LG3D."
 	elog "For more info visit"
 	elog "  https://bugs.gentoo.org/show_bug.cgi?id=440724"
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version ${v})" = "3" ]; then
+			elog "Awesome-4 introduced breaking changes. For release notes and porting guide see"
+			elog "https://awesomewm.org/apidoc/documentation/89-NEWS.md.html#v4 and"
+			elog "https://awesomewm.org/apidoc/documentation/17-porting-tips.md.html#v4"
+		fi
+	done
 }
diff --git a/x11-wm/awesome/awesome-4.2.ebuild b/x11-wm/awesome/awesome-4.2.ebuild
index 170a680ce24f..a579c0907b8d 100644
--- a/x11-wm/awesome/awesome-4.2.ebuild
+++ b/x11-wm/awesome/awesome-4.2.ebuild
@@ -61,8 +61,8 @@ src_configure() {
 		-DWITH_GENERATE_DOC=$(usex doc $(usex doc) n)
 	)
 	if use luajit; then
-		mycmakeargs+=('-DLUA_INCLUDE_DIR=/usr/include/luajit-2.0')
-		mycmakeargs+=('-DLUA_LIBRARY=/usr/lib/libluajit-5.1.so')
+		mycmakeargs+=("-DLUA_INCLUDE_DIR=${EPREFIX}/usr/include/luajit-2.0")
+		mycmakeargs+=("-DLUA_LIBRARY=${EPREFIX}/usr/$(get_libdir)/libluajit-5.1.so")
 	fi
 	cmake-utils_src_configure
 }