From 8d81c9a6d7dc76ee615b253d339c586aacfb6fac Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Thu, 18 Oct 2007 21:12:27 +0000 Subject: [PATCH] conky 1.4.8 git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@974 7f574dfc-610e-0410-a909-a81674777703 --- ChangeLog | 31 ++++---- app-admin/conky/conky-1.4.8.ebuild | 110 +++++++++++++++++++++++++++++ configure.ac.in | 4 +- src/conky.c | 2 +- 4 files changed, 132 insertions(+), 15 deletions(-) create mode 100644 app-admin/conky/conky-1.4.8.ebuild diff --git a/ChangeLog b/ChangeLog index 6f6480ae..606b7994 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,32 +1,39 @@ # $Id$ +2008-10-18 + * Conky 1.4.8 released. + +2007-10-17 + * doc/man fixes 1810328 & 1813483. + * struct alignment patch 1812924 (sohalt). + 2007-10-02 - * Multiple mailbox patch (thanks Ben Kibbey) + * Multiple mailbox patch (thanks Ben Kibbey). 2007-09-28 - * Small fix for $ibm_volume (thanks Kapil Hari Paranjape) - * Patch so $tail can read from a fifo file descriptor (thanks Ben Kibbey) + * Small fix for $ibm_volume (thanks Kapil Hari Paranjape). + * Patch so $tail can read from a fifo file descriptor (thanks Ben Kibbey). 2007-09-01 - * Improved performance slightly + * Improved performance slightly. * Added 'music_player_interval' config option to specify an update interval for music player threads (currently honored by mpd and audacious). - * Fixed some minor memory leaks associated with SIGUSR1 - * Zero out imap and pop3 stuff when the connection fails + * Fixed some minor memory leaks associated with SIGUSR1. + * Zero out imap and pop3 stuff when the connection fails. 2007-08-31 - * _Really_ fix mpd SIGPIPE issues + * _Really_ fix mpd SIGPIPE issues. * Fix timed thread race condition, seen esp. on new kernel scheduler (cfs). * Fix $audacious_title not being displayed when no length argument indicated. 2007-08-30 - * Conky 1.4.7 released - * Check for pkg-config >=0.19 - * Use timed_thread for mpd + * Conky 1.4.7 released. + * Check for pkg-config >=0.19. + * Use timed_thread for mpd. 2007-08-27 - * Fixed issue with SIGPIPE and mpd - * Updated COPYING (with more clarifications) + * Fixed issue with SIGPIPE and mpd. + * Updated COPYING (with more clarifications). 2007-08-14 * Updated vim/nano syntax files. diff --git a/app-admin/conky/conky-1.4.8.ebuild b/app-admin/conky/conky-1.4.8.ebuild new file mode 100644 index 00000000..470c92ad --- /dev/null +++ b/app-admin/conky/conky-1.4.8.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils +# used for epause + +DESCRIPTION="Conky is an advanced, highly configurable system monitor for X" +HOMEPAGE="http://conky.sf.net" +SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" +IUSE="audacious bmpx hddtemp ipv6 mpd rss truetype vim-syntax wifi X" + +DEPEND_COMMON=" + virtual/libc + 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-0.1 ) + bmpx? ( media-sound/bmpx + >=sys-apps/dbus-0.35 + ) + ) + wifi? ( net-wireless/wireless-tools ) + !ipv6? ( >=dev-libs/glib-2.0 )" +RDEPEND="${DEPEND_COMMON} + hddtemp? ( app-admin/hddtemp ) + vim-syntax? ( || ( app-editors/vim + app-editors/gvim ) )" + +DEPEND=" + ${DEPEND_COMMON} + X? ( + x11-libs/libXt + x11-proto/xextproto + x11-proto/xproto + )" + +src_compile() { + local mymake + if useq ipv6 ; then + ewarn + 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 + 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 hddtemp ) \ + $(use_enable mpd) \ + $(use_enable rss) \ + $(use_enable wifi wlan) \ + $(use_enable !ipv6 portmon) || die "econf failed" + emake ${mymake} || die "compile failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + dodoc ChangeLog AUTHORS README doc/conkyrc.sample + dohtml doc/docs.html doc/config_settings.html doc/variables.html + + 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 +} + +pkg_postinst() { + elog 'Default configuration file is "~/.conkyrc"' + elog "You can find a sample configuration file in" + elog "/usr/share/doc/${PF}/conkyrc.sample.bz2" + 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" + elog +} diff --git a/configure.ac.in b/configure.ac.in index ae3dc7f9..5dbb72db 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -4,7 +4,7 @@ dnl major, minor and micro version macros. m4_define([conky_version_major], [1]) m4_define([conky_version_minor], [4]) m4_define([conky_version_micro], [8]) -m4_define([conky_version_tag], [svn]) dnl [] for releases +m4_define([conky_version_tag], []) dnl [] for releases m4_define([conky_version_revision],[r@REVISION@]) m4_define([conky_version], [conky_version_major().conky_version_minor().conky_version_micro()ifelse( @@ -562,6 +562,6 @@ $PACKAGE $VERSION configured successfully: * general: hddtemp: $want_hddtemp portmon: $want_portmon - RSS: $want_rss + rss: $want_rss wireless: $want_wlan EOF diff --git a/src/conky.c b/src/conky.c index a1093b78..0aeb0f42 100644 --- a/src/conky.c +++ b/src/conky.c @@ -120,7 +120,7 @@ static void print_version() #ifdef HAVE_IWLIB " * wireless\n" #endif - "\n"); + ); exit(0); }