1 |
commit: 89decf31a4c1055df9abfee09242092f6a7eb22e |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 9 12:29:32 2017 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 9 12:30:15 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89decf31 |
7 |
|
8 |
x11-misc/dunst: Drop gtk+ dep for 1.1.0. Respect CC. Fix some compiler warnings. |
9 |
|
10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
11 |
|
12 |
x11-misc/dunst/dunst-1.1.0.ebuild | 45 ++++++++++++++++++++++----------------- |
13 |
x11-misc/dunst/dunst-1.2.0.ebuild | 22 +++++++++---------- |
14 |
2 files changed, 36 insertions(+), 31 deletions(-) |
15 |
|
16 |
diff --git a/x11-misc/dunst/dunst-1.1.0.ebuild b/x11-misc/dunst/dunst-1.1.0.ebuild |
17 |
index 01fcda42db9..1ce9d2c4edb 100644 |
18 |
--- a/x11-misc/dunst/dunst-1.1.0.ebuild |
19 |
+++ b/x11-misc/dunst/dunst-1.1.0.ebuild |
20 |
@@ -1,9 +1,8 @@ |
21 |
# Copyright 1999-2017 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI=5 |
25 |
- |
26 |
-inherit eutils |
27 |
+EAPI=6 |
28 |
+inherit toolchain-funcs |
29 |
|
30 |
DESCRIPTION="customizable and lightweight notification-daemon" |
31 |
HOMEPAGE="http://www.knopwob.org/dunst/" |
32 |
@@ -20,33 +19,41 @@ CDEPEND=" |
33 |
sys-apps/dbus |
34 |
x11-libs/cairo[X,glib] |
35 |
x11-libs/gdk-pixbuf |
36 |
- x11-libs/gtk+:2= |
37 |
x11-libs/libXScrnSaver |
38 |
x11-libs/libXft |
39 |
x11-libs/libXinerama |
40 |
x11-libs/pango[X] |
41 |
dunstify? ( x11-libs/libnotify ) |
42 |
" |
43 |
- |
44 |
-DEPEND="${CDEPEND} |
45 |
- dev-lang/perl |
46 |
- virtual/pkgconfig" |
47 |
- |
48 |
+DEPEND=" |
49 |
+ ${CDEPEND} |
50 |
+ dev-lang/perl |
51 |
+ virtual/pkgconfig |
52 |
+" |
53 |
RDEPEND="${CDEPEND}" |
54 |
|
55 |
src_prepare() { |
56 |
- # Remove nasty CFLAGS which override user choice |
57 |
- sed -ie "/^CFLAGS/ { |
58 |
- s:-g:: |
59 |
- s:-O.:: |
60 |
- }" config.mk || die "sed failed" |
61 |
+ sed -i \ |
62 |
+ -e '/^CFLAGS/ { s:-g::; s:-O.:: }' \ |
63 |
+ -e '/^CPPFLAGS/ s:-D_BSD_SOURCE:-D_DEFAULT_SOURCE:' \ |
64 |
+ config.mk || die |
65 |
|
66 |
- if use dunstify; then |
67 |
- # add dunstify to the all target |
68 |
- sed -ie "/^all:/ s:$: dunstify:" Makefile || die "sed failed" |
69 |
- fi |
70 |
+ sed -i \ |
71 |
+ -e 's:registration_id > 0:(&):' \ |
72 |
+ dbus.c || die |
73 |
+ |
74 |
+ sed -i \ |
75 |
+ -e '/g_print.*iter->data/ s:iter->data:(char *)&:' \ |
76 |
+ dunstify.c || die |
77 |
+ |
78 |
+ default |
79 |
+} |
80 |
+ |
81 |
+src_compile() { |
82 |
+ tc-export CC |
83 |
+ emake V= |
84 |
|
85 |
- epatch_user |
86 |
+ use dunstify && emake V= dunstify |
87 |
} |
88 |
|
89 |
src_install() { |
90 |
|
91 |
diff --git a/x11-misc/dunst/dunst-1.2.0.ebuild b/x11-misc/dunst/dunst-1.2.0.ebuild |
92 |
index ebbb3c591cb..40b3555454b 100644 |
93 |
--- a/x11-misc/dunst/dunst-1.2.0.ebuild |
94 |
+++ b/x11-misc/dunst/dunst-1.2.0.ebuild |
95 |
@@ -2,7 +2,7 @@ |
96 |
# Distributed under the terms of the GNU General Public License v2 |
97 |
|
98 |
EAPI=6 |
99 |
-inherit eutils |
100 |
+inherit toolchain-funcs |
101 |
|
102 |
DESCRIPTION="customizable and lightweight notification-daemon" |
103 |
HOMEPAGE="http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst" |
104 |
@@ -35,23 +35,21 @@ DEPEND=" |
105 |
RDEPEND="${CDEPEND}" |
106 |
|
107 |
src_prepare() { |
108 |
- default |
109 |
- |
110 |
- # Remove nasty CFLAGS which override user choice |
111 |
sed -i -e "/^CFLAGS/ { s:-g::;s:-O.:: }" config.mk || die |
112 |
|
113 |
- if use dunstify; then |
114 |
- # add dunstify to the all target |
115 |
- sed -i -e "/^all:/ s:$: dunstify:" Makefile || die |
116 |
- fi |
117 |
+ default |
118 |
+} |
119 |
+ |
120 |
+src_compile() { |
121 |
+ tc-export CC |
122 |
+ emake |
123 |
+ use dunstify && emake dunstify |
124 |
} |
125 |
|
126 |
src_install() { |
127 |
- emake DESTDIR="${D}" PREFIX="/usr" install |
128 |
+ default |
129 |
|
130 |
- if use dunstify; then |
131 |
- dobin dunstify |
132 |
- fi |
133 |
+ dunstify && dobin dunstify |
134 |
|
135 |
dodoc AUTHORS CHANGELOG.md README.md RELEASE_NOTES |
136 |
} |