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

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 66 insertions, 4 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/Manifest b/app-admin/conky/Manifest
index 11b1a6ff9879..0655a62c6537 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,9 +1,10 @@
 AUX conky-1.6.1-stdio.patch 299 RMD160 d4c5358424bb937deb60273738f20716fe4bd2a6 SHA1 cb9d97f56d150462628f1a5530d8c90a0ba0d01c SHA256 45dc2a627aa4ee0f41d467b666987bb33b58c3a7eed93fa5ab71e8cc23e7c299
+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.ebuild 3338 RMD160 1855c4104dc57f7a4c3082481a0853d1f7352adf SHA1 54d76746cdef37b62efadeb1f770b0e596291cc7 SHA256 850067ad7f5592e77aa840de52a8301baa745d74e347840133db19a189b69edf
-MISC ChangeLog 17007 RMD160 e031d404a9cb13a23c208282aa0bf1fb72155d4d SHA1 52f192d353d23404793148b096a06c0ee10190b1 SHA256 49ed3ed5b30cd102340bf578b00cfb49b2ca8bc5cdf85aa0272654e018a40fb3
+EBUILD conky-1.7.1.1.ebuild 3399 RMD160 b8813a965a0cfe7317d1b9dc59c4df851d431e63 SHA1 2e5cef34d9ddc674cc7e13edb2083446e628616d SHA256 6109498fba9585f52ab6ec20a16ff2bc9fcc7eeb6155eb2f8a0335be65569b7d
+MISC ChangeLog 17182 RMD160 1918f319d6ba29c95a9b496dad1b74a033c4712b SHA1 c21ea220123f2222677e1f2614363a36309c4cc6 SHA256 9c88810dcdb75314f6142251441e4fbad49853ca77b2db2ddc6ccc52e69d313c
 MISC metadata.xml 1692 RMD160 7cb77ca73eb90dedc3bfb20154a07410f52a4c99 SHA1 da66e9ed5136b013c8e194e7fa20e5cf84b0293a SHA256 4c3dfeb11d4f22ec225514a6d21a9f460cd8415a7dfdb4c72e2b4fff354b3fb6
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}