gentoo resync : 02.09.2020

6 files changed, 5 insertions, 145 deletions

diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index 0a2e896c5f0c..6495f1e4b01d 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1,7 +1,3 @@
-AUX xmobar-0.24.3-alsa-mixer-0.3.patch 1113 BLAKE2B bd73e83144c9544b96ecce7c0990a68e14befc8556e325d62634bb62745f9f0dd84711b2b4873d31c6b228ba1383132edb3fb75638eb0e306333e354cf2c78c6 SHA512 87e1a2461aa98d02f6b4e0602429e24fd906de86f982328affb055514151e338ce20a4294485f490ef1678e7a3633736d7bb553d66c464a9dddf1becf6dc2b58
-AUX xmobar-0.24.3-noxpm.patch 363 BLAKE2B f7bc04a5c317400501c0bfc86b403cb7c12e5407ff492a58cc252b54d4723a00fe2dbb954c0ff85f0b9d9f283b0b1739ef7b882e797f8f26125044dbd56b36ff SHA512 54e87bfac3476d0821c7b42ace5f9f3f2709ca89bdb182f3e93bdfb3e09cb0432267698e20aa325099949694120f0f81810e5c5a026839899de2b1d4550485c8
-DIST xmobar-0.24.3.tar.gz 100317 BLAKE2B 3ca7aeb977688b975674dc767f645d15aaf296ff906f51d79529ee58d827188437695b4ee0b960563f6c0ce1489baf1f5bdc4360807989277078a93dfafb3ed1 SHA512 aa16d55b16cf108005ee8ec6c3d1b348b3e70a5182cbb97eed2aeb67bed83bee4b23acff6d29d5bda5a30ce35dc87463a6ade6e0814b588f53b173a1c3b5a5b3
-DIST xmobar-0.35.1.tar.gz 133251 BLAKE2B bebd535f2f29f89131b468e1226a63168321cfdb93129e4e3e6cdf9e2489bf4df6bdc02a5d3f6569d5c35d2cfe1fb05efec73587544c7526bf2f97bfe6a7e1b4 SHA512 fd7bb8710f3c877835aa0b20e0fca227f6f620c0be31acd46e6a464b4ba3f6c7da8df31cd3f345e606b03a54328dd9a298e46e8fc2935e74ebd8c5712cedbf76
-EBUILD xmobar-0.24.3-r1.ebuild 3131 BLAKE2B 9559d065d2fc80acbb5284f06fe6f7ceb1c1664663d889376f86aacb1846ead62c4f3818d8dee68638b3aea84ff42e6b0ccaeb79e84b3666a10784cb0245b3ff SHA512 a3e3295e0654c6c36d2024e53c1fbf8d3fa0b6edf9705c876a63acbe5b6f6397c76eeb32364ae4cf92aafdd7c4d3c08d8a21af019adce163d9cb274277b39442
-EBUILD xmobar-0.35.1.ebuild 4193 BLAKE2B 4cc95a1a3740458b337f8fe3881b01c799f553b42f4d4bad4d72bac8433ac1d006676c75992cd7ba7157cd6d80fe0bf008004e171c61badd42e9c20a0add5e40 SHA512 da52c03e62bed40b886adfec53e7ade451c4865bab4233b00a191a452241c0a5c81ad81e21d23d50fb7792ecbb714c23341cde38a9af070e77e5c5f23879e6cb
-MISC metadata.xml 1541 BLAKE2B 25764867ba7aa8e01234baf9fba704bd28354a251775f53f4aebac5eaeab3d2c758fea53beeaa80b87096e15555aaa7867b1a6436fead8ed54de3dc3d84a74df SHA512 910fa9e26f97f950c920b01ecb1de35c21933619f2c5a416dca4afdefbfe5a8939ac5d92c664772ce85ead5797a7f08de548e9f55e8adb03ab1288a75b7dc296
+DIST xmobar-0.36.tar.gz 136890 BLAKE2B be76faaec78d66b5f0f99542bc59330106c34413c5502f4dbef8dc47647dbf7ebfc94311de965520ca620c8cfbdc1ba68a3eab36da65e476c413ad9f8f4f3695 SHA512 abb7f9cf367fa5c03f5928006fc5f7c38434743350d5f524307b99448cb30436fb44e0c856bd274032a6803f05b64e6d4ac553f51f4bd817efd2861408007c02
+EBUILD xmobar-0.36.ebuild 4189 BLAKE2B 005c7e2eefb11a829f7fab9300d87c3ab0ff80199c8542e49b132017d999c8f0d4782df9ca7f22d8205d9a1f4c935762b99597526ecd8ac4f8d999ba15f51f3d SHA512 4a489b171410b8bd45662e28f5170dbc75444d166785a3c73da64d8e81d912a5d7fec90bfe63579fc248d4eb6fb0b35ad81bc22c6b3ccb3378b3e96c51b18610
+MISC metadata.xml 1476 BLAKE2B 250601d02fc74bfe6d62a3b2c5be23998fec089bcfa625a73db8b79955ef55a3ca7b13040c44518d51b0b141a8370fe6dedf4f53a47c70882097a7838c1711ee SHA512 b274a1a21217bde42aff7eff73de3acb3bc9c49ae21a2bdb7a1e2b44f28198922c84d4c98bad0ad9ad4593dd64416236475cd1111e484ddccf8d6c6a85cf53b3
diff --git a/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch b/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch
deleted file mode 100644
index 837df1d29753..000000000000
--- a/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/Plugins/Monitors/Volume.hs
-+++ b/src/Plugins/Monitors/Volume.hs
-@@ -122,7 +122,8 @@ formatDb opts dbi = do
- runVolume :: String -> String -> [String] -> Monitor String
- runVolume mixerName controlName argv = do
-     opts <- io $ parseOpts argv
--    (lo, hi, val, db, sw) <- io readMixer
-+    (lo', hi', val', db, sw) <- io readMixer
-+    let (lo, hi, val) = (toInteger <$> lo', toInteger <$> hi', toInteger <$> val')
-     p <- liftMonitor $ liftM3 formatVol lo hi val
-     b <- liftMonitor $ liftM3 formatVolBar lo hi val
-     v <- liftMonitor $ liftM3 formatVolVBar lo hi val
-@@ -164,11 +165,11 @@ runVolume mixerName controlName argv = do
- 
-     getDB :: Maybe Volume -> IO (Maybe Integer)
-     getDB Nothing = return Nothing
--    getDB (Just v) = channel (dB v) 0
-+    getDB (Just v) = fmap toInteger <$> channel (dB v) 0
- 
-     getVal :: Maybe Volume -> IO (Maybe Integer)
-     getVal Nothing = return Nothing
--    getVal (Just v) = channel (value v) 0
-+    getVal (Just v) = fmap toInteger <$> channel (value v) 0
- 
-     getSw :: Maybe Switch -> IO (Maybe Bool)
-     getSw Nothing = return Nothing
diff --git a/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch b/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch
deleted file mode 100644
index 8f4da6b78847..000000000000
--- a/x11-misc/xmobar/files/xmobar-0.24.3-noxpm.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/xmobar.cabal b/xmobar.cabal
-index f6a6dae..8a17579 100644
---- a/xmobar.cabal
-+++ b/xmobar.cabal
-@@ -89,3 +89,3 @@ executable xmobar
-       Xmobar, Actions, Bitmap, Config, Parsers, Commands, Localize,
--      XUtil, XPMFile, StatFS, Runnable, ColorCache, Window, Signal,
-+      XUtil, StatFS, Runnable, ColorCache, Window, Signal,
-       Environment,
diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
index 3ecfd078e089..f3ba842d32a1 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="alsa">Use alsa-mixer to get the volume from soundcards</flag>
-		<flag name="conduit">Use conduit to fetch weather data.</flag>
 		<flag name="dbus">Publish a service on the session bus for controlling xmobar</flag>
 		<flag name="inotify">inotify support (modern Linux only). Required for the Mail and MBox plugins</flag>
 		<flag name="mpd">Support mpd plugin</flag>
diff --git a/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild b/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild
deleted file mode 100644
index 7cf587b82685..000000000000
--- a/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:wifi,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="https://xmobar.org"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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:=
-	dev-haskell/old-locale:=
-	>=dev-haskell/parsec-3.1:= <dev-haskell/parsec-3.2:=
-	dev-haskell/regex-compat:=
-	>=dev-haskell/stm-2.3:= <dev-haskell/stm-2.5:=
-	>=dev-haskell/utf8-string-0.3:= <dev-haskell/utf8-string-1.1:=
-	>=dev-haskell/x11-1.6.1:=
-	>=dev-lang/ghc-7.8.2:=
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	alsa? ( >=dev-haskell/alsa-core-0.5:= <dev-haskell/alsa-core-0.6:=
-		>=dev-haskell/alsa-mixer-0.3:= )
-	dbus? ( >=dev-haskell/dbus-0.10:= )
-	inotify? ( >=dev-haskell/hinotify-0.3:= <dev-haskell/hinotify-0.4:= )
-	mpd? ( >=dev-haskell/libmpd-0.9:= <dev-haskell/libmpd-0.10:= )
-	mpris? ( >=dev-haskell/dbus-0.10:= )
-	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 )
-	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 )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-noxpm.patch
-	"${FILESDIR}"/${P}-alsa-mixer-0.3.patch
-)
-
-src_prepare() {
-	default
-	# xmobar is an idle multithreaded program
-	# which sits in 'while { sleep(1); }'
-	# loops in multiple threads.
-	# It has a pathological behaviour in GHC:
-	#   everything program does is thread context switch
-	#   100 times per second. It's easily seen with
-	#
-	#       $ strace -f -p `pidof xmobar`
-	#
-	#   where rt_sigreturn() manages to enter/exit
-	# kernel 32 times in each second to do nothing
-	# This workaround allows shrinkng wakeups/thread
-	# switches down to one per second (internal xmobar's
-	# cycle).
-	# Be careful when remove it :]
-	HCFLAGS+=" -with-rtsopts=-V0"
-
-	cabal_chdeps \
-		'stm >= 2.3 && < 2.5' 'stm >= 2.3'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-all_extensions \
-		$(cabal_flag alsa with_alsa) \
-		$(cabal_flag conduit with_conduit) \
-		$(cabal_flag timezone with_datezone) \
-		$(cabal_flag dbus with_dbus) \
-		$(cabal_flag inotify with_inotify) \
-		$(cabal_flag wifi with_iwlib) \
-		$(cabal_flag mpd with_mpd) \
-		$(cabal_flag mpris with_mpris) \
-		--flag=with_threaded \
-		--flag=with_utf8 \
-		$(cabal_flag uvmeter with_uvmeter) \
-		$(cabal_flag xft with_xft) \
-		$(cabal_flag xpm with_xpm)
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc samples/xmobar.config readme.md news.md
-}
diff --git a/x11-misc/xmobar/xmobar-0.35.1.ebuild b/x11-misc/xmobar/xmobar-0.36.ebuild
index 50130b0d928b..319433122f08 100644
--- a/x11-misc/xmobar/xmobar-0.35.1.ebuild
+++ b/x11-misc/xmobar/xmobar-0.36.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.6
 #hackport: flags: -all_extensions,+with_threaded,+with_utf8,with_iwlib:iwlib,with_alsa:alsa,with_xft:xft,with_datezone:timezone,with_dbus:dbus,with_mpd:mpd,with_inotify:inotify,with_mpris:mpris,with_xpm:xpm,with_nl80211:wifi
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="http://xmobar.org"
+HOMEPAGE="https://xmobar.org"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"