Merge updates from master

8 files changed, 5 insertions, 49 deletions

diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index bc8acffcde6f..e2872ff5ac80 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -1,3 +1,3 @@
-DIST moodle-4.3.8.tgz 68132078 BLAKE2B d2830f03cfa39fdcd263b21a8efd3a4a317cd267f1f8eab5725d2acba4c020f0ab24462ce3b1bd31e65e6253603c7f2953d26b735405aed3bac3996d021dc6b5 SHA512 a97ba6e2aa54342f1e516af125c22385b2841b9b2677e056d8275ef45293093fdef002787afbce9a37b099c4b30450eda8b850f934c98e508fadbd57123de5cc
-DIST moodle-4.4.4.tgz 72507853 BLAKE2B 374e83c79d1a84c246aab4120bb94f1efa57362594c5660068cc922cb0a6c0d67a51c47609be9039332e4450a71f3b5f16ab75452850771da43ec4449ed0e1ad SHA512 e73a12d18ca361f1d2a86cc7987f82e848273e2dfc21eb3a1a5551891e623ae2b8c36e2f602e36178f8dfdd61657344a5be37bab812a7c7c4c97699e10673453
-DIST moodle-4.5.tgz 74155937 BLAKE2B 84ccb976f872042a66ae8ce03cf5e48fb008d36365152a7df902c8cc288e905a1d675261f19564ac4e6458d6bcd0a3eba06188c8a1a01ce1648caa0e872f6eca SHA512 f91f571461a9bf1198c39ce311739e77283838494bd8b42db094590ff9f90ce9de677365bb4fdb1942d358ff6fe1019445f264313b42fb0b7bfc5f68aff311f7
+DIST moodle-4.3.9.tgz 68143762 BLAKE2B 552b3f23fd0bc3d4201f0121baf47b5f0f1cc567ce1b32382d640b1507f3371e32700c73db57987d1aa886e120d9f5d7254676f531caef35541027c543465bfc SHA512 1c893943a2bc30dfecaf2ca08ffaf44700d35d16cbbc5cd8538e7aefdcd386c47de52c234e206e582b33c5711d7ba9ebe404789bd9c7dddfa4a9d6d92c471876
+DIST moodle-4.4.5.tgz 72540743 BLAKE2B e308b6725f47518c8f727fd53b2f45db95b3f9e36e20d14bd9dcbd090200b813775a90f67f438c8dfe1bda2dd0f114879805597d74d877c84498a0477b7fb378 SHA512 3699c4aea9ea6e2f2c1939f337cfb516d8cc9c610a5dbc2ea6337f8fdc4f3e12baf9e0e761d40d9490ee22da93c75545980c8cec79d305f2349b80cf3c431a43
+DIST moodle-4.5.1.tgz 74198418 BLAKE2B cf27161cd1d39ce01dbb58a6c296b5c2259688fb46ce4d595d57220377531f01e13ada63a62a7ffd65830018f4b5d3260c959e0de2b60e5d7b439461d126331b SHA512 fc6b6956c33e6186a7e8d25836e174d47cd9300dbd30b5727a3119d2bd26ea2c1d524f3e74533bb6d80e064f83f14531cfbff56c0c8296e79a0311b58fc64b3c
diff --git a/www-apps/moodle/moodle-4.3.8.ebuild b/www-apps/moodle/moodle-4.3.9.ebuild
index dc4f3bbcbc1f..dc4f3bbcbc1f 100644
--- a/www-apps/moodle/moodle-4.3.8.ebuild
+++ b/www-apps/moodle/moodle-4.3.9.ebuild
diff --git a/www-apps/moodle/moodle-4.4.4.ebuild b/www-apps/moodle/moodle-4.4.5.ebuild
index 266663e17ba6..266663e17ba6 100644
--- a/www-apps/moodle/moodle-4.4.4.ebuild
+++ b/www-apps/moodle/moodle-4.4.5.ebuild
diff --git a/www-apps/moodle/moodle-4.5.ebuild b/www-apps/moodle/moodle-4.5.1.ebuild
index 266663e17ba6..266663e17ba6 100644
--- a/www-apps/moodle/moodle-4.5.ebuild
+++ b/www-apps/moodle/moodle-4.5.1.ebuild
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index c03523a3ce75..9f15d6b43461 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,8 +1,7 @@
 DIST nextcloud-28.0.12.tar.bz2 190777207 BLAKE2B 796235889f7e4ee09a10c41a800ea954a592b9ff1c6e31abe4114e5e599e8c27e5f561ac42de3eb3239e13612d4c6ef9b8cbcb56c8027845d73b804bf09bea01 SHA512 8c22085e9fa6860b5892e0f833e90f4870c34a34a5f26e2bbbcbadc336989e6f33c45fbad7712307acbb813a7633b400c67501a8951e1a512261a8ce61b4125d
-DIST nextcloud-28.0.13.tar.bz2 192298589 BLAKE2B 90f11bd6ee73eb8d35d15c33b216cc3db0dc4c7810972eac7e8041304f96a79c707973a643492006c67366cc5009452894be0e152c7f103989201f13c64ca87a SHA512 b9eb705e1f9aabee39d9ee69bbcca70a83ce4f47562798a2a44a28395353f91260ad055277b403b1d46628dd0b5ed1cd4ade5c46c221646a055f33e0a6fec2ef
+DIST nextcloud-28.0.14.tar.bz2 192050636 BLAKE2B 4d2b7ff70864f062155fade7cbecb2743ee5e103b0dc98ecac3391724e5c576b7ff9d398f71419b778ed287dd64e6669a1db5198fe09bfa3a1e85b1fb7991cb4 SHA512 2ef507bbc224b73d509fa1788ef4325716ea7dd57f77f8f091f5d7ef9f7362c15ee2cb8f847053aae01f02863bc9954dffabe58cc51b89f092638904cb84ff50
 DIST nextcloud-28.0.6.tar.bz2 188259629 BLAKE2B 304d98076d02a190143d0e9846405a029a16b268eec2dfddde8746deae7ef02e0acd5f7a9a7303e454fbc4d828496cfc101c59e8664834e8a9691ae0c586c8f0 SHA512 f34c895602bd63f2e61492e91b9949852f9d2422c3b8740e851107efe5d46de72d8ec06a15c808fa27503546067d62d3166b55ff9979b18f36546845791941c2
 DIST nextcloud-29.0.10.tar.bz2 207170881 BLAKE2B b05af991b57ab98a782e473fd8a47e422234b06887755171c89702dba7e1a0e8ba5098a6593100058f6e80f2cf5ebfc16f4f03e5a881e3c4a0478b8952b36c5e SHA512 919603f3c1159b4e37d79e1e44bb96957d68384ef0ae60588e152d4d294b06df4d8fab4e7999c965c773ba8c1f1ec974445cf41d64ab1c9aaf65e9c07c606c20
 DIST nextcloud-29.0.7.tar.bz2 204453544 BLAKE2B 8affb8c2c6faf82df014e06fb9df3226e1ea6a0c9922a01a1b0f1e1120925b755163ee15d3a95f5fd4635dcc2d472290de29fc97b52c5e669122b32c7d64a28e SHA512 9a87ea11870aec4b26499e85c9ef91e38644d947c810c619f22f617307014b58adc24ebd19841af8aa3b5185427610f278951e48bb7ae242fa4de1eb3e6abb63
-DIST nextcloud-29.0.9.tar.bz2 201718621 BLAKE2B f53d252e02636f7cc4781e3cc2333d64fe07f91e19595d5167b7476e6e03c05dd183ac07555671449a2824f7377e120b313f0d6d4ffb236a709c0b658b71f9c6 SHA512 e0acd458ee87f9269f6e80c0b3b8b68226a80dc49aae9fc084cefdf156060edc983ac8f88b1ce15a3eead9eff8b60dc2ec69920a5499a923cad8496e8fa8bd7a
 DIST nextcloud-30.0.2.tar.bz2 186711039 BLAKE2B 96d75fbeb3f1c9de1d122e86f59cbaac591d93d9837a3af9c2b1009ec83b8e5bb672c346d71e1163100a4619b8ed526fc9f71d508269d0f577a063410c0f4069 SHA512 5587fd8a5695b70165bc705cc79294779a7d64e755d8a37e76a13b0f28da3132ea4228615f1fd2ed13727b34d4c03c7fd1965587590aa0dd8847b7a0b00b5fe7
-DIST nextcloud-30.0.3.tar.bz2 187679236 BLAKE2B 6e325dd3ddc2d33faebcdaa9ce3fceebad31209c1f7fa7f450578a6d21645b52b26f4fd709a97dbc2ae969c264bcf1fc30ab908dd6708f8b922566ed25e6f7f5 SHA512 9302fbd73197f561751b0893c52e5fa667b0a6a757f0173d1f44fb3930be106f56436acb85ed753eea4263a8d4be5107abfbaba8ee0e66ce4c1e7027b786e2db
+DIST nextcloud-30.0.4.tar.bz2 187905017 BLAKE2B 3bec2878a64e589aa54a99c0de30ea171a97da126723f86f8190757453cfa83bb191ead07c74b200b332f4d370a8c3d88737aa889311661a034f39e0ba88de5a SHA512 6686bd86f5a7ede656e46f07580ba0c83db42ba5e2f161074b3cd48bbba80c4836125bb6966e052c35eb332bb43d5df58e29c781a56a2ad6ac8498464aa47aec
diff --git a/www-apps/nextcloud/nextcloud-28.0.13.ebuild b/www-apps/nextcloud/nextcloud-28.0.14.ebuild
index c4a46ad7ae66..c4a46ad7ae66 100644
--- a/www-apps/nextcloud/nextcloud-28.0.13.ebuild
+++ b/www-apps/nextcloud/nextcloud-28.0.14.ebuild
diff --git a/www-apps/nextcloud/nextcloud-30.0.3.ebuild b/www-apps/nextcloud/nextcloud-30.0.3.ebuild
deleted file mode 100644
index cdae29e997d4..000000000000
--- a/www-apps/nextcloud/nextcloud-30.0.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="https://nextcloud.com/"
-SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
-
-S=${WORKDIR}/${PN}
-
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json(+),mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_postinst_txt en "${FILESDIR}"/php-argon2-en.txt
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-29.0.9.ebuild b/www-apps/nextcloud/nextcloud-30.0.4.ebuild
index cdae29e997d4..cdae29e997d4 100644
--- a/www-apps/nextcloud/nextcloud-29.0.9.ebuild
+++ b/www-apps/nextcloud/nextcloud-30.0.4.ebuild