summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/conky/ChangeLog9
-rw-r--r--app-admin/conky/Manifest18
-rw-r--r--app-admin/conky/conky-1.5.1.ebuild (renamed from app-admin/conky/conky-1.5.1_pre01052.ebuild)2
-rw-r--r--app-admin/conky/conky-1.5.1_pre01083.ebuild130
4 files changed, 22 insertions, 137 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 9947e74692f6..5fcae41bde88 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.71 2008/03/30 06:07:32 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.72 2008/04/01 19:05:21 omp Exp $
+
+*conky-1.5.1 (01 Apr 2008)
+
+ 01 Apr 2008; David Shakaryan <omp@gentoo.org>
+ -conky-1.5.1_pre01052.ebuild, -conky-1.5.1_pre01083.ebuild,
+ +conky-1.5.1.ebuild:
+ Conky 1.5.1 released.
*conky-1.5.1_pre01083 (30 Mar 2008)
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index ead91979cfe6..5a76d995d053 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,11 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX conky-1.5.0-disable-x11.patch 546 RMD160 b5df7c1a5bdd374a5ff16ddd26a62af1723d7d20 SHA1 3ced580289e10f5fefb01358515eabb5f4670455 SHA256 4687d76d28b2da5737d67c1d066a03dcd3d622dd6e26a21753668bea2e626c07
DIST conky-1.4.9.tar.bz2 412510 RMD160 d708ea0eae60cf1c1ca4d176fa20f8a464b803e1 SHA1 26f233588ea83b157729bb7dd56a64ffae856d20 SHA256 a6c98aa34932c8684e19e97fad460c04c2b7848c897bdaa293d37fbcc4d7949b
DIST conky-1.5.0.tar.bz2 420616 RMD160 9fa2bf8da9dc936f90245bfa1a1eef6dcf14ff0e SHA1 b5618ffa93fc305e30170102415b0913bbe79668 SHA256 25e0aa3b10677e71bb19665428575d39749c55db5fa4a224d99a002b7a966bbe
-DIST conky-1.5.1_pre01052.tar.bz2 421153 RMD160 1466904cbd52789fe7d7d06f038da1d2c82611f5 SHA1 d5043d43c5dbf07f4a6f950a1b77dd1dacdb8de1 SHA256 906b948eb74553d9b8ffe5ab2ad5b780d86e60109f7d4d64322a29d1d338666d
-DIST conky-1.5.1_pre01083.tar.bz2 422759 RMD160 33e6c39867375db56afa81231e54e57e9f67b011 SHA1 3dce1a523e828da05fc481ebccc52b905c790dbc SHA256 e045275c5554427db04e1f38827e575ec7a293cf02f3e3d92863f1e17ffb60cf
+DIST conky-1.5.1.tar.bz2 422965 RMD160 83458b7da66e3166dec24c2f8292201761e635f5 SHA1 fe6f0e3440fe9d18afe31ec0cacfa5b38042532a SHA256 ca8b1dbc87e7c2c44d06f70e2b195f59ae8b09f8d490cc92cfac8df10f7bc239
EBUILD conky-1.4.9-r1.ebuild 3599 RMD160 d70b8f876d104d67a5443a7b30b33513a30b8a3d SHA1 81d97f3ba329276cfdab2eed5828f5af8458d77d SHA256 846f55e1a48f4fd0b2e97335d180556bdbf8de8d6643931e5e0d67e588a8ee0e
EBUILD conky-1.5.0.ebuild 3763 RMD160 718de0bc830af93c1a7c44cd12087a4512efb30a SHA1 055a98f651d0cdb72bf4bb95fcd693802ab6c129 SHA256 f505b735c858695f876b2e9deaa12ea37d00192193f9d35c1309a945a67e5517
-EBUILD conky-1.5.1_pre01052.ebuild 3685 RMD160 a925e36f80be84575d1800f9c56e68faa14effe0 SHA1 133107ff432c7273d1b82d68ba84a74e85b2c1ce SHA256 40c2ec925de70f0ceeebfe84731258e978f46a5d75f8cf249f9bb88fbce2ac6e
-EBUILD conky-1.5.1_pre01083.ebuild 3685 RMD160 9936f5f2d8974b13f57894d32b7deb6370b534e0 SHA1 8ada6ee5214792f63aa230c6f0485b316ba4a52b SHA256 3be5239beeb11e914daad607b5641e1b296ef9b14ec3064bf4b89ec0846ffec2
-MISC ChangeLog 11299 RMD160 5d222aaf3da4d9fd639b134f8313003b03632e50 SHA1 0796191710978c47ca3242cfca05bcc73c2cd1e6 SHA256 2b783b58a732cf65793c83397c13b1b5c9fdcca8711906ca2f20404b65c367e9
+EBUILD conky-1.5.1.ebuild 3676 RMD160 061910fe65d9a029c5b0e08d700bc78f4f55bb81 SHA1 36bab50906d7461ecdf07310f8830ed19538c7f1 SHA256 0304274825c97c7a6fd8b85ca2f11c2d8d2be2fc5338f05a98aab6711b03ee4e
+MISC ChangeLog 11485 RMD160 e2e2d277ed5866077ec197175ce275827f97d8f0 SHA1 95f40dec4b4e7981038198356b26f7b149de92b0 SHA256 3070b9f4970ca0560051189f9727506a04538ee7b004a0c15296a5803b15fb10
MISC metadata.xml 661 RMD160 e01c3355104751367370f01e91fda7b7e050556b SHA1 7a5e7eee245dbc789a0db79578673c12786eb5a3 SHA256 1aeebff165b0c5ec46cdfc56d090a8bc2c8a2d3304d5dd1385c045d4beb113d3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH8od6vSApE0uP4UsRAvlbAJ9lG5jhWR2mtkl7Vsm7D0PtcHHFVACgm99v
+m/d6TxZ0Ii+XrtPsQj2MlT8=
+=B1fx
+-----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.5.1_pre01052.ebuild b/app-admin/conky/conky-1.5.1.ebuild
index d5539d143d63..9b2cb21b2176 100644
--- a/app-admin/conky/conky-1.5.1_pre01052.ebuild
+++ b/app-admin/conky/conky-1.5.1.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.5.1_pre01052.ebuild,v 1.1 2008/03/27 20:41:19 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.5.1.ebuild,v 1.1 2008/04/01 19:05:21 omp Exp $
inherit eutils
# used for epause
diff --git a/app-admin/conky/conky-1.5.1_pre01083.ebuild b/app-admin/conky/conky-1.5.1_pre01083.ebuild
deleted file mode 100644
index dce345830bad..000000000000
--- a/app-admin/conky/conky-1.5.1_pre01083.ebuild
+++ /dev/null
@@ -1,130 +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.5.1_pre01083.ebuild,v 1.1 2008/03/30 06:07:32 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 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 )
- !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}
- 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 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
-}