diff --git a/x11-misc/barrier/Manifest b/x11-misc/barrier/Manifest
new file mode 100644
index 0000000..0887ca6
--- /dev/null
+++ b/x11-misc/barrier/Manifest
@@ -0,0 +1,7 @@
+AUX barrier-qt5.11-port.patch 1836 BLAKE2B abeeca4fdbf89fcf79be6b7576472538f17f1156dbcfb767099369a9d1a6bbebe35041278a3fddc25390f65c410c003ea612a047756ca8df902b4714269ff9dc SHA512 42a2a77cd8c4de10fc7664a74ca20b4a56d9718242de2a5176b39413177e36015a72db789b4074d21f61f145aea007395f373bc8776a9dee4f4d3d4e113a041f
+DIST barrier-2.1.1.tar.gz 7229581 BLAKE2B 6f1f15f98179f3df6f71ef17766bc391d503fb8c11d76d0436c3b16850be6ea5384e3df313b6879b6332631245793a6ee50b6213d1e3d002492a38bff17bb014 SHA512 668a19ba5fc2570e4eaf268f0754b894bce30008226f4cd36e182b748cbb08179d8867c7f882446f5f267c9064e12ea0dc7575e49996b4ba72bfcf396054edd8
+DIST barrier-2.1.2.tar.gz 7234856 BLAKE2B fa96dc7d18142c0fa0af82c9c22759558a5074a38fa7bad672477adc0214d830f44699f716833a06ef0833497b8286f3e205d94f7650d013051cf7bdb6aa8c2d SHA512 4fe23384daeecaba01e3318d544b09b1be60e61775880bb4fb60c8b226630a764207dcd47b33ff10d9d261add7955376f5eaf4d421b382fe8c3830bdbb6b5669
+EBUILD barrier-2.1.1.ebuild 1216 BLAKE2B c66af20386b62f5f74c49715ac76094629b72c62474062393b6388b2ee0781e4d31e1b13d57be5bec126ed626c0c4827b67ba4bad4f9d6d453c7b777d0e88d97 SHA512 2127a3a49ce4ade1bdabd44b75d74b95e575ae653964c4a5eb8ecb18f411ec8c3b3bf3a0611b3956f188445bfab8a9358d657589cd9e157fc181467960be0f72
+EBUILD barrier-2.1.2.ebuild 1214 BLAKE2B 44fc72c89d2396fc467244b55bb6ac3984c3b8df8e54d178e80dad804c898d5672a8da2cfc79fc7209a06b28ae82d5767affce118447eaca9274a8a9d4406c7a SHA512 090ee2347f5f19f888a618bb6d67ffbe12984ac6386e324d9258ca56c1cefdb5ff40b6307d7eba73959a36384d1b3a9d289a825128be3dac4395f211be8df1dc
+EBUILD barrier-9999.ebuild 1171 BLAKE2B e2672868fe215e331994cc2d877f41d4ddcd046c781e20a7713bfcb5eebfb5736c851fc17bb8939ca1b084a3200be0a394b222572f5b8a50acf867200d375a00 SHA512 5c86d1c19cbed57b3166e9617964503ea7365c0bd7f17117b0a64c067d54256d4fb1fcd2e8cf80b5dcdd2c26f219a1f27c7d884eb77dcfd695154979f0b5de29
+MISC metadata.xml 358 BLAKE2B 106cac0d5e78b5cc871cd23853047b3e140341d3e63117e2a5d496e3a6a592eee06db98d6f3d9eb181af071d94af121784af09d8d390b2608753714da16b26af SHA512 e00a5fbdb6ccb7e817207ded164a28080bf8d5e158981c1ab3a78c7ded452986bd96bdb7f083a335ea57dea38a7df3107fabb4e26a2ef4cae124fba712b0f315
diff --git a/x11-misc/barrier/barrier-2.1.1.ebuild b/x11-misc/barrier/barrier-2.1.1.ebuild
new file mode 100644
index 0000000..d8d1c4f
--- /dev/null
+++ b/x11-misc/barrier/barrier-2.1.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
+HOMEPAGE="https://github.com/debauchee/barrier"
+SRC_URI="https://github.com/debauchee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl qt5"
+RESTRICT="test"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:* )
+	libressl? ( dev-libs/libressl )
+	net-misc/curl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtnetwork:5
+		net-dns/avahi[mdnsresponder-compat]
+	)
+	x11-base/xorg-proto
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-qt5.11-port.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBARRIER_BUILD_INSTALLER=OFF
+		-DBARRIER_BUILD_GUI=$(usex qt5)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use qt5; then
+		newicon -s 256 "${S}"/res/${PN}.png ${PN}.png
+		newmenu "${S}"/res/${PN}.desktop ${PN}.desktop
+	fi
+}
diff --git a/x11-misc/barrier/barrier-2.1.2.ebuild b/x11-misc/barrier/barrier-2.1.2.ebuild
new file mode 100644
index 0000000..e06ce8c
--- /dev/null
+++ b/x11-misc/barrier/barrier-2.1.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
+HOMEPAGE="https://github.com/debauchee/barrier"
+SRC_URI="https://github.com/debauchee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libressl qt5"
+RESTRICT="test"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:* )
+	libressl? ( dev-libs/libressl )
+	net-misc/curl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtnetwork:5
+		net-dns/avahi[mdnsresponder-compat]
+	)
+	x11-base/xorg-proto
+"
+
+RDEPEND="${DEPEND}"
+
+#PATCHES=( "${FILESDIR}"/${PN}-qt5.11-port.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBARRIER_BUILD_INSTALLER=OFF
+		-DBARRIER_BUILD_GUI=$(usex qt5)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use qt5; then
+		newicon -s 256 "${S}"/res/${PN}.png ${PN}.png
+		newmenu "${S}"/res/${PN}.desktop ${PN}.desktop
+	fi
+}
diff --git a/x11-misc/barrier/barrier-9999.ebuild b/x11-misc/barrier/barrier-9999.ebuild
new file mode 100644
index 0000000..4665de1
--- /dev/null
+++ b/x11-misc/barrier/barrier-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils cmake-utils flag-o-matic  git-r3
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
+HOMEPAGE="https://github.com/debauchee/barrier"
+
+EGIT_REPO_URI="https://github.com/debauchee/${PN}.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=
+IUSE="libressl qt5"
+RESTRICT="test"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:* )
+	libressl? ( dev-libs/libressl )
+	net-misc/curl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		net-dns/avahi[mdnsresponder-compat]
+	)
+	x11-base/xorg-proto
+"
+
+RDEPEND="${DEPEND}"
+
+# PATCHES=( "${FILESDIR}"/${PN}-qt5.11-port.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBARRIER_BUILD_INSTALLER=OFF
+		-DBARRIER_BUILD_GUI=$(usex qt5)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use qt5; then
+		newicon -s 256 "${S}"/res/${PN}.png ${PN}.png
+		newmenu "${S}"/res/${PN}.desktop ${PN}.desktop
+	fi
+}
diff --git a/x11-misc/barrier/files/barrier-qt5.11-port.patch b/x11-misc/barrier/files/barrier-qt5.11-port.patch
new file mode 100644
index 0000000..3f0a396
--- /dev/null
+++ b/x11-misc/barrier/files/barrier-qt5.11-port.patch
@@ -0,0 +1,51 @@
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index 9c902867..d49b4b04 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -22,13 +22,12 @@ add_executable (barrier WIN32
+ 
+ include_directories (./src)
+ 
+-qt5_use_modules (barrier Core Widgets Network)
+ target_compile_definitions (barrier PRIVATE -DBARRIER_VERSION_STAGE="${BARRIER_VERSION_STAGE}")
+ target_compile_definitions (barrier PRIVATE -DBARRIER_REVISION="${BARRIER_REVISION}")
+ 
+ if (WIN32)
+     include_directories ($ENV{BONJOUR_SDK_HOME}/Include)
+-    find_library (DNSSD_LIB dnssd.lib 
++    find_library (DNSSD_LIB dnssd.lib
+                   HINTS ENV BONJOUR_SDK_HOME
+                   PATH_SUFFIXES "Lib/x64")
+     set_target_properties (barrier PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
+@@ -46,6 +45,7 @@ if (HAVE_X11)
+ endif()
+ 
+ target_link_libraries (barrier common)
++target_link_libraries (barrier Qt5::Core Qt5::Widgets Qt5::Network)
+ 
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+     install (TARGETS barrier DESTINATION ${BARRIER_BUNDLE_BINARY_DIR})
+diff --git a/src/gui/src/ActionDialog.cpp b/src/gui/src/ActionDialog.cpp
+index e824ea3c..3565cfbc 100644
+--- a/src/gui/src/ActionDialog.cpp
++++ b/src/gui/src/ActionDialog.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include <QtCore>
+ #include <QtGui>
++#include <QButtonGroup>
+ 
+ ActionDialog::ActionDialog(QWidget* parent, ServerConfig& config, Hotkey& hotkey, Action& action) :
+     QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
+diff --git a/src/gui/src/ScreenSetupView.cpp b/src/gui/src/ScreenSetupView.cpp
+index e42ae17e..46e70990 100644
+--- a/src/gui/src/ScreenSetupView.cpp
++++ b/src/gui/src/ScreenSetupView.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include <QtCore>
+ #include <QtGui>
++#include <QHeaderView>
+ 
+ ScreenSetupView::ScreenSetupView(QWidget* parent) :
+     QTableView(parent)
diff --git a/x11-misc/barrier/metadata.xml b/x11-misc/barrier/metadata.xml
new file mode 100644
index 0000000..873ce5e
--- /dev/null
+++ b/x11-misc/barrier/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">debauchee/barrier</remote-id>
+	</upstream>
+</pkgmetadata>