* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2021-03-25 15:56 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2021-03-25 15:56 UTC (permalink / raw
To: gentoo-commits
commit: 6608010a69f8d3633a772179c20a68b6fcad1d1a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 15:55:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 15:56:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6608010a
gui-wm/hikari: fix dev-libs/wayland-protocols dependency
This belongs in DEPEND, not BDEPEND, because we need
the 'right type' (they could differ) of the headers and
for them to be in the right location.
Signed-off-by: Sam James <sam <AT> gentoo.org>
gui-wm/hikari/hikari-2.2.2-r1.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gui-wm/hikari/hikari-2.2.2-r1.ebuild b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
index bff348af91a..c576fc0ef13 100644
--- a/gui-wm/hikari/hikari-2.2.2-r1.ebuild
+++ b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
@@ -31,8 +31,10 @@ RDEPEND="
x11-misc/xkeyboard-config
"
+# Needeed in DEPEND only (not BDEPEND as need to be right location etc)
+DEPEND+=" dev-libs/wayland-protocols"
+
BDEPEND="
- dev-libs/wayland-protocols
sys-devel/bmake
virtual/pkgconfig
"
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2022-02-11 23:17 Ionen Wolkens
0 siblings, 0 replies; 14+ messages in thread
From: Ionen Wolkens @ 2022-02-11 23:17 UTC (permalink / raw
To: gentoo-commits
commit: 09ec5ed9dff2562de7e06b0fbe4872763365335a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 22:50:27 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 23:13:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ec5ed9
gui-wm/hikari: drop 2.3.2
Now that wlroots-0.15 was patched to work with nvidia GBM,
there should be no need to keep the wlroots-0.14 version.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
gui-wm/hikari/Manifest | 1 -
gui-wm/hikari/hikari-2.3.2.ebuild | 72 ---------------------------------------
2 files changed, 73 deletions(-)
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index c255c9d71b50..8a39b99a81d6 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,2 +1 @@
-DIST hikari-2.3.2.tar.gz 1022093 BLAKE2B 8e4df4377728cc1feab3509588a9f2d5138af6e3175682672eedce4ca45d5bb9b7e56568a860871b319b3ff1213468f38f0b6253927f6ab4b905dd495c05c53e SHA512 b7485be089064dd19c4614f60066b3f7b2f322328fa771d4383db27656695746fb00ab534cc754929141c23b7556992391529e537e0522080177068f3d0e2954
DIST hikari-2.3.3.tar.gz 1022191 BLAKE2B 8b1d0f03460a170f2288c97790dc437a4bd4eafc6973e87c15ca44b1d032ab02ef1d75406fe15be6bb14f67c07945b16be47ec1e41d43b51961a1c69a4a67f9b SHA512 15b6244ef46b29ad069475e8fadbafb01a65c8f96d1f89dd315d36f79dfea9a542936a5472e42237000f506094c7e08be37961c92a7eeed31477f4ed548f39f3
diff --git a/gui-wm/hikari/hikari-2.3.2.ebuild b/gui-wm/hikari/hikari-2.3.2.ebuild
deleted file mode 100644
index 119bd1fe8f0c..000000000000
--- a/gui-wm/hikari/hikari-2.3.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multiprocessing toolchain-funcs
-
-DESCRIPTION="Wayland compositor inspired by CWM"
-HOMEPAGE="https://hikari.acmelabs.space/"
-SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X suid"
-
-COMMON_DEPEND="
- dev-libs/glib:2
- dev-libs/libinput:=
- dev-libs/libucl
- dev-libs/wayland
- gui-libs/wlroots:0/14[X?]
- sys-libs/pam
- x11-libs/cairo
- x11-libs/libxkbcommon
- x11-libs/pango
- x11-libs/pixman"
-RDEPEND="
- ${COMMON_DEPEND}
- x11-misc/xkeyboard-config"
-DEPEND="
- ${COMMON_DEPEND}
- dev-libs/wayland-protocols"
-BDEPEND="
- dev-util/wayland-scanner
- sys-devel/bmake
- virtual/pkgconfig"
-
-src_compile() {
- tc-export CC PKG_CONFIG
-
- local bmake=(
- bmake -j$(makeopts_jobs)
- ETC_PREFIX="${EPREFIX}"
- CFLAGS_EXTRA="${CFLAGS} ${CPPFLAGS}"
- LDFLAGS_EXTRA="${LDFLAGS}"
- VERSION=${PV}
- -DWITH_GAMMACONTROL
- -DWITH_LAYERSHELL
- -DWITH_POSIX_C_SOURCE
- -DWITH_SCREENCOPY
- -DWITH_VIRTUAL_INPUT
- $(usev X -DWITH_XWAYLAND)
- )
-
- # empty flags to avoid duplicates (some parts use only _EXTRA, others both)
- echo "${bmake[*]}"
- CFLAGS= LDFLAGS= "${bmake[@]}" || die
-}
-
-src_install() {
- local bmake=(
- bmake install
- DESTDIR="${D}"
- PREFIX="${EPREFIX}"/usr
- ETC_PREFIX="${EPREFIX}"
- $(usev suid -DWITH_SUID)
- )
-
- echo "${bmake[*]}"
- "${bmake[@]}" || die
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2022-01-14 5:44 Ionen Wolkens
0 siblings, 0 replies; 14+ messages in thread
From: Ionen Wolkens @ 2022-01-14 5:44 UTC (permalink / raw
To: gentoo-commits
commit: f2149e93f05dc6ddae75d9baddb1a63dd0458cdb
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 05:13:18 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 05:43:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2149e93
gui-wm/hikari: add 2.3.3
Using with wlroots:0/15 currently segfaults with nvidia's GBM,
but looking around this isn't hikari's fault (happens with sway
as well), and supporting this new buggy GBM implementation is
low priority -- so bumping anyway.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
gui-wm/hikari/Manifest | 1 +
gui-wm/hikari/hikari-2.3.3.ebuild | 72 +++++++++++++++++++++++++++++++++++++++
2 files changed, 73 insertions(+)
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 3fc840736892..c255c9d71b50 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1 +1,2 @@
DIST hikari-2.3.2.tar.gz 1022093 BLAKE2B 8e4df4377728cc1feab3509588a9f2d5138af6e3175682672eedce4ca45d5bb9b7e56568a860871b319b3ff1213468f38f0b6253927f6ab4b905dd495c05c53e SHA512 b7485be089064dd19c4614f60066b3f7b2f322328fa771d4383db27656695746fb00ab534cc754929141c23b7556992391529e537e0522080177068f3d0e2954
+DIST hikari-2.3.3.tar.gz 1022191 BLAKE2B 8b1d0f03460a170f2288c97790dc437a4bd4eafc6973e87c15ca44b1d032ab02ef1d75406fe15be6bb14f67c07945b16be47ec1e41d43b51961a1c69a4a67f9b SHA512 15b6244ef46b29ad069475e8fadbafb01a65c8f96d1f89dd315d36f79dfea9a542936a5472e42237000f506094c7e08be37961c92a7eeed31477f4ed548f39f3
diff --git a/gui-wm/hikari/hikari-2.3.3.ebuild b/gui-wm/hikari/hikari-2.3.3.ebuild
new file mode 100644
index 000000000000..aa2351de6ddc
--- /dev/null
+++ b/gui-wm/hikari/hikari-2.3.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="Wayland compositor inspired by CWM"
+HOMEPAGE="https://hikari.acmelabs.space/"
+SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X suid"
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ dev-libs/libinput:=
+ dev-libs/libucl
+ dev-libs/wayland
+ gui-libs/wlroots:0/15[X?]
+ sys-libs/pam
+ x11-libs/cairo
+ x11-libs/libxkbcommon
+ x11-libs/pango
+ x11-libs/pixman"
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-misc/xkeyboard-config"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-libs/wayland-protocols"
+BDEPEND="
+ dev-util/wayland-scanner
+ sys-devel/bmake
+ virtual/pkgconfig"
+
+src_compile() {
+ tc-export CC PKG_CONFIG
+
+ local bmake=(
+ bmake -j$(makeopts_jobs)
+ ETC_PREFIX="${EPREFIX}"
+ CFLAGS_EXTRA="${CFLAGS} ${CPPFLAGS}"
+ LDFLAGS_EXTRA="${LDFLAGS}"
+ VERSION=${PV}
+ -DWITH_GAMMACONTROL
+ -DWITH_LAYERSHELL
+ -DWITH_POSIX_C_SOURCE
+ -DWITH_SCREENCOPY
+ -DWITH_VIRTUAL_INPUT
+ $(usev X -DWITH_XWAYLAND)
+ )
+
+ # empty flags to avoid duplicates (some parts use only _EXTRA, others both)
+ echo "${bmake[*]}"
+ CFLAGS= LDFLAGS= "${bmake[@]}" || die
+}
+
+src_install() {
+ local bmake=(
+ bmake install
+ DESTDIR="${D}"
+ PREFIX="${EPREFIX}"/usr
+ ETC_PREFIX="${EPREFIX}"
+ $(usev suid -DWITH_SUID)
+ )
+
+ echo "${bmake[*]}"
+ "${bmake[@]}" || die
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2021-09-19 20:28 Ionen Wolkens
0 siblings, 0 replies; 14+ messages in thread
From: Ionen Wolkens @ 2021-09-19 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 31f1c5a908248358ae1955f2b706828180198ae9
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 12:00:02 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 20:26:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31f1c5a9
gui-wm/hikari: add 2.3.2
Non-maintainer bump to support newer wlroots wrt
bug #789447, with some ebuild changes:
* Revert to running bmake directly. This isn't just about -lN
(many more options are missing and existing ones can even mean
different things), `bmake -j$(makeopts_jobs)` is more solid.
Seems better to think of it as its own thing than a $MAKE
drop-in replacement (like jamfiles or so).
Note: MAKEFLAGS is recognized by bmake to pass extra arguments
* Drop most [X?] as interest here is only wlroots xwayland support
* IUSE=X now non-default to match wlroots' and use profile settings
* Drop other IUSE and enable by default (trivial and no dependencies)
* Pin to wlroots:0/14 to avoid future issues
* Pass ETC_PREFIX at build time so it knows where to find the config
* Drop upstreamed pkgconfig patch
Closes: https://bugs.gentoo.org/779112
Closes: https://bugs.gentoo.org/789447
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
gui-wm/hikari/Manifest | 1 +
gui-wm/hikari/hikari-2.3.2.ebuild | 72 +++++++++++++++++++++++++++++++++++++++
2 files changed, 73 insertions(+)
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index aea90698300..f4f656fc45f 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1 +1,2 @@
DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1
+DIST hikari-2.3.2.tar.gz 1022093 BLAKE2B 8e4df4377728cc1feab3509588a9f2d5138af6e3175682672eedce4ca45d5bb9b7e56568a860871b319b3ff1213468f38f0b6253927f6ab4b905dd495c05c53e SHA512 b7485be089064dd19c4614f60066b3f7b2f322328fa771d4383db27656695746fb00ab534cc754929141c23b7556992391529e537e0522080177068f3d0e2954
diff --git a/gui-wm/hikari/hikari-2.3.2.ebuild b/gui-wm/hikari/hikari-2.3.2.ebuild
new file mode 100644
index 00000000000..119bd1fe8f0
--- /dev/null
+++ b/gui-wm/hikari/hikari-2.3.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing toolchain-funcs
+
+DESCRIPTION="Wayland compositor inspired by CWM"
+HOMEPAGE="https://hikari.acmelabs.space/"
+SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X suid"
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ dev-libs/libinput:=
+ dev-libs/libucl
+ dev-libs/wayland
+ gui-libs/wlroots:0/14[X?]
+ sys-libs/pam
+ x11-libs/cairo
+ x11-libs/libxkbcommon
+ x11-libs/pango
+ x11-libs/pixman"
+RDEPEND="
+ ${COMMON_DEPEND}
+ x11-misc/xkeyboard-config"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-libs/wayland-protocols"
+BDEPEND="
+ dev-util/wayland-scanner
+ sys-devel/bmake
+ virtual/pkgconfig"
+
+src_compile() {
+ tc-export CC PKG_CONFIG
+
+ local bmake=(
+ bmake -j$(makeopts_jobs)
+ ETC_PREFIX="${EPREFIX}"
+ CFLAGS_EXTRA="${CFLAGS} ${CPPFLAGS}"
+ LDFLAGS_EXTRA="${LDFLAGS}"
+ VERSION=${PV}
+ -DWITH_GAMMACONTROL
+ -DWITH_LAYERSHELL
+ -DWITH_POSIX_C_SOURCE
+ -DWITH_SCREENCOPY
+ -DWITH_VIRTUAL_INPUT
+ $(usev X -DWITH_XWAYLAND)
+ )
+
+ # empty flags to avoid duplicates (some parts use only _EXTRA, others both)
+ echo "${bmake[*]}"
+ CFLAGS= LDFLAGS= "${bmake[@]}" || die
+}
+
+src_install() {
+ local bmake=(
+ bmake install
+ DESTDIR="${D}"
+ PREFIX="${EPREFIX}"/usr
+ ETC_PREFIX="${EPREFIX}"
+ $(usev suid -DWITH_SUID)
+ )
+
+ echo "${bmake[*]}"
+ "${bmake[@]}" || die
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2021-09-19 20:28 Ionen Wolkens
0 siblings, 0 replies; 14+ messages in thread
From: Ionen Wolkens @ 2021-09-19 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 8a73ba3c7c6a7514608ddcf87a365dd959b73a1b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 11:36:22 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 20:21:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a73ba3c
gui-wm/hikari: define X in metadata.xml for clarity
Same definition as wlroots, so it's not misleading into seeming
like this can run on Xorg.
Also move maintainers on top like for most of these files.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
gui-wm/hikari/metadata.xml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml
index 9cd2500a639..8446f7621df 100644
--- a/gui-wm/hikari/metadata.xml
+++ b/gui-wm/hikari/metadata.xml
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <longdescription>
- hikari is a minimalistic wayland window manager
- based on wlroots trying inspired by the simplicity
- of CWM in the X days. It aims stay out of your way
- and focus more on the task than the windows.
- </longdescription>
<maintainer type="person" proxied="yes">
<email>gentoo@aisha.cc</email>
<name>Aisha Tammy</name>
@@ -15,7 +9,14 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
+ <longdescription>
+ Hikari is a minimalistic wayland window manager
+ based on wlroots trying inspired by the simplicity
+ of CWM in the X days. It aims stay out of your way
+ and focus more on the task than the windows.
+ </longdescription>
<use>
+ <flag name="X">Enable support for X11 applications (XWayland)</flag>
<flag name="gamma">add gamma control for redshift</flag>
<flag name="layershell">add support for wayland apps using layer shell</flag>
<flag name="screencopy">add support for screen grabbing</flag>
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2021-03-25 17:03 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2021-03-25 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 39f7155b659b65a406fc405fffbd417a66a1d3f5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 17:02:05 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 17:02:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f7155b
gui-wm/hikari: add MAKEOPTS filtering hack for now
We need to hack out --load-average (-l) from MAKEOPTS
for now until we have a better way (e.g. flag-o-matic.eclass)
to filter out options from MAKEOPTS for implementations
which don't support it, like bmake.
Thanks-to: ggabriel
Bug: https://bugs.gentoo.org/778191
Signed-off-by: Sam James <sam <AT> gentoo.org>
gui-wm/hikari/hikari-2.2.2-r1.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gui-wm/hikari/hikari-2.2.2-r1.ebuild b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
index c576fc0ef13..5db53df9ccd 100644
--- a/gui-wm/hikari/hikari-2.2.2-r1.ebuild
+++ b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
@@ -42,7 +42,12 @@ BDEPEND="
PATCHES=( "${FILESDIR}"/${PN}-2.2.1-pkgconfig.patch )
pkg_setup() {
+ # We set `bmake` and we also have to remove any reference to -l in MAKEOPTS
+ # as `bmake` does not support load average
+ # We do this in a crude way until flag-o-matic supports MAKEOPTS
+ # bug 778191
export MAKE=bmake
+ export MAKEOPTS=$(echo ${MAKEOPTS} | sed 's/-l \?[\.0-9]\+//' || die)
tc-export CC PKG_CONFIG
}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2021-03-25 15:56 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2021-03-25 15:56 UTC (permalink / raw
To: gentoo-commits
commit: ffe3fa3e92c7f458bd54765f9f2d9faf622eee4f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 15:54:30 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 15:56:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffe3fa3e
gui-wm/hikari: fix {PV} -> ${PV} typo
Signed-off-by: Sam James <sam <AT> gentoo.org>
gui-wm/hikari/hikari-2.2.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gui-wm/hikari/hikari-2.2.2-r1.ebuild b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
index 249a1164a1e..bff348af91a 100644
--- a/gui-wm/hikari/hikari-2.2.2-r1.ebuild
+++ b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
@@ -46,7 +46,7 @@ pkg_setup() {
src_compile() {
emake \
- VERSION="{PV}" \
+ VERSION="${PV}" \
CC="$(tc-getCC)" \
CFLAGS_EXTRA="${CFLAGS}" \
LDFLAGS_EXTRA="${LDFLAGS}" \
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2021-03-25 15:56 Sam James
0 siblings, 0 replies; 14+ messages in thread
From: Sam James @ 2021-03-25 15:56 UTC (permalink / raw
To: gentoo-commits
commit: 893ef30a570d5d1e202e6b9e007eda4bec663b67
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 15:53:23 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 15:56:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893ef30a
gui-wm/hikari: use emake instead of (b)make directly
PMS guarantees [0] that 'emake' respects ${MAKE}, so let's
use that to ensure that e.g. ${MAKEFLAGS} from the user is
respected.
[0] https://dev.gentoo.org/~ulm/pms/head/pms.html#x1-12800012.3.8
Signed-off-by: Sam James <sam <AT> gentoo.org>
gui-wm/hikari/hikari-2.2.2-r1.ebuild | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/gui-wm/hikari/hikari-2.2.2-r1.ebuild b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
index a9bbaec4c52..249a1164a1e 100644
--- a/gui-wm/hikari/hikari-2.2.2-r1.ebuild
+++ b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit multiprocessing toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Wayland compositor inspired by CWM"
HOMEPAGE="https://hikari.acmelabs.space/"
@@ -45,7 +45,8 @@ pkg_setup() {
}
src_compile() {
- ${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
+ emake \
+ VERSION="{PV}" \
CC="$(tc-getCC)" \
CFLAGS_EXTRA="${CFLAGS}" \
LDFLAGS_EXTRA="${LDFLAGS}" \
@@ -55,12 +56,16 @@ src_compile() {
$(usex screencopy -DWITH_SCREENCOPY "") \
$(usex virtual-io -DWITH_VIRTUAL_INPUT "") \
$(usex X -DWITH_XWAYLAND "") \
- all || die
+ all
}
src_install() {
- ${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ \
- $(usex suid "" -DWITHOUT_SUID) \
- install || die
+ emake \
+ DESTDIR="${D}" \
+ PREFIX=/usr \
+ ETC_PREFIX=/ \
+ $(usex suid "" -DWITHOUT_SUID) \
+ install
+
doman share/man/man1/hikari.1
}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2020-12-16 2:17 Aaron Bauman
0 siblings, 0 replies; 14+ messages in thread
From: Aaron Bauman @ 2020-12-16 2:17 UTC (permalink / raw
To: gentoo-commits
commit: b5b7e31d037c51f707d5a48480b73783f072e5fe
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Dec 8 11:48:45 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 02:16:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b7e31d
gui-wm/hikari: fix suid flag usage
was changed from WITH_SUID to WITHOUT_SUID
Closes: https://bugs.gentoo.org/758968
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/18564
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
gui-wm/hikari/{hikari-2.2.2.ebuild => hikari-2.2.2-r1.ebuild} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gui-wm/hikari/hikari-2.2.2.ebuild b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
similarity index 92%
rename from gui-wm/hikari/hikari-2.2.2.ebuild
rename to gui-wm/hikari/hikari-2.2.2-r1.ebuild
index 2d87cfd595d..a9bbaec4c52 100644
--- a/gui-wm/hikari/hikari-2.2.2.ebuild
+++ b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
@@ -45,7 +45,6 @@ pkg_setup() {
}
src_compile() {
-
${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
CC="$(tc-getCC)" \
CFLAGS_EXTRA="${CFLAGS}" \
@@ -54,13 +53,14 @@ src_compile() {
$(usex gamma -DWITH_GAMMACONTROL "") \
$(usex layershell -DWITH_LAYERSHELL "") \
$(usex screencopy -DWITH_SCREENCOPY "") \
- $(usex suid -DWITH_SUID "") \
$(usex virtual-io -DWITH_VIRTUAL_INPUT "") \
$(usex X -DWITH_XWAYLAND "") \
all || die
}
src_install() {
- ${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ install || die
+ ${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ \
+ $(usex suid "" -DWITHOUT_SUID) \
+ install || die
doman share/man/man1/hikari.1
}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2020-10-31 15:58 Joonas Niilola
0 siblings, 0 replies; 14+ messages in thread
From: Joonas Niilola @ 2020-10-31 15:58 UTC (permalink / raw
To: gentoo-commits
commit: 8d4c4096f265600feda2364a311cb015d06a9f29
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Oct 28 13:53:10 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 15:58:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4c4096
gui-wm/hikari: version bump to 2.2.2
should really fix the direct CC calls
Closes: https://bugs.gentoo.org/745375
Closes: https://bugs.gentoo.org/745399
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
gui-wm/hikari/Manifest | 1 +
gui-wm/hikari/hikari-2.2.2.ebuild | 66 +++++++++++++++++++++++++++++++++++++++
2 files changed, 67 insertions(+)
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index fc829c5c34f..02e31abef73 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1 +1,2 @@
DIST hikari-2.2.1.tar.gz 1019168 BLAKE2B aa2ea50b665b3e5d62deba9565cab0d24694046d37dcd9aaa85d3581efbce339ea3f02630155fc731a7eb20dc7b4e4a301e5c6abfd1499ef962e6ef012184ca6 SHA512 640d4ef19cb445613e43fb3363ff00f13937ab256155129bbeba7adcd5f8aed1e4ddbcc6af13809c54ce14dc0d51933cc2763c8a990f44e49d6bfbf9daf62d80
+DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1
diff --git a/gui-wm/hikari/hikari-2.2.2.ebuild b/gui-wm/hikari/hikari-2.2.2.ebuild
new file mode 100644
index 00000000000..2d87cfd595d
--- /dev/null
+++ b/gui-wm/hikari/hikari-2.2.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing 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.11.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
+"
+
+BDEPEND="
+ dev-libs/wayland-protocols
+ sys-devel/bmake
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.1-pkgconfig.patch )
+
+pkg_setup() {
+ export MAKE=bmake
+ tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+
+ ${MAKE} -j$(makeopts_jobs) 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 suid -DWITH_SUID "") \
+ $(usex virtual-io -DWITH_VIRTUAL_INPUT "") \
+ $(usex X -DWITH_XWAYLAND "") \
+ all || die
+}
+
+src_install() {
+ ${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ install || die
+ doman share/man/man1/hikari.1
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2020-10-31 15:58 Joonas Niilola
0 siblings, 0 replies; 14+ messages in thread
From: Joonas Niilola @ 2020-10-31 15:58 UTC (permalink / raw
To: gentoo-commits
commit: f9370c8a693707e11ef92be34f282b739a038133
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Oct 28 13:53:40 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 15:58:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9370c8a
gui-wm/hikari: drop old version
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/18057
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
gui-wm/hikari/Manifest | 1 -
gui-wm/hikari/hikari-2.2.1.ebuild | 64 ---------------------------------------
2 files changed, 65 deletions(-)
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 02e31abef73..aea90698300 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,2 +1 @@
-DIST hikari-2.2.1.tar.gz 1019168 BLAKE2B aa2ea50b665b3e5d62deba9565cab0d24694046d37dcd9aaa85d3581efbce339ea3f02630155fc731a7eb20dc7b4e4a301e5c6abfd1499ef962e6ef012184ca6 SHA512 640d4ef19cb445613e43fb3363ff00f13937ab256155129bbeba7adcd5f8aed1e4ddbcc6af13809c54ce14dc0d51933cc2763c8a990f44e49d6bfbf9daf62d80
DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1
diff --git a/gui-wm/hikari/hikari-2.2.1.ebuild b/gui-wm/hikari/hikari-2.2.1.ebuild
deleted file mode 100644
index 258f27273f5..00000000000
--- a/gui-wm/hikari/hikari-2.2.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing 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.11.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
-"
-
-BDEPEND="
- dev-libs/wayland-protocols
- sys-devel/bmake
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-pkgconfig.patch )
-
-pkg_setup() {
- export MAKE=bmake
- tc-export CC PKG_CONFIG
-}
-
-src_compile() {
-
- ${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
- LDFLAGS="${LDFLAGS}" \
- -DWITH_POSIX_C_SOURCE \
- $(usex gamma -DWITH_GAMMACONTROL "") \
- $(usex layershell -DWITH_LAYERSHELL "") \
- $(usex screencopy -DWITH_SCREENCOPY "") \
- $(usex suid -DWITH_SUID "") \
- $(usex virtual-io -DWITH_VIRTUAL_INPUT "") \
- $(usex X -DWITH_XWAYLAND "") \
- all || die
-}
-
-src_install() {
- ${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ install || die
- doman share/man/man1/hikari.1
-}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2020-09-29 6:37 Joonas Niilola
0 siblings, 0 replies; 14+ messages in thread
From: Joonas Niilola @ 2020-09-29 6:37 UTC (permalink / raw
To: gentoo-commits
commit: 9483bbcbc1a48707c44623f7635cb49c43610f97
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Wed Aug 26 03:55:30 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 06:23:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9483bbcb
gui-wm/hikari: version bump
also gets rid of gnu make patch
Closes: https://bugs.gentoo.org/736850
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
gui-wm/hikari/Manifest | 1 +
gui-wm/hikari/hikari-2.1.2.ebuild | 59 +++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+)
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 0da13980b1b..75b789090ab 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,3 +1,4 @@
DIST hikari-1.2.0.tar.gz 98941 BLAKE2B 0b882d483143e307d4b173560f335e85b4c5613b75c51c6b70b68df9b4f70f9a009d95cb8eda1c211f4968b5c8600e7113bca5e014cecfb1917db2acae7e6f3d SHA512 2bd0b6032541ca63a2bd12aee9155e9b0d08e4c541ec2f837073f1498ecb39df969f8821fcbd066e44c5ddaf658e4875bea25f344226b7ea97fe008a0db4d328
DIST hikari-2.0.2.tar.gz 1003593 BLAKE2B 89a2ec29673e7ac371a7e4f179b3dc398fbacb3daf859a9f1a53cf74aac9dc36ca33f3dc1878360fdae80ef39315a0b06d0988d897c9ce58693404fd3099d6bf SHA512 12e6cf2f1f24a4c0b64e6c035c518bdc5dbfa094a220147c374f599df8b52a4ee4c1f3cdffe1080fe87c665841a6ca018de4a48ec65aaa5b60e9e968087d83d6
DIST hikari-2.1.1.tar.gz 1012598 BLAKE2B 189e7bd9271ed5af89f5039288334c16a33c049c504f57e05cfa11b20098650165bb655023d016a14f2b13ed94e819bece088ef8517b9114b80d6a5921000780 SHA512 6da547d957cc65ab040647209a865550b0cc2b3d79040fae507591c41e938826861e27034379c21a1b7ce18afa35dbb813e96e661f4bd1232eb932f032271dff
+DIST hikari-2.1.2.tar.gz 1012670 BLAKE2B 9ce3dc08b3b9377458eba7299d5921466983c64ef7a9eb16194c4cf4dcb482af1313b9378bf733e38fd5bb0b8154553d7ab57a7e45db69932a2bb201ff29b041 SHA512 e4c1328414a2b99657fbce58139d5f6432580182ee277bc1fb8d3de1fa875675d78606dc8defd7997025caeac36f533ea9f34fca56c15a9a64dfa05c9c3e51b7
diff --git a/gui-wm/hikari/hikari-2.1.2.ebuild b/gui-wm/hikari/hikari-2.1.2.ebuild
new file mode 100644
index 00000000000..a78149f7cfc
--- /dev/null
+++ b/gui-wm/hikari/hikari-2.1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing
+
+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.11.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
+"
+
+BDEPEND="
+ dev-libs/wayland-protocols
+ sys-devel/bmake
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ export MAKE=bmake
+}
+
+src_compile() {
+ ${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
+ -DWITH_POSIX_C_SOURCE \
+ $(usex gamma -DWITH_GAMMACONTROL "") \
+ $(usex layershell -DWITH_LAYERSHELL "") \
+ $(usex screencopy -DWITH_SCREENCOPY "") \
+ $(usex suid -DWITH_SUID "") \
+ $(usex virtual-io WITH_VIRTUAL_INPUT "") \
+ $(usex X -DWITH_XWAYLAND "") \
+ all
+}
+
+src_install() {
+ ${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ install
+ doman share/man/man1/hikari.1
+}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2020-09-29 6:37 Joonas Niilola
0 siblings, 0 replies; 14+ messages in thread
From: Joonas Niilola @ 2020-09-29 6:37 UTC (permalink / raw
To: gentoo-commits
commit: fedae841665e46a2af9f6b45d0deb353ef2bf078
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 29 06:26:23 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 06:26:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fedae841
gui-wm/hikari: fix misalignments, add missing dies, fix typo on 2.1.2
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
gui-wm/hikari/hikari-2.1.2.ebuild | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gui-wm/hikari/hikari-2.1.2.ebuild b/gui-wm/hikari/hikari-2.1.2.ebuild
index a78149f7cfc..54f522c053a 100644
--- a/gui-wm/hikari/hikari-2.1.2.ebuild
+++ b/gui-wm/hikari/hikari-2.1.2.ebuild
@@ -43,17 +43,17 @@ pkg_setup() {
src_compile() {
${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
- -DWITH_POSIX_C_SOURCE \
- $(usex gamma -DWITH_GAMMACONTROL "") \
- $(usex layershell -DWITH_LAYERSHELL "") \
- $(usex screencopy -DWITH_SCREENCOPY "") \
- $(usex suid -DWITH_SUID "") \
- $(usex virtual-io WITH_VIRTUAL_INPUT "") \
- $(usex X -DWITH_XWAYLAND "") \
- all
+ -DWITH_POSIX_C_SOURCE \
+ $(usex gamma -DWITH_GAMMACONTROL "") \
+ $(usex layershell -DWITH_LAYERSHELL "") \
+ $(usex screencopy -DWITH_SCREENCOPY "") \
+ $(usex suid -DWITH_SUID "") \
+ $(usex virtual-io -DWITH_VIRTUAL_INPUT "") \
+ $(usex X -DWITH_XWAYLAND "") \
+ all || die
}
src_install() {
- ${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ install
+ ${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ install || die
doman share/man/man1/hikari.1
}
^ permalink raw reply related [flat|nested] 14+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/
@ 2020-06-15 2:27 Aaron Bauman
0 siblings, 0 replies; 14+ messages in thread
From: Aaron Bauman @ 2020-06-15 2:27 UTC (permalink / raw
To: gentoo-commits
commit: a5894b11cf76272b238e5d42669f80f42df6536c
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sun Jun 14 23:35:24 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 02:27:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5894b11
gui-wm/hikari: fix configuration files install
Closes: https://bugs.gentoo.org/728242
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/16246
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
gui-wm/hikari/{hikari-2.0.1.ebuild => hikari-2.0.1-r1.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gui-wm/hikari/hikari-2.0.1.ebuild b/gui-wm/hikari/hikari-2.0.1-r1.ebuild
similarity index 90%
rename from gui-wm/hikari/hikari-2.0.1.ebuild
rename to gui-wm/hikari/hikari-2.0.1-r1.ebuild
index 58e416a60cc..ba2a76d4e9e 100644
--- a/gui-wm/hikari/hikari-2.0.1.ebuild
+++ b/gui-wm/hikari/hikari-2.0.1-r1.ebuild
@@ -56,8 +56,8 @@ src_compile() {
}
src_install() {
- emake PREFIX="${D}/usr" ETC_PREFIX="${D}/etc" install
+ emake PREFIX="${D}/usr" ETC_PREFIX="${D}" install
if use man; then
- emake PREFIX="${D}/usr" ETC_PREFIX="${D}/etc" install-doc
+ emake PREFIX="${D}/usr" ETC_PREFIX="${D}" install-doc
fi
}
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2022-02-11 23:17 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-25 15:56 [gentoo-commits] repo/gentoo:master commit in: gui-wm/hikari/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-02-11 23:17 Ionen Wolkens
2022-01-14 5:44 Ionen Wolkens
2021-09-19 20:28 Ionen Wolkens
2021-09-19 20:28 Ionen Wolkens
2021-03-25 17:03 Sam James
2021-03-25 15:56 Sam James
2021-03-25 15:56 Sam James
2020-12-16 2:17 Aaron Bauman
2020-10-31 15:58 Joonas Niilola
2020-10-31 15:58 Joonas Niilola
2020-09-29 6:37 Joonas Niilola
2020-09-29 6:37 Joonas Niilola
2020-06-15 2:27 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox