Add patch to fix bug #331171. Thanks to Marián Čavojský for the report and Brenden Matthews for the fix. Also fixes other issues related to USE="-X".

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 23 insertions, 17 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 1b31ff644175..4d037e6cd802 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,11 @@
 # 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.138 2010/07/24 21:44:53 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.139 2010/08/13 19:30:33 billie Exp $
+
+  13 Aug 2010; Daniel Pielmeier <billie@gentoo.org> conky-1.8.0-r2.ebuild:
+  Add patch to fix bug #331171. Thanks to Marián Čavojský for the report
+  and Brenden Matthews for the fix. Also fixes other issues related to
+  USE="-X".
 
   24 Jul 2010; Daniel Pielmeier <billie@gentoo.org> conky-1.8.0-r2.ebuild,
   +files/conky-1.8.0-if-existing.patch:
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 4ddc3a955969..25488619d247 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -5,6 +5,6 @@ DIST conky-1.7.2.tar.bz2 585099 RMD160 6d419c7bdeded5890c4c99cdef884bc0a79a50cb
 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 3965 RMD160 07fc8a9f34bc7eda8c358b3aac93445dba442625 SHA1 a045a2e771952cb69e1078f428fb544347f6b59a SHA256 5ff216043923ef95458b314f5fca674e215d86518f7fe88e375e4d0a3648e1ab
-EBUILD conky-1.8.0-r2.ebuild 4050 RMD160 1af0045c505307b18a7d7a28b1e9eadd3d7aeb7b SHA1 10a98e036daa27a11907c46865f774ba9333d678 SHA256 68999cbcaf9b8330442c72d89a9fd12f2ec57ff6a24270052dc45474823a8344
-MISC ChangeLog 21371 RMD160 b50c4cc5c542fda104994b1842932196fc332d2a SHA1 d99bb2aae98077db10c2652e741c91327690c175 SHA256 c9ec802ce920d4ffafa26f7a090e2d83c1133a1126ae297a10a9e1e2e0a312ab
+EBUILD conky-1.8.0-r2.ebuild 4079 RMD160 3436ff2c35f2c2b22312ad88c884c54dc543bf70 SHA1 0578cf03fac7e477910b39109c52c50a49a3ed66 SHA256 849d437feaf17da6ca76adefa96c027da81ee6e42ccfcd8d8629a86ee6462819
+MISC ChangeLog 21606 RMD160 5e2f353112e421f0a3dafb874b94b6da27a4e646 SHA1 e53989a0412631796601b937a84029716b8785f7 SHA256 dbc8b74adfb20636526deadccd913d71d531623c90a062a5ac9482f5e5e78c79
 MISC metadata.xml 2154 RMD160 911d61ea1b3a10bf4c49fafba1b82b067ee0eee3 SHA1 dac481d15b6279f6d573cb8c76aa38267a9186d7 SHA256 a2ab7e0c213f854ed36387d6ca1702a77a77842d9d96d3b97351d48e0472d9f9
diff --git a/app-admin/conky/conky-1.8.0-r2.ebuild b/app-admin/conky/conky-1.8.0-r2.ebuild
index 9cbaaf26851a..f4601d598486 100644
--- a/app-admin/conky/conky-1.8.0-r2.ebuild
+++ b/app-admin/conky/conky-1.8.0-r2.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-r2.ebuild,v 1.2 2010/07/24 21:44:53 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild,v 1.3 2010/08/13 19:30:33 billie Exp $
 
 EAPI="2"
 
@@ -25,8 +25,9 @@ DEPEND_COMMON="
 		x11-libs/libX11
 		x11-libs/libXdamage
 		x11-libs/libXext
+		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib )
+		xmms2? ( media-sound/xmms2 )
 	)
-	audacious? ( >=media-sound/audacious-1.5 dev-libs/glib )
 	curl? ( net-misc/curl )
 	eve? ( net-misc/curl dev-libs/libxml2 )
 	portmon? ( dev-libs/glib )
@@ -37,7 +38,6 @@ DEPEND_COMMON="
 	weather-metar? ( net-misc/curl )
 	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
 	virtual/libiconv
-	xmms2? ( media-sound/xmms2 )
 	"
 RDEPEND="
 	${DEPEND_COMMON}
@@ -53,30 +53,32 @@ DEPEND="
 	"
 
 src_prepare() {
-	epatch "${FILESDIR}/conky-1.8.0-ncurses.patch" \
-		"${FILESDIR}/conky-1.8.0-audacious-2.3.patch" \
-		"${FILESDIR}/conky-1.8.0-if-existing.patch"
+	epatch "${FILESDIR}/${P}-ncurses.patch" \
+		"${FILESDIR}/${P}-audacious-2.3.patch" \
+		"${FILESDIR}/${P}-if-existing.patch" \
+		"${FILESDIR}/${P}-ibm-x.patch"
 	eautoreconf
 }
 
 src_configure() {
 	local myconf
+
 	if use X; then
-		myconf="--enable-x11 --enable-double-buffer --enable-xdamage --enable-argb"
-		myconf="${myconf} --enable-own-window"
+		myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
+		myconf="${myconf} --enable-argb --enable-own-window"
 		myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)"
 		myconf="${myconf} $(use_enable lua-imlib lua-imlib2)"
-		myconf="${myconf}  $(use_enable nvidia) $(use_enable truetype xft)"
+		myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)"
+		myconf="${myconf} $(use_enable audacious) $(use_enable xmms2)"
 	else
 		myconf="--disable-x11 --disable-own-window --disable-argb"
-		myconf="${myconf} --disable-imlib --disable-lua-cairo --disable-lua-imlib"
-		myconf="${myconf} --disable-nvidia --disable-xft"
+		myconf="${myconf} --disable-lua-cairo --disable-nvidia --disable-xft"
+		myconf="${myconf} --disable-audacious --disable-xmms2"
 	fi
 
 	econf \
 		${myconf} \
 		$(use_enable apcupsd) \
-		$(use_enable audacious) \
 		$(use_enable curl) \
 		$(use_enable debug) \
 		$(use_enable eve) \
@@ -92,8 +94,7 @@ src_configure() {
 		$(use_enable rss) \
 		$(use_enable weather-metar) \
 		$(use_enable weather-xoap) \
-		$(use_enable wifi wlan) \
-		$(use_enable xmms2)
+		$(use_enable wifi wlan)
 }
 
 src_install() {