commit: 114f9ae2ff3cc1dd154051baa75d0d9d6848fa7e Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Wed May 2 19:09:33 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Fri May 4 12:52:02 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=114f9ae2
sys-boot/plymouth: fixed in the tree sys-boot/plymouth/Manifest | 2 - .../plymouth/files/0.9.3-glibc-sysmacros.patch | 45 --------- sys-boot/plymouth/metadata.xml | 28 ------ sys-boot/plymouth/plymouth-0.9.3-r1.ebuild | 108 --------------------- 4 files changed, 183 deletions(-) diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest deleted file mode 100644 index 9ddbef2..0000000 --- a/sys-boot/plymouth/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da734ff9ae255fcd65e549d9bc3d510c283e235a770f42edcbdffc1d5cc4c2fcdec9cc931eb0acf504859 SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c -DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992872813a9f937211930f653207d77c1a331cb093156af5ec9502a04cf1f9e4123c42e07931eaf270fefedcc03700 SHA512 d7b9ba97485cdac7ad6bcaf5a7f1a9c84ece54b8d46d5efce4170294c0aa6571656d7d9957b53aed9c1e51d4d525714f54b7dbb08d8ec0b196a1a4419fd186ed diff --git a/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch b/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch deleted file mode 100644 index 8969161..0000000 --- a/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f8d7813b32dfe129d1e5718719ee3eff131f4fac Mon Sep 17 00:00:00 2001 -From: Kjell Claesson <[email protected]> -Date: Fri, 18 Aug 2017 00:25:56 +0200 -Subject: [PATCH] Fix build with newer glibc - -Signed-off-by: Gilles Dartiguelongue <[email protected]> ---- - configure.ac | 1 + - src/libply-splash-core/ply-terminal.c | 8 ++++++++ - 2 files changed, 9 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c32697f..8376789 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5,6 +5,7 @@ AC_CONFIG_AUX_DIR(build-tools) - - AC_USE_SYSTEM_EXTENSIONS - AC_SYS_LARGEFILE -+AC_HEADER_MAJOR - AC_PROG_AWK - AC_PROG_CC_STDC - AM_PROG_CC_C_O -diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c -index a0954f2..ef62bf8 100644 ---- a/src/libply-splash-core/ply-terminal.c -+++ b/src/libply-splash-core/ply-terminal.c -@@ -36,6 +36,14 @@ - #include <unistd.h> - #include <wchar.h> - -+/* major()/minor() */ -+#ifdef MAJOR_IN_MKDEV -+# include <sys/mkdev.h> -+#endif -+#ifdef MAJOR_IN_SYSMACROS -+# include <sys/sysmacros.h> -+#endif -+ - #include <linux/kd.h> - #include <linux/major.h> - #include <linux/vt.h> --- -2.14.1 - diff --git a/sys-boot/plymouth/metadata.xml b/sys-boot/plymouth/metadata.xml deleted file mode 100644 index 22a2251..0000000 --- a/sys-boot/plymouth/metadata.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Matthew Thode</name> - </maintainer> - <maintainer type="person"> - <email>[email protected]</email> - <name>Gilles Dartiguelongue</name> - </maintainer> - <use> - <flag name="gdm">Enables smooth transition to GDM</flag> - <flag name="libkms">Provides abstraction to the DRM drivers (intel, - nouveau and vmwgfx at this moment)</flag> - <flag name="pango">Adds support for printing text on splash screen and - text prompts, e.g. for password</flag> - </use> - <longdescription lang="en"> - Plymouth is an application that runs very early in the boot process - (even before the root filesystem is mounted!) that provides a graphical - boot animation while the boot process happens in the background. - - It is designed to work on systems with DRM modesetting drivers. Ideally, - the goal is to get rid of all flicker during startup. For systems that - don't have DRM mode settings drivers, plymouth falls back to text mode. - </longdescription> -</pkgmetadata> diff --git a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild deleted file mode 100644 index 78f3ea4..0000000 --- a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"; - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/plymouth" - inherit git-r3 -else - SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"; -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" -[[ ${PV} == 9999 ]] || \ -KEYWORDS="amd64 arm ~mips ppc x86" -IUSE="debug gdm +gtk +libkms +pango static-libs" - -CDEPEND=" - >=media-libs/libpng-1.2.16:= - gtk? ( - dev-libs/glib:2 - >=x11-libs/gtk+-3.14:3 - x11-libs/cairo ) - libkms? ( x11-libs/libdrm[libkms] ) - 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} - 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 gtk gtk) - $(use_enable libkms drm) - $(use_enable pango) - $(use_enable gdm gdm-transition) - ) - econf "${myconf[@]}" -} - -src_install() { - default - - insinto /usr/share/plymouth - newins "${DISTDIR}"/gentoo-logo.png bizcom.png - - # 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 - - 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 -} - -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 -}
![https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"](https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"){kind=link}