diff --git a/metadata/md5-cache/app-office/calcurse-4.8.1-r1 b/metadata/md5-cache/app-office/calcurse-4.8.1-r1
index c67b28719632b..93cb6965e5cd3 100644
--- a/metadata/md5-cache/app-office/calcurse-4.8.1-r1
+++ b/metadata/md5-cache/app-office/calcurse-4.8.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://calcurse.org/
 INHERIT=python-single-r1
 IUSE=caldav doc python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=~amd64 ~arm64 ppc ppc64 x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:0= sys-libs/timezone-data python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) caldav? ( python_single_target_python3_10? ( dev-python/httplib2[python_targets_python3_10(-)] dev-python/pyparsing[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/httplib2[python_targets_python3_11(-)] dev-python/pyparsing[python_targets_python3_11(-)] ) python_single_target_python3_12? ( dev-python/httplib2[python_targets_python3_12(-)] dev-python/pyparsing[python_targets_python3_12(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 )
 SLOT=0
 SRC_URI=https://calcurse.org/files/calcurse-4.8.1.tar.gz
 _eclasses_=multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	python-single-r1	75118e916668a74c660a13b0ecb22562
-_md5_=42a23862d07d1daafc9002b9720cedbe
+_md5_=a7a86d12ed57b71c09e8ea0b1cbdbd13
diff --git a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2 b/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2
deleted file mode 100644
index cecdef33cee42..0000000000000
--- a/metadata/md5-cache/dev-java/cpptasks-1.0_beta5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/ant-1.10.14:0 dev-java/xerces:2 test? ( >=dev-java/ant-1.10.14:0[junit] dev-java/junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
-DESCRIPTION=Ant-tasks to compile various source languages and produce executables
-EAPI=8
-HOMEPAGE=https://ant-contrib.sourceforge.net/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc examples source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/ant-1.10.14:0 dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/ant-contrib/ant-contrib/cpptasks-1.0-beta5/cpptasks-1.0b5.tar.gz
-_eclasses_=java-utils-2	d2bf348d35fd96d97944269dfbaf0f97	java-pkg-2	b6d755b4f6afabfd933932be28b46368	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc
-_md5_=5013968c2346afd456d5b76b41cd3290
diff --git a/metadata/md5-cache/dev-java/jcalendar-1.4-r1 b/metadata/md5-cache/dev-java/jcalendar-1.4-r1
deleted file mode 100644
index f63cc1fb79f4f..0000000000000
--- a/metadata/md5-cache/dev-java/jcalendar-1.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
-DESCRIPTION=Java date chooser bean for graphically picking a date
-EAPI=8
-HOMEPAGE=https://www.toedter.com/en/jcalendar/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/jgoodies-looks:2.6 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.2
-SRC_URI=https://www.toedter.com/download/jcalendar-1.4.zip
-_eclasses_=java-utils-2	d2bf348d35fd96d97944269dfbaf0f97	java-pkg-2	b6d755b4f6afabfd933932be28b46368	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc
-_md5_=cea34c9f66e014bc4174572339efe672
diff --git a/metadata/md5-cache/dev-java/jdom-1.1.3-r1 b/metadata/md5-cache/dev-java/jdom-1.1.3-r1
deleted file mode 100644
index 79ca9f14c3b63..0000000000000
--- a/metadata/md5-cache/dev-java/jdom-1.1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
-DESCRIPTION=Java API to manipulate XML data
-EAPI=7
-HOMEPAGE=http://www.jdom.org
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc examples source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86
-LICENSE=JDOM
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=http://www.jdom.org/dist/binary/archive/jdom-1.1.3.tar.gz
-_eclasses_=java-utils-2	d2bf348d35fd96d97944269dfbaf0f97	java-pkg-2	b6d755b4f6afabfd933932be28b46368	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc
-_md5_=15279c6eb7b16492a9dae6bc7ef27c76
diff --git a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3 b/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
deleted file mode 100644
index 51bee7ddd3238..0000000000000
--- a/metadata/md5-cache/dev-java/xpp2-2.1.10-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-1.10.14-r2:0 dev-java/javatoolkit
-DESCRIPTION=A streaming pull XML parser used to quickly process input elements
-EAPI=7
-HOMEPAGE=https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=test doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=Apache-1.1 IBM
-RDEPEND=>=virtual/jre-1.8:* dev-java/xerces:2 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-_eclasses_=java-utils-2	d2bf348d35fd96d97944269dfbaf0f97	java-pkg-2	b6d755b4f6afabfd933932be28b46368	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	java-ant-2	d3f6ffc6629499cbc0d4cd71b9d7e7dc
-_md5_=c997da50407e1c5b051225df8e317c3c
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-6.9.2 b/metadata/md5-cache/sys-fs/btrfs-progs-6.9.2
index 05b660cf12648..a84692da6cf07 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-6.9.2
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-6.9.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://btrfs.readthedocs.io/en/latest/
 INHERIT=bash-completion-r1 python-any-r1 udev verify-sig
 IUSE=+convert +man reiserfs static static-libs udev +zstd verify-sig
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= )
 REQUIRED_USE=static? ( !udev )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0
 SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v6.9.2.tar.xz verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v6.9.2.tar.sign )
 _eclasses_=toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	multilib	c19072c3cd7ac5cb21de013f7e9832e0	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-utils-r1	8b220bbce5c119fb1d4d5c2f5588f3ea	python-any-r1	f5169813d1619761b459800587005fd2	udev	eec0bbab06977f1cfc5597269c1fa152	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=162cf4698e701550e14db9129e3668f2
+_md5_=3878b00475159a4a24143701a09d48b5
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 32c4e13298202..1d812332df709 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -4831,7 +4831,7 @@ dev-java/concurrentlinkedhashmap-lru 1.4.2: A high performance version of java.u
 dev-java/conversant-disruptor 1.2.20: Conversant Disruptor - very high throughput Java BlockingQueue
 dev-java/cortado 0.6.0-r2 0.6.0-r3: Multimedia framework for Java written by Fluendo
 dev-java/coursier-bin 2.1.7 2.1.8 2.1.9: Java/Scala artifact fetching, bundling and deploying
-dev-java/cpptasks 1.0_beta5-r2 1.0_beta5-r3: Ant-tasks to compile various source languages and produce executables
+dev-java/cpptasks 1.0_beta5-r3: Ant-tasks to compile various source languages and produce executables
 dev-java/dom4j 2.1.4: flexible XML framework for Java
 dev-java/easymock 2.5.2 3.3.1-r1: Mock Objects for interfaces in JUnit tests by generating them on the fly
 dev-java/eclipse-ecj 4.20 4.26-r2 4.27-r1 4.30-r1 4.31 4.32: Eclipse Compiler for Java
@@ -4930,7 +4930,7 @@ dev-java/jbcrypt 0.4: Java implementation of OpenBSD's Blowfish password hashing
 dev-java/jbig2-imageio 3.0.3: PDFBox JBIG2 ImageIO plugin
 dev-java/jbitcollider-core 0.8-r2: Core classes of jBitcollider: org.bitpedia.collider.core
 dev-java/jboss-jms-api 1.0.1: JSR-000914: Java(TM) Message Service (JMS) 1.1 API
-dev-java/jcalendar 1.4-r1 1.4-r2: Java date chooser bean for graphically picking a date
+dev-java/jcalendar 1.4-r2: Java date chooser bean for graphically picking a date
 dev-java/jchart2d 3.2.2-r1: A minimalistic realtime charting library for Java
 dev-java/jcifs 1.3.19-r2: Library that implements the CIFS/SMB networking protocol in Java
 dev-java/jclasslib 3.1-r1: Java bytecode viewer
@@ -4940,7 +4940,7 @@ dev-java/jdbc-mysql 8.1.0-r1 8.3.0: JDBC Type 4 driver for MySQL
 dev-java/jdbc-postgresql 42.7.3: Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database
 dev-java/jdepend 2.10-r1: Traverses Java class file directories and generates design quality metrics
 dev-java/jdisasm 1.0.6: A disassembler for Java .class files
-dev-java/jdom 1.1.3-r1 1.1.3-r2 2.0.6.1: Java-based solution for accessing, manipulating, and outputting XML data
+dev-java/jdom 1.1.3-r2 2.0.6.1: Java-based solution for accessing, manipulating, and outputting XML data
 dev-java/jeromq 0.5.2: Pure Java implementation of libzmq
 dev-java/jffi 1.3.10: Java Foreign Function Interface
 dev-java/jflex 1.6.1-r2 1.6.1-r3: JFlex is a lexical analyzer generator for Java
@@ -5091,7 +5091,7 @@ dev-java/xmlunit-core 2.9.1: XMLUnit for Java
 dev-java/xmlunit-matchers 2.9.1: XMLUnit for Java Hamcrest Matchers
 dev-java/xmpbox 2.0.27: An open source Java tool that implements Adobe's XMP(TM) specification
 dev-java/xom 1.3.8-r1: XML Object Model
-dev-java/xpp2 2.1.10-r3 2.1.10-r4: A streaming pull XML parser used to quickly process input elements
+dev-java/xpp2 2.1.10-r4: A streaming pull XML parser used to quickly process input elements
 dev-java/xpp3 1.1.4c-r6: An implementation of XMLPULL V1 API
 dev-java/xsdlib 2022.7: XML Schema datatypes library
 dev-java/xz-java 1.9-r2: Implementation of xz data compression in pure java
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 7cbd5a48dc5d0..785b69d2819ec 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 17 Jul 2024 09:49:07 +0000
+Wed, 17 Jul 2024 10:04:14 +0000