Remove old.

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

3 files changed, 5 insertions, 144 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 52c603e12fb2..4a75f74c56ad 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.151 2010/11/06 21:30:53 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.152 2010/11/10 19:24:52 billie Exp $
+
+  10 Nov 2010; Daniel Pielmeier <billie@gentoo.org> -conky-1.7.2-r2.ebuild:
+  Remove old.
 
   06 Nov 2010; Mark Loeser <halcy0n@gentoo.org> conky-1.8.1.ebuild:
   Mark ~ppc64; bug #326767
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 80eae313ee81..f95c1c9d4392 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX conky-1.8.0-audacious-2.3.patch 595 RMD160 5ce471fc07a8f8dfe85e0b74f5ffc18a71ebef25 SHA1 d44055c6b4878b189cd5555747611d444cca3b25 SHA256 41ba5c1934992116b792e399064e1d517b7715b5338b8f9d782a0c7dfd96ea52
 AUX conky-1.8.0-ncurses.patch 4359 RMD160 deb00ff8338881bf97a8ed26aeb6cdb3d53c0a07 SHA1 13dd57185c5ab8118cf2ca9c7e86222b9dc4e166 SHA256 9ac58ffcebe10447ac0255a5e7c569d1f22ddb3f6b1a1b8b0854e55d781c6f59
 AUX conky-1.8.1-nvidia-x.patch 883 RMD160 f6e85e117ba5b895ba23db0d6e4160a0c0141c21 SHA1 1e3dc3f2a8e44d62e25ab2ab22726e0e91ecf666 SHA256 290ffdf4094167715bf11b86ee2cf73574a3af32ffb50fa09517d89c56bc0853
-DIST conky-1.7.2.tar.bz2 585099 RMD160 6d419c7bdeded5890c4c99cdef884bc0a79a50cb SHA1 3f4e5cc13651fbf94892b079d447a8549818809e SHA256 b3c0a1b0ff90579d48df542a6070adbe67d3926d6d0c66ee12b52b2d5a2c675c
 DIST conky-1.8.0.tar.bz2 610545 RMD160 5ea6accf73e1d41ebe8390722a53ae50e0c23df8 SHA1 eef214c2917ea5666d24f03128b12d00fa313b58 SHA256 badb3824a9655eee90281939df8bdb3ca95cf8bab03269b3b3775bfea2ed0a51
 DIST conky-1.8.1.tar.bz2 612481 RMD160 f3203131e2d8f3756eb29f5c5a9034b9c269fdc6 SHA1 9581419b1a53a8a7e37b0291cd4e55ab166d221a SHA256 f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43
-EBUILD conky-1.7.2-r2.ebuild 4118 RMD160 8e89dc873e1234c6a0a4fa4be7090bd75e211b78 SHA1 0dc6b5a59f98a9e8091811811baa6bf904c63f1a SHA256 235b4c517d279143031f18b3be9da7714d005c05d8ec93b42310542a0621d4fb
 EBUILD conky-1.8.0-r1.ebuild 3967 RMD160 2a7a6f187bf0c20b2d0f83796f3578ffea90714f SHA1 b4f01faaeb3b3046ed950997788b49c4fa51c5b0 SHA256 4bf134d29f37079b3b44c132856546c3ad74ae79f9d161b2a890253f9a8cc9e8
 EBUILD conky-1.8.1.ebuild 3860 RMD160 5bef2e701a28250853cc2868ed80f4e667be16af SHA1 1ec5851020fab08b1c6c3c1994756ed25f28a6b4 SHA256 eb5200a05190de1e99abb98b2466f8327afe43b1ec834d13c09aa8a42008ace7
-MISC ChangeLog 23161 RMD160 9a13052c5c11ccafc9115d94794df2d9d190c94a SHA1 d571691713a18cb9db777d32928db366b4f598ee SHA256 567f10a08f6cd2632a99f28c22354c3219eb7bfccfaae0b053b86ee9e20de3cf
+MISC ChangeLog 23251 RMD160 d562391f7ef229650f704ea3f1147c4c3c4a496e SHA1 9a47bd92febcd96bf7a9a4d7b42293d4ec3c7a93 SHA256 52bc948b370e806d9f3f84a967c13dca9dfca70c8991dcbda67f73ee86774cfa
 MISC metadata.xml 2154 RMD160 911d61ea1b3a10bf4c49fafba1b82b067ee0eee3 SHA1 dac481d15b6279f6d573cb8c76aa38267a9186d7 SHA256 a2ab7e0c213f854ed36387d6ca1702a77a77842d9d96d3b97351d48e0472d9f9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzVyRMACgkQCRZPokWLroSOvQCfc4IJNdsX02xG9Xy43veNFGlQ
-e9QAn2LWXXlzyZYRdZbQNPqfFZ65nOw7
-=Kbeu
------END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.7.2-r2.ebuild b/app-admin/conky/conky-1.7.2-r2.ebuild
deleted file mode 100644
index b8294fb1bf58..000000000000
--- a/app-admin/conky/conky-1.7.2-r2.ebuild
+++ /dev/null
@@ -1,130 +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.7.2-r2.ebuild,v 1.11 2010/11/06 01:42:29 rafaelmartins 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 ppc ppc64 sparc x86"
-IUSE="alsa apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X"
-# currently removed openmp, see
-# http://git.omp.am/?p=conky.git;a=commit;h=670e9a0eb15ed3bc384ae0154d3c09de691e390c
-
-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
-	)
-	alsa? ( media-libs/alsa-lib )
-	audacious? ( >=media-sound/audacious-1.5 )
-	curl? ( net-misc/curl )
-	eve? ( net-misc/curl dev-libs/libxml2 )
-	portmon? ( dev-libs/glib )
-	lua? ( >=dev-lang/lua-5.1 )
-	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 )
-	sys-libs/zlib
-	virtual/libiconv
-	"
-#	openmp? ( >=sys-devel/gcc-4.3[openmp] )
-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_configure() {
-	local myconf
-	if use X; then
-		myconf="--enable-x11 --enable-double-buffer --enable-xdamage"
-		myconf="${myconf} --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)"
-	else
-		myconf="--disable-x11 --disable-own-window"
-		myconf="${myconf} --disable-imlib --disable-lua-cairo --disable-lua-imlib"
-		myconf="${myconf} --disable-nvidia --disable-xft"
-	fi
-
-	econf \
-		${myconf} \
-		$(use_enable alsa) \
-		$(use_enable apcupsd) \
-		$(use_enable audacious) \
-		$(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 portmon) \
-		$(use_enable rss) \
-		$(use_enable weather-metar) \
-		$(use_enable weather-xoap) \
-		$(use_enable wifi wlan)
-#		$(use_enable openmp) \
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog AUTHORS TODO || die "dodoc failed"
-	dohtml doc/docs.html doc/config_settings.html doc/variables.html \
-		|| die "dohtml failed"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die "doins failed"
-
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim|| die "doins failed"
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano/
-		doins "${S}"/extras/nano/conky.nanorc|| die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "You can find a sample configuration file at"
-	elog "${ROOT%/}/etc/conky/conky.conf. To customize, copy"
-	elog "it to ~/.conkyrc and edit it to your liking."
-	elog
-	elog "For more info on Conky's new features please look at"
-	elog "the Changelog in ${ROOT%/}/usr/share/doc/${PF}"
-	elog "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
-	elog "Vim syntax highlighting for conkyrc now enabled with"
-	elog "USE=vim-syntax, for Nano with USE=nano-syntax"
-	elog
-}