Add conky_no_x11.conf from upstream git to fix compilation without X.

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 63 insertions, 2 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 0e7eba7ec591..01548543c24b 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
 # 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.111 2009/07/11 08:48:51 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.112 2009/07/11 11:03:18 billie Exp $
+
+  11 Jul 2009; Pielmeier Daniel <billie@gentoo.org>
+  +files/conky_no_x11.conf, conky-1.7.1.1.ebuild:
+  Add conky_no_x11.conf from upstream git to fix compilation without X.
 
 *conky-1.7.1.1 (11 Jul 2009)
 
diff --git a/app-admin/conky/conky-1.7.1.1.ebuild b/app-admin/conky/conky-1.7.1.1.ebuild
index 6b26af02218c..282f6e90de32 100644
--- a/app-admin/conky/conky-1.7.1.1.ebuild
+++ b/app-admin/conky/conky-1.7.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.1 2009/07/11 08:48:51 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.7.1.1.ebuild,v 1.2 2009/07/11 11:03:18 billie Exp $
 
 EAPI="2"
 
@@ -45,6 +45,10 @@ DEPEND="
 	dev-util/pkgconfig
 	"
 
+src_prepare() {
+	cp "${FILESDIR}"/conky_no_x11.conf data/
+}
+
 src_configure() {
 	local myconf
 	if use X; then
diff --git a/app-admin/conky/files/conky_no_x11.conf b/app-admin/conky/files/conky_no_x11.conf
new file mode 100644
index 000000000000..29216dc3e731
--- /dev/null
+++ b/app-admin/conky/files/conky_no_x11.conf
@@ -0,0 +1,53 @@
+# Conky, a system monitor, based on torsmo
+#
+# Any original torsmo code is licensed under the BSD license
+#
+# All code written since the fork of torsmo is licensed under the GPL
+#
+# Please see COPYING for details
+#
+# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
+# Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+# All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+background no
+cpu_avg_samples 2
+net_avg_samples 2
+no_buffers yes
+out_to_console no
+out_to_stderr no
+update_interval 1.0
+uppercase no
+use_spacer none
+
+TEXT
+${scroll 16 $nodename - $sysname $kernel on $machine | }
+Uptime: $uptime
+Frequency (in MHz): $freq
+Frequency (in GHz): $freq_g
+RAM Usage: $mem/$memmax - $memperc% ${membar 4}
+Swap Usage: $swap/$swapmax - $swapperc% ${swapbar 4}
+CPU Usage: $cpu% ${cpubar 4}
+Processes: $processes  Running: $running_processes
+File systems:
+ / ${fs_used /}/${fs_size /} ${fs_bar 6 /}
+Networking:
+Up: ${upspeed eth0}  - Down: ${downspeed eth0}
+Name              PID   CPU%   MEM%
+ ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
+ ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
+ ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
+ ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}