Version bump.

3 files changed, 137 insertions, 13 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 8fc84fc5c78e..eaa691078518 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.109 2009/03/09 22:24:17 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.110 2009/03/17 01:22:09 omp Exp $
+
+*conky-1.7.0_rc1 (17 Mar 2009)
+
+  17 Mar 2009; David Shakaryan <omp@gentoo.org> +conky-1.7.0_rc1.ebuild:
+  Version bump.
 
   09 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> conky-1.6.1.ebuild,
   conky-1.6.2_pre1355.ebuild:
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index b525a8640805..86bc30944c04 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX conky-1.6.1-stdio.patch 299 RMD160 d4c5358424bb937deb60273738f20716fe4bd2a6 SHA1 cb9d97f56d150462628f1a5530d8c90a0ba0d01c SHA256 45dc2a627aa4ee0f41d467b666987bb33b58c3a7eed93fa5ab71e8cc23e7c299
 DIST conky-1.6.1.tar.bz2 442180 RMD160 db9ed1cddd03711358f707f16f27d459a3b9387b SHA1 1f10d7b96f61636ffc14d2b9962c6d70aaf1c1f8 SHA256 e4acdd61e6971b7bf194c673828ef6de09f82abb95d3ece6e37e7eafab23b063
-DIST conky-1.6.2_pre1355.tar.bz2 473037 RMD160 4801346bdc526b18a26a684c087793df958883c8 SHA1 0565b59fc00664d7c5064181716a4fd990a5c203 SHA256 471cc67891fd5726fc04b6b2d05f2da40c6b5ee349c9ee2af6312891a2d4c9f5
+DIST conky-1.7.0_rc1.tar.bz2 482399 RMD160 a5f35b5f1a54a1f0095a12743620b28480ba2f95 SHA1 cbc563bf1d0ad6d4e0ecf70c64d4bffe2d23a84b SHA256 79722bafc987a42930b564962d4637cc3c4e517b5f979f4d470c825958022bbe
 EBUILD conky-1.6.1.ebuild 3566 RMD160 8516572e6f2bb24eb6d317f6e2396787dbebe963 SHA1 ef4ff057e443a8a27c07c2bb4a806bba5243a179 SHA256 75dbb536ee974fbf8a9cb411391ed144b38c70fcafff4328370f424bc8268a19
-EBUILD conky-1.6.2_pre1355.ebuild 3490 RMD160 f23fae9598551ad8d56e48f3edb8ad21fb6da342 SHA1 87438d11ed27582e563eead5d656ada42c135aa6 SHA256 9641bba2546698c269bda642d968b9ff61e3e3f6a723ee23c094b549dde03ec7
+EBUILD conky-1.7.0_rc1.ebuild 3505 RMD160 f2b11dd768d08e3eb3931eec949c88f991b14fbc SHA1 9a4cdd37172ae75fd999728b6adca2dd22209d8a SHA256 324330f51b3dac3181c7ad5af29294c25bc74e45e0f214ec4d708338b26b042e
 MISC ChangeLog 16519 RMD160 d941d04b34a11e717d326052a904ec8437229f5b SHA1 bbc4a312ea8d21e94af57b5e3a61a7643ada658e SHA256 0551814aac6b32952fdfb4055589947c8a9d3919a7e108ace3c124b690ffc36c
 MISC metadata.xml 1325 RMD160 1214f29dc5bd4c5e34278b7bc1fdc41c282f09ac SHA1 0f7d6cc5c2adb768dcd54a20b79d1cf9e43b1f0f SHA256 0e5dd4c28282fcfbf5e4aab9c7dcf6decee2ad06327d6766c2247ea53d9ae5d4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm1l34ACgkQcxLzpIGCsLQKXQCdEP0O1F1VZ3fIvqzLfV8Zy1Zn
-kfYAnRJu/So3VgfHvuO7w9itF6i03X/m
-=WDen
------END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.7.0_rc1.ebuild b/app-admin/conky/conky-1.7.0_rc1.ebuild
new file mode 100644
index 000000000000..235e82654693
--- /dev/null
+++ b/app-admin/conky/conky-1.7.0_rc1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.0_rc1.ebuild,v 1.1 2009/03/17 01:22:09 omp Exp $
+
+EAPI="2"
+
+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="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="audacious bmpx debug hddtemp ibm ipv6 moc mpd nano-syntax nvidia rss truetype vim-syntax wifi X"
+
+DEPEND_COMMON="
+	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.5 )
+		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
+	)"
+
+src_configure() {
+	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 ibm) \
+		$(use_enable moc) \
+		$(use_enable mpd) \
+		$(use_enable nvidia) \
+		$(use_enable rss) \
+		$(use_enable wifi wlan) \
+		$(use_enable !ipv6 portmon) || die "econf failed"
+}
+
+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
+
+	emake ${mymake} || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog AUTHORS README || die
+	dohtml doc/docs.html doc/config_settings.html doc/variables.html || die
+
+	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
+}