commit:     accb19bd979280ad401abda9b736cfd407f9507e
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sat Dec 17 16:36:20 2022 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 16:36:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=accb19bd

gui-apps/yambar: Add 1.9.0; update -9999

Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 gui-apps/yambar/Manifest            |   1 +
 gui-apps/yambar/metadata.xml        |  28 ++++++++++
 gui-apps/yambar/yambar-1.9.0.ebuild | 107 ++++++++++++++++++++++++++++++++++++
 gui-apps/yambar/yambar-9999.ebuild  |  57 +++++++++++++++----
 4 files changed, 183 insertions(+), 10 deletions(-)

diff --git a/gui-apps/yambar/Manifest b/gui-apps/yambar/Manifest
index 6b53d51c9..3f49a14ed 100644
--- a/gui-apps/yambar/Manifest
+++ b/gui-apps/yambar/Manifest
@@ -1,3 +1,4 @@
 DIST yambar-1.6.2.tar.gz 135455 BLAKE2B 
71d5b584bf04a7212ac84d8e0d8cb71c1abd7c7548c5ec998aff480d76afbd09825b059fe642edd4dd2537af6a5b811bd333a45bfa53f6a3a814a2be95eb58b4
 SHA512 
64a5e983be6dc99feb2f39d06fe265163c3b8f3f23f33a58c386891b63a9c915816cbde22d031473e700e839522c86c53b06f0cce1a57ebdab8ed6aeebe627e1
 DIST yambar-1.7.0.tar.gz 148762 BLAKE2B 
a394b588bb1a8c64e149f8f39d6a8056d139cb3518fc15c87db0da7ead9c96ce5d7b9d764a617c4626d9fa574edbda2c0e1e2b11b07741241188c5cd282d5643
 SHA512 
e34cc808533cf76ff0b95d18346b796b4758271b0a61151e80b33eaa0ce34c2d5a9f1c6671d28f377d1563a7979c5784782b9f2f87a3cb615efb129e89865ad3
 DIST yambar-1.8.0.tar.gz 157936 BLAKE2B 
d9fc01d71c89550c59b470f9bd3de27e44cc5d64f2103f8803c9c2b25c51b5240f54c41041c126df2b606ae011d9fca974723cafb45670eae70ef20bb3f765b6
 SHA512 
db2c3669162923b4ca2b1f13f50d203de2a0eb6963e6d2bfe8b03e41c7cb4ad9acf6607eef08b6da837c901374c89affb915aa44f2bc2e0eb4694ad91ae66a67
+DIST yambar-1.9.0.tar.gz 186338 BLAKE2B 
9fd043aab241c75e84bcdffcfed51bd24d3a687ff80f4b44517168fc46a33934467fd8bf7a315076e15fc74e157f3bccf703ae2fd32ed969082c383570b0f3bd
 SHA512 
de1acf1e738b33e2e0ee1dba497b5b84137028551827c38eee67fdc5bfb688f2037a52ccac7f5fb56ffeed7382e4cd670fd0b564c7f532f21a85724640c8004b

diff --git a/gui-apps/yambar/metadata.xml b/gui-apps/yambar/metadata.xml
index 48e360af7..8a88bd9d2 100644
--- a/gui-apps/yambar/metadata.xml
+++ b/gui-apps/yambar/metadata.xml
@@ -5,8 +5,36 @@
                <email>leona...@neumann.dev.br</email>
                <name>Leonardo Neumann</name>
        </maintainer>
+       <maintainer type="person">
+               <email>jul...@jroy.ca</email>
+               <name>Julien Roy</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://codeberg.org/dnkl/yambar/issues</bugs-to>
                <changelog>https://codeberg.org/dnkl/yambar/releases</changelog>
        </upstream>
+       <use>
+               <flag name="core">Compiles modules, particles and decorations 
as shared libraries, which are loaded on-demand</flag>
+               <flag name="alsa">ALSA support</flag>
+               <flag name="backlight">Backlight support</flag>
+               <flag name="battery">Battery support</flag>
+               <flag name="clock">Clock support</flag>
+               <flag name="cpu">CPU monitoring support</flag>
+               <flag name="disk-io">Disk I/O support</flag>
+               <flag name="dwl">DWL (dwm for wayland) support</flag>
+               <flag name="foreign-toplevel">Foreign toplevel (window tracking 
for Wayland) support</flag>
+               <flag name="memory">Memory monitoring support</flag>
+               <flag name="mpd">Music Player Daemon (MPD) support</flag>
+               <flag name="i3">i3+Sway support</flag>
+               <flag name="label">Label support</flag>
+               <flag name="network">Network monitoring support</flag>
+               <flag name="pipewire">Pipewire support</flag>
+               <flag name="pulseaudio">PulseAudio support</flag>
+               <flag name="removables">Removables (USB sticks, CD-ROM etc) 
monitoring support</flag>
+               <flag name="river">River support</flag>
+               <flag name="script">Script support</flag>
+               <flag name="sway-xkb">keyboard support for Sway</flag>
+               <flag name="xkb">keyboard support for X11</flag>
+               <flag name="xwindow">XWindow (window tracking for X11) 
support</flag>
+       </use>
 </pkgmetadata>

diff --git a/gui-apps/yambar/yambar-1.9.0.ebuild 
b/gui-apps/yambar/yambar-1.9.0.ebuild
new file mode 100644
index 000000000..9c6878e02
--- /dev/null
+++ b/gui-apps/yambar/yambar-1.9.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+if [[ ${PV} != *9999* ]]; then
+       SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+       S="${WORKDIR}/${PN}"
+else
+       inherit git-r3
+       EGIT_REPO_URI="https://codeberg.org/dnkl/${PN}.git";
+fi
+
+DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland"
+HOMEPAGE="https://codeberg.org/dnkl/yambar";
+LICENSE="MIT"
+SLOT="0"
+IUSE="core +alsa +backlight +battery +clock +cpu +disk-io +dwl 
+foreign-toplevel +memory +mpd +i3 +label +network +pipewire +pulseaudio 
+removables +river +script sway-xkb wayland X xkb xwindow"
+REQUIRED_USE="
+       || ( wayland X )
+       sway-xkb? ( wayland )
+       xkb? ( X )
+       xwindow? ( X )
+       || ( alsa backlight )
+"
+# For some reason, if building CPU, memory or pipewire modules
+# the build will fail if the alsa or backlight modules aren't present
+# See https://codeberg.org/dnkl/yambar/issues/239
+
+RDEPEND="
+       >=media-libs/fcft-2.4.0
+       dev-libs/libyaml
+       alsa? ( media-libs/alsa-lib )
+       backlight? ( virtual/libudev:= )
+       battery? ( virtual/libudev:= )
+       mpd? ( media-libs/libmpdclient )
+       pipewire? (
+                         dev-libs/json-c
+                         media-video/pipewire
+       )
+       pulseaudio? ( media-libs/libpulse )
+       removables? ( virtual/libudev:= )
+       sway-xkb? ( dev-libs/json-c )
+       x11-libs/pixman
+       X? (
+               x11-libs/libxcb:0=[xkb]
+               x11-libs/xcb-util
+               x11-libs/xcb-util-cursor
+               x11-libs/xcb-util-wm
+       )
+       wayland? ( dev-libs/wayland )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+       app-text/scdoc
+       >=dev-libs/tllist-1.0.1
+       >=dev-util/meson-0.53.0
+       virtual/pkgconfig
+       wayland? (
+               dev-libs/wayland-protocols
+               dev-util/wayland-scanner
+       )
+"
+
+src_configure() {
+       local emesonargs=(
+               $(meson_feature wayland backend-wayland)
+               $(meson_feature X backend-x11)
+               $(meson_use core core-plugins-as-shared-libraries)
+               $(meson_feature alsa plugin-alsa)
+               $(meson_feature backlight plugin-backlight)
+               $(meson_feature battery plugin-battery)
+               $(meson_feature clock plugin-clock)
+               $(meson_feature cpu plugin-cpu)
+               $(meson_feature disk-io plugin-disk-io)
+               $(meson_feature dwl plugin-dwl)
+               $(meson_feature foreign-toplevel plugin-foreign-toplevel)
+               $(meson_feature memory plugin-mem)
+               $(meson_feature mpd plugin-mpd)
+               $(meson_feature i3 plugin-i3)
+               $(meson_feature label plugin-label)
+               $(meson_feature network plugin-network)
+               $(meson_feature pipewire plugin-pipewire)
+               $(meson_feature pulseaudio plugin-pulse)
+               $(meson_feature removables plugin-removables)
+               $(meson_feature river plugin-river)
+               $(meson_feature script plugin-script)
+               $(meson_feature sway-xkb plugin-sway-xkb)
+               $(meson_feature xkb plugin-xkb)
+               $(meson_feature xwindow plugin-xwindow)
+               -Dwerror=false
+       )
+       meson_src_configure
+}
+
+src_install() {
+       meson_src_install
+       rm -rf "${D}/usr/share/doc/${PN}"
+}
+
+pkg_postinst() {
+       ewarn "Warning: if you are upgrading from 1.8.0, please note that there 
are breaking changes that might affect your config.yml file."
+       ewarn "See the changelog for more information"
+       ewarn "https://codeberg.org/dnkl/yambar/releases/tag/1.9.0";
+}

diff --git a/gui-apps/yambar/yambar-9999.ebuild 
b/gui-apps/yambar/yambar-9999.ebuild
index 5b1dbd73e..6e1db2c60 100644
--- a/gui-apps/yambar/yambar-9999.ebuild
+++ b/gui-apps/yambar/yambar-9999.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
 if [[ ${PV} != *9999* ]]; then
        SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="~amd64"
        S="${WORKDIR}/${PN}"
 else
        inherit git-r3
@@ -18,24 +17,40 @@ DESCRIPTION="Simplistic and highly configurable status 
panel for X and Wayland"
 HOMEPAGE="https://codeberg.org/dnkl/yambar";
 LICENSE="MIT"
 SLOT="0"
-IUSE="wayland X"
-REQUIRED_USE="|| ( wayland X )"
+IUSE="core +alsa +backlight +battery +clock +cpu +disk-io +dwl 
+foreign-toplevel +memory +mpd +i3 +label +network +pipewire +pulseaudio 
+removables +river +script sway-xkb wayland X xkb xwindow"
+REQUIRED_USE="
+       || ( wayland X )
+       sway-xkb? ( wayland )
+       xkb? ( X )
+       xwindow? ( X )
+       || ( alsa backlight )
+"
+# For some reason, if building CPU, memory or pipewire modules
+# the build will fail if the alsa or backlight modules aren't present
+# See https://codeberg.org/dnkl/yambar/issues/239
 
 RDEPEND="
        >=media-libs/fcft-2.4.0
-       dev-libs/json-c
        dev-libs/libyaml
-       media-libs/alsa-lib
-       media-libs/libmpdclient
-       virtual/libudev:=
+       alsa? ( media-libs/alsa-lib )
+       backlight? ( virtual/libudev:= )
+       battery? ( virtual/libudev:= )
+       mpd? ( media-libs/libmpdclient )
+       pipewire? (
+                         dev-libs/json-c
+                         media-video/pipewire
+       )
+       pulseaudio? ( media-libs/libpulse )
+       removables? ( virtual/libudev:= )
+       sway-xkb? ( dev-libs/json-c )
        x11-libs/pixman
-       wayland? ( dev-libs/wayland )
        X? (
                x11-libs/libxcb:0=[xkb]
                x11-libs/xcb-util
                x11-libs/xcb-util-cursor
                x11-libs/xcb-util-wm
        )
+       wayland? ( dev-libs/wayland )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -53,6 +68,28 @@ src_configure() {
        local emesonargs=(
                $(meson_feature wayland backend-wayland)
                $(meson_feature X backend-x11)
+               $(meson_use core core-plugins-as-shared-libraries)
+               $(meson_feature alsa plugin-alsa)
+               $(meson_feature backlight plugin-backlight)
+               $(meson_feature battery plugin-battery)
+               $(meson_feature clock plugin-clock)
+               $(meson_feature cpu plugin-cpu)
+               $(meson_feature disk-io plugin-disk-io)
+               $(meson_feature dwl plugin-dwl)
+               $(meson_feature foreign-toplevel plugin-foreign-toplevel)
+               $(meson_feature memory plugin-mem)
+               $(meson_feature mpd plugin-mpd)
+               $(meson_feature i3 plugin-i3)
+               $(meson_feature label plugin-label)
+               $(meson_feature network plugin-network)
+               $(meson_feature pipewire plugin-pipewire)
+               $(meson_feature pulseaudio plugin-pulse)
+               $(meson_feature removables plugin-removables)
+               $(meson_feature river plugin-river)
+               $(meson_feature script plugin-script)
+               $(meson_feature sway-xkb plugin-sway-xkb)
+               $(meson_feature xkb plugin-xkb)
+               $(meson_feature xwindow plugin-xwindow)
                -Dwerror=false
        )
        meson_src_configure

Reply via email to