diff --git a/profiles/package.mask b/profiles/package.mask
index 20fce0412e..f3a64647e0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,11 +1,10 @@
 # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-03-29)
-# Per profile masking in an overlay is currently not working
-# with pkgcore/pkgdev/pkgcheck. Masking this for all profiles
+# James Beddek <telans@posteo.de> (2021-10-09)
+# Per profile masking in overlays is currently not working
+# with pkgcore/pkgdev/pkgcheck. Mask offending packages for all profiles
 # as a workaround that both makes repoman happy and works with
 # pkgcore/pkgdev/pkgcheck.
-# Users of non-SELinux profiles can safely unmask this.
 # Sorry for the inconvenience.
 #
 # TODO: Either fix per profile masking in overlays, or move
-# this entry to the relevant package.mask files in ::gentoo
->=sys-block/systemd-swap-4.4.0
+# relevant entries to the relevant package.mask files in ::gentoo
diff --git a/sys-block/systemd-swap/Manifest b/sys-block/systemd-swap/Manifest
deleted file mode 100644
index 67c09af6c2..0000000000
--- a/sys-block/systemd-swap/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST systemd-swap-4.4.0.tar.gz 29066 BLAKE2B 7278b0f5fac52039c91e901f29d72275e5ce4579001926f3d105c3f4bad026d2bcd21106d4006e9e971f92ecd66b81716b8e92f291230776de78e8fcd2580252 SHA512 39cf297d0d82f4d5fbae64f323bda2c286dd24665321892f068dc5bceea4ea5ddcacdcef14576cab869edbed7d258de759baec36535403051bb2b925406db0b3
diff --git a/sys-block/systemd-swap/metadata.xml b/sys-block/systemd-swap/metadata.xml
deleted file mode 100644
index e4d26c543b..0000000000
--- a/sys-block/systemd-swap/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>telans@posteo.de</email>
-		<name>James Beddek</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">Nefelim4ag/systemd-swap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-block/systemd-swap/systemd-swap-4.4.0.ebuild b/sys-block/systemd-swap/systemd-swap-4.4.0.ebuild
deleted file mode 100644
index 5ce70f8f98..0000000000
--- a/sys-block/systemd-swap/systemd-swap-4.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CONFIG_CHECK="~ZRAM ~ZSWAP"
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit linux-info python-r1
-
-DESCRIPTION="Script for creating swap space from zram swaps, swap files and swap partitions."
-HOMEPAGE="https://github.com/Nefelim4ag/systemd-swap/"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Nefelim4ag/${PN}.git"
-else
-	SRC_URI="https://github.com/Nefelim4ag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		dev-python/sysv_ipc[${PYTHON_USEDEP}]
-	')
-"
-
-src_install() {
-	default
-	keepdir /var/lib/systemd-swap
-}
diff --git a/sys-block/systemd-swap/systemd-swap-9999.ebuild b/sys-block/systemd-swap/systemd-swap-9999.ebuild
deleted file mode 100644
index 5ce70f8f98..0000000000
--- a/sys-block/systemd-swap/systemd-swap-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CONFIG_CHECK="~ZRAM ~ZSWAP"
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit linux-info python-r1
-
-DESCRIPTION="Script for creating swap space from zram swaps, swap files and swap partitions."
-HOMEPAGE="https://github.com/Nefelim4ag/systemd-swap/"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Nefelim4ag/${PN}.git"
-else
-	SRC_URI="https://github.com/Nefelim4ag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		dev-python/sysv_ipc[${PYTHON_USEDEP}]
-	')
-"
-
-src_install() {
-	default
-	keepdir /var/lib/systemd-swap
-}