Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth/
Date: Tue, 08 Sep 2020 20:42:32
Message-Id: 1599597745.14d2aca1ac0f654e4a5ed7a788791876a90033ff.prometheanfire@gentoo
1 commit: 14d2aca1ac0f654e4a5ed7a788791876a90033ff
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 8 20:42:07 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 8 20:42:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d2aca1
7
8 sys-boot/plymouth: clean up
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 sys-boot/plymouth/Manifest | 1 -
14 sys-boot/plymouth/plymouth-0.9.3-r2.ebuild | 107 ----------------------------
15 sys-boot/plymouth/plymouth-0.9.4-r1.ebuild | 110 -----------------------------
16 3 files changed, 218 deletions(-)
17
18 diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
19 index 881eb629c18..090ffac2de5 100644
20 --- a/sys-boot/plymouth/Manifest
21 +++ b/sys-boot/plymouth/Manifest
22 @@ -1,4 +1,3 @@
23 DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da734ff9ae255fcd65e549d9bc3d510c283e235a770f42edcbdffc1d5cc4c2fcdec9cc931eb0acf504859 SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c
24 DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992872813a9f937211930f653207d77c1a331cb093156af5ec9502a04cf1f9e4123c42e07931eaf270fefedcc03700 SHA512 d7b9ba97485cdac7ad6bcaf5a7f1a9c84ece54b8d46d5efce4170294c0aa6571656d7d9957b53aed9c1e51d4d525714f54b7dbb08d8ec0b196a1a4419fd186ed
25 -DIST plymouth-0.9.4.tar.xz 1103496 BLAKE2B abad2cefb89e9d17b77113396d7203090544759b3dd7f73f67153d9f126db28e5366d36aa11e2335566bf4046bebd50d8d9dd47c75634446fb3a0314cd458925 SHA512 83eb2de7e6d0980e9f7fa4e0b0f20c46a8238051d84bc38dbbb5dfa438e41c1a39846dcd652374256d9f1fe79967b154a3576cd9c433ef816b6c962be2d31e93
26 DIST plymouth-0.9.5.tar.xz 1186200 BLAKE2B 8fd073703773fcf7f3e26454c860f094fb4b3d712c56c9df6716ef11815a79f7d5b078ab6c6567b76421026d84a086f95865bf9f3e4ae6363cb1ffc2caa68537 SHA512 686220e8d5b1a8be298156786d979d0e3fb9e010b930d0e8082a2bb152cf07c1bf493d820c243838a1771ee859dc0b4723bd9f10ee434a94a096ce9236c36ce9
27
28 diff --git a/sys-boot/plymouth/plymouth-0.9.3-r2.ebuild b/sys-boot/plymouth/plymouth-0.9.3-r2.ebuild
29 deleted file mode 100644
30 index 5ffedf306a9..00000000000
31 --- a/sys-boot/plymouth/plymouth-0.9.3-r2.ebuild
32 +++ /dev/null
33 @@ -1,107 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit flag-o-matic
40 -SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
41 -
42 -if [[ ${PV} == 9999 ]]; then
43 - inherit git-r3
44 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth"
45 -else
46 - SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
47 - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
48 -fi
49 -
50 -inherit autotools readme.gentoo-r1 systemd toolchain-funcs
51 -
52 -DESCRIPTION="Graphical boot animation (splash) and logger"
53 -HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
54 -
55 -LICENSE="GPL-2"
56 -SLOT="0"
57 -IUSE="debug gdm +gtk +libkms +pango static-libs"
58 -
59 -CDEPEND="
60 - >=media-libs/libpng-1.2.16:=
61 - gtk? (
62 - dev-libs/glib:2
63 - >=x11-libs/gtk+-3.14:3
64 - x11-libs/cairo
65 - )
66 - libkms? ( x11-libs/libdrm[libkms] )
67 - pango? ( >=x11-libs/pango-1.21 )
68 -"
69 -DEPEND="${CDEPEND}
70 - elibc_musl? ( sys-libs/rpmatch-standalone )
71 - app-text/docbook-xsl-stylesheets
72 - dev-libs/libxslt
73 - virtual/pkgconfig
74 -"
75 -# Block due bug #383067
76 -RDEPEND="${CDEPEND}
77 - virtual/udev
78 - !<sys-kernel/dracut-0.37-r3
79 -"
80 -
81 -DOC_CONTENTS="
82 - Follow the following instructions to set up Plymouth:\n
83 - https://wiki.gentoo.org/wiki/Plymouth#Configuration
84 -"
85 -
86 -PATCHES=(
87 - "${FILESDIR}"/0.9.3-glibc-sysmacros.patch
88 -)
89 -
90 -src_prepare() {
91 - use elibc_musl && append-ldflags -lrpmatch
92 - default
93 - eautoreconf
94 -}
95 -
96 -src_configure() {
97 - local myconf=(
98 - --with-system-root-install=no
99 - --localstatedir=/var
100 - --without-rhgb-compat-link
101 - --enable-documentation
102 - --enable-systemd-integration
103 - --with-systemdunitdir="$(systemd_get_systemunitdir)"
104 - $(use_enable !static-libs shared)
105 - $(use_enable static-libs static)
106 - $(use_enable debug tracing)
107 - $(use_enable gtk gtk)
108 - $(use_enable libkms drm)
109 - $(use_enable pango)
110 - $(use_enable gdm gdm-transition)
111 - )
112 - econf "${myconf[@]}"
113 -}
114 -
115 -src_install() {
116 - default
117 -
118 - insinto /usr/share/plymouth
119 - newins "${DISTDIR}"/gentoo-logo.png bizcom.png
120 -
121 - # Install compatibility symlinks as some rdeps hardcode the paths
122 - dosym /usr/bin/plymouth /bin/plymouth
123 - dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
124 - dosym /usr/sbin/plymouthd /sbin/plymouthd
125 -
126 - readme.gentoo_create_doc
127 -
128 - # looks like make install create /var/run/plymouth
129 - # this is not needed for systemd, same should hold for openrc
130 - # so remove
131 - rm -rf "${D}"/var/run
132 -}
133 -
134 -pkg_postinst() {
135 - readme.gentoo_print_elog
136 - if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then
137 - ewarn "If you want initramfs builder with plymouth support, please emerge"
138 - ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]."
139 - fi
140 -}
141
142 diff --git a/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild
143 deleted file mode 100644
144 index 1ade24f98db..00000000000
145 --- a/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild
146 +++ /dev/null
147 @@ -1,110 +0,0 @@
148 -# Copyright 1999-2020 Gentoo Authors
149 -# Distributed under the terms of the GNU General Public License v2
150 -
151 -EAPI=7
152 -
153 -inherit flag-o-matic
154 -SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
155 -
156 -if [[ ${PV} == 9999 ]]; then
157 - inherit git-r3
158 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth"
159 -else
160 - SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
161 - KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
162 -fi
163 -
164 -inherit autotools readme.gentoo-r1 systemd toolchain-funcs
165 -
166 -DESCRIPTION="Graphical boot animation (splash) and logger"
167 -HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
168 -
169 -LICENSE="GPL-2"
170 -SLOT="0"
171 -IUSE="debug gdm +gtk +libkms +pango +split-usr static-libs +udev"
172 -
173 -CDEPEND="
174 - >=media-libs/libpng-1.2.16:=
175 - gtk? (
176 - dev-libs/glib:2
177 - >=x11-libs/gtk+-3.14:3
178 - x11-libs/cairo
179 - )
180 - libkms? ( x11-libs/libdrm[libkms] )
181 - pango? ( >=x11-libs/pango-1.21 )
182 -"
183 -DEPEND="${CDEPEND}
184 - elibc_musl? ( sys-libs/rpmatch-standalone )
185 - app-text/docbook-xsl-stylesheets
186 - dev-libs/libxslt
187 - virtual/pkgconfig
188 -"
189 -# Block due bug #383067
190 -RDEPEND="${CDEPEND}
191 - udev? ( virtual/udev )
192 - !<sys-kernel/dracut-0.37-r3
193 -"
194 -
195 -DOC_CONTENTS="
196 - Follow the following instructions to set up Plymouth:\n
197 - https://wiki.gentoo.org/wiki/Plymouth#Configuration
198 -"
199 -
200 -PATCHES=(
201 - "${FILESDIR}"/0.9.3-glibc-sysmacros.patch
202 -)
203 -
204 -src_prepare() {
205 - use elibc_musl && append-ldflags -lrpmatch
206 - default
207 - eautoreconf
208 -}
209 -
210 -src_configure() {
211 - local myconf=(
212 - --with-system-root-install=no
213 - --localstatedir=/var
214 - --without-rhgb-compat-link
215 - --enable-documentation
216 - --enable-systemd-integration
217 - --with-systemdunitdir="$(systemd_get_systemunitdir)"
218 - $(use_enable !static-libs shared)
219 - $(use_enable static-libs static)
220 - $(use_enable debug tracing)
221 - $(use_enable gtk gtk)
222 - $(use_enable libkms drm)
223 - $(use_enable pango)
224 - $(use_enable gdm gdm-transition)
225 - $(use_with udev)
226 - )
227 - econf "${myconf[@]}"
228 -}
229 -
230 -src_install() {
231 - default
232 -
233 - insinto /usr/share/plymouth
234 - newins "${DISTDIR}"/gentoo-logo.png bizcom.png
235 -
236 - if use split-usr ; then
237 - # Install compatibility symlinks as some rdeps hardcode the paths
238 - dosym ../usr/bin/plymouth /bin/plymouth
239 - dosym ../usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
240 - dosym ../usr/sbin/plymouthd /sbin/plymouthd
241 - fi
242 -
243 - readme.gentoo_create_doc
244 -
245 - # looks like make install create /var/run/plymouth
246 - # this is not needed for systemd, same should hold for openrc
247 - # so remove
248 - rm -rf "${D}"/var/run
249 -}
250 -
251 -pkg_postinst() {
252 - readme.gentoo_print_elog
253 - if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then
254 - ewarn "If you want initramfs builder with plymouth support, please emerge"
255 - ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]."
256 - fi
257 -}