From 8dd17625671faf6a47abf31d4c96a1e20d764ba5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 20 Feb 2023 02:17:30 +0000
Subject: gentoo auto-resync : 20:02:2023 - 02:17:29

---
 x11-themes/Manifest.gz                             | Bin 21395 -> 21395 bytes
 x11-themes/arc-icon-theme/Manifest                 |   2 +-
 .../arc-icon-theme-20161122-r1.ebuild              |  24 ++++++
 .../arc-icon-theme/arc-icon-theme-20161122.ebuild  |  41 ----------
 x11-themes/commonbox-styles-extra/Manifest         |   2 +-
 .../commonbox-styles-extra-0.2-r2.ebuild           |  28 -------
 .../commonbox-styles-extra-0.2-r3.ebuild           |  30 ++++++++
 x11-themes/commonbox-styles/Manifest               |   2 +-
 .../commonbox-styles-0.6-r1.ebuild                 |  28 +++++++
 .../commonbox-styles/commonbox-styles-0.6.ebuild   |  26 -------
 x11-themes/constantine-backgrounds/Manifest        |   2 +-
 .../constantine-backgrounds-12.1.1.4-r1.ebuild     |  40 ----------
 .../constantine-backgrounds-12.1.1.4-r2.ebuild     |  34 +++++++++
 x11-themes/fvwm-themes/Manifest                    |   2 +-
 x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild |  40 ----------
 x11-themes/fvwm-themes/fvwm-themes-0.7.0-r2.ebuild |  40 ++++++++++
 x11-themes/geany-themes/Manifest                   |   2 +-
 .../geany-themes/geany-themes-1.22.2-r1.ebuild     |  21 ------
 .../geany-themes/geany-themes-1.22.2-r2.ebuild     |  21 ++++++
 x11-themes/gnome-icon-theme-extras/Manifest        |   2 +-
 .../gnome-icon-theme-extras-3.12.0-r1.ebuild       |  36 +++++++++
 .../gnome-icon-theme-extras-3.12.0.ebuild          |  36 ---------
 x11-themes/goddard-backgrounds/Manifest            |   2 +-
 .../goddard-backgrounds-13.0.0.3-r1.ebuild         |  40 ----------
 .../goddard-backgrounds-13.0.0.3-r2.ebuild         |  34 +++++++++
 x11-themes/gtk-chtheme/Manifest                    |   2 +-
 x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild |  39 ----------
 x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r4.ebuild |  40 ++++++++++
 x11-themes/gtk-engines-quartz/Manifest             |   2 +-
 .../gtk-engines-quartz-0.2-r1.ebuild               |  26 +++++++
 .../gtk-engines-quartz-0.2.ebuild                  |  28 -------
 x11-themes/iceicons/Manifest                       |   2 +-
 x11-themes/iceicons/iceicons-0.10.0-r1.ebuild      |  42 -----------
 x11-themes/iceicons/iceicons-0.10.0-r2.ebuild      |  42 +++++++++++
 x11-themes/kfaenza/Manifest                        |   2 +-
 x11-themes/kfaenza/kfaenza-0.8.9-r2.ebuild         |  57 --------------
 x11-themes/kfaenza/kfaenza-0.8.9-r3.ebuild         |  58 ++++++++++++++
 x11-themes/larry-backgrounds/Manifest              |   2 +-
 .../larry-backgrounds-20110822-r1.ebuild           |  83 ---------------------
 .../larry-backgrounds-20110822-r2.ebuild           |  82 ++++++++++++++++++++
 x11-themes/laughlin-backgrounds/Manifest           |   2 +-
 .../laughlin-backgrounds-14.1.0.3-r1.ebuild        |  40 ----------
 .../laughlin-backgrounds-14.1.0.3-r2.ebuild        |  34 +++++++++
 x11-themes/leonidas-backgrounds/Manifest           |   2 +-
 .../leonidas-backgrounds-11.0.0.2-r1.ebuild        |  45 -----------
 .../leonidas-backgrounds-11.0.0.2-r2.ebuild        |  38 ++++++++++
 x11-themes/lovelock-backgrounds/Manifest           |   2 +-
 .../lovelock-backgrounds-14.91.1.1-r1.ebuild       |  32 --------
 .../lovelock-backgrounds-14.91.1.1-r2.ebuild       |  26 +++++++
 49 files changed, 609 insertions(+), 654 deletions(-)
 create mode 100644 x11-themes/arc-icon-theme/arc-icon-theme-20161122-r1.ebuild
 delete mode 100644 x11-themes/arc-icon-theme/arc-icon-theme-20161122.ebuild
 delete mode 100644 x11-themes/commonbox-styles-extra/commonbox-styles-extra-0.2-r2.ebuild
 create mode 100644 x11-themes/commonbox-styles-extra/commonbox-styles-extra-0.2-r3.ebuild
 create mode 100644 x11-themes/commonbox-styles/commonbox-styles-0.6-r1.ebuild
 delete mode 100644 x11-themes/commonbox-styles/commonbox-styles-0.6.ebuild
 delete mode 100644 x11-themes/constantine-backgrounds/constantine-backgrounds-12.1.1.4-r1.ebuild
 create mode 100644 x11-themes/constantine-backgrounds/constantine-backgrounds-12.1.1.4-r2.ebuild
 delete mode 100644 x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
 create mode 100644 x11-themes/fvwm-themes/fvwm-themes-0.7.0-r2.ebuild
 delete mode 100644 x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild
 create mode 100644 x11-themes/geany-themes/geany-themes-1.22.2-r2.ebuild
 create mode 100644 x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.12.0-r1.ebuild
 delete mode 100644 x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.12.0.ebuild
 delete mode 100644 x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r1.ebuild
 create mode 100644 x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r2.ebuild
 delete mode 100644 x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
 create mode 100644 x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r4.ebuild
 create mode 100644 x11-themes/gtk-engines-quartz/gtk-engines-quartz-0.2-r1.ebuild
 delete mode 100644 x11-themes/gtk-engines-quartz/gtk-engines-quartz-0.2.ebuild
 delete mode 100644 x11-themes/iceicons/iceicons-0.10.0-r1.ebuild
 create mode 100644 x11-themes/iceicons/iceicons-0.10.0-r2.ebuild
 delete mode 100644 x11-themes/kfaenza/kfaenza-0.8.9-r2.ebuild
 create mode 100644 x11-themes/kfaenza/kfaenza-0.8.9-r3.ebuild
 delete mode 100644 x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild
 create mode 100644 x11-themes/larry-backgrounds/larry-backgrounds-20110822-r2.ebuild
 delete mode 100644 x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r1.ebuild
 create mode 100644 x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r2.ebuild
 delete mode 100644 x11-themes/leonidas-backgrounds/leonidas-backgrounds-11.0.0.2-r1.ebuild
 create mode 100644 x11-themes/leonidas-backgrounds/leonidas-backgrounds-11.0.0.2-r2.ebuild
 delete mode 100644 x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1-r1.ebuild
 create mode 100644 x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1-r2.ebuild

(limited to 'x11-themes')

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 7f0ebd8e1538..2b274e5aaf91 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/arc-icon-theme/Manifest b/x11-themes/arc-icon-theme/Manifest
index 19a631d926c3..d3b2ee451a70 100644
--- a/x11-themes/arc-icon-theme/Manifest
+++ b/x11-themes/arc-icon-theme/Manifest
@@ -1,3 +1,3 @@
 DIST arc-icon-theme-20161122.tar.gz 5033333 BLAKE2B 844a6a0979cbffaf08f32ddbb4c8b7f2be9e514b3174771ea2b0872d78b256d824994ff285f5ed5181b82b96930d9f23caa5f2e8b39d438b33c77c6101887c18 SHA512 5d0f1417358eb81994868949acefe146537d8f3cc2fd7f529f9e6ba9c264845e50962f94427bac1262a76d3ca98d05795819d7c4a6ecd3139b0b57a6e9fdfad1
-EBUILD arc-icon-theme-20161122.ebuild 828 BLAKE2B 118a626322d70ffde228724b7c1334b414d70a9cea1527a1cf035cf1f57e736009d5d58d29910943b1197ac7bf9a8481973eb46f2deb03ad6d5ea6e08aac33f1 SHA512 a89510df14c67036d396f75d32f05d5e304150ec9501f03a4a671708302f9a565dc583f57273f66efb8221e27bd17b1565340840da1d73f096a88b82def6ef35
+EBUILD arc-icon-theme-20161122-r1.ebuild 666 BLAKE2B 38cc21fb76919f06baf91c9384cf89a36152cf7315d8f4a025b6dee8c4be188a499ba2e4f9bcf25b0be9d29c7029f04f156955ff98fa53fe695b3b0c66577a86 SHA512 c94e7a26ef4c94f953d2a5d37ab60fc309141fd801c7e42e2d77136b3384c496c2715008b673a5fbdee3c2d728bde1ab7e6486ce1dd681507e4f0bfa592e3789
 MISC metadata.xml 353 BLAKE2B 6b394bc6955e3999fd87b170c35a76aa87b9011b91d144c98cacba67108bea144bd1ae2777d9a2f8115f3545c90c91bf0771134eefe508fa5a87d3f7aff8a098 SHA512 3c860be081df95ed83ad13297ccbd5a6219cb8efad756f46008dde614d14b7d2b017d3f3d4b46b5056aedf543854ad5770b4e8726dbd7fff60bc56985b92ec47
diff --git a/x11-themes/arc-icon-theme/arc-icon-theme-20161122-r1.ebuild b/x11-themes/arc-icon-theme/arc-icon-theme-20161122-r1.ebuild
new file mode 100644
index 000000000000..3b272fe61bdc
--- /dev/null
+++ b/x11-themes/arc-icon-theme/arc-icon-theme-20161122-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg
+
+DESCRIPTION="Vertex icon theme"
+HOMEPAGE="https://github.com/horst3180/arc-icon-theme"
+SRC_URI="https://github.com/horst3180/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+# Require adwaita until moka is packaged
+RDEPEND="x11-themes/adwaita-icon-theme"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/x11-themes/arc-icon-theme/arc-icon-theme-20161122.ebuild b/x11-themes/arc-icon-theme/arc-icon-theme-20161122.ebuild
deleted file mode 100644
index e2090d55a9f7..000000000000
--- a/x11-themes/arc-icon-theme/arc-icon-theme-20161122.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils
-
-DESCRIPTION="Vertex icon theme"
-HOMEPAGE="https://github.com/horst3180/arc-icon-theme"
-SRC_URI="https://github.com/horst3180/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-# Require adwaita until moka is packaged
-RDEPEND="
-	x11-themes/adwaita-icon-theme
-"
-DEPEND=""
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-themes/commonbox-styles-extra/Manifest b/x11-themes/commonbox-styles-extra/Manifest
index ba1f65afeefa..1adb14a3825e 100644
--- a/x11-themes/commonbox-styles-extra/Manifest
+++ b/x11-themes/commonbox-styles-extra/Manifest
@@ -1,3 +1,3 @@
 DIST commonbox-styles-extra-0.2.tar.bz2 8155158 BLAKE2B 80f4d299c6e805a637996372675087092f900035d10c683e1e26958a4cdc7a34708a10e1319058f98401ca4b9db3c00be132a8de32f60e8d72ee8b3cf10e4c4b SHA512 4c6408231037b327ec96e4345c84282476ef8ccb8b048769c0b80c22c65941aa3832fe7ada0a0701e876d305156c1eddcc9b19e903a94454a7b4fcf281d04b45
-EBUILD commonbox-styles-extra-0.2-r2.ebuild 693 BLAKE2B 1ca5959ee2850e7e8790760af7a74f52187450faa9b1db260da11af3df8ef07fa60475b380ab3862981f36e887840b8501386d8861cb7d517bac55a9c3629fd4 SHA512 9e301fffaac30c62dccc38a7c7e13baf4006db0bb3b8f8f4252e46e554db8c235ed2280bbb5dd75abe0daa45980f68aff9cc5ee7830f84937a745ff44ef3955f
+EBUILD commonbox-styles-extra-0.2-r3.ebuild 632 BLAKE2B 591ff9c4af352bfc8666e6725c3595c807060040b60f7e1859d2a425100c0d63b5a07a6b295e0dddb6c054c66bb43284338a37e49dd6bc4af4bdba929fb506c1 SHA512 d662febcc567d2e5fbd71e4d10192a116a05f570e8d6dd34b7d1da0f2eab9c15673db27590deb0ed1a73e4897e119adb8ad07a818dcb1e3ac6bfcc3f3a3b7f81
 MISC metadata.xml 166 BLAKE2B d722eb15953d598289863849a29a7cb30aee8bb377f28eadd4f9832c86a3908f238f05351aa4ca511ef0b6bf1e486c5b3cd83eff62940c82f4c28c199a739792 SHA512 04043d591dec13326c96e2d223af0875732a0a030f1cd100330f810b82ef655484eee2143831aaf7370f38f767741cc284eaa875d965b7198e72218b23ab378a
diff --git a/x11-themes/commonbox-styles-extra/commonbox-styles-extra-0.2-r2.ebuild b/x11-themes/commonbox-styles-extra/commonbox-styles-extra-0.2-r2.ebuild
deleted file mode 100644
index f29445b713dc..000000000000
--- a/x11-themes/commonbox-styles-extra/commonbox-styles-extra-0.2-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Extra styles pack for flux|black|open(box)"
-HOMEPAGE="http://mkeadle.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://mkeadle.org/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-# xv is there so *box can convert backgrounds/textures to use
-RDEPEND="media-gfx/xv
-	|| ( x11-wm/fluxbox x11-wm/blackbox x11-wm/openbox )"
-
-src_install() {
-	insinto /usr/share/commonbox/styles
-	doins -r styles/.
-
-	insinto /usr/share/commonbox/backgrounds
-	doins -r backgrounds/.
-
-	dodoc README.commonbox-styles-extra
-}
diff --git a/x11-themes/commonbox-styles-extra/commonbox-styles-extra-0.2-r3.ebuild b/x11-themes/commonbox-styles-extra/commonbox-styles-extra-0.2-r3.ebuild
new file mode 100644
index 000000000000..ee7fa679b98a
--- /dev/null
+++ b/x11-themes/commonbox-styles-extra/commonbox-styles-extra-0.2-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Extra styles pack for flux|black|open(box)"
+HOMEPAGE="http://mkeadle.org/"
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
+	http://mkeadle.org/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+
+# xv is there so *box can convert backgrounds/textures to use
+RDEPEND="
+	media-gfx/xv
+	|| (
+		x11-wm/fluxbox
+		x11-wm/blackbox
+		x11-wm/openbox
+	)"
+
+src_install() {
+	insinto /usr/share/commonbox
+	doins -r backgrounds styles
+
+	dodoc README.commonbox-styles-extra
+}
diff --git a/x11-themes/commonbox-styles/Manifest b/x11-themes/commonbox-styles/Manifest
index 485537af42a0..9e2c8aaea0d7 100644
--- a/x11-themes/commonbox-styles/Manifest
+++ b/x11-themes/commonbox-styles/Manifest
@@ -1,3 +1,3 @@
 DIST commonbox-styles-0.6.tar.bz2 106381 BLAKE2B 4aedfb2d149d1a1b95322eb82a4ecc91decce0364edc850933f7cefb6ecccf7f4b9912b17da55f719795f330e00a3a147bd3d527c1e90842df631724e1532f3c SHA512 fff627e62cca21f44a98579ebdaf45f6c6391be3e846fd20ec261a4d147ba1524d13add7bb830d529728ad59c16f52c28a4cd0471b2d62b98e6f9c08f51304d1
-EBUILD commonbox-styles-0.6.ebuild 657 BLAKE2B b116a8ce75c64bb77ad6482463f406a1a532b3218f0ff4cda49485c296741146a47205e0a08d387d6422df12407ef0e6b21e0ff63f48e853aaff85fbc5dc3403 SHA512 1b213a8139a4e20d47a6acb5196f953b7b2b798cc7660ea685928c0adb262ecda00bba6ab28a732316842bb7455e2481ed1aa49e57ad15f6c26a4dd54fb59a40
+EBUILD commonbox-styles-0.6-r1.ebuild 587 BLAKE2B df8b0a35fed3fb051a867c803229121570f1e997aa623af648769ad742bf80e743197b2f3b633cd1cf180fd345980dc814eeb45c698ca22f435341c6cbf78daa SHA512 734dda5929953693607b837d0736ee3f6a021ce83bf5cbcac70501c735115ae66bc29ee7f0391f56b05ce7d236ffd742d85a87aa669092de40dcb6c3dec558b9
 MISC metadata.xml 166 BLAKE2B d722eb15953d598289863849a29a7cb30aee8bb377f28eadd4f9832c86a3908f238f05351aa4ca511ef0b6bf1e486c5b3cd83eff62940c82f4c28c199a739792 SHA512 04043d591dec13326c96e2d223af0875732a0a030f1cd100330f810b82ef655484eee2143831aaf7370f38f767741cc284eaa875d965b7198e72218b23ab378a
diff --git a/x11-themes/commonbox-styles/commonbox-styles-0.6-r1.ebuild b/x11-themes/commonbox-styles/commonbox-styles-0.6-r1.ebuild
new file mode 100644
index 000000000000..f4779a3e9522
--- /dev/null
+++ b/x11-themes/commonbox-styles/commonbox-styles-0.6-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Common styles for fluxbox, blackbox, and openbox"
+HOMEPAGE="http://mkeadle.org/distfiles/"
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
+	http://mkeadle.org/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+
+RDEPEND="
+	|| (
+		x11-wm/fluxbox
+		x11-wm/blackbox
+		x11-wm/openbox
+	)"
+
+src_install() {
+	insinto /usr/share/commonbox
+	doins -r backgrounds styles
+
+	dodoc README.commonbox-styles STYLES.authors
+}
diff --git a/x11-themes/commonbox-styles/commonbox-styles-0.6.ebuild b/x11-themes/commonbox-styles/commonbox-styles-0.6.ebuild
deleted file mode 100644
index c487885dc7c1..000000000000
--- a/x11-themes/commonbox-styles/commonbox-styles-0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Common styles for fluxbox, blackbox, and openbox"
-HOMEPAGE="http://mkeadle.org/distfiles/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://mkeadle.org/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="|| ( x11-wm/fluxbox x11-wm/blackbox x11-wm/openbox )"
-
-src_install() {
-	insinto /usr/share/commonbox/backgrounds
-	doins "${S}"/backgrounds/*
-
-	insinto /usr/share/commonbox/styles
-	doins "${S}"/styles/*
-
-	dodoc README.commonbox-styles STYLES.authors
-}
diff --git a/x11-themes/constantine-backgrounds/Manifest b/x11-themes/constantine-backgrounds/Manifest
index 9517f9fd5430..78720b2899fa 100644
--- a/x11-themes/constantine-backgrounds/Manifest
+++ b/x11-themes/constantine-backgrounds/Manifest
@@ -1,3 +1,3 @@
 DIST constantine-backgrounds-12.1.1-4.fc15.src.rpm 63652663 BLAKE2B d23f7b8695151944579ce7120bff29eb6830a595f64592fc2464918fb8109058eb300c51c33dfeee433cb8711415d2c046d82d38f6db492557165f9f33861f68 SHA512 e8b4f065cafe984f6dd36ce9ab027249ffeb312240e0036aa3b8662d67b510fe5ccfeafb836f0e61b302308d898936b17e7e0bccac978d64f0aec127b7715fad
-EBUILD constantine-backgrounds-12.1.1.4-r1.ebuild 876 BLAKE2B ca74956c0655457ec7c30dfce3a3895c18ab2cd1d83a903b40bc49ae34ec09b0a3ef8fad0866442c7dcbeb59c173b1e2e7d6ed0894d42e678671e187b8e6daa0 SHA512 0da57c823e36d2527a4e1b96816e231755a4ee24ca5abc386cf526568168690efa0ff628f3d446b3449ff239815715e02c2601e9b1c8cafd01e59ec18dc8797f
+EBUILD constantine-backgrounds-12.1.1.4-r2.ebuild 754 BLAKE2B e6a470fbec4aee95d111493b11da5971e471dc28ebdaf072de2458909c3fa3dca9cee145981d5715e03a3809d3785d5f7ced3268b9198a865905c85648fefb72 SHA512 7db62cfebd3fbf26819c050a0593fdd7de8ad6cdadbd4ef2bc67b9aa6b9e97ad01f5e1d92c93e0ee701f263249ad1072919871e1ef62256f055b3cd87ac9d122
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-themes/constantine-backgrounds/constantine-backgrounds-12.1.1.4-r1.ebuild b/x11-themes/constantine-backgrounds/constantine-backgrounds-12.1.1.4-r1.ebuild
deleted file mode 100644
index e834d7ac6ba4..000000000000
--- a/x11-themes/constantine-backgrounds/constantine-backgrounds-12.1.1.4-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm versionator
-
-SRC_PATH=development/15/source/SRPMS
-FEDORA=15
-MY_P="${PN}-$(get_version_component_range 1-3)"
-
-DESCRIPTION="Fedora 12 official background artwork"
-HOMEPAGE="https://fedoraproject.org/wiki/F12_Artwork"
-SRC_URI="https://archives.fedoraproject.org/pub/archive/fedora/linux/${SRC_PATH}/${PN}-$(replace_version_separator 3 -).fc${FEDORA}.src.rpm"
-
-LICENSE="CC-BY-SA-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	rpm_src_unpack
-
-	# as of 2017-07-28 rpm.eclass does not unpack the further lzma
-	# file automatically.
-	unpack ./${MY_P}.tar.lzma
-}
-
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	# The install targets are serial anyway.
-	emake -j1 DESTDIR="${D}" install
-}
diff --git a/x11-themes/constantine-backgrounds/constantine-backgrounds-12.1.1.4-r2.ebuild b/x11-themes/constantine-backgrounds/constantine-backgrounds-12.1.1.4-r2.ebuild
new file mode 100644
index 000000000000..54fad80ba489
--- /dev/null
+++ b/x11-themes/constantine-backgrounds/constantine-backgrounds-12.1.1.4-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rpm
+
+MY_P="${PN}-$(ver_cut 1-3)"
+
+DESCRIPTION="Fedora 12 official background artwork"
+HOMEPAGE="https://fedoraproject.org/wiki/F12_Artwork"
+SRC_URI="https://archives.fedoraproject.org/pub/archive/fedora/linux/development/15/source/SRPMS/${PN}-$(ver_rs 3 -).fc15.src.rpm"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CC-BY-SA-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+src_unpack() {
+	rpm_src_unpack
+
+	# as of 2017-07-28 rpm.eclass does not unpack the further lzma
+	# file automatically.
+	unpack ./${MY_P}.tar.lzma
+}
+
+src_compile() { :; }
+
+src_test() { :; }
+
+src_install() {
+	# The install targets are serial anyway.
+	emake -j1 DESTDIR="${D}" install
+}
diff --git a/x11-themes/fvwm-themes/Manifest b/x11-themes/fvwm-themes/Manifest
index 6d2a45158572..b0a7583fd67f 100644
--- a/x11-themes/fvwm-themes/Manifest
+++ b/x11-themes/fvwm-themes/Manifest
@@ -1,5 +1,5 @@
 AUX fvwm-themes-0.7.0-gentoo.patch 906 BLAKE2B e4da518c0c0e9f2a3cf757b26c2cb1013a78cb7b6e81c0d9085cac1c68bf23c4ba4361d92b9cc5835a41a5501e330428ae6b5bc0d5689bbb28a8da6a0806f24a SHA512 cfd9281e4706962425f229cf596cd3cd898e501d2503e5e688e75541438db21f3febe54225a20df246d06d78d602ff3dfbf173e0c89a858d033247656a9af459
 AUX fvwm-themes-0.7.0-posix-sort.patch 356 BLAKE2B 42f0cccef7f54e57716d16fecd8ce195fb4b50029764778409c5e66fdd8829040fde705d637970fb423a00b958a5cd6e67891895516147b24d6a3a24a43e4ccd SHA512 e74a9aadc925c752cdc863312451d4a539f493e20a858d5cf163e518cbd068f7f6eb266dc8b42e21ff1b2e5dd156e86012b66856ad79a585a3e8182eb7db951b
 DIST fvwm-themes-0.7.0.tar.bz2 921517 BLAKE2B e8011b0677bd0a7bcc4f5141bc0ec17cab20f49fc2bf7932760b8a12d3ddc0a4a3324124eef02152508be40ebae20be58f485e223ce9622beaacf2c50cf8fea2 SHA512 38b14412bf3b9b59f8a001b628c384687daa8c26c8aaff258a0fcedde7fd8c5bb3fbd7cfb083dfa46b7ff1ae2ace652727a1faf96815bc5074d8134cd073e608
-EBUILD fvwm-themes-0.7.0-r1.ebuild 901 BLAKE2B cbe68544c3a765712efbe8d15ba8a276c052f18c692d21384be722ac054110ec2172d74a98e886918f1017ab38b8c89881b4b410f5872af7397e905e22b19c02 SHA512 0db7c662c223f55642b8595589d9390acdbf11a9986fc0d417e8601950477abe046a61d0b9c1623343dc4a0eecf3b42103e43c900601069b37bad97756c218f2
+EBUILD fvwm-themes-0.7.0-r2.ebuild 845 BLAKE2B 8614dd7bcaa21be4279766f45c145273ab70f1c26a47909a800f95788e4ee5f33524076c825b71a59f7a0eb2a45db66a11e9ac7ea5915d5f82cc087f166dabfe SHA512 6108e77f4b7e59eec9db6bda93c37bd6ab4dd8ae94ffd38b7547a0242beecb3f6c7a31b110edf0f8463ff2e6639c6d7547d27baf7830dc72d8b010f3c4c72813
 MISC metadata.xml 249 BLAKE2B dbc285bbc2a8b0b548e1297ff182dda4ed31be9356d62ee606c1747e4e90bb2492fe2cd682fdebc3d88e0f07d3328013587debd633c3bce621a4e0422f4f47d4 SHA512 20a2f4c34d8593a122540afa16fa150e7efd7b5f7a845cf229163f5c1581fca1a34fcdecc59d8509ce1cbb98a5dc93c78099b6a463fbfcffb3bec1804a8c062e
diff --git a/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
deleted file mode 100644
index 3408eb54f1d6..000000000000
--- a/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A configuration framework for the fvwm window manager"
-HOMEPAGE="http://fvwm-themes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="gnome"
-
-RDEPEND=">=x11-wm/fvwm-2.6.2"
-DEPEND="${RDEPEND}
-	gnome? ( virtual/imagemagick-tools )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gentoo.patch"
-	"${FILESDIR}/${P}-posix-sort.patch"
-)
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die "moving configure.in failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable gnome gnome-icons)
-}
-
-pkg_postinst() {
-	fvwm-themes-config --site --reset
-	fvwm-themes-menuapp --site --build-menus --remove-popup
-
-	use gnome && fvwm-themes-images --ft-install --gnome
-}
diff --git a/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r2.ebuild b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r2.ebuild
new file mode 100644
index 000000000000..9935fc153819
--- /dev/null
+++ b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A configuration framework for the fvwm window manager"
+HOMEPAGE="http://fvwm-themes.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE="gnome"
+
+RDEPEND=">=x11-wm/fvwm-2.6.2"
+DEPEND="${RDEPEND}"
+BDEPEND="gnome? ( virtual/imagemagick-tools )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-posix-sort.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable gnome gnome-icons)
+}
+
+pkg_postinst() {
+	fvwm-themes-config --site --reset
+	fvwm-themes-menuapp --site --build-menus --remove-popup
+
+	use gnome && fvwm-themes-images --ft-install --gnome
+}
diff --git a/x11-themes/geany-themes/Manifest b/x11-themes/geany-themes/Manifest
index 9aafdd61051b..dc065688473a 100644
--- a/x11-themes/geany-themes/Manifest
+++ b/x11-themes/geany-themes/Manifest
@@ -1,3 +1,3 @@
 DIST geany-themes-1.22.2.tar.bz2 14694 BLAKE2B 2cac3e3170bdeb04d727574f5285da89c8a915a681e0fcebbd8217d2314c00d681b3113fa5ed8e00f0454c99725688a92350ecc9b2a7859d029914f940fb4eb3 SHA512 3759c687a06a7f933e40fde5c52dc10c36eebeb799a5c471c5ee31598f8c32496b1a3f326342494e33ae209bed66420147f85ebdbce771af2f27b0151dca9c84
-EBUILD geany-themes-1.22.2-r1.ebuild 480 BLAKE2B 448a9e2b8d290d7df7acc539e9b5a218a3f12acdcd5dddfd71c90f34b53e401edeb948a42a113c37359302cccde49214fb5c61725507a67b88285f687f1d8a63 SHA512 8f48b33e52b9071cfa4c0aa612549166a22b8a8291e890ac6c1f24e0aa1097f79d904240511ee952e6c6d12b0835524e4d17faa819dbbe61fd6d7a6a366e7168
+EBUILD geany-themes-1.22.2-r2.ebuild 473 BLAKE2B a279dc122293a42fe140b13cb04ca1325d5916c266adcc578677a70da118c1c060ff8408d3ec09d5e9dc9bdc10cf0cf977615af2db63e0c7e62cb4dcdb226366 SHA512 9b3b37892143c0656aa9556a7e22a9a5fced88a6ded9a3d20f497c7009eca01a44316efe431999282669b19cd787be430db74a1e54705079c48db2207070b03b
 MISC metadata.xml 256 BLAKE2B cea95bd275c393247f6fbaba91a1f887d2b5ca74ed4eac16e76dae81bb37f4135dad1d6ff5ef9dc4b3076e2a89611d58e82e07798d97d60677f98a7a0af916da SHA512 c45b7e976f3298fd4a4e72911f5db44feb23200d731884d0d1b5f1b046c485a5472f48041b4a4242609783718192beacc751bca4072533ec3c64051e3689cfd3
diff --git a/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild b/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild
deleted file mode 100644
index 3184f258c379..000000000000
--- a/x11-themes/geany-themes/geany-themes-1.22.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A collection of colour schemes for Geany"
-HOMEPAGE="https://github.com/codebrainz/geany-themes"
-SRC_URI="https://github.com/downloads/codebrainz/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1 BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-util/geany-${PV:0:4}"
-
-src_install() {
-	default
-	insinto /usr/share/geany
-	doins -r colorschemes
-}
diff --git a/x11-themes/geany-themes/geany-themes-1.22.2-r2.ebuild b/x11-themes/geany-themes/geany-themes-1.22.2-r2.ebuild
new file mode 100644
index 000000000000..a1e4a0ac636f
--- /dev/null
+++ b/x11-themes/geany-themes/geany-themes-1.22.2-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A collection of colour schemes for Geany"
+HOMEPAGE="https://github.com/codebrainz/geany-themes"
+SRC_URI="https://github.com/downloads/codebrainz/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-2.1 BSD-2 MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=dev-util/geany-${PV:0:4}"
+
+src_install() {
+	default
+
+	insinto /usr/share/geany
+	doins -r colorschemes
+}
diff --git a/x11-themes/gnome-icon-theme-extras/Manifest b/x11-themes/gnome-icon-theme-extras/Manifest
index f652b8ee0794..4277d3ec5736 100644
--- a/x11-themes/gnome-icon-theme-extras/Manifest
+++ b/x11-themes/gnome-icon-theme-extras/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-icon-theme-extras-3.12.0.tar.xz 1729576 BLAKE2B 48035e7094e3832a1d355867668c535c2aed691e3d3633963b7811cd49cddbbc08e15981df8b3f6f93ce8c66facb8a1ee04227dfa24788d6971bcdc6a4f5a277 SHA512 e74b1b31cdc6bc2d9410c874b8e0891521a657cd3cc86c391f58709fa2d35d9e983bd50faaca1f1378a11d716502143bc2b41942a9cdcd3caa2280429bb3f6f5
-EBUILD gnome-icon-theme-extras-3.12.0.ebuild 918 BLAKE2B 810935f57071210f2d82267d56a9af5f93e46693ff130225d0c73060ea9ecb1f89fc794dd788490668a0f8e199a27cfb6c597e963c034419638e51a7ea52469f SHA512 f697ce7e125beeaf368fd9777ab633264d562a6f09d573af58ec9f923fbca98de016ab9a1187efa1a4a0622620ac03c1b7367f4defecc912537a56773d6efc66
+EBUILD gnome-icon-theme-extras-3.12.0-r1.ebuild 913 BLAKE2B c0370e7e352b72439b32b6d06796bd354594e1c0722f200e31fecd3c7761f465ed88e93b723ede578d66339dae8718e7ad290f5a8fd56f9cf623a07cb132cd82 SHA512 e5313116b186ee6ccfc43ec35425ed73195690517f227f680f491ffc0cb3fd6bc41c781d40c883ede6c73f58b96cfce276caa990ac4af4f4f369487e047b40c2
 MISC metadata.xml 366 BLAKE2B 057515bcc6b9d62579c883cbe6822842352f1c5b411f52dabf48a1a858365c518d9e5b3019faf0133fc5c477c036e8fad46cff6336ce7c4277702b8eca77d737 SHA512 7ffbbe5fe11a79929c34ff861eab90a7f99f0ba5cc0b52e4939d538392cc1963d104f30281b6e7d4f4d631263f8b52e177668be88fd876681f7eddf8898f923c
diff --git a/x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.12.0-r1.ebuild b/x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.12.0-r1.ebuild
new file mode 100644
index 000000000000..a69ee7906e43
--- /dev/null
+++ b/x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.12.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+DESCRIPTION="Extra GNOME icons for specific devices and file types"
+HOMEPAGE="https://gitlab.gnome.org/Archive/gnome-icon-theme-extras"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+RDEPEND=">=x11-themes/hicolor-icon-theme-0.10"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	x11-misc/icon-naming-utils
+	virtual/pkgconfig"
+
+# FIXME: double check potential LINGUAS problem
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Always use pre-rendered icons
+	# FIXME: changing configure.ac triggers maintainer-mode rebuild
+	sed -e 's/"x$allow_rendering" = "xyes"/"x$allow_rendering" = "xdonotwant"/' \
+		-i configure || die
+}
+
+src_configure() {
+	gnome2_src_configure --enable-icon-mapping
+}
diff --git a/x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.12.0.ebuild b/x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.12.0.ebuild
deleted file mode 100644
index d2ba5a9fa725..000000000000
--- a/x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.12.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Extra GNOME icons for specific devices and file types"
-HOMEPAGE="https://gitlab.gnome.org/Archive/gnome-icon-theme-extras"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-themes/hicolor-icon-theme-0.10"
-DEPEND="${RDEPEND}
-	>=x11-misc/icon-naming-utils-0.8.7
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-# FIXME: double check potential LINGUAS problem
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Always use pre-rendered icons
-	# FIXME: changing configure.ac triggers maintainer-mode rebuild
-	sed -e 's/"x$allow_rendering" = "xyes"/"x$allow_rendering" = "xdonotwant"/' \
-		-i configure || die
-}
-
-src_configure() {
-	gnome2_src_configure --enable-icon-mapping
-}
diff --git a/x11-themes/goddard-backgrounds/Manifest b/x11-themes/goddard-backgrounds/Manifest
index 90e5fb6d32dc..71c5569fc104 100644
--- a/x11-themes/goddard-backgrounds/Manifest
+++ b/x11-themes/goddard-backgrounds/Manifest
@@ -1,3 +1,3 @@
 DIST goddard-backgrounds-13.0.0-3.fc15.src.rpm 3741339 BLAKE2B 592dcbdc548eee6d13fa31e7747d10e38fbdffe3afbdb4bdc5417908f11114f4b28db3387b4e9ab0a98a9d66571f522182486ff2ac7a018a7171375eb048cf79 SHA512 39ed95d1f00bf9c9fc351f5b335a3db22f4438dbf2a66559b1afcdd2c663821696f820e6f19e907aa2a2efd67bf49f154a68d2967dac8eec4c4ce1a19ad109df
-EBUILD goddard-backgrounds-13.0.0.3-r1.ebuild 873 BLAKE2B d5d940c2e63565c02c09b68ec9bd9217b684b4607c856128b45c536e101eabf535abc493f534f6c4d91d020a3ac1b8024b943ee8cbbf95f2b3630825b82e7cf3 SHA512 56d1779bf38d4fc626d00d25f37976224b71463885752effd628cd327dd8b175bd2a0a4ffba140d0dd2cba4ee06b347b343a2578347e01ad80d368a8adf20eee
+EBUILD goddard-backgrounds-13.0.0.3-r2.ebuild 754 BLAKE2B 78c5493adb2798e82bbdefbf8b33ef2d6567341657c328453b4f1f06a20a69fb8d48159567e509fd5bd9683b0142c8434e9451b22224f0b9cbdcec89158d60f1 SHA512 688a482d881fdb7d8b58c1b016c906fbb9a8a5aa60dcf78f7d7d9f52d0fb5efea7aaeb9e5747e7e2b11ac7913fe9d1817d563b55dc49bf65a35c0c9828dc5b7c
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r1.ebuild b/x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r1.ebuild
deleted file mode 100644
index d2d15d28bf0f..000000000000
--- a/x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm versionator
-
-SRC_PATH=development/15/source/SRPMS
-FEDORA=15
-MY_P="${PN}-$(get_version_component_range 1-3)"
-
-DESCRIPTION="Fedora 13 official background artwork"
-HOMEPAGE="https://fedoraproject.org/wiki/F13_Artwork"
-SRC_URI="https://archives.fedoraproject.org/pub/archive/fedora/linux/${SRC_PATH}/${PN}-$(replace_version_separator 3 -).fc${FEDORA}.src.rpm"
-
-LICENSE="CC-BY-SA-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	rpm_src_unpack
-
-	# as of 2017-07-28 rpm.eclass does not unpack the further lzma
-	# file automatically.
-	unpack ./${MY_P}.tar.lzma
-}
-
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	# The install targets are serial anyway.
-	emake -j1 DESTDIR="${D}" install
-}
diff --git a/x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r2.ebuild b/x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r2.ebuild
new file mode 100644
index 000000000000..826ea81b3879
--- /dev/null
+++ b/x11-themes/goddard-backgrounds/goddard-backgrounds-13.0.0.3-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rpm
+
+MY_P="${PN}-$(ver_cut 1-3)"
+
+DESCRIPTION="Fedora 13 official background artwork"
+HOMEPAGE="https://fedoraproject.org/wiki/F13_Artwork"
+SRC_URI="https://archives.fedoraproject.org/pub/archive/fedora/linux/development/15/source/SRPMS/${PN}-$(ver_rs 3 -).fc15.src.rpm"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CC-BY-SA-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+src_unpack() {
+	rpm_src_unpack
+
+	# as of 2017-07-28 rpm.eclass does not unpack the further lzma
+	# file automatically.
+	unpack ./${MY_P}.tar.lzma
+}
+
+src_compile() { :; }
+
+src_test() { :; }
+
+src_install() {
+	# The install targets are serial anyway.
+	emake -j1 DESTDIR="${D}" install
+}
diff --git a/x11-themes/gtk-chtheme/Manifest b/x11-themes/gtk-chtheme/Manifest
index d1f592eae866..efcc1b0e774a 100644
--- a/x11-themes/gtk-chtheme/Manifest
+++ b/x11-themes/gtk-chtheme/Manifest
@@ -2,5 +2,5 @@ AUX gtk-chtheme-0.3.1-asneeded.patch 726 BLAKE2B 378d9a3615a814904830c5b1104f547
 AUX gtk-chtheme-0.3.1-implicit.patch 364 BLAKE2B fafbaf600fc40590e4d697a11e53bf66a968f9655d0114079ee3b4f4779aa4d01ca7e76f7b20c61e52fdf7d1c0533057b44b6448e02a0d8d7902013461b64e5c SHA512 642573a4ef8a73f303a62cd84b7b778de2abb8472bf9fbcb22b74f6b5a5af37a8ce023c245713957c18c3081d113c82bc2f28d22b7b08fc872e049116a3f51a8
 AUX gtk-chtheme-0.3.1-qgtkstyle.patch 484 BLAKE2B 4138c7f0c7b7f7256db7a334381002bd7c90b9a715d5a59fa5f05773299fc14ad3bd9b6dbda9e3e95ec0a98d9386036ab705fddbe93ac122cad01de4c6abd360 SHA512 8a3ce1278155dfa61e69fb639829b652d21dd0946578c6ac0e371cae2e54ea2834cbd15c7124fc02fd2839feda29184b41cd45205d0b56c368435cb1fdfbd1d7
 DIST gtk-chtheme-0.3.1.tar.bz2 18205 BLAKE2B 628f10656be4560c476b74b4c1379a4bafd1cc6a6593852bdce352919663fa10519494ca5cac3f920b036bc7a06f045488635bce91148ebc94613aae1ecb8d3d SHA512 162cdafe81294621f43c5aab550d6bda08a07f9f23456b82d9e885b677ed9e56ee6f602c86ce5b6f2dac5bab91a09d9e97bb07e59c9a393867410bcdcff375dd
-EBUILD gtk-chtheme-0.3.1-r3.ebuild 903 BLAKE2B bc5f730b113c438f4fc6288331ec6b5d18e94e0d04215af03fcc871bb2cebf9efca24fb80a2207e345aff406dc23fd24602fe5732b0d25b4c5d472eb3c13a804 SHA512 9a0ec35cdb9e3586b7c0ce4af5546e39ac61c87f2dd1a1a15fcd362a374fb66533151c333635ceed827deba0c15dc1b2125b84633c3764dafbd699b8cf70c088
+EBUILD gtk-chtheme-0.3.1-r4.ebuild 899 BLAKE2B 9fe67e28c017556685c06757122522e742b23452c8a8197ad6af1017ba7e8a28edcc1f269ce3ca3aa0939eec95f97de06389f1ee24af95a92db62871aec49393 SHA512 368ff10b7e2a05c86701a851490a8f5811d726d2fdf349b093ba2c4856549e2e0f0e23da10d76cc6b0684655177beb3984ea66ba8345f67e1e0df7720e5f0cd8
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild b/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
deleted file mode 100644
index bd7dd770de66..000000000000
--- a/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="GTK-2.0 Theme Switcher"
-HOMEPAGE="http://plasmasturm.org/programs/gtk-chtheme/"
-SRC_URI="http://plasmasturm.org/programs/gtk-chtheme/${P}.tar.bz2"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-implicit.patch
-	"${FILESDIR}/${P}-asneeded.patch"  # Fix forced as-needed, bug #248655
-	"${FILESDIR}/${P}-qgtkstyle.patch" # Make it work with qgtkstyle, bug #250504
-)
-
-src_prepare() {
-	# QA: stop Makefile from stripping the binaries
-	sed -i -e "s:strip:true:" "${S}"/Makefile || die "sed failed"
-
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-}
diff --git a/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r4.ebuild b/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r4.ebuild
new file mode 100644
index 000000000000..40828f11d52f
--- /dev/null
+++ b/x11-themes/gtk-chtheme/gtk-chtheme-0.3.1-r4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="GTK-2.0 Theme Switcher"
+HOMEPAGE="http://plasmasturm.org/programs/gtk-chtheme/"
+SRC_URI="http://plasmasturm.org/programs/gtk-chtheme/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-implicit.patch
+	"${FILESDIR}"/${P}-asneeded.patch  # Fix forced as-needed, bug #248655
+	"${FILESDIR}"/${P}-qgtkstyle.patch # Make it work with qgtkstyle, bug #250504
+)
+
+src_prepare() {
+	default
+
+	# QA: stop Makefile from stripping the binaries
+	sed -i -e "s:strip:true:" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	einstalldocs
+}
diff --git a/x11-themes/gtk-engines-quartz/Manifest b/x11-themes/gtk-engines-quartz/Manifest
index 7f07d8045306..99555a554c2b 100644
--- a/x11-themes/gtk-engines-quartz/Manifest
+++ b/x11-themes/gtk-engines-quartz/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-quartz-engine-0.2.tar.gz 29639 BLAKE2B 99cd4340c0dddb55cdf08d3a763b48e5b2ec669f7086fe4fc8bd0a684139d72e9ffbe2bd54cd525c77fdee982e30b3b9878b4184f0e0daf1bd0f5b5985b9b099 SHA512 52cee174325d731fa8c1873d9308fc8fde03e4a96fa73a2179bbcc29274a725cd88ff5aa3be733556f3fc95eeda08e5e0ab88ef051378b023c53febd106a57a7
-EBUILD gtk-engines-quartz-0.2.ebuild 569 BLAKE2B 4df79e1c5f7f7d7f2772004ae8f1c33857b26a0c3b645e635b308af2ff9577baeea7082fd04c3fff3adf3e56d1594fd54064f29a262f1ff04b4a7f05d61b4db8 SHA512 1f1836afca8434dbe55fe4419ee18401538ae57a252cb919de7a04db6975637fe8287fc8c2730e59b4b8d31ffbf61c2f1020f72c2f95c90e78dd89b506f9701c
+EBUILD gtk-engines-quartz-0.2-r1.ebuild 564 BLAKE2B 9cd12c498f42c9933eac69dddf7bd5f6cdbb3d468764eae389490bbc069eb2f63d95f72a41ad2314c969011644517e4c9014a9d5ef1f5c1ce02a41dfff8eb9ae SHA512 bf8c8c621ccfe7d22c79ecddf3b70c34fc4c44b6ae105db7a2e38ded4e03a896c51e5bdc8963699c454c977bf9188c3c9956e34de742bd8fbd7bfc1a6f2a9eb8
 MISC metadata.xml 327 BLAKE2B 45927cb57aa64620531afb32bbd9877c345ccd3ce0f50142bd47b0e60c046f192ed0bdf46b2c28d9f87574139b4a75505fe83f435abf31ac3a1c1bae0008c5f6 SHA512 f2d60fd3d67e3f303eb5f093d1e4bd53e65c5e52af6de85c819ebaba67e1abfb54e5dcf97e6c2887029fe27b8c4b21dc886b21ea0bd1cd19a6bacb368d583f62
diff --git a/x11-themes/gtk-engines-quartz/gtk-engines-quartz-0.2-r1.ebuild b/x11-themes/gtk-engines-quartz/gtk-engines-quartz-0.2-r1.ebuild
new file mode 100644
index 000000000000..585b286b2966
--- /dev/null
+++ b/x11-themes/gtk-engines-quartz/gtk-engines-quartz-0.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_P="gtk-quartz-engine-${PV}"
+
+DESCRIPTION="OSX GTK+ Theme Engine"
+HOMEPAGE="https://sourceforge.net/apps/trac/gtk-osx/wiki/GtkQuartzEngine"
+SRC_URI="http://downloads.sourceforge.net/project/gtk-osx/GTK%20Quartz%20Engine/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc-macos"
+
+RDEPEND=">=x11-libs/gtk+-2.10:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/x11-themes/gtk-engines-quartz/gtk-engines-quartz-0.2.ebuild b/x11-themes/gtk-engines-quartz/gtk-engines-quartz-0.2.ebuild
deleted file mode 100644
index e67c2252fef9..000000000000
--- a/x11-themes/gtk-engines-quartz/gtk-engines-quartz-0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_NAME=gtk-quartz-engine-${PV}
-
-DESCRIPTION="OSX GTK+ Theme Engine"
-HOMEPAGE="https://sourceforge.net/apps/trac/gtk-osx/wiki/GtkQuartzEngine"
-SRC_URI="http://downloads.sourceforge.net/project/gtk-osx/GTK%20Quartz%20Engine/${MY_NAME}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc-macos"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.10:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_NAME}
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/x11-themes/iceicons/Manifest b/x11-themes/iceicons/Manifest
index 74dce0533054..ee277f60a17f 100644
--- a/x11-themes/iceicons/Manifest
+++ b/x11-themes/iceicons/Manifest
@@ -1,3 +1,3 @@
 DIST iceicons-default-0.10.0.tar.gz 1462091 BLAKE2B a893d0f4b5f5082759bb109390742edbbb5ff46cc02153b69499a29d4403ed7ae573e71837a63acabe70f0a43dbac92b0774f74c7f818982867ab7d486c2be4d SHA512 310564a4f3c5df4209d4f8ae451d76c5c04928a6be5cb1c96124751f3d748a2d95926f6444bf5efc9bf2d447e6b836877cb8913b3ce1c161994600ad85ebdd02
-EBUILD iceicons-0.10.0-r1.ebuild 1000 BLAKE2B f73c160ea7be7d9d89ec15e6e73ec3af48d0e7f9f49cfe0956e739072612bd905c6df954e8111da9bda79242a12131f6fac42d6d113495ee0aad5a6fbc06e821 SHA512 7fe52f461f24f3488aa4b0bc777b0d71919de35e9c960a57e4ff1fbf0bdfead64bcf7b7a510d3fe6ab1e42b67800285eca408b8adc821c78b04234ce73a9eb47
+EBUILD iceicons-0.10.0-r2.ebuild 940 BLAKE2B 27392dda903888edb8c73639f9ececd13adfd694ead0feb395591b0c067ac3eea8b56078852fc57a3c7a6ba0db22ffcc8d63f7ffbd1cdedf63a8a7910e0c0739 SHA512 5090074e56d84995bb4c5bc78f0b39d8322b0f261c0655d0b3561661187fbf7cff4a06884dee860f5eb4e7401f971ff86fc75b40f92098af4c02381043821678
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-themes/iceicons/iceicons-0.10.0-r1.ebuild b/x11-themes/iceicons/iceicons-0.10.0-r1.ebuild
deleted file mode 100644
index f64d22c2cdf5..000000000000
--- a/x11-themes/iceicons/iceicons-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="IceWM Icons is a set of XPM 16x16, 32x32, and 48x48 XPM and PNG icons for IceWM"
-HOMEPAGE="http://sandbox.cz/~covex/icewm/iceicons/"
-SRC_URI="http://sandbox.cz/~covex/icewm/iceicons/${PN}-default-${PV}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-wm/icewm-1.2.6"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-ICEICONSDIR="/usr/share/icewm/icons/iceicons"
-
-src_install() {
-	dodir "${ICEICONSDIR}"
-	cp -pPR icons/* "${D}"/"${ICEICONSDIR}" || die
-	chown -R root:0 "${D}"/"${ICEICONSDIR}" || die
-	chmod -R o-w "${D}"/"${ICEICONSDIR}" || die
-
-	dodoc CHANGELOG README TODO winoptions
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use new IceWm icons, add following"
-	einfo "into your IceWm preference file:"
-	einfo "IconPath=\"${ICEICONSDIR}:${ICEICONSDIR}/menuitems\""
-	einfo
-}
-
-pkg_postrm() {
-	einfo
-	einfo "Update your IceWm preference."
-	einfo
-}
diff --git a/x11-themes/iceicons/iceicons-0.10.0-r2.ebuild b/x11-themes/iceicons/iceicons-0.10.0-r2.ebuild
new file mode 100644
index 000000000000..708b7b6b4d38
--- /dev/null
+++ b/x11-themes/iceicons/iceicons-0.10.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="IceWM Icons is a set of XPM 16x16, 32x32, and 48x48 XPM and PNG icons for IceWM"
+HOMEPAGE="http://sandbox.cz/~covex/icewm/iceicons/"
+SRC_URI="http://sandbox.cz/~covex/icewm/iceicons/${PN}-default-${PV}.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+
+RDEPEND=">=x11-wm/icewm-1.2.6"
+DEPEND="${RDEPEND}"
+
+ICEICONSDIR="/usr/share/icewm/icons/iceicons"
+
+src_install() {
+	insinto "${ICEICONSDIR}"
+	doins -r icons/.
+
+	fowners -R root:0 "${ICEICONSDIR}"
+	fperms -R o-w "${ICEICONSDIR}"
+
+	dodoc CHANGELOG README TODO winoptions
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To use new IceWm icons, add following"
+	einfo "into your IceWm preference file:"
+	einfo "IconPath=\"${ICEICONSDIR}:${ICEICONSDIR}/menuitems\""
+	einfo
+}
+
+pkg_postrm() {
+	einfo
+	einfo "Update your IceWm preference."
+	einfo
+}
diff --git a/x11-themes/kfaenza/Manifest b/x11-themes/kfaenza/Manifest
index 2eddf50bf91e..169b0e06aba0 100644
--- a/x11-themes/kfaenza/Manifest
+++ b/x11-themes/kfaenza/Manifest
@@ -1,5 +1,5 @@
 DIST 147483-additional-KFaenza.tar.gz 520155 BLAKE2B 641129bed0d0b838b9d77347c274564475edfb87dd813a5e043cb10c54c8e9cf064164e7e0d43c6ba58b3811f88ef8ecbfc098065522a1c46b594e620bb86f69 SHA512 940078c60a950242c5fe55883923563864c5f7020ef20e35492e18b4cb2ca885d679ac33f35482427b2a6fdba71d6ef19fb6e697a9e3fc1df09e1b542da8c5db
 DIST 153813-kfaenza-icon-patch-0.3.tar.gz 51672 BLAKE2B be9cd24baaf8391a55333f139a900354f9f974103b44b667f512d74e0aaeab95df214960d29189aa99c57d25cfad42aa9f2d80ac924aed6e788889b04658c078 SHA512 0a0bf105d320c25ffca06f6fbfdd4298ea891012aaa33df9494dbab04f786bd5b9b7a18a5a388333fb8af708334ee4653f8aaa86b0221b3ef45755bb3b8f3d8a
 DIST kfaenza-0.8.9.tar.gz 71489656 BLAKE2B dc98dffa25e8acc6a9c83d389ead7e66466b62b3cb7c2e3963ec6ae89bed7a340457364aca6412947dc9fe980bf1fa2cd48f5ff25db685b148b5808a9c07d53a SHA512 cb66f9ab7f25c4f5c4f5148d6dcdda4015f7ef128234845b60ab06db4b82f2fc0103f922f349a93a8e559b781db44e9c6865a2d0dadab8988c4a34f65a867cc4
-EBUILD kfaenza-0.8.9-r2.ebuild 1505 BLAKE2B 2e730c41ba7b898588369db1d80edb5c4e3655820958318bc3816756b11afc0fc2b13dd846ee2a196f343d9008dade281be67fa665c148c995b2271eacd12d7d SHA512 3fc70fc5c8fe69791e16b9450195dac9ed0b4c7598634e330bec29e2a135f0ec6c238848de1e026b6f878363cd72cae8876daa074ec7bccc597b7090bed9e50f
+EBUILD kfaenza-0.8.9-r3.ebuild 1464 BLAKE2B 312f03e42e05a923654de0d3fceb762dd47c61ed62204e022cdd0ce23734a235dbccac508cb575a7f3a8f4368f74d10a4c5eaa5dc8c2650e62b4421a8bd7ce4b SHA512 dd065888ec52454fede5ff2a6fae5fdda099a6f3cfa03b4f960508e8350f08c56bc0dc3acb19936d2fa03a36b37ffef9a35b12aa75385835257a41b3320831ee
 MISC metadata.xml 363 BLAKE2B 528db77078e3c167457e1f51414578337cc9cbeb62828e69e6836a515236326bf07130ed554c37ba61b7ee7ddfb8e64083869016ca99f5c465219d39aea55c9f SHA512 b095e9a7bdc61c7ad1681d8a1057a6edf5ab9503bd178125ac63c4f1ff194c15ad431484ac9c378ea110f4703112c04ae8b718a1c4308ac878e99158fb672cf9
diff --git a/x11-themes/kfaenza/kfaenza-0.8.9-r2.ebuild b/x11-themes/kfaenza/kfaenza-0.8.9-r2.ebuild
deleted file mode 100644
index 07f3151900e0..000000000000
--- a/x11-themes/kfaenza/kfaenza-0.8.9-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="KFaenza"
-DESCRIPTION="Faenza-Cupertino icon theme for KDE Plasma"
-HOMEPAGE="https://store.kde.org/p/1002580/
-	https://kde-look.org/content/show.php/KFaenza+icon+patch?content=153813
-	https://kde-look.org/content/show.php/Additional+KFaenza+Icons?content=147483"
-#That is upstream location, not reupload. Don't fix
-SRC_URI="http://ompldr.org/vYjR0NQ/${P}.tar.gz
-	http://kde-look.org/CONTENT/content-files/153813-${PN}-icon-patch-0.3.tar.gz
-	additional? ( http://kde-look.org/CONTENT/content-files/147483-additional-KFaenza.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additional branding"
-
-S="${WORKDIR}/${MY_PN}"
-RESTRICT="binchecks strip"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	pushd "${S}" > /dev/null
-	for tarball in ${A}; do
-		[[ "${tarball}" == ${P}.tar.gz ]] && continue
-		unpack "${tarball}"
-	done
-	popd > /dev/null
-}
-
-src_prepare() {
-	default
-
-	# Gentoo bug 620352
-	local f
-	for f in 16 22 32 48; do
-		mv apps/${f}/"numpty physics.png" apps/${f}/"numptyphysics.png" || die
-	done
-
-	use branding || return
-
-	local res
-	for res in 22 32 48 64 128 256; do
-		cp "${S}"/places/${res}/start-here-gentoo.png \
-			"${S}"/places/${res}/start-here.png || die
-	done
-	cp "${S}"/places/scalable/start-here-gentoo.svg \
-		"${S}"/places/scalable/start-here.svg || die
-}
-
-src_install() {
-	dodir /usr/share/icons
-	cp -R "${S}/" "${D}"/usr/share/icons || die "Install failed!"
-}
diff --git a/x11-themes/kfaenza/kfaenza-0.8.9-r3.ebuild b/x11-themes/kfaenza/kfaenza-0.8.9-r3.ebuild
new file mode 100644
index 000000000000..792976c3d5cc
--- /dev/null
+++ b/x11-themes/kfaenza/kfaenza-0.8.9-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="KFaenza"
+
+DESCRIPTION="Faenza-Cupertino icon theme for KDE Plasma"
+HOMEPAGE="https://store.kde.org/p/1002580/
+	https://kde-look.org/content/show.php/KFaenza+icon+patch?content=153813
+	https://kde-look.org/content/show.php/Additional+KFaenza+Icons?content=147483"
+#That is upstream location, not reupload. Don't fix
+SRC_URI="http://ompldr.org/vYjR0NQ/${P}.tar.gz
+	http://kde-look.org/CONTENT/content-files/153813-${PN}-icon-patch-0.3.tar.gz
+	additional? ( http://kde-look.org/CONTENT/content-files/147483-additional-KFaenza.tar.gz )"
+S="${WORKDIR}/${MY_PN}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+additional branding"
+RESTRICT="binchecks strip"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	pushd "${S}" >/dev/null || die
+	local tarball
+	for tarball in ${A}; do
+		[[ "${tarball}" == ${P}.tar.gz ]] && continue
+		unpack "${tarball}"
+	done
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	default
+
+	# Gentoo Bug #620352
+	local f
+	for f in 16 22 32 48; do
+		mv apps/${f}/"numpty physics.png" apps/${f}/"numptyphysics.png" || die
+	done
+
+	use branding || return
+
+	local res
+	for res in 22 32 48 64 128 256; do
+		cp places/${res}/start-here-gentoo.png \
+			places/${res}/start-here.png || die
+	done
+	cp places/scalable/start-here-gentoo.svg \
+		places/scalable/start-here.svg || die
+}
+
+src_install() {
+	insinto /usr/share/icons/KFaenza
+	doins -r .
+}
diff --git a/x11-themes/larry-backgrounds/Manifest b/x11-themes/larry-backgrounds/Manifest
index e077abbe9185..37c0706b5c71 100644
--- a/x11-themes/larry-backgrounds/Manifest
+++ b/x11-themes/larry-backgrounds/Manifest
@@ -37,5 +37,5 @@ DIST gentoo-larry-bg-1920x1200.png 224505 BLAKE2B d07caccfd81912cb5784b2c96f2a8b
 DIST gentoo-larry-bg-4-3.svg 133710 BLAKE2B 948f5f9144b899557c112eb7d12c6b8910868cabe3d6818913a1c6f52c348eead8b58659d4d559ac75745cbe1da5af1f50867d28d5f90d93d7aceabaea7c9ddc SHA512 f6749a1eac833fb94da8bc0f1f14f48758a3ef5ec7fe521a851441d96be1fa8fd9f02bfadc2bd3eed1c2c83415033eeafdf7d47013a28bd4e6114ec6e8dbb508
 DIST gentoo-larry-bg-5-4.svg 133720 BLAKE2B a407ca2fa13a20d5f3701ebb617149f98040470d6a6586c28f2e2e697b0d7211abed1e64176fcc9102944b9c62dd4efc09bb62e2a293e017d6ce55bb4ea59dec SHA512 c06bdd04e23ea5a75b57c28098121ec1a381728b6f914b5e0031e4b2f6d2aca8d1cca4c93731ea9119146d869d62c06777000cb521cca7647500d1471477b835
 DIST gentoo-larry-bg-800x600.png 76455 BLAKE2B 63b278ddbe12be527ed6b4e21d15b363393a7382c6469575248e9e3337a8aa71ca88ff997f388af01930ce33f4bb23f271d1b04cf6140ac7702f5ed2737fe5aa SHA512 c2f889e8258125b8876e0b97df240bd210f144b57df1806a1bcb7e0197f0046226e93f351b270045311e4e390913dc1a841a40496486189c863feb6afb66e24a
-EBUILD larry-backgrounds-20110822-r1.ebuild 3745 BLAKE2B 69b465c3676d6de324783e7cf6ea93d37537e75fb71eee88832edf5fd7be6eed9e32036af9886d9efc03d4089c20a280cc4af7890ab16040ef6b408a1adc3dfb SHA512 7a09bb31f3942a48ab9f62f171e42283c671ca3919d76d3795b3048109c8904380c00de8cf0f93826d86fe83653c2004f237035b0399d3517089ecd99e16b50f
+EBUILD larry-backgrounds-20110822-r2.ebuild 3744 BLAKE2B 02cea98e4631b256bb13f511543d15595366615d4af8b86fbaa98eb66e174ab507e7491a6a79a4f8d9e523b950ca5aa4d50cdfffcf4b233a32c82377686dd9a8 SHA512 79472f2324167a3910de6dee8d83819ce8aa3a84012d9ab172496049be7b502f4a9c70bf20d50ab69c60ec3e3e8360e994be5d5cb21862254c1f1733b2458a84
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild b/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild
deleted file mode 100644
index 38dcdb486677..000000000000
--- a/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Wallpapers featuring Gentoo mascot Larry the cow"
-HOMEPAGE="https://www.gentoo.org/main/en/graphics.xml#wallpapers"
-web_home='https://www.gentoo.org/assets/img/wallpaper'
-SRC_URI="
-	${web_home}/abducted/gentoo-abducted-800x600.png
-	${web_home}/abducted/gentoo-abducted-1024x768.png
-	${web_home}/abducted/gentoo-abducted-1152x864.png
-	${web_home}/abducted/gentoo-abducted-1280x1024.png
-	${web_home}/abducted/gentoo-abducted-1600x1200.png
-	${web_home}/abducted/gentoo-abducted-1680x1050.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake.svg
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1280x1024.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-800x600.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1024x768.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1152x864.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1280x960.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1600x1200.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1280x800.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1440x900.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1680x1050.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1920x1200.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1280x720.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1366x768.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1600x900.png
-	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1920x1080.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-4-3.svg
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-5-4.svg
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-16-9.svg
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-16-10.svg
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-800x600.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1024x768.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1152x864.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1280x720.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1280x800.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1280x960.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1280x1024.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1366x768.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1440x900.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1600x900.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1600x1200.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1680x1050.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1920x1080.png
-	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1920x1200.png
-"
-
-LICENSE="CC-BY-SA-2.5"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}"
-
-RESTRICT="mirror"  # TODO make a tarball, instead?
-
-src_unpack() { :; }
-
-src_install() {
-	local backdrops='/usr/share/xfce4/backdrops'
-	local share_home='backgrounds/larry-the-cow'
-
-	cd "${DISTDIR}" || die
-	insinto /usr/share/${share_home}/
-	doins ${A}
-
-	# Integrate with KDE 4
-	dosym ../${share_home} /usr/share/wallpapers/larry-the-cow
-
-	# Integrate with XFCE 4
-	dodir ${backdrops}/
-	dosym ../../${share_home}/gentoo-abducted-1600x1200.png ${backdrops}/gentoo-abducted-4:3.png
-	dosym ../../${share_home}/gentoo-abducted-1280x1024.png ${backdrops}/gentoo-abducted-5:4.png
-	dosym ../../${share_home}/gentoo-abducted-1680x1050.png ${backdrops}/gentoo-abducted-8:5.png
-	dosym ../../${share_home}/gentoo-cow-gdm-remake-1600x1200.png ${backdrops}/gentoo-cow-gdm-remake-4:3.png
-	dosym ../../${share_home}/gentoo-cow-gdm-remake-1280x1024.png ${backdrops}/gentoo-cow-gdm-remake-5:4.png
-	dosym ../../${share_home}/gentoo-cow-gdm-remake-1680x1050.png ${backdrops}/gentoo-cow-gdm-remake-8:5.png
-	for ratio in 4-3 5-4 16-9 16-10 ; do
-		dosym ../../${share_home}/gentoo-larry-bg-${ratio}.svg ${backdrops}/gentoo-larry-bg-${ratio/-/:}.svg
-	done
-}
diff --git a/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r2.ebuild b/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r2.ebuild
new file mode 100644
index 000000000000..e5089b21a6da
--- /dev/null
+++ b/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+web_home="https://www.gentoo.org/assets/img/wallpaper"
+
+DESCRIPTION="Wallpapers featuring Gentoo mascot Larry the cow"
+HOMEPAGE="https://www.gentoo.org/main/en/graphics.xml#wallpapers"
+SRC_URI="
+	${web_home}/abducted/gentoo-abducted-800x600.png
+	${web_home}/abducted/gentoo-abducted-1024x768.png
+	${web_home}/abducted/gentoo-abducted-1152x864.png
+	${web_home}/abducted/gentoo-abducted-1280x1024.png
+	${web_home}/abducted/gentoo-abducted-1600x1200.png
+	${web_home}/abducted/gentoo-abducted-1680x1050.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake.svg
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1280x1024.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-800x600.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1024x768.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1152x864.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1280x960.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1600x1200.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1280x800.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1440x900.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1680x1050.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1920x1200.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1280x720.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1366x768.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1600x900.png
+	${web_home}/gentoo-cow/gentoo-cow-gdm-remake-1920x1080.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-4-3.svg
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-5-4.svg
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-16-9.svg
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-16-10.svg
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-800x600.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1024x768.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1152x864.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1280x720.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1280x800.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1280x960.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1280x1024.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1366x768.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1440x900.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1600x900.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1600x1200.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1680x1050.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1920x1080.png
+	${web_home}/gentoo-larry-bg/gentoo-larry-bg-1920x1200.png"
+S="${WORKDIR}"
+
+LICENSE="CC-BY-SA-2.5"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="mirror"  # TODO make a tarball, instead?
+
+src_unpack() { :; }
+
+src_install() {
+	local backdrops='/usr/share/xfce4/backdrops'
+	local share_home='backgrounds/larry-the-cow'
+
+	cd "${DISTDIR}" || die
+	insinto /usr/share/${share_home}/
+	doins ${A}
+
+	# Integrate with KDE 4
+	dosym ../${share_home} /usr/share/wallpapers/larry-the-cow
+
+	# Integrate with XFCE 4
+	dodir ${backdrops}/
+	dosym ../../${share_home}/gentoo-abducted-1600x1200.png ${backdrops}/gentoo-abducted-4:3.png
+	dosym ../../${share_home}/gentoo-abducted-1280x1024.png ${backdrops}/gentoo-abducted-5:4.png
+	dosym ../../${share_home}/gentoo-abducted-1680x1050.png ${backdrops}/gentoo-abducted-8:5.png
+	dosym ../../${share_home}/gentoo-cow-gdm-remake-1600x1200.png ${backdrops}/gentoo-cow-gdm-remake-4:3.png
+	dosym ../../${share_home}/gentoo-cow-gdm-remake-1280x1024.png ${backdrops}/gentoo-cow-gdm-remake-5:4.png
+	dosym ../../${share_home}/gentoo-cow-gdm-remake-1680x1050.png ${backdrops}/gentoo-cow-gdm-remake-8:5.png
+	local ratio
+	for ratio in 4-3 5-4 16-9 16-10 ; do
+		dosym ../../${share_home}/gentoo-larry-bg-${ratio}.svg ${backdrops}/gentoo-larry-bg-${ratio/-/:}.svg
+	done
+}
diff --git a/x11-themes/laughlin-backgrounds/Manifest b/x11-themes/laughlin-backgrounds/Manifest
index 4abd2562dc70..edff13009126 100644
--- a/x11-themes/laughlin-backgrounds/Manifest
+++ b/x11-themes/laughlin-backgrounds/Manifest
@@ -1,3 +1,3 @@
 DIST laughlin-backgrounds-14.1.0-3.fc15.src.rpm 52687935 BLAKE2B b8bbf3847a2524988fc8395cb33a5009209d49d5c648b021a0ab146e32ea7b8e54a4145a072d564ec55155cc3417c2e1126623103ef745c6b89e872396af1b2d SHA512 db03da2177bcd894a267366cdfb0ae9497872bd22ad7061fadc42d9bc1e2c2ce3015d8f85ed7fa58d1b82132ca350d7939ee20104b7a2e9e9d99bee197bc9e80
-EBUILD laughlin-backgrounds-14.1.0.3-r1.ebuild 873 BLAKE2B a2cab4b7bb4204e846ecb70d6eff995ed505730523f8cc09035f8ef1175357ef934d7569fb2c942b37ca47c5759705167f8d5e3b3841353b97cf487bc1b193fa SHA512 769ceed35c84ae80a10a4d82ae8884ad2031d9415665d360433e17d62c334c1406f8cc811d69bf195754459c9a26a4cb042fe8000d51de3b9da4341306143912
+EBUILD laughlin-backgrounds-14.1.0.3-r2.ebuild 754 BLAKE2B 422c773a80826429268fc50dda62faeb5f9aa32f6d4fd5f2399b724ad7fb176d9bf2826b78c2abe0703a61705dbe4c64f14552e3159de21088d2461b773f7ff5 SHA512 ec4657bc28afc909da0198ad4733d9e6a6e1aaa1b2e2633d4d4b0473bc773378a80fd86b967aa7690452ffd583a2d8530186e44dca8d8b5fbf572186eba9f726
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r1.ebuild b/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r1.ebuild
deleted file mode 100644
index 0fe9084619c1..000000000000
--- a/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm versionator
-
-SRC_PATH=development/15/source/SRPMS
-FEDORA=15
-MY_P="${PN}-$(get_version_component_range 1-3)"
-
-DESCRIPTION="Fedora 14 official background artwork"
-HOMEPAGE="https://fedoraproject.org/wiki/F14_Artwork"
-SRC_URI="https://archives.fedoraproject.org/pub/archive/fedora/linux/${SRC_PATH}/${PN}-$(replace_version_separator 3 -).fc${FEDORA}.src.rpm"
-
-LICENSE="CC-BY-SA-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	rpm_src_unpack
-
-	# as of 2017-07-28 rpm.eclass does not unpack the further lzma
-	# file automatically.
-	unpack ./${MY_P}.tar.lzma
-}
-
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	# The install targets are serial anyway.
-	emake -j1 DESTDIR="${D}" install
-}
diff --git a/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r2.ebuild b/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r2.ebuild
new file mode 100644
index 000000000000..711e7ea18b9e
--- /dev/null
+++ b/x11-themes/laughlin-backgrounds/laughlin-backgrounds-14.1.0.3-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rpm
+
+MY_P="${PN}-$(ver_cut 1-3)"
+
+DESCRIPTION="Fedora 14 official background artwork"
+HOMEPAGE="https://fedoraproject.org/wiki/F14_Artwork"
+SRC_URI="https://archives.fedoraproject.org/pub/archive/fedora/linux/development/15/source/SRPMS/${PN}-$(ver_rs 3 -).fc15.src.rpm"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CC-BY-SA-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+src_unpack() {
+	rpm_src_unpack
+
+	# as of 2017-07-28 rpm.eclass does not unpack the further lzma
+	# file automatically.
+	unpack ./${MY_P}.tar.lzma
+}
+
+src_compile() { :; }
+
+src_test() { :; }
+
+src_install() {
+	# The install targets are serial anyway.
+	emake -j1 DESTDIR="${D}" install
+}
diff --git a/x11-themes/leonidas-backgrounds/Manifest b/x11-themes/leonidas-backgrounds/Manifest
index a593c96fb44d..45b74ccdc83c 100644
--- a/x11-themes/leonidas-backgrounds/Manifest
+++ b/x11-themes/leonidas-backgrounds/Manifest
@@ -1,3 +1,3 @@
 DIST leonidas-backgrounds-11.0.0-2.fc12.src.rpm 30664585 BLAKE2B 07528accc0b004fd4404ce86fe38398e2aa8bae97a6f73432541dca4f5c4f048ca77639b08aa9bc2ba9d13ea9146ad1de1be2a84c4a9b83b3cc52156c6a1542f SHA512 c0ad0c2d5051fe2ca0711b46f1eb4be78ae265b9b6da469cdb37ff16b3c49c6576f8d94f3d625e4011f80a0b7b220a9cf245a1cf66cbd601517ce139a397e3c1
-EBUILD leonidas-backgrounds-11.0.0.2-r1.ebuild 907 BLAKE2B bbb0c00bf0f7a4644e447b829bb070d9ec085c3f7fe3f73a9fca58982c6819411f15e89c2651f66cf75575af714b14d43ede08a8cbdaf70d35b89e97d7104ed6 SHA512 e08ee0ca7288db2236d2acfae0a5b59aed12cab6d718a88e6d15cf6c5ebd62d59324cafc9ed9ae1f0c9e4417e995abdb73d79cbd4ff5ba83403a0a5bf8af38f3
+EBUILD leonidas-backgrounds-11.0.0.2-r2.ebuild 797 BLAKE2B 36304128693502baf1688e0b1e9eb5f1042b5a9a6858652471ea9ccd751abbcc89d8554916cf0a94a05e39bcf8428d74089fd84c252cd2cd5ba20568f0eccc55 SHA512 1eb622b6f0e663a47d945de542ace71f8911a840b12187dda99c42d7c2805a2e1943a813cd85914e72171b2392d5b068e9256d886e816ddb97d546477231fd08
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-themes/leonidas-backgrounds/leonidas-backgrounds-11.0.0.2-r1.ebuild b/x11-themes/leonidas-backgrounds/leonidas-backgrounds-11.0.0.2-r1.ebuild
deleted file mode 100644
index f74bf6de6f94..000000000000
--- a/x11-themes/leonidas-backgrounds/leonidas-backgrounds-11.0.0.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator rpm
-
-SRC_PATH=development/15/source/SRPMS
-FEDORA=12
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-
-DESCRIPTION="Fedora 11 official background artwork"
-HOMEPAGE="https://fedoraproject.org/wiki/F11_Artwork"
-
-SRC_URI="https://archives.fedoraproject.org/pub/archive/fedora/linux/${SRC_PATH}/${PN}-$(replace_version_separator 3 -).fc${FEDORA}.src.rpm"
-
-LICENSE="CC-BY-SA-2.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="!x11-themes/fedora-backgrounds:11"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-SLOT="0"
-
-src_unpack() {
-	rpm_src_unpack
-	unpack ./${MY_P}.tar.lzma
-}
-
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	dodoc Credits
-
-	insinto /usr/share/backgrounds/leonidas
-	doins -r leonidas* landscape lion
-
-	insinto /usr/share/gnome-background-properties
-	doins desktop-*.xml
-}
diff --git a/x11-themes/leonidas-backgrounds/leonidas-backgrounds-11.0.0.2-r2.ebuild b/x11-themes/leonidas-backgrounds/leonidas-backgrounds-11.0.0.2-r2.ebuild
new file mode 100644
index 000000000000..b8c9839f733d
--- /dev/null
+++ b/x11-themes/leonidas-backgrounds/leonidas-backgrounds-11.0.0.2-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rpm
+
+MY_P="${PN}-$(ver_cut 1-3)"
+
+DESCRIPTION="Fedora 11 official background artwork"
+HOMEPAGE="https://fedoraproject.org/wiki/F11_Artwork"
+SRC_URI="https://archives.fedoraproject.org/pub/archive/fedora/linux/development/15/source/SRPMS/${PN}-$(ver_rs 3 -).fc12.src.rpm"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CC-BY-SA-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="!x11-themes/fedora-backgrounds:11"
+
+src_unpack() {
+	rpm_src_unpack
+	unpack ./${MY_P}.tar.lzma
+}
+
+src_compile() { :; }
+
+src_test() { :; }
+
+src_install() {
+	dodoc Credits
+
+	insinto /usr/share/backgrounds/leonidas
+	doins -r leonidas* landscape lion
+
+	insinto /usr/share/gnome-background-properties
+	doins desktop-*.xml
+}
diff --git a/x11-themes/lovelock-backgrounds/Manifest b/x11-themes/lovelock-backgrounds/Manifest
index 91b77609e661..89b77c3c8bfd 100644
--- a/x11-themes/lovelock-backgrounds/Manifest
+++ b/x11-themes/lovelock-backgrounds/Manifest
@@ -1,3 +1,3 @@
 DIST lovelock-backgrounds-14.91.1-1.fc15.src.rpm 5298508 BLAKE2B aa819092c6695a11c9ffe7509d5a48fdcdfdb7c9ed87861e2c5b56b8ff4d33acdb6282714a45531aa5eb64d40b4e24309e6e785ee79d5d8d2c5695e35e32ed7b SHA512 565fc375d1de604d9d940a30f1bade68530d1170d101d8c81cd09873f89737fdb691649149f41d12bcf7d90deb2072bb70787f47b96d034cf061222cba5d37fb
-EBUILD lovelock-backgrounds-14.91.1.1-r1.ebuild 731 BLAKE2B ba5af5bff1e4108b84f916c9c308d11527cb712b8ed174001026e48ab9e40d780114d6efeae30c3fa96e5ad45ae84d83d6402903ad515073b4d2440243b4f5be SHA512 0a225c07a282c6e2bce2292471a6ebae3fe2973839063c2a72ec1188fc2e992ce8ad31f25faf20a3091bade2ec30ed35e5c8173739b33a652710d6df711292a6
+EBUILD lovelock-backgrounds-14.91.1.1-r2.ebuild 609 BLAKE2B ef1656c8982ca69e469cd4d4f55c1a4305bacb6b8886e2c4a5f1a3bcdc2c9bf71581ca0c840d7ae766159147508c054635a3b19a00803e5a0c66758a3292e5a4 SHA512 9b469bdc1a87f7563526e491f55788399e2ce3bb067481225a4891e373b02d1c8d62fda807e482cd4ed8ad78f4601104d4d4ce0bf48449ef30c9e090bd6db085
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1-r1.ebuild b/x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1-r1.ebuild
deleted file mode 100644
index 4da6d64d88fc..000000000000
--- a/x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm versionator
-
-SRC_PATH=releases/15/Fedora/source/SRPMS
-FEDORA=15
-MY_P="${PN}-$(get_version_component_range 1-3)"
-
-DESCRIPTION="Fedora 15 official background artwork"
-HOMEPAGE="https://fedoraproject.org/wiki/F15_Artwork"
-SRC_URI="https://archives.fedoraproject.org/pub/archive/fedora/linux/${SRC_PATH}/${PN}-$(replace_version_separator 3 -).fc${FEDORA}.src.rpm"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	# The install targets are serial anyway.
-	emake -j1 DESTDIR="${D}" install
-}
diff --git a/x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1-r2.ebuild b/x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1-r2.ebuild
new file mode 100644
index 000000000000..b9a4bb6be0c1
--- /dev/null
+++ b/x11-themes/lovelock-backgrounds/lovelock-backgrounds-14.91.1.1-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rpm
+
+MY_P="${PN}-$(ver_cut 1-3)"
+
+DESCRIPTION="Fedora 15 official background artwork"
+HOMEPAGE="https://fedoraproject.org/wiki/F15_Artwork"
+SRC_URI="https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/source/SRPMS/${PN}-$(ver_rs 3 -).fc15.src.rpm"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+src_compile() { :; }
+
+src_test() { :; }
+
+src_install() {
+	# The install targets are serial anyway.
+	emake -j1 DESTDIR="${D}" install
+}
-- 
cgit v1.2.3