gentoo resync : 02.02.2022

4 files changed, 3 insertions, 79 deletions

diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 735e0e637a28..86316d363630 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,7 +1,4 @@
-AUX dunst-1.6.1-no-Os.patch 466 BLAKE2B 7db2103d68ea8bde062ada64adc3a56813f3083cf3bd462b4372d462b276684fd2ef83a835d586596975bc4d12c90ab864c31ed06dc65321b96a4c11e81a7a20 SHA512 8c5e99c08faf56cdaffbcbdb85e45101d4822db13445155eb2bd8d4dd564bafe50db4016cb08399ee711e8a03d954d0c9272b012b2875bd3c8584df90e135ac5
-DIST dunst-1.6.1.tar.gz 217267 BLAKE2B 267e5be6a079097fb5a677bd2451b0e5bcbcddadf4c4de9af87d4eab7dd90b61908f140db3f1238b6a79d370fc3bb89c062c6b4deeefae6c9c0069b55017e907 SHA512 079ffd0ff75f1865b68cb8db261849cbe4f68b5c632c39ef8f7a3d193ff3eba3734bca31cb7268f27c9a411aec56e4c484c383b419bc0b4755b7d80ede84cd96
 DIST dunst-1.7.3.tar.gz 4596283 BLAKE2B dff61659b777a92cd2add9b15551a7fa471eb9adda47b31bd48d6b20a34192f3f9e7147a4249047f6993a595d0d0cf9895d9a7cc84f5bbc64972f4e111e924ad SHA512 e8bd8555bd9ea3dc5ae85c2459ad1fa29bbc5d575346381e828fc6efd618db1e87c40b4fceeb89aef83bb7f5df6b246d8a354ce8b13ec549f3452cb32c918d62
-EBUILD dunst-1.6.1.ebuild 1340 BLAKE2B bf51111b1f244cdaeca167b8bcd63786c61fc809d6ae0c42278830fdaac06ee384739c5d112911b7fe21d33c9ec210297b48a3799817903e7ddc68581e18dbde SHA512 5e8ae0babb55274f447dd0e892b50c2f37d149a43da9671ca1ffa1a2cf05ec5d4d0e17202e5112431aee141706f90ccff5533c43434f9f6b9c5cbac5b4c79786
-EBUILD dunst-1.7.3.ebuild 1557 BLAKE2B 20f64ed5ee829f226974bbb1d9bd9f2c147baf8f78c222429ac18b5b7f9d6597af52449899ac32be2fec9694ec72d7e458f388a7f9615449c4a6669e22911966 SHA512 faa7e7edca6fddafa9bf4cb471e1e453edc5231a089c888b2edc7c3b1b67ce3b904ea76a30b503b68b3ea13842d62c691397d3fdb2fdbbdd6c734e31d106003b
+EBUILD dunst-1.7.3.ebuild 1555 BLAKE2B bdff728971252a3e829b30ffc2e48f53246d93a97a0f8531ec453fe228fd599f18389bc127e26953f05cdfe90c6c149b36e907fa85abb13931185091888005da SHA512 fc191d4e3b2330636f6e366ab4e99c8301b4fad7ac06b2341ab0b537fea6d55a42c4fe7b8f0f4d2dcae19818b5c08dd4996baffdf61b416f0953907b570dde49
 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.6.1.ebuild b/x11-misc/dunst/dunst-1.6.1.ebuild
deleted file mode 100644
index fb0a1988036b..000000000000
--- a/x11-misc/dunst/dunst-1.6.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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/ 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
-
-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|" \
-		dunst.systemd.service.in > dunst.service || die
-}
-
-src_install() {
-	emake WAYLAND=$(usex wayland 1 0) SYSTEMD=0 \
-		DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	systemd_douserunit dunst.service
-}
diff --git a/x11-misc/dunst/dunst-1.7.3.ebuild b/x11-misc/dunst/dunst-1.7.3.ebuild
index 8eaab62529e9..2658bc4c820a 100644
--- a/x11-misc/dunst/dunst-1.7.3.ebuild
+++ b/x11-misc/dunst/dunst-1.7.3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="wayland"
 
 DEPEND="
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
deleted file mode 100644
index 90a1de94de95..000000000000
--- a/x11-misc/dunst/files/dunst-1.6.1-no-Os.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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