commit:     9ff9ebd8ad9ca3553bbc3630a1381de9ba865437
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 10 07:32:50 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 10 07:33:19 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff9ebd8

sys-boot/plymouth: fix SRC_URI

While here, normalise the variable layout to make it way easier to spot.

Fixes: 167714a29964bccf4b95921d91f71c23cf12619d
Reported-by: chaos_princess
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-boot/plymouth/plymouth-22.02.122-r3.ebuild | 14 ++++++--------
 sys-boot/plymouth/plymouth-22.02.122-r4.ebuild |  9 ++++-----
 sys-boot/plymouth/plymouth-24.004.60-r1.ebuild |  9 ++++-----
 sys-boot/plymouth/plymouth-9999.ebuild         |  9 ++++-----
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/sys-boot/plymouth/plymouth-22.02.122-r3.ebuild 
b/sys-boot/plymouth/plymouth-22.02.122-r3.ebuild
index 846c04837e3e..5e7277598b4f 100644
--- a/sys-boot/plymouth/plymouth-22.02.122-r3.ebuild
+++ b/sys-boot/plymouth/plymouth-22.02.122-r3.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic readme.gentoo-r1 systemd
+
+DESCRIPTION="Graphical boot animation (splash) and logger"
+HOMEPAGE="https://cgit.freedesktop.org/plymouth/";
 
SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png";
 
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://gitlab.freedesktop.org/plymouth/plymouth";
 else
-       SRC_URI="${SRC_URI} 
https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz";
+       SRC_URI+=" 
https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz";
        KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 fi
 
-inherit autotools readme.gentoo-r1 systemd
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="https://gitlab.freedesktop.org/plymouth/plymouth";
-
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug +drm +gtk +pango selinux +split-usr static-libs +udev"

diff --git a/sys-boot/plymouth/plymouth-22.02.122-r4.ebuild 
b/sys-boot/plymouth/plymouth-22.02.122-r4.ebuild
index 0aaa12077a32..6e6b6f2b861d 100644
--- a/sys-boot/plymouth/plymouth-22.02.122-r4.ebuild
+++ b/sys-boot/plymouth/plymouth-22.02.122-r4.ebuild
@@ -3,21 +3,20 @@
 
 EAPI=8
 
-inherit flag-o-matic autotools readme.gentoo-r1 systemd
+inherit autotools flag-o-matic readme.gentoo-r1 systemd
 
 DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="https://gitlab.freedesktop.org/plymouth/plymouth";
+HOMEPAGE="https://cgit.freedesktop.org/plymouth/";
+SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png";
 
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://gitlab.freedesktop.org/plymouth/plymouth";
 else
-       SRC_URI="${SRC_URI} 
https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz";
+       SRC_URI+=" 
https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz";
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 fi
 
-SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png";
-
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug +drm +gtk +pango selinux +split-usr static-libs +udev"

diff --git a/sys-boot/plymouth/plymouth-24.004.60-r1.ebuild 
b/sys-boot/plymouth/plymouth-24.004.60-r1.ebuild
index c6b3361f1b93..5232acc18874 100644
--- a/sys-boot/plymouth/plymouth-24.004.60-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-24.004.60-r1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit meson readme.gentoo-r1 flag-o-matic
 
+DESCRIPTION="Graphical boot animation (splash) and logger"
+HOMEPAGE="https://cgit.freedesktop.org/plymouth/";
 
SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png";
 
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://gitlab.freedesktop.org/plymouth/plymouth";
 else
-       SRC_URI="${SRC_URI} 
https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz";
+       SRC_URI+=" 
https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz";
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 fi
 
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="https://cgit.freedesktop.org/plymouth/";
-
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug +drm +gtk +pango selinux freetype +split-usr +udev doc systemd"

diff --git a/sys-boot/plymouth/plymouth-9999.ebuild 
b/sys-boot/plymouth/plymouth-9999.ebuild
index 46e2f98cb6ae..aadd72de820a 100644
--- a/sys-boot/plymouth/plymouth-9999.ebuild
+++ b/sys-boot/plymouth/plymouth-9999.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit meson readme.gentoo-r1 flag-o-matic
 
+DESCRIPTION="Graphical boot animation (splash) and logger"
+HOMEPAGE="https://cgit.freedesktop.org/plymouth/";
 
SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png";
 
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://gitlab.freedesktop.org/plymouth/plymouth";
 else
-       SRC_URI="${SRC_URI} 
https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz";
+       SRC_URI+=" 
https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz";
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv 
~sparc ~x86"
 fi
 
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="https://gitlab.freedesktop.org/plymouth/plymouth";
-
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug +drm +gtk +pango selinux freetype +split-usr +udev doc systemd"

Reply via email to