diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 2bd7e54..7b46af4 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,2 +1,3 @@
 DIST gitea-1.15.2.tar.gz 48648887 BLAKE2B 5bd5800e4c967946dad918d57318831cc7a55cdeedd46e8efb74cd47940eefde1212b85f43b77f1ba443d2c09997a5dd1dd29fd9c7bbc404cf2943048e42225c SHA512 47332f07882c2bef26f9417f0617801518c0448cbe84c2a70b140f38dbe18c17cfe9bb077da49536663066b8d09a566a423256430f954beafc53d746b5bfd578
 DIST gitea-1.15.3.tar.gz 48671233 BLAKE2B 3440e02711f696fff8629e5049c44963a31375516ae8e335069970d8a9a65792c60a382444bea6d49f1048936862ff5e56b79eaa7bc1aefaafe0c080ce52cb02 SHA512 00bf48e8c30ee2c00465f7e29055149e68a1f2956860ca4314c7671d054e93c94024d8aed91770b1a0a50a21937bb51e42da5d9639462c21f9a56652fbfdf04e
+DIST gitea-1.15.4.tar.gz 48693539 BLAKE2B db88c522d1777140b148d8449a40f4d50788dd82dbbf111c31ec0cb1c34b85cf87d4c4fa45cb1d2425abc5618346bd6e086dc3ee63520f606663a743c551a8fa SHA512 2547eb3720b6ec9b11652c2cabdd2b5469153f0daaabbb5af913479c6b6ac7aa4ed769efebc2e4ad5ce5e4c27d0fc7c0ee86b3b61427df37168ea235d6b7da98
diff --git a/www-apps/gitea/gitea-1.15.4.ebuild b/www-apps/gitea/gitea-1.15.4.ebuild
new file mode 100644
index 0000000..3131d61
--- /dev/null
+++ b/www-apps/gitea/gitea-1.15.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 2016-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps go-module tmpfiles systemd
+
+MY_PV="${PV/_rc/-rc}"
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io"
+SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${MY_PV}/gitea-src-${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64"
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+acct pam sqlite"
+
+COMMON_DEPEND="
+	acct? (
+		acct-group/git
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-vcs/git
+"
+
+DOCS=( custom/conf/app.example.ini CONTRIBUTING.md README.md )
+FILECAPS=( -m 711 cap_net_bind_service+ep usr/bin/gitea )
+
+RESTRICT="test"
+QA_PRESTRIPPED="usr/bin/gitea"
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
+		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
+		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
+		-e "s#^MODE = console#MODE = file#"
+		-e "s#^LEVEL = Trace#LEVEL = Info#"
+		-e "s#^LOG_SQL = true#LOG_SQL = false#"
+		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
+	fi
+
+	einfo "Remove tests which are known to fail with network-sandbox enabled."
+	rm ./modules/migrations/github_test.go || die
+
+	einfo "Remove tests which depend on gitea git-repo."
+	rm ./modules/git/blob_test.go || die
+	rm ./modules/git/repo_test.go || die
+}
+
+src_compile() {
+	local gitea_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		TAGS="${gitea_tags[*]}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
+	)
+	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
+
+	env "${makeenv[@]}" emake backend
+}
+
+src_install() {
+	dobin gitea
+
+	einstalldocs
+
+	newconfd "${FILESDIR}/gitea.confd-r1" gitea
+	newinitd "${FILESDIR}/gitea.initd-r3" gitea
+	newtmpfiles - gitea.conf <<-EOF
+		d /run/gitea 0755 git git
+	EOF
+	systemd_newunit "${FILESDIR}"/gitea.service-r3 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.example.ini app.ini
+	if use acct ; then
+		fowners root:git /etc/gitea/{,app.ini}
+		fperms g+w,o-rwx /etc/gitea/{,app.ini}
+
+		diropts -m0750 -o git -g git
+		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+		keepdir /var/log/gitea
+	fi
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	tmpfiles_process gitea.conf
+
+	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
+	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
+	ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
+	ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
+}