Revision bump. Add eve use flag thanks to c0nv1ct on IRC for pointing me to it. Add missing dependencies.

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

4 files changed, 142 insertions, 3 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index e5d0dbca21ca..ed299400750c 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.119 2009/09/08 16:29:26 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.120 2009/09/09 21:16:42 billie Exp $
+
+*conky-1.7.2-r2 (09 Sep 2009)
+
+  09 Sep 2009; Pielmeier Daniel <billie@gentoo.org> +conky-1.7.2-r2.ebuild,
+  metadata.xml:
+  Revision bump. Add eve use flag thanks to c0nv1ct on IRC for pointing me
+  to it. Add missing dependencies.
 
 *conky-1.7.2-r1 (08 Sep 2009)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index e68cd0f33e68..3812511ac69e 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -7,6 +7,7 @@ DIST conky-1.7.2.tar.bz2 585099 RMD160 6d419c7bdeded5890c4c99cdef884bc0a79a50cb
 EBUILD conky-1.6.1.ebuild 3501 RMD160 d986c7c4430e32f56d9dc942397935b7004a805a SHA1 d059af46e282ba29dc1fa52cce8221a89eeb0d84 SHA256 9e6a893e1c38167b7fe25b2909b494d226a44c2c005d3eb87b719229d05c5ade
 EBUILD conky-1.7.1.1-r2.ebuild 3402 RMD160 7f4148b3709eebb2d71eef41ff9467791e9d4233 SHA1 e9b4cf8bb7b1327ecc1e0ac38ba3da42b4b7aec3 SHA256 6c6972a0743e2c186938dcc27da7b069e0bd0acf858c5df840b68ca6137ef30d
 EBUILD conky-1.7.2-r1.ebuild 3977 RMD160 878b4f38b04e0e7a78cc5ba8a30832ec58ec90fd SHA1 36de6bb74003db8c6d934c28873696f3ab63d179 SHA256 c0d25565c8c942869327d4ca0e4926637ddecb746abc8091b1d415b46d44bbcd
+EBUILD conky-1.7.2-r2.ebuild 4077 RMD160 fbcf521451ecec9dbe51b5645f9571a00c00ef7c SHA1 59be906f66585d0f1cfb510caf51205e246de6f1 SHA256 f1dd2db6b68e5650a28e785f8792f55bbbdc065a084b92becf75e7a6e68a0ad2
 EBUILD conky-1.7.2.ebuild 3671 RMD160 d05819917eb1a5edb067aeabee227f4f981f67b8 SHA1 b7da65765acd1d615a0c20daad8faf739b0cbdc0 SHA256 0ae2b24a793e8d29e480c448750fdb3214f32422c5e925e1f2777ed907f68449
-MISC ChangeLog 18418 RMD160 dbb6cd91428857cdd13d63716a7224a175689e8c SHA1 466c513bae22b1ab69ec86ef26b81f35dbfc0485 SHA256 5de0ad8594593e1c444e9e86fe7bc0083e574192682702449da73dd1bff93c9d
-MISC metadata.xml 2204 RMD160 10f16d02cc003972f92928ddfa138bd491c52ae5 SHA1 3587a19ed8f840b46d0e47511f3c119803bed5a1 SHA256 b656e1f71e44f9f0620e55a1fb041b64bcde396a4924923ac2a0b787e52fc08c
+MISC ChangeLog 18652 RMD160 911bcbd9cde26080a20a1811258860a9207bac14 SHA1 7d2445eeabbb8077085d910fa86aadcd80a23dfc SHA256 99b01b4201e8d1d4c80170109cb5674241450db59e60620fd45e5015473b1648
+MISC metadata.xml 2278 RMD160 71b6f2849466170e8002729af7b0feda4d8cb4a0 SHA1 9b4ef724a1b2be767ef75af054d1f382db5d9d3e SHA256 a9feeb7c5a529652de232f296af93e1bc39a03c4dfdefe154ed2e5f5b1007a57
diff --git a/app-admin/conky/conky-1.7.2-r2.ebuild b/app-admin/conky/conky-1.7.2-r2.ebuild
new file mode 100644
index 000000000000..d2f44f8f7ab8
--- /dev/null
+++ b/app-admin/conky/conky-1.7.2-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.2-r2.ebuild,v 1.1 2009/09/09 21:16:42 billie Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="http://conky.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X"
+# currently removed openmp, see
+# http://git.omp.am/?p=conky.git;a=commit;h=670e9a0eb15ed3bc384ae0154d3c09de691e390c
+
+DEPEND_COMMON="
+	X? (
+		imlib? ( media-libs/imlib2 )
+		lua-cairo? ( >=dev-lang/toluapp-1.0.93 x11-libs/cairo[X] )
+		lua-imlib? ( >=dev-lang/toluapp-1.0.93 media-libs/imlib2 )
+		nvidia? ( media-video/nvidia-settings )
+		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXext
+	)
+	alsa? ( media-libs/alsa-lib )
+	audacious? ( >=media-sound/audacious-1.5 )
+	curl? ( net-misc/curl )
+	eve? ( net-misc/curl dev-libs/libxml2 )
+	portmon? ( dev-libs/glib )
+	lua? ( >=dev-lang/lua-5.1 )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
+	wifi? ( net-wireless/wireless-tools )
+	weather-metar? ( net-misc/curl )
+	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+	sys-libs/zlib
+	virtual/libiconv
+	"
+#	openmp? ( >=sys-devel/gcc-4.3[openmp] )
+RDEPEND="
+	${DEPEND_COMMON}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+DEPEND="
+	${DEPEND_COMMON}
+	dev-util/pkgconfig
+	"
+
+src_configure() {
+	local myconf
+	if use X; then
+		myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
+		myconf="${myconf} --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)"
+	else
+		myconf="--disable-x11 --disable-own-window"
+		myconf="--disable-imlib --disable-lua-cairo --disable-lua-imlib"
+		myconf="--disable-nvidia --disable-xft"
+	fi
+
+	econf \
+		${myconf} \
+		$(use_enable alsa) \
+		$(use_enable apcupsd) \
+		$(use_enable audacious) \
+		$(use_enable curl) \
+		$(use_enable debug) \
+		$(use_enable eve) \
+		$(use_enable hddtemp) \
+		$(use_enable iostats) \
+		$(use_enable lua) \
+		$(use_enable thinkpad ibm) \
+		$(use_enable math) \
+		$(use_enable moc) \
+		$(use_enable mpd) \
+		$(use_enable portmon) \
+		$(use_enable rss) \
+		$(use_enable weather-metar) \
+		$(use_enable weather-xoap) \
+		$(use_enable wifi wlan)
+#		$(use_enable openmp) \
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog AUTHORS TODO || die "dodoc failed"
+	dohtml doc/docs.html doc/config_settings.html doc/variables.html \
+		|| die "dohtml failed"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die "doins failed"
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim|| die "doins failed"
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc|| die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	elog "You can find a sample configuration file at"
+	elog "${ROOT%/}/etc/conky/conky.conf. To customize, copy"
+	elog "it to ~/.conkyrc and edit it to your liking."
+	elog
+	elog "For more info on Conky's new features please look at"
+	elog "the Changelog in ${ROOT%/}/usr/share/doc/${PF}"
+	elog "There are also pretty html docs available"
+	elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html"
+	elog
+	elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
+	elog
+	elog "Vim syntax highlighting for conkyrc now enabled with"
+	elog "USE=vim-syntax, for Nano with USE=nano-syntax"
+	elog
+}
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 189e28ae528e..c24636a55361 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -23,6 +23,7 @@
 	<use>
 		<flag name='apcupsd'>enable support for <pkg>sys-power/apcupsd</pkg></flag>
 		<flag name='audacious'>enable monitoring of music played by <pkg>media-sound/audacious</pkg></flag>
+		<flag name='eve'>enable support for the eve-online skill monitor</flag>
 		<flag name='ipv6'>disable support for tcp (ip4) port monitoring</flag>
 		<flag name='iostats'>enable support for per-task I/O statistics</flag>
 		<flag name='lua'>enable if you want Lua scripting support</flag>