version bump bug #126008. dependency fix bug #125226

(Portage version: 2.1_pre7-r5)

5 files changed, 130 insertions, 19 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index a611cb06f2d6..a2b192f33b2c 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.25 2006/03/25 01:46:55 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.26 2006/04/11 20:34:50 dragonheart Exp $
+
+*conky-1.4.1 (11 Apr 2006)
+
+  11 Apr 2006; Daniel Black <dragonheart@gentoo.org> conky-1.4.0-r1.ebuild,
+  +conky-1.4.1.ebuild:
+  version bump bug #126008 thanks Brenden and Philip
+
+  11 Apr 2006; Daniel Black <dragonheart@gentoo.org> conky-1.4.0-r1.ebuild:
+  dependency fix thanks to Diego and Philip bug #125226
 
   25 Mar 2006; Luis Medinas <metalgod@gentoo.org> conky-1.4.0-r1.ebuild:
   Stable on amd64. Bug #122079.
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 1428724292aa..535dcf15e15f 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,18 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ddba5025d4f3ccc6954153494d5aea89 ChangeLog 4415
-RMD160 8fd2f5fc1fe2ab80b8792ba1e0ca15cc6712d17f ChangeLog 4415
-SHA256 e1b43ae5077f72813049040200004578528fca69b8bc4eebf5ae0f3b716284c1 ChangeLog 4415
+MD5 6b0b35e29440f3658ea3911dfb84cebf ChangeLog 4548
+RMD160 6e5723ef6a9024746ecddadc879c72c35f71a6e9 ChangeLog 4548
+SHA256 26d5c43b5ede9b1afb9826227437b6143f6962d046448a29a6f9e40d9b81046f ChangeLog 4548
 MD5 daec6353bf84e62c4edd4d82d00cd350 conky-1.3.4-r2.ebuild 2662
 RMD160 cb44f4d794c053ce408b57c4efadb8ada3239204 conky-1.3.4-r2.ebuild 2662
 SHA256 a5f19b74b6edcbf2b1e307239add9960b8e2b3e01f8f32e1da90e2cc79ab1736 conky-1.3.4-r2.ebuild 2662
 MD5 18290bbc2ed560becdfe5c1eed21f28a conky-1.3.5-r1.ebuild 2247
 RMD160 a37dedf494b4b89e7656a175590b4b971fa2e6f0 conky-1.3.5-r1.ebuild 2247
 SHA256 b59fc2bfcf438818650a43063a569d69e927cb040f52bb24c812bd22b4c37222 conky-1.3.5-r1.ebuild 2247
-MD5 e27a284aebf4ca3050727c5664470421 conky-1.4.0-r1.ebuild 2588
-RMD160 a7697e68a4e1978124140fb1165d23ee87133522 conky-1.4.0-r1.ebuild 2588
-SHA256 cb3f4fb2f1a5db3e360fcdb0468907c439172e241de480908aff9ac049883131 conky-1.4.0-r1.ebuild 2588
+MD5 cabe81d77a2503fe278bec1ef4af3a4a conky-1.4.0-r1.ebuild 2554
+RMD160 5ddd144c3d3e5707b95f6965daf9889108b39692 conky-1.4.0-r1.ebuild 2554
+SHA256 b8c65039e05a83e91721b210e6a55e69337d43e061491f6ee9ba66fae26eec32 conky-1.4.0-r1.ebuild 2554
+MD5 7a37ebd199721a6ae48b4180561c455f conky-1.4.1.ebuild 2492
+RMD160 464f9058a6280de5c53a17098bc239e320ef560c conky-1.4.1.ebuild 2492
+SHA256 684f141058cad3a69be9517dca98d6cc57f8efc8bfca61ece689396d4516f8bc conky-1.4.1.ebuild 2492
 MD5 d9296cc5c3fc007026e784f5825b153e files/conky-1.3.4-arraybounds.patch 1560
 RMD160 dcb1c9b195a03e19b2e477dbc149228930588b52 files/conky-1.3.4-arraybounds.patch 1560
 SHA256 4d1eb88c938305b680e4880a8b0f34264b72d4083ce660ef8afdaead8a752710 files/conky-1.3.4-arraybounds.patch 1560
@@ -28,16 +28,12 @@ SHA256 4b2c1d690aafb4a33771921f6425cdb31ca0fd8bb57a839b7ce6bda1d2aeb7c3 files/di
 MD5 dd1c99f09b0ec583eadca05832f8c5ea files/digest-conky-1.4.0-r1 238
 RMD160 4743c690e8a6d5923fd3a83d25c1f021549978cb files/digest-conky-1.4.0-r1 238
 SHA256 61e0266fd2231aa366ed5009e12d8667da17bc789f026bf0dd082af02853261f files/digest-conky-1.4.0-r1 238
+MD5 bb654fedea893b35ec7677d0dd6e1912 files/digest-conky-1.4.1 238
+RMD160 576e0ac8989b47af56c33f02bf634fac1f72b230 files/digest-conky-1.4.1 238
+SHA256 97f947b3bba8cb1c747b19c99b6a4500e7b6acaa709e667c8919564669872109 files/digest-conky-1.4.1 238
 MD5 5d84594f42f7e10ad9b8a6bf8617b5bd files/portmon-mpd.patch 7143
 RMD160 fe1ccafec1903de6c9b1db99e8278c06c86be2c9 files/portmon-mpd.patch 7143
 SHA256 6952b4756e2d59d34d00896b6e1a53d6514993dd0b53312c9b464ac9ba91b4b8 files/portmon-mpd.patch 7143
 MD5 32bd4230c3ee12a8d5502d4bd57a9a3d metadata.xml 588
 RMD160 b40ff9a4903b330dcef016836e32f78709f10d0a metadata.xml 588
 SHA256 6cf91473c528b64d87041a3088f4930e270349ebdebd3c6dca06dc4943370b5a metadata.xml 588
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEJKDZwUpWvClEHQoRAnqbAJ937cC3oEgYHSvtiqwngH3ZNcG3XwCghN3N
-KjLi4MB0VfaiRtQKXfLRNR0=
-=fxuI
------END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.4.0-r1.ebuild b/app-admin/conky/conky-1.4.0-r1.ebuild
index 973ad0d2dbd6..af941a1062ad 100644
--- a/app-admin/conky/conky-1.4.0-r1.ebuild
+++ b/app-admin/conky/conky-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.0-r1.ebuild,v 1.5 2006/03/25 01:46:55 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.0-r1.ebuild,v 1.6 2006/04/11 20:34:50 dragonheart Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ DEPEND_COMMON="
 		)
 		truetype? ( >=media-libs/freetype-2 )
 		audacious? ( media-sound/audacious )
-		infopipe? ( || ( media-plugins/bmp-infopipe media-plugins/xmms-infopipe ) )
+		infopipe? ( media-plugins/xmms-infopipe )
 		xmms? ( media-sound/xmms )
 	)"
 
diff --git a/app-admin/conky/conky-1.4.1.ebuild b/app-admin/conky/conky-1.4.1.ebuild
new file mode 100644
index 000000000000..898aaba3a703
--- /dev/null
+++ b/app-admin/conky/conky-1.4.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.1.ebuild,v 1.1 2006/04/11 20:34:50 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
+HOMEPAGE="http://conky.sf.net"
+SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="truetype X ipv6 bmpx bmp xmms infopipe audacious"
+
+DEPEND_COMMON="
+	virtual/libc
+	X? (
+		|| ( ( x11-libs/libICE
+				x11-libs/libXext
+				x11-libs/libX11
+				x11-libs/libSM
+				x11-libs/libXrender
+				x11-libs/libXft
+				)
+				virtual/x11
+		)
+		truetype? ( >=media-libs/freetype-2 )
+		bmpx? ( media-sound/bmpx
+				>=sys-apps/dbus-0.35
+			)
+		bmp? ( media-sound/beep-media-player )
+		audacious? ( media-sound/audacious )
+		infopipe? ( media-plugins/xmms-infopipe )
+		xmms? ( media-sound/xmms )
+	)"
+
+RDEPEND="${DEPEND_COMMON}"
+
+DEPEND="
+	${DEPEND_COMMON}
+	X? (
+		|| ( ( x11-libs/libXt
+				x11-proto/xextproto
+				x11-proto/xproto
+				)
+				virtual/x11
+		)
+	)
+	sys-apps/grep
+	sys-apps/sed"
+
+
+src_compile() {
+	local mymake
+	if useq ipv6 ; then
+		ewarn
+		ewarn "You have the ipv6 USE flag enabled.  Please note that"
+		ewarn "using the ipv6 USE flag with Conky disables the port"
+		ewarn "monitor."
+		ewarn
+		epause
+	else
+		mymake="MPD_NO_IPV6=noipv6"
+	fi
+	local myconf
+	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime \
+		--enable-mpd --enable-mldonkey"
+	econf \
+		${myconf} \
+		$(use_enable truetype xft) \
+		$(use_enable X x11) \
+		$(use_enable bmpx) \
+		$(use_enable bmp) \
+		$(use_enable xmms) \
+		$(use_enable audacious) \
+		$(use_enable infopipe) \
+		$(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 doc/conkyrc.sample doc/variables.html
+	dodoc doc/docs.html doc/config_settings.html
+}
+
+pkg_postinst() {
+	einfo 'Default configuration file is "~/.conkyrc"'
+	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 "There are also pretty html docs available"
+	einfo "on Conky's site or in /usr/share/doc/${PF}"
+	einfo
+	einfo "Check out app-vim/conky-syntax for conkyrc"
+	einfo "syntax highlighting in Vim"
+	einfo
+}
diff --git a/app-admin/conky/files/digest-conky-1.4.1 b/app-admin/conky/files/digest-conky-1.4.1
new file mode 100644
index 000000000000..dccf6d176a53
--- /dev/null
+++ b/app-admin/conky/files/digest-conky-1.4.1
@@ -0,0 +1,3 @@
+MD5 14227017a9fbd11b413990793d3783bb conky-1.4.1.tar.bz2 364106
+RMD160 c8a20d9331e363a05b3a233ff2a4d4dbf875e1c0 conky-1.4.1.tar.bz2 364106
+SHA256 ea12650dfe96bec612fa0185f3191bd882a7381d80726ef510f113ce226f3e40 conky-1.4.1.tar.bz2 364106