gentoo resync : 20.03.2022

4 files changed, 88 insertions, 5 deletions

diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 86316d363630..f9af81c8a6e5 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,4 +1,6 @@
 DIST dunst-1.7.3.tar.gz 4596283 BLAKE2B dff61659b777a92cd2add9b15551a7fa471eb9adda47b31bd48d6b20a34192f3f9e7147a4249047f6993a595d0d0cf9895d9a7cc84f5bbc64972f4e111e924ad SHA512 e8bd8555bd9ea3dc5ae85c2459ad1fa29bbc5d575346381e828fc6efd618db1e87c40b4fceeb89aef83bb7f5df6b246d8a354ce8b13ec549f3452cb32c918d62
-EBUILD dunst-1.7.3.ebuild 1555 BLAKE2B bdff728971252a3e829b30ffc2e48f53246d93a97a0f8531ec453fe228fd599f18389bc127e26953f05cdfe90c6c149b36e907fa85abb13931185091888005da SHA512 fc191d4e3b2330636f6e366ab4e99c8301b4fad7ac06b2341ab0b537fea6d55a42c4fe7b8f0f4d2dcae19818b5c08dd4996baffdf61b416f0953907b570dde49
-EBUILD dunst-9999.ebuild 1405 BLAKE2B aba54e0bb45e773e58d07e78d0cd49d808c7777dc7adad3b4b5e85c000ebe9dff5174f329821e101bb34a223c0047ce0f592881ceaea4cde289805dbfe09fe1f SHA512 8d3cf492b7a74cea1500873e465f17e13fda664d3e1c97af691afd45f044e9677b780d2328381dd9eb63ec671cccc341638e72935a99ed8f680992b615368f64
+DIST dunst-1.8.1.tar.gz 4603941 BLAKE2B c694503087425a69eecd40e4e50c5cfe5e5d3e9525d259b04dacd7e2bc05ff188aad14a331c41e6ecdd91b7c43d87d5902662b8a510675f3450da7097b7da1e9 SHA512 bd8605844eacb24ec1beafbd62be1defa8ff9f6fc2e93a4746acaba483e86d0fa3937045c20dbba71c46310102d8878c8ec987a3081328b02a09d7f9fde974d9
+EBUILD dunst-1.7.3-r1.ebuild 1593 BLAKE2B 74799c0e1bc5b2744fceeb7abb7cdd3c184676645d25efadc95a0ab2b2160322bc678aa379deeda7e3db96a1a128762a108a69e2f327e38a9592a0c547b2cb06 SHA512 3a86fa252c453dff714be3982a9d73386dd2b0e7caf08a06d8ec48b97a598562aacb77b76da23477e06fdedc0e36a4f0a6bc0263e32e01da2a4353da83fb4dd0
+EBUILD dunst-1.8.1.ebuild 1595 BLAKE2B 639d95fa131b6765873682fb4df0200ac07b6b96843470dd1f3924e7d8429ae33c70bbda3cfa5adaaa0776ab6d480af5306c4e2627ac31af5814c6be612d13ba SHA512 7572b08204d70de4128b1fda07bae60dfe1378f26e203527392e2ff1cb834aa5f1535eb6bc26dfc9600b0402c8106bcd8f69be8b7b6e9d889d35644211b8fb2c
+EBUILD dunst-9999.ebuild 1443 BLAKE2B e9ff7f69d40187ee07c60fcd8f5933e2b9e725f5976c08db922c7a91c2de6517e418786a89cdb70d342ec75c059d1865296905ed3eb01118740e3ccac8656593 SHA512 f4e7347f08df22c12aadbbf6288577627208905d3f58119fd3af31dc6e03e8d89bced59b0d2e893f972e96302601117142c02f542fe0a9ade529128474c0789d
 MISC metadata.xml 335 BLAKE2B a51f44edaf12235d9edf8f84d2df6d1a94ddd894075d708f0dfd4b3d289b0225797083cfe7c02a92688d23bb47daadcdd9751c6b740ca1cf0d69b9c1ab957b8e SHA512 7010391e438ab56478c3f2c0bd92afcbe9dcedb55ec89ee3af75c89365811af2b7f198bc64adae95de5fadd6603792d1d3fd60b46840d564a920c571d3c67e20
diff --git a/x11-misc/dunst/dunst-1.7.3.ebuild b/x11-misc/dunst/dunst-1.7.3-r1.ebuild
index 2658bc4c820a..37336b25c793 100644
--- a/x11-misc/dunst/dunst-1.7.3.ebuild
+++ b/x11-misc/dunst/dunst-1.7.3-r1.ebuild
@@ -57,6 +57,7 @@ src_configure() {
 
 src_compile() {
 	local myemakeargs=(
+		SYSCONFDIR="${EPREFIX}/etc/xdg"
 		SYSTEMD="0"
 		WAYLAND="$(usex wayland 1 0)"
 	)
@@ -67,7 +68,7 @@ src_compile() {
 src_install() {
 	local myemakeargs=(
 		PREFIX="${ED}/usr"
-		SYSCONFDIR="${ED}/etc"
+		SYSCONFDIR="${ED}/etc/xdg"
 		SYSTEMD="0"
 		WAYLAND="$(usex wayland 1 0)"
 	)
diff --git a/x11-misc/dunst/dunst-1.8.1.ebuild b/x11-misc/dunst/dunst-1.8.1.ebuild
new file mode 100644
index 000000000000..e3f5d7b97fd2
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.8.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 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="wayland"
+
+DEPEND="
+	dev-libs/glib:2
+	sys-apps/dbus
+	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
+	wayland? ( dev-libs/wayland )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	wayland? ( dev-libs/wayland-protocols )
+"
+
+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=(
+		SYSCONFDIR="${EPREFIX}/etc/xdg"
+		SYSTEMD="0"
+		WAYLAND="$(usex wayland 1 0)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		PREFIX="${ED}/usr"
+		SYSCONFDIR="${ED}/etc/xdg"
+		SYSTEMD="0"
+		WAYLAND="$(usex wayland 1 0)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	systemd_newuserunit dunst.systemd.service.in dunst.service
+}
diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild
index c26bd529c4b9..bb3f803de889 100644
--- a/x11-misc/dunst/dunst-9999.ebuild
+++ b/x11-misc/dunst/dunst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -57,6 +57,7 @@ src_configure() {
 
 src_compile() {
 	local myemakeargs=(
+		SYSCONFDIR="${EPREFIX}/etc/xdg"
 		SYSTEMD="0"
 		WAYLAND="$(usex wayland 1 0)"
 	)
@@ -67,7 +68,7 @@ src_compile() {
 src_install() {
 	local myemakeargs=(
 		PREFIX="${ED}/usr"
-		SYSCONFDIR="${ED}/etc"
+		SYSCONFDIR="${ED}/etc/xdg"
 		SYSTEMD="0"
 		WAYLAND="$(usex wayland 1 0)"
 	)