conky patch that fixes bug #278343

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 140 insertions, 2 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index f61a5bb82ae4..3e1c9e522f6d 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,12 @@
 # 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.114 2009/07/14 20:39:42 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.115 2009/07/19 20:33:10 wired Exp $
+
+*conky-1.7.1.1-r1 (19 Jul 2009)
+
+  19 Jul 2009; Alex Alexander <wired@gentoo.org> +conky-1.7.1.1-r1.ebuild,
+  +files/conky-1.7.1.1-comment.patch:
+  added patch that fixes \# in TEXT. bug #278343
 
   14 Jul 2009; Pielmeier Daniel <billie@gentoo.org> metadata.xml:
   Document the ipv6 use flag.
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index fcfa814f238a..d27e4a6112d8 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,10 +1,12 @@
 AUX conky-1.6.1-stdio.patch 299 RMD160 d4c5358424bb937deb60273738f20716fe4bd2a6 SHA1 cb9d97f56d150462628f1a5530d8c90a0ba0d01c SHA256 45dc2a627aa4ee0f41d467b666987bb33b58c3a7eed93fa5ab71e8cc23e7c299
+AUX conky-1.7.1.1-comment.patch 296 RMD160 79252610420abda967587eae39e79f20d167793b SHA1 1505289ca142d44146f20d7585e61a2d2419b1c4 SHA256 c263cb4a412a81e1544b9063cd6e9714e19a889eeffebf8a24900a02a38968b2
 AUX conky_no_x11.conf 1848 RMD160 33ffedf5ebdeb521e6cf7d42c2b349d24d732549 SHA1 0f4c2e5c171c026c51872509554d94c0b65cc16a SHA256 e67c0916aa123722ca38a5e2215e72d5506334eb5fcc6352368c3517aa804157
 DIST conky-1.6.1.tar.bz2 442180 RMD160 db9ed1cddd03711358f707f16f27d459a3b9387b SHA1 1f10d7b96f61636ffc14d2b9962c6d70aaf1c1f8 SHA256 e4acdd61e6971b7bf194c673828ef6de09f82abb95d3ece6e37e7eafab23b063
 DIST conky-1.7.0_rc1.tar.bz2 482399 RMD160 a5f35b5f1a54a1f0095a12743620b28480ba2f95 SHA1 cbc563bf1d0ad6d4e0ecf70c64d4bffe2d23a84b SHA256 79722bafc987a42930b564962d4637cc3c4e517b5f979f4d470c825958022bbe
 DIST conky-1.7.1.1.tar.bz2 512566 RMD160 b3c52919bcb035a0c065b30345d2a02ed208a766 SHA1 e8a5a814c156b17aa32614e77a25389e00f1cf02 SHA256 aa7277c01dc5da407f12b27ae4d6b6ab72f24667d60818e9be28e7bdf26cd3ca
 EBUILD conky-1.6.1.ebuild 3567 RMD160 e203f8f415052f043ede24e6b9d7e9880fe43be3 SHA1 503d487ef4e2d14533121088081f234735f4b143 SHA256 2d0f4b19c8627ed501488d1605c62105004f37a10b584ff6337bc983ef4eba96
 EBUILD conky-1.7.0_rc1.ebuild 3494 RMD160 0fca2291a291e0b4c7f24fc1ab18da66b242a885 SHA1 796757364ed488055c8a3e6aeab582644bc21b8b SHA256 26b34f8ad07940a9e879275dab037feb323a9784a2d87187467053518edda6f2
+EBUILD conky-1.7.1.1-r1.ebuild 3434 RMD160 f0e0254de55d9ad43d6baa98e23d7336d050e4e1 SHA1 5c64af951feab7cfaaff8c0f7db13f3caf965d54 SHA256 931c50e97c64a5d827f6ede3dc314bb3de150a3a353262e6c09d2b98ad5e55dd
 EBUILD conky-1.7.1.1.ebuild 3373 RMD160 cc958ff80e793c15146315d27e45acaa17d38464 SHA1 46ec3c299ceabd21c566288e05865183e4a586aa SHA256 9a54b1a7798c96c305de792730ea27923bf6a3dc518990e527cca8f96a55ade7
-MISC ChangeLog 17457 RMD160 f73a777f29abb760e976cc6cc0c9408c71b69e18 SHA1 1a71fd9daa41b6dd7d5a14d495e93633682d1318 SHA256 4294a65f23f8717998343d8c84b468802a8ce5e86eb25c62fefd30ff66d68e1a
+MISC ChangeLog 17652 RMD160 d64d30033587c4f5b2c3c89c53c261b0881370bd SHA1 9c9bb91e078c63a3769110e6f5edeeed2a31d93d SHA256 1f0a4866d04e91f2a7310fc9b060e8bad10ac1403028d7c0f98325305295e8e1
 MISC metadata.xml 1769 RMD160 18c9955d96d33ec72709ed8188801ba3dcb84712 SHA1 ba140be54bd3e23cbbb88553893264b0e38cfc14 SHA256 215c22ee35dabb8799ac03a8e2635978539e18d33edf702173bdfef95bdc7d32
diff --git a/app-admin/conky/conky-1.7.1.1-r1.ebuild b/app-admin/conky/conky-1.7.1.1-r1.ebuild
new file mode 100644
index 000000000000..ebeba9802970
--- /dev/null
+++ b/app-admin/conky/conky-1.7.1.1-r1.ebuild
@@ -0,0 +1,119 @@
+# 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.1.1-r1.ebuild,v 1.1 2009/07/19 20:33:10 wired Exp $
+
+EAPI="2"
+
+inherit eutils
+
+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 ~sparc ~x86"
+IUSE="alsa apcupsd audacious bmpx debug hddtemp imlib lua math moc mpd nano-syntax nvidia openmp +portmon rss thinkpad truetype vim-syntax wifi X"
+
+DEPEND_COMMON="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXext
+		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+		imlib? ( media-libs/imlib2 )
+		nvidia? ( media-video/nvidia-settings )
+	)
+	alsa? ( media-libs/alsa-lib )
+	audacious? ( >=media-sound/audacious-1.5 )
+	bmpx? ( media-sound/bmpx >=sys-apps/dbus-0.35 )
+	portmon? ( dev-libs/glib )
+	lua? ( >=dev-lang/lua-5.1 )
+	openmp? ( >=sys-devel/gcc-4.3[openmp] )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
+	wifi? ( net-wireless/wireless-tools )
+	"
+RDEPEND="
+	${DEPEND_COMMON}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+DEPEND="
+	${DEPEND_COMMON}
+	dev-util/pkgconfig
+	"
+
+src_prepare() {
+	cp "${FILESDIR}"/conky_no_x11.conf data/
+	epatch "${FILESDIR}"/"${P}"-comment.patch
+}
+
+src_configure() {
+	local myconf
+	if use X; then
+		myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
+		myconf="${myconf} --enable-own-window $(use_enable truetype xft)"
+	else
+		myconf="--disable-x11 --disable-own-window"
+	fi
+
+	econf \
+		${myconf} \
+		$(use_enable alsa) \
+		$(use_enable apcupsd) \
+		$(use_enable audacious) \
+		$(use_enable bmpx) \
+		$(use_enable debug) \
+		$(use_enable hddtemp) \
+		$(use_enable imlib imlib2) \
+		$(use_enable lua) \
+		$(use_enable thinkpad ibm) \
+		$(use_enable math) \
+		$(use_enable moc) \
+		$(use_enable mpd) \
+		$(use_enable nvidia) \
+		$(use_enable openmp) \
+		$(use_enable rss) \
+		$(use_enable wifi wlan) \
+		$(use_enable portmon)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog AUTHORS TODO || die "dodoc failed"
+	dohtml doc/docs.html doc/config_settings.html doc/variables.html \
+		|| die "dohtml failed"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die "doins failed"
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim|| die "doins failed"
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc|| die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	elog "You can find a sample configuration file at"
+	elog "${ROOT%/}/etc/conky/conky.conf. To customize, copy"
+	elog "it to ~/.conkyrc and edit it to your liking."
+	elog
+	elog "For more info on Conky's new features please look at"
+	elog "the Changelog in ${ROOT%/}/usr/share/doc/${PF}"
+	elog "There are also pretty html docs available"
+	elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html"
+	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
+}
diff --git a/app-admin/conky/files/conky-1.7.1.1-comment.patch b/app-admin/conky/files/conky-1.7.1.1-comment.patch
new file mode 100644
index 000000000000..ef206cac06f8
--- /dev/null
+++ b/app-admin/conky/files/conky-1.7.1.1-comment.patch
@@ -0,0 +1,11 @@
+--- src/conky.c.old	2009-07-19 22:27:18.514288448 +0300
++++ src/conky.c	2009-07-19 23:12:27.905568398 +0300
+@@ -3264,6 +3264,8 @@
+ 					append_object(retval, obj);
+ 				}
+ 			}
++		} else if (*p == '\\' && *(p+1) == '#') {
++			strfold(p, 1);
+ 		} else if (*p == '#') {
+ 			remove_comment(p);
+ 		}