gentoo resync : 13.06.2020

4 files changed, 132 insertions, 1 deletions

diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index f9eed008cc96..eb8d4f621c5d 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1,8 +1,10 @@
+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.23.1.tar.gz 96169 BLAKE2B 5d16d3fc0a052614bc86cbc5ab515a5e2879d39d7bdf4541a3a10193c08bdc34a9bb07468ff7142c73e58694fb24c2fe581934404fd5ca737c4736855c60d316 SHA512 0215c02d32d90efff4d041d48b663755ccfb1944281f8a2cabb3e88cc9fd77221da03dd709b9c96f5ca8d7204561fe33fdabf37a2d919a83374df71909cc5978
 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 2874 BLAKE2B df35ca980a34b443b73170fb496fa0cf9d41861a54d1c804b113e4e72b979799b3bb4a2134287f2374590baebc4e258f08e1175a8958d0c56dd1b4da4e8ac92e SHA512 5eb9e8afde181c8ae13da72013ca22b77ae79ed16b57f0a8dd89df395725354fd6c31f95255763e6d6d7d45520525d07bffc0044a03b7a42eb9e9b5c55177e4d
 EBUILD xmobar-0.24.2.ebuild 3017 BLAKE2B 0b304a167a5da7222cba30e8d4b88a4566e7891a960eedafe6f555e5a7afbe6434d0117fa02390d05f2ec4bd1e78c0dddca57ad57a4ea6cc87aa99bb1a6a08f0 SHA512 284eba89d9aed6997268b90d1aa0b6fc83d6c7e031bc267a071caad9308e8235bfc8c25c9b2ba86ca1cac1e070296575d10f3337c387bba9193fa9253bbe0ed6
-EBUILD xmobar-0.24.3.ebuild 3036 BLAKE2B 3d844be3c3ac6f677693cbc84c5fe4b91c59411ff03ba22a598bc27b4efb55f4bd6bda751e8ee30ef59c423be27c5c9739b1c8d18c7d762e562dfd8e27b28f27 SHA512 bb8c785a79532028f89ea28d6f77422da2a628bf6cd422f9bb0283c90063625c56730862eb8ae3b72b194f62ad0816ff97e8ddb0ef4f1254fe79c02f831a8651
+EBUILD xmobar-0.24.3-r1.ebuild 3131 BLAKE2B 9559d065d2fc80acbb5284f06fe6f7ceb1c1664663d889376f86aacb1846ead62c4f3818d8dee68638b3aea84ff42e6b0ccaeb79e84b3666a10784cb0245b3ff SHA512 a3e3295e0654c6c36d2024e53c1fbf8d3fa0b6edf9705c876a63acbe5b6f6397c76eeb32364ae4cf92aafdd7c4d3c08d8a21af019adce163d9cb274277b39442
+EBUILD xmobar-0.24.3.ebuild 3090 BLAKE2B 4a8baabbcef3c4f8d52ce2edba2a96762f520159ae836272eec9d8b51696f8f5fa4535539af3ef981b15fc59c50dab8cb5b58521d34ef1c7f2e6eb4727c129a3 SHA512 2d8318df250ca22d86562e3aaa93c04eac88fd9a9b81e7495cb1a99c655bdfb431dbe4589b5092333e0c2673be250e8ae358abe5064d65b4bd00d8929c648c70
 MISC metadata.xml 807 BLAKE2B 3529fa66e04b28b6a55fd835e942c7bbe0e1e3888d16374eb62a7a57c5e88244a4bbd6fbc8370f3e27a586f3ed46b32f28afcd0d5f0254374230809c0338f9d7 SHA512 3753cd9088cf4c0d7858876d7606379c52b65ab5ed2314b69a480d3b21c522b8f3934b2572c61f72efb7be1da3b77665e055b6a76641c7f22d7c0de65e98ec44
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
new file mode 100644
index 000000000000..837df1d29753
--- /dev/null
+++ b/x11-misc/xmobar/files/xmobar-0.24.3-alsa-mixer-0.3.patch
@@ -0,0 +1,26 @@
+--- 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/xmobar-0.24.3-r1.ebuild b/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild
new file mode 100644
index 000000000000..7cf587b82685
--- /dev/null
+++ b/x11-misc/xmobar/xmobar-0.24.3-r1.ebuild
@@ -0,0 +1,100 @@
+# 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.24.3.ebuild b/x11-misc/xmobar/xmobar-0.24.3.ebuild
index 9c2fcc1f822d..62173b3a3355 100644
--- a/x11-misc/xmobar/xmobar-0.24.3.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.3.ebuild
@@ -67,6 +67,9 @@ src_prepare() {
 	# cycle).
 	# Be careful when remove it :]
 	HCFLAGS+=" -with-rtsopts=-V0"
+
+	cabal_chdeps \
+		'stm >= 2.3 && < 2.5' 'stm >= 2.3'
 }
 
 src_configure() {