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 B71921382C5 for ; Wed, 4 Apr 2018 17:04:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC82AE09DE; Wed, 4 Apr 2018 17:04:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 72C38E09DE for ; Wed, 4 Apr 2018 17:04:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9035D335C0A for ; Wed, 4 Apr 2018 17:04:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F277250 for ; Wed, 4 Apr 2018 17:04:24 +0000 (UTC) From: "Matt 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, "Matt Thode" Message-ID: <1522861436.1025a469f1d1dbb1c9c281dfb86961ca8d9dfbd3.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/plymouth/plymouth-0.9.3-r2.ebuild sys-boot/plymouth/plymouth-9999.ebuild X-VCS-Directories: sys-boot/plymouth/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 1025a469f1d1dbb1c9c281dfb86961ca8d9dfbd3 X-VCS-Branch: master Date: Wed, 4 Apr 2018 17:04:24 +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-Archives-Salt: 161d0d17-31b5-42ae-9984-da8f8ea4f5ba X-Archives-Hash: 025b683f09a6020df8a7fac4a28627e5 commit: 1025a469f1d1dbb1c9c281dfb86961ca8d9dfbd3 Author: Matthew Thode gentoo org> AuthorDate: Wed Apr 4 17:03:04 2018 +0000 Commit: Matt Thode gentoo org> CommitDate: Wed Apr 4 17:03:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1025a469 sys-boot/plymouth: fixing musl and updating 9999 ebuild Closes: https://bugs.gentoo.org/651874 Package-Manager: Portage-2.3.27, Repoman-2.3.9 .../{plymouth-9999.ebuild => plymouth-0.9.3-r2.ebuild} | 14 ++++++++++---- sys-boot/plymouth/plymouth-9999.ebuild | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-0.9.3-r2.ebuild similarity index 90% copy from sys-boot/plymouth/plymouth-9999.ebuild copy to sys-boot/plymouth/plymouth-0.9.3-r2.ebuild index 375f98aabb3..5ffedf306a9 100644 --- a/sys-boot/plymouth/plymouth-9999.ebuild +++ b/sys-boot/plymouth/plymouth-0.9.3-r2.ebuild @@ -3,13 +3,15 @@ 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="https://anongit.freedesktop.org/git/plymouth" inherit git-r3 + EGIT_REPO_URI="https://anongit.freedesktop.org/git/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" fi inherit autotools readme.gentoo-r1 systemd toolchain-funcs @@ -19,8 +21,6 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/" LICENSE="GPL-2" SLOT="0" -[[ ${PV} == 9999 ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="debug gdm +gtk +libkms +pango static-libs" CDEPEND=" @@ -28,11 +28,15 @@ CDEPEND=" gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 - x11-libs/cairo ) + 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 @@ -51,6 +55,7 @@ PATCHES=( ) src_prepare() { + use elibc_musl && append-ldflags -lrpmatch default eautoreconf } @@ -60,6 +65,7 @@ src_configure() { --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) diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild index 375f98aabb3..5ffedf306a9 100644 --- a/sys-boot/plymouth/plymouth-9999.ebuild +++ b/sys-boot/plymouth/plymouth-9999.ebuild @@ -3,13 +3,15 @@ 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="https://anongit.freedesktop.org/git/plymouth" inherit git-r3 + EGIT_REPO_URI="https://anongit.freedesktop.org/git/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" fi inherit autotools readme.gentoo-r1 systemd toolchain-funcs @@ -19,8 +21,6 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/" LICENSE="GPL-2" SLOT="0" -[[ ${PV} == 9999 ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="debug gdm +gtk +libkms +pango static-libs" CDEPEND=" @@ -28,11 +28,15 @@ CDEPEND=" gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 - x11-libs/cairo ) + 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 @@ -51,6 +55,7 @@ PATCHES=( ) src_prepare() { + use elibc_musl && append-ldflags -lrpmatch default eautoreconf } @@ -60,6 +65,7 @@ src_configure() { --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)