Yet another version bump.

Package-Manager: portage-2.1.4.4

3 files changed, 143 insertions, 5 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 6e58922c9dec..7248b5ab4bdf 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,12 @@
 # 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.69 2008/03/27 19:54:42 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.70 2008/03/27 20:41:19 omp Exp $
+
+*conky-1.5.1_pre01052 (27 Mar 2008)
+
+  27 Mar 2008; David Shakaryan <omp@gentoo.org>
+  +conky-1.5.1_pre01052.ebuild:
+  Yet another version bump.
 
 *conky-1.5.0 (27 Mar 2008)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 2b49ce5e976e..d76c98658582 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -4,14 +4,16 @@ 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
 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
-MISC ChangeLog 10997 RMD160 07f8d3bb55e5a0df9e09110259c993955c4fe790 SHA1 6bbff6a62575e5b5a21869f8b413f5a48bee86b9 SHA256 b1e74e52eb5d6ac45e70c1bc77182f48824245853ba8605c66423fde79369bab
+EBUILD conky-1.5.1_pre01052.ebuild 3685 RMD160 a925e36f80be84575d1800f9c56e68faa14effe0 SHA1 133107ff432c7273d1b82d68ba84a74e85b2c1ce SHA256 40c2ec925de70f0ceeebfe84731258e978f46a5d75f8cf249f9bb88fbce2ac6e
+MISC ChangeLog 11143 RMD160 1e5760e19c26dfbb32b8ece3113296c5651e3777 SHA1 e7dd4e6e56f573a36565ed08f287029fc093b8bc SHA256 77dcb44b461f9847e5d97534c3015b902e8b04060bd4b69f96983ac0d7d7be6f
 MISC metadata.xml 569 RMD160 b366c022728c365d2c27ddd7d558e4d7815bd512 SHA1 55b29887fc494ea60ff7e6100c3a85857eabf3a7 SHA256 1cfb216faf8f26ef4032857408246f0addf6fd09e50f0d4f1cb67789b506832b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH6/uNvSApE0uP4UsRAk2fAJ9c+6wC7Cz3kXuxKAI5PsGk/AZV9ACfXBh8
-OyCqCzfbVt/OirHuYCOpEvs=
-=KJhu
+iD8DBQFH7AZ7vSApE0uP4UsRArMrAJ95Fy16tZ+ae/fKQotlBoHX6W6KpgCdFrjK
+ebgPkLYn43yLLIf0mQjgwRM=
+=u//x
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.5.1_pre01052.ebuild b/app-admin/conky/conky-1.5.1_pre01052.ebuild
new file mode 100644
index 000000000000..d5539d143d63
--- /dev/null
+++ b/app-admin/conky/conky-1.5.1_pre01052.ebuild
@@ -0,0 +1,130 @@
+# 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 $
+
+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
+}