From ea04a57aa5676bdec90a82a99e8f93d114fb0961 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Sun, 26 Mar 2023 20:18:51 +0500
Subject: [PATCH] gui-apps/sfwbar: fix deps & use

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 gui-apps/sfwbar/metadata.xml                | 21 +++++----
 gui-apps/sfwbar/sfwbar-1.0_beta10-r1.ebuild | 44 ++++++++++++++++++
 gui-apps/sfwbar/sfwbar-1.0_beta10.ebuild    | 49 ---------------------
 3 files changed, 56 insertions(+), 58 deletions(-)
 create mode 100644 gui-apps/sfwbar/sfwbar-1.0_beta10-r1.ebuild
 delete mode 100644 gui-apps/sfwbar/sfwbar-1.0_beta10.ebuild

diff --git a/gui-apps/sfwbar/metadata.xml b/gui-apps/sfwbar/metadata.xml
index b80b6d90d9..08fb0fd946 100644
--- a/gui-apps/sfwbar/metadata.xml
+++ b/gui-apps/sfwbar/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>harley@hosers.org</email>
-        <name>Lev Babiev</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">LBCrion/sfwbar</remote-id>
-        <bugs-to>https://github.com/LBCrion/sfwbar/issues</bugs-to>
-        <changelog>https://github.com/LBCrion/sfwbar/releases</changelog>
-    </upstream>
+	<maintainer type="person">
+		<email>harley@hosers.org</email>
+		<name>Lev Babiev</name>
+	</maintainer>
+	<use>
+		<flag name="mpd">Add support for Music Player Daemon</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">LBCrion/sfwbar</remote-id>
+		<bugs-to>https://github.com/LBCrion/sfwbar/issues</bugs-to>
+		<changelog>https://github.com/LBCrion/sfwbar/releases</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/gui-apps/sfwbar/sfwbar-1.0_beta10-r1.ebuild b/gui-apps/sfwbar/sfwbar-1.0_beta10-r1.ebuild
new file mode 100644
index 0000000000..3caa9228b3
--- /dev/null
+++ b/gui-apps/sfwbar/sfwbar-1.0_beta10-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="S* Floating Window Bar"
+HOMEPAGE="https://github.com/LBCrion/sfwbar"
+SRC_URI="https://github.com/LBCrion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="X mpd pulseaudio"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-c:=
+	dev-libs/wayland
+	gui-libs/gtk-layer-shell
+	>=x11-libs/gtk+-3.22.0:3[introspection,wayland]
+	X? ( x11-libs/libxkbcommon )
+	mpd? ( media-libs/libmpdclient )
+	pulseaudio? ( media-libs/libpulse[glib] )
+"
+RDEPEND="${COMMON_DEPEND}
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/wayland-protocols-1.17
+"
+BDEPEND="dev-util/wayland-scanner"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature mpd)
+		$(meson_feature pulseaudio pulse)
+		$(meson_feature X xkb)
+		-Dnetwork=enabled
+	)
+
+	meson_src_configure
+}
diff --git a/gui-apps/sfwbar/sfwbar-1.0_beta10.ebuild b/gui-apps/sfwbar/sfwbar-1.0_beta10.ebuild
deleted file mode 100644
index fec47b4de9..0000000000
--- a/gui-apps/sfwbar/sfwbar-1.0_beta10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg-utils
-
-DESCRIPTION="S* Floating Window Bar"
-HOMEPAGE="https://github.com/LBCrion/sfwbar"
-SRC_URI="https://github.com/LBCrion/sfwbar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+mpd +pulse +net +xkb"
-
-DEPEND="
-	mpd? ( media-libs/libmpdclient )
-	pulse? ( media-libs/libpulse )
-	xkb? ( x11-libs/libxkbcommon )
-	>=x11-libs/gtk+-3.22.0:3[introspection,wayland]
-	gui-libs/gtk-layer-shell
-	dev-libs/json-c
-	dev-util/wayland-scanner
-	virtual/freedesktop-icon-theme
-	>=dev-libs/wayland-protocols-1.17
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature mpd)
-		$(meson_feature pulse)
-		$(meson_feature net network)
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}