gentoo resync : 29.01.2021

3 files changed, 2 insertions, 142 deletions

diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 547a57da2083..338072e65441 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -8,7 +8,6 @@ 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-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
-EBUILD awesome-4.3-r101.ebuild 4018 BLAKE2B d9cf27c7dc9bc200c277c7517916ac9ce444a567fefba8e83b8d73dcad68041d68c5e6c06c6300b0ef9327f5f463cd9089e1d79a0e37ea44f362f8fc0145c8a1 SHA512 6a340fcedffc2162b5029c6c04c4f5e1998096154cef36d62b1d156b8a6041dddbbd261b3d350505d3e54533f58b588adb6ea03e769a491d731b8cc343769983
-EBUILD awesome-4.3-r2.ebuild 3628 BLAKE2B 13d41fa0d81ac06d95294d603e19caa5d50d2307b482746eea0f9603b215790503cedd75490a0cab49880b66f1215f22b901748cc78e4a91bc0ede95533fda54 SHA512 c662a249779837b4397fe749113c78f87c0f2312cc76ce13926b2732fabd5e12fe97baec4c9a41816178925b3da65821dfdeab7b4a4089b69883cd6f7d1a3284
+EBUILD awesome-4.3-r101.ebuild 4013 BLAKE2B 8de97a602b1d365a241115ee410fa0967176b629f8906b68519951ad194e5b958b3e401d6b5bead8b55bfc76e1de2d361eb00842f750aea35ddc9d491e859e25 SHA512 9cfc73d8d2c514548d06c9d25343ddb4750b208c00eb57cc8a30b41b0041cec7fd36c44f4db1bf8944f116a1f247c6e33655bb0ce82e06ef9fc42c628c19080d
 EBUILD awesome-9999.ebuild 3959 BLAKE2B c8198273b9ad36c5dabfc202bd4d64438b8156370a9a1220f5b0b36d4422a64c493cbe9116b25a69016474e3c4ae1d7445925961f2f9d2d3ad0f7e033f9aa59b SHA512 bf6b1b79f597e476a6754c6bbd24e50311e10f137d89ec7fb65d4d4e683ca12f65f71f51bc9e6f014a65528489520b4b01891d4fc00f43289e5a80e55339880c
 MISC metadata.xml 327 BLAKE2B 2b34d6e8f8e02580c16d30bf9d65e33e29447c848fe58f4fb2324d0d3adbe93e7ba7eaeb440d1bd987ce300f21116742383b59c3fe53c15176a14eda684c6a5e SHA512 4bfbb536edf61389e39e0f6ae53e7255a4f2cf78f197f44317be2e11419ddb950b2aab540d48a1552c2b4c9cc050665ba944e10da5227f95ddacac29ed741276
diff --git a/x11-wm/awesome/awesome-4.3-r101.ebuild b/x11-wm/awesome/awesome-4.3-r101.ebuild
index 48a04ca56869..d89688d5699b 100644
--- a/x11-wm/awesome/awesome-4.3-r101.ebuild
+++ b/x11-wm/awesome/awesome-4.3-r101.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"
 else
 	SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm ppc ppc64 x86"
 fi
 
 DESCRIPTION="A dynamic floating and tiling window manager"
diff --git a/x11-wm/awesome/awesome-4.3-r2.ebuild b/x11-wm/awesome/awesome-4.3-r2.ebuild
deleted file mode 100644
index c402663215fd..000000000000
--- a/x11-wm/awesome/awesome-4.3-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop pax-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git"
-else
-	SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz"
-	KEYWORDS="amd64 arm ppc ppc64 x86"
-fi
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="https://awesomewm.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus doc gnome luajit test"
-RESTRICT="test" # https://bugs.gentoo.org/654084
-
-RDEPEND="
-	dev-lang/lua:0
-	dev-libs/glib:2
-	dev-libs/libxdg-basedir
-	dev-lua/lgi
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libxcb[xkb]
-	x11-libs/pango[introspection]
-	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
-	x11-libs/libXcursor
-	x11-libs/libxkbcommon[X]
-	x11-libs/libX11
-	dbus? ( sys-apps/dbus )
-	luajit? ( dev-lang/luajit:2 )
-"
-
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
-DEPEND="${RDEPEND}
-	x11-base/xcb-proto
-	x11-base/xorg-proto
-	test? (
-		x11-base/xorg-server[xvfb]
-		dev-lua/busted
-		dev-lua/luacheck
-	)
-"
-BDEPEND="
-	app-text/asciidoc
-	media-gfx/imagemagick[png]
-	virtual/pkgconfig
-	doc? ( dev-lua/ldoc )
-	test? ( app-shells/zsh )"
-
-# Skip installation of README.md by einstalldocs, which leads to broken symlink
-DOCS=()
-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
-	"${FILESDIR}"/${P}-fno-common.patch         # bug #707262
-)
-
-src_configure() {
-	# Compression of manpages is handled by portage
-	local mycmakeargs=(
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DCOMPRESS_MANPAGES=OFF
-		-DWITH_DBUS=$(usex dbus)
-		-DGENERATE_DOC=$(usex doc)
-		-DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
-	)
-	if use luajit; then
-		mycmakeargs+=("-DLUA_INCLUDE_DIR=${EPREFIX}/usr/include/luajit-2.0")
-		mycmakeargs+=("-DLUA_LIBRARY=${EPREFIX}/usr/$(get_libdir)/libluajit-5.1.so")
-	fi
-	cmake_src_configure
-}
-
-src_test() {
-	# awesome's test suite starts Xvfb by itself, no need for virtualx eclass
-	HEADLESS=1 cmake_build check -j1
-}
-
-src_install() {
-	cmake_src_install
-	rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
-
-	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
-
-	# This directory contains SVG images which we don't want to compress
-	use doc && docompress -x /usr/share/doc/${PF}/doc
-}
-
-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"
-}