Version bump per request of Brenden Matthews. (bug #214330)

Package-Manager: portage-2.1.4.4

4 files changed, 172 insertions, 5 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 497dcd1b4aa4..6e58922c9dec 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.68 2008/03/19 07:14:26 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.69 2008/03/27 19:54:42 omp Exp $
+
+*conky-1.5.0 (27 Mar 2008)
+
+  27 Mar 2008; David Shakaryan <omp@gentoo.org>
+  +files/conky-1.5.0-disable-x11.patch, +conky-1.5.0.ebuild:
+  Version bump per request of Brenden Matthews. (bug #214330)
 
   19 Mar 2008; Christian Faulhammer <opfer@gentoo.org>
   conky-1.4.9-r1.ebuild:
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 77ded82784f4..2b49ce5e976e 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
 EBUILD conky-1.4.9-r1.ebuild 3599 RMD160 d70b8f876d104d67a5443a7b30b33513a30b8a3d SHA1 81d97f3ba329276cfdab2eed5828f5af8458d77d SHA256 846f55e1a48f4fd0b2e97335d180556bdbf8de8d6643931e5e0d67e588a8ee0e
-MISC ChangeLog 10799 RMD160 94a791b16bb3842bc2079405c053fc6ad7d1f095 SHA1 93b064e0f61a7b0de0dd4c5c0391b2883d3d0781 SHA256 c4469827992aeb02258341feabc9021af1336e535389e0307d0c1a94ec06e432
+EBUILD conky-1.5.0.ebuild 3763 RMD160 718de0bc830af93c1a7c44cd12087a4512efb30a SHA1 055a98f651d0cdb72bf4bb95fcd693802ab6c129 SHA256 f505b735c858695f876b2e9deaa12ea37d00192193f9d35c1309a945a67e5517
+MISC ChangeLog 10997 RMD160 07f8d3bb55e5a0df9e09110259c993955c4fe790 SHA1 6bbff6a62575e5b5a21869f8b413f5a48bee86b9 SHA256 b1e74e52eb5d6ac45e70c1bc77182f48824245853ba8605c66423fde79369bab
 MISC metadata.xml 569 RMD160 b366c022728c365d2c27ddd7d558e4d7815bd512 SHA1 55b29887fc494ea60ff7e6100c3a85857eabf3a7 SHA256 1cfb216faf8f26ef4032857408246f0addf6fd09e50f0d4f1cb67789b506832b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH4L38NQqtfCuFneMRAuJBAJ9271tO7sbfAoLds7KgXHt0gfa6lQCeJVEl
-JWFtYlNlzNvakRwkMWBtc+8=
-=HCet
+iD8DBQFH6/uNvSApE0uP4UsRAk2fAJ9c+6wC7Cz3kXuxKAI5PsGk/AZV9ACfXBh8
+OyCqCzfbVt/OirHuYCOpEvs=
+=KJhu
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.5.0.ebuild b/app-admin/conky/conky-1.5.0.ebuild
new file mode 100644
index 000000000000..f4ed01de76b7
--- /dev/null
+++ b/app-admin/conky/conky-1.5.0.ebuild
@@ -0,0 +1,136 @@
+# 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.0.ebuild,v 1.1 2008/03/27 19:54:42 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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-disable-x11.patch"
+}
+
+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
+}
diff --git a/app-admin/conky/files/conky-1.5.0-disable-x11.patch b/app-admin/conky/files/conky-1.5.0-disable-x11.patch
new file mode 100644
index 000000000000..10fafc90d9cb
--- /dev/null
+++ b/app-admin/conky/files/conky-1.5.0-disable-x11.patch
@@ -0,0 +1,22 @@
+Index: src/conky.c
+===================================================================
+--- src/conky.c	(revision 1040)
++++ src/conky.c	(revision 1041)
+@@ -127,6 +127,8 @@
+ 	exit(0);
+ }
+ 
++static char *suffixes[] = { "B", "kiB", "MiB", "GiB", "TiB", "PiB", "" };
++
+ #ifdef X11
+ 
+ /* text size */
+@@ -164,8 +166,6 @@
+ static int font_count = -1;
+ struct font_list *fonts = NULL;
+ 
+-static char *suffixes[] = { "B", "kiB", "MiB", "GiB", "TiB", "PiB", "" };
+-
+ #ifdef XFT
+ 
+ #define font_height() (use_xft ? (fonts[selected_font].xftfont->ascent + \