version bump bug #101604

(Portage version: 2.0.51.22-r2)

5 files changed, 93 insertions, 13 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 7d51df28dd1b..e26123bd82d6 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,12 @@
 # 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.3 2005/07/06 09:34:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.4 2005/08/07 09:32:27 dragonheart Exp $
+
+*conky-1.2 (07 Aug 2005)
+
+  07 Aug 2005; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  +conky-1.2.ebuild:
+  version bump thanks to Brenden Matthews bug #101604
 
 *conky-1.1 (06 Jul 2005)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index d098c421b07b..d9db1282803a 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c523644170dfb059ad9924c752d9e3b2 metadata.xml 541
+MD5 1df498fa629ec6c784245ab9079031b9 conky-1.2.ebuild 1963
+MD5 32bd4230c3ee12a8d5502d4bd57a9a3d metadata.xml 588
 MD5 050f1d3a0b290fe5c3efa965d5d445e9 conky-1.1.ebuild 1699
 MD5 34ff93f765fcd56a26dbdaa42e2fe112 ChangeLog 642
+MD5 9ea3ccd9bf37ef4b760e4c1309b0b100 files/digest-conky-1.2 62
 MD5 fba84f081179467be732edff57fb09a8 files/digest-conky-1.1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCy6XBmdTrptrqvGERAo5BAJ4j3Y933Z/L5KrjOXa1GR6PR5KK1gCeJaOb
-p7okGPPasszkaNTsJscrS38=
-=XkW6
------END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.2.ebuild b/app-admin/conky/conky-1.2.ebuild
new file mode 100644
index 000000000000..2d2be1c4a884
--- /dev/null
+++ b/app-admin/conky/conky-1.2.ebuild
@@ -0,0 +1,77 @@
+# 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.2.ebuild,v 1.1 2005/08/07 09:32:27 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
+HOMEPAGE="http://conky.rty.ca"
+SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="truetype seti metar"
+
+DEPEND_COMMON="
+	virtual/libc
+	virtual/x11
+	truetype? ( >=media-libs/freetype-2 )
+	!amd64? (
+		!sparc? (
+			metar? ( dev-libs/mdsplib )
+		)
+	)"
+
+#sparc and am64 awaiting keywords as per bug #99262
+
+
+RDEPEND="${DEPEND_COMMON}
+	seti? ( sci-astronomy/setiathome )"
+
+DEPEND="
+	${DEPEND_COMMON}
+	>=sys-devel/automake-1.4
+	sys-devel/autoconf
+	sys-apps/grep
+	sys-apps/sed
+	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 --enable-mldonkey"
+	if !use amd64 && !use sparc
+	then
+		myconf="${myconf} $(use_enable metar)"
+	fi
+	econf \
+		${myconf} \
+		$(use_enable truetype xft) \
+		$(use_enable seti) \
+		$(use_enable metar) || die "econf failed"
+	emake || die "compile failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "make install failed"
+	dodoc ChangeLog AUTHORS README conkyrc.sample
+}
+
+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
+	einfo "Comment out temperature info lines if you have no kernel"
+	einfo "support for it."
+	einfo
+	ewarn "Conky doesn't work with window managers that"
+	ewarn "take control over root window such as Gnome's nautilus."
+}
diff --git a/app-admin/conky/files/digest-conky-1.2 b/app-admin/conky/files/digest-conky-1.2
new file mode 100644
index 000000000000..06dabfb73470
--- /dev/null
+++ b/app-admin/conky/files/digest-conky-1.2
@@ -0,0 +1 @@
+MD5 f4e446cc5f463f337340a48379baccaa conky-1.2.tar.bz2 132166
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index a97e82b08892..cc30c2b47183 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -5,7 +5,11 @@
 <maintainer>
   <email>dragonheart@gentoo.org</email>
     <name>Daniel Black</name>
-    <description>A user ebuild that I felt obliged to include. Please take over if you want it</description>
+</maintainer>
+<maintainer>
+  <email>brenden@rty.ca</email>
+    <name>Brenden Matthews</name>
+    <description>Upstream author and gentoo user</description>
 </maintainer>
 <longdescription>
 Conky is a system monitor that sits in the corner of your desktop.