diff --git a/sys-apps/rigo-daemon/Manifest b/sys-apps/rigo-daemon/Manifest
index fbdbb97f6..c722cf0c3 100644
--- a/sys-apps/rigo-daemon/Manifest
+++ b/sys-apps/rigo-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST entropy-318.tar.bz2 1840399 BLAKE2B 2660b0c34287f76abf026801ba14ec4c2fc10ad99692851791de0345a6b37a48627c459b6a4a4274bf8e0844a1e5665861f322b3ccb08d3c42cd9ef8dc0d415c SHA512 fb9c970a4c3a6b9c8391063457597d6dddacb477258343996a999c21b97359f0cd6595f8ca4df323f74e81078fade3fee7272f24eb489f9e5be6859ff2ed056f
-DIST entropy-319.tar.bz2 1843077 BLAKE2B 300335dd9bbb8f6fe2cbbaae25362af295239bd3e992f6ffedb2d9256ebb58e8e497e8569af86a960a8e4bd954f79fad06ce7fa6692fae24bc98f052d64a1fc8 SHA512 22d3d5052882609ee7c1d4e0eeb0b6cdf679e58319d31eaa9692e1e8e3c46ee2b946a97709a6737c5575887d3b3d3cfa06f12015c5ed1869c990218c3474ec4d
 DIST entropy-320.tar.bz2 1848403 BLAKE2B 9700fc5242b07d4063a3f50145cd2b9d1ddbd23d68e45ce72836aa63f8e474b56bb693dc330695c7cd9d0f14fc7230645075a082208d9339f096edab34204848 SHA512 50a68d82e01a3240a2577e9f61bec948b3a575d287c1e061c2a3d24f0329205aeb935911df99e51f554b83961ee99aa12f3c95b8b9ce5283d8e3e486a9fff3e5
 DIST entropy-322.tar.bz2 1849723 BLAKE2B 41eb6e0ab4863d5e146a3dda189d2309191987c5c6d0841eb9aaf3a05143e52ad01c279e7a7388fef38d12b6c8c18a330132db2eaab0d72ab994f073ac5c2a32 SHA512 db93698e1c290307e6e95a8e64e5b7809ec47d7f8eb53c5ae5a3b46b8c250cc1be54d66bc8085e76647d6607e12dc0eeb9203d3d1d3d00d0698f6481f2d39704
 DIST entropy-323.tar.bz2 1852689 BLAKE2B 5b390e86f332562b7b5e99ab0a5a01ec3001b71e4197d156e67403b17e915e4e94d42a7cd5f2f50c25eeb5a621779b566422a46a31c291c9a3335ebeb6294688 SHA512 f02a483833960e0241560a562de36bd0b6c7ba8912cb2d1c6cbf2ff3c84a890989ec933bee2d47b347744fd293510a05c30ba03f2dedb4e1b5ae5d00bc74c411
diff --git a/sys-apps/rigo-daemon/rigo-daemon-318.ebuild b/sys-apps/rigo-daemon/rigo-daemon-318.ebuild
deleted file mode 100644
index 3e4f5044d..000000000
--- a/sys-apps/rigo-daemon/rigo-daemon-318.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-MY_PN="RigoDaemon"
-DESCRIPTION="Entropy Client DBus Services, aka RigoDaemon"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-
-S="${WORKDIR}/entropy-${PV}/rigo/${MY_PN}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]
-	sys-auth/polkit[introspection]
-	sys-devel/gettext"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	default
-	python_fix_shebang "${S}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	python_optimize "${D}/usr/lib/rigo/${MY_PN}"
-}
-
-pkg_preinst() {
-	# ask RigoDaemon to shutdown, if running
-	# TODO: this will be removed in future
-	local shutdown_exec=${EROOT}/usr/lib/rigo/${MY_PN}/shutdown.py
-	[[ -x "${shutdown_exec}" ]] && "${shutdown_exec}"
-}
diff --git a/sys-apps/rigo-daemon/rigo-daemon-319.ebuild b/sys-apps/rigo-daemon/rigo-daemon-319.ebuild
deleted file mode 100644
index 3e4f5044d..000000000
--- a/sys-apps/rigo-daemon/rigo-daemon-319.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-MY_PN="RigoDaemon"
-DESCRIPTION="Entropy Client DBus Services, aka RigoDaemon"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-3"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-
-S="${WORKDIR}/entropy-${PV}/rigo/${MY_PN}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]
-	sys-auth/polkit[introspection]
-	sys-devel/gettext"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	default
-	python_fix_shebang "${S}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	python_optimize "${D}/usr/lib/rigo/${MY_PN}"
-}
-
-pkg_preinst() {
-	# ask RigoDaemon to shutdown, if running
-	# TODO: this will be removed in future
-	local shutdown_exec=${EROOT}/usr/lib/rigo/${MY_PN}/shutdown.py
-	[[ -x "${shutdown_exec}" ]] && "${shutdown_exec}"
-}