[gentoo-commits] repo/proj/guru:dev commit in: x11-wm/phoc/

[Gerben Jan Dijkman]

commit:     7f95347bd90d97e665d47a949daca6dfe1bf0b34
Author:     Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver <DOT> nl>
AuthorDate: Mon Apr  4 12:34:15 2022 +0000
Commit:     Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver <DOT> nl>
CommitDate: Mon Apr  4 12:34:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7f95347b

x11-wm/phoc: Version Bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver.nl>

 x11-wm/phoc/Manifest                               |  5 +-
 x11-wm/phoc/phoc-0.11.0.ebuild                     | 85 ----------------------
 .../{phoc-0.12.0.ebuild => phoc-0.13.1.ebuild}     |  4 +-
 3 files changed, 4 insertions(+), 90 deletions(-)

diff --git a/x11-wm/phoc/Manifest b/x11-wm/phoc/Manifest
index fb3617b8c..a33a4d1f5 100644
--- a/x11-wm/phoc/Manifest
+++ b/x11-wm/phoc/Manifest
@@ -1,3 +1,2 @@
-DIST phoc-v0.11.0.tar.gz 161198 BLAKE2B 1121dead62dc1088043843e3816d11b9ee0231566eccd78add1ed6e75a2d158e8bc844dd4831a05b0a3ff1c5a3d8181c46c3163ba105285a0833b246e50dc386 SHA512 0ed455a9216ec1fb8100cf8422d771c56e37067f8c1a809b1cde0e424d48622780fd0ffd6b164e1217218c56a016e448a23d7acb03559c5b7058d6b359e56e14
-DIST phoc-v0.12.0.tar.gz 164086 BLAKE2B 64db3b0ee6994e53e0270cd721fc89452f85c7852e92e97e087dd584dd9c1bb8b6449b14c2cb738e5cfb1917829d2b823a4e3568b5ecd8d1fd0e46c64e2e017e SHA512 4eea728f576da1b4e70ac4b697a685077b8053045f5bb5dced0a327ee59dfca7df9c94f68f1a2dd4de852e9787a64a045e04edd814293820a623c910a75ed630
-DIST wlroots-2fce64d30d378d7009a5770b2472231a0e535ada.tar.gz 506577 BLAKE2B 4ea1bfa90e6b6e00c68ab29c04519876c5fefc229d3affde035cfb4b7355f7119cf2bca3d5337aca297741e4795a22739b3a8d627ffe5fbc37bcf24fa91bc3d2 SHA512 cecf7427bdcb231516d665e47cd2508fabda0ba03b2e0f8f3279197c0403c9d8f07f7a00906179e80e53fe9e0a1a226bda99f94d398ba278803b98b76574a2b4
+DIST phoc-v0.13.1.tar.gz 166867 BLAKE2B 6606855efe7099d12c8be3ee16c401bbcc618aaed2f264abe982cc4a49ccbc0e65fac1b7d8da62de4261bdf3a322f4313a15723c7b7cb7a9ce279957dbf89c78 SHA512 0da68ac4d0601e91ed5f59eeb0beea64180b546f58b300631495084d366fe515c26fe9d58d0ca20687032f6824ae98dcc82edd8a6c80caa95178d24d27ee2650
+DIST wlroots-c9cd3502ba6113070020de50e41f0af72e0f5031.tar.gz 506612 BLAKE2B 70589e63cf223aa5b3634e057cc8c9d1f52d0f6c0fd3bbf66739bc1c934036bab0e8fc8337f51b1d4bb0d73c008b16421c354194cf215741e84ad88345465870 SHA512 af610233ec2343a3baefbb30db4b9a3f30dac4f8656293849be603fbcad0cdd65e91d80702c35e4aaf47437e8c301229c4933b7c8b5df3a7128979c94bcfcddc

diff --git a/x11-wm/phoc/phoc-0.11.0.ebuild b/x11-wm/phoc/phoc-0.11.0.ebuild
deleted file mode 100644
index bad337bad..000000000
--- a/x11-wm/phoc/phoc-0.11.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson vala xdg gnome2-utils
-
-MY_PV="v${PV}"
-MY_P="${PN}-${MY_PV}"
-
-WL_COMMIT="2fce64d30d378d7009a5770b2472231a0e535ada"
-WL_P="wlroots-${WL_COMMIT}"
-
-DESCRIPTION="Wlroots based Phone compositor"
-HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phoc"
-
-# we don't use the version on gentoo because it breaks
-# the phoc installation. we follow method used in archlinuxarm
-SRC_URI="
-	https://gitlab.gnome.org/World/Phosh/phoc/-/archive/${MY_PV}/${MY_P}.tar.gz
-	https://source.puri.sm/Librem5/wlroots/-/archive/${WL_COMMIT}/${WL_P}.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="+introspection +systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib
-	dev-libs/gobject-introspection
-	dev-libs/libinput
-	dev-libs/wayland
-	dev-libs/wayland-protocols
-	gnome-base/gnome-desktop
-	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
-	sys-auth/seatd
-	!gui-libs/wlroots
-"
-
-BDEPEND="
-	dev-util/ctags
-	dev-util/meson
-	virtual/pkgconfig
-	x11-base/xorg-server
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	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() {
-	local emesonargs=(
-		-Ddefault_library=shared
-		-Dtests=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	DESTDIR="${D}" meson_src_install
-	dobin "${S}"/helpers/scale-to-fit
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}

diff --git a/x11-wm/phoc/phoc-0.12.0.ebuild b/x11-wm/phoc/phoc-0.13.1.ebuild
similarity index 94%
rename from x11-wm/phoc/phoc-0.12.0.ebuild
rename to x11-wm/phoc/phoc-0.13.1.ebuild
index 1b8747b84..5186898e1 100644
--- a/x11-wm/phoc/phoc-0.12.0.ebuild
+++ b/x11-wm/phoc/phoc-0.13.1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit meson vala xdg gnome2-utils
+inherit meson xdg gnome2-utils
 
 MY_PV="v${PV}"
 MY_P="${PN}-${MY_PV}"
 
-WL_COMMIT="2fce64d30d378d7009a5770b2472231a0e535ada"
+WL_COMMIT="c9cd3502ba6113070020de50e41f0af72e0f5031"
 WL_P="wlroots-${WL_COMMIT}"
 
 DESCRIPTION="Wlroots based Phone compositor"