gentoo (valentine's day) resync : 14.02.2021

2 files changed, 20 insertions, 24 deletions

diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index aab0fd0276e9..eeea6fa43557 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -1,4 +1,4 @@
 AUX wmii.desktop 106 BLAKE2B b92235ce6a4f21648baf326952bf7dd0cc9f76670b97a41316d9763889c91b64defa067c0b07a93c2547e477fdac29b4f4050cc9954210b98788ea34ad3eac54 SHA512 4c2ce08f692996c20f3f8d3d7884ac82644e8d1782b3895a0e75ecfe6c8ee9faf68a7621226d3cd9fb75cee0942d46cc55373dd74832508368a7c9760a18b143
 DIST wmii+ixp-3.9.2.tbz 432032 BLAKE2B 176b0cee20de3bac6eb23584650fc9beed793cfce1b2af9d47fc7be675da094d90670e8566b1dce264a8715711aa0d3cd207d9b8ef243bd48343fd5fe3c645f7 SHA512 c75d6d3f80e2b263c8d7b9eb6d0e700a1ad642209fc0984908e9399d22372c6c0572f47ab61881d5d56c4cc4eeb2914a545f6af1bbb936b65848764577d75761
-EBUILD wmii-3.9.2-r5.ebuild 1626 BLAKE2B e28350b06c1eb13953319bdb23383b73a15cd9a5ed700748158ec60d52619e127aad23bd12a0465f3686d346b6bb4e731ae7ddb96ca87c7d0c9a4b196cdb64aa SHA512 7a1294f37cf2f037f9fa3f21f68dcbbc5d9779150b62dcb8d99034142463f1a3cc9eb00c92526aa4ad1a293bf4f57b51a30e8e2298de3298af0200d997c0f817
+EBUILD wmii-3.9.2-r6.ebuild 1644 BLAKE2B 8d1aadc39751bc8e85d6745e57dc8c2342d7dea5b897357ef62fbd86c3669b5c0e1cac912f90865e0339cbc2b882828a6ce83ddc2478318496788ad4fcc722e4 SHA512 ad857a5e68236dc3d8669b21d9aac5d03ca52a442044a2a1a40c16fcb4f0d03d80a15cb1e3d9596c339990e4e28190da35f3c65d1320838194f87ba0c78ee00d
 MISC metadata.xml 594 BLAKE2B d801807fafe5de7450411e473648981388b862e019854ece2f037a92468847ea3c7117d72e1909cd6452b6f28157b10dae36454d162fd987388466558e31e5ba SHA512 edcd06fe65f52b946193e53d348431ff81917c25c6c5fb7f52be1a202a81b7b05a575449f6bc6cf288f6e2c68d4db240c262378e5133c5b1b2b091e7bdb96baa
diff --git a/x11-wm/wmii/wmii-3.9.2-r5.ebuild b/x11-wm/wmii/wmii-3.9.2-r6.ebuild
index ce878f3d1ccd..1199ba5c7cad 100644
--- a/x11-wm/wmii/wmii-3.9.2-r5.ebuild
+++ b/x11-wm/wmii/wmii-3.9.2-r6.ebuild
@@ -1,43 +1,34 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic multilib toolchain-funcs
 
 MY_P="wmii+ixp-${PV}"
 
 DESCRIPTION="A dynamic window manager for X11"
-HOMEPAGE="http://wmii.suckless.org/"
+HOMEPAGE="https://github.com/0intro/wmii"
 SRC_URI="http://dl.suckless.org/wmii/${MY_P}.tbz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
 
-CDEPEND="
+DEPEND="
+	media-libs/freetype
 	>=sys-libs/libixp-0.5_p20110208-r3
-	x11-libs/libXft
 	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXinerama
-	>=media-libs/freetype-2
-"
-
-RDEPEND="
-	${CDEPEND}
-	x11-apps/xmessage
-	x11-apps/xsetroot
+	x11-libs/libX11"
+RDEPEND="${DEPEND}
 	media-fonts/font-misc-misc
-"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig
-"
+	x11-apps/xmessage
+	x11-apps/xsetroot"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -61,13 +52,18 @@ src_prepare() {
 	)
 
 	# punt internal copy of sys-libs/libixp #323037
-	rm -f include/ixp{,_srvutil}.h || die
+	rm include/ixp{,_srvutil}.h || die
 	sed -i -e '/libixp/d' Makefile || die
 
 	sed -i -e "/BINSH \!=/d" mk/hdr.mk || die #335083
 	sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die #369115
 }
 
+src_configure() {
+	append-flags -fcommon
+	default
+}
+
 src_compile() {
 	append-flags -I/usr/include/freetype2
 	emake "${mywmiiconf[@]}"
@@ -81,5 +77,5 @@ src_install() {
 	doexe "${T}/${PN}"
 
 	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
+	doins "${FILESDIR}"/${PN}.desktop
 }