# HG changeset patch # User gabriel # Date 1628350298 -3600 # Node ID abb6a36085ad3dd6cb928cdd4ea10beed3f9bb19 # Parent 9575db29637a6a769bb745cec2931e9ede5f0b6b Upgrade to hikari 2.3.2 diff -r 9575db29637a -r abb6a36085ad gui-wm/hikari/Manifest --- a/gui-wm/hikari/Manifest Sun Apr 18 17:09:52 2021 +0100 +++ b/gui-wm/hikari/Manifest Sat Aug 07 16:31:38 2021 +0100 @@ -1,4 +1,6 @@ AUX hikari.1 42248 BLAKE2B 694cad2fd65f394723ea22d06d294d085bdbef1d709dfabc85fcc5c09f39bc62fa64b5b99e373a9953291a0f4f947b57078e63fd3cdfe90213ab05e3a3385188 SHA512 f5e85cfb4969a4cc5f5d9a533b1b30b07c709fb895bbc025761584967f089df25b2bb818ecb9d983647d27a29c63d2fc567b0401f3450e0334096a70393049b3 DIST hikari-2.3.0.tar.gz 1021952 BLAKE2B 67a5f6d80bf5dfe67742e6cb24213c7bc49bb35a7990e3004a8b09de0682140900f3a484c582bbf62eae0c0f2324506b051eb7a504981977af1220f7bd37772f SHA512 9624aadc8caae079d9d314e1bee93f4d9899ee5ea9d7da299c6b9d0bff2a87c204ab6d763cb9bba234ef094840244cd4e6e812f0d6abc0b8844da473a76a6262 +DIST hikari-2.3.2.tar.gz 1022093 BLAKE2B 8e4df4377728cc1feab3509588a9f2d5138af6e3175682672eedce4ca45d5bb9b7e56568a860871b319b3ff1213468f38f0b6253927f6ab4b905dd495c05c53e SHA512 b7485be089064dd19c4614f60066b3f7b2f322328fa771d4383db27656695746fb00ab534cc754929141c23b7556992391529e537e0522080177068f3d0e2954 EBUILD hikari-2.3.0.ebuild 1641 BLAKE2B 90d5983a0c0da7e0cc38a22e36bf6e675b5b32624622ae6997334d7bd44d4ce9f911d5de392bb6f237d831ec3e693066852165bedb3dc9b0384e2dfd94eb1bfe SHA512 6aba8becbe2b82d99d680628453dd7c7cd9c2a615a77672ef9d5dec8891e05366fa3aeef33cc11758f414c0e736394fafad3998409e86f07ac478e9be2a825e3 -EBUILD hikari-9999.ebuild 2021 BLAKE2B 978c5d80c052ee61774d48bd662e017d0c3aef3399e4a21bfcc4592c40fa47ebf2296d43adfbc95b53e3fb0feec06c65547449cb0a6160e0b8a3b0e0818fdfb3 SHA512 8cf2873adfe2c58c4b1b0bf58eddbac37c69afab82479c2659d35055f23cb3d0c383e3db569c62becd80a44057163ee01cc249ebee831aa7032cf0eeed617fc8 +EBUILD hikari-2.3.2.ebuild 1641 BLAKE2B be5923ef643a49058c276ea003772dfa9a9840266a7f698d4fe9f2efdc56c9a83dcc4f52dd7584b0cb858b81f7f84268fc73c4493b6257b054dd29d881a85a8b SHA512 0e60a366a64ddf9767ca6e97ed511261fd4f1afc78dd57bd30781b4d201c4513b18f63aba91d5fe39ce3a5423c388285b770174f43cfdb870e6e4c3662d92e74 +EBUILD hikari-9999.ebuild 2046 BLAKE2B a21ade6f680747deee2b6339f19303004f1f44e5106dd2b131de0f194c3f4f04a2562bef7e6600f3c510e2a976035dc7645c5c5a2fac25f08b95440324d0e8fc SHA512 7c53884abf6052ea91928fff557c02ac8a9e677d876003dc566bbf994385dda2a2ee11bbcf3a326cc59d3115c16917080f7376f3d1664df79a81f975951d149d diff -r 9575db29637a -r abb6a36085ad gui-wm/hikari/hikari-2.3.2.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gui-wm/hikari/hikari-2.3.2.ebuild Sat Aug 07 16:31:38 2021 +0100 @@ -0,0 +1,76 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Wayland compositor inspired by CWM" +HOMEPAGE="https://hikari.acmelabs.space/" +SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz" +KEYWORDS="~amd64 ~x86" + +LICENSE="MIT" +SLOT="0" +IUSE="gamma layershell screencopy suid virtual-io +X" + +DEPEND=" + dev-libs/libinput:= + dev-libs/libucl + >=gui-libs/wlroots-0.14.0[X?] + media-libs/libglvnd + x11-libs/cairo[X?,svg] + x11-libs/libxkbcommon[X?] + x11-libs/pango[X?] + x11-libs/pixman + sys-libs/pam +" + +RDEPEND=" + ${DEPEND} + x11-misc/xkeyboard-config +" + +# Needeed in DEPEND only (not BDEPEND as need to be right location etc) +DEPEND+=" dev-libs/wayland-protocols" + +BDEPEND=" + sys-devel/bmake + virtual/pkgconfig +" + +pkg_setup() { + # We set `bmake` and we also remove any reference to -l in MAKEOPTS + # as `bamke` does not support load average + # We do this in a crude way until flag-o-matic supports MAKEOPTS + # bug 778191 + export MAKE=bmake + MAKEOPTS=`echo $MAKEOPTS | sed 's/-l \?[\.0-9]\+//'` + tc-export CC PKG_CONFIG +} + +src_compile() { + emake \ + VERSION="${PV}" \ + CC="$(tc-getCC)" \ + CFLAGS_EXTRA="${CFLAGS}" \ + LDFLAGS_EXTRA="${LDFLAGS}" \ + -DWITH_POSIX_C_SOURCE \ + $(usex gamma -DWITH_GAMMACONTROL "") \ + $(usex layershell -DWITH_LAYERSHELL "") \ + $(usex screencopy -DWITH_SCREENCOPY "") \ + $(usex virtual-io -DWITH_VIRTUAL_INPUT "") \ + $(usex X -DWITH_XWAYLAND "") \ + all +} + +src_install() { + emake \ + DESTDIR="${D}" \ + PREFIX=/usr \ + ETC_PREFIX=/ \ + $(usex suid "" -DWITHOUT_SUID) \ + install + + doman share/man/man1/hikari.1 +} diff -r 9575db29637a -r abb6a36085ad gui-wm/hikari/hikari-9999.ebuild --- a/gui-wm/hikari/hikari-9999.ebuild Sun Apr 18 17:09:52 2021 +0100 +++ b/gui-wm/hikari/hikari-9999.ebuild Sat Aug 07 16:31:38 2021 +0100 @@ -9,7 +9,7 @@ HOMEPAGE="https://hikari.acmelabs.space/" if [[ ${PV} == 9999 ]]; then EDARCS_REPOSITORY="https://hub.darcs.net/raichoo/hikari" - inherit darcs + # inherit darcs wtf happened with this SRC_URI="" else SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"