Version bump. Requested by fox in bug #411477.

Package-Manager: portage-2.2.0_alpha96_p5/cvs/Linux x86_64

5 files changed, 134 insertions, 13 deletions

diff --git a/x11-misc/xmobar/ChangeLog b/x11-misc/xmobar/ChangeLog
index 692e68feffaf..6a09bf11b1b8 100644
--- a/x11-misc/xmobar/ChangeLog
+++ b/x11-misc/xmobar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xmobar
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/ChangeLog,v 1.14 2012/04/02 03:34:46 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/ChangeLog,v 1.15 2012/04/13 21:33:35 slyfox Exp $
+
+*xmobar-0.14 (13 Apr 2012)
+
+  13 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/xmobar-0.14-stm-2.3.patch, +xmobar-0.14.ebuild, metadata.xml:
+  Version bump. Requested by fox in bug #411477.
 
   02 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org>
   +files/xmobar-0.13-fix-build-failure-against-ghc-7.2.patch,
diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index 82e917fdf20c..706e9e6da838 100644
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 AUX xmobar-0.13-fix-build-failure-against-ghc-7.2.patch 887 RMD160 e8e8a2f7ab6214ba7df33865910a9e17107d6ddd SHA1 4ec51c9d07d046cf0692a86e7a815a80d793ade0 SHA256 3ffad42f277a6b5306bc534e706ad49bca1f89e0d867bbd215aa6c9c798b72a8
+AUX xmobar-0.14-stm-2.3.patch 1552 RMD160 8dce88786e3b374c180758f8a5b5a3572d63bfa0 SHA1 b0ed8e0097477a4ff821e5727bf667fd83e34a10 SHA256 485052411e6b6bd784a8a197fc97e2b8f1abcb167f0186e73d8e51002e51d742
 DIST xmobar-0.13.tar.gz 55874 RMD160 c8af69211d65f0b1ef66ff256f9db71b7d8005ee SHA1 a1e9312319a378b2d60fc9388d3e8158e87b835f SHA256 c7c151c12491e230310a7ae22796cfe3f79d8731ddc453b661b509bb81da4a46
+DIST xmobar-0.14.tar.gz 64977 RMD160 cf69870df567cb1448e2d3a0c63bf5cb19f5cf1f SHA1 ea40641184a23011d29dd1346fa91cbbb5570f72 SHA256 70c39b0bd98a95fb362a78305cc9b10d4f9c24aa6431597fd81da65d945846f8
 EBUILD xmobar-0.13.ebuild 1520 RMD160 2ad1b55a499e7a4d7eeaca876281c4d9ae9458bb SHA1 959e675ff01a76ed818d2a940d06edf22ae4acd7 SHA256 65bbd9a64eaf59ff3ace0041135cbb3c094d60db8e346686818abcfd36779f7f
-MISC ChangeLog 2351 RMD160 323d3823e68ee0251ceaf462dbf17aa50f075ada SHA1 cfb860d3ce53224ff05051d2ef3abcdcf25db037 SHA256 e4ed46509f1b0e596ee4d6a1a73e8b94dec63669cc51ae664a1f2c6ad35d7acf
-MISC metadata.xml 326 RMD160 8a245bae2f03eafe73e40975ac0de3cb05a195cd SHA1 8a2589e3a4c621b55a0bf39f313a9ced394d4b44 SHA256 91d8af01976bf4fd4ae6a23e26d18acaa2a77b3bcdd426ea48d5a0b75fc34a9c
+EBUILD xmobar-0.14.ebuild 1668 RMD160 66a2c565637e833883eb54270ef4cbf5c96b4040 SHA1 5fe93d247e271d330791f9648e7ea7fc4dad5095 SHA256 77596b3a5539c3f8bd58c0836887c5a1e58c79166220ccc0bdb4a6ca55beddf5
+MISC ChangeLog 2554 RMD160 6caa59bdd6c67874a65ce442de03bd4fabc6c190 SHA1 05fe5a5b300f29153d5e13ffcab15146eadd8eae SHA256 f91636bbe1b0919223d7dbd88874ba37cecf1e2a7e2bde2ee5e6aceaaf102056
+MISC metadata.xml 722 RMD160 4285b93e315a2ac268113acc8a074a9dc9bb126b SHA1 bc516d75265cb5898fdd6ec40ad84619b39c3f66 SHA256 077620b273e66abd15b5ce9dfb479631ae9053c2ef95d94bbd6050c553e5a731
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk95H38ACgkQcaHudmEf86pmdwCeKrl4jpiqDuQRj5RrSo2KtxgR
-K5IAn0y82vnbs8k8C6jR84VYRb/LDo5X
-=gJbT
+iEYEARECAAYFAk+InNoACgkQcaHudmEf86rCEQCfbkQHm/RU/2K9HaW8SWqW08aw
+F0IAn0dHFf36KnbIQc2F8jMR5cKnbTP8
+=cskc
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..a780a98840d3
--- /dev/null
+++ b/x11-misc/xmobar/files/xmobar-0.14-stm-2.3.patch
@@ -0,0 +1,38 @@
+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 050435d7e32c..96ef7f93cea2 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
-<maintainer>
-  <email>haskell@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name='mail'>Support the mail plugin. Pulls dependency dev-haskell/hinotify.</flag>
-</use>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='mail'>Support the mail plugin. Pulls dependency dev-haskell/hinotify.</flag>
+		<flag name='mpd'>MPD status reporting via <pkg>dev-haskell/libmpd</pkg>.</flag>
+		<flag name='timezone'>Enables localized date support.</flag>
+	</use>
+	<longdescription>
+		Xmobar is a minimalistic text based status bar.
+		
+		Inspired by the Ion3 status bar, it supports similar
+		features, like dynamic color management, output templates,
+		and extensibility through plugins.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-misc/xmobar/xmobar-0.14.ebuild b/x11-misc/xmobar/xmobar-0.14.ebuild
new file mode 100644
index 000000000000..0e02edb4fd19
--- /dev/null
+++ b/x11-misc/xmobar/xmobar-0.14.ebuild
@@ -0,0 +1,65 @@
+# 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.1 2012/04/13 21:33:34 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="http://hackage.haskell.org/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-6.8.1
+		>=dev-haskell/cabal-1.6
+		dev-haskell/mtl
+		dev-haskell/parsec
+		dev-haskell/stm
+		dev-haskell/time
+		>=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
+}