Remove old and bump version.

(Portage version: 2.1.6.13/cvs/Linux i686)

4 files changed, 135 insertions, 135 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index eaa691078518..0e7eba7ec591 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,14 @@
 # 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.110 2009/03/17 01:22:09 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.111 2009/07/11 08:48:51 billie Exp $
+
+*conky-1.7.1.1 (11 Jul 2009)
+
+  11 Jul 2009; Pielmeier Daniel <billie@gentoo.org> metadata.xml,
+  -conky-1.6.2_pre1355.ebuild, +conky-1.7.1.1.ebuild:
+  Remove old and bump version. Closes bug #273264, thanks to all reporters there.
+  Ebuild cleanup. Dropping ppc64 as the new dependency sys-power/apcupsd has no
+  keywords, see bug #274847. Taking over maintainership.
 
 *conky-1.7.0_rc1 (17 Mar 2009)
 
diff --git a/app-admin/conky/conky-1.6.2_pre1355.ebuild b/app-admin/conky/conky-1.6.2_pre1355.ebuild
deleted file mode 100644
index 31e2db5f32ce..000000000000
--- a/app-admin/conky/conky-1.6.2_pre1355.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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.6.2_pre1355.ebuild,v 1.3 2009/03/09 22:24:17 betelgeuse Exp $
-
-EAPI="2"
-
-inherit eutils
-# used for epause
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="audacious bmpx debug hddtemp ipv6 moc mpd nano-syntax nvidia rss truetype vim-syntax smapi wifi X"
-
-DEPEND_COMMON="
-	X? (
-		x11-libs/libICE
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libXrender
-		x11-libs/libXdamage
-		x11-libs/libXft
-		truetype? ( >=media-libs/freetype-2 )
-		audacious? ( >=media-sound/audacious-1.5 )
-		bmpx? ( media-sound/bmpx
-				>=sys-apps/dbus-0.35
-			)
-	)
-	rss? ( dev-libs/libxml2
-			net-misc/curl
-			)
-	wifi? ( net-wireless/wireless-tools )
-	nvidia? ( media-video/nvidia-settings )
-	!ipv6? ( >=dev-libs/glib-2.0 )"
-RDEPEND="${DEPEND_COMMON}
-	hddtemp? ( app-admin/hddtemp )
-	vim-syntax? ( || ( app-editors/vim
-	app-editors/gvim ) )
-	nano-syntax? ( app-editors/nano )"
-DEPEND="
-	${DEPEND_COMMON}
-	dev-util/pkgconfig
-	X? (
-		x11-libs/libXt
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-src_configure() {
-	local myconf
-	myconf="--enable-proc-uptime"
-	if useq X; then
-		myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage --enable-own-window"
-		myconf="${myconf} $(use_enable truetype xft)"
-	else
-		myconf="${myconf} --disable-x11 --disable-double-buffer --disable-xdamage --disable-own-window"
-		myconf="${myconf} --disable-xft"
-	fi
-	econf \
-		${myconf} \
-		$(use_enable audacious) \
-		$(use_enable bmpx) \
-		$(use_enable debug) \
-		$(use_enable hddtemp ) \
-		$(use_enable moc) \
-		$(use_enable mpd) \
-		$(use_enable nvidia) \
-		$(use_enable rss) \
-		$(use_enable smapi) \
-		$(use_enable wifi wlan) \
-		$(use_enable !ipv6 portmon) || die "econf failed"
-}
-
-src_compile() {
-	local mymake
-	if useq ipv6 ; then
-		ewarn "You have the ipv6 USE flag enabled.  Please note that using"
-		ewarn "the ipv6 USE flag with Conky disables the port monitor."
-		epause
-	else
-		mymake="MPD_NO_IPV6=noipv6"
-	fi
-
-	emake ${mymake} || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog AUTHORS README || die
-	dohtml doc/docs.html doc/config_settings.html doc/variables.html || die
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano/
-		doins "${S}"/extras/nano/conky.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "You can find the sample configuration file at"
-	elog "/etc/conky/conky.conf.  To customize it, copy"
-	elog "/etc/conky/conky.conf to ~/.conkyrc and edit"
-	elog "it to your liking."
-	elog
-	elog "For more info on Conky's new features,"
-	elog "please look at the README and ChangeLog:"
-	elog "/usr/share/doc/${PF}/README.bz2"
-	elog "/usr/share/doc/${PF}/ChangeLog.bz2"
-	elog "There are also pretty html docs available"
-	elog "on Conky's site or in /usr/share/doc/${PF}"
-	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/conky-1.7.1.1.ebuild b/app-admin/conky/conky-1.7.1.1.ebuild
new file mode 100644
index 000000000000..6b26af02218c
--- /dev/null
+++ b/app-admin/conky/conky-1.7.1.1.ebuild
@@ -0,0 +1,113 @@
+# 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.1.1.ebuild,v 1.1 2009/07/11 08:48:51 billie Exp $
+
+EAPI="2"
+
+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="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="alsa apcupsd audacious bmpx debug hddtemp imlib lua math moc mpd nano-syntax nvidia openmp +portmon rss thinkpad truetype vim-syntax wifi X"
+
+DEPEND_COMMON="
+	X? (
+		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 )
+	bmpx? ( media-sound/bmpx >=sys-apps/dbus-0.35 )
+	portmon? ( dev-libs/glib )
+	lua? ( >=dev-lang/lua-5.1 )
+	openmp? ( >=sys-devel/gcc-4.3[openmp] )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
+	wifi? ( net-wireless/wireless-tools )
+	"
+RDEPEND="
+	${DEPEND_COMMON}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	mpd? ( media-sound/mpd )
+	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 $(use_enable truetype xft)"
+	else
+		myconf="--disable-x11 --disable-own-window"
+	fi
+
+	econf \
+		${myconf} \
+		$(use_enable alsa) \
+		$(use_enable apcupsd) \
+		$(use_enable audacious) \
+		$(use_enable bmpx) \
+		$(use_enable debug) \
+		$(use_enable hddtemp) \
+		$(use_enable imlib imlib2) \
+		$(use_enable lua) \
+		$(use_enable thinkpad ibm) \
+		$(use_enable math) \
+		$(use_enable moc) \
+		$(use_enable mpd) \
+		$(use_enable nvidia) \
+		$(use_enable openmp) \
+		$(use_enable rss) \
+		$(use_enable wifi wlan) \
+		$(use_enable portmon)
+}
+
+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 6cede218d28f..db3cff7caccb 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -3,26 +3,34 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>omp@gentoo.org</email>
-		<name>David Shakaryan</name>
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
 	</maintainer>
 	<maintainer>
 		<email>dragonheart@gentoo.org</email>
 		<name>Daniel Black</name>
 	</maintainer>
 	<maintainer>
+		<email>omp@gentoo.org</email>
+		<name>David Shakaryan</name>
+	</maintainer>
+	<maintainer>
 		<email>brenden@rty.ca</email>
 		<name>Brenden Matthews</name>
 		<description>Upstream author</description>
 	</maintainer>
 	<longdescription>Conky is a system monitor that sits in the corner of your desktop. It is a fork of Torsmo that is actually maintained.</longdescription>
 	<use>
-		<flag name='audacious'>enable monitoring of audio tracks that are playing <pkg>media-sound/bmpx</pkg></flag>
-		<flag name='bmpx'>enable monitoring of audio tracks that are playing <pkg>media-sound/bmpx</pkg></flag>
+		<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='bmpx'>enable monitoring of music played by <pkg>media-sound/bmpx</pkg></flag>
+		<flag name='math'>enable support for glibc's libm math library</flag>
 		<flag name='moc'>enable monitoring of music played by <pkg>media-sound/moc</pkg></flag>
-		<flag name='mpd'>enable monitoring mpd controlled music <pkg>media-sound/mpd</pkg></flag>
+		<flag name='mpd'>enable monitoring of music played by <pkg>media-sound/mpd</pkg></flag>
 		<flag name='nano-syntax'>enable syntax highlighting for <pkg>app-editors/nano</pkg></flag>
 		<flag name='nvidia'>enable reading of nvidia card temperature sensors via <pkg>media-video/nvidia-settings</pkg></flag>
+		<flag name='portmon'>enable support for tcp (ip4) port monitoring</flag>
 		<flag name='smapi'>enable support for smapi</flag>
+		<flag name='thinkpad'>enable support for IBM/Lenovo notebooks</flag>
 	</use>
 </pkgmetadata>