version bump as per bug #98078. Fixes bug #97947.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 28 insertions, 12 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 0c0413d3f6ef..7d51df28dd1b 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.2 2005/06/22 11:29:17 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.3 2005/07/06 09:34:36 dragonheart Exp $
+
+*conky-1.1 (06 Jul 2005)
+
+  06 Jul 2005; Daniel Black <dragonheart@gentoo.org> -conky-1.0.ebuild,
+  +conky-1.1.ebuild:
+  version bump as per bug #98078. Fixes bug #97947. Thanks to Brenden Matthews
+  and Cole Thompson
 
 *conky-1.0 (22 Jun 2005)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 7710979442e6..d098c421b07b 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 87112e0acd992eac0a08c5f64d0196b7 conky-1.0.ebuild 1371
 MD5 c523644170dfb059ad9924c752d9e3b2 metadata.xml 541
-MD5 a6c9fbc73bcca94c25bec602691bc95d ChangeLog 423
-MD5 a5bba8ea4e2dc8761199eb5a38449eed files/digest-conky-1.0 61
+MD5 050f1d3a0b290fe5c3efa965d5d445e9 conky-1.1.ebuild 1699
+MD5 34ff93f765fcd56a26dbdaa42e2fe112 ChangeLog 642
+MD5 fba84f081179467be732edff57fb09a8 files/digest-conky-1.1 62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCuUukmdTrptrqvGERAqzUAKCRDeQIrkf3AY8ArgMPmePjJ8VpsgCeMW8w
-00na4XWQg7Yn7K+SdxWh1Wk=
-=kgoS
+iD8DBQFCy6XBmdTrptrqvGERAo5BAJ4j3Y933Z/L5KrjOXa1GR6PR5KK1gCeJaOb
+p7okGPPasszkaNTsJscrS38=
+=XkW6
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.0.ebuild b/app-admin/conky/conky-1.1.ebuild
index f39d614ff005..7ab72157fb88 100644
--- a/app-admin/conky/conky-1.0.ebuild
+++ b/app-admin/conky/conky-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.0.ebuild,v 1.1 2005/06/22 11:26:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.1.ebuild,v 1.1 2005/07/06 09:34:36 dragonheart Exp $
 
 inherit eutils
 
@@ -24,13 +24,17 @@ DEPEND="truetype? ( >=media-libs/freetype-2 )
 	sys-devel/autoconf
 	sys-apps/grep
 	sys-apps/sed
-	sys-devel/gcc"
+	sys-devel/gcc
+	>=sys-process/procps-3.2.5"
 
 
 src_compile() {
+	local myconf
+	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime --enable-mpd"
 	econf \
-	   `use_enable truetype xft` \
-	   `use_enable seti` || die "econf failed"
+		${myconf} \
+		$(use_enable truetype xft) \
+	$(use_enable seti) || die "econf failed"
 	emake || die "compile failed"
 }
 
@@ -44,6 +48,11 @@ pkg_postinst() {
 	einfo "you can find a sample configuration file in"
 	einfo "/usr/share/doc/${PF}/conkyrc.sample.gz"
 	einfo
+	einfo "For more info on Conky's new features,"
+	einfo "please look at the README and ChangeLog:"
+	einfo "/usr/share/doc/${PF}/README.gz"
+	einfo "/usr/share/doc/${PF}/ChangeLog.gz"
+	einfo
 	einfo "Comment out temperature info lines if you have no kernel"
 	einfo "support for it."
 	einfo
diff --git a/app-admin/conky/files/digest-conky-1.0 b/app-admin/conky/files/digest-conky-1.0
deleted file mode 100644
index 75a3a78711f1..000000000000
--- a/app-admin/conky/files/digest-conky-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b662ba95c6cea1345353889b80b61ee conky-1.0.tar.bz2 70711
diff --git a/app-admin/conky/files/digest-conky-1.1 b/app-admin/conky/files/digest-conky-1.1
new file mode 100644
index 000000000000..c17a313a14df
--- /dev/null
+++ b/app-admin/conky/files/digest-conky-1.1
@@ -0,0 +1 @@
+MD5 42ebf9d66a7ce21779f8f78f69a9d2ec conky-1.1.tar.bz2 112699