Remove older version.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.24-gentoo-r3 x86_64

3 files changed, 15 insertions, 133 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 9c5cef2e8626..1106a251b7cc 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.89 2008/08/24 11:46:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.90 2008/08/25 07:31:07 omp Exp $
+
+  25 Aug 2008; David Shakaryan <omp@gentoo.org> -conky-1.4.9-r1.ebuild:
+  Remove older version.
 
   24 Aug 2008; Markus Rothe <corsair@gentoo.org> conky-1.5.1.ebuild:
   Stable on ppc64; bug #234757
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 916c23708855..48ea5aca4936 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,8 +1,16 @@
-DIST conky-1.4.9.tar.bz2 412510 RMD160 d708ea0eae60cf1c1ca4d176fa20f8a464b803e1 SHA1 26f233588ea83b157729bb7dd56a64ffae856d20 SHA256 a6c98aa34932c8684e19e97fad460c04c2b7848c897bdaa293d37fbcc4d7949b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST conky-1.5.1.tar.bz2 422965 RMD160 83458b7da66e3166dec24c2f8292201761e635f5 SHA1 fe6f0e3440fe9d18afe31ec0cacfa5b38042532a SHA256 ca8b1dbc87e7c2c44d06f70e2b195f59ae8b09f8d490cc92cfac8df10f7bc239
 DIST conky-1.6.1.tar.bz2 442180 RMD160 db9ed1cddd03711358f707f16f27d459a3b9387b SHA1 1f10d7b96f61636ffc14d2b9962c6d70aaf1c1f8 SHA256 e4acdd61e6971b7bf194c673828ef6de09f82abb95d3ece6e37e7eafab23b063
-EBUILD conky-1.4.9-r1.ebuild 3618 RMD160 57b6229b5d5ea114ae616767cd155a7e741f5fa4 SHA1 7805731cd1f069ab2f70602a95bd94f114421aa4 SHA256 c05d1cccdb2149577a5df5c3bf9445e99cc12f2504f57b9cfdc9649a0ade64ad
 EBUILD conky-1.5.1.ebuild 3694 RMD160 2c823889731cb5544550bad6a136a385ddf5ebb7 SHA1 c18e333296b90d8841d7a443fba9effc8a8045fb SHA256 88149cdc38173cf872ce59a9c392de01db8c6f3b4d0b72ea27fdd8c11b6ff12c
 EBUILD conky-1.6.1.ebuild 3701 RMD160 649e403a65c32ae8801d8ee5ee08bdc4583d1811 SHA1 6f8cc41f1b676d489f1873df318afd7bc05cb59c SHA256 697537bfb408f7ffe30439680afb180ebfbcf6beed967fb04f8f5c13deb073c7
-MISC ChangeLog 13687 RMD160 8cb5115a789dc56ca36e4b40598b2ce0eb51649f SHA1 0b58ed12d67a2e062fc2a15147c3a2e25dbc125c SHA256 4de776b35d4825c0934ae7baa9ef9504d4907683ca303220d405f1b72d3b2e1d
+MISC ChangeLog 13780 RMD160 54a2e620f72ac79bbc6009a5e95ecbce34a64f8f SHA1 1a7c49bbcc5454979928f3b2824214f4134cfed6 SHA256 8e3472ba394fefe0d3399b36a4d5dd2e71e49ec6229aa28328026e36e0281618
 MISC metadata.xml 1124 RMD160 ebf05369beed806ab102a077c412a488db2b6b00 SHA1 791b73e88203146f9eacafc715eae9d6a77a8c37 SHA256 258fadc0ab971e31bf32c1e7d9dc1e6b92f5c45ff73ab56f5230313a6254c0c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiyX8MACgkQvSApE0uP4UumEACeOzx2B2Z7EPHZ22uyHjXJoNuW
+Wi0An3zg3FYM7P0a6RCcvaQvYEvSGx6P
+=sbTY
+-----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.4.9-r1.ebuild b/app-admin/conky/conky-1.4.9-r1.ebuild
deleted file mode 100644
index 7b069529043a..000000000000
--- a/app-admin/conky/conky-1.4.9-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.9-r1.ebuild,v 1.10 2008/04/22 06:05:45 omp Exp $
-
-inherit eutils
-# used for epause
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sourceforge.net/"
-SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE="audacious bmpx hddtemp ipv6 mpd nano-syntax rss truetype vim-syntax wifi X"
-
-DEPEND_COMMON="
-	virtual/libc
-	X? (
-		x11-libs/libICE
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libXrender
-		x11-libs/libXdamage
-		x11-libs/libXft
-		truetype? ( >=media-libs/freetype-2 )
-		audacious? ( >=media-sound/audacious-1.4.0 )
-		bmpx? ( media-sound/bmpx
-				>=sys-apps/dbus-0.35
-			)
-	)
-	rss? ( dev-libs/libxml2
-			net-misc/curl
-			)
-	wifi? ( net-wireless/wireless-tools )
-	!ipv6? ( >=dev-libs/glib-2.0 )"
-RDEPEND="${DEPEND_COMMON}
-	hddtemp? ( app-admin/hddtemp )
-	vim-syntax? ( || ( app-editors/vim
-	app-editors/gvim ) )
-	nano-syntax? ( app-editors/nano )"
-
-DEPEND="
-	${DEPEND_COMMON}
-	dev-util/pkgconfig
-	X? (
-		x11-libs/libXt
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-pkg_setup() {
-	if use audacious; then
-		if has_version <media-sound/audacious-1.5.0 && ! built_with_use media-sound/audacious dbus; then
-			eerror "media-sound/audacious is not built with dbus USE flag."
-			eerror "Please add 'dbus' to your USE flags, and re-emerge media-sound/audacious."
-			die "media-sound/audacious needs USE=dbus"
-		fi
-	fi
-}
-
-src_compile() {
-	local mymake
-	if useq ipv6 ; then
-		ewarn "You have the ipv6 USE flag enabled.  Please note that using"
-		ewarn "the ipv6 USE flag with Conky disables the port monitor."
-		epause
-	else
-		mymake="MPD_NO_IPV6=noipv6"
-	fi
-	local myconf
-	myconf="--enable-proc-uptime"
-	if useq X; then
-		myconf="${myconf} --enable-x11 --enable-double-buffer --enable-xdamage --enable-own-window"
-		myconf="${myconf} $(use_enable truetype xft)"
-	else
-		myconf="${myconf} --disable-x11 --disable-double-buffer --disable-xdamage --disable-own-window"
-		myconf="${myconf} --disable-xft"
-	fi
-	econf \
-		${myconf} \
-		$(use_enable audacious) \
-		$(use_enable bmpx) \
-		$(use_enable hddtemp ) \
-		$(use_enable mpd) \
-		$(use_enable rss) \
-		$(use_enable wifi wlan) \
-		$(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
-	dohtml doc/docs.html doc/config_settings.html doc/variables.html
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano/
-		doins "${S}"/extras/nano/conky.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog 'Default configuration file is "~/.conkyrc"'
-	elog "You can find a sample configuration file in"
-	elog "/usr/share/doc/${PF}/conkyrc.sample.bz2"
-	elog
-	elog "For more info on Conky's new features,"
-	elog "please look at the README and ChangeLog:"
-	elog "/usr/share/doc/${PF}/README.bz2"
-	elog "/usr/share/doc/${PF}/ChangeLog.bz2"
-	elog "There are also pretty html docs available"
-	elog "on Conky's site or in /usr/share/doc/${PF}"
-	elog
-	elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
-	elog
-	elog "Vim syntax highlighting for conkyrc now enabled with"
-	elog "USE=vim-syntax, for Nano with USE=nano-syntax"
-	elog
-}