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 9BA2C139335 for ; Sun, 27 Jun 2021 08:13:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4107E0821; Sun, 27 Jun 2021 08:13:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 853B6E0821 for ; Sun, 27 Jun 2021 08:13:47 +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 C6A9A335DB8 for ; Sun, 27 Jun 2021 08:13:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BD0E7B3 for ; Sun, 27 Jun 2021 08:13:45 +0000 (UTC) From: "Marco Scardovi" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marco Scardovi" Message-ID: <1624781616.14140750e36a8698d8864878f442db965bf6b32f.marco@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/ X-VCS-Repository: repo/proj/guru X-VCS-Files: x11-wm/phoc/phoc-0.7.1.ebuild X-VCS-Directories: x11-wm/phoc/ X-VCS-Committer: marco X-VCS-Committer-Name: Marco Scardovi X-VCS-Revision: 14140750e36a8698d8864878f442db965bf6b32f X-VCS-Branch: dev Date: Sun, 27 Jun 2021 08:13:45 +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: f4534686-4202-4753-8d69-b305dd940c39 X-Archives-Hash: 38e5c97d0c36224ed2e3b59a5b4492b0 commit: 14140750e36a8698d8864878f442db965bf6b32f Author: Marco Scardovi scardovi com> AuthorDate: Sun Jun 27 08:13:16 2021 +0000 Commit: Marco Scardovi scardovi com> CommitDate: Sun Jun 27 08:13:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=14140750 x11-wm/phoc: remove the gnome2-utils Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Marco Scardovi scardovi.com> x11-wm/phoc/phoc-0.7.1.ebuild | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/x11-wm/phoc/phoc-0.7.1.ebuild b/x11-wm/phoc/phoc-0.7.1.ebuild index 1c0e78a69..cda542c9d 100644 --- a/x11-wm/phoc/phoc-0.7.1.ebuild +++ b/x11-wm/phoc/phoc-0.7.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit vala meson gnome2-utils xdg +inherit meson vala xdg MY_PV="v${PV}" MY_P="${PN}-${MY_PV}" @@ -24,20 +24,27 @@ SRC_URI=" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm64" -IUSE="+introspection" +IUSE="+introspection +systemd test" +RESTRICT="!test? ( test )" -DEPEND=" +RDEPEND=" dev-libs/glib dev-libs/gobject-introspection dev-libs/libinput + dev-libs/wayland dev-libs/wayland-protocols gnome-base/gnome-desktop - !gui-libs/wlroots + systemd? ( + !sys-apps/openrc + sys-apps/systemd + ) + x11-libs/libdrm + x11-libs/pixman x11-libs/xcb-util x11-libs/xcb-util-wm x11-wm/mutter " -RDEPEND="${DEPEND}" + BDEPEND=" dev-util/ctags dev-util/meson @@ -54,9 +61,8 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default - eapply_user - rm -r "${S}"/subprojects/wlroots || die - mv "${WORKDIR}/${WL_P}" "${S}"/subprojects/wlroots || die + rm -r "${S}"/subprojects/wlroots || die "Failed to remove bundled wlroots" + cp -r "${WORKDIR}/${WL_P}" "${S}"/subprojects/wlroots || die "Failed to copy right version of wlroots" } src_configure() { @@ -70,16 +76,14 @@ src_configure() { } src_install() { - meson_src_install - dobin "${S}"/helpers/scale-to-fit + DESTDIR="${D}" meson_src_install +# dobin "${S}"/helpers/scale-to-fit } pkg_postinst() { xdg_pkg_postinst - gnome2_schemas_update } pkg_postrm() { xdg_pkg_postrm - gnome2_schemas_update }