Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xnots/
Date: Mon, 22 Aug 2016 19:01:23
Message-Id: 1471892463.25c7fd05b4e8078439390b36cda83bab69041852.jer@gentoo
1 commit: 25c7fd05b4e8078439390b36cda83bab69041852
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 22 19:00:43 2016 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 22 19:01:03 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25c7fd05
7
8 x11-misc/xnots: Fix building with sys-devel/gcc-5* (bug #575376).
9
10 Package-Manager: portage-2.3.0
11
12 x11-misc/xnots/xnots-0.2.1-r1.ebuild | 22 ++++++++++++++--------
13 x11-misc/xnots/xnots-9999.ebuild | 22 ++++++++++++++--------
14 2 files changed, 28 insertions(+), 16 deletions(-)
15
16 diff --git a/x11-misc/xnots/xnots-0.2.1-r1.ebuild b/x11-misc/xnots/xnots-0.2.1-r1.ebuild
17 index ee11e5f..92153b8 100644
18 --- a/x11-misc/xnots/xnots-0.2.1-r1.ebuild
19 +++ b/x11-misc/xnots/xnots-0.2.1-r1.ebuild
20 @@ -1,9 +1,9 @@
21 -# Copyright 1999-2015 Gentoo Foundation
22 +# Copyright 1999-2016 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24 # $Id$
25
26 EAPI=5
27 -inherit toolchain-funcs
28 +inherit flag-o-matic toolchain-funcs
29
30 DESCRIPTION="A desktop sticky note program for the unix geek"
31 HOMEPAGE="http://xnots.sourceforge.net https://github.com/thePalindrome/xnots"
32 @@ -14,20 +14,26 @@ SLOT="0"
33 KEYWORDS="amd64 x86"
34 IUSE="vim-syntax"
35
36 -RDEPEND="x11-libs/libX11
37 +RDEPEND="
38 + x11-libs/libX11
39 x11-libs/libXext
40 - x11-libs/libXrender
41 x11-libs/libXrandr
42 - x11-libs/pango[X]"
43 + x11-libs/libXrender
44 + x11-libs/pango[X]
45 +"
46
47 -DEPEND="${RDEPEND}
48 +DEPEND="
49 + ${RDEPEND}
50 virtual/pkgconfig
51 - x11-proto/xextproto
52 + x11-proto/randrproto
53 x11-proto/renderproto
54 - x11-proto/randrproto"
55 + x11-proto/xextproto
56 +"
57
58 src_prepare() {
59 sed -i -e 's|LICENCE||g' Makefile || die
60 +
61 + append-cflags -std=gnu89
62 }
63
64 src_compile() {
65
66 diff --git a/x11-misc/xnots/xnots-9999.ebuild b/x11-misc/xnots/xnots-9999.ebuild
67 index d30b43e..4615827 100644
68 --- a/x11-misc/xnots/xnots-9999.ebuild
69 +++ b/x11-misc/xnots/xnots-9999.ebuild
70 @@ -1,9 +1,9 @@
71 -# Copyright 1999-2015 Gentoo Foundation
72 +# Copyright 1999-2016 Gentoo Foundation
73 # Distributed under the terms of the GNU General Public License v2
74 # $Id$
75
76 EAPI=5
77 -inherit git-r3 toolchain-funcs
78 +inherit flag-o-matic git-r3 toolchain-funcs
79
80 DESCRIPTION="A desktop sticky note program for the unix geek"
81 HOMEPAGE="http://xnots.sourceforge.net https://github.com/thePalindrome/xnots"
82 @@ -13,20 +13,26 @@ LICENSE="GPL-2"
83 SLOT="0"
84 IUSE="vim-syntax"
85
86 -RDEPEND="x11-libs/libX11
87 +RDEPEND="
88 + x11-libs/libX11
89 x11-libs/libXext
90 - x11-libs/libXrender
91 x11-libs/libXrandr
92 - x11-libs/pango[X]"
93 + x11-libs/libXrender
94 + x11-libs/pango[X]
95 +"
96
97 -DEPEND="${RDEPEND}
98 +DEPEND="
99 + ${RDEPEND}
100 virtual/pkgconfig
101 - x11-proto/xextproto
102 + x11-proto/randrproto
103 x11-proto/renderproto
104 - x11-proto/randrproto"
105 + x11-proto/xextproto
106 +"
107
108 src_prepare() {
109 sed -i -e 's|LICENCE||g' Makefile || die
110 +
111 + append-cflags -std=gnu89
112 }
113
114 src_compile() {