| 1 |
commit: 14140750e36a8698d8864878f442db965bf6b32f |
| 2 |
Author: Marco Scardovi <marco <AT> scardovi <DOT> com> |
| 3 |
AuthorDate: Sun Jun 27 08:13:16 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 27 08:13:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=14140750 |
| 7 |
|
| 8 |
x11-wm/phoc: remove the gnome2-utils |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 11 |
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com> |
| 12 |
|
| 13 |
x11-wm/phoc/phoc-0.7.1.ebuild | 28 ++++++++++++++++------------ |
| 14 |
1 file changed, 16 insertions(+), 12 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-wm/phoc/phoc-0.7.1.ebuild b/x11-wm/phoc/phoc-0.7.1.ebuild |
| 17 |
index 1c0e78a69..cda542c9d 100644 |
| 18 |
--- a/x11-wm/phoc/phoc-0.7.1.ebuild |
| 19 |
+++ b/x11-wm/phoc/phoc-0.7.1.ebuild |
| 20 |
@@ -3,7 +3,7 @@ |
| 21 |
|
| 22 |
EAPI=7 |
| 23 |
|
| 24 |
-inherit vala meson gnome2-utils xdg |
| 25 |
+inherit meson vala xdg |
| 26 |
|
| 27 |
MY_PV="v${PV}" |
| 28 |
MY_P="${PN}-${MY_PV}" |
| 29 |
@@ -24,20 +24,27 @@ SRC_URI=" |
| 30 |
LICENSE="GPL-3" |
| 31 |
SLOT="0" |
| 32 |
KEYWORDS="~amd64 ~arm64" |
| 33 |
-IUSE="+introspection" |
| 34 |
+IUSE="+introspection +systemd test" |
| 35 |
+RESTRICT="!test? ( test )" |
| 36 |
|
| 37 |
-DEPEND=" |
| 38 |
+RDEPEND=" |
| 39 |
dev-libs/glib |
| 40 |
dev-libs/gobject-introspection |
| 41 |
dev-libs/libinput |
| 42 |
+ dev-libs/wayland |
| 43 |
dev-libs/wayland-protocols |
| 44 |
gnome-base/gnome-desktop |
| 45 |
- !gui-libs/wlroots |
| 46 |
+ systemd? ( |
| 47 |
+ !sys-apps/openrc |
| 48 |
+ sys-apps/systemd |
| 49 |
+ ) |
| 50 |
+ x11-libs/libdrm |
| 51 |
+ x11-libs/pixman |
| 52 |
x11-libs/xcb-util |
| 53 |
x11-libs/xcb-util-wm |
| 54 |
x11-wm/mutter |
| 55 |
" |
| 56 |
-RDEPEND="${DEPEND}" |
| 57 |
+ |
| 58 |
BDEPEND=" |
| 59 |
dev-util/ctags |
| 60 |
dev-util/meson |
| 61 |
@@ -54,9 +61,8 @@ S="${WORKDIR}/${MY_P}" |
| 62 |
|
| 63 |
src_prepare() { |
| 64 |
default |
| 65 |
- eapply_user |
| 66 |
- rm -r "${S}"/subprojects/wlroots || die |
| 67 |
- mv "${WORKDIR}/${WL_P}" "${S}"/subprojects/wlroots || die |
| 68 |
+ rm -r "${S}"/subprojects/wlroots || die "Failed to remove bundled wlroots" |
| 69 |
+ cp -r "${WORKDIR}/${WL_P}" "${S}"/subprojects/wlroots || die "Failed to copy right version of wlroots" |
| 70 |
} |
| 71 |
|
| 72 |
src_configure() { |
| 73 |
@@ -70,16 +76,14 @@ src_configure() { |
| 74 |
} |
| 75 |
|
| 76 |
src_install() { |
| 77 |
- meson_src_install |
| 78 |
- dobin "${S}"/helpers/scale-to-fit |
| 79 |
+ DESTDIR="${D}" meson_src_install |
| 80 |
+# dobin "${S}"/helpers/scale-to-fit |
| 81 |
} |
| 82 |
|
| 83 |
pkg_postinst() { |
| 84 |
xdg_pkg_postinst |
| 85 |
- gnome2_schemas_update |
| 86 |
} |
| 87 |
|
| 88 |
pkg_postrm() { |
| 89 |
xdg_pkg_postrm |
| 90 |
- gnome2_schemas_update |
| 91 |
} |
Archives