diff --git a/mail-mta/bongo/Manifest b/mail-mta/bongo/Manifest
index e44c390..f3d5ef8 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 2351 BLAKE2B 264959017169f27efa510c7b34561f3053928a7bd6cffde1ab037db4cfe753b8a11d89602a23c93b41eec974a4d129d165471c9aca10acb7813a76c487723d1b SHA512 5be04627f45fe280a9917bb2eb41b5b5c10b8e7959ba00f805b3e63701632ee0170459bed3adc2b1ec28e30753d7547d24d8fb07d2dddca0f6c39c574be6fcf6
-EBUILD bongo-9999.ebuild 2238 BLAKE2B 6c04027b6716149a9281627e7b5e4f964d8e09635dfedaa7e86ddfbc92e9de2d091adbd87d3fb8e2ae0d578a0550a727169e5fe27c4a1c3405dcd332d509bf5d SHA512 8a615a9ef80e79c7854fc63876a4d1592438dbacd3a388d4fd8078198a2df0438ef5df153c3ebe6019b108f92020cbbc29a4f0e9eb111b81ee06610163f8fcc4
+EBUILD bongo-0.6.1.ebuild 2475 BLAKE2B 35b6b3adc79eb1a057550e0edbf2818380f958e6e641fc900fe1aa456e4c72b308292f065a44df1500020326a4d26a8e605eeacb82427acf34b306850f1864ac SHA512 6464c25f49b8a6f530befec469dcbc9fc32c258147910ef74f4fe08c635284745d4fa2ee02ed62b1313c504acfe86e516d058542a8205b35aa37b005d094ed81
+EBUILD bongo-9999.ebuild 2419 BLAKE2B 792c61d67f521d1119364417d89fa2774f220cc04ab1664977b430df2a4dffa383ca303d0899d668d5655f3ad5bc37ff90f348d4801ad4e7874d9c6d837b68a3 SHA512 b13c70482949c33928e45264ba65f5197ed8a55804d8e7b596c532114e5b85cd789f517b6a1cf30f94a1e06bc9ed5a0e9bca8130c78829c7dc62ed8ee1322565
 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 e885a51..e099bda 100644
--- a/mail-mta/bongo/bongo-0.6.1.ebuild
+++ b/mail-mta/bongo/bongo-0.6.1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit cmake
+PYTHON_COMPAT=( python3_{11..14} )
+
+inherit cmake python-single-r1
 
 DESCRIPTION="Calendar and webmail application with its own MTA"
 HOMEPAGE="https://bongo-project.org/"
@@ -13,7 +15,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
-# Only keep this if you really need unstripped binaries.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="strip"
 
 DEPEND="
@@ -32,11 +34,15 @@ DEPEND="
 "
 RDEPEND="
     ${DEPEND}
+    ${PYTHON_DEPS}
     >=net-mail/mailbase-0.00
     !net-mail/mailwrapper
     virtual/logger
-    dev-python/lxml
+    $(python_gen_cond_dep '
+	dev-python/lxml[${PYTHON_USEDEP}]
+    ')
 "
+BDEPEND="${RDEPEND}"
 
 PATCHES=(
     "${FILESDIR}"/bongo-FORTIFY-1.patch
diff --git a/mail-mta/bongo/bongo-9999.ebuild b/mail-mta/bongo/bongo-9999.ebuild
index 05def22..99f8d61 100644
--- a/mail-mta/bongo/bongo-9999.ebuild
+++ b/mail-mta/bongo/bongo-9999.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit cmake git-r3
+PYTHON_COMPAT=( python3_{11..13} )
+
+inherit cmake git-r3 python-single-r1
 
 EGIT_REPO_URI="https://github.com/bongo-project/bongo.git"
 
@@ -13,6 +15,7 @@ HOMEPAGE="https://bongo-project.org/"
 LICENSE="LGPL-2"
 SLOT="0"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="strip"
 
 DEPEND="
@@ -31,11 +34,15 @@ DEPEND="
 "
 RDEPEND="
     ${DEPEND}
+    ${PYTHON_DEPS}
     >=net-mail/mailbase-0.00
     !net-mail/mailwrapper
     virtual/logger
-    dev-python/lxml
+    $(python_gen_cond_dep '
+	dev-python/lxml[${PYTHON_USEDEP}]
+    ')
 "
+BDEPEND="${RDEPEND}"
 
 PATCHES=(
     "${FILESDIR}"/bongo-FORTIFY-1.patch