commit: c53ad3e8295a2a3ee8d6db6d4d933574c139e18d Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Sat Aug 6 17:29:21 2022 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Sat Aug 6 17:29:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c53ad3e8
sys-boot/plymouth: cleanup and remove genkernel-next references Closes: https://bugs.gentoo.org/861704 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> sys-boot/plymouth/Manifest | 2 - sys-boot/plymouth/plymouth-0.9.5-r2.ebuild | 112 -------------------- .../plymouth/plymouth-0.9.6_pre20211225-r1.ebuild | 114 --------------------- sys-boot/plymouth/plymouth-22.02.122-r1.ebuild | 4 +- sys-boot/plymouth/plymouth-9999.ebuild | 4 +- 5 files changed, 4 insertions(+), 232 deletions(-) diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest index 7595bea28e61..6eb0a48b567b 100644 --- a/sys-boot/plymouth/Manifest +++ b/sys-boot/plymouth/Manifest @@ -1,4 +1,2 @@ DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da734ff9ae255fcd65e549d9bc3d510c283e235a770f42edcbdffc1d5cc4c2fcdec9cc931eb0acf504859 SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c -DIST plymouth-0.9.5.tar.xz 1186200 BLAKE2B 8fd073703773fcf7f3e26454c860f094fb4b3d712c56c9df6716ef11815a79f7d5b078ab6c6567b76421026d84a086f95865bf9f3e4ae6363cb1ffc2caa68537 SHA512 686220e8d5b1a8be298156786d979d0e3fb9e010b930d0e8082a2bb152cf07c1bf493d820c243838a1771ee859dc0b4723bd9f10ee434a94a096ce9236c36ce9 DIST plymouth-22.02.122.tar.xz 1183608 BLAKE2B 8bb1362fcaa7d4c0fb1b69729a8a681d992a5d2abc07644d3be5cc0b19df2cac83df031165a65fa06f95042f619b9f4b7a7e1f3816528f6623473a2b1303e1be SHA512 9f2f5a7121b431f16561d6b5f31177ff06cf1e6bdffaa68c1fe08aa3c765a96dee745824aae8eaac9a0b4a08f0a17a9ae79a82bd0826fcc3fe14d8553635f817 -DIST plymouth-5b91b9ed84cc91759c986634a4d64d474e6092cf.tar.gz 1132049 BLAKE2B 0e224aad93fef4039a1a023ece051a64e1fa854f29a814957673c7ba68eb3f2348ca075f59a17f7bad692152ddcc402b2246db413886ac73ad77a36a6fb2cb3c SHA512 3d81ce379d0a11af5b557bfe86e336a40e5abdbb6dbd6cd5e046ede9a46cf2782af75b8e32e3fb2232b8a22efee1890ecb47394742041d9dcb499b38476a814c diff --git a/sys-boot/plymouth/plymouth-0.9.5-r2.ebuild b/sys-boot/plymouth/plymouth-0.9.5-r2.ebuild deleted file mode 100644 index 5dd00723beda..000000000000 --- a/sys-boot/plymouth/plymouth-0.9.5-r2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic -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"; - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86" -fi - -inherit autotools readme.gentoo-r1 systemd toolchain-funcs - -DESCRIPTION="Graphical boot animation (splash) and logger" -HOMEPAGE="https://cgit.freedesktop.org/plymouth/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug +drm +gtk +pango +split-usr static-libs +udev" - -CDEPEND=" - >=media-libs/libpng-1.2.16:= - drm? ( x11-libs/libdrm ) - gtk? ( - dev-libs/glib:2 - >=x11-libs/gtk+-3.14:3 - x11-libs/cairo - ) - pango? ( >=x11-libs/pango-1.21 ) -" -DEPEND="${CDEPEND} - elibc_musl? ( sys-libs/rpmatch-standalone ) - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - virtual/pkgconfig -" -# Block due bug #383067 -RDEPEND="${CDEPEND} - udev? ( virtual/udev ) - !<sys-kernel/dracut-0.37-r3 -" - -DOC_CONTENTS=" - Follow the following instructions to set up Plymouth:\n - https://wiki.gentoo.org/wiki/Plymouth#Configuration -" - -PATCHES=( - "${FILESDIR}"/0.9.3-glibc-sysmacros.patch -) - -src_prepare() { - use elibc_musl && append-ldflags -lrpmatch - default - eautoreconf -} - -src_configure() { - local myconf=( - --with-system-root-install=no - --localstatedir=/var - --without-rhgb-compat-link - --enable-documentation - --enable-systemd-integration - --with-systemdunitdir="$(systemd_get_systemunitdir)" - $(use_enable !static-libs shared) - $(use_enable static-libs static) - $(use_enable debug tracing) - $(use_enable drm) - $(use_enable gtk) - $(use_enable pango) - $(use_with udev) - ) - econf "${myconf[@]}" -} - -src_install() { - default - - insinto /usr/share/plymouth - newins "${DISTDIR}"/gentoo-logo.png bizcom.png - - if use split-usr ; then - # Install compatibility symlinks as some rdeps hardcode the paths - dosym ../usr/bin/plymouth /bin/plymouth - dosym ../usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme - dosym ../usr/sbin/plymouthd /sbin/plymouthd - fi - - readme.gentoo_create_doc - - # looks like make install create /var/run/plymouth - # this is not needed for systemd, same should hold for openrc - # so remove - rm -rf "${D}"/var/run - - # fix broken symlink - dosym ../../bizcom.png /usr/share/plymouth/themes/spinfinity/header-image.png -} - -pkg_postinst() { - readme.gentoo_print_elog - if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then - ewarn "If you want initramfs builder with plymouth support, please emerge" - ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]." - fi -} diff --git a/sys-boot/plymouth/plymouth-0.9.6_pre20211225-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.6_pre20211225-r1.ebuild deleted file mode 100644 index 7ee910f6b422..000000000000 --- a/sys-boot/plymouth/plymouth-0.9.6_pre20211225-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic -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 - PRE_RELEASE_SHA="5b91b9ed84cc91759c986634a4d64d474e6092cf" - SRC_URI="${SRC_URI} https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PRE_RELEASE_SHA}/${PN}-${PRE_RELEASE_SHA}.tar.gz"; - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86" - S="${WORKDIR}/${PN}-${PRE_RELEASE_SHA}" -fi - -inherit autotools readme.gentoo-r1 systemd - -DESCRIPTION="Graphical boot animation (splash) and logger" -HOMEPAGE="https://cgit.freedesktop.org/plymouth/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug +drm +gtk +pango +split-usr static-libs +udev" - -CDEPEND=" - >=media-libs/libpng-1.2.16:= - drm? ( x11-libs/libdrm ) - gtk? ( - dev-libs/glib:2 - >=x11-libs/gtk+-3.14:3 - x11-libs/cairo - ) - pango? ( >=x11-libs/pango-1.21 ) -" -DEPEND="${CDEPEND} - elibc_musl? ( sys-libs/rpmatch-standalone ) - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - virtual/pkgconfig -" -# Block due bug #383067 -RDEPEND="${CDEPEND} - udev? ( virtual/udev ) - !<sys-kernel/dracut-0.37-r3 -" - -DOC_CONTENTS=" - Follow the following instructions to set up Plymouth:\n - https://wiki.gentoo.org/wiki/Plymouth#Configuration -" - -PATCHES=( - "${FILESDIR}"/0.9.3-glibc-sysmacros.patch -) - -src_prepare() { - use elibc_musl && append-ldflags -lrpmatch - default - eautoreconf -} - -src_configure() { - local myconf=( - --with-system-root-install=no - --localstatedir=/var - --without-rhgb-compat-link - --enable-documentation - --enable-systemd-integration - --with-systemdunitdir="$(systemd_get_systemunitdir)" - $(use_enable !static-libs shared) - $(use_enable static-libs static) - $(use_enable debug tracing) - $(use_enable drm) - $(use_enable gtk) - $(use_enable pango) - $(use_with udev) - ) - econf "${myconf[@]}" -} - -src_install() { - default - - insinto /usr/share/plymouth - newins "${DISTDIR}"/gentoo-logo.png bizcom.png - - if use split-usr ; then - # Install compatibility symlinks as some rdeps hardcode the paths - dosym ../usr/bin/plymouth /bin/plymouth - dosym ../usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme - dosym ../usr/sbin/plymouthd /sbin/plymouthd - fi - - readme.gentoo_create_doc - - # looks like make install create /var/run/plymouth - # this is not needed for systemd, same should hold for openrc - # so remove - rm -rf "${D}"/var/run - - # fix broken symlink - dosym ../../bizcom.png /usr/share/plymouth/themes/spinfinity/header-image.png -} - -pkg_postinst() { - readme.gentoo_print_elog - if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then - ewarn "If you want initramfs builder with plymouth support, please emerge" - ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]." - fi -} diff --git a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild index b69e14eb1e65..d87fe2ec7e36 100644 --- a/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild +++ b/sys-boot/plymouth/plymouth-22.02.122-r1.ebuild @@ -105,8 +105,8 @@ src_install() { pkg_postinst() { readme.gentoo_print_elog - if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then + if ! has_version "sys-kernel/dracut"; then ewarn "If you want initramfs builder with plymouth support, please emerge" - ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]." + ewarn "sys-kernel/dracut." fi } diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild index e3ad01aa6372..23aadfbab573 100644 --- a/sys-boot/plymouth/plymouth-9999.ebuild +++ b/sys-boot/plymouth/plymouth-9999.ebuild @@ -105,8 +105,8 @@ src_install() { pkg_postinst() { readme.gentoo_print_elog - if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then + if ! has_version "sys-kernel/dracut"; then ewarn "If you want initramfs builder with plymouth support, please emerge" - ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]." + ewarn "sys-kernel/dracut." fi }
![https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"](https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"){kind=link}