Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/dunst/, x11-misc/dunst/files/
Date: Wed, 02 Mar 2022 20:29:29
Message-Id: 1646252892.dbeca47cb185e4153eb9f15c98002c6abcb58b68.conikost@gentoo
1 commit: dbeca47cb185e4153eb9f15c98002c6abcb58b68
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 2 20:28:12 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 2 20:28:12 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbeca47c
7
8 x11-misc/dunst: drop 1.8.0-r1
9
10 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
11
12 x11-misc/dunst/Manifest | 1 -
13 x11-misc/dunst/dunst-1.8.0-r1.ebuild | 81 ------------------------------
14 x11-misc/dunst/files/dunst-1.8.0-xdg.patch | 23 ---------
15 3 files changed, 105 deletions(-)
16
17 diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
18 index ac0deb9ee533..76dbb6535e7c 100644
19 --- a/x11-misc/dunst/Manifest
20 +++ b/x11-misc/dunst/Manifest
21 @@ -1,3 +1,2 @@
22 DIST dunst-1.7.3.tar.gz 4596283 BLAKE2B dff61659b777a92cd2add9b15551a7fa471eb9adda47b31bd48d6b20a34192f3f9e7147a4249047f6993a595d0d0cf9895d9a7cc84f5bbc64972f4e111e924ad SHA512 e8bd8555bd9ea3dc5ae85c2459ad1fa29bbc5d575346381e828fc6efd618db1e87c40b4fceeb89aef83bb7f5df6b246d8a354ce8b13ec549f3452cb32c918d62
23 -DIST dunst-1.8.0.tar.gz 4603966 BLAKE2B 796cd76f782772cc91af27d797db92f6d3a35511d8a907e060a6363604a4b58a52f1cfc755d60a158e57ccb8b612ad119c36e8bbe960d354eed59acab93c0fde SHA512 b8e7f0884bb66aee8627858f667ef4db31664b07f7d7ede27c37d88fff6d7f47c62739d07fe7ab26628f95a13b13efa7704ea318dea4d0bcf0193a3fba6124bd
24 DIST dunst-1.8.1.tar.gz 4603941 BLAKE2B c694503087425a69eecd40e4e50c5cfe5e5d3e9525d259b04dacd7e2bc05ff188aad14a331c41e6ecdd91b7c43d87d5902662b8a510675f3450da7097b7da1e9 SHA512 bd8605844eacb24ec1beafbd62be1defa8ff9f6fc2e93a4746acaba483e86d0fa3937045c20dbba71c46310102d8878c8ec987a3081328b02a09d7f9fde974d9
25
26 diff --git a/x11-misc/dunst/dunst-1.8.0-r1.ebuild b/x11-misc/dunst/dunst-1.8.0-r1.ebuild
27 deleted file mode 100644
28 index 3607f4c5c20e..000000000000
29 --- a/x11-misc/dunst/dunst-1.8.0-r1.ebuild
30 +++ /dev/null
31 @@ -1,81 +0,0 @@
32 -# Copyright 1999-2022 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=8
36 -
37 -inherit systemd toolchain-funcs
38 -
39 -DESCRIPTION="Lightweight replacement for common notification daemons"
40 -HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
41 -SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.tar.gz"
42 -
43 -LICENSE="BSD"
44 -SLOT="0"
45 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
46 -IUSE="wayland"
47 -
48 -DEPEND="
49 - dev-libs/glib:2
50 - sys-apps/dbus
51 - x11-libs/cairo[X,glib]
52 - x11-libs/gdk-pixbuf:2
53 - x11-libs/libX11
54 - x11-libs/libXext
55 - x11-libs/libXScrnSaver
56 - x11-libs/libXinerama
57 - x11-libs/libXrandr
58 - x11-libs/libnotify
59 - x11-libs/pango[X]
60 - x11-misc/xdg-utils
61 - wayland? ( dev-libs/wayland )
62 -"
63 -
64 -RDEPEND="${DEPEND}"
65 -
66 -BDEPEND="
67 - dev-lang/perl
68 - virtual/pkgconfig
69 - wayland? ( dev-libs/wayland-protocols )
70 -"
71 -
72 -PATCHES=( "${FILESDIR}/${PN}-1.8.0-xdg.patch" )
73 -
74 -src_prepare() {
75 - default
76 -
77 - # Respect users CFLAGS
78 - sed -e 's/-Os//' -i config.mk || die
79 -
80 - # Use correct path for dbus and system unit
81 - sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die
82 - sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die
83 -}
84 -
85 -src_configure() {
86 - tc-export CC PKG_CONFIG
87 -
88 - default
89 -}
90 -
91 -src_compile() {
92 - local myemakeargs=(
93 - SYSCONFDIR="${EPREFIX}/etc/xdg"
94 - SYSTEMD="0"
95 - WAYLAND="$(usex wayland 1 0)"
96 - )
97 -
98 - emake "${myemakeargs[@]}"
99 -}
100 -
101 -src_install() {
102 - local myemakeargs=(
103 - PREFIX="${ED}/usr"
104 - SYSCONFDIR="${ED}/etc/xdg"
105 - SYSTEMD="0"
106 - WAYLAND="$(usex wayland 1 0)"
107 - )
108 -
109 - emake "${myemakeargs[@]}" install
110 -
111 - systemd_newuserunit dunst.systemd.service.in dunst.service
112 -}
113
114 diff --git a/x11-misc/dunst/files/dunst-1.8.0-xdg.patch b/x11-misc/dunst/files/dunst-1.8.0-xdg.patch
115 deleted file mode 100644
116 index e2a3a127094c..000000000000
117 --- a/x11-misc/dunst/files/dunst-1.8.0-xdg.patch
118 +++ /dev/null
119 @@ -1,23 +0,0 @@
120 -From 50743754de28da6d474c001e6b7e04ada789c04a Mon Sep 17 00:00:00 2001
121 -From: Aleksei Bavshin <alebastr89@×××××.com>
122 -Date: Sun, 27 Feb 2022 08:49:41 -0800
123 -Subject: [PATCH] Use correct variable for the configuration file paths
124 -
125 -Fixes #1041
126 ----
127 - src/utils.c | 2 +-
128 - 1 file changed, 1 insertion(+), 1 deletion(-)
129 -
130 -diff --git a/src/utils.c b/src/utils.c
131 -index 380dac26..90c47a9a 100644
132 ---- a/src/utils.c
133 -+++ b/src/utils.c
134 -@@ -448,7 +448,7 @@ FILE *fopen_verbose(const char * const path)
135 -
136 - /* see utils.h */
137 - void add_paths_from_env(GPtrArray *arr, char *env_name, char *subdir, char *alternative) {
138 -- const char *xdg_data_dirs = g_getenv("XDG_DATA_DIRS");
139 -+ const char *xdg_data_dirs = g_getenv(env_name);
140 - if (!xdg_data_dirs)
141 - xdg_data_dirs = alternative;
142 -