diff --git a/app-editors/kakoune/kakoune-9999.ebuild b/app-editors/kakoune/kakoune-9999.ebuild
new file mode 100644
index 0000000..79393ec
--- /dev/null
+++ b/app-editors/kakoune/kakoune-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/surf/surf-9999.ebuild,v 1.3 2014/09/16 19:23:43 jer Exp $
+
+EAPI=5
+inherit eutils git-2 toolchain-funcs
+
+DESCRIPTION="Console text editor"
+HOMEPAGE="http://kakoune.org/"
+EGIT_REPO_URI="https://github.com/mawww/kakoune.git"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+
+COMMON_DEPEND="
+ dev-libs/boost
+ sys-libs/ncurses
+"
+DEPEND="
+ ${COMMON_DEPEND}
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+"
+
+src_compile() {
+ cd ./src
+ emake || die "emake failed"
+}
+
+src_install () {
+ cd ./src
+ emake DESTDIR="${D}" install
+}
diff --git a/app-editors/kakoune/metadata.xml b/app-editors/kakoune/metadata.xml
new file mode 100644
index 0000000..fda18a2
--- /dev/null
+++ b/app-editors/kakoune/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+boudin@cherboiche.org
+
+
diff --git a/x11-libs/wlc/metadata.xml b/x11-libs/wlc/metadata.xml
new file mode 100644
index 0000000..3483ee8
--- /dev/null
+++ b/x11-libs/wlc/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+proxy-maintainers
+
+ gentoo@cherboiche.org
+ Boudin
+ Maintainer. Assign bugs to him
+
+WLC is a wayland compositor library
+
diff --git a/x11-libs/wlc/wlc-9999.ebuild b/x11-libs/wlc/wlc-9999.ebuild
new file mode 100644
index 0000000..fb123f9
--- /dev/null
+++ b/x11-libs/wlc/wlc-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wlc/wlc-9999.ebuild,v 1.13 2014/11/20 11:47:14 jer Exp $
+
+EAPI=5
+inherit cmake-utils eutils toolchain-funcs git-r3
+
+DESCRIPTION="wayland compositor library"
+HOMEPAGE="http://github.com/Cloudef/wlc"
+SRC_URI=""
+EGIT_REPO_URI=${EGIT_REPO_URI:="https://github.com/Cloudef/wlc.git"}
+EGIT_BRANCH="master"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+ dev-libs/wayland
+ x11-libs/pixman
+ x11-libs/libxkbcommon
+ sys-fs/udev
+ dev-libs/libinput
+"
+DEPEND="
+ dev-util/cmake
+ x11-libs/libX11
+ x11-libs/libxcb
+ media-libs/mesa
+ ${RDEPEND}
+"
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/x11-libs/wld/metadata.xml b/x11-libs/wld/metadata.xml
new file mode 100644
index 0000000..afbc8f2
--- /dev/null
+++ b/x11-libs/wld/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+proxy-maintainers
+
+ gentoo@cherboiche.org
+ Boudin
+ Maintainer. Assign bugs to him
+
+WLD is a wayland drawing library
+
diff --git a/x11-libs/wld/wld-9999.ebuild b/x11-libs/wld/wld-9999.ebuild
new file mode 100644
index 0000000..507511a
--- /dev/null
+++ b/x11-libs/wld/wld-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wlc/wlc-9999.ebuild,v 1.13 2014/11/20 11:47:14 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs git-r3
+
+DESCRIPTION="wayland drawing library"
+HOMEPAGE="https://github.com/michaelforney/wld"
+SRC_URI=""
+EGIT_REPO_URI=${EGIT_REPO_URI:="https://github.com/michaelforney/wld.git"}
+EGIT_BRANCH="master"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+VIDEO_CARDS="nouveau intel"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+IUSE="${IUSE_VIDEO_CARDS} pixman drm wayland static"
+
+RDEPEND="
+ wayland? dev-libs/wayland
+"
+DEPEND="
+ ${RDEPEND}
+"
diff --git a/x11-terms/st/ChangeLog b/x11-terms/st/ChangeLog
new file mode 100644
index 0000000..bf0eb6a
--- /dev/null
+++ b/x11-terms/st/ChangeLog
@@ -0,0 +1,97 @@
+# ChangeLog for x11-terms/st
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v 1.22 2015/07/09 05:40:15 jer Exp $
+
+*st-0.6 (09 Jul 2015)
+
+ 09 Jul 2015; Jeroen Roovers +st-0.6.ebuild:
+ Version bump.
+
+ 12 Mar 2015; Michael Weber -st-0.4.1-r1.ebuild,
+ -st-0.4.1.ebuild, st-0.5.ebuild, st-9999.ebuild:
+ Drop old versions, add epatch_user
+
+ 09 Oct 2014; Agostino Sarubbo st-0.5.ebuild:
+ Stable for amd64, wrt bug #523954
+
+*st-0.5 (06 Apr 2014)
+
+ 06 Apr 2014; Jeroen Roovers +st-0.5.ebuild:
+ Version bump.
+
+ 06 Jan 2014; Jeroen Roovers st-0.4.1-r1.ebuild:
+ Marked ~hppa too.
+
+*st-0.4.1-r1 (06 Jan 2014)
+
+ 06 Jan 2014; Jeroen Roovers -st-0.4.ebuild,
+ +st-0.4.1-r1.ebuild, st-9999.ebuild:
+ Add desktop entry. "Migrate" to git-r3.eclass.
+
+ 17 Jun 2013; Michael Weber st-0.4.1.ebuild, st-0.4.ebuild,
+ st-9999.ebuild:
+ Update LICENSE to MIT-with-advertising (bug 472664, thanks Jack Chen)
+
+*st-0.4.1 (27 Apr 2013)
+
+ 27 Apr 2013; Jeroen Roovers st-0.4.ebuild, +st-0.4.1.ebuild,
+ st-9999.ebuild:
+ DEPEND on virtual/pkgconfig, X11 protos. Version bump.
+
+ 02 Apr 2013; Agostino Sarubbo -st-0.3.ebuild, st-0.4.ebuild:
+ Add ~x86, remove old, wrt to bug #464252
+
+*st-0.4 (02 Apr 2013)
+
+ 02 Apr 2013; Michael Weber +st-0.4.ebuild:
+ Version bump.
+
+ 23 Feb 2013; Michael Weber st-9999.ebuild:
+ Fix missing git-2 eclass.
+
+ 23 Feb 2013; Michael Weber -st-0.1.1.ebuild,
+ -st-0.2.1.ebuild, st-0.3.ebuild, st-9999.ebuild:
+ Correct X11 paths (thanks Joe M, bug 458796), verbose build.
+
+ 22 Feb 2013; Michael Weber st-0.3.ebuild, st-9999.ebuild,
+ metadata.xml:
+ Add IUSE savedconfig, update live ebuild.
+
+ 17 Dec 2012; Michael Weber st-9999.ebuild:
+ Update live ebuild from mercurial to git (thanks Andreas Wiese, bug 447564)
+
+ 07 Nov 2012; Jeroen Roovers st-0.3.ebuild:
+ Show elog messages only on first install.
+
+ 07 Nov 2012; Jeroen Roovers st-0.3.ebuild:
+ Add more deps.
+
+*st-0.3 (07 Nov 2012)
+
+ 07 Nov 2012; Jeroen Roovers +st-0.3.ebuild:
+ Version bump.
+
+ 07 Mar 2012; Jeroen Roovers st-0.1.1.ebuild,
+ st-0.2.1.ebuild, st-9999.ebuild:
+ Do not install installation instructions (README).
+
+*st-0.2.1 (07 Mar 2012)
+
+ 07 Mar 2012; Jeroen Roovers st-0.1.1.ebuild,
+ +st-0.2.1.ebuild, st-9999.ebuild:
+ Do not hard-code version in SRC_URI. Use SRC_URI arrows. Do not set SRC_URI
+ in 9999 ebuild. Version bump.
+
+ 04 Jan 2012; Mike Frysinger st-0.1.1.ebuild,
+ st-9999.ebuild:
+ Drop `use savedconfig` logic that the savedconfig eclass handles itself.
+
+ 04 Nov 2011; Michael Weber st-0.1.1.ebuild, st-9999.ebuild:
+ Added font warning (bug 369621)
+
+*st-9999 (31 May 2011)
+*st-0.1.1 (31 May 2011)
+
+ 31 May 2011; Michael Weber +st-0.1.1.ebuild,
+ +st-9999.ebuild, +metadata.xml:
+ Initial import
diff --git a/x11-terms/st/Manifest b/x11-terms/st/Manifest
new file mode 100644
index 0000000..7637d88
--- /dev/null
+++ b/x11-terms/st/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST st-0.5.tar.gz 36710 SHA256 ae80ddfaf8146f7665772efc9b85e05e08be5087682a689ecdf71aa4d4bfdd4e SHA512 fb5d3b6dfb56f35c60a83164d0da2aef67d9fc23b81fdd7c26b9a618c92524a601db5fc4149a3a5054ca3306ecc80e104fa629ecb1516c047a726012237c83d5 WHIRLPOOL 90083bfaca02f7507e706c4d251736b300553e95c12640d948a8a5c273c5339b2080e34d54113a69e7cd0d083207634c645a55744c443efe77a2f7b40a82f9ad
+DIST st-0.6.tar.gz 40271 SHA256 85310c08c3814e099b5e45888f8ac7548640e69e9973e934d4fba38b03737a2b SHA512 31e4b6d2b27d6cea79d6a31dabd7ff4e08a8ab376f06c113123810c05eab25e3964482a6429eecd65c369983cc8ee3694f367e3894ed2cc740c67738c1898d29 WHIRLPOOL 94b526dffa7cb2446160acf4d2bb5e78d25f300c3f2ff4549bbe39ad5fae7ea80428ccdaa61a3603c1a3e6f4b98040983f5d468f218542204c62cb88fb776917
+EBUILD st-0.5.ebuild 1468 SHA256 88fdd2739d171065680d6c33c3ee2903f01bc77c1c2d58f56576c4fb65ebdd77 SHA512 968d2781d63ba164889c21f79809e8d174603a4c85bc1facf8e36882ac61c6c2c2fe653894b1da264482aedb41b7bc96b4e79d6571832af248568fc4a26dde5c WHIRLPOOL f44b3ee92250bb69d9396d86bb2445fc735f73932c7e3e1f78e78d90840655deb49ed09a30b1685de00a3a437e53b6f34cb202d388400ffd4564a178e77ed259
+EBUILD st-0.6.ebuild 1469 SHA256 890690e439b827d1ce5174e94eb0a89999f47a3093364a863f37c1bee3ca420b SHA512 5030ab10e174876e11b0499711624b832d506b3b5e62335f088a718c9d9ab9236d851fc3db4085137c969f8745ea83da04d0f77bdb61b7aa753c2795d10baa8c WHIRLPOOL b5a1a9ccf0ffbb1330ee96ee35333788a955fb4a47e2155821f3055144a101a6693d8838d37f0792ce0128ba77b01628024f6c0636854923d820d9a98a3c1d9c
+EBUILD st-9999.ebuild 1556 SHA256 2e6ee0900cf9a6af98da985d419351cd86d0332bb7d88a967f68f5180ff86c0b SHA512 83f094973ecf2dba7508deb7438850cb2641c571ee5c135d33c324c6ff70ac74def3e72d9fb4e85f7471f363155dea4deea10a7449fe8438013fa2c0c34bd311 WHIRLPOOL 5de21d5847715601fc15702449fa8290b24cd382bc7075a43ff9bea788f409a335c48b890925443881a92473d7034381e76a57515c189cbec157fc783e3b49e9
+MISC ChangeLog 3168 SHA256 03d9360f27446eb492cff2ce257e7a90f0f7bc2a191c61f4054033f1fc28bab6 SHA512 1f796c0fa630454e5684f89b5d921b7ff0128aa25619532872c17add19271fd87c60444886613eab42c04cd70dad47662289863a60f25ba6964043092f0f3b70 WHIRLPOOL fce0f879ab34e93d30be72b6db7ad0fa162c8c798d14cda7b37872f750c5d2560dbd851ff9e582beca410d414d6f27efc1beceed51585bf903ac870f09f8e5ad
+MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlWeCUAACgkQVWmRsqeSphPqBQCeIJl+KS8Aie6fI2R4KFHlaihK
+D60An1meytmWbfi4DwYIoQt+Xpx1niQS
+=LREh
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/st/metadata.xml b/x11-terms/st/metadata.xml
new file mode 100644
index 0000000..5b80fb9
--- /dev/null
+++ b/x11-terms/st/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+xmw@gentoo.org
+Michael Weber
+
+
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
new file mode 100644
index 0000000..74a4b84
--- /dev/null
+++ b/x11-terms/st/st-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-9999.ebuild,v 1.13 2015/03/12 14:16:15 xmw Exp $
+
+EAPI=5
+inherit eutils git-r3 multilib savedconfig toolchain-funcs
+
+DESCRIPTION="simple terminal implementation for X"
+HOMEPAGE="http://st.suckless.org/"
+EGIT_REPO_URI="https://lab.cherboiche.org/gentoo/st.git"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+KEYWORDS=""
+IUSE="savedconfig"
+
+RDEPEND="media-libs/fontconfig
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft"
+DEPEND="${RDEPEND}
+ sys-libs/ncurses
+ virtual/pkgconfig
+ x11-proto/xextproto
+ x11-proto/xproto"
+
+src_prepare() {
+ epatch_user
+
+ sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
+ -e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
+ -e '/^LDFLAGS/{s:[[:space:]]-s[[:space:]]: :}' \
+ -e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+ -e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+ -i config.mk || die
+ sed -e '/@echo/!s:@::' \
+ -i Makefile || die
+ tc-export CC
+
+ restore_config config.h
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+ tic -s -o "${ED}"/usr/share/terminfo st.info || die
+ dodoc TODO
+
+ make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' ''
+
+ save_config config.h
+}
+
+pkg_postinst() {
+ if ! [[ "${REPLACING_VERSIONS}" ]]; then
+ elog "Please ensure a usable font is installed, like"
+ elog " media-fonts/corefonts"
+ elog " media-fonts/dejavu"
+ elog " media-fonts/urw-fonts"
+ fi
+}
diff --git a/x11-wm/orbment/orbment-9999.ebuild b/x11-wm/orbment/orbment-9999.ebuild
new file mode 100644
index 0000000..49a373e
--- /dev/null
+++ b/x11-wm/orbment/orbment-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wlc/wlc-9999.ebuild,v 1.13 2014/11/20 11:47:14 jer Exp $
+
+EAPI=5
+inherit cmake-utils eutils toolchain-funcs git-r3
+
+DESCRIPTION="wayland WM"
+HOMEPAGE="https://github.com/Cloudef/orbment"
+SRC_URI=""
+EGIT_REPO_URI=${EGIT_REPO_URI:="https://github.com/Cloudef/orbment.git"}
+EGIT_BRANCH="master"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+ x11-libs/wlc
+"
+DEPEND="
+ dev-util/cmake
+ ${RDEPEND}
+"
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/x11-wm/sway/sway-9999.ebuild b/x11-wm/sway/sway-9999.ebuild
new file mode 100644
index 0000000..ba252a2
--- /dev/null
+++ b/x11-wm/sway/sway-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/wlc/wlc-9999.ebuild,v 1.13 2014/11/20 11:47:14 jer Exp $
+
+EAPI=5
+inherit cmake-utils eutils toolchain-funcs git-r3
+
+DESCRIPTION="I3 compatible wayland WM"
+HOMEPAGE="http://github.com/SirCmpwn/sway"
+SRC_URI=""
+EGIT_REPO_URI=${EGIT_REPO_URI:="https://github.com/SirCmpwn/sway.git"}
+EGIT_BRANCH="master"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+ x11-base/xorg-server[wayland]
+ x11-libs/wlc
+"
+DEPEND="
+ dev-util/cmake
+ app-text/asciidoc
+ ${RDEPEND}
+"
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ cmake-utils_src_configure
+}
+
+src_install() {
+ sed -i "s/sway-9999\/bin\/\//sway-9999_build\/bin\//g" ${BUILD_DIR}/cmake_install.cmake
+ cmake-utils_src_install
+}