diff --git a/dev-util/beautysh/Manifest b/dev-util/beautysh/Manifest
new file mode 100644
index 0000000000..624fd367ae
--- /dev/null
+++ b/dev-util/beautysh/Manifest
@@ -0,0 +1 @@
+DIST beautysh-6.0.1.tar.gz 14634 BLAKE2B ee81d9eca73676ad485f3b21eaf14d9aa8bdf294ede0951f850f30b005c30dede5265cba414df449d2ab55f238e82d841ee1f7b85d1407b973fc8c8da59b5650 SHA512 71ecdb10d73750966c0ebea44702e74e82828ba863d99274d6427b314cd3981ab04895e206e08ee68cc719d1e67cc6c3ff6ffc7f11e0978c69ffcbab21fe60e4
diff --git a/dev-util/beautysh/beautysh-6.0.1.ebuild b/dev-util/beautysh/beautysh-6.0.1.ebuild
new file mode 100644
index 0000000000..3223019492
--- /dev/null
+++ b/dev-util/beautysh/beautysh-6.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="This program takes upon itself the hard task of beautifying Bash scripts"
+HOMEPAGE="http://uncrustify.sourceforge.net/"
+SRC_URI="https://github.com/lovesegfault/beautysh/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
diff --git a/dev-util/beautysh/metadata.xml b/dev-util/beautysh/metadata.xml
new file mode 100644
index 0000000000..92c8553530
--- /dev/null
+++ b/dev-util/beautysh/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ marco@scardovi.com
+ Marco Scardovi
+
+
+ beautysh
+ lovesegfault/beautysh
+
+
diff --git a/games-action/ATLauncher/ATLauncher-3.4.3.1.ebuild b/games-action/ATLauncher/ATLauncher-3.4.3.1.ebuild
index bcfeaf6685..2256d5abe3 100644
--- a/games-action/ATLauncher/ATLauncher-3.4.3.1.ebuild
+++ b/games-action/ATLauncher/ATLauncher-3.4.3.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Minecraft launcher which integrates multiple different ModPacks"
HOMEPAGE="https://atlauncher.com
https://github.com/ATLauncher/ATLauncher"
SRC_URI="https://github.com/ATLauncher/ATLauncher/releases/download/v${PV}/${P}.jar
- https://raw.githubusercontent.com/ATLauncher/ATLauncher/master/src/main/resources/assets/image/Icon.ico -> ${PN}.ico"
+ https://raw.githubusercontent.com/ATLauncher/ATLauncher/master/src/main/resources/assets/image/icon.ico -> ${PN}.ico"
KEYWORDS="~amd64 ~x86"
LICENSE="GPL-3"
diff --git a/x11-misc/caffeine-ng/Manifest b/x11-misc/caffeine-ng/Manifest
new file mode 100644
index 0000000000..6d3797d54f
--- /dev/null
+++ b/x11-misc/caffeine-ng/Manifest
@@ -0,0 +1 @@
+DIST caffeine-ng-3.5.1.tar.gz 155324 BLAKE2B 3f0ecce6a9fa4a3cdd206a33c80f0ce10ae8472b3f08546dfe5273e9055d8f8840528d9c1d4114b90c2a1967d40b30ce890306862939f4996a675ede90ebef60 SHA512 d37a4ddfefca3ed883a7aade0c25ef9f1bf475d27cb43e7c64ee6f946a9157727c5527ad2c06fb39bac6e74344f523c1d9f2896c301b33cd3c8c6e1ed52a99fb
diff --git a/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild b/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild
new file mode 100644
index 0000000000..694fc49626
--- /dev/null
+++ b/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="Aplication able to temporarily inhibit the screensaver."
+HOMEPAGE="https://github.com/caffeine-ng/caffeine-ng"
+if [[ ${PV} == 9999 ]];then
+ inherit git-r3
+ EGIT_REPO_URI="${HOMEPAGE}.git"
+else
+ SRC_URI="https://github.com/caffeine-ng/caffeine-ng/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-python/pygobject:3
+ >=dev-python/pyxdg-0.25
+ dev-python/dbus-python
+ >=dev-python/docopt-0.6.2
+ >=dev-python/setproctitle-1.1.10
+ dev-python/setuptools
+ >=dev-python/wheel-0.29.0
+ dev-python/setuptools_scm
+ dev-libs/libappindicator:3
+ x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}"
+
+pkg_preinst(){
+ gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+ gnome2_gconf_install
+ gnome2_schemas_update
+}
+
+pkg_postrm(){
+ gnome2_gconf_uninstall
+ gnome2_schemas_update
+}
diff --git a/x11-misc/caffeine-ng/caffeine-ng-9999.ebuild b/x11-misc/caffeine-ng/caffeine-ng-9999.ebuild
new file mode 100644
index 0000000000..f55d9d5dce
--- /dev/null
+++ b/x11-misc/caffeine-ng/caffeine-ng-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="Aplication able to temporarily inhibit the screensaver."
+HOMEPAGE="https://github.com/caffeine-ng/caffeine-ng"
+if [[ ${PV} == 9999 ]];then
+ inherit git-r3
+ EGIT_REPO_URI="${HOMEPAGE}.git"
+else
+ SRC_URI="https://github.com/caffeine-ng/caffeine-ng/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-python/pygobject:3
+ >=dev-python/pyxdg-0.25
+ dev-python/dbus-python
+ >=dev-python/docopt-0.6.2
+ >=dev-python/setproctitle-1.1.10
+ dev-python/setuptools
+ >=dev-python/wheel-0.29.0
+ dev-python/setuptools_scm
+ dev-libs/libappindicator:3
+ x11-libs/gtk+:3
+ x11-libs/libnotify
+"
+RDEPEND="${DEPEND}"
+
+pkg_preinst(){
+ gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+ gnome2_gconf_install
+ gnome2_schemas_update
+}
+
+pkg_postrm(){
+ gnome2_gconf_uninstall
+ gnome2_schemas_update
+}
diff --git a/x11-misc/caffeine-ng/metadata.xml b/x11-misc/caffeine-ng/metadata.xml
new file mode 100644
index 0000000000..3df903c795
--- /dev/null
+++ b/x11-misc/caffeine-ng/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ queereen@riseup.net
+ Avis Drożniak
+
+
+ Caffeine is a little daemon that sits in your systray, and prevents the screensaver from showing up, or the system from going to sleep.
+ It does so when an application is fullscreened (eg: youtube), or when you click on the systray icon (which you can do, when, eg: reading).
+
+