From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 54895138359 for ; Wed, 8 Jul 2020 22:10:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C6A6E0784; Wed, 8 Jul 2020 22:10:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 358EDE0784 for ; Wed, 8 Jul 2020 22:10:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3E3234ED5E for ; Wed, 8 Jul 2020 22:10:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15E41162 for ; Wed, 8 Jul 2020 22:10:39 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1594246231.ba28aec661049833452dfac9c6650b3b22082ed7.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/plymouth/Manifest sys-boot/plymouth/plymouth-0.9.5.ebuild sys-boot/plymouth/plymouth-9999.ebuild X-VCS-Directories: sys-boot/plymouth/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: ba28aec661049833452dfac9c6650b3b22082ed7 X-VCS-Branch: master Date: Wed, 8 Jul 2020 22:10:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 67b3b9e6-3e16-4ede-b803-e0e02348a44c X-Archives-Hash: 0afbf8edf46cedf8689cf4b3df4eba0c commit: ba28aec661049833452dfac9c6650b3b22082ed7 Author: Matthew Thode gentoo org> AuthorDate: Wed Jul 8 22:10:31 2020 +0000 Commit: Matthew Thode gentoo org> CommitDate: Wed Jul 8 22:10:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba28aec6 sys-boot/plymouth: 0.9.5 bump Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Matthew Thode gentoo.org> sys-boot/plymouth/Manifest | 1 + .../{plymouth-9999.ebuild => plymouth-0.9.5.ebuild} | 17 +++++++++-------- sys-boot/plymouth/plymouth-9999.ebuild | 17 +++++++++-------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest index 9e889ee2efe..881eb629c18 100644 --- a/sys-boot/plymouth/Manifest +++ b/sys-boot/plymouth/Manifest @@ -1,3 +1,4 @@ DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da734ff9ae255fcd65e549d9bc3d510c283e235a770f42edcbdffc1d5cc4c2fcdec9cc931eb0acf504859 SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992872813a9f937211930f653207d77c1a331cb093156af5ec9502a04cf1f9e4123c42e07931eaf270fefedcc03700 SHA512 d7b9ba97485cdac7ad6bcaf5a7f1a9c84ece54b8d46d5efce4170294c0aa6571656d7d9957b53aed9c1e51d4d525714f54b7dbb08d8ec0b196a1a4419fd186ed DIST plymouth-0.9.4.tar.xz 1103496 BLAKE2B abad2cefb89e9d17b77113396d7203090544759b3dd7f73f67153d9f126db28e5366d36aa11e2335566bf4046bebd50d8d9dd47c75634446fb3a0314cd458925 SHA512 83eb2de7e6d0980e9f7fa4e0b0f20c46a8238051d84bc38dbbb5dfa438e41c1a39846dcd652374256d9f1fe79967b154a3576cd9c433ef816b6c962be2d31e93 +DIST plymouth-0.9.5.tar.xz 1186200 BLAKE2B 8fd073703773fcf7f3e26454c860f094fb4b3d712c56c9df6716ef11815a79f7d5b078ab6c6567b76421026d84a086f95865bf9f3e4ae6363cb1ffc2caa68537 SHA512 686220e8d5b1a8be298156786d979d0e3fb9e010b930d0e8082a2bb152cf07c1bf493d820c243838a1771ee859dc0b4723bd9f10ee434a94a096ce9236c36ce9 diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-0.9.5.ebuild similarity index 83% copy from sys-boot/plymouth/plymouth-9999.ebuild copy to sys-boot/plymouth/plymouth-0.9.5.ebuild index f833e4ef1b5..19a9265e3f9 100644 --- a/sys-boot/plymouth/plymouth-9999.ebuild +++ b/sys-boot/plymouth/plymouth-0.9.5.ebuild @@ -8,10 +8,10 @@ SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo if [[ ${PV} == 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth" + 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi inherit autotools readme.gentoo-r1 systemd toolchain-funcs @@ -21,7 +21,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/" LICENSE="GPL-2" SLOT="0" -IUSE="debug gdm +gtk +libkms +pango static-libs +udev" +IUSE="debug +gtk +libkms +pango static-libs +udev" CDEPEND=" >=media-libs/libpng-1.2.16:= @@ -74,7 +74,6 @@ src_configure() { $(use_enable gtk gtk) $(use_enable libkms drm) $(use_enable pango) - $(use_enable gdm gdm-transition) $(use_with udev) ) econf "${myconf[@]}" @@ -86,10 +85,12 @@ src_install() { 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 + 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 diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild index f833e4ef1b5..19a9265e3f9 100644 --- a/sys-boot/plymouth/plymouth-9999.ebuild +++ b/sys-boot/plymouth/plymouth-9999.ebuild @@ -8,10 +8,10 @@ SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo if [[ ${PV} == 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth" + 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi inherit autotools readme.gentoo-r1 systemd toolchain-funcs @@ -21,7 +21,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/" LICENSE="GPL-2" SLOT="0" -IUSE="debug gdm +gtk +libkms +pango static-libs +udev" +IUSE="debug +gtk +libkms +pango static-libs +udev" CDEPEND=" >=media-libs/libpng-1.2.16:= @@ -74,7 +74,6 @@ src_configure() { $(use_enable gtk gtk) $(use_enable libkms drm) $(use_enable pango) - $(use_enable gdm gdm-transition) $(use_with udev) ) econf "${myconf[@]}" @@ -86,10 +85,12 @@ src_install() { 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 + 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