Make stricter requirements to x11-misc/xmobar.

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

diff --git a/x11-misc/xmobar/ChangeLog b/x11-misc/xmobar/ChangeLog
index 64e7920959cf592ee3be36677d5e423bc33f533f..1089d7082ece8f677cb524c33ef200cc640802c8 100644 (file)
--- a/x11-misc/xmobar/ChangeLog
+++ b/x11-misc/xmobar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xmobar
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/ChangeLog,v 1.7 2010/01/27 19:13:26 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/ChangeLog,v 1.8 2010/03/28 09:41:05 kolmodin Exp $
+
+  28 Mar 2010; Lennart Kolmodin <kolmodin@gentoo.org>
+  xmobar-0.9.2-r1.ebuild:
+  Bump requirement of cabal to 1.6, as we use the --constraint flag.
+  See bug #295568.
 
   27 Jan 2010; <kolmodin@gentoo.org> xmobar-0.9.2-r1.ebuild:
   Use explicit patch name in PATHCHES. Reported in bug #302225.

diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest
index 7d998529d13948297c7166d51872500d88cd7421..07cea8e7d416c43de105332574e3042d4d93dd37 100644 (file)
--- a/x11-misc/xmobar/Manifest
+++ b/x11-misc/xmobar/Manifest
@@ -7,14 +7,14 @@ DIST xmobar-0.9.2.tar.gz 29334 RMD160 ffe000a93b18e9f7638e09a06924b34640bafcca S
 DIST xmobar-0.9.tar.gz 37172 RMD160 9c4407a839f42fba9eca3dab58917ad12621111d SHA1 79aca34379e31b1e9974314cec5231163ecab1c9 SHA256 1e52e9ec669504ae66ae98fbd5291a7034e28723bf93abe29345d5567aefeba9
 EBUILD xmobar-0.8-r1.ebuild 977 RMD160 7eda6113818ffaeb37c514d12d19aa7e0ca577d0 SHA1 5c80af33545a72f7f8816906f4979ddf0dec2621 SHA256 c263ceda3a9c6dc6f65d610551a2e8fdce7dc247bb748a8a1da2aa5dfaefd94f
 EBUILD xmobar-0.8.ebuild 861 RMD160 0e0d662139283a7e93c9a960a3ddc7f2f7fc8cef SHA1 ba5033768051bdcc7afcfc2ce26448d8126c6f33 SHA256 42013a02447d918e0f9153c107de383cf828fb4d313eafd50fd624c9e3a170c6
-EBUILD xmobar-0.9.2-r1.ebuild 1530 RMD160 4889af88dc7393e1668fb5321996b788af1b290c SHA1 c0a4a26615a7e387896a218b35ba5b8202753472 SHA256 e44c84ec067c76b611e9673f534fa2946b51a84e2cdacd4f987377c7de681745
+EBUILD xmobar-0.9.2-r1.ebuild 1530 RMD160 011f2fad102a7d509badc4c1cd5ed579d99b355d SHA1 7bfff59b1b03e37f6cdeb54f8a5b19c8ea34977f SHA256 9ce4a8a45fb4209c4b6c726685215660e26ba21a0b4223aa49341afca3b10200
 EBUILD xmobar-0.9.ebuild 835 RMD160 0314093ced1ce940dc29dadf0ccfe6ddc2360ae4 SHA1 85a2eb8b78f13b4a4a5f10cdc5bcdcbd37b5f588 SHA256 dee27ba6a0d8a72094dce053925f4932735332ffd622acdcd5c6acf099e264cf
-MISC ChangeLog 1159 RMD160 2ca2188dcdf93f0a81e573b357e5e4eb3764a06f SHA1 b3088d0ea5feaafed4966984d98235970a8f3548 SHA256 14ed5c7b918018c73d6e5f4564f651cdf08d6a7fe302f3c3ce4bc50372688032
+MISC ChangeLog 1328 RMD160 fdd778d7be2d2dcbed0ded4a8458d1ec0867c95b SHA1 6dabb80a19e79b629229c5bc9443efe9101da0a6 SHA256 2f0590f16f0643a2737ef671bf0e44b2d93aef5121680fc4bce903cc90c50833
 MISC metadata.xml 326 RMD160 8a245bae2f03eafe73e40975ac0de3cb05a195cd SHA1 8a2589e3a4c621b55a0bf39f313a9ced394d4b44 SHA256 91d8af01976bf4fd4ae6a23e26d18acaa2a77b3bcdd426ea48d5a0b75fc34a9c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktgkF8ACgkQ1n/CYbXjntIUEgCghcQNo1areWeLrkWB7wEw008y
-ghoAn1CeOgxRYBzCRqQo0VGDCgMltMd2
-=H+x4
+iEYEARECAAYFAkuvJDMACgkQ1n/CYbXjntI6XwCaA20m0a6LHGduWQpwXUPtkAkt
+fKoAnA5ieTHORj/mA5RaWYGV6sM5SCI+
+=mtGk
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/xmobar/xmobar-0.9.2-r1.ebuild b/x11-misc/xmobar/xmobar-0.9.2-r1.ebuild
index 1a859666ce8ce42a8a2ce73fe0028caa8560e421..876d31cad8a58a1132d5d320de17b04cfe53b4cb 100644 (file)
--- a/x11-misc/xmobar/xmobar-0.9.2-r1.ebuild
+++ b/x11-misc/xmobar/xmobar-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.9.2-r1.ebuild,v 1.3 2010/01/27 19:13:26 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/xmobar-0.9.2-r1.ebuild,v 1.4 2010/03/28 09:41:05 kolmodin Exp $
 
 CABAL_FEATURES="bin"
 inherit base haskell-cabal
@@ -24,7 +24,7 @@ RDEPEND=">=dev-lang/ghc-6.6.1
                                dev-haskell/x11-xft )
                mail? ( dev-haskell/hinotify )"
 DEPEND="${RDEPEND}
-               >=dev-haskell/cabal-1.2"
+               >=dev-haskell/cabal-1.6"
 
 PATCHES=("${FILESDIR}/${P}-cpu-high-load.patch")