commit:     c17cca78a19a365eec70488891bf2c1eb2a7a023
Author:     Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me>
AuthorDate: Fri Sep 29 01:49:16 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 07:17:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17cca78

dev-libs/girara: update EAPI 7 -> 8

Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> proton.me>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 .../{girara-9999.ebuild => girara-0.4.0-r1.ebuild} | 32 ++++++++++++++--------
 dev-libs/girara/girara-9999.ebuild                 | 31 +++++++++++++--------
 2 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/dev-libs/girara/girara-9999.ebuild 
b/dev-libs/girara/girara-0.4.0-r1.ebuild
similarity index 62%
copy from dev-libs/girara/girara-9999.ebuild
copy to dev-libs/girara/girara-0.4.0-r1.ebuild
index 88dc773e88de..34e5e35a0455 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-0.4.0-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson virtualx
 
 DESCRIPTION="UI library that focuses on simplicity and minimalism"
 HOMEPAGE="https://pwmt.org/projects/girara/";
 
-if [[ ${PV} == *999 ]]; then
+if [[ ${PV} == *9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git";
        EGIT_BRANCH="develop"
@@ -20,27 +20,35 @@ fi
 LICENSE="ZLIB"
 SLOT="0"
 IUSE="doc libnotify test"
-
 RESTRICT="!test? ( test )"
 
-DEPEND="dev-libs/glib:2
+DEPEND="
+       dev-libs/glib:2
        dev-libs/json-glib:=
        >=x11-libs/gtk+-3.20:3
-       libnotify? ( x11-libs/libnotify )"
+       libnotify? ( x11-libs/libnotify )
+"
 RDEPEND="${DEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )
-       test? ( dev-libs/check )
-       virtual/pkgconfig"
+# Tests are run under virtx
+BDEPEND="
+       virtual/pkgconfig
+       doc? ( app-doc/doxygen )
+       test? (
+               dev-libs/check
+               x11-libs/gtk+:3[X]
+       )
+"
 
 src_configure() {
-       local emesonargs=(
+       local -a emesonargs=(
                -Djson=enabled
-               -Ddocs=$(usex doc enabled disabled)
-               -Dnotify=$(usex libnotify enabled disabled)
+               $(meson_feature doc docs)
+               $(meson_feature libnotify notify)
        )
        meson_src_configure
 }
 
 src_test() {
+       # TODO: run test on wayland
        virtx meson_src_test
 }

diff --git a/dev-libs/girara/girara-9999.ebuild 
b/dev-libs/girara/girara-9999.ebuild
index 88dc773e88de..47b80dd68548 100644
--- a/dev-libs/girara/girara-9999.ebuild
+++ b/dev-libs/girara/girara-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson virtualx
 
 DESCRIPTION="UI library that focuses on simplicity and minimalism"
 HOMEPAGE="https://pwmt.org/projects/girara/";
 
-if [[ ${PV} == *999 ]]; then
+if [[ ${PV} == *9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git";
        EGIT_BRANCH="develop"
@@ -23,24 +23,33 @@ IUSE="doc libnotify test"
 
 RESTRICT="!test? ( test )"
 
-DEPEND="dev-libs/glib:2
+DEPEND="
+       dev-libs/glib:2
        dev-libs/json-glib:=
        >=x11-libs/gtk+-3.20:3
-       libnotify? ( x11-libs/libnotify )"
+       libnotify? ( x11-libs/libnotify )
+"
 RDEPEND="${DEPEND}"
-BDEPEND="doc? ( app-doc/doxygen )
-       test? ( dev-libs/check )
-       virtual/pkgconfig"
+# Tests are run under virtx
+BDEPEND="
+       virtual/pkgconfig
+       doc? ( app-doc/doxygen )
+       test? (
+               dev-libs/check
+               x11-libs/gtk+:3[X]
+       )
+"
 
 src_configure() {
-       local emesonargs=(
+       local -a emesonargs=(
                -Djson=enabled
-               -Ddocs=$(usex doc enabled disabled)
-               -Dnotify=$(usex libnotify enabled disabled)
+               $(meson_feature doc docs)
+               $(meson_feature libnotify notify)
        )
        meson_src_configure
 }
 
 src_test() {
+       # TODO: run test on wayland
        virtx meson_src_test
 }

Reply via email to