Don't use epatch for eapi 8 on wmaker ebuild

Added patch for respecting window fixed size content (like terminals)
even in maximized state (basically rollback of 370adc94e commit).
Aligned ebuild with upstream.

x11-wm/windowmaker/Manifest

@@ -1,3 +1,4 @@
+AUX wmaker-ignore-max-for-terminals.patch 1309 BLAKE2B 605136e83cbfa3acb05fcb7e2b0d82bd05007997e970d4ffe9bf302254193aa5806ba696a4fa226158194b7d0e69b0ba2e7eda6009c07d4015add016d878d4c5 SHA512 63a3ab78b688638562c3eb040e8df02254633d594a380b21777163fe8fa1a140d0f1ea6e419c53aa58c1624a3098d5a1873ebca57bda3b32954407acff1cd13f
 AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-8888.ebuild 3065 BLAKE2B df0936858c58a540712ad0f7dba17e6538c26da2b1be1f51093a02ecc36ce87a40acd21bdb24656d93a3d017cd63723181ad17019b6db0cd5a2ba1e5e60a878b SHA512 aa01bae520dd9c3c7f425712f4862e0571cd57d3193d74bbf187c52d03992dddda8629a708056d183d605862920de977d7aafcffe6c710812d913cad512523bf
+EBUILD windowmaker-8888.ebuild 3426 BLAKE2B 11995ec89ea63a5d2d49b4ce79ef56a245a81f18e08813c54a7bb97d6205d15324607d0beb70dca7434bce75104a85e6916dcedb11e4026c1c4cd221cb3acc71 SHA512 57d62fd5e79c076214a658138d132c8a99f4e702746b238ad8ed976fcc8f85c8372b41c023ae51e0950f4027a0efa3420a3407b46c6c84d33f69f39923ea6498

x11-wm/windowmaker/files/wmaker-ignore-max-for-terminals.patch

@@ -0,0 +1,43 @@
+diff --git a/src/window.c b/src/window.c
+index 70e1f962..2acc4e3c 100644
+--- a/src/window.c
++++ b/src/window.c
+@@ -1911,10 +1911,9 @@ void wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nhe
+ 	}
+ 
+ 	if (wwin->normal_hints) {
+-		if (!wwin->flags.maximized) {
+-			winc = wwin->normal_hints->width_inc;
+-			hinc = wwin->normal_hints->height_inc;
+-		}
++		winc = wwin->normal_hints->width_inc;
++		hinc = wwin->normal_hints->height_inc;
++
+ 		minW = wwin->normal_hints->min_width;
+ 		minH = wwin->normal_hints->min_height;
+ 		maxW = wwin->normal_hints->max_width;
+@@ -1981,17 +1980,15 @@ void wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nhe
+ 		}
+ 	}
+ 
+-	if (!wwin->flags.maximized) {
+-		if (baseW != 0)
+-			width = (((width - baseW) / winc) * winc) + baseW;
+-		else
+-			width = (((width - minW) / winc) * winc) + minW;
++	if (baseW != 0)
++		width = (((width - baseW) / winc) * winc) + baseW;
++	else
++		width = (((width - minW) / winc) * winc) + minW;
+ 
+-		if (baseH != 0)
+-			height = (((height - baseH) / hinc) * hinc) + baseH;
+-		else
++	if (baseH != 0)
++		height = (((height - baseH) / hinc) * hinc) + baseH;
++	else
+ 			height = (((height - minH) / hinc) * hinc) + minH;
+-	}
+ 
+ 	/* broken stupid apps may cause preposterous values for these.. */
+ 	if (width > 0)

x11-wm/windowmaker/windowmaker-8888.ebuild

@@ -2,18 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit autotools git-r3
+inherit autotools desktop git-r3
 
 DESCRIPTION="The fast and light GNUstep window manager - gryf's personal ebuild"
 HOMEPAGE="http://www.windowmaker.org/"
 SRC_URI="http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
 EGIT_REPO_URI="https://github.com/gryf/wmaker"
-EGIT_BRANCH="${BRANCH:-mynext}"
-EGIT_COMMIT="${COMMIT:-}"
+EGIT_BRANCH="${EGIT_BRANCH:-master}"
+EGIT_COMMIT="${EGIT_COMMIT:-}"
 
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
+IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr -term"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="media-libs/fontconfig
@@ -24,14 +24,18 @@ DEPEND="media-libs/fontconfig
 	x11-libs/libXv
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
 	imagemagick? ( >=media-gfx/imagemagick-7:0= )
-	jpeg? ( virtual/jpeg:0= )
-	nls? ( >=sys-devel/gettext-0.10.39 )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	webp? ( media-libs/libwebp )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng:= )
+	tiff? ( media-libs/tiff:= )
+	webp? ( media-libs/libwebp:= )
 	xinerama? ( x11-libs/libXinerama )
 	xrandr? ( x11-libs/libXrandr )"
 RDEPEND="${DEPEND}"
+BDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )"
+
+DOCS=( AUTHORS BUGFORM BUGS ChangeLog INSTALL-WMAKER FAQ
+	NEWS README README.definable-cursor README.i18n TODO )
 
 src_unpack() {
 	# wm-extras
@@ -40,49 +44,65 @@ src_unpack() {
 	git-r3_src_unpack
 }
 
+PATCHES=( )
+
 src_prepare() {
+	# Add info about commit in About window
 	local git_revision=$(git log --pretty=format:'%h' -n 1)
 	sed -i -e "s/\(AC_INIT(\[WindowMaker\],\[[^]]*\)\]/\1, rev.${git_revision}\]/" configure.ac || die
 
 	# Fix some paths
 	for file in WindowMaker/*menu* util/wmgenmenu.c; do
 		if [[ -r $file ]] ; then
-			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
-			sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
-			sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die
+			sed -i -e "s|/usr/local/GNUstep/Applications/WPrefs.app|${EPREFIX}/usr/bin/|g;" "$file" || die
+			sed -i -e "s|/usr/local/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
+			sed -i -e "s|/opt/share/WindowMaker|${EPREFIX}/usr/share/WindowMaker|g;" "$file" || die
 		fi
 	done
 
+	if use term; then
+		PATCHES+=( "${FILESDIR}/wmaker-ignore-max-for-terminals.patch" )
+	fi
+
 	default
 	eautoreconf
 }
 
 src_configure() {
-	local myconf
+	local -a myeconfargs=(
+		# image format types
+		$(use_enable gif)
+		$(use_enable imagemagick magick)
+		$(use_enable jpeg)
+		$(use_enable png)
+		$(use_enable tiff)
+		$(use_enable webp)
+		$(use_enable xpm)
 
-	# image format types
-	myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"
+		# optional X capabilities
+		$(use_enable modelock)
+		$(use_enable xinerama)
+		$(use_enable xrandr randr)
+	)
 
+	# NLS depends on whether LINGUAS is empty
 	if use nls; then
-		[[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)"
+		myeconfargs+=( LINGUAS="${LINGUAS:-$(cd po; x=(*.po); echo ${x[*]%.po})}" )
 	else
-		myconf="${myconf} --disable-locale"
+		myeconfargs+=( LINGUAS= )
 	fi
 
-	# default settings with $myconf appended
 	econf \
+		--localedir="${EPREFIX}"/usr/share/locale \
 		--sysconfdir="${EPREFIX}"/etc/X11 \
-		--with-x \
 		--enable-debug \
 		--enable-usermenu \
+		--with-{incs,libs}-from= \
 		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
-		--localedir="${EPREFIX}"/usr/share/locale \
-		${myconf}
+		--with-x \
+		"${myeconfargs[@]}"
 
-	pushd ../WindowMaker-extra-0.1 || die
+	pushd ../WindowMaker-extra-0.1 &>/dev/null || die
 	econf
 }
 
@@ -90,18 +110,15 @@ src_compile() {
 	emake
 
 	# WindowMaker Extra Package (themes and icons)
-	pushd ../WindowMaker-extra-0.1 || die
-	emake
+	emake -C ../WindowMaker-extra-0.1
 }
 
 src_install() {
 	default
 
 	# WindowMaker Extra
-	pushd ../WindowMaker-extra-0.1 || die
-	emake DESTDIR="${D}" install
-
-	newdoc README README.extra
+	emake -C ../WindowMaker-extra-0.1 DESTDIR="${D}" install
+	newdoc ../WindowMaker-extra-0.1/README README.extra
 
 	# create wmaker session shell script
 	echo "#!/usr/bin/env bash" > wmaker