Version bump.

Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.27-ARCH i686

3 files changed, 143 insertions, 2 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index a021098f0a87..4bfa0cc633d3 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,11 @@
 # 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.104 2008/12/14 03:42:18 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.105 2008/12/20 02:51:14 omp Exp $
+
+*conky-1.6.2_pre1347 (20 Dec 2008)
+
+  20 Dec 2008; David Shakaryan <omp@gentoo.org> +conky-1.6.2_pre1347.ebuild:
+  Version bump.
 
 *conky-1.6.2_pre1321 (14 Dec 2008)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index df59c8520569..88a87d96cf7f 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,9 +3,11 @@ DIST conky-1.6.1.tar.bz2 442180 RMD160 db9ed1cddd03711358f707f16f27d459a3b9387b
 DIST conky-1.6.2_pre01267.tar.bz2 456852 RMD160 c1e9e26bc520988a7cfc3a92976d03a1cfcea4af SHA1 35263cee247fc3ef4eb12d91c0983baa39b3869c SHA256 69ef16c19208384088406aab78429d56501cbbddf73f1afdfdc052cdef53d1ce
 DIST conky-1.6.2_pre1285.tar.bz2 461412 RMD160 3ee94afdc85378eae9a76bc9231731c2be8c5070 SHA1 c16850c36527e40fb6ed73b2f35619d21a2e1c32 SHA256 bb736d9c42a97441c6c9a236e0d23cc49ec70f771063ede2293a4049a4bb0089
 DIST conky-1.6.2_pre1321.tar.bz2 467722 RMD160 8ea768b0c89e40b716c3d733cafc224613ff182d SHA1 324d307ab1127fd0001a31b2c3e687e55c4092f7 SHA256 eb0899389065a38e96f074596fefb4dedc87b63a27f78219508bf2ed8e86e304
+DIST conky-1.6.2_pre1347.tar.bz2 470888 RMD160 ad3ef46b6b9c2e35c743ebda6a37afd27cee5c5d SHA1 b97904f61a8137fe83d310f00e54fad2aa3aec46 SHA256 6d0b93e448679f2e502969e3680dde1268800a5e5a9a3dddd34ad62bd537ea5e
 EBUILD conky-1.6.1.ebuild 3851 RMD160 dafda7d5978077c3e90ecdf22cd4051835548ba5 SHA1 1b3f9d5afa78a3dcecd6a7b1288c6596fd3fa185 SHA256 5c09f0270a52cfaa446ef09798eb35d5251e3d3d889a33e4ec532229c72e16d2
 EBUILD conky-1.6.2_pre01267.ebuild 3806 RMD160 86b52befacc93bcafce86df98bc40d537d12c980 SHA1 b488402bb0326a0ce60b87af8ff42dfa93d49b0e SHA256 d9f4b77a7ef182f16aff9302c74f9f42d482462e2c24bc62bfc6c96bc005487d
 EBUILD conky-1.6.2_pre1285.ebuild 3805 RMD160 a60a2ecf6e33ad049ccaa56e9d7455f2dd8a20bd SHA1 5cec721f797d149f25943439b430cf3e5f17595d SHA256 d93ac28bc8c54085d0e3d8886dea752b282ea5ec410084409f05605d9a4fa240
 EBUILD conky-1.6.2_pre1321.ebuild 3805 RMD160 3599559dddd07cbe9d6a9adf41e6dd8835eaa0b0 SHA1 258d74d325aac780c4a29f74cc44c1071c7d7039 SHA256 b0c9ef4462248f3a5157b6d2e6f4f2bb90791b9ab651c4a571f4ffbbc9e0d40a
-MISC ChangeLog 15765 RMD160 9f857e62b2c562c4461d1a62cfbba849e160185c SHA1 19f7a4e64b2977800cd7f2dff6dd11afa852d1d5 SHA256 cee249634796d4095ce60b550c83ea0a11e9c6f7b5d1a0d0019d6b3bbae7cbb8
+EBUILD conky-1.6.2_pre1347.ebuild 3805 RMD160 b0e6f5137ddb6879b07cb890a70ca9644d87b4df SHA1 e0946289adc44c7bc06ed3e924098aa9debb44aa SHA256 456f38f94f27e6bda3d17137826597bbc9f08cdd9286cfc6cac05b7e6dd47876
+MISC ChangeLog 15895 RMD160 f22988ae4164f2dfd87d3f71cb2a55cdb231a2d2 SHA1 eebb67319bd233f72bad1e935a00cf7505db09b5 SHA256 0cbe8f1ce951fc2d82043783ad36f1e8ac127c47e34bd4299fb6f496a4728d89
 MISC metadata.xml 1325 RMD160 1214f29dc5bd4c5e34278b7bc1fdc41c282f09ac SHA1 0f7d6cc5c2adb768dcd54a20b79d1cf9e43b1f0f SHA256 0e5dd4c28282fcfbf5e4aab9c7dcf6decee2ad06327d6766c2247ea53d9ae5d4
diff --git a/app-admin/conky/conky-1.6.2_pre1347.ebuild b/app-admin/conky/conky-1.6.2_pre1347.ebuild
new file mode 100644
index 000000000000..dff6e0c34a55
--- /dev/null
+++ b/app-admin/conky/conky-1.6.2_pre1347.ebuild
@@ -0,0 +1,134 @@
+# 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_pre1347.ebuild,v 1.1 2008/12/20 02:51:14 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 moc 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 moc) \
+		$(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
+}