diff --git a/app-admin/ananicy/ananicy-2.2.1-r1.ebuild b/app-admin/ananicy/ananicy-2.2.1-r1.ebuild
index 4ad74bc5a5..359b99a091 100644
--- a/app-admin/ananicy/ananicy-2.2.1-r1.ebuild
+++ b/app-admin/ananicy/ananicy-2.2.1-r1.ebuild
@@ -31,6 +31,6 @@ src_compile() {
 src_install() {
 	emake PREFIX="${D}" install
 	python_fix_shebang "${ED}/usr/bin/ananicy"
-	doinitd ananicy.initd
+	doinitd "${FILESDIR}/ananicy.initd"
 	einstalldocs
 }
diff --git a/app-crypt/reop/reop-2.1.1.ebuild b/app-crypt/reop/reop-2.1.1.ebuild
index 439cf435b6..b0b69c931b 100644
--- a/app-crypt/reop/reop-2.1.1.ebuild
+++ b/app-crypt/reop/reop-2.1.1.ebuild
@@ -15,7 +15,7 @@ DEPEND="dev-libs/libsodium:="
 RDEPEND="${DEPEND}"
 
 src_compile() {
-	emake CC="${CC:-cc}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -lsodium"
+	emake CC="${CC:-cc}" CFLAGS="${CFLAGS}" LDFLAGS="-lsodium ${LDFLAGS}"
 }
 
 src_test() {
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
new file mode 100644
index 0000000000..0be7d35d80
--- /dev/null
+++ b/dev-libs/pocl/Manifest
@@ -0,0 +1 @@
+DIST pocl-1.6.tar.gz 1595212 BLAKE2B ee628ec466df03c44f02235c78b516aeea0e02f82ce095cd798d6d4d4cf81773adf16493837306243ac7e0de58b2ccfbdcfb3a63ff8e287f6c83c58160811712 SHA512 ecd3a3867a62a2a555183741fa4586eeefae00514d66d15a79b9094ff0a0248b213f62ab23b3e61bdb1042e760cd34b07e546f97b304ac86c3f861a9161df1b1
diff --git a/dev-libs/pocl/files/vendor_opencl_libs_location.patch b/dev-libs/pocl/files/vendor_opencl_libs_location.patch
new file mode 100644
index 0000000000..548589ca41
--- /dev/null
+++ b/dev-libs/pocl/files/vendor_opencl_libs_location.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -125,7 +125,7 @@
+ endif()
+ 
+ # for libpocl.so
+-set(POCL_INSTALL_PUBLIC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "POCL public libdir")
++set(POCL_INSTALL_PUBLIC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/OpenCL/vendors/pocl" CACHE PATH "POCL public libdir")
+ 
+ # for llvmopencl.so
+ set(POCL_INSTALL_PRIVATE_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pocl" CACHE PATH "POCL private libdir")
+@@ -134,7 +134,7 @@
+ if(UNIX AND NOT CMAKE_CROSSCOMPILING AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+   set(POCL_INSTALL_ICD_VENDORDIR "/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
+ else()
+-  set(POCL_INSTALL_ICD_VENDORDIR "${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
++  set(POCL_INSTALL_ICD_VENDORDIR "${SYSCONFDIR}/etc/OpenCL/vendors" CACHE PATH "POCL ICD file destination")
+ endif()
+ 
+ # for kernel-<target>.bc
diff --git a/dev-libs/pocl/metadata.xml b/dev-libs/pocl/metadata.xml
new file mode 100644
index 0000000000..5070dbc08d
--- /dev/null
+++ b/dev-libs/pocl/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<description>comaintainers welcome</description>
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">
+PoCL is a portable open source (MIT-licensed) implementation of the OpenCL standard (1.2 with some 2.0 features supported). In addition to being an easily portable multi-device (truely heterogeneous) open-source OpenCL implementation, a major goal of this project is improving interoperability of diversity of OpenCL-capable devices by integrating them to a single centrally orchestrated platform. Also one of the key goals longer term is to enhance performance portability of OpenCL programs across device types utilizing runtime and compiler techniques.
+
+Upstream PoCL currently supports various CPUs, NVIDIA GPUs via libcuda, HSA-supported GPUs and TCE ASIPs (experimental, see: OpenASIP). It is also known to have multiple (private) adaptations in active production use.
+
+PoCL uses Clang as an OpenCL C frontend and LLVM for kernel compiler implementation, and as a portability layer. Thus, if your desired target has an LLVM backend, it should be able to get OpenCL support easily by using PoCL.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">pocl/pocl</remote-id>
+	</upstream>
+	<use>
+		<flag name="accel">Enable the generic hardware accelerator device driver</flag>
+		<flag name="cl20">Enable reporting OpenCL 2.0 for the CPU device</flag>
+		<flag name="conformance">Ensures that certain build options which would result in non-conformant pocl build stay disabled. Note that this does not quarantee a fully conformant build of pocl by itself</flag>
+		<flag name="cuda">Enable the CUDA backend for NVIDIA GPUs</flag>
+		<flag name="float-conversion">When enabled, OpenCL printf() call's f/e/g formatters are handled by pocl. When disabled, these are handled by system C library.</flag>
+		<flag name="hardening">Enable hardening against various attacks. May worsen performance</flag>
+		<!--<flag name="hsa">Enable the HSA base profile runtime device driver</flag>-->
+		<flag name="hwloc">Enable hwloc support</flag>
+		<flag name="memmanager">Enables custom memory manager. Except for special circumstances, this should be disabled</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/pocl/pocl-1.6.ebuild b/dev-libs/pocl/pocl-1.6.ebuild
new file mode 100644
index 0000000000..cef334945c
--- /dev/null
+++ b/dev-libs/pocl/pocl-1.6.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DOCS_AUTODOC=0
+DOCS_BUILDER="sphinx"
+DOCS_DIR="doc/sphinx/source"
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake llvm python-any-r1 docs
+
+LLVM_MAX_SLOT=11
+
+DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
+HOMEPAGE="
+	http://portablecl.org
+	https://github.com/pocl/pocl
+"
+SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="accel cl20 +conformance cuda debug examples float-conversion hardening +hwloc memmanager" #hsa tce
+
+#TODO: add dependencies for cuda
+RDEPEND="
+	dev-libs/libltdl
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	virtual/opencl
+
+	!cuda? ( sys-devel/clang:${LLVM_MAX_SLOT} )
+	cuda? ( sys-devel/clang:${LLVM_MAX_SLOT}[llvm_targets_NVPTX] )
+	debug? ( dev-util/lttng-ust )
+	hwloc? ( sys-apps/hwloc[cuda?] )
+"
+DEPEND="
+	${RDEPEND}
+	doc? ( $(python_gen_any_dep '<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]') )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/vendor_opencl_libs_location.patch" )
+
+src_configure() {
+	llvm_pkg_setup
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DENABLE_HSA=OFF
+		-DENABLE_ICD=ON
+		-DENABLE_POCL_BUILDING=OFF
+		-DKERNELLIB_HOST_CPU_VARIANTS=native
+		-DPOCL_ICD_ABSOLUTE_PATH=OFF
+		-DSTATIC_LLVM=OFF
+
+		-DENABLE_ACCEL_DEVICE=$(usex accel)
+		-DENABLE_CONFORMANCE=$(usex conformance)
+		-DENABLE_CUDA=$(usex cuda)
+		-DENABLE_HOST_CPU_DEVICE_CL20=$(usex cl20)
+		-DENABLE_HWLOC=$(usex hwloc)
+		-DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
+		-DHARDENING_ENABLE=$(usex hardening)
+		-DPOCL_DEBUG_MESSAGES=$(usex debug)
+		-DUSE_POCL_MEMMANAGER=$(usex memmanager)
+		-DWITH_LLVM_CONFIG=$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+src_install() {
+	cmake_src_install
+	dodoc CREDITS README CHANGES
+	if use doc; then
+		dodoc -r _build/html
+		docompress -x "/usr/share/doc/${P}/html"
+	fi
+	if use examples; then
+		dodoc -r examples
+		docompress -x "/usr/share/doc/${P}/examples"
+	fi
+}
diff --git a/media-sound/ibniz/ibniz-1.18.ebuild b/media-sound/ibniz/ibniz-1.18.ebuild
index 6765da88cb..1e0e19f2a4 100644
--- a/media-sound/ibniz/ibniz-1.18.ebuild
+++ b/media-sound/ibniz/ibniz-1.18.ebuild
@@ -18,10 +18,11 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
-	sed -e "s/gcc/$(tc-getCC)/" \
-		-e "s/FLAGS=/FLAGS=${CFLAGS} /" \
+	sed -r \
+		-e "s/gcc/$(tc-getCC)/" \
+		-e "s/^FLAGS=(.*)$/FLAGS=${CFLAGS} \1 ${LDFLAGS}/" \
 		-e "s/-s //" \
-		-i Makefile
+		-i Makefile || die
 }
 
 src_install() {
diff --git a/net-im/discord-canary-bin/Manifest b/net-im/discord-canary-bin/Manifest
index d127675ddb..14a2ec46ec 100644
--- a/net-im/discord-canary-bin/Manifest
+++ b/net-im/discord-canary-bin/Manifest
@@ -1 +1 @@
-DIST discord-canary-0.0.119.deb 71512470 BLAKE2B a5c89940427b7d4fe228e1929cbe5d1e9f4bf47818b7e4f70fbdd772359c0db81bbfaa7b7b228a975bf73119084674cd03a902d668f189b995e94c2d97c39c8c SHA512 d19fe621ee13aecb19eacb4bda87d4e2e4342399173d1c1a4e9f9864fb8670f05254a966dc7f2f968b4dc7031e30f696d45c21affc83e7de8d96ca501da4482e
+DIST discord-canary-0.0.120.deb 71530356 BLAKE2B 8cb269b491bf5559d41692eef63e3f38624c3dbedd393acff0dcd54a4501508f208e46bcea98e04c76c6df86327b593c8991fe39bedeeda588b6cfabadea2a7b SHA512 fbc0932000401bb43341d6e446be287029c0883f9ab028efa65a73d4f8066d477a680b3758e7dfeaa5a08cae37ae882db5c4e352ed587612ef56dc405d928de1
diff --git a/net-im/discord-canary-bin/discord-canary-bin-0.0.119-r1.ebuild b/net-im/discord-canary-bin/discord-canary-bin-0.0.120.ebuild
similarity index 100%
rename from net-im/discord-canary-bin/discord-canary-bin-0.0.119-r1.ebuild
rename to net-im/discord-canary-bin/discord-canary-bin-0.0.120.ebuild
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index 4c94b6e335..a1e56775b5 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1 +1 @@
-DIST rocketchat-3.2.1.x86_64.rpm 55355092 BLAKE2B 53e94118fc04f154ee70c673402124deaa3242ffaf5f0f013bf720ba26787e2a6e0fe698d4f1c314643121b35e382789b23f311f8a93b73d7661b7386ce219da SHA512 69b8201378cf73335c1c847d670006dfa8bcc61a0221edb5eb873635c93fac597b6da4a717dd25d9a0eaddb10331486a8d2870bda5320ae117e83406b03c9f95
+DIST rocketchat-3.2.2.x86_64.rpm 55347028 BLAKE2B 77fb7f5461b28ae4cf896742b4a65bd19a877aa69984f1040e509b2dfdacdceb4db83d9f6af58e2ef357e5884a927a05d707b0af502cf83c9aeb238a1cec8fad SHA512 5f48168529804d6fc849dac21f3ca0f94b6d8cb5d3ef0086a8f1631c0a66b69741ff5e642e64b08a3df2dd7e3a6d36f97dca5157a43c3a716238f293dcadad7e
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.1.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.2.ebuild
similarity index 100%
rename from net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.1.ebuild
rename to net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.2.2.ebuild