version bump, fixes bug 187871

Package-Manager: portage-2.1.2.11

4 files changed, 132 insertions, 9 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 4513462c5ee6..31098bcabb66 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.48 2007/07/22 08:19:13 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.49 2007/08/07 06:56:37 opfer Exp $
+
+*conky-1.4.6 (07 Aug 2007)
+
+  07 Aug 2007; Christian Faulhammer <opfer@gentoo.org> +conky-1.4.6.ebuild:
+  version bump, fixes bug 187871
 
   22 Jul 2007; David Shakaryan <omp@gentoo.org> conky-1.4.5.ebuild:
   Remove virtual/x11 from dependencies.
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index e64e5e92e430..aac3d1a1f58b 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -2,14 +2,19 @@
 Hash: SHA1
 
 DIST conky-1.4.5.tar.bz2 390741 RMD160 7cc3690a78c562e7997e0e6d4b7342246be53d25 SHA1 27a2ae320fb4ced5c3c6873cce418dfe5f3dd369 SHA256 beb77ec55399dfa65f76330ba5ff65873028b24f3a768f4780e965d9bc5fd63b
+DIST conky-1.4.6.tar.bz2 408742 RMD160 4052fb3f99316709d138e90154d1515f61bc143f SHA1 d1d5e0eba97f2abc830c8112587f9abf1d2bde7a SHA256 31146c36fd0b3cb52e06cd01d25bb8a4c7c77d1fcdd00e9fd15db977af0145de
 EBUILD conky-1.4.5.ebuild 2954 RMD160 6d73d90a8ea54cfba9f33acae4bde281f656542f SHA1 ebc86b097d73e14f2dd97cad572531bf9c265d9a SHA256 8f6c4de00e63ffbf62ed8ba91fc2dbb7e5c715f06c24d6da6929e4516c98f0c6
 MD5 e4cb63eef5e9abdf0a21cfda9fab9ad4 conky-1.4.5.ebuild 2954
 RMD160 6d73d90a8ea54cfba9f33acae4bde281f656542f conky-1.4.5.ebuild 2954
 SHA256 8f6c4de00e63ffbf62ed8ba91fc2dbb7e5c715f06c24d6da6929e4516c98f0c6 conky-1.4.5.ebuild 2954
-MISC ChangeLog 8111 RMD160 265525cf2c256a2773caaaf66a49b0f7187a7aca SHA1 18dd180a80086aa3b317a8186acda94f1df7bb63 SHA256 5c26d9cf663404611d56cec5738637785cb6caf7aba347fd1933f33d2aec88ba
-MD5 898afc775f2c06d32405733d320d361d ChangeLog 8111
-RMD160 265525cf2c256a2773caaaf66a49b0f7187a7aca ChangeLog 8111
-SHA256 5c26d9cf663404611d56cec5738637785cb6caf7aba347fd1933f33d2aec88ba ChangeLog 8111
+EBUILD conky-1.4.6.ebuild 2926 RMD160 7439e95f4403743c564f3e01050cc22e23a87e31 SHA1 cd6fc217f03991045d881ccea74e6c4125d62b18 SHA256 d5eeede273c3b4163331d86c36ab5c3b3116ad6c4fd42d37b7d81cb1298d4ed0
+MD5 9d0cff3c4289b70b903c7d0c32f0d3e0 conky-1.4.6.ebuild 2926
+RMD160 7439e95f4403743c564f3e01050cc22e23a87e31 conky-1.4.6.ebuild 2926
+SHA256 d5eeede273c3b4163331d86c36ab5c3b3116ad6c4fd42d37b7d81cb1298d4ed0 conky-1.4.6.ebuild 2926
+MISC ChangeLog 8251 RMD160 824f9c8694cd7b496af97cc4dcabc11ca14847d7 SHA1 fa2ab531de2d29e5471f5ee489f3f02dff17018d SHA256 bbe9f8817e77efdc855aefa1478053f330c3e26775fc1e46ea9c709cf389095d
+MD5 eff02c86ee660865f2b98f5fb8e5493f ChangeLog 8251
+RMD160 824f9c8694cd7b496af97cc4dcabc11ca14847d7 ChangeLog 8251
+SHA256 bbe9f8817e77efdc855aefa1478053f330c3e26775fc1e46ea9c709cf389095d ChangeLog 8251
 MISC metadata.xml 569 RMD160 b366c022728c365d2c27ddd7d558e4d7815bd512 SHA1 55b29887fc494ea60ff7e6100c3a85857eabf3a7 SHA256 1cfb216faf8f26ef4032857408246f0addf6fd09e50f0d4f1cb67789b506832b
 MD5 03a9b5b9e3a071e3a4f6450a3559735b metadata.xml 569
 RMD160 b366c022728c365d2c27ddd7d558e4d7815bd512 metadata.xml 569
@@ -17,10 +22,13 @@ SHA256 1cfb216faf8f26ef4032857408246f0addf6fd09e50f0d4f1cb67789b506832b metadata
 MD5 642549dcaf7c261ab1debd9bb4bab3e8 files/digest-conky-1.4.5 238
 RMD160 098c571e597a6de1ec155fae0803f10e3f70b771 files/digest-conky-1.4.5 238
 SHA256 7a976846714021782708e067dcf2f31e998d33a33523468c79a31f1694409f82 files/digest-conky-1.4.5 238
+MD5 08f12f6c4f5089f3bf77cd1a8cd4625b files/digest-conky-1.4.6 238
+RMD160 0db1d1f7e10fc9b700112eb5a684e3a546ac8bf0 files/digest-conky-1.4.6 238
+SHA256 4e00e17ad56512bd64fcb12d6f98ff7d9de11a3cda49508eb26e8dfa7e581ec3 files/digest-conky-1.4.6 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGoxMPvSApE0uP4UsRAtQHAKCSTYGGZNxjg4vfZ2pbyZd7nq1BqACgmi3V
-sgtnYcaJWDQafGPINxYRn6U=
-=fmZz
+iD8DBQFGuBetNQqtfCuFneMRAlB6AKCCZASMfdJArqmP2EH5N3fCH7meDwCfREy+
+0ztgBU+dlHTgswUrxGIo58E=
+=uxC8
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.4.6.ebuild b/app-admin/conky/conky-1.4.6.ebuild
new file mode 100644
index 000000000000..2d726348e935
--- /dev/null
+++ b/app-admin/conky/conky-1.4.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.6.ebuild,v 1.1 2007/08/07 06:56:37 opfer Exp $
+
+inherit eutils
+# used for epause
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="http://conky.sf.net"
+SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="audacious bmpx hddtemp ipv6 mpd truetype vim-syntax 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-0.1 )
+		bmpx? ( media-sound/bmpx
+				>=sys-apps/dbus-0.35
+			)
+	)
+	!ipv6? ( >=dev-libs/glib-2.0 )"
+RDEPEND="${DEPEND_COMMON}
+	hddtemp? ( app-admin/hddtemp )
+	vim-syntax? ( || ( app-editors/vim
+	app-editors/gvim ) )"
+
+DEPEND="
+	${DEPEND_COMMON}
+	X? (
+		x11-libs/libXt
+		x11-proto/xextproto
+		x11-proto/xproto
+	)"
+
+src_compile() {
+	local mymake
+	if useq ipv6 ; then
+		ewarn
+		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 hddtemp ) \
+		$(use_enable mpd) \
+		$(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 doc/conkyrc.sample
+	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
+}
+
+pkg_postinst() {
+	elog 'Default configuration file is "~/.conkyrc"'
+	elog "You can find a sample configuration file in"
+	elog "/usr/share/doc/${PF}/conkyrc.sample.gz"
+	elog
+	elog "For more info on Conky's new features,"
+	elog "please look at the README and ChangeLog:"
+	elog "/usr/share/doc/${PF}/README.gz"
+	elog "/usr/share/doc/${PF}/ChangeLog.gz"
+	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"
+	elog
+}
diff --git a/app-admin/conky/files/digest-conky-1.4.6 b/app-admin/conky/files/digest-conky-1.4.6
new file mode 100644
index 000000000000..64b3b918152c
--- /dev/null
+++ b/app-admin/conky/files/digest-conky-1.4.6
@@ -0,0 +1,3 @@
+MD5 fdada1c19d7349de8929414302575983 conky-1.4.6.tar.bz2 408742
+RMD160 4052fb3f99316709d138e90154d1515f61bc143f conky-1.4.6.tar.bz2 408742
+SHA256 31146c36fd0b3cb52e06cd01d25bb8a4c7c77d1fcdd00e9fd15db977af0145de conky-1.4.6.tar.bz2 408742