Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xmobar/
Date: Mon, 30 Sep 2019 23:36:51
Message-Id: 1569886562.1abb23efdc71ee0f54b2a602c2b40e986e860e20.slyfox@gentoo
1 commit: 1abb23efdc71ee0f54b2a602c2b40e986e860e20
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 30 23:35:15 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 30 23:36:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1abb23ef
7
8 x11-misc/xmobar: drop underscores from IUSE, bug #695144
9
10 Reported-by: Michał Górny
11 Closes: https://bugs.gentoo.org/695144
12 Package-Manager: Portage-2.3.76, Repoman-2.3.17
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 x11-misc/xmobar/metadata.xml | 4 ++--
16 x11-misc/xmobar/xmobar-0.24.2.ebuild | 10 +++++-----
17 x11-misc/xmobar/xmobar-0.24.3.ebuild | 10 +++++-----
18 3 files changed, 12 insertions(+), 12 deletions(-)
19
20 diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
21 index 7cb1b0df794..69dba3f2e45 100644
22 --- a/x11-misc/xmobar/metadata.xml
23 +++ b/x11-misc/xmobar/metadata.xml
24 @@ -9,8 +9,8 @@
25 <flag name="mpd">Support mpd plugin</flag>
26 <flag name="mpris">Enables MPRIS v1, v2 support</flag>
27 <flag name="timezone">Enables localized date support</flag>
28 - <flag name="with_conduit">Use conduit to fetch weather data.</flag>
29 - <flag name="with_uvmeter">Plugin to show UV data for Australia.</flag>
30 + <flag name="conduit">Use conduit to fetch weather data.</flag>
31 + <flag name="uvmeter">Plugin to show UV data for Australia.</flag>
32 </use>
33 <longdescription>
34 Xmobar is a minimalistic text based status bar.
35
36 diff --git a/x11-misc/xmobar/xmobar-0.24.2.ebuild b/x11-misc/xmobar/xmobar-0.24.2.ebuild
37 index 6444bb6aae4..e6856fed386 100644
38 --- a/x11-misc/xmobar/xmobar-0.24.2.ebuild
39 +++ b/x11-misc/xmobar/xmobar-0.24.2.ebuild
40 @@ -1,4 +1,4 @@
41 -# Copyright 1999-2016 Gentoo Foundation
42 +# Copyright 1999-2019 Gentoo Authors
43 # Distributed under the terms of the GNU General Public License v2
44
45 EAPI=6
46 @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
47 LICENSE="BSD"
48 SLOT="0"
49 KEYWORDS="~amd64 ~x86"
50 -IUSE="alsa dbus inotify mpd mpris timezone wifi with_conduit with_uvmeter xft xpm"
51 +IUSE="alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm"
52
53 RDEPEND=">=dev-haskell/http-4000.2.4:=
54 >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:=
55 @@ -39,7 +39,7 @@ RDEPEND=">=dev-haskell/http-4000.2.4:=
56 timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:=
57 >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= )
58 wifi? ( net-wireless/wireless-tools )
59 - with_conduit? ( dev-haskell/http-conduit:=
60 + conduit? ( dev-haskell/http-conduit:=
61 dev-haskell/http-types:= )
62 xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= )
63 xpm? ( x11-libs/libXpm )
64 @@ -72,7 +72,7 @@ src_configure() {
65 haskell-cabal_src_configure \
66 --flag=-all_extensions \
67 $(cabal_flag alsa with_alsa) \
68 - $(cabal_flag with_conduit with_conduit) \
69 + $(cabal_flag conduit with_conduit) \
70 $(cabal_flag timezone with_datezone) \
71 $(cabal_flag dbus with_dbus) \
72 $(cabal_flag inotify with_inotify) \
73 @@ -81,7 +81,7 @@ src_configure() {
74 $(cabal_flag mpris with_mpris) \
75 --flag=with_threaded \
76 --flag=with_utf8 \
77 - $(cabal_flag with_uvmeter with_uvmeter) \
78 + $(cabal_flag uvmeter with_uvmeter) \
79 $(cabal_flag xft with_xft) \
80 $(cabal_flag xpm with_xpm)
81 }
82
83 diff --git a/x11-misc/xmobar/xmobar-0.24.3.ebuild b/x11-misc/xmobar/xmobar-0.24.3.ebuild
84 index 99ba8160478..fbc0b390b6e 100644
85 --- a/x11-misc/xmobar/xmobar-0.24.3.ebuild
86 +++ b/x11-misc/xmobar/xmobar-0.24.3.ebuild
87 @@ -1,4 +1,4 @@
88 -# Copyright 1999-2016 Gentoo Foundation
89 +# Copyright 1999-2019 Gentoo Authors
90 # Distributed under the terms of the GNU General Public License v2
91
92 EAPI=6
93 @@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
94 LICENSE="BSD"
95 SLOT="0"
96 KEYWORDS="~amd64 ~x86"
97 -IUSE="alsa dbus inotify mpd mpris timezone wifi with_conduit with_uvmeter xft xpm"
98 +IUSE="alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm"
99
100 RDEPEND=">=dev-haskell/http-4000.2.4:=
101 >=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:=
102 @@ -38,7 +38,7 @@ RDEPEND=">=dev-haskell/http-4000.2.4:=
103 timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:=
104 >=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= )
105 wifi? ( net-wireless/wireless-tools )
106 - with_conduit? ( dev-haskell/http-conduit:=
107 + conduit? ( dev-haskell/http-conduit:=
108 dev-haskell/http-types:= )
109 xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= )
110 xpm? ( x11-libs/libXpm )
111 @@ -73,7 +73,7 @@ src_configure() {
112 haskell-cabal_src_configure \
113 --flag=-all_extensions \
114 $(cabal_flag alsa with_alsa) \
115 - $(cabal_flag with_conduit with_conduit) \
116 + $(cabal_flag conduit with_conduit) \
117 $(cabal_flag timezone with_datezone) \
118 $(cabal_flag dbus with_dbus) \
119 $(cabal_flag inotify with_inotify) \
120 @@ -82,7 +82,7 @@ src_configure() {
121 $(cabal_flag mpris with_mpris) \
122 --flag=with_threaded \
123 --flag=with_utf8 \
124 - $(cabal_flag with_uvmeter with_uvmeter) \
125 + $(cabal_flag uvmeter with_uvmeter) \
126 $(cabal_flag xft with_xft) \
127 $(cabal_flag xpm with_xpm)
128 }