From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1341922-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id F02ED158086
for <garchives@archives.gentoo.org>; Sun, 21 Nov 2021 14:41:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EB6852BC004;
Sun, 21 Nov 2021 14:41:20 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C6C0C2BC004
for <gentoo-commits@lists.gentoo.org>; Sun, 21 Nov 2021 14:41:20 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B1B45342E8F
for <gentoo-commits@lists.gentoo.org>; Sun, 21 Nov 2021 14:41:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 29B4B1D8
for <gentoo-commits@lists.gentoo.org>; Sun, 21 Nov 2021 14:41:18 +0000 (UTC)
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" <conikost@gentoo.org>
Message-ID: <1637505661.4cb2dc2f57bfeb4e955ec6a3cb0e321e7a5004ab.conikost@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/dunst/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-misc/dunst/dunst-9999.ebuild
X-VCS-Directories: x11-misc/dunst/
X-VCS-Committer: conikost
X-VCS-Committer-Name: Conrad Kostecki
X-VCS-Revision: 4cb2dc2f57bfeb4e955ec6a3cb0e321e7a5004ab
X-VCS-Branch: master
Date: Sun, 21 Nov 2021 14:41:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d9117b8e-e700-4728-bfba-d6b7c2db8261
X-Archives-Hash: 29f6ae1d4203509ea331e06d2913d84f
commit: 4cb2dc2f57bfeb4e955ec6a3cb0e321e7a5004ab
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 14:39:00 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 14:41:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cb2dc2f
x11-misc/dunst: update live ebuild
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
x11-misc/dunst/dunst-9999.ebuild | 61 +++++++++++++++++++++++-----------------
1 file changed, 35 insertions(+), 26 deletions(-)
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
}