Version bump.

(Portage version: 2.2.10_p40/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

4 files changed, 13 insertions, 106 deletions

diff --git a/x11-misc/xmobar/ChangeLog b/x11-misc/xmobar/ChangeLog
index 52990a830cbb..389ff10b3a6f 100644
--- a/x11-misc/xmobar/ChangeLog
+++ b/x11-misc/xmobar/ChangeLog
@@ -1,6 +1,12 @@
 # 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.28 2014/07/14 21:36:06 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/ChangeLog,v 1.29 2014/07/24 14:04:41 slyfox Exp $
+
+*xmobar-0.21 (24 Jul 2014)
+
+  24 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> +xmobar-0.21.ebuild,
+  -files/xmobar-0.19-ghc-7.8.patch, -xmobar-0.19.ebuild, -xmobar-0.20.1.ebuild:
+  Version bump.
 
 *xmobar-0.20.1-r1 (14 Jul 2014)
 
diff --git a/x11-misc/xmobar/files/xmobar-0.19-ghc-7.8.patch b/x11-misc/xmobar/files/xmobar-0.19-ghc-7.8.patch
deleted file mode 100644
index 50d9af358528..000000000000
--- a/x11-misc/xmobar/files/xmobar-0.19-ghc-7.8.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 21782da09df74bb96128636c10f55bff135d66af
-Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-Date:   Mon Nov 25 00:51:44 2013 +0100
-
-    findFiles renamed for directory-1.2.0.2 compat (fixes #137)
-
-diff --git a/src/Plugins/Monitors/CoreCommon.hs b/src/Plugins/Monitors/CoreCommon.hs
-index c7fb7d5..5d6efd4 100644
---- a/src/Plugins/Monitors/CoreCommon.hs
-+++ b/src/Plugins/Monitors/CoreCommon.hs
-@@ -35,7 +35,8 @@ retrieveData :: (Ord a, Num a)
-              => [String] -> Maybe (String, String -> Int)
-              -> (Double -> a) -> (a -> String) -> Monitor (Maybe String)
- retrieveData path lbl trans fmt = do
--  pairs <- map snd . sortBy (compare `on` fst) <$> (mapM readFiles =<< findFiles path lbl)
-+  pairs <- map snd . sortBy (compare `on` fst) <$>
-+             (mapM readFiles =<< findFilesAndLabel path lbl)
-   if null pairs
-     then return Nothing
-     else Just <$> (     parseTemplate
-@@ -84,9 +85,9 @@ pathComponents = joinComps . drop 2 . intercalate [Space] . map splitParts
- 
- -- | Function to find all files matching the given path and possible label file.
- -- The path must be absolute (start with a leading slash).
--findFiles :: [String] -> Maybe (String, String -> Int)
-+findFilesAndLabel :: [String] -> Maybe (String, String -> Int)
-           -> Monitor [(String, Either Int (String, String -> Int))]
--findFiles path lbl  =  catMaybes
-+findFilesAndLabel path lbl  =  catMaybes
-                    <$> (     mapM addLabel . zip [0..] . sort
-                          =<< recFindFiles (pathComponents path) "/"
-                        )
diff --git a/x11-misc/xmobar/xmobar-0.19.ebuild b/x11-misc/xmobar/xmobar-0.19.ebuild
deleted file mode 100644
index 130fe59f69cf..000000000000
--- a/x11-misc/xmobar/xmobar-0.19.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.19.ebuild,v 1.1 2014/02/21 19:19:24 slyfox Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.5
-#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 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="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/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.1 <dev-haskell/alsa-mixer-0.2 )
-	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 )"
-
-PATCHES=("${FILESDIR}"/${P}-ghc-7.8.patch)
-
-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
-}
diff --git a/x11-misc/xmobar/xmobar-0.20.1.ebuild b/x11-misc/xmobar/xmobar-0.21.ebuild
index 5b8f276fdec3..92c538257e4e 100644
--- a/x11-misc/xmobar/xmobar-0.20.1.ebuild
+++ b/x11-misc/xmobar/xmobar-0.21.ebuild
@@ -1,17 +1,17 @@
 # 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.2 2014/05/10 11:57:28 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/xmobar-0.21.ebuild,v 1.1 2014/07/24 14:04:41 slyfox Exp $
 
 EAPI=5
 
-# ebuild generated by hackport 0.3.6.9999
+# ebuild generated by hackport 0.4.3.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/"
+HOMEPAGE="http://xmobar.org"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -23,15 +23,15 @@ RDEPEND="x11-libs/libXrandr
 	wifi? ( net-wireless/wireless-tools )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
+	>=dev-haskell/cabal-1.6
 	>=dev-haskell/http-4000
-	>=dev-haskell/mtl-2.0 <dev-haskell/mtl-2.2
+	>=dev-haskell/mtl-2.0 <dev-haskell/mtl-2.3
 	>=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
+	>=dev-lang/ghc-7.4.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 )