diff --git a/dev-libs/feedbackd/Manifest b/dev-libs/feedbackd/Manifest
deleted file mode 100644
index 9bdc134..0000000
--- a/dev-libs/feedbackd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST feedbackd-v0.0.0+git20210125.tar.gz 77368 BLAKE2B 882d9078db7d12a66c8eca6214e1a8ea6f9c5a34b55e5299234fbbd6f4c0adeb81911427b4d53bba8a6f8ac12fb8ff2618f6e8ecae67806877ec3fc67d86e5ea SHA512 1f0397052e0eb7815ed4f922065b3b283288a5aeceeb03feb9de0c303182c37526bbbcefdfbb7aac6116c29b6672c4e92fa7a022a9e02bb750931de93354ebd1
diff --git a/dev-libs/feedbackd/feedbackd-0.0.0-r6.ebuild b/dev-libs/feedbackd/feedbackd-0.0.0-r6.ebuild
deleted file mode 100644
index ebe2909..0000000
--- a/dev-libs/feedbackd/feedbackd-0.0.0-r6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-#GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit vala meson udev
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-if [[ ${PV} == "0.0.0" ]]; then
-	MY_PV="v${PV}+git20210125"
-	MY_P="${PN}-${MY_PV}"
-fi
-
-DESCRIPTION="A daemon to provide haptic feedback on events"
-HOMEPAGE="https://source.puri.sm/Librem5/feedbackd"
-if [[ ${PV} == 9999 ]]; then
-	inherit vala meson udev git-r3
-	EGIT_REPO_URI="https://source.puri.sm/Librem5/feedbackd.git"
-	SRC_URI=""
-else
-	EGIT_REPO_URI=""
-	SRC_URI="https://source.puri.sm/Librem5/feedbackd/-/archive/${MY_PV}/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-fi
-LICENSE="LGPL-3"
-SLOT="0"
-
-DEPEND="
-		gnome-base/dconf
-		media-libs/gsound
-		dev-libs/json-glib
-		virtual/libudev
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-		dev-libs/gobject-introspection
-		dev-util/meson
-		dev-util/pkgconfig
-		vala? ( $(vala_depend) )
-"
-src_prepare() {
-	default
-	eapply_user
-	use vala && vala_src_prepare
-	sed -i 's/-G feedbackd/-G video/g' ${S}/debian/feedbackd.udev
-}
-
-src_install() {
-	default
-	meson_src_install
-	insinto /usr/share/feedbackd/themes
-	doins ${FILESDIR}/*.json
-	udev_newrules ${S}/debian/feedbackd.udev 90-feedbackd.rules
-}
diff --git a/gnome-extra/iio-sensor-proxy/Manifest b/gnome-extra/iio-sensor-proxy/Manifest
deleted file mode 100644
index 46d0800..0000000
--- a/gnome-extra/iio-sensor-proxy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST iio-sensor-proxy-3.0.tar.bz2 39608 BLAKE2B b758b0176388606fbabbca372786f41875fcc4ec4f8e1509213cf546b7a0ab54db4eaa77c731a698d21ea670b07628fa64e40946c0b38881f8d5b7baf12668c2 SHA512 372053d4406ceb7a50e5efde32d3d36d0ade0a680170e33450ec2154edfe85f268f7427180daa023b65760a8ea431136c599044cc7d36e07b26e32bbf188729e
diff --git a/gnome-extra/iio-sensor-proxy/iio-sensor-proxy-3.0-r1.ebuild b/gnome-extra/iio-sensor-proxy/iio-sensor-proxy-3.0-r1.ebuild
deleted file mode 100644
index b79be68..0000000
--- a/gnome-extra/iio-sensor-proxy/iio-sensor-proxy-3.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd udev gnome2-utils
-
-DESCRIPTION="IIO sensors to D-Bus proxy"
-HOMEPAGE="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/"
-SRC_URI="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:*
-	gnome-base/gnome-common
-	virtual/libudev
-	virtual/udev"
-
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-BDEPEND=""
-
-src_prepare() {
-	# Remove problematic LDFLAGS declaration
-	sed -i -e '/^LDFLAGS/d' src/Makefile.am || die
-	${S}/autogen.sh
-	eapply_user
-}
diff --git a/virutal/libgudev/libgudev-o.ebuild b/virutal/libgudev/libgudev-o.ebuild
new file mode 100644
index 0000000..701d1c9
--- /dev/null
+++ b/virutal/libgudev/libgudev-o.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-build
+
+DESCRIPTION="Virtual for libgudev providers"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="static-libs systemd"
+
+RDEPEND="
+	!systemd? ( || (
+		>=sys-fs/eudev-3.2.9:0/0[${MULTILIB_USEDEP},static-libs(-)?]
+		>=sys-fs/udev-232:0/0[${MULTILIB_USEDEP},static-libs(-)?]
+	) )
+	systemd? ( >=sys-apps/systemd-232:0/2[${MULTILIB_USEDEP},static-libs(-)?] )
+"