Gentoo Archives: gentoo-commits

From: Daniel Pielmeier <billie@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/conky/
Date: Sun, 18 Nov 2018 13:24:36
Message-Id: 1542547458.a49e994670c8df3df15b201ac52bfba3ca1fcecb.billie@gentoo
1 commit: a49e994670c8df3df15b201ac52bfba3ca1fcecb
2 Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 18 13:24:18 2018 +0000
4 Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 18 13:24:18 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49e9946
7
8 app-admin/conky: Disable audacious support. Fix bug #518836.
9
10 Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 app-admin/conky/conky-1.10.8-r4.ebuild | 6 ++----
14 1 file changed, 2 insertions(+), 4 deletions(-)
15
16 diff --git a/app-admin/conky/conky-1.10.8-r4.ebuild b/app-admin/conky/conky-1.10.8-r4.ebuild
17 index b6d120f7b1c..a2bc7d317c4 100644
18 --- a/app-admin/conky/conky-1.10.8-r4.ebuild
19 +++ b/app-admin/conky/conky-1.10.8-r4.ebuild
20 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
21 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
22 SLOT="0"
23 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
24 -IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
25 +IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
26 lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
27 nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
28 weather-metar webserver wifi X xmms2"
29 @@ -30,7 +30,6 @@ COMMON_DEPEND="
30 x11-libs/libXinerama
31 x11-libs/libXfixes
32 x11-libs/libXext
33 - audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
34 xmms2? ( media-sound/xmms2 )
35 )
36 cmus? ( media-sound/cmus )
37 @@ -110,7 +109,6 @@ src_configure() {
38 -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
39 -DBUILD_LUA_RSVG=$(usex lua-rsvg)
40 -DBUILD_NVIDIA=$(usex nvidia)
41 - -DBUILD_AUDACIOUS=$(usex audacious)
42 -DBUILD_XMMS2=$(usex xmms2)
43 )
44 else
45 @@ -120,7 +118,6 @@ src_configure() {
46 -DBUILD_LUA_CAIRO=OFF
47 -DBUILD_LUA_IMLIB2=OFF
48 -DBUILD_LUA_RSVG=OFF
49 - -DBUILD_AUDACIOUS=OFF
50 -DBUILD_XMMS2=OFF
51 )
52 fi
53 @@ -154,6 +151,7 @@ src_configure() {
54 -DBUILD_I18N=ON
55 -DMAINTAINER_MODE=ON
56 -DRELEASE=ON
57 + -DBUILD_AUDACIOUS=OFF
58 -DBUILD_BMPX=OFF
59 -DDOC_PATH=/usr/share/doc/${PF}
60 )