summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Pielmeier <billie@gentoo.org>2010-07-03 20:07:57 +0000
committerDaniel Pielmeier <billie@gentoo.org>2010-07-03 20:07:57 +0000
commit81122e095703284ded154b553eede2bed1e7c056 (patch)
tree68da2e4ba94e3a4698dc3dd5d35741ad5d75da05 /app-admin
parentVersion bump. Remove old. (diff)
downloadgentoo-2-81122e095703284ded154b553eede2bed1e7c056.tar.gz
gentoo-2-81122e095703284ded154b553eede2bed1e7c056.tar.bz2
gentoo-2-81122e095703284ded154b553eede2bed1e7c056.zip
Add xmms2 use flag to fix bug #326463. Thanks Steve for reporting. Remove old.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/conky/ChangeLog9
-rw-r--r--app-admin/conky/conky-1.8.0-r2.ebuild (renamed from app-admin/conky/conky-1.8.0.ebuild)18
-rw-r--r--app-admin/conky/metadata.xml1
3 files changed, 21 insertions, 7 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/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>