diff --git a/.github/workflows/duplicates.yml b/.github/workflows/duplicates.yml
index d143d718e0..6240adef05 100644
--- a/.github/workflows/duplicates.yml
+++ b/.github/workflows/duplicates.yml
@@ -13,11 +13,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Setup master gentoo repository
       run: |
-        sudo mkdir -p /var/db/repos/gentoo /etc/portage /var/cache/distfiles
-        wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz" | sudo tar xz -C /var/db/repos/gentoo --strip-components=1
-        sudo wget "https://www.gentoo.org/dtd/metadata.dtd" -O /var/cache/distfiles/metadata.dtd
-        sudo wget "https://gitweb.gentoo.org/proj/portage.git/plain/cnf/repos.conf" -O /etc/portage/repos.conf
-        sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile
+        ./scripts/setup-master-gentoo.sh
     - name: Check for duplicates
       run: |
         ./scripts/check-duplicates.sh
diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml
index 048f17c5f4..e98762769e 100644
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -10,9 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
+    - uses: actions/checkout@v2
     - name: Run pkgcheck
       uses: pkgcore/pkgcheck-action@v1
       with:
diff --git a/.github/workflows/repoman.yml b/.github/workflows/repoman.yml
index 8eb8668ad5..fa9cebb6f9 100644
--- a/.github/workflows/repoman.yml
+++ b/.github/workflows/repoman.yml
@@ -11,24 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.9
-    - name: Setup repoman
-      run: |
-        python -m pip install --upgrade pip
-        pip install lxml pyyaml
-        wget -qO - "https://github.com/gentoo/portage/archive/portage-3.0.12.tar.gz" | tar xz
-        sudo groupadd -g 250 portage
-        sudo useradd -g portage -d /var/tmp/portage -s /bin/false -u 250 portage
     - name: Setup master gentoo repository
       run: |
-        sudo mkdir -p /var/db/repos/gentoo /etc/portage /var/cache/distfiles
-        wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz" | sudo tar xz -C /var/db/repos/gentoo --strip-components=1
-        sudo wget "https://www.gentoo.org/dtd/metadata.dtd" -O /var/cache/distfiles/metadata.dtd
-        sudo wget "https://gitweb.gentoo.org/proj/portage.git/plain/cnf/repos.conf" -O /etc/portage/repos.conf
-        sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile
-    - name: Test with repoman
+        ./scripts/setup-master-gentoo.sh
+    - name: Setup and run Repoman
       run: |
-        python3 portage-portage-3.0.12/repoman/bin/repoman full -dx
+        ./scripts/setup-and-run-repoman.sh
diff --git a/app-arch/tarlz/tarlz-0.19.ebuild b/app-arch/tarlz/tarlz-0.19-r1.ebuild
similarity index 93%
rename from app-arch/tarlz/tarlz-0.19.ebuild
rename to app-arch/tarlz/tarlz-0.19-r1.ebuild
index ae5d5f16a2..7447fc19d3 100644
--- a/app-arch/tarlz/tarlz-0.19.ebuild
+++ b/app-arch/tarlz/tarlz-0.19-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 KEYWORDS="~amd64"
 
-RDEPEND="app-arch/lzlib"
+RDEPEND="app-arch/lzlib:0="
 DEPEND="
 	${RDEPEND}
 	$(unpacker_src_uri_depends)
diff --git a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild b/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild
index 8386e046c3..0fd274a7bf 100644
--- a/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild
+++ b/dev-lang/aldor/aldor-1.2.0_p20190730.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 COMMIT="13e5b90eecc79ec6704efb333c4c100187520e80"
 
-#TODO: figure out if a java eclass is needed
-inherit autotools elisp-common
+inherit autotools elisp-common java-pkg-opt-2
 
 DESCRIPTION="The Aldor Programming Language"
 HOMEPAGE="http://pippijn.github.io/aldor"
diff --git a/games-action/multimc/multimc-0.6.12.ebuild b/games-action/multimc/multimc-0.6.12.ebuild
index 6ed4083114..cd96402934 100644
--- a/games-action/multimc/multimc-0.6.12.ebuild
+++ b/games-action/multimc/multimc-0.6.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop xdg cmake
+inherit desktop java-pkg-2 xdg cmake
 
 MY_PN="MultiMC5"
 MY_P="${MY_PN}-${PV}"
diff --git a/scripts/check-duplicates.sh b/scripts/check-duplicates.sh
index 8c6743bbd2..ddd63fa680 100755
--- a/scripts/check-duplicates.sh
+++ b/scripts/check-duplicates.sh
@@ -4,7 +4,6 @@
 #
 # This checks for potential and exact package matches within an overlay & ::gentoo
 # Note that this is not going to be 100% accurate
-#
 
 GENTOO_DIR="/var/db/repos/gentoo"
 GENTOO_PACKAGES=(
diff --git a/scripts/setup-and-run-repoman.sh b/scripts/setup-and-run-repoman.sh
new file mode 100755
index 0000000000..f6607549d6
--- /dev/null
+++ b/scripts/setup-and-run-repoman.sh
@@ -0,0 +1,30 @@
+#! /usr/bin/env bash
+# Maintainer: Andrew Ammerlaan <andrewammerlaan@riseup.net>
+#
+# This sets up repoman and runs the latest version
+#
+# TODO: Force repoman to output in colour
+
+### Setup prerequisites
+python3 -m pip install --upgrade pip
+pip install lxml pyyaml
+sudo groupadd -g 250 portage
+sudo useradd -g portage -d /var/tmp/portage -s /bin/false -u 250 portage
+
+### Sync the portage repository
+git clone https://github.com/gentoo/portage.git
+cd portage
+
+# Get all versions, and read into array
+mapfile -t RM_VERSIONS < <( git tag | grep repoman | sort -u )
+
+# Select latests version (last element in array)
+RM_VERS="${RM_VERSIONS[-1]}"
+
+# Checkout this version
+git checkout tags/${RM_VERS} -b ${RM_VERS}
+
+cd ..
+
+### Run repoman
+python3 portage/repoman/bin/repoman -dx full
diff --git a/scripts/setup-master-gentoo.sh b/scripts/setup-master-gentoo.sh
new file mode 100755
index 0000000000..a2939721af
--- /dev/null
+++ b/scripts/setup-master-gentoo.sh
@@ -0,0 +1,10 @@
+#! /usr/bin/env bash
+# Maintainer: Andrew Ammerlaan <andrewammerlaan@riseup.net>
+#
+# Fetch and setup the latest ::gentoo
+
+sudo mkdir -p /var/db/repos/gentoo /etc/portage /var/cache/distfiles
+wget -qO - "https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz" | sudo tar xz -C /var/db/repos/gentoo --strip-components=1
+sudo wget "https://www.gentoo.org/dtd/metadata.dtd" -O /var/cache/distfiles/metadata.dtd
+sudo wget "https://gitweb.gentoo.org/proj/portage.git/plain/cnf/repos.conf" -O /etc/portage/repos.conf
+sudo ln -s /var/db/repos/gentoo/profiles/default/linux/amd64/17.1 /etc/portage/make.profile