Version bump (bug #506750 by Phil Tooley).

Package-Manager: portage-2.2.8_p62/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

10 files changed, 82 insertions, 348 deletions

diff --git a/x11-misc/xmobar/ChangeLog b/x11-misc/xmobar/ChangeLog
index 09e212ae0881..23f87f709414 100644
--- a/x11-misc/xmobar/ChangeLog
+++ b/x11-misc/xmobar/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/xmobar
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/ChangeLog,v 1.25 2014/02/21 19:19:24 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/ChangeLog,v 1.26 2014/04/04 19:11:40 slyfox Exp $
+
+*xmobar-0.20.1 (04 Apr 2014)
+
+  04 Apr 2014; Sergei Trofimovich <slyfox@gentoo.org> +xmobar-0.20.1.ebuild,
+  -files/xmobar-0.13-fix-build-failure-against-ghc-7.2.patch,
+  -files/xmobar-0.14-stm-2.3.patch, -xmobar-0.13.ebuild, -xmobar-0.14.ebuild,
+  -xmobar-0.16-r1.ebuild, -xmobar-0.18.ebuild, metadata.xml:
+  Version bump (bug #506750 by Phil Tooley).
 
 *xmobar-0.19 (21 Feb 2014)
 
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index 85ae2017edfd..b3dff02aa997 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1,25 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xmobar-0.13-fix-build-failure-against-ghc-7.2.patch 887 SHA256 3ffad42f277a6b5306bc534e706ad49bca1f89e0d867bbd215aa6c9c798b72a8 SHA512 16440403836b4699e839037b82ebb5222748bdf26b953d00b8c99f10993515e2db632ea63d69abe2a54fb16b6c023b07eaf5b30982e69746f2e92f91a01ac248 WHIRLPOOL 18af54bb74b18d247acacc38d4149b69bdcbc4cd311f665269fbf7fc30ecf65410246c050ea330b0b8277c2d7e4711c643cc3570f337345b2d8463d38efbfc25
-AUX xmobar-0.14-stm-2.3.patch 1552 SHA256 485052411e6b6bd784a8a197fc97e2b8f1abcb167f0186e73d8e51002e51d742 SHA512 43644014efe65a9e87594ed00c642f30d4f6c1c2d3943529420feae1efe3c8a2ac9b7cbb9c918e76710152a05e6468b391fc1953b5c14b01d10b85d8bbd2b4a1 WHIRLPOOL 0c4859831c882d9605d070edfe728aa3bf0571ea7d9c1735eff7a900e3db7a2653e264134e88360b60f0906a1b1c899f5075d0d4ae5924bfee776d44950259e2
 AUX xmobar-0.19-ghc-7.8.patch 1564 SHA256 046c0332c9f00ce0abf27eee9a01c7424fa51606aa4f05226018738d265bf2ee SHA512 f37ccb273d038076147c1bc13a45eee928f3580f6b3022b3e0aa4d10e066b49727f8d114d0da117658e6e57a3e4cfd521fd7d5b86da8b9c24426fecbe8fbec4e WHIRLPOOL 81bba2bea9d5194d77fd3e3969161ba4da3ead49494491d5f8cb45bb47dbd2cd0756c99f834e9abba5c4bb4f9214bf503bb1add96aa8eec04fb5f2433ea1f753
-DIST xmobar-0.13.tar.gz 55874 SHA256 c7c151c12491e230310a7ae22796cfe3f79d8731ddc453b661b509bb81da4a46 SHA512 303293deed974ec566f44618e8adb469392e9858e048d9e7606cb545b9ffc4dc143b65cd9433bf44817baf9a54fb5e07f3112661fd5b97d1e42816ec191528e3 WHIRLPOOL a176c57c0ae8a48882abfea72bf9c93d54ad0c590eac0b685be600c17ccff39ecfbf0653b4fc2e3cf7d207cb93e340d41f8b1427379c082d311d171b40f9ce2a
-DIST xmobar-0.14.tar.gz 64977 SHA256 70c39b0bd98a95fb362a78305cc9b10d4f9c24aa6431597fd81da65d945846f8 SHA512 ee6037052a066f1e4366f0b528ca3557a7fa6950a58e6bc310bff20d38c8f9de7a44faf739bc362dafd3e9a0d4da5e064c38d0f008860421aa33212f37ea9f65 WHIRLPOOL 0af76b7517100a9dc6aba0dc2661bd6a7e22539ffda65ef9d92b77998686a9931562a60508f799b760a7e1d7ac82adeac78642460bcc3bf3a7b4d93b47f34499
-DIST xmobar-0.16.tar.gz 76102 SHA256 115d602018ca20c62b35206864f63008c2ede4739a1229892c8cdcff3c9fa4b7 SHA512 f955a65661b5246ba77a4116abe28708139a24fdce58e662857f45d8aca3bf1e18cdcac5c06f5bdf83f90f8665f2dd6a65c310aa625f2b683690e9c5f7b3c3b5 WHIRLPOOL 5d3a961fc812edd0f9d7d3fc2f3a4a3eb4216bcff23a13ba9606a5aee765a7c796281412ae5779eb994e785c49e38fc8b2f382bb2f53821b543c5d93c4690fe0
-DIST xmobar-0.18.tar.gz 79963 SHA256 fc6c2422704ecd3802711894b0e54450378036da908cb6f7ce7287d2a5077322 SHA512 de7cddcdcf440b7831f8ffa40a8f1b22ff0d37deea9894630d0fd0d5ad7cba5b3c1d17af4e09f643e361a31c2fa384586a6e3411d87bede4d44bbd6d11f6bfe4 WHIRLPOOL fe4cc37193eddcd118550fe9119e8cd2bd2d8f676b9ee0613a2d1888e456c33b8242d501d59e6829478bda821abedf7fdedcdbc8be9b7090a113153ff6702cfa
 DIST xmobar-0.19.tar.gz 81828 SHA256 02770f83d987ff1a8c0696f45e74ed7a7ab7b1e82a626ac28d4ce3bb13e78bd3 SHA512 27fb9be99e679a0854d896f7e273bae7e755e13a677ac8fddf6c71580d0a896385692b90fd1d0ad6c58f369d94a359c9e439e6b505dd26f6ec2f3f2e3a595b42 WHIRLPOOL cc9a1b6a030957aa8044e14699301ba414c0c0bcee0bf07162f61e4f97e05f015685c9ebcb91c6b0a8715848cf327303826b9e2623abb7b10c40d59b9bbf43dc
-EBUILD xmobar-0.13.ebuild 1491 SHA256 c1793e4d3b6d512801f911c5602bf2167b92695761efea54b8df06295be0770f SHA512 fbeb039b2023b2d789c45908cce6155135758609fabd5e6cbf3961ef22a007e0b3fb6dd1acb6db03da67412f0ee1f1b4b0c73df9c1c90149436217b781f48a9e WHIRLPOOL 53b4a14da22df2aa7cdce029c19c3461071a81c48f29b5b0a8e986c9073009771fb7bf7fbc3b156519c6d6dcf276e72783e0a90a4dc81272ea5697925c4dd722
-EBUILD xmobar-0.14.ebuild 1643 SHA256 cf1c5f43567d986dcb2af2c22159a2875e1ccf2140a5dc3e2598a9a4aa98c1eb SHA512 f5c6e4d36323cee761aee60e7d34b3c49fb60ae6cdf2fe70e33d7c560d59c6bd9715ee1b80902a13cfd6f46880befee0be6678f93fd2f665eea64919957965f6 WHIRLPOOL f248684e3fef59860a224ff4139cb05674fc08ffe38f99afae70501e014c505a68ee98dfdd992d961ef440bd1a3b70a76929f2d73a860a43b42818eff8721d7a
-EBUILD xmobar-0.16-r1.ebuild 1949 SHA256 a3b05d67e7f7aae2e2a420c5900e14b1764b03b8473d1dd2e998f580156e709f SHA512 c2fa9a710f73baca7f5a570177aadb8d3aedc86716660f19b2a092cff774a609975a842d2ad5995429d14de02dc56d78f6bc900b906f3c1cb6fcea4e14ce6a37 WHIRLPOOL 93bd3e937567ffc76d6b76ce6d766b16291344a90154d76a37f704032732410023bd89a0661872b259b5d14d2c24d86d3b7a29bc19ae609e0d48c21c433da05f
-EBUILD xmobar-0.18.ebuild 2087 SHA256 ccfb487f91a73e3f99df31a5ac203672486b39aebb1c004f5bfca0ac13fa8202 SHA512 1a6e505da81a25b54cce6072a7636ce3131f19463360a3f8b49b9b78dc34ea512ef000100d12b864b1c1a17be070f3ef59f103fdf87ed6d046553f4db7de2d11 WHIRLPOOL 4d0122375ae5ca352cc581560904835723bc8953068543cb0ae04768f47ba50cc57fc1f9daa56eaf6c008486fa8141fc340fc289b7bf39f58c00a5fd7e4afb21
+DIST xmobar-0.20.1.tar.gz 83871 SHA256 73cb4bbb1186dbdd89b9dd75df95eb8bfe7a74bd6c41898de4b9e3c88c7d4e9a SHA512 b3fe69024a26bd8bc1728fced5f3c69afeb0b462c7b44acada3a6744ee686a789ceff260519bdc0feb398b520a5fc86b4ca1d8addfe8b51bfe95769ca6f8323a WHIRLPOOL bb0a4661b78e816dd29b55ed0f2f5f9b62ac0efc9ee102d30c3dd1ddde498a481cf6c7559800f75ed43e114294019b69a46d8299c54efd53cb7ce8b4fc3df631
 EBUILD xmobar-0.19.ebuild 2262 SHA256 3abab8e65505cb51719e2d908a3c773795b55d6ee169fa9c7dfacc2c8cb481b5 SHA512 15f5577641e8d66c2609d5db223bb917ab4c9b3bef3f02e5b6ced0bede8db5657c9696f8164bc4730016e95a2fcf8213accb3b032a2d1ec488a7605294d7ba7f WHIRLPOOL 5351ed8f58ae294731cb376c9bfcc44181d9919e39eb594593af4e6152bfb7a3b2e32e2ee2fb4488b7b9233e501b2968e477d88ab1527821ecfcc924c9e49595
-MISC ChangeLog 4179 SHA256 bc9f161d118ab33e8a6babb10bc219048a609001c2cb5f159ed2d2eab62f736a SHA512 579576d98f03f877b0cf0677fcb80a43d24d9004553d239645bdbcf7fb8a335b1bdf1a667362ef5b57c6a1e71c53417b97cfef1233b5c107ae7ba9ea596597ca WHIRLPOOL ea3f6de93b07fc7d0de14659bf525f811c8e736de5d699d566c06fe16147bb482c49387364cbd4fc6d10446f239c15128409cbe9e0346cfb76e16c1b434182ff
-MISC metadata.xml 798 SHA256 4cf1bc7af23238e738fa6647969355bfa478e0d7a7cb5ff2133c477d24da069f SHA512 2eca919e07325055a92509e5362ac5465f2fa48e45026d410f31ecf65d369ab64449c90a7cb7cfe6e6da7ddebb4db406bf050a909a36a219ba69f90acc7a6889 WHIRLPOOL c88a3811bb6aa4e7186c88b54bd2d4bf9d66a406cbbe0fd249744020158dde5f724e95ace8c342bf1cdc2740a07955b8fc1bcf1e00438b13a09c0e0967ea3769
+EBUILD xmobar-0.20.1.ebuild 2245 SHA256 5f383a414a7877f8f3d2d7fdd0f5d4d1c183310d79015d357517c766cf30c1ee SHA512 931e5a23faa89bc230ea6aabad5101afeed59150ccc54edb8420d068cc400e640556752b77d2de2ac172400a67f0f651891d7efc6f7b2b26ae46d6d5e17e70ff WHIRLPOOL 588c23206d62c9ee859247ff96b1ac55cfb60283b46fdb6007a1ad024e5148a176d5a17fab95d3a19ac947257c7a099d4385de68224e9ecba45d562920390f00
+MISC ChangeLog 4533 SHA256 4ad5f610c896dcd03e4edc724089b3b157203360beeaa37fe44f9f8ff430ab1b SHA512 dbb6f909f656ce2eccfef9b730c3678206b8732f0c40721bc1ded9470e245c85772e903637e943e859365c98b45fb8d29062c5f0df4f8142adf043928ae7be8c WHIRLPOOL 7cf6b4e8abde0dc8b7071ffe78bdfd938db2eb2648b8009defb72d2a3df3fb7e08a52473c41d3c1ff789c32cbd5b2334de103cc7e1d6cb6eaf5cc9ae488a071d
+MISC metadata.xml 651 SHA256 f62d1b0c8e6573e71bd5b7ce3d94d991df42646b3025a19667c92286111039b7 SHA512 e1bdff73516a824263f9bdc06e6fdf4bf6d216cf060feb76f9fab382c9c00c4f2b7a26056d3f4e222521118e9dc03524e921f1e8c984d425f98d8bad01decb5d WHIRLPOOL b3d42646e691e21b1c93b1bfb94e7e74d451a5deffa7babaab7f9f3da2eb990d15266ba7c2c393ae07b98bd34efa0eca32b42f6204327adab8e8cbf07aa66816
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMHprEACgkQcaHudmEf86pEYwCfRFQsdtv2ZtbzzgWY6LiUeowF
-4cEAn33xSU+tAAHwPCAjyGWxhV4K3tOt
-=iqxy
+iEYEAREIAAYFAlM/A6wACgkQcaHudmEf86rJ7gCbB/wjbm+M9Nh7y7XXjUlPSVdX
+Q2QAn09ANiX2mWUAjdhe9Ru/dxbUJmXl
+=PQjC
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xmobar/files/xmobar-0.13-fix-build-failure-against-ghc-7.2.patch b/x11-misc/xmobar/files/xmobar-0.13-fix-build-failure-against-ghc-7.2.patch
deleted file mode 100644
index 698a5d82b38b..000000000000
--- a/x11-misc/xmobar/files/xmobar-0.13-fix-build-failure-against-ghc-7.2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f7fcc06097d862ca3bc6840b550a53e0b02f139f Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Fri, 22 Jul 2011 12:36:06 +0300
-Subject: [PATCH] fix build failure against ghc-7.2
-
-    src/Plugins/Monitors/Top.hs:140:17:
-        Illegal bang-pattern (use -XBangPatterns):
-        ! r
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/Plugins/Monitors/Top.hs |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/Plugins/Monitors/Top.hs b/src/Plugins/Monitors/Top.hs
-index e45210c..6001164 100644
---- a/src/Plugins/Monitors/Top.hs
-+++ b/src/Plugins/Monitors/Top.hs
-@@ -13,6 +13,7 @@
- -----------------------------------------------------------------------------
- 
- {-# LANGUAGE ForeignFunctionInterface #-}
-+{-# LANGUAGE BangPatterns #-}
- 
- module Plugins.Monitors.Top (startTop, topMemConfig, runTopMem) where
- 
--- 
-1.7.3.4
-
diff --git a/x11-misc/xmobar/files/xmobar-0.14-stm-2.3.patch b/x11-misc/xmobar/files/xmobar-0.14-stm-2.3.patch
deleted file mode 100644
index a780a98840d3..000000000000
--- a/x11-misc/xmobar/files/xmobar-0.14-stm-2.3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/src/Plugins/Mail.hs b/src/Plugins/Mail.hs
-index 58431ce..2d0be37 100644
---- a/src/Plugins/Mail.hs
-+++ b/src/Plugins/Mail.hs
-@@ -49,18 +49,18 @@ instance Exec Mail where
-         forM_ (zip ds vs) $ \(d, v) -> do
-             s <- fmap (S.fromList . filter (not . isPrefixOf "."))
-                     $ getDirectoryContents d
--            atomically $ modifyTVar v (S.union s)
-+            atomically $ modifyTVarxm v (S.union s)
- 
-         changeLoop (mapM (fmap S.size . readTVar) vs) $ \ns ->
-             cb . unwords $ [m ++ ":" ++  show n
-                                     | (m, n) <- zip ts ns
-                                     , n /= 0 ]
- 
--modifyTVar :: TVar a -> (a -> a) -> STM ()
--modifyTVar v f = readTVar v >>= writeTVar v . f
-+modifyTVarxm :: TVar a -> (a -> a) -> STM ()
-+modifyTVarxm v f = readTVar v >>= writeTVar v . f
- 
- handle :: TVar (Set String) -> Event -> IO ()
--handle v e = atomically $ modifyTVar v $ case e of
-+handle v e = atomically $ modifyTVarxm v $ case e of
-     Created  {} -> create
-     MovedIn  {} -> create
-     Deleted  {} -> delete
-diff --git a/src/Plugins/Monitors/MPD.hs b/src/Plugins/Monitors/MPD.hs
-index 60c3e48..757c1ca 100644
---- a/src/Plugins/Monitors/MPD.hs
-+++ b/src/Plugins/Monitors/MPD.hs
-@@ -102,5 +102,5 @@ showTime t = int2str minutes ++ ":" ++ int2str seconds
-   where minutes = t `div` 60
-         seconds = t `mod` 60
- 
--int2str :: (Num a, Ord a) => a -> String
-+int2str :: (Num a, Ord a, Show a) => a -> String
- int2str x = if x < 10 then '0':sx else sx where sx = show x
diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
index 30ee2d2b729c..e4837ee8bce8 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -6,10 +6,8 @@
 		<email>haskell@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='mail'>Support the mail plugin. Pulls dependency dev-haskell/hinotify.</flag>
 		<flag name='mpd'>Support mpd plugin</flag>
 		<flag name='mpris'>Enables MPRIS v1, v2  support</flag>
-		<flag name='threaded'>Use threaded GHC runtime</flag>
 		<flag name='timezone'>Enables localized date support</flag>
 	</use>
 	<longdescription>
diff --git a/x11-misc/xmobar/xmobar-0.13.ebuild b/x11-misc/xmobar/xmobar-0.13.ebuild
deleted file mode 100644
index 7d4ec07dc31e..000000000000
--- a/x11-misc/xmobar/xmobar-0.13.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/xmobar-0.13.ebuild,v 1.4 2012/12/07 10:41:15 slyfox Exp $
-
-EAPI="3"
-CABAL_FEATURES="bin"
-inherit base haskell-cabal
-
-DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="http://projects.haskell.org/xmobar/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="xft unicode mail alsa"
-# wifi USE flag disabled due to compilation error with current stable wireless-tools.
-# mpd is disabled as it requires mtl-2 (not in tree)
-
-DEPEND=">=dev-lang/ghc-6.8.1
-		>=dev-haskell/cabal-1.6
-		dev-haskell/mtl
-		dev-haskell/parsec
-		dev-haskell/stm
-		>=dev-haskell/x11-1.3.0
-		unicode? ( dev-haskell/utf8-string )
-		xft?  ( dev-haskell/utf8-string
-				dev-haskell/x11-xft )
-		mail? ( dev-haskell/hinotify )
-		alsa? ( >=dev-haskell/alsa-mixer-0.1 )"
-#		mpd? ( >=dev-haskell/libmpd-0.5 )
-# 		wifi? ( net-wireless/wireless-tools )
-#RDEPEND="mpd? ( media-sound/mpd )"
-RDEPEND=""
-
-PATCHES=("${FILESDIR}/${PN}-0.13-fix-build-failure-against-ghc-7.2.patch")
-
-src_configure() {
-	cabal_src_configure \
-		$(cabal_flag xft with_xft) \
-		$(cabal_flag unicode with_utf8) \
-		$(cabal_flag mail with_inotify) \
-		$(cabal_flag alsa with_alsa)
-#		$(cabal_flag mpd with_mpd) \
-#		$(cabal_flag wifi with_iwlib) \
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc samples/xmobar.config README
-}
diff --git a/x11-misc/xmobar/xmobar-0.14.ebuild b/x11-misc/xmobar/xmobar-0.14.ebuild
deleted file mode 100644
index a35832e7aad2..000000000000
--- a/x11-misc/xmobar/xmobar-0.14.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/xmobar-0.14.ebuild,v 1.5 2012/12/07 10:41:15 slyfox Exp $
-
-# ebuild generated by hackport 0.2.14
-
-EAPI="3"
-
-CABAL_FEATURES="bin"
-inherit base haskell-cabal
-
-DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="http://projects.haskell.org/xmobar/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="xft unicode mail mpd alsa timezone"
-# wifi USE flag disabled due to compilation error with current stable wireless-tools.
-
-RDEPEND="x11-libs/libXrandr
-	mpd? ( media-sound/mpd )
-	"
-
-DEPEND="${RDEPEND}
-		>=dev-lang/ghc-7.0.1
-		>=dev-haskell/cabal-1.6
-		dev-haskell/mtl
-		>=dev-haskell/parsec-3
-		dev-haskell/stm
-		>=dev-haskell/x11-1.3.0
-		unicode? ( dev-haskell/utf8-string )
-		xft?  ( dev-haskell/utf8-string
-				dev-haskell/x11-xft )
-		mail? ( dev-haskell/hinotify )
-		mpd? ( >=dev-haskell/libmpd-0.6 )
-		alsa? ( =dev-haskell/alsa-mixer-0.1*
-			=dev-haskell/alsa-core-0.5*
-		)
-		timezone? ( dev-haskell/timezone-series
-			dev-haskell/timezone-olson
-		)
-		"
-		#wifi? ( net-wireless/wireless-tools )
-
-PATCHES=("${FILESDIR}/${PN}-0.14-stm-2.3.patch")
-
-src_configure() {
-	cabal_src_configure \
-		$(cabal_flag xft with_xft) \
-		$(cabal_flag unicode with_utf8) \
-		$(cabal_flag mail with_inotify) \
-		$(cabal_flag mpd with_mpd) \
-		$(cabal_flag alsa with_alsa) \
-		$(cabal_flag timezone with_datezone)
-		#$(cabal_flag wifi with_iwlib) \
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc samples/xmobar.config README
-}
diff --git a/x11-misc/xmobar/xmobar-0.16-r1.ebuild b/x11-misc/xmobar/xmobar-0.16-r1.ebuild
deleted file mode 100644
index 5a832c6b4507..000000000000
--- a/x11-misc/xmobar/xmobar-0.16-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/xmobar-0.16-r1.ebuild,v 1.1 2013/02/21 20:58:50 slyfox Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="http://projects.haskell.org/xmobar/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="xft unicode mail mpd mpris alsa timezone wifi dbus"
-REQUIRED_USE="mpris? ( dbus )"
-
-RDEPEND="x11-libs/libXrandr
-	wifi? ( net-wireless/wireless-tools )
-	"
-DEPEND="${RDEPEND}
-		>=dev-lang/ghc-6.10.4
-		>=dev-haskell/cabal-1.6
-		>=dev-haskell/mtl-2.0
-		<dev-haskell/mtl-2.2
-		=dev-haskell/parsec-3.1*
-		>=dev-haskell/stm-2.3
-		<dev-haskell/stm-2.5
-		=dev-haskell/x11-1.6*
-		alsa? ( =dev-haskell/alsa-mixer-0.1*
-			=dev-haskell/alsa-core-0.5*
-		)
-		dbus? ( >=dev-haskell/dbus-0.10 )
-		mail? ( =dev-haskell/hinotify-0.3* )
-		mpd? ( =dev-haskell/libmpd-0.8* )
-		mpris? ( >=dev-haskell/dbus-0.10 )
-		timezone? ( =dev-haskell/timezone-olson-0.1*
-			=dev-haskell/timezone-series-0.1*
-		)
-		xft? ( =dev-haskell/utf8-string-0.3*
-			=dev-haskell/x11-xft-0.3*
-		)
-		"
-RDEPEND+="mpd? ( media-sound/mpd )"
-
-src_configure() {
-	# with_threaded is to workaround http://hackage.haskell.org/trac/ghc/ticket/4934
-	# but it's broken in current master:
-	#    https://github.com/jaor/xmobar/issues/77
-	cabal_src_configure \
-		--flags=-with_threaded \
-		$(cabal_flag xft with_xft) \
-		$(cabal_flag unicode with_utf8) \
-		$(cabal_flag mail with_inotify) \
-		$(cabal_flag mpd with_mpd) \
-		$(cabal_flag alsa with_alsa) \
-		$(cabal_flag timezone with_datezone) \
-		$(cabal_flag wifi with_iwlib) \
-		$(cabal_flag dbus with_wbus) \
-		$(cabal_flag mpris with_mpris)
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc samples/xmobar.config readme.md news.md
-}
diff --git a/x11-misc/xmobar/xmobar-0.18.ebuild b/x11-misc/xmobar/xmobar-0.18.ebuild
deleted file mode 100644
index 7e84744ca8af..000000000000
--- a/x11-misc/xmobar/xmobar-0.18.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/xmobar-0.18.ebuild,v 1.2 2013/07/23 18:24:08 slyfox Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="http://projects.haskell.org/xmobar/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-#hackport: ignore-use all_extansions
-#hackport: rename-use with_alsa alsa
-#hackport: rename-use with_datezone timezone
-#hackport: rename-use with_threaded threaded
-#hackport: rename-use with_dbus dbus
-#hackport: rename-use with_inotify mail
-IUSE="alsa timezone threaded dbus wifi mpd mpris mail xft"
-
-#	xft? ( net-wireless/iw )
-RDEPEND="x11-libs/libXrandr
-	wifi? ( net-wireless/wireless-tools )
-	"
-
-DEPEND="${RDEPEND}
-		>=dev-lang/ghc-6.12.1
-		>=dev-haskell/cabal-1.6
-		>=dev-haskell/mtl-2.0
-		<dev-haskell/mtl-2.2
-		=dev-haskell/parsec-3.1*
-		dev-haskell/regex-compat
-		>=dev-haskell/stm-2.3
-		<dev-haskell/stm-2.5
-		>=dev-haskell/x11-1.6.1
-		alsa? ( =dev-haskell/alsa-mixer-0.1*
-			=dev-haskell/alsa-core-0.5*
-		)
-		dbus? ( >=dev-haskell/dbus-0.10 )
-		mail? ( =dev-haskell/hinotify-0.3* )
-		mpd? ( =dev-haskell/libmpd-0.8* )
-		mpris? ( >=dev-haskell/dbus-0.10 )
-		timezone? ( =dev-haskell/timezone-olson-0.1*
-			=dev-haskell/timezone-series-0.1*
-		)
-		xft? ( <dev-haskell/x11-xft-0.4
-			>=dev-haskell/x11-xft-0.2
-			=dev-haskell/utf8-string-0.3*
-		)"
-RDEPEND+="mpd? ( media-sound/mpd )"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flags=with_utf8 \
-		$(cabal_flag alsa with_alsa) \
-		$(cabal_flag timezone with_datezone) \
-		$(cabal_flag dbus with_dbus) \
-		$(cabal_flag mail with_inotify) \
-		$(cabal_flag wifi with_iwlib) \
-		$(cabal_flag mpd with_mpd) \
-		$(cabal_flag mpris with_mpris) \
-		$(cabal_flag threaded with_threaded) \
-		$(cabal_flag xft with_xft)
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc samples/xmobar.config readme.md news.md
-}
diff --git a/x11-misc/xmobar/xmobar-0.20.1.ebuild b/x11-misc/xmobar/xmobar-0.20.1.ebuild
new file mode 100644
index 000000000000..3f5df8851530
--- /dev/null
+++ b/x11-misc/xmobar/xmobar-0.20.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/xmobar-0.20.1.ebuild,v 1.1 2014/04/04 19:11:40 slyfox Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.6.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
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="A Minimalistic Text Based Status Bar"
+HOMEPAGE="http://projects.haskell.org/xmobar/"
+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 xft"
+
+RDEPEND="x11-libs/libXrandr
+	wifi? ( net-wireless/wireless-tools )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8.0.2
+	>=dev-haskell/http-4000
+	>=dev-haskell/mtl-2.0 <dev-haskell/mtl-2.2
+	>=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-0.4
+	>=dev-haskell/x11-1.6.1
+	>=dev-lang/ghc-6.12.1
+	alsa? ( >=dev-haskell/alsa-core-0.5 <dev-haskell/alsa-core-0.6
+		>=dev-haskell/alsa-mixer-0.2 <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.8 <dev-haskell/libmpd-0.9 )
+	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 )
+	xft? ( >=dev-haskell/x11-xft-0.2 <dev-haskell/x11-xft-0.4 )
+"
+RDEPEND+="mpd? ( media-sound/mpd )"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-all_extensions \
+		$(cabal_flag alsa with_alsa) \
+		$(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 xft with_xft)
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc samples/xmobar.config readme.md news.md
+}