Removed old.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/x11-misc/xmobar/ChangeLog b/x11-misc/xmobar/ChangeLog
index 982a75f5bdaa2e4cb4ad3a56439a8f52efbb30fc..c31b20abfaab78d417d7bf264a28eefb6430e142 100644 (file)
--- a/x11-misc/xmobar/ChangeLog
+++ b/x11-misc/xmobar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xmobar
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/ChangeLog,v 1.12 2011/09/18 18:09:00 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/ChangeLog,v 1.13 2011/09/18 18:10:59 slyfox Exp $
+
+  18 Sep 2011; Sergei Trofimovich <slyfox@gentoo.org>
+  -files/xmobar-0.9.2-cpu-high-load.patch, -xmobar-0.11.1.ebuild:
+  Removed old.
 
 *xmobar-0.13 (18 Sep 2011)
 

diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index eba92d31a3ebe3b9018fff007e98006e7eec2019..349f42fc83ff4459612f15af86fe7acf00900d1b 100644 (file)
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -1,17 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX xmobar-0.9.2-cpu-high-load.patch 2598 RMD160 7d6477540ac354e67995ee87d01bdc075f22fbff SHA1 4ea0781f303314f67974757f2cc70a1deeba935e SHA256 646af583ddb70ca7b2ce375a0742d68ae7d974355fddcf023a5d1d827cd9133d
-DIST xmobar-0.11.1.tar.gz 45872 RMD160 a6edde92d08049d5ad0eaf093899d75673e58d8b SHA1 3b9a12a4e03f5b6174dba73236f85468d9c9cc1b SHA256 753b755b96852008bbbf8c79933d9ebb87554bf7e562888e8d6fb5b8320a6a73
 DIST xmobar-0.13.tar.gz 55874 RMD160 c8af69211d65f0b1ef66ff256f9db71b7d8005ee SHA1 a1e9312319a378b2d60fc9388d3e8158e87b835f SHA256 c7c151c12491e230310a7ae22796cfe3f79d8731ddc453b661b509bb81da4a46
-EBUILD xmobar-0.11.1.ebuild 1320 RMD160 8aeb1411fc578043e51c01b142179ee307d4f192 SHA1 cf52fe0006b50cedcef6ca018b8bca262128a261 SHA256 984608cb2ff4ddd741011be53e4c9f00257a34d3d86d67cceaab14f019958bdb
 EBUILD xmobar-0.13.ebuild 1439 RMD160 07d7283a25a1bf60f634889c1d45e6f556d35354 SHA1 1ba30a3877453f3c1a2c8556ce2f9878be848118 SHA256 2658ea770e5043b25d13e15abd186cf64344cc858bc66bd1ad07a2d0f9925a09
-MISC ChangeLog 2007 RMD160 208dfd2ce9c05707f5f494fdfccd82db00046350 SHA1 7f544b1b947e8a3d2033cef2e7649cd50d035bff SHA256 fa5033b3419de32f07dc10126971b83ad62a1ac696a607c7954a5843b23b925c
+MISC ChangeLog 2143 RMD160 ab1d366a895c51c66965e464921691efa6b1d653 SHA1 9848c0b763ba02893bf14471819da9f9e51e716f SHA256 2d2b50b62a27c59664228218c6ada50af88a85ef6c1cb4b6a6d8e9dc0d0cb4d8
 MISC metadata.xml 326 RMD160 8a245bae2f03eafe73e40975ac0de3cb05a195cd SHA1 8a2589e3a4c621b55a0bf39f313a9ced394d4b44 SHA256 91d8af01976bf4fd4ae6a23e26d18acaa2a77b3bcdd426ea48d5a0b75fc34a9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk52NJIACgkQcaHudmEf86r2IgCfWTcZnheW4KO75Y2Z9tzTSDa3
-KI8AnRX1d0jnOahzyv89TxjV8d1UYzMw
-=//VE
+iEYEARECAAYFAk52NQgACgkQcaHudmEf86ph5QCfZVZrF0BxHxaAh7NRPNgPswBu
+0SEAn2r9J60HxAFd8kQvl3tzHu+cqP7u
+=hKlQ
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/xmobar/files/xmobar-0.9.2-cpu-high-load.patch b/x11-misc/xmobar/files/xmobar-0.9.2-cpu-high-load.patch
deleted file mode 100644 (file)
index b2bfcaf..0000000
--- a/x11-misc/xmobar/files/xmobar-0.9.2-cpu-high-load.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Sun Aug 16 22:25:20 EEST 2009  Sergei Trofimovich <slyfox@inbox.ru>
-  * fixed "Abnormally high cpu load on X" (11 issue in tracker)
-  
-    Steps to reproduce are described in
-    http://code.google.com/p/xmobar/issues/detail?id=11
-  
-    I've noticed large bunch of XAllocNamedColor calls/sec
-    in xmobar ltrace log.
-    This patch introduces simple hackish color cachig. It's more PoC,
-    than real fix.
-diff -rN -u old-xmobar/XUtil.hsc new-xmobar/XUtil.hsc
---- old-xmobar/XUtil.hsc       2009-08-16 22:26:45.107628493 +0300
-+++ new-xmobar/XUtil.hsc       2009-08-16 22:26:45.126628260 +0300
-@@ -33,12 +33,14 @@
- import Control.Concurrent
- import Control.Monad
- import Control.Monad.Trans
-+import Data.IORef
- import Foreign
- import Graphics.X11.Xlib hiding (textExtents, textWidth)
- import qualified Graphics.X11.Xlib as Xlib (textExtents, textWidth)
- import Graphics.X11.Xlib.Extras
- import System.Posix.Types (Fd(..))
- import System.IO
-+import System.IO.Unsafe (unsafePerformIO)
- #if defined XFT || defined UTF8
- import Foreign.C
- import qualified System.IO.UTF8 as UTF8 (readFile,hGetLine)
-@@ -187,9 +189,31 @@
- initColor dpy c = (initColor' dpy c) `catch`
-                   (const . return $ DynPixel False (blackPixel dpy $ defaultScreen dpy))
- 
-+type ColorCache = [(String, Color)]
-+
-+-- dark magic: enable hack
-+{-# NOINLINE colorCache #-}
-+colorCache :: IORef ColorCache
-+colorCache = unsafePerformIO $ newIORef []
-+
-+getCachedColor :: String -> IO (Maybe Color)
-+getCachedColor color_name = do
-+  result <- lookup color_name `fmap` readIORef colorCache
-+  return result
-+
-+putCachedColor :: String -> Color -> IO ()
-+putCachedColor color_name color_id = do
-+    modifyIORef colorCache $ \cache -> (color_name,color_id) : cache
-+
- initColor' :: Display -> String -> IO DynPixel
- initColor' dpy c = do
--  (c', _) <- allocNamedColor dpy colormap c
-+  cached_color <- getCachedColor c
-+  c' <- do
-+      case cached_color of
-+          Just col -> return col
-+          _        -> do (c'', _) <- allocNamedColor dpy colormap c
-+                         putCachedColor c c''
-+                         return c''
-   return $ DynPixel True (color_pixel c')
-   where colormap = defaultColormap dpy (defaultScreen dpy)
- 
-@@ -197,7 +221,8 @@
- withColors d cs f = do
-   ps <- mapM (io . initColor d) cs
-   r  <- f $ map pixel ps
--  io $ freeColors d cmap (map pixel $ filter allocated ps) 0
-+  -- there is color leak in 'putCachedColor'. might be freed at xmobar shutdown
-+  -- io $ freeColors d cmap (map pixel $ filter allocated ps) 0
-   return r
-   where
-     cmap = defaultColormap d (defaultScreen d)

diff --git a/x11-misc/xmobar/xmobar-0.11.1.ebuild b/x11-misc/xmobar/xmobar-0.11.1.ebuild
deleted file mode 100644 (file)
index 7955ef1..0000000
--- a/x11-misc/xmobar/xmobar-0.11.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/xmobar-0.11.1.ebuild,v 1.1 2010/10/04 21:09:26 kolmodin Exp $
-
-EAPI="2"
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A Minimalistic Text Based Status Bar"
-HOMEPAGE="http://code.haskell.org/~arossato/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"
-# wifi USE flag disabled due to compilation error with current stable wireless-tools.
-
-DEPEND=">=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.4 )
-#              wifi? ( net-wireless/wireless-tools )
-
-#RDEPEND="mpd? ( media-sound/mpd )"
-RDEPEND=""
-
-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 wifi with_iwlib) \
-}
-
-src_install() {
-       cabal_src_install
-
-       dodoc xmobar.config-sample README
-}