From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 567241396D0 for ; Sat, 9 Sep 2017 12:30:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FFD71FC048; Sat, 9 Sep 2017 12:30:19 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60E261FC048 for ; Sat, 9 Sep 2017 12:30:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E2493417CD for ; Sat, 9 Sep 2017 12:30:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FD4E9065 for ; Sat, 9 Sep 2017 12:30:16 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1504960215.89decf31a4c1055df9abfee09242092f6a7eb22e.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/dunst/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/dunst/dunst-1.1.0.ebuild x11-misc/dunst/dunst-1.2.0.ebuild X-VCS-Directories: x11-misc/dunst/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 89decf31a4c1055df9abfee09242092f6a7eb22e X-VCS-Branch: master Date: Sat, 9 Sep 2017 12:30:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f6f96603-930b-4f33-a597-7001e984b993 X-Archives-Hash: 48259aff3b7e4033f608e21cff66f1e9 commit: 89decf31a4c1055df9abfee09242092f6a7eb22e Author: Jeroen Roovers gentoo org> AuthorDate: Sat Sep 9 12:29:32 2017 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sat Sep 9 12:30:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89decf31 x11-misc/dunst: Drop gtk+ dep for 1.1.0. Respect CC. Fix some compiler warnings. Package-Manager: Portage-2.3.8, Repoman-2.3.3 x11-misc/dunst/dunst-1.1.0.ebuild | 45 ++++++++++++++++++++++----------------- x11-misc/dunst/dunst-1.2.0.ebuild | 22 +++++++++---------- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/x11-misc/dunst/dunst-1.1.0.ebuild b/x11-misc/dunst/dunst-1.1.0.ebuild index 01fcda42db9..1ce9d2c4edb 100644 --- a/x11-misc/dunst/dunst-1.1.0.ebuild +++ b/x11-misc/dunst/dunst-1.1.0.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI=6 +inherit toolchain-funcs DESCRIPTION="customizable and lightweight notification-daemon" HOMEPAGE="http://www.knopwob.org/dunst/" @@ -20,33 +19,41 @@ CDEPEND=" sys-apps/dbus x11-libs/cairo[X,glib] x11-libs/gdk-pixbuf - x11-libs/gtk+:2= x11-libs/libXScrnSaver x11-libs/libXft x11-libs/libXinerama x11-libs/pango[X] dunstify? ( x11-libs/libnotify ) " - -DEPEND="${CDEPEND} - dev-lang/perl - virtual/pkgconfig" - +DEPEND=" + ${CDEPEND} + dev-lang/perl + virtual/pkgconfig +" RDEPEND="${CDEPEND}" src_prepare() { - # Remove nasty CFLAGS which override user choice - sed -ie "/^CFLAGS/ { - s:-g:: - s:-O.:: - }" config.mk || die "sed failed" + sed -i \ + -e '/^CFLAGS/ { s:-g::; s:-O.:: }' \ + -e '/^CPPFLAGS/ s:-D_BSD_SOURCE:-D_DEFAULT_SOURCE:' \ + config.mk || die - if use dunstify; then - # add dunstify to the all target - sed -ie "/^all:/ s:$: dunstify:" Makefile || die "sed failed" - fi + sed -i \ + -e 's:registration_id > 0:(&):' \ + dbus.c || die + + sed -i \ + -e '/g_print.*iter->data/ s:iter->data:(char *)&:' \ + dunstify.c || die + + default +} + +src_compile() { + tc-export CC + emake V= - epatch_user + use dunstify && emake V= dunstify } src_install() { diff --git a/x11-misc/dunst/dunst-1.2.0.ebuild b/x11-misc/dunst/dunst-1.2.0.ebuild index ebbb3c591cb..40b3555454b 100644 --- a/x11-misc/dunst/dunst-1.2.0.ebuild +++ b/x11-misc/dunst/dunst-1.2.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils +inherit toolchain-funcs DESCRIPTION="customizable and lightweight notification-daemon" HOMEPAGE="http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst" @@ -35,23 +35,21 @@ DEPEND=" RDEPEND="${CDEPEND}" src_prepare() { - default - - # Remove nasty CFLAGS which override user choice sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die - if use dunstify; then - # add dunstify to the all target - sed -i -e "/^all:/ s:$: dunstify:" Makefile || die - fi + default +} + +src_compile() { + tc-export CC + emake + use dunstify && emake dunstify } src_install() { - emake DESTDIR="${D}" PREFIX="/usr" install + default - if use dunstify; then - dobin dunstify - fi + dunstify && dobin dunstify dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES }