diff --git a/dev-cpp/drogon/drogon-1.7.3.ebuild b/dev-cpp/drogon/drogon-1.7.3-r1.ebuild
similarity index 56%
rename from dev-cpp/drogon/drogon-1.7.3.ebuild
rename to dev-cpp/drogon/drogon-1.7.3-r1.ebuild
index 9d585e902e..2455c3b57b 100644
--- a/dev-cpp/drogon/drogon-1.7.3.ebuild
+++ b/dev-cpp/drogon/drogon-1.7.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -17,17 +17,21 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-cpp/trantor-1.5.2
-	dev-libs/jsoncpp
+	dev-libs/jsoncpp:=
 	sys-libs/zlib
-	brotli? ( app-arch/brotli )
+	brotli? ( app-arch/brotli:= )
 	mariadb? ( dev-db/mariadb:= )
 	postgres? ( dev-db/postgresql:= )
-	redis? ( dev-libs/hiredis )
-	sqlite? ( dev-db/sqlite )
-	ssl? ( dev-libs/openssl )
+	redis? ( dev-libs/hiredis:= )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:= )
+	elibc_Darwin? ( sys-libs/native-uuid )
+	elibc_SunOS? ( sys-libs/libuuid )
+	!elibc_Darwin? ( !elibc_SunOS? (
+		sys-apps/util-linux
+	) )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )
 "
 BDEPEND="doc? ( app-doc/doxygen )"
@@ -38,8 +42,6 @@ src_prepare() {
 	cmake_comment_add_subdirectory "trantor"
 	sed -i '/${PROJECT_SOURCE_DIR}\/trantor\/trantor\/tests\/server.pem/d' \
 		lib/tests/CMakeLists.txt || die
-	use ssl || sed -i '/find_package(OpenSSL)/d' CMakeLists.txt || die
-	use doc || sed -i '/find_package(Doxygen/d' CMakeLists.txt || die
 
 	use examples && DOCS+=( "${S}/examples" )
 
@@ -48,17 +50,24 @@ src_prepare() {
 
 src_configure() {
 	local -a mycmakeargs=(
-		"-DBUILD_DOC=$(usex doc)"
-		"-DBUILD_EXAMPLES=NO"
-		"-DBUILD_DROGON_SHARED=YES"
-		"-DBUILD_POSTGRESQL=$(usex postgres)"
-		"-DBUILD_MYSQL=$(usex mariadb)"
-		"-DBUILD_SQLITE=$(usex sqlite)"
-		"-DBUILD_REDIS=$(usex redis)"
-		"-DBUILD_TESTING=$(usex test)"
-		"-DBUILD_BROTLI=$(usex brotli)"
+		-DBUILD_DOC=$(usex doc)
+		-DBUILD_EXAMPLES=NO
+		-DBUILD_DROGON_SHARED=YES
+		-DBUILD_POSTGRESQL=$(usex postgres)
+		-DBUILD_MYSQL=$(usex mariadb)
+		-DBUILD_SQLITE=$(usex sqlite)
+		-DBUILD_REDIS=$(usex redis)
+		-DBUILD_TESTING=$(usex test)
+		-DBUILD_BROTLI=$(usex brotli)
+		$(cmake_use_find_package ssl OpenSSL)
+		$(cmake_use_find_package doc Doxygen)
 	)
-	use doc && HTML_DOCS="${BUILD_DIR}/docs/drogon/html/*"
+	use doc && HTML_DOCS=( "${BUILD_DIR}/docs/drogon/html/." )
 
 	cmake_src_configure
 }
+
+src_install() {
+	docompress -x /usr/share/doc/${PF}/examples
+	cmake_src_install
+}
diff --git a/dev-cpp/drogon/metadata.xml b/dev-cpp/drogon/metadata.xml
index 80e637052b..782288ff93 100644
--- a/dev-cpp/drogon/metadata.xml
+++ b/dev-cpp/drogon/metadata.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>Ronny (tastytea) Gutbrod</name>
-	</maintainer>
-	<upstream>
-		<doc>https://drogon.docsforge.com/</doc>
-	</upstream>
-	<use>
-		<flag name="brotli">Enable support for brotli compression</flag>
-		<flag name="mariadb">Add support for the mariadb database</flag>
-		<flag name="redis">Add support for the Redis database via
-		dev-libs/hiredis</flag>
-	</use>
+<maintainer type="person">
+	<email>gentoo@tastytea.de</email>
+	<name>Ronny (tastytea) Gutbrod</name>
+</maintainer>
+<upstream>
+	<doc>https://drogon.docsforge.com/</doc>
+</upstream>
+<use>
+	<flag name="brotli">Enable support for brotli compression</flag>
+	<flag name="mariadb">Add support for the mariadb database</flag>
+	<flag name="redis">Add support for the Redis database via <pkg>dev-libs/hiredis</pkg></flag>
+</use>
 </pkgmetadata>