6 files changed, 37 insertions, 31 deletions
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 1ff58ac34866..a562b0ced41c 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/abiword-docs-3.0.2 b/metadata/md5-cache/app-office/abiword-docs-3.0.2
deleted file mode 100644
index 5454df6e6842..000000000000
--- a/metadata/md5-cache/app-office/abiword-docs-3.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-office/abiword-3.0.2 >=app-portage/elt-patches-20240116 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Fully featured yet light and fast cross platform word processor documentation
-EAPI=6
-HOMEPAGE=http://www.abisource.com/
-INHERIT=gnome2
-KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-office/abiword-3.0.2
-SLOT=0
-SRC_URI=http://www.abisource.com/downloads/abiword/3.0.2/source/abiword-docs-3.0.2.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	c61c368a76fdf3a82fdf8dbaebea3804	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	libtool	5f49a16f67f81bdf873e3d1f10b10001	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=669fe6682bcc4ecdcf95342f55ae6003
diff --git a/metadata/md5-cache/app-office/abiword-docs-3.0.2-r1 b/metadata/md5-cache/app-office/abiword-docs-3.0.2-r1
new file mode 100644
index 000000000000..0d957db0a08e
--- /dev/null
+++ b/metadata/md5-cache/app-office/abiword-docs-3.0.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20240116 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-office/abiword-3.0.2
+DESCRIPTION=Fully featured yet light and fast cross platform word processor documentation
+EAPI=8
+HOMEPAGE=http://www.abisource.com/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-office/abiword-3.0.2
+SLOT=0
+SRC_URI=http://www.abisource.com/downloads/abiword/3.0.2/source/abiword-docs-3.0.2.tar.gz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=78366b9de262f16392099bb2ea0ca7ec
diff --git a/metadata/md5-cache/app-office/dia-0.97.3-r1 b/metadata/md5-cache/app-office/dia-0.97.3-r1
deleted file mode 100644
index 8421b4b8c003..000000000000
--- a/metadata/md5-cache/app-office/dia-0.97.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=media-libs/freetype-2 >=media-libs/libart_lgpl-2 media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango cairo? ( x11-libs/cairo ) doc? ( app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets ) dev-util/intltool virtual/pkgconfig doc? ( dev-libs/libxslt ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Diagram/flowchart creation program
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Dia
-INHERIT=gnome2
-IUSE=+cairo doc
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=media-libs/freetype-2 >=media-libs/libart_lgpl-2 media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango cairo? ( x11-libs/cairo ) doc? ( app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets )
-SLOT=0
-SRC_URI=mirror://gnome/sources/dia/0.97/dia-0.97.3.tar.xz
-_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	c61c368a76fdf3a82fdf8dbaebea3804	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=6ad51a6b3af3aa0ff1ff412df2e18e5f
diff --git a/metadata/md5-cache/app-office/dia-0.97.3-r2 b/metadata/md5-cache/app-office/dia-0.97.3-r2
new file mode 100644
index 000000000000..4952d3d65959
--- /dev/null
+++ b/metadata/md5-cache/app-office/dia-0.97.3-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig doc? ( dev-libs/libxslt ) >=app-portage/elt-patches-20240116 sys-devel/gnuconfig || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=media-libs/freetype-2 >=media-libs/libart_lgpl-2 media-libs/libpng:= sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango cairo? ( x11-libs/cairo ) doc? ( app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets )
+DESCRIPTION=Diagram/flowchart creation program
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Dia
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2
+IUSE=+cairo doc
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=media-libs/freetype-2 >=media-libs/libart_lgpl-2 media-libs/libpng:= sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango cairo? ( x11-libs/cairo ) doc? ( app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets )
+SLOT=0
+SRC_URI=mirror://gnome/sources/dia/0.97/dia-0.97.3.tar.xz
+_eclasses_=autotools	dc70c1dc473b68317fc4a86f5fbfc57d	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	a397adda6984a4c423e28ac274c1ba98	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=56377b094a583adaafbaa79ead3e1979
diff --git a/metadata/md5-cache/app-office/glabels-3.4.1 b/metadata/md5-cache/app-office/glabels-3.4.1-r1
index 8dcb89c28239..9a4e18f22664 100644
--- a/metadata/md5-cache/app-office/glabels-3.4.1
+++ b/metadata/md5-cache/app-office/glabels-3.4.1-r1
@@ -1,8 +1,10 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/itstool dev-build/gtk-doc-am >=dev-util/intltool-0.28 virtual/pkgconfig >=app-portage/elt-patches-20240116 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.42.0:2 >=x11-libs/gtk+-3.14.0:3 >=dev-libs/libxml2-2.9.0:2 >=gnome-base/librsvg-2.39.0:2 >=x11-libs/cairo-1.14.0 >=x11-libs/pango-1.36.1 barcode? ( >=app-text/barcode-0.98 >=media-gfx/qrencode-3.1 ) eds? ( >=gnome-extra/evolution-data-server-3.12.0:= ) app-text/docbook-xml-dtd:4.1.2 dev-util/itstool dev-build/gtk-doc-am >=dev-util/intltool-0.28 virtual/pkgconfig >=app-portage/elt-patches-20240116 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.42.0:2 >=x11-libs/gtk+-3.14.0:3 >=dev-libs/libxml2-2.9.0:2 >=gnome-base/librsvg-2.39.0:2 >=x11-libs/cairo-1.14.0 >=x11-libs/pango-1.36.1 barcode? ( >=app-text/barcode-0.98 >=media-gfx/qrencode-3.1 ) eds? ( >=gnome-extra/evolution-data-server-3.12.0:= )
 DESCRIPTION=Program for creating labels and business cards
-EAPI=6
+EAPI=8
 HOMEPAGE=https://glabels.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=gnome2
 IUSE=barcode eds
 KEYWORDS=amd64 ~ppc ~sparc x86
@@ -10,5 +12,5 @@ LICENSE=GPL-3+ LGPL-3+ CC-BY-SA-3.0 MIT
 RDEPEND=>=dev-libs/glib-2.42.0:2 >=x11-libs/gtk+-3.14.0:3 >=dev-libs/libxml2-2.9.0:2 >=gnome-base/librsvg-2.39.0:2 >=x11-libs/cairo-1.14.0 >=x11-libs/pango-1.36.1 barcode? ( >=app-text/barcode-0.98 >=media-gfx/qrencode-3.1 ) eds? ( >=gnome-extra/evolution-data-server-3.12.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glabels/3.4/glabels-3.4.1.tar.xz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	c61c368a76fdf3a82fdf8dbaebea3804	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	libtool	5f49a16f67f81bdf873e3d1f10b10001	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=ccc7da798a01d4ce6d1bce125971d045
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=a12650343a5a3852be64c1f9fb9e938c