Remove old.

Package-Manager: portage-2.1.9.35/cvs/Linux i686

3 files changed, 5 insertions, 129 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 2f766adae102..00ffcf02056c 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.156 2011/02/12 17:43:58 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.157 2011/02/13 19:57:01 billie Exp $
+
+  13 Feb 2011; Daniel Pielmeier <billie@gentoo.org> -conky-1.8.1.ebuild:
+  Remove old.
 
 *conky-1.8.1-r2 (12 Feb 2011)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 651aad9bddde..44f9f418ce04 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -8,6 +8,5 @@ DIST conky-1.8.0.tar.bz2 610545 RMD160 5ea6accf73e1d41ebe8390722a53ae50e0c23df8
 DIST conky-1.8.1.tar.bz2 612481 RMD160 f3203131e2d8f3756eb29f5c5a9034b9c269fdc6 SHA1 9581419b1a53a8a7e37b0291cd4e55ab166d221a SHA256 f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43
 EBUILD conky-1.8.0-r1.ebuild 3967 RMD160 2a7a6f187bf0c20b2d0f83796f3578ffea90714f SHA1 b4f01faaeb3b3046ed950997788b49c4fa51c5b0 SHA256 4bf134d29f37079b3b44c132856546c3ad74ae79f9d161b2a890253f9a8cc9e8
 EBUILD conky-1.8.1-r2.ebuild 3990 RMD160 e00ba0238f441ea9abe4877041ac830beec89f0e SHA1 8cb3767926cfa5b4dbab2245d73bd7ef38af0610 SHA256 9d9634f7ff46919bf36568e2436c9abc3f3c141ddb2d703cc96b98f904461f6f
-EBUILD conky-1.8.1.ebuild 3905 RMD160 f889427c9fc44f24e24583afb0121e9beee3c3a5 SHA1 8904b6068ab786a3756bac63ae55766c34b0d8d5 SHA256 c5798acb092e90c995c53d8d022efa3b3ecc4ff380971f0e00ab5277cc12e65b
-MISC ChangeLog 23971 RMD160 8c475ae28206f03e7ad57353c5dca400e7b061bc SHA1 db8661466cb9b9a87609332a2ac52d5871b6f516 SHA256 d7cee88fe5f697f297c45a9440aeef40b5338149c9f37696e4f47fd1db9d327a
+MISC ChangeLog 24059 RMD160 5d0f1efa45b5fd6435b6ae61472e9cb434c5d461 SHA1 76cde2afbff0bb7b99c6a01066f1216a27999e7e SHA256 c873f22dbff785ca34d4ddd85c79daf47a72f57b7629728a6d24629735b4d855
 MISC metadata.xml 2154 RMD160 911d61ea1b3a10bf4c49fafba1b82b067ee0eee3 SHA1 dac481d15b6279f6d573cb8c76aa38267a9186d7 SHA256 a2ab7e0c213f854ed36387d6ca1702a77a77842d9d96d3b97351d48e0472d9f9
diff --git a/app-admin/conky/conky-1.8.1.ebuild b/app-admin/conky/conky-1.8.1.ebuild
deleted file mode 100644
index 84f29183956a..000000000000
--- a/app-admin/conky/conky-1.8.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1.ebuild,v 1.7 2010/11/12 17:21:57 billie Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~sparc ~x86"
-IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X xmms2"
-
-DEPEND_COMMON="
-	X? (
-		imlib? ( media-libs/imlib2 )
-		lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
-		lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 )
-		nvidia? ( media-video/nvidia-settings )
-		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXext
-		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib )
-		xmms2? ( media-sound/xmms2 )
-	)
-	curl? ( net-misc/curl )
-	eve? ( net-misc/curl dev-libs/libxml2 )
-	portmon? ( dev-libs/glib )
-	lua? ( >=dev-lang/lua-5.1 )
-	ncurses? ( sys-libs/ncurses )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
-	wifi? ( net-wireless/wireless-tools )
-	weather-metar? ( net-misc/curl )
-	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
-	virtual/libiconv
-	"
-RDEPEND="
-	${DEPEND_COMMON}
-	apcupsd? ( sys-power/apcupsd )
-	hddtemp? ( app-admin/hddtemp )
-	moc? ( media-sound/moc )
-	nano-syntax? ( app-editors/nano )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	"
-DEPEND="
-	${DEPEND_COMMON}
-	dev-util/pkgconfig
-	"
-
-src_prepare() {
-	epatch "${FILESDIR}/conky-${PV}-nvidia-x.patch"
-	epatch "${FILESDIR}/conky-${PV}-xmms2.patch"
-}
-
-src_configure() {
-	local myconf
-
-	if use X; then
-		myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
-		myconf="${myconf} --enable-argb --enable-own-window"
-		myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)"
-		myconf="${myconf} $(use_enable lua-imlib lua-imlib2)"
-		myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)"
-		myconf="${myconf} $(use_enable audacious) $(use_enable xmms2)"
-	else
-		myconf="--disable-x11 --disable-own-window --disable-argb"
-		myconf="${myconf} --disable-lua-cairo --disable-nvidia --disable-xft"
-		myconf="${myconf} --disable-audacious --disable-xmms2"
-	fi
-
-	econf \
-		${myconf} \
-		$(use_enable apcupsd) \
-		$(use_enable curl) \
-		$(use_enable debug) \
-		$(use_enable eve) \
-		$(use_enable hddtemp) \
-		$(use_enable iostats) \
-		$(use_enable lua) \
-		$(use_enable thinkpad ibm) \
-		$(use_enable math) \
-		$(use_enable moc) \
-		$(use_enable mpd) \
-		$(use_enable ncurses) \
-		$(use_enable portmon) \
-		$(use_enable rss) \
-		$(use_enable weather-metar) \
-		$(use_enable weather-xoap) \
-		$(use_enable wifi wlan)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog AUTHORS TODO || die
-	dohtml doc/docs.html doc/config_settings.html doc/variables.html || die
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim || die
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano/
-		doins "${S}"/extras/nano/conky.nanorc || die
-	fi
-}
-
-pkg_postinst() {
-	elog "You can find a sample configuration file at ${ROOT%/}/etc/conky/conky.conf."
-	elog "To customize, copy it to ~/.conkyrc and edit it to your liking."
-	elog
-	elog "For more info on Conky's features please look at the Changelog in"
-	elog "${ROOT%/}/usr/share/doc/${PF}. There are also pretty html docs available"
-	elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html."
-	elog
-	elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
-	elog
-}