gentoo resync : 05.12.2021

6 files changed, 120 insertions, 143 deletions

diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 0ac265fbd67c..ec14a73ef30e 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,9 +1,7 @@
 AUX dunst-1.6.1-no-Os.patch 466 BLAKE2B 7db2103d68ea8bde062ada64adc3a56813f3083cf3bd462b4372d462b276684fd2ef83a835d586596975bc4d12c90ab864c31ed06dc65321b96a4c11e81a7a20 SHA512 8c5e99c08faf56cdaffbcbdb85e45101d4822db13445155eb2bd8d4dd564bafe50db4016cb08399ee711e8a03d954d0c9272b012b2875bd3c8584df90e135ac5
-DIST dunst-1.4.1.tar.gz 160124 BLAKE2B d618b3bffc8f4518f58d28e108a8aadf1ff71164f581632bc198b3d0a81f6efa0fff73513fa5d46ec4a7058bb1beb8d8a51cb01e4621c76f8d3f8653cc6e2270 SHA512 43667898e123ef0dea59e2ca55a76686785906e44b453b2a86bdf361045b3f6b751a2e81fa9f562127f80bf47f8c9248960c37f8365dbbe409d72ddc3deb34fb
-DIST dunst-1.5.0.tar.gz 169272 BLAKE2B 63c33e62f61aefec67e5420d5afe41808cf8b377c0decde92781ef541315c955b715aa78c6e1a2288b916cabf7830d5621366d53731d477e3c4a6a60349f4c8b SHA512 2057dc530adce1dac89f12f4ca55e9186d378ccc2b406e0fa20d43bc69f671dc303b608a4fea781ab1193bd2e159dcbdecf3baf50e27ac9b0f164965b5824c85
 DIST dunst-1.6.1.tar.gz 217267 BLAKE2B 267e5be6a079097fb5a677bd2451b0e5bcbcddadf4c4de9af87d4eab7dd90b61908f140db3f1238b6a79d370fc3bb89c062c6b4deeefae6c9c0069b55017e907 SHA512 079ffd0ff75f1865b68cb8db261849cbe4f68b5c632c39ef8f7a3d193ff3eba3734bca31cb7268f27c9a411aec56e4c484c383b419bc0b4755b7d80ede84cd96
-EBUILD dunst-1.4.1.ebuild 1042 BLAKE2B 80f0cab6a7592ed4da0bdee6a8d595f0910567357e3eaf808d279264fc40d1be9d5bd028fff0ac568c9a083e35b5bd461f8d1cd8bb4301926da8fb052668cade SHA512 1fa787b051a4fb4472da55f44bf8d7ddd0175becb13423d7af68468b4e4706dda2be7995443c658cdf65d7561801886bdf8a7a359c623edb61ca671e7d394bab
-EBUILD dunst-1.5.0.ebuild 951 BLAKE2B 92ce2b3a4e3b66fa84184f3a80847d9ae4d6d4fcef3fb83ec9353828132702a51653cba91b322725490ed8d554b3e0854015b0cb089181db03a5490ce893a055 SHA512 85c7b4acb808207ede30e9f28047861a295c377c3311dbd1112a5fc01c61b415ccd966e88ef501dd14f6c6d73d802f47a1af60d19bae3d3c0b8c1fd7013bd45e
+DIST dunst-1.7.1.tar.gz 4585838 BLAKE2B 3bc11b4d5e6826ca03b70aa4a2cca38e2d54170cf53e8912d55129ce23eb3bacf618f8242a6be5ddcb35d7d26d6e327b9210492af2898041eae7cdec9acd9f16 SHA512 5e3e0af3cff79b371e38ddf836b53ae65e2ff32d709f7bf29c29445071e98c786d430105aa61b5a80f9c709daa07f02389f141edfd4a3dcfa53b2c667782c9a9
 EBUILD dunst-1.6.1.ebuild 1340 BLAKE2B bf51111b1f244cdaeca167b8bcd63786c61fc809d6ae0c42278830fdaac06ee384739c5d112911b7fe21d33c9ec210297b48a3799817903e7ddc68581e18dbde SHA512 5e8ae0babb55274f447dd0e892b50c2f37d149a43da9671ca1ffa1a2cf05ec5d4d0e17202e5112431aee141706f90ccff5533c43434f9f6b9c5cbac5b4c79786
-EBUILD dunst-9999.ebuild 1453 BLAKE2B 3ce3bef467d44bd753c714af4f2e1b52bd746abe49b210d8e8dbb0fe4ce465a2e0437f979110b3085c227315ce179762a814ff3ee1e2b4de53997561f5e4663b SHA512 bf09009b644600ccb85d58dd9f90c37aa8b2b3a9a9e29bae9fdf12128da782171db7377d56fbc896ccae21c99e965c4ee59ec45340f0b1e84eb936f3313fbbc6
-MISC metadata.xml 562 BLAKE2B 2e89f14a0c4334206206bf43edb95fd14020133c1faf0ba9d99037ecaf1ed4ceee35d1bba469eb4c5e1cdab90f2cdabd3d9f2b4c3d741ab8d6cca4f5def336b4 SHA512 a785ef9f97a6d30070e0a2555ed6ca7b684bfddeb6539dec32120e8e0dcc2c49724328d8ec77e2d370b61538c71f51c11aa529ecc00d078de7616475909856bd
+EBUILD dunst-1.7.1-r1.ebuild 1557 BLAKE2B 20f64ed5ee829f226974bbb1d9bd9f2c147baf8f78c222429ac18b5b7f9d6597af52449899ac32be2fec9694ec72d7e458f388a7f9615449c4a6669e22911966 SHA512 faa7e7edca6fddafa9bf4cb471e1e453edc5231a089c888b2edc7c3b1b67ce3b904ea76a30b503b68b3ea13842d62c691397d3fdb2fdbbdd6c734e31d106003b
+EBUILD dunst-9999.ebuild 1405 BLAKE2B aba54e0bb45e773e58d07e78d0cd49d808c7777dc7adad3b4b5e85c000ebe9dff5174f329821e101bb34a223c0047ce0f592881ceaea4cde289805dbfe09fe1f SHA512 8d3cf492b7a74cea1500873e465f17e13fda664d3e1c97af691afd45f044e9677b780d2328381dd9eb63ec671cccc341638e72935a99ed8f680992b615368f64
+MISC metadata.xml 335 BLAKE2B a51f44edaf12235d9edf8f84d2df6d1a94ddd894075d708f0dfd4b3d289b0225797083cfe7c02a92688d23bb47daadcdd9751c6b740ca1cf0d69b9c1ab957b8e SHA512 7010391e438ab56478c3f2c0bd92afcbe9dcedb55ec89ee3af75c89365811af2b7f198bc64adae95de5fadd6603792d1d3fd60b46840d564a920c571d3c67e20
diff --git a/x11-misc/dunst/dunst-1.4.1.ebuild b/x11-misc/dunst/dunst-1.4.1.ebuild
deleted file mode 100644
index 6bd70a292b88..000000000000
--- a/x11-misc/dunst/dunst-1.4.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Customizable and lightweight notification-daemon"
-HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
-SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="dunstify"
-
-CDEPEND="
-	dev-libs/glib:2
-	sys-apps/dbus
-	x11-libs/cairo[X,glib]
-	x11-libs/gdk-pixbuf
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/pango[X]
-	dunstify? ( x11-libs/libnotify )
-"
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die
-
-	default
-}
-
-src_compile() {
-	tc-export CC
-	emake
-	use dunstify && emake dunstify
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
-	use dunstify && dobin dunstify
-
-	dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES
-}
diff --git a/x11-misc/dunst/dunst-1.5.0.ebuild b/x11-misc/dunst/dunst-1.5.0.ebuild
deleted file mode 100644
index 2e108755ce51..000000000000
--- a/x11-misc/dunst/dunst-1.5.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Customizable and lightweight notification-daemon"
-HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
-SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DEPEND="
-	dev-libs/glib:2
-	sys-apps/dbus
-	x11-libs/cairo[X,glib]
-	x11-libs/gdk-pixbuf
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libnotify
-	x11-libs/pango[X]
-"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die
-
-	default
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-
-	dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES
-}
diff --git a/x11-misc/dunst/dunst-1.7.1-r1.ebuild b/x11-misc/dunst/dunst-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..8eaab62529e9
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.7.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 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=(
+		SYSTEMD="0"
+		WAYLAND="$(usex wayland 1 0)"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	local myemakeargs=(
+		PREFIX="${ED}/usr"
+		SYSCONFDIR="${ED}/etc"
+		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 dbbb4b319428..c26bd529c4b9 100644
--- a/x11-misc/dunst/dunst-9999.ebuild
+++ b/x11-misc/dunst/dunst-9999.ebuild
@@ -1,40 +1,38 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit systemd toolchain-funcs
+EAPI=8
 
-DESCRIPTION="Customizable and lightweight notification-daemon"
-HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
+inherit git-r3 systemd toolchain-funcs
+
+EGIT_REPO_URI="https://github.com/dunst-project/dunst"
 
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dunst-project/dunst"
-else
-	SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
+DESCRIPTION="Lightweight replacement for common notification daemons"
+HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test wayland"
-RESTRICT="!test? ( test )"
+KEYWORDS=""
+IUSE="wayland"
 
 DEPEND="
 	dev-libs/glib:2
 	sys-apps/dbus
 	x11-libs/cairo[X,glib]
-	x11-libs/gdk-pixbuf
+	x11-libs/gdk-pixbuf:2
 	x11-libs/libX11
-	x11-libs/libXScrnSaver
 	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
@@ -44,26 +42,37 @@ BDEPEND="
 src_prepare() {
 	default
 
-	sed -i \
-		-e "/^DEFAULT_CFLAGS/s/-g //" \
-		-e "/^DEFAULT_CFLAGS/s/-Os //" \
-		config.mk \
-		|| die "sed failed"
+	# Respect users CFLAGS
+	sed -e 's/-Os//' -i config.mk || die
+
+	# Use correct path for system unit
+	sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die
 }
 
 src_configure() {
 	tc-export CC PKG_CONFIG
+
 	default
 }
 
 src_compile() {
-	emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0
-	sed -e "s|##PREFIX##|${EPREFIX}/usr|" \
-		dunst.systemd.service.in > dunst.service || die
+	local myemakeargs=(
+		SYSTEMD="0"
+		WAYLAND="$(usex wayland 1 0)"
+	)
+
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
-	emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0 \
-		DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	systemd_douserunit dunst.service
+	local myemakeargs=(
+		PREFIX="${ED}/usr"
+		SYSCONFDIR="${ED}/etc"
+		SYSTEMD="0"
+		WAYLAND="$(usex wayland 1 0)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	systemd_newuserunit dunst.systemd.service.in dunst.service
 }
diff --git a/x11-misc/dunst/metadata.xml b/x11-misc/dunst/metadata.xml
index 759adfc747a6..47e53e6187f7 100644
--- a/x11-misc/dunst/metadata.xml
+++ b/x11-misc/dunst/metadata.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>gentoo@aisha.cc</email>
-		<name>Aisha Tammy</name>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="dunstify">Experimental replacement for notify-send.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">dunst-project/dunst</remote-id>
 	</upstream>