x11-wm/wmii: fix build w/ lld; fix VariableScope

Closes: https://bugs.gentoo.org/836124
Closes: https://bugs.gentoo.org/832476
Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 96 insertions, 0 deletions

diff --git a/x11-wm/wmii/files/wmii-3.9.2-libdir.patch b/x11-wm/wmii/files/wmii-3.9.2-libdir.patch
new file mode 100644
index 000000000000..a1d68fac1afa
--- /dev/null
+++ b/x11-wm/wmii/files/wmii-3.9.2-libdir.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/832476
+--- a/config.mk
++++ b/config.mk
+@@ -11,7 +11,7 @@ PREFIX = /usr/local
+ 
+ # Includes and libs
+ INCLUDES = -I. -I$(ROOT)/include -I$(INCLUDE) -I/usr/include
+-LIBS = -L$(ROOT)/lib -L/usr/lib
++LIBS = -L$(LIBDIR)
+ 
+ TERMINAL = xterm
+ 
diff --git a/x11-wm/wmii/wmii-3.9.2-r7.ebuild b/x11-wm/wmii/wmii-3.9.2-r7.ebuild
new file mode 100644
index 000000000000..b4c0c4b776be
--- /dev/null
+++ b/x11-wm/wmii/wmii-3.9.2-r7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P="wmii+ixp-${PV}"
+
+DESCRIPTION="A dynamic window manager for X11"
+HOMEPAGE="https://github.com/0intro/wmii"
+SRC_URI="https://dl.suckless.org/wmii/${MY_P}.tbz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	media-libs/freetype
+	>=sys-libs/libixp-0.5_p20110208-r3
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libX11"
+RDEPEND="${DEPEND}
+	media-fonts/font-misc-misc
+	x11-apps/xmessage
+	x11-apps/xsetroot"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( NEWS NOTES README TODO )
+
+# Force dynamic linking, bug #273332
+MAKEOPTS="${MAKEOPTS} STATIC= -j1"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.9.2-libdir.patch
+)
+
+src_prepare() {
+	default
+
+	mywmiiconf=(
+		PREFIX=/usr
+		DOC=/usr/share/doc/${PF}
+		ETC=/etc
+		LIBDIR=/usr/$(get_libdir)
+		CC="$(tc-getCC) -c"
+		LD="$(tc-getCC)"
+		AR="$(tc-getAR) crs"
+		LIBIXP="${ESYSROOT}/usr/$(get_libdir)/libixp.so"
+	)
+
+	# Punt internal copy of sys-libs/libixp, bug #323037
+	rm include/ixp{,_srvutil}.h || die
+	sed -i -e '/libixp/d' Makefile || die
+
+	# bug #335083
+	sed -i -e "/BINSH \!=/d" mk/hdr.mk || die
+	# bug #369115
+	sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die
+}
+
+src_compile() {
+	append-flags -I"${ESYSROOT}"/usr/include/freetype2
+	append-flags -fcommon
+
+	emake "${mywmiiconf[@]}"
+}
+
+src_install() {
+	emake "${mywmiiconf[@]}" DESTDIR="${D}" install
+
+	echo ${PN} > "${T}"/${PN} || die
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/${PN}
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+}