diff --git a/dev-libs/log4c/Manifest b/dev-libs/log4c/Manifest
index 4a976a2..7d03b1f 100644
--- a/dev-libs/log4c/Manifest
+++ b/dev-libs/log4c/Manifest
@@ -1,5 +1,5 @@
 AUX log4c-socket.patch 35592 BLAKE2B 1c0cc7e1bbabd34a02fcbc7da6317772a37394219754fb2b25fdafa427c7c0c6e40c1f60ef955fd047f17f5bf95ea9fde4794ece4e8e1f9d4415f37f2a6a3f8f SHA512 54c86d315c5ee49162a876b137c807d4c07c1af9e0ef11f26187bfece0dcb6f6281dcd09701cc4da9b03d357d6fbe85831fb56fd43b5adf9e71736a1a37ffa0f
 DIST log4c-1.2.4.tar.gz 559789 BLAKE2B a685fafb8ac117f47063e77bdbef09d187da464daa9eac7df726d9f65e225b45205ff5ac118e9466a682866d920afadc635192ee14a8fa8598fb7d7f6da6d33f SHA512 bd66029183b545de6b46b803e128735c5b57af0ca7f8a0a1f1655565920778993362e3187ffbe9b4b5e85dbf4c700b7d1f1dd4d1a636bcb20bfdb71fc73d37ca
-EBUILD log4c-1.2.4.ebuild 1132 BLAKE2B f59177374b954eb5bdab145b3d5c2415258313ef3de3dda0f1064e37691b9d6b0f23367fb24254376daf6c0826960747cf4fbc5e0bba65b7034474e3af5c1368 SHA512 4ae9382981aa06f11ca351d3c8eaf46c1ceddc1f3af62f5aeea2f02796250404572af01f3374292959f68fc44993116070bcb0d566d67e04b0f2d11745e1a2ab
+EBUILD log4c-1.2.4.ebuild 1135 BLAKE2B bdb04ea5b99d911c3e64ee596fd704904add3c5faa42815b1bd912e3a248e51375b229641764c00e5b5bdcb63fcee8e9a9acc5c8393563149811480464df9002 SHA512 247da22d52e22cc0f9c9a930dc5798fe675a6ae668bbc6bdf97ff227c41d23830fc033a0265851eb9fd804c2aa555044ab480a07433ba45c562cf1608e3090e5
 MISC ChangeLog 817 BLAKE2B 18d6a96421609a21169fbe2a4d6737d73140a629dfdd0a36805e474263bbaad77c7c9e2b47811184f0b5da2ed4f0a3de577b0ef5e0fbc3a634457ec6866847c4 SHA512 f6e0caebf861e601eb2b5c503d651a63869f5e862881a026da8cc5ebeb6c06c4ec38d3cd754585523a9ff50ff03b2dde2907a2648c9cf69104735b388b260758
 MISC metadata.xml 505 BLAKE2B a834408238278fda83342c87452757e76f4f50ea72d7aae5ddb2577023992d0a985cdac6f3eea35b687124a83528fccce832a688c688c8f1424605476a39ddc4 SHA512 1140257ff2eaa385c9831c68b4668385767d762917f006d06cc4e9db72e6c6f9e05177dab405fa525352c1c6428733ce113f13887c0f939dc91e62e27b910ca0
diff --git a/dev-libs/log4c/log4c-1.2.4.ebuild b/dev-libs/log4c/log4c-1.2.4.ebuild
index e7119e0..7a33cb2 100644
--- a/dev-libs/log4c/log4c-1.2.4.ebuild
+++ b/dev-libs/log4c/log4c-1.2.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Log4c is a library of C for flexible logging to files, syslog and other destinations"
 HOMEPAGE="http://log4c.sourceforge.net/"
@@ -20,9 +20,11 @@ RDEPEND="media-gfx/graphviz
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-src_prepare() {
-	epatch ${FILESDIR}/log4c-socket.patch
-	eautoreconf
+
+rc_prepare() {
+eapply ${FILESDIR}/log4c-socket.patch
+eautoreconf
+eapply_user
 }
 
 src_configure() {
diff --git a/mail-mta/bongo/Manifest b/mail-mta/bongo/Manifest
index 4f9702a..6fb1cc5 100644
--- a/mail-mta/bongo/Manifest
+++ b/mail-mta/bongo/Manifest
@@ -9,7 +9,7 @@ AUX bongo.conf.d 319 BLAKE2B b490af0e0c4673dcb31a9c3ca7292aeaf381105400b954d1457
 AUX bongo.init 795 BLAKE2B b094d1b850d1bbea7680da38216fb6819cbc7df3e675a47e2561adce1837d6fba85d1c9206c04712e5e5b68942d9f099bcd52092b4f17000a0f540e93f2c7499 SHA512 fa8129ad5969187ca36d7edaa56d83aceb480fd5241fdae22b041242d6c98ead46fd79e15efc9ec102e88dcddba19f650dbd9ef8619ab4cb4b0b4a629a0760d9
 AUX mailer.conf 301 BLAKE2B 6c285d7a4acc2fd73990d112c95604dd1bd4ac28c9e296767f2521dc3b1b92c765a5972c51de46d70110aa723b395759289a587d0fd88d7a2aa1a8a9911be397 SHA512 ee02584838312730277150605206c6963035e958f7c2c3327d882cbadc343a21fd2fa2ddd9af43021cc6573f27080f2dd574c9aca6b294efa3d720966751cf47
 DIST bongo-0.6.1.tar.gz 2488587 BLAKE2B fdb3596a751e8bc859796019f144b47b23e23e85c265b91d5b34c88da3171d23b90b313a202ecd53c9226490fbc0458d122af1520ef0e23f0b5fcc42fdfb9932 SHA512 27aadcc8cb45a5541c343b8c0871e35d1555f2170e68edebd9a13ccc9c5beeab4c32817c569950d4cf28f6f2f11dbe0a6d7d31172c15cef548c8ac471fe54aac
-EBUILD bongo-0.6.1.ebuild 2334 BLAKE2B 150145264adce06e442d2f7641c945e39a807d1d57a9d87d0535080ca0551deac1ed28d79878ceb96b35f5b297b14b3c7f4d7e8ddd92f6d7e156fc4012115065 SHA512 c939fc41001cf746f8a1e10b8ed8346a66639621fb664293760655c50dfe93d4b99faa1a0efe64712925be2c5803b1cb4fb5333e946434920c3b4575e63b75bf
-EBUILD bongo-9999.ebuild 2290 BLAKE2B a517972e98cc08f202fe417412d8d7060e57cb3db45e66c0fb76def51d4bb99e4cc0f6ed0ba045fd36080a5ea774f74963acdb760a851414d2a8c7a5f41455c7 SHA512 185099eafe38c3e4f83de0cc0be944625540b09eebc77c7d33376e5b54e9b53806d9212de23c2fb7950d3815f249a9a5ef1d4a26a59c4e8029781446cf9a9751
+EBUILD bongo-0.6.1.ebuild 2280 BLAKE2B 6f4ce7976e31e091ffae9b4ffb85add6031e7334c39d4860959478bfddbba8f39a0cb23f17059ad02d4fc370f1189a821182eb127fba5eb481deb9a11dfb9b20 SHA512 83ef6ff05d0f3061d37cdec3ace6a9ddbc6410ef950c3737a4b759262c3b57d530b5a2430c76805bd8de725205fb67b19eacbed8d1f045869c6576b42d99a4be
+EBUILD bongo-9999.ebuild 2262 BLAKE2B 656fb9ae5af218387e1986ca56c660b1525f69e6ac65b200b66457f0ceb4e865011fe446de267e7cfcc2fa101a4df6039e274650b6fe03e2f6be39cec74ef3db SHA512 88eb9587110bb5f836779fff96db6b209f78526d5b2dd38dd1f7e5a52cf4fe421e8c05c0f1ea59d76b8ddcfe581cfd483dac7a2fa67264c3e400d9518ca9821a
 MISC ChangeLog 1707 BLAKE2B 9668b8a388b560b09f0f49ee8c14e1d67690b0ae98fb5eafe257ee72f25b065c344284f40d5719b9c111e74d6ed578406447f0d15af0347f4e6472f50f361ba4 SHA512 9f1fd1ca681cc63b09dabd9cb285d1eb2b564cb79c3e2c1d0b18af8092040dd8bf67e37b69da8557ee5cf1b4bdabd64336951f1dc67e9c4ac97acb5790f312db
 MISC metadata.xml 411 BLAKE2B 6bd76e3591b8a2d88277f9ebfbd5951a7458a266adf5818533a1d829a770db62e1de41a4cb4f29206ed5eb381c6f4bfdc04973c4c65bd72496b7e31b6c85880f SHA512 df1f54923628bff824dc8835c96902bd07d4462472b9b8f356abb0b9b81875d78fa96e511290739ecc5423eadc8b2579a65b2f31f9c2c6a73c8d3413c0603d98
diff --git a/mail-mta/bongo/bongo-0.6.1.ebuild b/mail-mta/bongo/bongo-0.6.1.ebuild
index 4352051..d4a9aac 100644
--- a/mail-mta/bongo/bongo-0.6.1.ebuild
+++ b/mail-mta/bongo/bongo-0.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 
 #ESVN_REPO_URI="http://svn.gna.org/svn/${PN}/trunk"
 
-inherit eutils multilib flag-o-matic cmake-utils
+inherit multilib flag-o-matic cmake
 
 DESCRIPTION="A calendar and webmail application, which includes its own MTA"
 
@@ -28,7 +28,7 @@ DEPEND="acct-group/bongo
 	dev-db/unixODBC
 	>=dev-lang/python-2.3
 	>=dev-libs/glib-2.10
-	>=dev-libs/gmime-2.0
+	dev-libs/gmime:2.6
 	dev-libs/libgcrypt
 	>=dev-libs/libical-0.40
 	dev-libs/log4c
@@ -42,17 +42,19 @@ RDEPEND="${DEPEND}
 	!net-mail/mailwrapper
 	virtual/logger"
 
-mycmakeargs="-DBONGO_USER=bongo
-		-DCMAKE_BUILD_TYPE=Release
-		-DDEBUG=Off"
+mycmakeargs=(
+	-DBONGO_USER=bongo
+	-DCMAKE_BUILD_TYPE=Release
+	-DDEBUG=Off
+)
 
-src_prepare() {
-	epatch ${FILESDIR}/bongo-FORTIFY-1.patch
-	epatch ${FILESDIR}/bongo-0.6.0-missing_link-1.patch
-	epatch ${FILESDIR}/bongo-0.6.0-uninitialized-1.patch
-	epatch ${FILESDIR}/bongo-return_value-1.patch
-	epatch ${FILESDIR}/bongo-gentoo-1.patch
-}
+PATCHES=(
+	${FILESDIR}/bongo-FORTIFY-1.patch
+	${FILESDIR}/bongo-0.6.0-missing_link-1.patch
+	${FILESDIR}/bongo-0.6.0-uninitialized-1.patch
+	${FILESDIR}/bongo-return_value-1.patch
+	${FILESDIR}/bongo-gentoo-1.patch
+ )
 
 src_install() {
 	cmake-utils_src_install
diff --git a/mail-mta/bongo/bongo-9999.ebuild b/mail-mta/bongo/bongo-9999.ebuild
index 38c9747..ab1714f 100644
--- a/mail-mta/bongo/bongo-9999.ebuild
+++ b/mail-mta/bongo/bongo-9999.ebuild
@@ -4,7 +4,8 @@
 
 EAPI="7"
 
-inherit eutils multilib flag-o-matic cmake-utils git-r3
+inherit multilib flag-o-matic cmake git-r3
+
 EGIT_REPO_URI="https://github.com/bongo-project/bongo.git"
 
 DESCRIPTION="A calendar and webmail application, which includes its own MTA"
@@ -27,7 +28,7 @@ DEPEND="acct-group/bongo
 	dev-db/unixODBC
 	>=dev-lang/python-2.3
 	>=dev-libs/glib-2.10
-	>=dev-libs/gmime-2.0
+	dev-libs/gmime:2.6
 	dev-libs/libgcrypt
 	>=dev-libs/libical-0.40
 	dev-libs/log4c
@@ -41,21 +42,19 @@ RDEPEND="${DEPEND}
 	!net-mail/mailwrapper
 	virtual/logger"
 
-mycmakeargs="-DBONGO_USER=bongo
-		-DCMAKE_BUILD_TYPE=Debug
-		-DDEBUG=On
-		-DSTRICTCOMPILE=Off"
+mycmakeargs=(
+	-DBONGO_USER=bongo
+	-DCMAKE_BUILD_TYPE=Release
+	-DDEBUG=Off
+)
 
-pkg_setup() {
-	enewgroup bongo
-	enewuser bongo -1 -1 -1 bongo
-#	filter-ldflags -Wl,--as-needed --as-needed
-}
-
-src_prepare() {
-	epatch ${FILESDIR}/bongo-arm-asm-1.patch
-	epatch ${FILESDIR}/bongo-gentoo-1.patch
-}
+PATCHES=(
+	${FILESDIR}/bongo-FORTIFY-1.patch
+	${FILESDIR}/bongo-0.6.0-missing_link-1.patch
+	${FILESDIR}/bongo-0.6.0-uninitialized-1.patch
+	${FILESDIR}/bongo-return_value-1.patch
+	${FILESDIR}/bongo-gentoo-1.patch
+ )
 
 src_install() {
 	cmake-utils_src_install