8 files changed, 140 insertions, 85 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d12aa624a0e1..4c12e5a22b34 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 066a0a1fdcdd..2659db746956 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,4 +1,6 @@
 DIST dunst-1.11.0.tar.gz 4645279 BLAKE2B 0daa8d098f032a0e3b16872bc2e33c8411e8eed543fc13533e649935d2d0796ad74b3fb27769f839972b335b7a2f7ae6b5efd9f324a8bb807ac2f82fa8611a5d SHA512 84c9edccddd183fb867233cb5377115d96735f4c1be84007194ac39dd48d913e5bb021d2952057aecdb978564c2471a8974c4ee4eeccfb188e5345527007a5c4
+DIST dunst-1.12.0.tar.gz 4653739 BLAKE2B ee537ae10333e41d478f8707d88ff892fad8277038efa7c0180fcbea070ef256060aff8bf2d5c9ac9ebe13e69d3d31066007a8eaf2ca3e1c33f5c922abe22714 SHA512 c969d1bc669cd4b56ebb24ac5ad915aea2776746caf06a941630faff662ed08a05d4652946102428d66e5a89c9144e5d0bfcf7113f8fba3e7c28f0777b490052
 EBUILD dunst-1.11.0.ebuild 1593 BLAKE2B 66e8044489c283417f8c30efa9267cb146da8f6685cc83fe5ace46e1310cb0fc5645dd8ce0fda192ec6e1c442683b45f7d9c68c35c7ea6678918af4d16a8ba76 SHA512 6415b048c9cb5463f5730264e8d5c387c84dbebb14e66d49fb094a7f591d36a3e3df1c4d0c5ec0f9c455b953ebe9cf02694a7f72e0df066ff199e9890bc4c6eb
-EBUILD dunst-9999.ebuild 1431 BLAKE2B 1080fd19995417f83864689dee591fde1fd01d25a0fd6a4950baf751702c40d68cab2b3c8ead8a1012864faeb7fc1e497dd169f5706b10a24ec7c0d117a34833 SHA512 1f26d5d0d4ced83ebf460b19b197f2b06059131cc5ca50b08b68366da049c1ed905a5350cf0133dc26aac9bc687be3952b8ce9b64d9ffac58c3b0758f67fb106
-MISC metadata.xml 335 BLAKE2B a51f44edaf12235d9edf8f84d2df6d1a94ddd894075d708f0dfd4b3d289b0225797083cfe7c02a92688d23bb47daadcdd9751c6b740ca1cf0d69b9c1ab957b8e SHA512 7010391e438ab56478c3f2c0bd92afcbe9dcedb55ec89ee3af75c89365811af2b7f198bc64adae95de5fadd6603792d1d3fd60b46840d564a920c571d3c67e20
+EBUILD dunst-1.12.0.ebuild 2380 BLAKE2B 7f342dfe03a127ae4b349ddb8ad89f774f67ca3309f25f3209fdf62ccbc431bb2e6ba6ceeb046081d4edcbaa0e50ec9753c0ca332261e246cc2d464feb4f99c9 SHA512 61acf21630e0228d843d1f92737db9d1f0a8c86f5302d421133de9d26b8d61acd69248261b5818b7cca4a96fec3018944323bec8e4eb0dbce51c0989d2d26109
+EBUILD dunst-9999.ebuild 1773 BLAKE2B bd51fc291f84d52f6b6791479aa23117c907fd42f065bab30dac19b3d7d8147fd6e4d37682f198d6475f7900938c67d4fcbc42f6f099a93b27a813a9a2247d23 SHA512 deb41c8b95d714f0eef1360e93f172a3930600254f8f872c311ad3d9186973633490511a4b2bee18b11bf045da4a4b7e1eb4a0ff67993c8adcf6ec5860bbb232
+MISC metadata.xml 583 BLAKE2B 0e304f035c74e14c1551e0e15eafac158cded052a39b893ab63b72f700a3d151fe048db153b00a1c98145261e8d6f56e609e215e95ff75de091d6f33156c9f14 SHA512 31932adf73148096301e796a0320332efd87f5b855d51618c81bb661611ef51d151ed2ea9575e3e64702368ca0791a9a5b9c8d2b6c036e1d11ce8bf04b7dc151
diff --git a/x11-misc/dunst/dunst-1.12.0.ebuild b/x11-misc/dunst/dunst-1.12.0.ebuild
new file mode 100644
index 000000000000..4a9665d4576b
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.12.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Lightweight replacement for common notification daemons"
+HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
+SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+IUSE="+completions +dunstify wayland +X +xdg"
+
+DEPEND="
+	dev-libs/glib:2
+	sys-apps/dbus
+	x11-libs/cairo[X?,glib]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango[X?]
+	dunstify? ( x11-libs/libnotify )
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXScrnSaver
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+	)
+	xdg? ( x11-misc/xdg-utils )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	wayland? ( dev-libs/wayland-protocols )
+"
+
+REQUIRED_USE="|| ( wayland X )"
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-Os//' -i config.mk || die
+
+	# Use correct path for dbus and system unit
+	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die
+	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+
+	default
+}
+
+src_compile() {
+	local myemakeargs=(
+		DUNSTIFY="$(usex dunstify 1 0)"
+		SYSCONFDIR="${EPREFIX}/etc/xdg"
+		SYSTEMD="0"
+		WAYLAND="$(usex wayland 1 0)"
+		X11="$(usex X 1 0)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		COMPLETIONS="$(usex completions 1 0)"
+		DUNSTIFY="$(usex dunstify 1 0)"
+		PREFIX="${ED}/usr"
+		SYSCONFDIR="${ED}/etc/xdg"
+		SYSTEMD="0"
+		WAYLAND="$(usex wayland 1 0)"
+		X11="$(usex X 1 0)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	systemd_newuserunit dunst.systemd.service.in dunst.service
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -ge 1.12.0; then
+				return
+			fi
+		done
+	fi
+
+	einfo "The behaviour of the setting 'height' has been changed in a breaking way."
+	einfo "The way of specifying a maximum height before was:"
+	einfo "    height = 300"
+	einfo "The equivalent way now is:"
+	einfo "    height = (0, 300)"
+	einfo "For more information read the official RELEASE_NOTES [1]."
+	einfo ""
+	einfo "[1] https://dunst-project.org/release/#v1.12.0"
+}
diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild
index 901f3e6a33b9..38f2b2385cea 100644
--- a/x11-misc/dunst/dunst-9999.ebuild
+++ b/x11-misc/dunst/dunst-9999.ebuild
@@ -12,22 +12,24 @@ HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="wayland"
+IUSE="+completions +dunstify wayland +X +xdg"
 
 DEPEND="
 	dev-libs/glib:2
 	sys-apps/dbus
-	x11-libs/cairo[X,glib]
+	x11-libs/cairo[X?,glib]
 	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXScrnSaver
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libnotify
-	x11-libs/pango[X]
-	x11-misc/xdg-utils
+	x11-libs/pango[X?]
+	dunstify? ( x11-libs/libnotify )
 	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXScrnSaver
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+	)
+	xdg? ( x11-misc/xdg-utils )
 "
 
 RDEPEND="${DEPEND}"
@@ -38,14 +40,17 @@ BDEPEND="
 	wayland? ( dev-libs/wayland-protocols )
 "
 
+REQUIRED_USE="|| ( wayland X )"
+
 src_prepare() {
 	default
 
 	# Respect users CFLAGS
 	sed -e 's/-Os//' -i config.mk || die
 
-	# Use correct path for system unit
+	# Use correct path for dbus and system unit
 	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die
+	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die
 }
 
 src_configure() {
@@ -56,9 +61,11 @@ src_configure() {
 
 src_compile() {
 	local myemakeargs=(
+		DUNSTIFY="$(usex dunstify 1 0)"
 		SYSCONFDIR="${EPREFIX}/etc/xdg"
 		SYSTEMD="0"
 		WAYLAND="$(usex wayland 1 0)"
+		X11="$(usex X 1 0)"
 	)
 
 	emake "${myemakeargs[@]}"
@@ -66,10 +73,13 @@ src_compile() {
 
 src_install() {
 	local myemakeargs=(
+		COMPLETIONS="$(usex completions 1 0)"
+		DUNSTIFY="$(usex dunstify 1 0)"
 		PREFIX="${ED}/usr"
 		SYSCONFDIR="${ED}/etc/xdg"
 		SYSTEMD="0"
 		WAYLAND="$(usex wayland 1 0)"
+		X11="$(usex X 1 0)"
 	)
 
 	emake "${myemakeargs[@]}" install
diff --git a/x11-misc/dunst/metadata.xml b/x11-misc/dunst/metadata.xml
index 47e53e6187f7..856034fe4775 100644
--- a/x11-misc/dunst/metadata.xml
+++ b/x11-misc/dunst/metadata.xml
@@ -5,6 +5,11 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
+	<use>
+		<flag name="completions">Install shell completions (for bash, fish and zsh)</flag>
+		<flag name="dunstify">Build dunstify (notify-send alternative)</flag>
+		<flag name="xdg">Install xdg-utils for opening links with xdg-open</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">dunst-project/dunst</remote-id>
 	</upstream>
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 1a58b4aed77b..fcc2d4ad3358 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,6 +1,4 @@
 AUX polybar-3.7.2-gcc15-cstdint-includes.patch 2184 BLAKE2B 0d906e4a01c92fc50ffd3cb887eadd1103ba0899aa6604bac0bf5d2fb0d231aadfd7bc1e5c3378accd9abccd6ace0fb15f1ace4a85155459d616de9ff64ea17d SHA512 169c9f5a602d0df718b52de4dff2b6250cf593e4acd2623dfb8e8059b45b0f483cc11a814661287362b25182268cbd6209752b74a1124cd3e3a7e23bcfd2cf27
-DIST polybar-3.7.1.tar.gz 495162 BLAKE2B 33ffb3bb3595a41cb82a5ee70c79f5a31f23b6463c156a704546c803f0f006780c59b04fe2d1479f52dd15a44534687f130dfde794ac08218df2b634b34838de SHA512 cb248fd904a89dbd88d2d1ab71aeaf31e2b5781304f126aeb489da1238681e354d5347555076e814751ef5bb6717a3a6742d1726cf4721697e75694c7643bed4
 DIST polybar-3.7.2.tar.gz 494383 BLAKE2B dda97c42de5f32a005ae6d4de737651278df0364187c735d7fa8a6d34e644b917ba3f32859cc19bd869c43f5d14f73ca734a4227651eb267724d808e4a766e08 SHA512 a0ee701533e101789f7eb95c71717ecf1d389a10b202d19261f9f71fee9d43fb8be17fb63e4a056c5e8bd62d2e669c95ee4d4b8c6bb06b933e1e4b26ab1a0624
-EBUILD polybar-3.7.1-r1.ebuild 1631 BLAKE2B 226f1293a5d34cf421b26d55c98916a0e7d55a609d622113a6b5363c9347852bfd778440c39a2f86d54e36d59aa721d697136c3a2f72a82b4cf97879a4f5d44d SHA512 6402c85813b18d29897076e1ad88da26b9c0465081c4b7ea1f3fca0af13971af16052dfcdd86d56cde4716e7f1989625af57fc49672b212077e6dba429eb8b5b
-EBUILD polybar-3.7.2.ebuild 1695 BLAKE2B 5666aef38ff0a9fc437bbb728560d1f2c2d999075357cfae7c5d57a7806a6174b14ade7e80e089d5d95cf2de21fe33fe80cde2656995445c29685623802994e0 SHA512 7b7e248ff90dec7c6e5e4c4ff6fd59600094cc2956200315433d0f6ce2903023d5242cedfe552c1536a0154c83d55172210c4359064fa0779312e06cf6aaace5
+EBUILD polybar-3.7.2.ebuild 1693 BLAKE2B 5514c4d92ab06e763c553c94fa840ed1c3ed57b4b187afd565124f2af7cc931a32941ff08e0f50eccb5f2ed72b5cf3ef9ce0482cb6fbb7d34da8a0dea8232b4d SHA512 4bfc665f8bdf3c450f6fcfb39aaac5c7b60a788ee06830bd09c5e06da652bd1456d9a10d587895f9cf2a0b6915b932e90ae8060e9e7d17477c0dc03a3c864674
 MISC metadata.xml 585 BLAKE2B c792f265587effc07acc20f097adc1a1975d23ddf55ceb07b4bda02e61e1b48b1d20c5a07792ac18fa5f02949e0a88bc18fe6df2fffd9454406cda34ac33654b SHA512 c3f9080f68d989dbfd75492ec0c4870e4df9b0525a69256ac95bf55eea60022ac018cc1afe42677bc8f822beec75d137e1e7c8a876763c72664541a0a54b28f1
diff --git a/x11-misc/polybar/polybar-3.7.1-r1.ebuild b/x11-misc/polybar/polybar-3.7.1-r1.ebuild
deleted file mode 100644
index acdb2155246d..000000000000
--- a/x11-misc/polybar/polybar-3.7.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake optfeature python-single-r1
-
-DESCRIPTION="A fast and easy-to-use tool for creating status bars"
-HOMEPAGE="https://github.com/polybar/polybar"
-SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]')
-	dev-libs/libuv:=
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-base/xorg-proto
-	x11-libs/cairo[X,xcb(+)]
-	x11-libs/libxcb:=
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-wm
-	x11-libs/xcb-util-xrm
-	alsa? ( media-libs/alsa-lib )
-	curl? ( net-misc/curl )
-	doc? ( dev-python/sphinx )
-	i3wm? (
-		dev-libs/jsoncpp:=
-		x11-wm/i3
-	)
-	mpd? ( media-libs/libmpdclient )
-	network? ( dev-libs/libnl:3 )
-	pulseaudio? ( media-libs/libpulse )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_ALSA="$(usex alsa)"
-		-DENABLE_CURL="$(usex curl)"
-		-DBUILD_DOC="$(usex doc)"
-		-DENABLE_I3="$(usex i3wm)"
-		-DBUILD_POLYBAR_MSG="$(usex ipc)"
-		-DENABLE_MPD="$(usex mpd)"
-		-DENABLE_NETWORK="$(usex network)"
-		-DENABLE_PULSEAUDIO="$(usex pulseaudio)"
-		# Bug 767949
-		-DENABLE_CCACHE="OFF"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc/"
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	optfeature "Unprivileged display backlight control via udev" sys-power/acpilight
-}
diff --git a/x11-misc/polybar/polybar-3.7.2.ebuild b/x11-misc/polybar/polybar-3.7.2.ebuild
index 7dfd36994d4a..3e08e6ca1869 100644
--- a/x11-misc/polybar/polybar-3.7.2.ebuild
+++ b/x11-misc/polybar/polybar-3.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit cmake optfeature python-single-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"