Version bump. Remove old.

(Portage version: 2.1.6.13/cvs/Linux i686)

4 files changed, 48 insertions, 43 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 9fee102d7605..e45425ce79e3 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,12 @@
 # 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.125 2009/12/31 14:05:02 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.126 2010/01/25 18:14:23 billie Exp $
+
+*conky-1.8.0_rc2 (25 Jan 2010)
+
+  25 Jan 2010; Daniel Pielmeier <billie@gentoo.org>
+  -conky-1.7.1.1-r2.ebuild, +conky-1.8.0_rc2.ebuild:
+  Version bump. Remove old.
 
   31 Dec 2009; Brent Baude <ranger@gentoo.org> conky-1.7.2-r2.ebuild:
   Marking conky-1.7.2-r2 ~ppc64 for bug 274847
diff --git a/app-admin/conky/conky-1.6.1.ebuild b/app-admin/conky/conky-1.6.1.ebuild
index 79db63b430d3..df0a0dd0690d 100644
--- a/app-admin/conky/conky-1.6.1.ebuild
+++ b/app-admin/conky/conky-1.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.6.1.ebuild,v 1.14 2009/07/31 15:58:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.1.ebuild,v 1.15 2010/01/25 18:14:23 billie Exp $
 
 EAPI="2"
 
diff --git a/app-admin/conky/conky-1.7.2-r2.ebuild b/app-admin/conky/conky-1.7.2-r2.ebuild
index 2d879c4b8c88..8175ca83a7a1 100644
--- a/app-admin/conky/conky-1.7.2-r2.ebuild
+++ b/app-admin/conky/conky-1.7.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.7.2-r2.ebuild,v 1.5 2009/12/31 14:05:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.2-r2.ebuild,v 1.6 2010/01/25 18:14:23 billie Exp $
 
 EAPI="2"
 
diff --git a/app-admin/conky/conky-1.7.1.1-r2.ebuild b/app-admin/conky/conky-1.8.0_rc2.ebuild
index 40371930052f..5ed675040f68 100644
--- a/app-admin/conky/conky-1.7.1.1-r2.ebuild
+++ b/app-admin/conky/conky-1.8.0_rc2.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.7.1.1-r2.ebuild,v 1.3 2009/12/31 14:00:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0_rc2.ebuild,v 1.1 2010/01/25 18:14:23 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"
@@ -13,26 +11,31 @@ 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="alsa apcupsd audacious debug hddtemp imlib lua math moc mpd nano-syntax nvidia +portmon rss thinkpad truetype vim-syntax wifi X"
-# currently removed openmp
+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="
 	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
-		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-		imlib? ( media-libs/imlib2 )
-		nvidia? ( media-video/nvidia-settings )
 	)
-	alsa? ( media-libs/alsa-lib )
-	audacious? ( >=media-sound/audacious-1.5 )
+	audacious? ( >=media-sound/audacious-1.5 dev-libs/glib )
+	curl? ( net-misc/curl )
+	eve? ( net-misc/curl dev-libs/libxml2 )
 	portmon? ( dev-libs/glib )
 	lua? ( >=dev-lang/lua-5.1 )
+	ncurses? ( sys-libs/ncurses )
 	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 )
+	virtual/libiconv
 	"
-#	openmp? ( >=sys-devel/gcc-4.3[openmp] )
 RDEPEND="
 	${DEPEND_COMMON}
 	apcupsd? ( sys-power/apcupsd )
@@ -46,39 +49,40 @@ DEPEND="
 	dev-util/pkgconfig
 	"
 
-src_prepare() {
-	cp "${FILESDIR}"/conky_no_x11.conf data/
-	epatch "${FILESDIR}"/"${P}"-comment.patch
-}
-
 src_configure() {
 	local myconf
 	if use X; then
-		myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
-		myconf="${myconf} --enable-own-window $(use_enable truetype xft)"
+		myconf="--enable-x11 --enable-double-buffer --enable-xdamage --enable-argb"
+		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-x11 --disable-own-window --disable-argb"
+		myconf="${myconf} --disable-imlib --disable-lua-cairo --disable-lua-imlib"
+		myconf="${myconf} --disable-nvidia --disable-xft"
 	fi
 
 	econf \
 		${myconf} \
-		$(use_enable alsa) \
 		$(use_enable apcupsd) \
 		$(use_enable audacious) \
-		--disable-bmpx \
+		$(use_enable curl) \
 		$(use_enable debug) \
+		$(use_enable eve) \
 		$(use_enable hddtemp) \
-		$(use_enable imlib imlib2) \
+		$(use_enable iostats) \
 		$(use_enable lua) \
 		$(use_enable thinkpad ibm) \
 		$(use_enable math) \
 		$(use_enable moc) \
 		$(use_enable mpd) \
-		$(use_enable nvidia) \
+		$(use_enable ncurses) \
+		$(use_enable portmon) \
 		$(use_enable rss) \
-		$(use_enable wifi wlan) \
-		$(use_enable portmon)
-#		$(use_enable openmp) \
+		$(use_enable weather-metar) \
+		$(use_enable weather-xoap) \
+		$(use_enable wifi wlan)
 }
 
 src_install() {
@@ -102,18 +106,13 @@ src_install() {
 }
 
 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 "You can find a sample configuration file at ${ROOT%/}/etc/conky/conky.conf."
+	elog "To customize, copy 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 "For more info on Conky's features please look at the Changelog in"
+	elog "${ROOT%/}/usr/share/doc/${PF}. 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
 }