gentoo resync : 13.10.2019

4 files changed, 15 insertions, 15 deletions

diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index 14a53a990cb7..d020e7fcf9de 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -3,6 +3,6 @@ DIST xmobar-0.23.1.tar.gz 96169 BLAKE2B 5d16d3fc0a052614bc86cbc5ab515a5e2879d39d
 DIST xmobar-0.24.2.tar.gz 100179 BLAKE2B a5ca50d66bdb83274be62d1df83545d3527a3d05fc41708be44927ff75519f8686a2afc6671bede1142b881ebef37ede5116abff557b03276d509b031f5292d3 SHA512 c271e50d615d509c2c15ffa716b45df3211cfa143b128126c55a78a056475c9fbb6d7abc60a6a058e20a12aced5f33b94cecc35c73a76505e33e62ea1f1561f8
 DIST xmobar-0.24.3.tar.gz 100317 BLAKE2B 3ca7aeb977688b975674dc767f645d15aaf296ff906f51d79529ee58d827188437695b4ee0b960563f6c0ce1489baf1f5bdc4360807989277078a93dfafb3ed1 SHA512 aa16d55b16cf108005ee8ec6c3d1b348b3e70a5182cbb97eed2aeb67bed83bee4b23acff6d29d5bda5a30ce35dc87463a6ade6e0814b588f53b173a1c3b5a5b3
 EBUILD xmobar-0.23.1.ebuild 2879 BLAKE2B f8190f009a90e65399b18737c0cae75e1ea078166df656119021860d3844d6a0e90b19de5a98666961203c7d9ac82336b64b719befa80cfe18c5946fa766a6bc SHA512 0acad8ab127e2b401f6e8a1b901b196f7361ac3a3d68c890917d84dd395803e8bb4dae03f8583c7029b13fd2dc241d108044ae581bd8b56803dc8e95c9b4344f
-EBUILD xmobar-0.24.2.ebuild 3049 BLAKE2B 96369410b7c09cce372f41efdaab19c04d9d62bfff9ccf56ee27add0897c624686fa2d250fc25d53df98f777ca8e41292fa45f510086c3ccc7ef45c1011938a3 SHA512 b9ee096d5eac6e7b58bbb8fc54d5f4c07895c47cdcc384d5e40afa84afd9516237a6fcc406e5d31a64fddb9d5c397feedad082288038bed6641fba00b5c09e59
-EBUILD xmobar-0.24.3.ebuild 3068 BLAKE2B e240bdf3ce2bfbf4fc8c89a2bbbabf8c8fa546430eee652fd0bd8dcbf89752011bd171b731dfbb7632d7b4dbafbd3760afab11cb4f44cf4e770f4b62ef5ed594 SHA512 982bba19184c8fc31bee661c5fe36886eec3fc8f9cb57b9240512df995ec3b70246aefdad2e23b77a58368ca6525b70494d1b2e1c4e26be658ec8d1ddba8a0c8
-MISC metadata.xml 817 BLAKE2B 0b5a60495d92749fcdfac5208477dae79d6dfc2edc5766beb9f595c85bf0322c712a676009b2f470323589dc8695809a11a617cfeb86ef22c9ea9d00caf62dfd SHA512 f4c3fe7d5869d364cdba2756367488b8ae2b9ad2c72684d1725d57da44db1600c5ad37a93b1579316309e0ae12dd5cca986710ce5a6bd0a44ac3add03137fd3a
+EBUILD xmobar-0.24.2.ebuild 3021 BLAKE2B e2c16299ccda5ea212c6de84c5fc71561c9ef3cc0b4a9b2848054be7df9c8c759dc2b7e8ed7a99c2673b1c48f8f41c107c2763a2950adafd7602fac426408163 SHA512 6b8d275fa0fd6869c7f0fce9d42ef3ce2207f993e9a32e2d58bdbed8409273b74b8e4cacbb90c4d6578e08b5cd2c79220081737f75ad20fff6c0cbf046ccd042
+EBUILD xmobar-0.24.3.ebuild 3040 BLAKE2B 82cb03e63b26cebd5d2c46b2cb2d412dd0d2f459910bbdd2717fedbcd64dad3968434ee1ddc4dc6f73538a93d6cd829936d039e2c7a1b9be6cdd6f694b6fb5ac SHA512 c8316e8d92a8b16b62fdd5712667dde7a89b399db347942ba140a971d4c5e58b3cc16981ffa8dca7eb00a29c29688a90c2589fc16a866c399855839be11538fb
+MISC metadata.xml 807 BLAKE2B 3529fa66e04b28b6a55fd835e942c7bbe0e1e3888d16374eb62a7a57c5e88244a4bbd6fbc8370f3e27a586f3ed46b32f28afcd0d5f0254374230809c0338f9d7 SHA512 3753cd9088cf4c0d7858876d7606379c52b65ab5ed2314b69a480d3b21c522b8f3934b2572c61f72efb7be1da3b77665e055b6a76641c7f22d7c0de65e98ec44
diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
index 7cb1b0df7941..69dba3f2e452 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -9,8 +9,8 @@
 		<flag name="mpd">Support mpd plugin</flag>
 		<flag name="mpris">Enables MPRIS v1, v2  support</flag>
 		<flag name="timezone">Enables localized date support</flag>
-		<flag name="with_conduit">Use conduit to fetch weather data.</flag>
-		<flag name="with_uvmeter">Plugin to show UV data for Australia.</flag>
+		<flag name="conduit">Use conduit to fetch weather data.</flag>
+		<flag name="uvmeter">Plugin to show UV data for Australia.</flag>
 	</use>
 	<longdescription>
 		Xmobar is a minimalistic text based status bar.
diff --git a/x11-misc/xmobar/xmobar-0.24.2.ebuild b/x11-misc/xmobar/xmobar-0.24.2.ebuild
index 6444bb6aae47..e6856fed386e 100644
--- a/x11-misc/xmobar/xmobar-0.24.2.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus inotify mpd mpris timezone wifi with_conduit with_uvmeter xft xpm"
+IUSE="alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm"
 
 RDEPEND=">=dev-haskell/http-4000.2.4:=
 	>=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:=
@@ -39,7 +39,7 @@ RDEPEND=">=dev-haskell/http-4000.2.4:=
 	timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:=
 			>=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= )
 	wifi? ( net-wireless/wireless-tools )
-	with_conduit? ( dev-haskell/http-conduit:=
+	conduit? ( dev-haskell/http-conduit:=
 			dev-haskell/http-types:= )
 	xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= )
 	xpm? ( x11-libs/libXpm )
@@ -72,7 +72,7 @@ src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-all_extensions \
 		$(cabal_flag alsa with_alsa) \
-		$(cabal_flag with_conduit with_conduit) \
+		$(cabal_flag conduit with_conduit) \
 		$(cabal_flag timezone with_datezone) \
 		$(cabal_flag dbus with_dbus) \
 		$(cabal_flag inotify with_inotify) \
@@ -81,7 +81,7 @@ src_configure() {
 		$(cabal_flag mpris with_mpris) \
 		--flag=with_threaded \
 		--flag=with_utf8 \
-		$(cabal_flag with_uvmeter with_uvmeter) \
+		$(cabal_flag uvmeter with_uvmeter) \
 		$(cabal_flag xft with_xft) \
 		$(cabal_flag xpm with_xpm)
 }
diff --git a/x11-misc/xmobar/xmobar-0.24.3.ebuild b/x11-misc/xmobar/xmobar-0.24.3.ebuild
index 99ba81604786..fbc0b390b6e6 100644
--- a/x11-misc/xmobar/xmobar-0.24.3.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus inotify mpd mpris timezone wifi with_conduit with_uvmeter xft xpm"
+IUSE="alsa dbus inotify mpd mpris timezone wifi conduit uvmeter xft xpm"
 
 RDEPEND=">=dev-haskell/http-4000.2.4:=
 	>=dev-haskell/mtl-2.1:= <dev-haskell/mtl-2.3:=
@@ -38,7 +38,7 @@ RDEPEND=">=dev-haskell/http-4000.2.4:=
 	timezone? ( >=dev-haskell/timezone-olson-0.1:= <dev-haskell/timezone-olson-0.2:=
 			>=dev-haskell/timezone-series-0.1:= <dev-haskell/timezone-series-0.2:= )
 	wifi? ( net-wireless/wireless-tools )
-	with_conduit? ( dev-haskell/http-conduit:=
+	conduit? ( dev-haskell/http-conduit:=
 			dev-haskell/http-types:= )
 	xft? ( >=dev-haskell/x11-xft-0.2:= <dev-haskell/x11-xft-0.4:= )
 	xpm? ( x11-libs/libXpm )
@@ -73,7 +73,7 @@ src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-all_extensions \
 		$(cabal_flag alsa with_alsa) \
-		$(cabal_flag with_conduit with_conduit) \
+		$(cabal_flag conduit with_conduit) \
 		$(cabal_flag timezone with_datezone) \
 		$(cabal_flag dbus with_dbus) \
 		$(cabal_flag inotify with_inotify) \
@@ -82,7 +82,7 @@ src_configure() {
 		$(cabal_flag mpris with_mpris) \
 		--flag=with_threaded \
 		--flag=with_utf8 \
-		$(cabal_flag with_uvmeter with_uvmeter) \
+		$(cabal_flag uvmeter with_uvmeter) \
 		$(cabal_flag xft with_xft) \
 		$(cabal_flag xpm with_xpm)
 }