Remove older version.

Package-Manager: portage-2.1.5_rc3

4 files changed, 9 insertions, 166 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 0a3f5914ec45..e7c04d17e330 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
 # 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.73 2008/04/14 21:04:01 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.74 2008/04/14 21:07:01 omp Exp $
+
+  14 Apr 2008; David Shakaryan <omp@gentoo.org>
+  -files/conky-1.5.0-disable-x11.patch, -conky-1.5.0.ebuild:
+  Remove older version.
 
 *conky-1.5.2_pre01104 (14 Apr 2008)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 370022145c36..aff2cb7c1c93 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX conky-1.5.0-disable-x11.patch 546 RMD160 b5df7c1a5bdd374a5ff16ddd26a62af1723d7d20 SHA1 3ced580289e10f5fefb01358515eabb5f4670455 SHA256 4687d76d28b2da5737d67c1d066a03dcd3d622dd6e26a21753668bea2e626c07
 DIST conky-1.4.9.tar.bz2 412510 RMD160 d708ea0eae60cf1c1ca4d176fa20f8a464b803e1 SHA1 26f233588ea83b157729bb7dd56a64ffae856d20 SHA256 a6c98aa34932c8684e19e97fad460c04c2b7848c897bdaa293d37fbcc4d7949b
-DIST conky-1.5.0.tar.bz2 420616 RMD160 9fa2bf8da9dc936f90245bfa1a1eef6dcf14ff0e SHA1 b5618ffa93fc305e30170102415b0913bbe79668 SHA256 25e0aa3b10677e71bb19665428575d39749c55db5fa4a224d99a002b7a966bbe
 DIST conky-1.5.1.tar.bz2 422965 RMD160 83458b7da66e3166dec24c2f8292201761e635f5 SHA1 fe6f0e3440fe9d18afe31ec0cacfa5b38042532a SHA256 ca8b1dbc87e7c2c44d06f70e2b195f59ae8b09f8d490cc92cfac8df10f7bc239
 DIST conky-1.5.2_pre01104.tar.bz2 426713 RMD160 928dc1f701a44ff3cd7446b5d61e3b0ee1178a52 SHA1 b6f90095cdebe88540034306c00fb4e7e01ab91b SHA256 1b233a5a2140ae3d29c2fb6e1c5bd3742c8edb29395f06192e582af62865d665
 EBUILD conky-1.4.9-r1.ebuild 3599 RMD160 d70b8f876d104d67a5443a7b30b33513a30b8a3d SHA1 81d97f3ba329276cfdab2eed5828f5af8458d77d SHA256 846f55e1a48f4fd0b2e97335d180556bdbf8de8d6643931e5e0d67e588a8ee0e
-EBUILD conky-1.5.0.ebuild 3763 RMD160 718de0bc830af93c1a7c44cd12087a4512efb30a SHA1 055a98f651d0cdb72bf4bb95fcd693802ab6c129 SHA256 f505b735c858695f876b2e9deaa12ea37d00192193f9d35c1309a945a67e5517
 EBUILD conky-1.5.1.ebuild 3676 RMD160 061910fe65d9a029c5b0e08d700bc78f4f55bb81 SHA1 36bab50906d7461ecdf07310f8830ed19538c7f1 SHA256 0304274825c97c7a6fd8b85ca2f11c2d8d2be2fc5338f05a98aab6711b03ee4e
 EBUILD conky-1.5.2_pre01104.ebuild 3685 RMD160 18050b520813c02ec1d8294c5d3fba392911cb5b SHA1 05764d9c1fb5b33ebb8dbfcbad7ea211e698c762 SHA256 b94df0f5a20b6dabf7c74eb5666477ad8adf3d8346b4af26f3085954859fa135
-MISC ChangeLog 11619 RMD160 66a99f9de7a8919afc4bc0b7aa359ebc1e68f95b SHA1 bd213a213786168418b0599d722dc98e43816471 SHA256 790d264c580cb9fcc351b6641a15f381ff3310222d8a0184a5f8f0eee02efbfb
+MISC ChangeLog 11753 RMD160 06524d5fc015ba691954bcbf1ff27742794aaa4b SHA1 69c64d117138c39573583bc07851cd8f0d2e0be7 SHA256 cb279e7c3438355ab36f3cc78e6b4ef57e6f39d22a887eb2bc69a04b483a7734
 MISC metadata.xml 661 RMD160 e01c3355104751367370f01e91fda7b7e050556b SHA1 7a5e7eee245dbc789a0db79578673c12786eb5a3 SHA256 1aeebff165b0c5ec46cdfc56d090a8bc2c8a2d3304d5dd1385c045d4beb113d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgDxsoACgkQvSApE0uP4UvL6QCgn1+EzOiErAzlx2+O1dy2Z6Dv
-FJEAoIkLtVxPJMmEf0efJYlaOe/YgORL
-=VkhF
+iEYEARECAAYFAkgDx3wACgkQvSApE0uP4UtkAgCeIiVQY3lwPdw9KrJyrdlqfYpT
+UUIAnRzAX3sO+4ZbMW/l5fJlCk/OU6iI
+=ynFS
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.5.0.ebuild b/app-admin/conky/conky-1.5.0.ebuild
deleted file mode 100644
index f4ed01de76b7..000000000000
--- a/app-admin/conky/conky-1.5.0.ebuild
+++ /dev/null
@@ -1,136 +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.5.0.ebuild,v 1.1 2008/03/27 19:54:42 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/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="audacious bmpx debug hddtemp ipv6 mpd nano-syntax rss truetype vim-syntax smapi 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}
-	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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-disable-x11.patch"
-}
-
-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 debug) \
-		$(use_enable hddtemp ) \
-		$(use_enable mpd) \
-		$(use_enable rss) \
-		$(use_enable smapi) \
-		$(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
-	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 "You can find the sample configuration file at"
-	elog "/etc/conky/conky.conf.  To customize it, copy"
-	elog "/etc/conky/conky.conf to ~/.conkyrc and edit"
-	elog "it to your liking."
-	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
-}
diff --git a/app-admin/conky/files/conky-1.5.0-disable-x11.patch b/app-admin/conky/files/conky-1.5.0-disable-x11.patch
deleted file mode 100644
index 10fafc90d9cb..000000000000
--- a/app-admin/conky/files/conky-1.5.0-disable-x11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/conky.c
-===================================================================
---- src/conky.c	(revision 1040)
-+++ src/conky.c	(revision 1041)
-@@ -127,6 +127,8 @@
- 	exit(0);
- }
- 
-+static char *suffixes[] = { "B", "kiB", "MiB", "GiB", "TiB", "PiB", "" };
-+
- #ifdef X11
- 
- /* text size */
-@@ -164,8 +166,6 @@
- static int font_count = -1;
- struct font_list *fonts = NULL;
- 
--static char *suffixes[] = { "B", "kiB", "MiB", "GiB", "TiB", "PiB", "" };
--
- #ifdef XFT
- 
- #define font_height() (use_xft ? (fonts[selected_font].xftfont->ascent + \