version bump thanks to brenden - bug #109232

Package-Manager: portage-2.0.53_rc3

7 files changed, 38 insertions, 97 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 3ddf9095f7d8..21367853a7d5 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.8 2005/09/12 22:10:21 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.9 2005/10/17 19:21:31 dragonheart Exp $
+
+*conky-1.3.2 (17 Oct 2005)
+
+  17 Oct 2005; Daniel Black <dragonheart@gentoo.org> -conky-1.1.ebuild,
+  -conky-1.2.ebuild, +conky-1.3.2.ebuild:
+  version bump thanks to brenden - bug #109232
 
 *conky-1.3.1 (12 Sep 2005)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index bafb81e25005..6c86966921d2 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cee39c72c9b27c9017c8d56c77429240 conky-1.2.ebuild 1940
-MD5 32bd4230c3ee12a8d5502d4bd57a9a3d metadata.xml 588
-MD5 050f1d3a0b290fe5c3efa965d5d445e9 conky-1.1.ebuild 1699
-MD5 0a902d2311b3998c7296d637e3e4b8b5 ChangeLog 1419
+MD5 64d92746b3b5755e7460863140c3ccfc ChangeLog 1609
 MD5 15c860c244cb942a93b3d426e50c99c9 conky-1.3.0.ebuild 2034
 MD5 199085e7a8ed12031f881663a3c100d1 conky-1.3.1.ebuild 2019
-MD5 4d0383c72f80917243ad608fb5cfaded files/digest-conky-1.2 62
-MD5 fba84f081179467be732edff57fb09a8 files/digest-conky-1.1 62
+MD5 cb56f0b6b72f5dbe973cd821a333f9a3 conky-1.3.2.ebuild 2035
 MD5 50640cfe7f4aa4c127c6ff3100560e1d files/digest-conky-1.3.0 64
 MD5 31acfc146c31ba015fb9b8643deb2d57 files/digest-conky-1.3.1 64
+MD5 f2790a5c3e6e3b87339b64a077afafe4 files/digest-conky-1.3.2 64
+MD5 32bd4230c3ee12a8d5502d4bd57a9a3d metadata.xml 588
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDJfzbmdTrptrqvGERAiEuAJ9/1yL9kPSNy18E/rW2U3MmsnMNrwCfXV+O
-uQ8U3IwuZkR39zXhAfTaUis=
-=gkWy
+iD8DBQFDU/nYmdTrptrqvGERArqSAKCLDloGv8wbO+H2dyij/pcF/qFy5wCcCdxJ
+O7K+cSYtVpsivDeFS2ymA8w=
+=cH+L
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.1.ebuild b/app-admin/conky/conky-1.1.ebuild
deleted file mode 100644
index 7ab72157fb88..000000000000
--- a/app-admin/conky/conky-1.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.1.ebuild,v 1.1 2005/07/06 09:34:36 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="minimalist system monitor for X based on torsmo"
-HOMEPAGE="http://conky.rty.ca"
-SRC_URI="http://conky.rty.ca/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="truetype seti"
-
-RDEPEND="virtual/libc
-	virtual/x11
-	truetype? ( >=media-libs/freetype-2 )
-	seti? ( sci-astronomy/setiathome )"
-
-DEPEND="truetype? ( >=media-libs/freetype-2 )
-	virtual/x11
-	>=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"
-	econf \
-		${myconf} \
-		$(use_enable truetype xft) \
-	$(use_enable seti) || 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/conky-1.2.ebuild b/app-admin/conky/conky-1.3.2.ebuild
index c4c46b1d452c..cc8ed22ca823 100644
--- a/app-admin/conky/conky-1.2.ebuild
+++ b/app-admin/conky/conky-1.3.2.ebuild
@@ -1,64 +1,58 @@
 # 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.2 2005/08/10 19:07:50 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.3.2.ebuild,v 1.1 2005/10/17 19:21:31 dragonheart Exp $
 
 inherit eutils
 
 DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.rty.ca"
+HOMEPAGE="http://conky.sf.net"
 SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="truetype seti metar"
+IUSE="truetype seti X"
 
 DEPEND_COMMON="
 	virtual/libc
-	virtual/x11
-	truetype? ( >=media-libs/freetype-2 )
-	!amd64? (
-			metar? ( dev-libs/mdsplib )
+	X? (
+		virtual/x11
+		truetype? ( >=media-libs/freetype-2 )
 	)"
 
-#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-devel/automake-1.9
+	>=sys-devel/autoconf-2.59
+	sys-devel/libtool
 	sys-apps/grep
 	sys-apps/sed
-	sys-devel/gcc
-	>=sys-process/procps-3.2.5"
+	sys-devel/gcc"
 
 
 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
+	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime
+	--enable-mpd --enable-mldonkey"
 	econf \
 		${myconf} \
 		$(use_enable truetype xft) \
-		$(use_enable seti) \
-		$(use_enable metar) || die "econf failed"
+		$(use_enable X x11) \
+		$(use_enable seti) || die "econf failed"
 	emake || die "compile failed"
 }
 
 src_install() {
 	emake DESTDIR=${D} install || die "make install failed"
-	dodoc ChangeLog AUTHORS README conkyrc.sample
+	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 'Default configuration file is "~/.conkyrc"'
 	einfo "you can find a sample configuration file in"
 	einfo "/usr/share/doc/${PF}/conkyrc.sample.gz"
 	einfo
@@ -66,10 +60,15 @@ pkg_postinst() {
 	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 "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."
+	ewarn
+	ewarn "Please note that METAR support has been removed since 1.2"
+	ewarn
 }
diff --git a/app-admin/conky/files/digest-conky-1.1 b/app-admin/conky/files/digest-conky-1.1
deleted file mode 100644
index c17a313a14df..000000000000
--- a/app-admin/conky/files/digest-conky-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42ebf9d66a7ce21779f8f78f69a9d2ec conky-1.1.tar.bz2 112699
diff --git a/app-admin/conky/files/digest-conky-1.2 b/app-admin/conky/files/digest-conky-1.2
deleted file mode 100644
index 0a7bb39dcdeb..000000000000
--- a/app-admin/conky/files/digest-conky-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ac197caa27914f4c47e24d5bdf8510e8 conky-1.2.tar.bz2 132171
diff --git a/app-admin/conky/files/digest-conky-1.3.2 b/app-admin/conky/files/digest-conky-1.3.2
new file mode 100644
index 000000000000..ff80a883a6da
--- /dev/null
+++ b/app-admin/conky/files/digest-conky-1.3.2
@@ -0,0 +1 @@
+MD5 eccf28a73abf88c398697a3affaaf046 conky-1.3.2.tar.bz2 316882