diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
new file mode 100644
index 0000000..d01dbef
--- /dev/null
+++ b/dev-libs/msgpack/Manifest
@@ -0,0 +1 @@
+DIST msgpack-1.2.0.tar.gz 722483 SHA256 a7963b22665cecd1f72d8404b70be95a9c376084e9790833a7942c6633b33ca0 SHA512 2a4922fd745ae2d76c913c7200db667fa457f757c4e2696c215165a0ea48da6e35f7e8baae38855598eddd2f7414cdf022c3515b6cde0975686135cacfb4e978 WHIRLPOOL 48d61e7e330c3cd2a6a60c6ecf2b90289adb42c500521b4d8df50983d4db82434560a1129f6f957d09117532b52bc14a7167d1166fcd0c7a2d0e157da3267d75
diff --git a/dev-libs/msgpack/msgpack-1.2.0.ebuild b/dev-libs/msgpack/msgpack-1.2.0.ebuild
new file mode 100644
index 0000000..a10e761
--- /dev/null
+++ b/dev-libs/msgpack/msgpack-1.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
+HOMEPAGE="http://msgpack.org/ https://github.com/msgpack/msgpack-c/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+cxx static-libs test"
+
+DEPEND="
+	test? (
+		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use cxx MSGPACK_ENABLE_CXX)
+		$(cmake-utils_use static-libs MSGPACK_STATIC)
+		$(cmake-utils_use test MSGPACK_BUILD_TESTS)
+	)
+	cmake-multilib_src_configure
+}
diff --git a/net-libs/libringclient/libringclient-9999.ebuild b/net-libs/libringclient/libringclient-9999.ebuild
new file mode 100644
index 0000000..9b2de86
--- /dev/null
+++ b/net-libs/libringclient/libringclient-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit git-r3 cmake-utils
+
+DESCRIPTION="Ring is a Voice-over-IP software phone."
+HOMEPAGE="https://ring.cx/"
+EGIT_REPO_URI="https://gerrit-ring.savoirfairelinux.com/ring-lrc"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	net-voip/ring-daemon"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/opendht/opendht-9999.ebuild b/net-libs/opendht/opendht-9999.ebuild
new file mode 100644
index 0000000..80448d9
--- /dev/null
+++ b/net-libs/opendht/opendht-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit git-r3 cmake-utils
+
+DESCRIPTION="A lightweight C++11 Distributed Hash Table implementation originally based on https://github.com/jech/dht by Juliusz Chroboczek."
+HOMEPAGE="https://github.com/savoirfairelinux/opendht/"
+EGIT_REPO_URI="https://github.com/savoirfairelinux/opendht/"
+
+LICENSE="GPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/msgpack-1.2.0[cxx]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
diff --git a/net-libs/pjsip/.pjsip-2.4.ebuild.swp b/net-libs/pjsip/.pjsip-2.4.ebuild.swp
new file mode 100644
index 0000000..3cec6cd
Binary files /dev/null and b/net-libs/pjsip/.pjsip-2.4.ebuild.swp differ
diff --git a/net-libs/pjsip/Manifest b/net-libs/pjsip/Manifest
new file mode 100644
index 0000000..a8bff8b
--- /dev/null
+++ b/net-libs/pjsip/Manifest
@@ -0,0 +1 @@
+DIST pjproject-2.4.tar.bz2 4631778 SHA256 108015aeda8dce20d182ec9b4fc277026d2b1796e82947da106eeb406eb02059 SHA512 164737bed8f688b2c555e2b4c701a568570a592fa7d1259da0be73a6a79f8c8157562cb941a1c00a0bea2954a8d13dd867bfc16b48c722ac4bde303986e4549a WHIRLPOOL 0218b97bd039873ae963c5638a49fd5cfd16feb2a16af59472e1664e73984a4f01a8924553c7934912031a4f3e8f13fa98959c12602a459ec8800af47ca99ff0
diff --git a/net-libs/pjsip/files/pjsip-ring-intptr_t.patch b/net-libs/pjsip/files/pjsip-ring-intptr_t.patch
new file mode 100644
index 0000000..92ed313
--- /dev/null
+++ b/net-libs/pjsip/files/pjsip-ring-intptr_t.patch
@@ -0,0 +1,11 @@
+--- pjsip/src/pjsua2/endpoint.cpp	2015-09-26 04:21:41.626163428 +0300
++++ pjsip/src/pjsua2/endpoint.cpp	2015-09-26 04:20:51.008975347 +0300
+@@ -21,6 +21,7 @@
+ #include <pjsua2/call.hpp>
+ #include <pjsua2/presence.hpp>
+ #include <algorithm>
++#include <stdint.h>
+ #include "util.hpp"
+ 
+ using namespace pj;
+
diff --git a/net-libs/pjsip/files/user.mak b/net-libs/pjsip/files/user.mak
new file mode 100644
index 0000000..b6414ec
--- /dev/null
+++ b/net-libs/pjsip/files/user.mak
@@ -0,0 +1,3 @@
+export CFLAGS += -fPIC
+export LDFLAGS += 
+
diff --git a/net-libs/pjsip/pjsip-2.4.ebuild b/net-libs/pjsip/pjsip-2.4.ebuild
new file mode 100644
index 0000000..b742dc5
--- /dev/null
+++ b/net-libs/pjsip/pjsip-2.4.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/pjsip/pjsip-1.8.10.ebuild,v 1.1 2011/02/22 10:59:09 elvanor Exp $
+
+EAPI="2"
+
+[[ ${PV} = *9999* ]] && VCS_ECLASS="subversion" || VCS_ECLASS=""
+
+inherit ${VCS_ECLASS} git-r3
+
+DESCRIPTION="Multimedia communication libraries written in C language
+for building VoIP applications."
+HOMEPAGE="http://www.pjsip.org/"
+if [[ ${PV} == *9999* ]]; then
+	ESVN_REPO_URI="http://svn.pjsip.org/repos/pjproject/trunk"
+	KEYWORDS=""
+else
+	SRC_URI="http://www.pjsip.org/release/${PV}/pjproject-${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa doc epoll examples ext-sound g711 g722 g7221 gsm ilbc l16
+oss python ring speex ssl"
+#small-filter large-filter speex-aec
+
+DEPEND="alsa? ( media-libs/alsa-lib )
+	gsm? ( media-sound/gsm )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	speex? ( media-libs/speex )
+	ring? ( ssl? ( net-libs/gnutls ) )
+	!ring? ( ssl? ( dev-libs/openssl ) )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/pjproject-${PV}"
+
+src_unpack() {
+[[ ${PV} = *9999* ]] && subversion_src_unpack || default
+
+	if use ring; then
+		EGIT_REPO_URI="https://gerrit-ring.savoirfairelinux.com/ring-daemon"
+		EGIT_CHECKOUT_DIR=$WORKDIR/ring
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# Fix hardcoded prefix and flags
+	sed -i \
+		-e 's/poll@/poll@\nexport PREFIX := @prefix@\n/g' \
+		-e 's!prefix = /usr/local!prefix = $(PREFIX)!' \
+		Makefile \
+		build.mak.in || die "sed failed."
+
+	# apply -fPIC globally
+	cp ${FILESDIR}/user.mak ${S}
+
+	# TODO: remove deps to shipped codecs and libs, use system ones
+	# rm -r third_party
+	# libresample: https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html
+
+	use ring && {
+		epatch $WORKDIR/ring/contrib/src/pjproject/*.patch $FILESDIR/pjsip-ring-intptr_t.patch
+		sed -i -e 's#/usr/local#/usr#' aconfigure
+	}
+}
+
+src_configure() {
+	# Disable through portage available codecs
+	ssl=''
+	if use ring; then
+		use ssl && ssl=--enable-ssl=gnutls
+		conf=./aconfigure
+	else
+		use ssl && ssl=$(use_enable ssl)
+		conf=econf
+	fi
+	$conf --disable-gsm-codec \
+		--disable-speex-codec \
+		--disable-ilbc-codec \
+		--disable-speex-aec \
+		$ssl \
+		$(use_enable epoll) \
+		$(use_enable alsa sound) \
+		$(use_enable oss) \
+		$(use_enable ext-sound) \
+		$(use_enable g711 g711-codec) \
+		$(use_enable l16 l16-codec) \
+		$(use_enable g722 g722-codec) \
+		$(use_enable g7221 g7221-codec) || die "econf failed."
+		#$(use_enable small-filter) \
+		#$(use_enable large-filter) \
+		#$(use_enable speex-aec) \
+}
+
+src_compile() {
+	emake dep || die "emake dep failed."
+	emake -j1 || die "emake failed."
+}
+
+src_install() {
+	DESTDIR="${D}" emake install || die "emake install failed."
+
+	if use python; then
+		pushd pjsip-apps/src/python
+		python setup.py install --prefix="${D}/usr/"
+		popd
+	fi
+
+	if use doc; then
+		dodoc README.txt README-RTEMS
+	fi
+
+	if use examples; then
+		insinto "/usr/share/doc/${P}/examples"
+		doins "${S}/pjsip-apps/src/samples/"*
+	fi
+
+	# Remove files that pjproject should not install
+	rm -r "${D}/usr/lib/libportaudio.a" \
+		"${D}/usr/lib/libsrtp.a"
+}
diff --git a/net-voip/gnome-ring/gnome-ring-9999.ebuild b/net-voip/gnome-ring/gnome-ring-9999.ebuild
new file mode 100644
index 0000000..a560718
--- /dev/null
+++ b/net-voip/gnome-ring/gnome-ring-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit git-r3 cmake-utils
+
+DESCRIPTION="Ring is a Voice-over-IP software phone."
+HOMEPAGE="https://ring.cx/"
+EGIT_REPO_URI="https://gerrit-ring.savoirfairelinux.com/ring-client-gnome"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify"
+
+DEPEND="
+	dev-qt/qtcore:5
+	net-libs/libringclient
+	media-libs/clutter
+	media-libs/clutter-gtk
+	libnotify? ( x11-libs/libnotify )
+	x11-themes/gnome-icon-theme-symbolic
+	>=x11-libs/gtk+-3.10
+	app-text/libebook
+	"
+RDEPEND="${DEPEND}"
diff --git a/net-voip/ring-daemon/ring-daemon-9999.ebuild b/net-voip/ring-daemon/ring-daemon-9999.ebuild
new file mode 100644
index 0000000..2e6a401
--- /dev/null
+++ b/net-voip/ring-daemon/ring-daemon-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit git-r3 autotools
+
+DESCRIPTION="Ring is a Voice-over-IP software phone."
+HOMEPAGE="https://ring.cx/"
+EGIT_REPO_URI="https://gerrit-ring.savoirfairelinux.com/ring-daemon"
+
+LICENSE="GPL"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	net-libs/opendht
+	>=net-libs/pjsip-2.4
+	dev-cpp/yaml-cpp"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mkdir contrib/native
+	cd contrib/native
+	../bootstrap
+	cd ../..
+	conf=econf
+	$conf --without-pulse \
+		  --without-jack \
+		  --without-dbus \
+i		  --without-gsm
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_compile() {
+	cd contrib/native
+	make -j
+	cd ../..
+	emake
+}
diff --git a/x11-libs/wlc/wlc-9999.ebuild b/x11-libs/wlc/wlc-9999.ebuild
index fb123f9..3e61505 100644
--- a/x11-libs/wlc/wlc-9999.ebuild
+++ b/x11-libs/wlc/wlc-9999.ebuild
@@ -13,22 +13,23 @@ EGIT_BRANCH="master"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
-	dev-libs/wayland
+	>=dev-libs/wayland-1.7
 	x11-libs/pixman
 	x11-libs/libxkbcommon
-	sys-fs/udev
+	virtual/udev
 	dev-libs/libinput
+	x11-libs/libxkbcommon
 "
 DEPEND="
-	dev-util/cmake
-	x11-libs/libX11
-	x11-libs/libxcb
-	media-libs/mesa
 	${RDEPEND}
+	x11-libs/libX11
+	x11-libs/libxcb[xkb]
+	x11-libs/xcb-util-image
+	media-libs/mesa[egl,gles2,wayland]
 "
 
 src_prepare() {
diff --git a/x11-wm/sway/sway-9999.ebuild b/x11-wm/sway/sway-9999.ebuild
index ba252a2..f38686a 100644
--- a/x11-wm/sway/sway-9999.ebuild
+++ b/x11-wm/sway/sway-9999.ebuild
@@ -3,7 +3,7 @@
 # $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
+inherit cmake-utils eutils git-r3
 
 DESCRIPTION="I3 compatible wayland WM"
 HOMEPAGE="http://github.com/SirCmpwn/sway"
@@ -13,16 +13,31 @@ EGIT_BRANCH="master"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="swaybar -swaybg -swaygrabvideo -swaygrabpicture -swaylock -systemd"
 
 RDEPEND="
-	x11-base/xorg-server[wayland]
-	x11-libs/wlc
+	app-text/asciidoc
 "
 DEPEND="
-	dev-util/cmake
-	app-text/asciidoc
+	x11-libs/wlc
+	dev-libs/libpcre
+	dev-libs/json-c
+	x11-base/xorg-server[wayland]
+	x11-libs/libxkbcommon
+	swaygrabpicture? ( media-gfx/imagemagick[png,raw] )
+	swaygrabvideo? ( media-video/ffmpeg )
+	swaylock? ( x11-libs/cairo )
+	swaylock? ( x11-libs/pango )
+	swaylock? ( x11-libs/gdk-pixbuf[jpeg] )
+	swaylock? ( sys-libs/pam )
+	swaybar? ( x11-libs/cairo )
+	swaybar? ( x11-libs/pango )
+	swaybar? ( x11-libs/gdk-pixbuf[jpeg] )
+	swaybg? ( x11-libs/cairo )
+	swaybg? ( x11-libs/pango )
+	swaybg? ( x11-libs/gdk-pixbuf[jpeg] )
+	systemd? ( sys-apps/systemd )
 	${RDEPEND}
 "
 
@@ -35,6 +50,7 @@ src_configure() {
 }
 
 src_install() {
-	sed -i "s/sway-9999\/bin\/\//sway-9999_build\/bin\//g" ${BUILD_DIR}/cmake_install.cmake
+	#sed -i "s/sway-9999\/bin\/\//sway-9999_build\/bin\//g" ${BUILD_DIR}/cmake_install.cmake
 	cmake-utils_src_install
+	use !systemd && fperms u+s '/usr/bin/sway'
 }