Remove old.

Package-Manager: portage-2.1.11.50/cvs/Linux i686
Manifest-Sign-Key: 0x215AD14D

3 files changed, 15 insertions, 137 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 62884b08bcfe..950bfd498ce9 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.204 2013/02/12 20:21:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.205 2013/02/14 18:56:42 billie Exp $
+
+  14 Feb 2013; Daniel Pielmeier <billie@gentoo.org> -conky-1.9.0-r1.ebuild:
+  Remove old.
 
   12 Feb 2013; Agostino Sarubbo <ago@gentoo.org> conky-1.9.0-r2.ebuild:
   Stable for sparc, wrt bug #456266
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 4a21625e7b9b..7be35899057b 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,9 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX conky-1.8.1-utf8-scroll.patch 2814 SHA256 ee622cda243c7265915c858b264fc4750a329f5c7e9a29323421a777291acfb7 SHA512 a88c49e83b360949d6450f1fbee22dc6648586f5469f6256581db7c55ba8efc35c01756fa241bfc13df0b44390d36ef72e4250d18a8743d62089e2f57f9f8fbd WHIRLPOOL 951e9b9083033a4d247bfeee12ee4f3da30ae53015c7b8095d587fb544e720c627b951ccee5da418c719a05c9a55b560d6bcb56cdfa5daaa6f50cee1a828327e
 AUX conky-1.9.0-lines-fix.patch 1067 SHA256 9a406f382092632e458d368b5fff81217258729df19098836f7f9ace0130b316 SHA512 555a7234933e6967cdf7ee003e46b089f29819891551205ab7d3008037f8c8771473ced3ed3da1009e2041e9d34beb6edca25fb1017f043a824611d439094e0e WHIRLPOOL 64d88b5b94e435cd0473d18fceaa1358dcea1e1d2c5c2de93588351c0e08f6fe3461e4a1d8b470533f1d8fb80c99ec078825d4b7803f7042be5bee74a540791d
 AUX conky-1.9.0-ncurses.patch 939 SHA256 76a777bab29009c2053b61e9e5904aea131c93d5f026acc161048374f75e72f6 SHA512 0a0737bec67eb241dee4029907d9f3e5bc8d49c8239fbdda5cbfa2b7b0aa50fb2ac9bf3397ccecd94768a176fc6c3ec0e18d67391d9285aff9658ba234202d4e WHIRLPOOL 0893db6ffbc2b37c58b2de8e34e4288640a1d3a5e3a754bd39faec141a7e94e49c83011f5eb58c86afe838fff1b77a661ff63a61f6780f9ca5e5b24f50463014
 AUX conky-1.9.0-update-when-message-count-decreases.patch 2723 SHA256 d47df08331ff381eacfb9729f76135f7e556b51a4d8e2005df789f604b2fed38 SHA512 f4867a37d3874a3b6248d33c176f2178fa1171a16c61789895c4c10419ce28bc766d712ebba9ca7eade2c352331f43466e440f3c787ab879e66d4a60177b6264 WHIRLPOOL ab4fc736098bd6577e75a3670bfd0d39ad9a453fe3fce41716e4c6ed9d6f56f9b22ab2d0589253d9aad4dfe158c1c465588876e15a820c02d9cfdca9a11e68d9
 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a
-EBUILD conky-1.9.0-r1.ebuild 3862 SHA256 46404d43acdcd36922d3ec35fa7b05b55461c8d54beffcfcea893bb6143b5a30 SHA512 bf7058de7f0388c542ad1d2da1646391732a8057f15f5704d62663b03cb2739bc93de668129ca58eb09a96c113ba9e0fb4e85575fc4df8de82958f44245f2350 WHIRLPOOL 2cb95aa399886ab56c5118f5a94ed63aca391f7e7d31f8ea248eb166f0186aed4a3789ea4520756218b0fca444cfd52437e954aff7c438bd63b459fd96fcd661
 EBUILD conky-1.9.0-r2.ebuild 3924 SHA256 b74253a89d705a00890c6cb592b2c6c31bd8cc81bc3d1a1c7bc6854b31e67d1b SHA512 c318fee911623909f4c32becd296e1af35b25652e5adcd9bac2dc28281a2411ddd336d7e0ec80aada39bc2355e158fe4d93d6ff4245546a6182eac5c5254a3fb WHIRLPOOL 99752889bd96186070a8e5a76c8908f09e64d989503f7e88b05dd324eca1b41a819e8eb93741c0b12b72d5cdccd20869ca719b8f569df2fe68b0ca4bb818b7b2
-MISC ChangeLog 31153 SHA256 52469a36b568ba1640e7f6a091209b299d13f4a824ea6e3ac28f3f96645befba SHA512 4063e21a696328637fe26ec34a0efa760dd6305d4d617350d7d510fa7b3537bf2c7cbc60591fb504476dc7ce5ead75ca70700af200e3eeb556e58b265ee9d66e WHIRLPOOL 5f81d619a3a393dbf5f15e10c7f7f58c979475fefb39ebcaca353f10dd18d0f3bca0475b073ee1bc3166e684163099dd90275bd4b7c8afa766d78cbef33ab13c
+MISC ChangeLog 31247 SHA256 e57d2de29f6447026f7e719ce9ff5d364e688f6bf508b4679ece999354cca5b5 SHA512 ab3371ab4c66b8d3fc2f925b5f24a323187fe558d4569409510e9ffd3d9bca62a506b559d380d90cbf512205b56bb1252e0a58981d411c113ac22bca2136c3f6 WHIRLPOOL 61a541ad741a988dea4a2cc4611b30b38b0faac3bbe835abb3359df9ef5770e4bd0b20a0cfd1ed075a62fdd908c2613dea0a7ff762a6f8cd26e8583026995c5b
 MISC metadata.xml 2035 SHA256 7629c0d86a74d086f1b9934919881b5ee82c285e94d58d4a802694633ea11302 SHA512 546dafceed03c1148cdd4003021112306b636124f0f4ee13950d4a1b5bb8a7ff56256e6acf131e08e4573195e987810d562b2c202ba9c3022097a52e47c1f325 WHIRLPOOL 3e2eebfc6456a2e3d4658076ba8a02c84ff7a967768330e6df866589886b10dceccdaf8ff4d6863a2a61f676cb09d60ab8d7f5e57e1ae895b890f12de009dc23
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEdM3EACgkQlcuUeyFa0U3J8ACg8gSlGV5HKeKsUZsN+POhNEco
+ByEAoO7RZzjmSKyJhxTDzb4GhlhIR7sa
+=7fo9
+-----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.9.0-r1.ebuild b/app-admin/conky/conky-1.9.0-r1.ebuild
deleted file mode 100644
index 68bf0170d5fa..000000000000
--- a/app-admin/conky/conky-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r1.ebuild,v 1.9 2013/01/11 18:10:36 billie Exp $
-
-EAPI=4
-
-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="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
-			>=dev-lang/lua-5.1.4-r8
-			x11-libs/cairo[X] )
-		lua-imlib? (
-			>=dev-lua/toluapp-1.0.93
-			>=dev-lang/lua-5.1.4-r8
-			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.4-r8 )
-	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}
-	virtual/pkgconfig
-	"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8.1-utf8-scroll.patch" \
-		"${FILESDIR}/${P}-ncurses.patch" \
-		"${FILESDIR}/${P}-lines-fix.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() {
-	default
-
-	dohtml doc/{config_settings.html,docs.html,lua.html,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() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}."
-		elog "To customize, copy to ~/.conkyrc and edit it to your liking."
-		elog
-		elog "There are pretty html docs available at the conky homepage"
-		elog "or in ${ROOT%/}/usr/share/doc/${PF}/html."
-		elog
-		elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
-		elog
-	fi
-}