summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Shakaryan <omp@gentoo.org>2008-09-28 03:13:15 +0000
committerDavid Shakaryan <omp@gentoo.org>2008-09-28 03:13:15 +0000
commit1d3193c85427392c3d89bbc51eb2cd512d290a28 (patch)
tree7bc42a441cfe36b3aa064a28330353ceb2e68ace /app-admin
parentOops (diff)
downloadgentoo-2-1d3193c85427392c3d89bbc51eb2cd512d290a28.tar.gz
gentoo-2-1d3193c85427392c3d89bbc51eb2cd512d290a28.tar.bz2
gentoo-2-1d3193c85427392c3d89bbc51eb2cd512d290a28.zip
Version bump; remove older 1.6.2 prereleases.
(Portage version: 2.2_rc9/cvs/Linux 2.6.24-gentoo-r3 x86_64)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/conky/ChangeLog9
-rw-r--r--app-admin/conky/conky-1.6.2_pre01247.ebuild133
-rw-r--r--app-admin/conky/conky-1.6.2_pre01261.ebuild (renamed from app-admin/conky/conky-1.6.2_pre01258.ebuild)2
3 files changed, 9 insertions, 135 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 79a2a466e3a6..eb2765bf0691 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-admin/conky
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.100 2008/09/25 09:53:46 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.101 2008/09/28 03:13:15 omp Exp $
+
+*conky-1.6.2_pre01261 (28 Sep 2008)
+
+ 28 Sep 2008; David Shakaryan <omp@gentoo.org>
+ -conky-1.6.2_pre01247.ebuild, -conky-1.6.2_pre01258.ebuild,
+ +conky-1.6.2_pre01261.ebuild:
+ Version bump; remove older 1.6.2 prereleases.
*conky-1.6.2_pre01258 (25 Sep 2008)
diff --git a/app-admin/conky/conky-1.6.2_pre01247.ebuild b/app-admin/conky/conky-1.6.2_pre01247.ebuild
deleted file mode 100644
index 33dc56cf9fa4..000000000000
--- a/app-admin/conky/conky-1.6.2_pre01247.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2008 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_pre01247.ebuild,v 1.2 2008/09/21 06:17:35 omp Exp $
-
-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 mpd nano-syntax nvidia rss truetype vim-syntax smapi 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-1.4.0 )
- 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
- )"
-
-pkg_setup() {
- if use audacious; then
- if has_version '<media-sound/audacious-1.5.0' && ! built_with_use media-sound/audacious dbus; then
- eerror "media-sound/audacious is not built with dbus USE flag."
- eerror "Please add 'dbus' to your USE flags, and re-emerge media-sound/audacious."
- die "media-sound/audacious needs USE=dbus"
- fi
- fi
-}
-
-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
- 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 mpd) \
- $(use_enable nvidia) \
- $(use_enable rss) \
- $(use_enable smapi) \
- $(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
- 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
-
- 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.6.2_pre01258.ebuild b/app-admin/conky/conky-1.6.2_pre01261.ebuild
index 78b637fa9ce6..c6ca5eb5a862 100644
--- a/app-admin/conky/conky-1.6.2_pre01258.ebuild
+++ b/app-admin/conky/conky-1.6.2_pre01261.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 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_pre01258.ebuild,v 1.1 2008/09/25 09:53:46 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.6.2_pre01261.ebuild,v 1.1 2008/09/28 03:13:15 omp Exp $
inherit eutils
# used for epause