From cc4618c9ba3d974948ebf340b542d8cb01db2f55 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 16 Sep 2021 22:05:01 +0100 Subject: gentoo resync : 16.09.2021 --- gui-wm/wayfire/Manifest | 8 ++- gui-wm/wayfire/metadata.xml | 2 +- gui-wm/wayfire/wayfire-0.7.1.ebuild | 104 ------------------------------------ gui-wm/wayfire/wayfire-0.7.2.ebuild | 7 ++- gui-wm/wayfire/wayfire-9999.ebuild | 9 ++-- 5 files changed, 15 insertions(+), 115 deletions(-) delete mode 100644 gui-wm/wayfire/wayfire-0.7.1.ebuild (limited to 'gui-wm/wayfire') diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index 7b0a82bd9b70..4bbb36663dd7 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,8 +1,6 @@ AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143c9badf0e9852bed4af14bb0c4dd3101a179958b06904889204915e965c46f64073fb8f05800553e3 SHA512 616bbf244a358fb7fbeb1230a3ba862a7ca373fdf3b181819a05ca63da82c78fcd80d0f7167d50488c38820559f007702d2c86ac861f214775c3a6271351bb1d AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039 -DIST wayfire-0.7.1.tar.xz 753104 BLAKE2B e26b5e770fff44ef04a9d832ed404f05d37448c8ecc0be1e976b8bd0866c2716150bc43394fc4d2fbba1854696eaf54f16dabc632b686f236e66313d0d1eaf59 SHA512 c045ed16d2eb24b508f84d6616021638ec139b99618f5cb834f2b3675d1e549a6cc1bc3150dd97965a16a2a23fe54abe34e4671ce345350a7fb4084f13d7e969 DIST wayfire-0.7.2.tar.xz 753132 BLAKE2B 0873ff9937cdc7cc63af2c2c365c7e3eed9c0784ab0777e88de9aa373316e9bb1c87a10651d8526577e3da32e402e4d8f6db68d32bc4fcf5513f526751f76829 SHA512 e1321605dbae2b9769a54aaacb0e4a4259b1e2ab4304e8a8c1257f7033b2d740b0632053309ecccc75e04f7b6d2bdf6d68dcebad6950fd914c3052b19bc58e24 -EBUILD wayfire-0.7.1.ebuild 2580 BLAKE2B 09eb5d67feff24b583b0e4ee01daf29648d94cc24e11c3a691180ba669800a37e59d8caf3fdba5bce719c0cd2f56d159324ec01dc3306c4dd90dfefb6a2af01f SHA512 708e46581f1aebb898303b681cb69de80a53991f9f7f0bb8b0ffe130e7993ccaf6cb4d261348b2c6648c2a9f2d4d697e8b13ded6d7da75de5737d809801f4d99 -EBUILD wayfire-0.7.2.ebuild 2313 BLAKE2B c94b3744ee151f14a36753153833f4d6cbb7cf2903206e0a09c5a823212bd26ac2f3fffdda3fb050f0413421008ad35142c0e9e6ad609edb2c02c30927e4df3c SHA512 ce905fb586c3166cb1f356a878d32d554f2bc26b7ac495cd8ef956e353a62b962531d6390612bc52de01f5f859e1af9b8a88199fcda685fa619df0540e50add8 -EBUILD wayfire-9999.ebuild 2239 BLAKE2B ef25ef945f009d6e4cc824fe91fdd5f5c53220b6082299c5b4aee322001765cfc22dcad861c504efa326fd042d8facb8cb0324389aa477379d8032a6268a6d35 SHA512 62aa06ab7ba2f4b26fdcaa93f5c1c2a7ac8a8334a2e99cef923fea1e5217aab19a1f92387ca144d9379c82279e6a47df5ff876dcefc81cfce8d991a99c8c5ef0 -MISC metadata.xml 1080 BLAKE2B 4bdf18556fcdd4e1c5f10e658dc0c7c7237d19d3678b2cd9025f703f29f3faffc1f9c7b1adcf8aa930ad819c932d55281169cec624e05000adeac17eff3caef9 SHA512 fff94cb62f8362b451f1843bf440109e4d4a941c866197cc249e209443ec373e6b7cfb491fadeebdfb84f2165cee3ee58d498c07056f5e8cb4040b9029f41f80 +EBUILD wayfire-0.7.2.ebuild 2335 BLAKE2B 980475ce5d54014c508ffa26b305cae8323b7774e0fa58425ecc89b288b3cef031b5c7719e468e78497964374edfc13af22cf48ef10a7aee7b7ac857560633fa SHA512 63b057d9396dab26389c331f4d73d09680d9f826b83769abaf5ca30c86da0476fc6de71b816bd7bcf15a3d98bef838a8632755296e42cb78633ffa186d4f3b28 +EBUILD wayfire-9999.ebuild 2256 BLAKE2B 3bfd365944660783f21659e8cb7ee60d23687c63a783a566f19df2eaef43698e9faee5de9a229df86169190f3dfc34f3aff2680ff625b2549becaa456e364edd SHA512 24498dcf2c55decf5c37f124f746a39f91643cc75f4bb888f60114fe3d6dc34cea8e2ee1af746b536a432b70b40ab7dc59508a7a496008276aaab71cabdd045d +MISC metadata.xml 1081 BLAKE2B 906a3e4da3c6737f0d0686a2a927c7519a26beebaf4e7e1e8365f5382db089969c5e43d081bfe6bef7eae2ead1af4a44d53935a1b023a2ba79360d2eb983f930 SHA512 c86ab8b31cff5af7fac0bb8df64b78d0497549d168c24aa37e8c77e3f723aa9ac779f4c01cab37468b5170dbf57d89ad08e4a1e14ec3d401115fffc327325e9d diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml index ebb88ce3d365..bc435a800ec8 100644 --- a/gui-wm/wayfire/metadata.xml +++ b/gui-wm/wayfire/metadata.xml @@ -1,5 +1,5 @@ - + compiz like eye-candy 3D wayland, with low memory footprint. diff --git a/gui-wm/wayfire/wayfire-0.7.1.ebuild b/gui-wm/wayfire/wayfire-0.7.1.ebuild deleted file mode 100644 index 10e6172e29cf..000000000000 --- a/gui-wm/wayfire/wayfire-0.7.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="compiz like 3D wayland compositor" -HOMEPAGE="https://github.com/WayfireWM/wayfire" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git" -else - SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+gles +system-wfconfig +system-wlroots elogind systemd X" -REQUIRED_USE="?? ( elogind systemd )" - -DEPEND=" - dev-libs/libevdev - dev-libs/libinput - gui-libs/gtk-layer-shell - media-libs/glm - media-libs/mesa:=[gles2,wayland,X?] - media-libs/libjpeg-turbo - media-libs/libpng - media-libs/freetype:=[X?] - x11-libs/libdrm - x11-libs/gtk+:3=[wayland,X?] - x11-libs/cairo:=[X?,svg] - X? ( x11-libs/libxkbcommon:=[X] ) - x11-libs/pixman - gles? ( media-libs/libglvnd[X?] ) - system-wfconfig? ( - >=gui-libs/wf-config-0.7.1 - =gui-libs/wlroots-0.13.0:=[elogind=,systemd=,X?] - "${T}"/wayfire-session || die - sed -e "s:@EPREFIX@:${EPREFIX}:" \ - "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die - local emesonargs=( - $(meson_feature system-wfconfig use_system_wfconfig) - $(meson_feature system-wlroots use_system_wlroots) - $(meson_feature X xwayland) - $(meson_use gles enable_gles32) - ) - meson_src_configure -} - -src_install() { - default - meson_src_install - dobin "${T}"/wayfire-session - einstalldocs - - insinto "/usr/share/wayland-sessions/" - insopts -m644 - doins wayfire.desktop - doins "${T}"/wayfire-session.desktop - - dodoc wayfire.ini - - if ! use systemd && ! use elogind; then - fowners root:0 /usr/bin/wayfire - fperms 4511 /usr/bin/wayfire - fi -} - -pkg_postinst() { - if [ -z "${REPLACING_VERSIONS}" ]; then - elog "Wayfire has been installed but the session cannot be used" - elog "until you install a configuration file. The default config" - elog "file is installed at \"/usr/share/doc/${PF}/wayfire.ini.bz2\"" - elog "To install the file execute" - elog "\$ mkdir -p ~/.config && bzcat /usr/share/doc/${PF}/wayfire.ini.bz2 > ~/.config/wayfire.ini" - fi -} diff --git a/gui-wm/wayfire/wayfire-0.7.2.ebuild b/gui-wm/wayfire/wayfire-0.7.2.ebuild index f0a550b499df..91bd59b30f01 100644 --- a/gui-wm/wayfire/wayfire-0.7.2.ebuild +++ b/gui-wm/wayfire/wayfire-0.7.2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git" else SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 ~x86" fi LICENSE="MIT" @@ -35,7 +35,10 @@ DEPEND=" x11-libs/cairo:=[X?,svg] x11-libs/libxkbcommon:=[X?] x11-libs/pixman - X? ( x11-libs/libxcb ) + X? ( + x11-base/xwayland + x11-libs/libxcb + ) system-wfconfig? ( >=gui-libs/wf-config-0.7.1 "${T}"/wayfire-session || die + "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die sed -e "s:@EPREFIX@:${EPREFIX}:" \ - "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die + "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die local emesonargs=( $(meson_feature system-wfconfig use_system_wfconfig) $(meson_feature system-wlroots use_system_wlroots) -- cgit v1.2.3