Add xmms2 use flag to fix bug #326463. Thanks Steve for reporting. Remove old.

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

4 files changed, 24 insertions, 10 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 1c532bb44e80..2f49e32e234a 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,13 @@
 # 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.134 2010/06/12 21:20:55 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.135 2010/07/03 20:07:57 billie Exp $
+
+*conky-1.8.0-r2 (03 Jul 2010)
+
+  03 Jul 2010; Daniel Pielmeier <billie@gentoo.org> -conky-1.8.0.ebuild,
+  +conky-1.8.0-r2.ebuild, metadata.xml:
+  Add xmms2 use flag to fix bug #326463. Thanks Steve for reporting. Remove
+  old.
 
 *conky-1.8.0-r1 (12 Jun 2010)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 12245fd129f7..9c17d189c6a9 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -4,6 +4,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 3968 RMD160 a05a2712bc2d93075a3499f39eb57d424cba06fb SHA1 b45fe976c66d885d636ddfe82b1199bfbbffc8d9 SHA256 28abe151268f993f667af617fc0c5af8a9ff208226d099652f8083240377ffec
-EBUILD conky-1.8.0.ebuild 3876 RMD160 39e78d678c819a9b6c67feb4c3a1ad65b2b9af77 SHA1 6da1a43ce8a54da61e29e4867c057ef81e902df3 SHA256 fd9b7548a87dacda9da0b47c897c329cc78cd0888923a1ef2ffa913032f95c59
-MISC ChangeLog 20747 RMD160 31d1779e02690b1af9a4840e838466e2132bc72c SHA1 e523e6d497caa6b622e1bd1688993ffa8c713527 SHA256 22f449ba32a0d0770ecd754c7eaab117e4d8e2379efd99c11b689782ae17282f
-MISC metadata.xml 2060 RMD160 88b9e4aa76eec177f3773e3f8cef6470437d58a6 SHA1 4e2498e15c938127dbd349a46d9c5890815bc7ec SHA256 f4b99e301ade7ca819eb909f041d75be53a26632e4dd04f0132c92d6c73d6352
+EBUILD conky-1.8.0-r2.ebuild 4002 RMD160 a27d501ee5be4b7f5cb7aee11838147db15535cf SHA1 c692c16315203f083f75406ea5e24d6b183faed4 SHA256 4584ecc90cef8374e4ca52610ab546471d604e96842d4f6a1b008cf15a877f2d
+MISC ChangeLog 20975 RMD160 b37c13434efe141d917d3c2c6db6b08199dc6f0d SHA1 82d09184ae50f6f1b6e6de315b2ba99b77086599 SHA256 e67a428f892bf90628897e9643ed011436321abc23aff5feac7be2bfe41f5b45
+MISC metadata.xml 2154 RMD160 911d61ea1b3a10bf4c49fafba1b82b067ee0eee3 SHA1 dac481d15b6279f6d573cb8c76aa38267a9186d7 SHA256 a2ab7e0c213f854ed36387d6ca1702a77a77842d9d96d3b97351d48e0472d9f9
diff --git a/app-admin/conky/conky-1.8.0.ebuild b/app-admin/conky/conky-1.8.0-r2.ebuild
index 77041c91bcc0..cf1eb8d8a894 100644
--- a/app-admin/conky/conky-1.8.0.ebuild
+++ b/app-admin/conky/conky-1.8.0-r2.ebuild
@@ -1,10 +1,10 @@
 # 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.ebuild,v 1.2 2010/04/07 19:05:02 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild,v 1.1 2010/07/03 20:07:57 billie Exp $
 
 EAPI="2"
 
-inherit base
+inherit autotools eutils
 
 DESCRIPTION="An advanced, highly configurable system monitor for X"
 HOMEPAGE="http://conky.sourceforge.net/"
@@ -12,8 +12,8 @@ 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"
-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"
+KEYWORDS="~amd64 ~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 xmms2"
 
 DEPEND_COMMON="
 	X? (
@@ -37,6 +37,7 @@ DEPEND_COMMON="
 	weather-metar? ( net-misc/curl )
 	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
 	virtual/libiconv
+	xmms2? ( media-sound/xmms2 )
 	"
 RDEPEND="
 	${DEPEND_COMMON}
@@ -51,7 +52,11 @@ DEPEND="
 	dev-util/pkgconfig
 	"
 
-PATCHES=( "${FILESDIR}/conky-1.8.0-ncurses.patch" )
+src_prepare() {
+	epatch "${FILESDIR}/conky-1.8.0-ncurses.patch" \
+		"${FILESDIR}/conky-1.8.0-audacious-2.3.patch"
+	eautoreconf
+}
 
 src_configure() {
 	local myconf
@@ -86,7 +91,8 @@ src_configure() {
 		$(use_enable rss) \
 		$(use_enable weather-metar) \
 		$(use_enable weather-xoap) \
-		$(use_enable wifi wlan)
+		$(use_enable wifi wlan) \
+		$(use_enable xmms2)
 }
 
 src_install() {
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 38a5ba79244a..0483667f143d 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -33,5 +33,6 @@
 		<flag name='thinkpad'>enable support for IBM/Lenovo notebooks</flag>
 		<flag name='weather-metar'>enable support for metar weather service</flag>
 		<flag name='weather-xoap'>enable support for metar and xoap weather service</flag>
+		<flag name='xmms2'>enable monitoring of music played by <pkg>media-sound/xmms2</pkg></flag>
 	</use>
 </pkgmetadata>