gentoo resync : 05.03.2021

5 files changed, 111 insertions, 21 deletions

diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 7cb390411ddd..d9da47f3ba93 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,6 +1,9 @@
+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
-EBUILD dunst-9999.ebuild 914 BLAKE2B 4803027c90298c1d6de77808f93ff1d8ba0907cad80ca1a189f544b63dc01bf5cfce7682fed17110e0aa3c30371294b02a7fde43f02f27a53ff495de69edf8fa SHA512 4bbd28c9dd0c3877c7f3d204b23bc311973d73f806caa111bfcc9542edd1573e6c6e1192b63cb9f53566b8b102623a13f050efe97a84147351da84f69227ceaf
-MISC metadata.xml 448 BLAKE2B 088d419b835ebdb800e07ae00892d0c01bef6f862d72ac3976d58202e532870c1c0f8e96ea292c95e9579bda48b5c81952f954afee300e250a21167af639bf7e SHA512 4269d385c94e1dcfcd89f9ba95486da2a7feea2370fe1cef33051a3886e8c7612911bca2da15fa049d6692994c8c342e308fdfa2645a5f576ad93080e8d54d73
+EBUILD dunst-1.6.1.ebuild 1303 BLAKE2B f3a91461b6c86a5f288fa248e2a83f4ce286b4281b504b30bbef9062bdbdcec24176d1179d522d8622e566687a098922e099d878f2200e86b72cfa44ea9dd9a6 SHA512 84a30e6963ffcb1a04dad5064e23b8683adbb7e04a351e75d492948a8982e7f52fe5d2e3609a924a5c7b97655af8bac9229e3d1bbe64bd5002b12e226383dfd2
+EBUILD dunst-9999.ebuild 1303 BLAKE2B f3a91461b6c86a5f288fa248e2a83f4ce286b4281b504b30bbef9062bdbdcec24176d1179d522d8622e566687a098922e099d878f2200e86b72cfa44ea9dd9a6 SHA512 84a30e6963ffcb1a04dad5064e23b8683adbb7e04a351e75d492948a8982e7f52fe5d2e3609a924a5c7b97655af8bac9229e3d1bbe64bd5002b12e226383dfd2
+MISC metadata.xml 531 BLAKE2B ee3ea89d78c72a65107549b543efae51493efeae741cdfc4bb61e10db1d1a4ef43d61453d44a8b44fc5d366b7795f3b7e7e5736fff4f8f3d98e71b5fc1e4975d SHA512 e7d15adc2506bc87f631f7d90dd3fcc5e8cafd69287df6518d285b487841f3bda286fb3da3717340a271532749af7605dc07b8cb65340bc0f5b154150c2ec7b3
diff --git a/x11-misc/dunst/dunst-1.6.1.ebuild b/x11-misc/dunst/dunst-1.6.1.ebuild
new file mode 100644
index 000000000000..db38e7cda0ae
--- /dev/null
+++ b/x11-misc/dunst/dunst-1.6.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Customizable and lightweight notification-daemon"
+HOMEPAGE="https://dunst-project.org/"
+
+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
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test wayland"
+RESTRICT="!test? ( test )"
+
+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]
+	wayland? ( dev-libs/wayland )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	wayland? ( dev-libs/wayland-protocols )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.6.1-no-Os.patch )
+
+src_configure() {
+	tc-export CC PKG_CONFIG
+	default
+}
+
+src_compile() {
+	emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0
+	sed -e "s|##PREFIX##|${EPREFIX}/usr|" \
+	    -i dunst.systemd.service.in > dunst.service
+}
+
+src_install() {
+	emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0 \
+	      DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	systemd_dounit dunst.service
+}
diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild
index f341b6af6627..db38e7cda0ae 100644
--- a/x11-misc/dunst/dunst-9999.ebuild
+++ b/x11-misc/dunst/dunst-9999.ebuild
@@ -1,16 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs
+inherit systemd toolchain-funcs
 
 DESCRIPTION="Customizable and lightweight notification-daemon"
-HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
-EGIT_REPO_URI="https://github.com/${PN}-project/${PN}"
+HOMEPAGE="https://dunst-project.org/"
+
+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
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
+IUSE="test wayland"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/glib:2
@@ -23,28 +31,30 @@ DEPEND="
 	x11-libs/libXrandr
 	x11-libs/libnotify
 	x11-libs/pango[X]
+	wayland? ( dev-libs/wayland )
 "
+RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
-"
-RDEPEND="
-	${DEPEND}
+	wayland? ( dev-libs/wayland-protocols )
 "
 
-src_prepare() {
-	sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die
-
-	default
-}
+PATCHES=( "${FILESDIR}"/${PN}-1.6.1-no-Os.patch )
 
 src_configure() {
 	tc-export CC PKG_CONFIG
 	default
 }
 
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+src_compile() {
+	emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0
+	sed -e "s|##PREFIX##|${EPREFIX}/usr|" \
+	    -i dunst.systemd.service.in > dunst.service
+}
 
-	dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES
+src_install() {
+	emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0 \
+	      DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	systemd_dounit dunst.service
 }
diff --git a/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch b/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch
new file mode 100644
index 000000000000..90a1de94de95
--- /dev/null
+++ b/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch
@@ -0,0 +1,13 @@
+diff --git a/config.mk b/config.mk
+index 54426a7..2e18031 100644
+--- a/config.mk
++++ b/config.mk
+@@ -36,7 +36,7 @@ endif
+ 
+ # flags
+ DEFAULT_CPPFLAGS = -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
+-DEFAULT_CFLAGS   = -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os ${STATIC} ${ENABLE_WAYLAND}
++DEFAULT_CFLAGS   = --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} ${ENABLE_WAYLAND}
+ DEFAULT_LDFLAGS  = -lm -lrt
+ 
+ CPPFLAGS_DEBUG := -DDEBUG_BUILD
diff --git a/x11-misc/dunst/metadata.xml b/x11-misc/dunst/metadata.xml
index de3681ee1319..1472d6311cad 100644
--- a/x11-misc/dunst/metadata.xml
+++ b/x11-misc/dunst/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type='project'>
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="dunstify">Experimental replacement for notify-send.</flag>