gentoo resync : 30.09.2020

3 files changed, 62 insertions, 7 deletions

diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index ca407acbf9a3..9dc242b15757 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -5,6 +5,8 @@ AUX wmfs-99999999-desktop.patch 153 BLAKE2B e9a3f1039bddd76ddc05955e843e89c1ab81
 AUX wmfs-99999999-fno-common.patch 1986 BLAKE2B 096becca88a23b15e3fee115640b50baca0f1f3ba58c15903a74fd4da75bc2e1662d672982940ac55c506f79f3820ffa9e851981008f82d9163eaf291e4339cf SHA512 b7593e0c0c0e3e73421a1636cdc2b3cebd6c51896e404bad9bec378e733b54cb0168a53dea40466128210f47459a2bb5e04074d588d33b07908efd1581472eaf
 AUX wmfs-99999999-strncat.patch 598 BLAKE2B e80fd233e895162e24f7264cf152c9a570665d5f6ff48ea1ec9212963c2b786b5707c8052d33a1a354b283042af0c2b7d5ac45f34e8dc57a68abd517d7e410aa SHA512 9141bd044a122fbe0aa10189f38d02e127c453665ae7d926dee852bb16ec7812450357e86ab6dfc8f48a41ce16891759a8229bb4a67f1bb5a970c7e6452298fd
 DIST wmfs-201003.tar.gz 59593 BLAKE2B b2e1f2cf73ca3d8881fa8de7b52fb6cae947a6006549f05dd06179b8b44b10fd1157a8e180b2b3177177fe0edf4c39b9a3fbf36ebb2b6470f1ed802a641a4c89 SHA512 117a238d6a8d8d147291ec9fb4e0aaf2bf8bab8ea794cf00deeaeaac1df15f0122bc705cb1bff54abe80d7228a19e67a79e4b3e0de0ced82abaf98fab3778a90
+DIST wmfs-20180520.tar.xz 56364 BLAKE2B 23530193ba2c37ae4129fd23dda2ff8cd301b0bd92d32e06b264efd990b7957b38170de31f04afca6fd9875d2e0450c8bede416e5f49d6e19962718fe2e240a3 SHA512 bcff251397d8483db49c037c51eef7b3dcc87a6d94650ae9e9cabc7104177216e0efa7e67bfb34978bae67dc4853884673ce288bb8087e95cb2993d519ab4f2f
 EBUILD wmfs-201003.ebuild 968 BLAKE2B 89d8b905ba1c0a6c0016e9b0b40e0f3bd5ef538134e72b7b560dac4547a5f875081d3275604fc66a274ebb118556295433516ee884aa815fe8572cb2a766fc24 SHA512 4afaf1556dd33aa42c749a22929a815ec7970156963e39cc6e78e2d56dbbf465554889e4bb1ed1534e92ee0fbdc00803cf873408d8a014d197702c82ac803bc2
-EBUILD wmfs-99999999.ebuild 1141 BLAKE2B 29ab0a030dafb7f482dda9c06ae49c26bad2c5a77099e58b4148ee635a003d03e5a9a21c265800319a4a467c4d07a831e874c0279e6ac6adfd1f8de78065fb15 SHA512 e68aacf763356986ada1101eb77226c9efb94a23a7e1e619110f8e5f954a9b73168aa997c39a88c8c9744c5365a8709d9fbef0a3c176c9b65b2d8b47155eb823
+EBUILD wmfs-20180520.ebuild 1132 BLAKE2B cb7e3aebeb66a9c09f0984f6ef7d3b1971e1365c12af12a2ba33484aa05b67bbe62f24a586b04c3d0000a69941378868c2104813ea5a43618617c1a48f4a88ba SHA512 49d7081c5c0f5cf9177b898b3eb81e9275fa06aa9a45afeb235b5c3742e92f28edbc80fca9310fc1c4172fa5ab8eac3d90b2822afb5f331e88d82b8aee380dc0
+EBUILD wmfs-99999999.ebuild 1130 BLAKE2B d0e2ae315de0ce2a810b0ff2b7bfb5dcd0ea6f2e98201ade65e7f4154c61a421a1c642c541078379ef3ff6d31ce2aa78f50423454251bba4649286b3cef38d46 SHA512 b52a4cbb7ef9268c7e3da454d08ea38df0d1f585ea94ca71f4dc7da157f19b85f50749b9ef7f71226c2ec0304c23c3de1ca8b07bbfb4961a7a85a7c517bff2ad
 MISC metadata.xml 380 BLAKE2B 318de05f3f531b8c35e71a0563525f7c8a1397e0ba4adbd086b768c93d792d8c336da47bc7582dfc7b0f4ce2917dcccb21191f46c064b02317477ef3a568ee17 SHA512 644e88ac0ca2d999cd273f807d45400a8438a9800b3b744f764c914fa41d819efd55ecaa27de6cbcf4403491f2986299fc1c032afd26fee67822cfc2c6368359
diff --git a/x11-wm/wmfs/wmfs-20180520.ebuild b/x11-wm/wmfs/wmfs-20180520.ebuild
new file mode 100644
index 000000000000..f01f6ce2129b
--- /dev/null
+++ b/x11-wm/wmfs/wmfs-20180520.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable"
+HOMEPAGE="https://github.com/xorg62/wmfs"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+imlib2 +xinerama"
+
+RDEPEND="
+	media-libs/freetype
+	media-libs/imlib2[X]
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999999-Debian.patch
+	"${FILESDIR}"/${PN}-99999999-desktop.patch
+	"${FILESDIR}"/${PN}-99999999-fno-common.patch
+	"${FILESDIR}"/${PN}-99999999-strncat.patch
+)
+DOCS=(
+	README
+	scripts/keybind_help.sh
+	scripts/status.sh
+)
+
+src_configure() {
+	tc-export CC
+	# not autotools based
+	local ECHO
+	for ECHO in echo ''; do
+		${ECHO} sh configure \
+			$(usex xinerama '' --without-xinerama) \
+			$(usex imlib2 '' --without-imlib2) \
+			--prefix /usr \
+			--man-prefix /usr/share/man \
+			--xdg-config-dir /etc/xdg \
+			|| die
+	done
+}
diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild
index 416f8f678db2..286281b6f1f6 100644
--- a/x11-wm/wmfs/wmfs-99999999.ebuild
+++ b/x11-wm/wmfs/wmfs-99999999.ebuild
@@ -32,6 +32,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-99999999-fno-common.patch
 	"${FILESDIR}"/${PN}-99999999-strncat.patch
 )
+DOCS=(
+	README
+	scripts/keybind_help.sh
+	scripts/status.sh
+)
 
 src_configure() {
 	tc-export CC
@@ -47,9 +52,3 @@ src_configure() {
 			|| die
 	done
 }
-
-src_install() {
-	default
-	rm -r "${D}"/usr/share/${PN}
-	dodoc README
-}