From: Christian Faulhammer <fauli@gentoo.org>
Date: Wed, 14 Jul 2010 14:06:42 +0000 (+0000)
Subject: stable x86, bug 328161
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5b60cec31305aee2c9f0900ac3c44847a20bfa7d;p=gentoo.git

stable x86, bug 328161
Package-Manager: portage-2.1.8.3/cvs/Linux i686
---

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 130fa7c9f8a4..5de0a648a0a3 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.136 2010/07/13 22:36:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.137 2010/07/14 14:06:42 fauli Exp $
+
+  14 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
+  conky-1.8.0-r1.ebuild:
+  stable x86, bug 328161
 
   13 Jul 2010; Markos Chandras <hwoarang@gentoo.org> conky-1.8.0-r1.ebuild:
   Stable on amd64 wrt bug #328161
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 12cdd9b55250..214675b265af 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX conky-1.8.0-audacious-2.3.patch 595 RMD160 5ce471fc07a8f8dfe85e0b74f5ffc18a71ebef25 SHA1 d44055c6b4878b189cd5555747611d444cca3b25 SHA256 41ba5c1934992116b792e399064e1d517b7715b5338b8f9d782a0c7dfd96ea52
 AUX conky-1.8.0-ncurses.patch 4359 RMD160 deb00ff8338881bf97a8ed26aeb6cdb3d53c0a07 SHA1 13dd57185c5ab8118cf2ca9c7e86222b9dc4e166 SHA256 9ac58ffcebe10447ac0255a5e7c569d1f22ddb3f6b1a1b8b0854e55d781c6f59
 DIST conky-1.7.2.tar.bz2 585099 RMD160 6d419c7bdeded5890c4c99cdef884bc0a79a50cb SHA1 3f4e5cc13651fbf94892b079d447a8549818809e SHA256 b3c0a1b0ff90579d48df542a6070adbe67d3926d6d0c66ee12b52b2d5a2c675c
 DIST conky-1.8.0.tar.bz2 610545 RMD160 5ea6accf73e1d41ebe8390722a53ae50e0c23df8 SHA1 eef214c2917ea5666d24f03128b12d00fa313b58 SHA256 badb3824a9655eee90281939df8bdb3ca95cf8bab03269b3b3775bfea2ed0a51
 EBUILD conky-1.7.2-r2.ebuild 4115 RMD160 919d049392827b928c262962d13a319fb1b539e9 SHA1 026757ee426bd25a82ff0bef2cccb323d30eafd2 SHA256 6bea285b3344a9888f0b0207d8c3c836252570dcca3e55595e9df88301fe16f1
-EBUILD conky-1.8.0-r1.ebuild 3969 RMD160 b6da5c12a0c3546191738fec242451373aa3be6d SHA1 3dbc7895072c7483b895a3f932866b9bc9b92201 SHA256 1de2fe31096129d5a3f57084600a97ce821e4756fb6f1a4fbe0efaaa664238ed
+EBUILD conky-1.8.0-r1.ebuild 3965 RMD160 07fc8a9f34bc7eda8c358b3aac93445dba442625 SHA1 a045a2e771952cb69e1078f428fb544347f6b59a SHA256 5ff216043923ef95458b314f5fca674e215d86518f7fe88e375e4d0a3648e1ab
 EBUILD conky-1.8.0-r2.ebuild 4002 RMD160 a27d501ee5be4b7f5cb7aee11838147db15535cf SHA1 c692c16315203f083f75406ea5e24d6b183faed4 SHA256 4584ecc90cef8374e4ca52610ab546471d604e96842d4f6a1b008cf15a877f2d
-MISC ChangeLog 21088 RMD160 b3db6141f8da0da78721a3fecc61a1d5a4fe1fad SHA1 97b0652c0e2c173b306d50244d0a8e9a0c25bc11 SHA256 15b98e45f8b3f8d8167ed30fb9ef86af9e529641002eef6db55672f267570100
+MISC ChangeLog 21191 RMD160 f03b286e48262d887f5f8735f82fa81e0c5245d8 SHA1 950744b139fe67a3896176b5ce1c932e272285ab SHA256 4c2bcac41a8d257664b8d57f081f3bebede3f07bb6ea284d75cde6f9dcc5bc21
 MISC metadata.xml 2154 RMD160 911d61ea1b3a10bf4c49fafba1b82b067ee0eee3 SHA1 dac481d15b6279f6d573cb8c76aa38267a9186d7 SHA256 a2ab7e0c213f854ed36387d6ca1702a77a77842d9d96d3b97351d48e0472d9f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkw9xOMACgkQNQqtfCuFneMObQCdF1pJxfVgkE0CRrhhLG4ujThS
+2lAAniPXZo1rKlf1as0Knlw+AGN4gbSY
+=WzjX
+-----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.8.0-r1.ebuild b/app-admin/conky/conky-1.8.0-r1.ebuild
index d4d4c74175da..444673343a4e 100644
--- a/app-admin/conky/conky-1.8.0-r1.ebuild
+++ b/app-admin/conky/conky-1.8.0-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/app-admin/conky/conky-1.8.0-r1.ebuild,v 1.2 2010/07/13 22:36:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r1.ebuild,v 1.3 2010/07/14 14:06:42 fauli Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X"
 
 DEPEND_COMMON="