8 files changed, 3 insertions, 498 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 47454ab19b45..796a1e64b285 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 0255f6225908..e8aabe21b60d 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -1,19 +1,9 @@
 AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce37ca5d1195e3f812683a2da59bedf45688cd448cc3ca544a02ee1c0e125f3960e81a062b0f7949e2cde581563d SHA512 0328842265ca859e78fa7d5babeac7b6baa16fb25962f50d431bbca133d042694d98942f77ba3387832d66645cc4df8fb9f3c4591ca7ed4eade6782a92a3d445
 DIST roundcubemail-1.4.11-complete.tar.gz 7048262 BLAKE2B aaf5e6ce5b07577f687788730bc9181334402bb2ff5e78fb306425913b62b4a8f72505547bdcc8673806b48b9ba8252b8059b59399efc95a51877d5c672a4760 SHA512 2bfe0ff3716f76bf9eb5bf5f7b62c738b233c57e67d6ac767c044d1a3a694ae003642d9cc68a18d6f6ba94135aa7ee1692db920e9127128669faee9ddf78fe80
-DIST roundcubemail-1.5.0-complete.tar.gz 7802014 BLAKE2B d81a521c264b47b55b7f868caf4fd8f0d7fdb2f0d04bf560bf1774c39aa4d0b4143ba1edb977941a4596848921671ec47a0dfd21f20f7e28778a021d58bec402 SHA512 cba32ee2b86864af9d9163d83fa49763267e3420bee59b86d47b889e1bc53871ed2ff5b2c1444778324f4b259e99752faa3b72f909a8f9c26c7af9c96ba08a54
-DIST roundcubemail-1.5.1-complete.tar.gz 7827081 BLAKE2B 1547ba369ef8e5f2b99ed72d562de3f76ff973d9617f4394bb89e281917264c9304aeb2b44cffd16952c2295111707215fe0426ce0f3f1d4a5c94df5f0811235 SHA512 bcea37859fbbee2f474cda024e5648b823a2da44ae69e5036a5b7e6add1d73dbfc1cd1cc32a3e01e59b0a3ba2ea03d1b028eec8e8f139fc4fb3eea8b52e28203
 DIST roundcubemail-1.5.2-complete.tar.gz 7852981 BLAKE2B 36920aa30301b96e1157a586508f3d460c26cfd692919b803bc8cecb31d99ebec5f93a62c725dd5d1dbd1ff68d59c97278b07eaabec42c5fb02c320c72fac8bf SHA512 96faa8c95c23b538ebfa91f58fb918b37185dbd1c09f2d128c9f8c800a0e3d6a2abbfa52753fb6a7ee47b633f35e2b31c92623107116dc760dfa9a22a4b2a23c
-DIST roundcubemail-1.5.3-complete.tar.gz 7857655 BLAKE2B 46e34d706b9b2a425e3c9bba2f05e5b21d9c15b9e3031c49aa4df97fbd07f6b769c4784fe4f65cd1a21fe0270629f3573239ff1e82486c39abee9ae118540e4f SHA512 b43db6ffe129e8738b34e0f3dad6fec815e6be4dc41237f81bbb53ccfe56ac2d5b115edcef0a2587d4733f73b0951e740d94f0d314b324d4dd31c4563994aec1
-DIST roundcubemail-1.6-beta-complete.tar.gz 5941128 BLAKE2B 2114a683cbf0c4ec6f5ba0b4d5eebb0a1f96121724861c1b1b5ce30f6b3a8fae02693878cae168af3d7f906a705814233aef024ddbc24d807ccd089f24b63fe1 SHA512 8a8bc9749203980d33ede7b221b96e0990b4afbe41db65fca74f0a49334adcae717306d4fe8fe1a5c938bf9fbcb5c4745d4d67bc5a587503aa3a2e9cb8f6384b
-DIST roundcubemail-1.6-rc-complete.tar.gz 5961003 BLAKE2B a21a42f69c223eb50b38f6d02ab69ebe3cf55cc2848fc49cc0e238eead5f19751801654c0b5fb6954022d9b24562c04ba085bf668591a5b7ff7b306d3a950d1c SHA512 f12f7858b19ce16613ed02a8b4cf7b4fe16753454b7c4cf4e92bbb2d11de4ba1e00b09ba70b387133613967654aadaaf09167ed16c54809885eb48adcf54de5f
-DIST roundcubemail-1.6.0-complete.tar.gz 5970153 BLAKE2B 2e8766f9b99c36c9111768fc9bc5fca9811c59f82b740d66cd03da939c15f32467750d752e60b8c0def059f0b2f25a208460dc688fe595f971babdc9923f5e4e SHA512 821733778085c670caeed6bed515e542841920dccc21e2ca97088e1f77a302b6961234d6ee5bcfbda797470889747a3be2c6d13cc5016615c8919c7ea064108c
+DIST roundcubemail-1.6.1-complete.tar.gz 5970713 BLAKE2B b46545b4a26983fbb993550e2c2f1504aea26c2caba28eb86703c6a94ac61209fecf45041b07440a495b7d2ad58eb20cb688cf37718402ef409ccc5442f0f62e SHA512 d5804e91c2da3b732cf14ad86f06099254540dd826ae5b7f14b98a7af8b90a7e9457221da2945aace8d12a60381eec85161e8bc6e0af4572b798a66cb36f2f00
 EBUILD roundcube-1.4.11.ebuild 2289 BLAKE2B 3e24731cb8fa44a45ff7c34aeaf0f2766849d1cec59e6c5ae26fb639443e9288889e435a976686328860fdd6bc64b98369d0ad585f879b57202cdbf6dbdd6d06 SHA512 858450c270914701ad910de943f35985c538a817cc325cef345ed6d582507fc365b3df11df2d1f800c107cebd3cd8ed0251e5d055dcb568f91423c5c62017bc6
-EBUILD roundcube-1.5.0.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
-EBUILD roundcube-1.5.1.ebuild 2358 BLAKE2B e44b1329bb7d68f7d328c5b8a2b4adb394b81781e0245dd709d1a0827e813a44b59f4f934dbcf157fc236159ad735b6dfdcb2b894f7f6710d40f522476270924 SHA512 b207366b024710c60da353129ca2316009d256060164198a6a374d6cec9eeb733b89b81acf6f2256b0e996b716d3caa9ec9905e77569b758e25997662564b483
 EBUILD roundcube-1.5.2.ebuild 2352 BLAKE2B 1e64cd573981cb3c3840e8f8ef09069c4c22ee3cf12ea4b67398fb6c733d2042e396bf65f3614b905b6b72750be027847042a44c9ffa1ca828bf2caf7a6d8caf SHA512 9992c350daa90b41c0b4754f742e2dbcaf4c530cbcb94fa1f9d3a07bb18bfa391fdfb0fd2ff2a53da9cd3ef654c5ae6ed2e10997496506a2824441ec8f4e37ac
-EBUILD roundcube-1.5.3.ebuild 2358 BLAKE2B 9c0d75804dd6c52f3130114c540b6a017169786d17642f09da9c7712eaa47a23cd918608fe5c35720787e7cac00513ae51434a677de5dd234969c987083b68e8 SHA512 6355e5b89d590ca1c0cb9bcae698bac146941f72ec9c81ca05c80e26041c7a88d5ed6f42162b4932531919ed1026dfe0cecfd2ab5e49f07f7aeeb2c178441d1c
-EBUILD roundcube-1.6.0.ebuild 2358 BLAKE2B dd2606aba7bc4f4a1fe6a1256f4ebece36d8e841828123e033c7402a67c49e56e0ad78014f51c05dc51467aafddd0fb7721d45f92bab42d4505149d0395bf2b3 SHA512 36d905618b994534ea6bf306c1f81c6994ea55bcb34cebff3997368973a7833686f16504c944e5d5a179dce8c9dd1c0725541b4e8e3e2e5aba4974270cf4e148
-EBUILD roundcube-1.6_beta.ebuild 2358 BLAKE2B 2ec8dcf67cbceffad488687cf6fd206e479aa317136843eae599b2dc489e4c91bdc9e8e6e1e8e2be15ed2187abb532da1fdb842c9b0529d87fe503ff206084c9 SHA512 6ef49096ec40fe9ae94731a19aa9d49d60f0868e14c9513e4a42599bd51cc15fe2cac895eae15740385a9271f1cd81bb68aa4460ddb0fac26ba38ba5b63703eb
-EBUILD roundcube-1.6_rc.ebuild 2358 BLAKE2B 2ec8dcf67cbceffad488687cf6fd206e479aa317136843eae599b2dc489e4c91bdc9e8e6e1e8e2be15ed2187abb532da1fdb842c9b0529d87fe503ff206084c9 SHA512 6ef49096ec40fe9ae94731a19aa9d49d60f0868e14c9513e4a42599bd51cc15fe2cac895eae15740385a9271f1cd81bb68aa4460ddb0fac26ba38ba5b63703eb
+EBUILD roundcube-1.6.1.ebuild 2358 BLAKE2B a841177c837ac4047b1303f6f9f48b7f88c3bff13e74935055a91553baff286a8fc412b46fcea094d8136170c72da08e9b26931b8bfaca0b016618f1969daaf3 SHA512 b55e0868a351b4d8346b90c982942cda0039becfbd5ff14b49d30f0bddafaab53fb89e7e49fb5ed536ec657ae65f92f9b0ec153d290b379fca0b4da20654e97f
 EBUILD roundcube-9999.ebuild 2358 BLAKE2B dd2606aba7bc4f4a1fe6a1256f4ebece36d8e841828123e033c7402a67c49e56e0ad78014f51c05dc51467aafddd0fb7721d45f92bab42d4505149d0395bf2b3 SHA512 36d905618b994534ea6bf306c1f81c6994ea55bcb34cebff3997368973a7833686f16504c944e5d5a179dce8c9dd1c0725541b4e8e3e2e5aba4974270cf4e148
 MISC metadata.xml 1128 BLAKE2B b7ecf906ab635d9100c5c28e9950ff9a0d746a797502a672e8a8f3f2da36a67b4f42863133548dfe3b415382d8fe116229cdc6d24f7df1db0cdf3a4a9da7a4f3 SHA512 35e05c40b1175760b0e171acce265b1a5f0748824f010dfb93d7d3345e595c0814ba8ebd2ddfdb699893b5fd7fdd19fed68eccd3ec94a816876b88550412c486
diff --git a/mail-client/roundcube/roundcube-1.5.0.ebuild b/mail-client/roundcube/roundcube-1.5.0.ebuild
deleted file mode 100644
index e63578dfa2c6..000000000000
--- a/mail-client/roundcube/roundcube-1.5.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="https://roundcube.net"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-
-IUSE="change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-# this function only sets DEPEND so we need to include that in RDEPEND
-need_httpd_cgi
-
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.5.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
-	virtual/httpd-php
-	change-password? (
-		dev-lang/php[sockets]
-	)
-	enigma? (
-		app-crypt/gnupg
-	)
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
-	EGIT_BRANCH="master"
-	BDEPEND="${BDEPEND}
-		app-arch/unzip
-		dev-php/composer
-		net-misc/curl"
-else
-	SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
-		git-r3_src_unpack
-		pushd "${S}" > /dev/null || die
-		rm Makefile || die
-		mv composer.json-dist composer.json || die
-		composer install --no-dev || die
-		./bin/install-jsdeps.sh || die
-		popd > /dev/null || die
-	else
-		default
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.md INSTALL README.md UPGRADING SECURITY.md
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
-	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "You can review the post-upgrade instructions at:"
-		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
-	fi
-}
diff --git a/mail-client/roundcube/roundcube-1.5.1.ebuild b/mail-client/roundcube/roundcube-1.5.1.ebuild
deleted file mode 100644
index e63578dfa2c6..000000000000
--- a/mail-client/roundcube/roundcube-1.5.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="https://roundcube.net"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-
-IUSE="change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-# this function only sets DEPEND so we need to include that in RDEPEND
-need_httpd_cgi
-
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.5.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
-	virtual/httpd-php
-	change-password? (
-		dev-lang/php[sockets]
-	)
-	enigma? (
-		app-crypt/gnupg
-	)
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
-	EGIT_BRANCH="master"
-	BDEPEND="${BDEPEND}
-		app-arch/unzip
-		dev-php/composer
-		net-misc/curl"
-else
-	SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
-		git-r3_src_unpack
-		pushd "${S}" > /dev/null || die
-		rm Makefile || die
-		mv composer.json-dist composer.json || die
-		composer install --no-dev || die
-		./bin/install-jsdeps.sh || die
-		popd > /dev/null || die
-	else
-		default
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.md INSTALL README.md UPGRADING SECURITY.md
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
-	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "You can review the post-upgrade instructions at:"
-		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
-	fi
-}
diff --git a/mail-client/roundcube/roundcube-1.5.3.ebuild b/mail-client/roundcube/roundcube-1.5.3.ebuild
deleted file mode 100644
index a7324c1ce64e..000000000000
--- a/mail-client/roundcube/roundcube-1.5.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="https://roundcube.net"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-
-IUSE="change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-# this function only sets DEPEND so we need to include that in RDEPEND
-need_httpd_cgi
-
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-5.5.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
-	virtual/httpd-php
-	change-password? (
-		dev-lang/php[sockets]
-	)
-	enigma? (
-		app-crypt/gnupg
-	)
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
-	EGIT_BRANCH="master"
-	BDEPEND="${BDEPEND}
-		app-arch/unzip
-		dev-php/composer
-		net-misc/curl"
-else
-	SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
-		git-r3_src_unpack
-		pushd "${S}" > /dev/null || die
-		rm Makefile || die
-		mv composer.json-dist composer.json || die
-		composer install --no-dev || die
-		./bin/install-jsdeps.sh || die
-		popd > /dev/null || die
-	else
-		default
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.md INSTALL README.md UPGRADING SECURITY.md
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
-	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "You can review the post-upgrade instructions at:"
-		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
-	fi
-}
diff --git a/mail-client/roundcube/roundcube-1.6.0.ebuild b/mail-client/roundcube/roundcube-1.6.1.ebuild
index 30c03bb63b3f..190b5fa07b04 100644
--- a/mail-client/roundcube/roundcube-1.6.0.ebuild
+++ b/mail-client/roundcube/roundcube-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/mail-client/roundcube/roundcube-1.6_beta.ebuild b/mail-client/roundcube/roundcube-1.6_beta.ebuild
deleted file mode 100644
index 44d89c9d3634..000000000000
--- a/mail-client/roundcube/roundcube-1.6_beta.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="https://roundcube.net"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-
-IUSE="change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-# this function only sets DEPEND so we need to include that in RDEPEND
-need_httpd_cgi
-
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-7.3.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
-	virtual/httpd-php
-	change-password? (
-		dev-lang/php[sockets]
-	)
-	enigma? (
-		app-crypt/gnupg
-	)
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
-	EGIT_BRANCH="master"
-	BDEPEND="${BDEPEND}
-		app-arch/unzip
-		dev-php/composer
-		net-misc/curl"
-else
-	SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
-		git-r3_src_unpack
-		pushd "${S}" > /dev/null || die
-		rm Makefile || die
-		mv composer.json-dist composer.json || die
-		composer install --no-dev || die
-		./bin/install-jsdeps.sh || die
-		popd > /dev/null || die
-	else
-		default
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.md INSTALL README.md UPGRADING SECURITY.md
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
-	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "You can review the post-upgrade instructions at:"
-		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
-	fi
-}
diff --git a/mail-client/roundcube/roundcube-1.6_rc.ebuild b/mail-client/roundcube/roundcube-1.6_rc.ebuild
deleted file mode 100644
index 44d89c9d3634..000000000000
--- a/mail-client/roundcube/roundcube-1.6_rc.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-MY_PN=${PN}mail
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_PV}
-
-DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
-HOMEPAGE="https://roundcube.net"
-
-# roundcube is GPL-licensed, the rest of the licenses here are
-# for bundled PEAR components, googiespell and utf8.class.php
-LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
-
-IUSE="change-password enigma exif fileinfo ldap mysql postgres sqlite ssl spell zip"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-# this function only sets DEPEND so we need to include that in RDEPEND
-need_httpd_cgi
-
-RDEPEND="
-	${DEPEND}
-	>=dev-lang/php-7.3.0[exif?,fileinfo?,filter,gd,iconv,intl,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml,zip?]
-	virtual/httpd-php
-	change-password? (
-		dev-lang/php[sockets]
-	)
-	enigma? (
-		app-crypt/gnupg
-	)
-	mysql? (
-		|| (
-			dev-lang/php[mysql]
-			dev-lang/php[mysqli]
-		)
-	)
-	spell? ( dev-lang/php[curl,spell] )
-"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/roundcube/roundcubemail"
-	EGIT_BRANCH="master"
-	BDEPEND="${BDEPEND}
-		app-arch/unzip
-		dev-php/composer
-		net-misc/curl"
-else
-	SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
-		git-r3_src_unpack
-		pushd "${S}" > /dev/null || die
-		rm Makefile || die
-		mv composer.json-dist composer.json || die
-		composer install --no-dev || die
-		./bin/install-jsdeps.sh || die
-		popd > /dev/null || die
-	else
-		default
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.md INSTALL README.md UPGRADING SECURITY.md
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r [[:lower:]]* SQL
-	doins .htaccess
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/logs
-	webapp_serverowned "${MY_HTDOCSDIR}"/temp
-
-	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
-	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "You can review the post-upgrade instructions at:"
-		elog "${EROOT}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
-	fi
-}