proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

10 files changed, 658 insertions, 0 deletions

diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
new file mode 100644
index 000000000000..af7eba4c7f33
--- /dev/null
+++ b/x11-wm/windowmaker/Manifest
@@ -0,0 +1,5 @@
+DIST WindowMaker-0.92.0.tar.gz 2758524 SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6 SHA512 3db6d7128d49ecd87d46893c63efcdda07f841bdfd5961462c0c9247d4f3937835f637dc7f4fa7169f6999595afca914c611f4249915700a461130c5a3c865d2 WHIRLPOOL 8d9395c79cdb23d4d6011dc5a1383852890f2d02fa0038a80cf81e2135b4a904065b4051fd1be07818136442f5ac792459f5cc81bc75ba090c1728aa4e4ef4cd
+DIST WindowMaker-0.95.5.tar.gz 2927995 SHA256 4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0 SHA512 0a6eb7c3ffee1d09dbc2408be4d2c04f6647cd1195366047083b5c5c89b61e92a5c7d5d134e43775fc371ea27ac8645ad0a7cbae86ebd53f2eae20066ac56703 WHIRLPOOL eb41cffab165af4efb66b28aacbc0e4695d57a426565554f20566b02bb0f428c31e23ec50af36759992a9a18f1598a727f98168d6bde7443f58821101d1653da
+DIST WindowMaker-0.95.6.tar.gz 3004856 SHA256 435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4 SHA512 259db96b44058fde21b7efe65419b7f7ae149029dcfbf5cf480f920d68f906cd15345105ab67d8539be44d6f1b30e62accf68fc009d53af8c12e047c01154a11 WHIRLPOOL 6f27180cc4439b4b19c3f249fc9c5577463187c741c2e04112bb70feb8e052ad1093e0a5103f1772b59ee7b2549f7b126ac621165f94483e22fd756a969e0e3c
+DIST WindowMaker-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 WHIRLPOOL f2c61b318f64a2debb727ae79dfa1bb8101888bc9492633a96ace0e704c731c383e92882c871622987d5971b919359c066638fba05c5dade330fe3bee21bb034
+DIST windowmaker-0.92.0-patchset-5.tar.bz2 226417 SHA256 3298be8a2f1eb8130c249df790ed2a35a230c337f2d12fd426e14df9652a9adc SHA512 9edc25386658e5ddeaee2e3c7f396adbe16e9fdccde906f7b69bca95b1e0b33a2b2481fa445f5cf5b8e6b2492ca1b8409615e7a66f7d039d449d099523c4c779 WHIRLPOOL 62b42d533f2c2c22259aa0004ab995472e455997ccb6074e3f5b599b22cdd1c640003b6903c104e8663e62be312254afbc4d4147366af72eb16227b36eacd77c
diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.3-fix_underlinking.patch b/x11-wm/windowmaker/files/windowmaker-0.95.3-fix_underlinking.patch
new file mode 100644
index 000000000000..cd88709dc148
--- /dev/null
+++ b/x11-wm/windowmaker/files/windowmaker-0.95.3-fix_underlinking.patch
@@ -0,0 +1,15 @@
+diff --git a/wmlib/Makefile.am b/wmlib/Makefile.am
+index 0f8201f..7b95d1f 100644
+--- a/wmlib/Makefile.am
++++ b/wmlib/Makefile.am
+@@ -2,6 +2,7 @@
+ AUTOMAKE_OPTIONS = no-dependencies
+ 
+ libWMaker_la_LDFLAGS = -version-info 1:1:0
++libWMaker_la_LIBADD = @LIBRARY_SEARCH_PATH@ @XLIBS@
+ lib_LTLIBRARIES = libWMaker.la
+ 
+ include_HEADERS = WMaker.h
+-- 
+1.7.8.6
+
diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.5-bsd_crash.patch b/x11-wm/windowmaker/files/windowmaker-0.95.5-bsd_crash.patch
new file mode 100644
index 000000000000..a3e71375f621
--- /dev/null
+++ b/x11-wm/windowmaker/files/windowmaker-0.95.5-bsd_crash.patch
@@ -0,0 +1,28 @@
+From: François Tigeot <ftigeot@wolfpond.org>
+Date: Sat, 21 Sep 2013 10:34:51 +0000 (+0200)
+Subject: osdep_bsd.c: Fix a typo causing memory to be overwritten
+X-Git-Url: http://repo.or.cz/w/wmaker-crm.git/commitdiff_plain/38e088314a2a4b7f8031f50eb546c22e5024bdf4
+
+osdep_bsd.c: Fix a typo causing memory to be overwritten
+
+* When compiled on DragonFly+gcc 4.7.3, this out of bounds array element
+  initialization causes an important variable to be overwritten and a
+  subsequent WindowMaker crash
+
+* It was sheer luck other compilers/environments didn't exhibit any obvious
+  issue so far
+---
+
+diff --git a/src/osdep_bsd.c b/src/osdep_bsd.c
+index 3393240..ad504ad 100644
+--- a/src/osdep_bsd.c
++++ b/src/osdep_bsd.c
+@@ -86,7 +86,7 @@ Bool GetCommandForPid(int pid, char ***argv, int *argc)
+ 		mib[0] = CTL_KERN;
+ 		mib[1] = KERN_ARGMAX;
+ 		mib[2] = 0;
+-		mib[4] = 0;
++		mib[3] = 0;
+ 
+ 		count = sizeof(argmax);
+ 		if (sysctl(mib, 2, &argmax, &count, NULL, 0) == -1)
diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.6-webp_detection.patch b/x11-wm/windowmaker/files/windowmaker-0.95.6-webp_detection.patch
new file mode 100644
index 000000000000..a451486288f6
--- /dev/null
+++ b/x11-wm/windowmaker/files/windowmaker-0.95.6-webp_detection.patch
@@ -0,0 +1,70 @@
+From e1146e56e08af2a66aecedffc6ff31d8ddcb25f3 Mon Sep 17 00:00:00 2001
+From: Christophe CURIS <christophe.curis@free.fr>
+Date: Mon, 15 Dec 2014 23:49:29 +0100
+Subject: [PATCH] configure: rewrote the detection for WebP image library
+
+Unfortunately, the detection was broken because the header is using a hack
+on the function name to provide compatibility between different versions of
+the API, which means the usual link test, which uses a known name of a
+symbol, cannot work without also using the header to get the hack applied
+on the function's name.
+
+The new detection mechanism now simply check for both header and link at
+the same time, so we're probably safe until a Major API change is decided,
+in which case we will also have to update WRaster's code anyway.
+
+Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
+---
+ m4/wm_imgfmt_check.m4 |   36 ++++++++++++++++++++++++++++--------
+ 1 files changed, 28 insertions(+), 8 deletions(-)
+
+diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
+index cad2d72..d07e618 100644
+--- a/m4/wm_imgfmt_check.m4
++++ b/m4/wm_imgfmt_check.m4
+@@ -187,14 +187,34 @@ AC_DEFUN_ONCE([WM_IMGFMT_CHECK_TIFF],
+ # the variable 'supported_gfx'
+ # When not found, append info to variable 'unsupported'
+ AC_DEFUN_ONCE([WM_IMGFMT_CHECK_WEBP],
+-[WM_LIB_CHECK([WEBP], ["-lwebp"], [VP8DecodeLayer], [$XLFLAGS $XLIBS],
+-    [wm_save_CFLAGS="$CFLAGS"
+-     AS_IF([wm_fn_lib_try_compile "webp/decode.h" "" "return 0" ""],
+-         [],
+-         [AC_MSG_ERROR([found $CACHEVAR but could not find appropriate header - are you missing libwebp-dev package?])])
+-     CFLAGS="$wm_save_CFLAGS"],
+-    [supported_gfx], [GFXLIBS])dnl
+-]) dnl AC_DEFUN
++[AS_IF([test "x$enable_webp" = "xno"],
++    [unsupported="$unsupported WebP"],
++    [AC_CACHE_CHECK([for WebP support library], [wm_cv_imgfmt_webp],
++        [wm_cv_imgfmt_webp=no
++         dnl
++         dnl The library is using a special trick on the functions to provide
++         dnl compatibility between versions, so we cannot try linking against
++         dnl a symbol without first using the header to handle it
++         wm_save_LIBS="$LIBS"
++         LIBS="$LIBS -lwebp"
++         AC_TRY_LINK(
++             [@%:@include <webp/decode.h>],
++             [WebPGetFeatures(NULL, 1024, NULL);],
++             [wm_cv_imgfmt_webp="-lwebp"])
++         LIBS="$wm_save_LIBS"
++         AS_IF([test "x$enable_webp$wm_cv_imgfmt_webp" = "xyesno"],
++              [AC_MSG_ERROR([explicit WebP support requested but no library found])])dnl
++        ])
++     AS_IF([test "x$wm_cv_imgfmt_webp" = "xno"],
++         [unsupported="$unsupported WebP"
++          enable_webp="no"],
++         [supported_gfx="$supported_gfx WebP"
++          WM_APPEND_ONCE([$wm_cv_imgfmt_webp], [GFXLIBS])dnl
++          AC_DEFINE([USE_WEBP], [1],
++              [defined when valid Webp library with header was found])])dnl
++    ])
++AM_CONDITIONAL([USE_WEBP], [test "x$enable_webp" != "xno"])dnl
++])
+ 
+ 
+ # WM_IMGFMT_CHECK_XPM
+-- 
+1.7.6.6.GIT
+
diff --git a/x11-wm/windowmaker/files/wmaker.desktop b/x11-wm/windowmaker/files/wmaker.desktop
new file mode 100644
index 000000000000..fd24a0b00e0c
--- /dev/null
+++ b/x11-wm/windowmaker/files/wmaker.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+# The names/descriptions should really be better
+Name=GNUStep WindowMaker
+Comment=Use this session to run WindowMaker as your desktop environment
+Exec=/usr/bin/wmaker
+Icon=
+Type=Application
diff --git a/x11-wm/windowmaker/metadata.xml b/x11-wm/windowmaker/metadata.xml
new file mode 100644
index 000000000000..ddcce78103f8
--- /dev/null
+++ b/x11-wm/windowmaker/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gnustep</herd>
+	<use>
+		<flag name="modelock">Enable XKB language status lock support. README
+			says: "If you don't know what it is you probably don't need
+			it."</flag>
+		<flag name='xrandr'>Enable XRandR window extension support</flag>
+		<flag name="vdesktop">Enable dynamic virtual desktop (conflicts with
+			software that works on the edges of the screen)</flag>
+		<flag name="webp">Enables WebP image format support using <pkg>media-libs/libwebp</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
new file mode 100644
index 000000000000..56cbbee3f356
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=3
+
+inherit autotools eutils flag-o-matic
+
+# note: patchset is in gentoo/src/patchsets/windowmaker
+PATCHVER=5
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="http://www.windowmaker.info/"
+SRC_URI="
+	ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz
+	mirror://gentoo/${P}-patchset-${PATCHVER}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif jpeg nls png tiff modelock +vdesktop xinerama"
+KEYWORDS="alpha amd64 hppa ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	png? ( media-libs/libpng:0 )
+	jpeg? ( virtual/jpeg )
+	tiff? ( media-libs/tiff:0 )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )
+	!app-i18n/scim-anthy[gtk3]
+"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+src_prepare() {
+	local psd="${WORKDIR}"/${P}-patchset-${PATCHVER}
+
+	epatch "${psd}"/WindowMaker-0.92.0-cvs20060123.patch
+	epatch "${psd}"/WindowMaker-0.92.0-cvs-gcc41.patch
+	epatch "${psd}"/wlist-0.9x.patch
+	epatch "${psd}"/${P}-gif-before-ungif.patch
+	epatch "${psd}"/${P}-math_h.patch
+	epatch "${psd}"/${P}-gettext.patch
+	epatch "${psd}"/${P}-libpng14.patch
+	epatch "${psd}"/${P}-libpng15.patch
+
+	# Patches from upstream HG
+	epatch "${psd}"/${P}-composite-non-24bit-depth.patch
+	epatch "${psd}"/${P}-mouse-window-focus.patch
+	epatch "${psd}"/${P}-maximise-borderless-too-small.patch
+	epatch "${psd}"/${P}-xinerama-switchpanel-corruption.patch
+	epatch "${psd}"/${P}-dialog-history.patch
+	epatch "${psd}"/${P}-single-click-dockapp-start.patch
+	epatch "${psd}"/${P}-no-pop-empty-array.patch
+	epatch "${psd}"/${P}-empty-command-fatal-error.patch
+	epatch "${psd}"/${P}-findfile-overflow.patch
+	epatch "${psd}"/${P}-pointer-integer-warn-fix.patch
+	epatch "${psd}"/${P}-workspace-change-crash.patch
+	epatch "${psd}"/${P}-app-icon-fix.patch
+	epatch "${psd}"/${P}-xchangeproperty-64bits-fix.patch
+
+	# Patches from altlinux
+	epatch "${psd}"/WindowMaker-0.91.0-alt-session.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-restartscrpt.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-menutrans.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-titlebar.patch
+	epatch "${psd}"/${P}-no-clip-title.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-mmx.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-focus.patch
+	epatch "${psd}"/WindowMaker-0.92.0-alt-alloca.patch
+
+	# New features (cool!)
+	epatch "${psd}"/${P}-doubleclick-maximise.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-dockhotkeys.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-trance.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-newbuttons.patch
+	epatch "${psd}"/WindowMaker-0.91.0-hmepas-minimizeall.patch
+	epatch "${psd}"/WindowMaker-0.91.0-hmepas-swmenu_rclick.patch
+	epatch "${psd}"/WindowMaker-0.91.0-sga-moving-add.patch
+	epatch "${psd}"/WindowMaker-0.91.0-peter-newappicon.patch
+	epatch "${psd}"/WindowMaker-0.91.0-peter-mouse-placement.patch
+	epatch "${psd}"/WindowMaker-0.91.0-peter-appicon-bouncer2.patch
+	epatch "${psd}"/WindowMaker-0.91.0-sga-swpanel-customization.patch
+	epatch "${psd}"/WindowMaker-0.92.0-alt-newpo.patch
+
+	[[ ${CHOST} == *-interix* ]] && epatch "${psd}"/${P}-interix3.patch
+	epatch "${psd}"/${P}-darwin-setlocale.patch
+	epatch "${psd}"/${P}-nls.patch
+
+	# Add UK localisation
+	cp "${psd}"/WindowMaker-uk.po po/uk.po
+	cp "${psd}"/WPrefs-uk.po WPrefs.app/po/uk.po
+
+	# Add newbuttons resources
+	cp "${psd}"/WindowMaker-newbuttons.nextstyle.tiff \
+		WPrefs.app/tiff/nextstyle.tiff
+	cp "${psd}"/WindowMaker-newbuttons.oldstyle.tiff \
+		WPrefs.app/tiff/oldstyle.tiff
+	cp "${psd}"/WindowMaker-newbuttons.nextstyle.xpm \
+		WPrefs.app/xpm/nextstyle.xpm
+
+	# Fix some paths
+	for file in "${S}"/WindowMaker/*menu*; 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
+		fi;
+	done;
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	is-flag -fstack-protector && filter-flags -fstack-protector \
+		&& ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)"
+	replace-flags "-Os" "-O2"
+	replace-flags "-O3" "-O2"
+
+	# image format types
+	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
+
+	# non required X capabilities
+	myconf="${myconf} $(use_enable modelock) $(use_enable xinerama)"
+
+	if use nls; then
+		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# enable new features, need to be done via defines
+	append-flags -DBOUNCE_APP -DNEWAPPICON
+	use vdesktop && append-flags -DVIRTUAL_DESKTOP
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--with-nlsdir="${EPREFIX}"/usr/share/locale \
+		${myconf}
+	cd ../WindowMaker-extra-0.1
+	econf
+}
+
+src_compile() {
+	emake || die "windowmaker: make has failed"
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	emake || die "windowmaker-extra: make has failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "windowmaker: install has failed."
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \
+		  MIRRORS README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake DESTDIR="${D}" install || die "windowmaker-extra: install failed"
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /etc/X11/dm/Sessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}
diff --git a/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild
new file mode 100644
index 000000000000..ef35c19b70f8
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="http://www.windowmaker.org/"
+SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif jpeg nls png tiff modelock xinerama xrandr"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	png? ( media-libs/libpng:0= )
+	jpeg? ( virtual/jpeg )
+	tiff? ( media-libs/tiff:0 )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )
+	!app-i18n/scim-anthy[gtk3]
+"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+src_prepare() {
+	# 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
+		fi;
+	done;
+
+	epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch
+	epatch "${FILESDIR}"/${P}-bsd_crash.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# image format types
+	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
+
+	# non required X capabilities
+	myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)"
+
+	if use nls; then
+		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--with-nlsdir="${EPREFIX}"/usr/share/locale \
+		${myconf}
+
+	cd ../WindowMaker-extra-0.1
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
+		  README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake DESTDIR="${D}" install
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}
diff --git a/x11-wm/windowmaker/windowmaker-0.95.6.ebuild b/x11-wm/windowmaker/windowmaker-0.95.6.ebuild
new file mode 100644
index 000000000000..045be493f3e6
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.95.6.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="http://www.windowmaker.org/"
+SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	imagemagick? ( media-gfx/imagemagick )
+	jpeg? ( virtual/jpeg:0= )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	webp? ( media-libs/libwebp )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )
+	!app-i18n/scim-anthy[gtk3]
+"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+src_prepare() {
+	# 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
+		fi;
+	done;
+
+	epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch
+	epatch "${FILESDIR}"/${P}-webp_detection.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# 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)"
+
+	if use nls; then
+		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--with-nlsdir="${EPREFIX}"/usr/share/locale \
+		${myconf}
+
+	cd ../WindowMaker-extra-0.1
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
+		  README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake DESTDIR="${D}" install
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}
diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
new file mode 100644
index 000000000000..9fcb8baf6193
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils git-r3
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="http://www.windowmaker.org/"
+SRC_URI="http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+EGIT_REPO_URI="git://repo.or.cz/wmaker-crm.git"
+EGIT_BRANCH="next"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr"
+KEYWORDS=""
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	imagemagick? ( media-gfx/imagemagick )
+	jpeg? ( virtual/jpeg:0= )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	webp? ( media-libs/libwebp )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )
+	!app-i18n/scim-anthy[gtk3]"
+
+src_unpack() {
+	# wm-extras
+	unpack ${A}
+
+	git-r3_src_unpack
+}
+
+src_prepare() {
+	# 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
+		fi;
+	done;
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# 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)"
+
+	if use nls; then
+		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--localedir="${EPREFIX}"/usr/share/locale \
+		${myconf}
+
+	cd ../WindowMaker-extra-0.1
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
+		  README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake DESTDIR="${D}" install
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}