Remove old.

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

3 files changed, 8 insertions, 139 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 9a2b21c890ad..3b15253c7869 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.194 2012/12/16 15:18:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.195 2012/12/18 17:30:19 billie Exp $
+
+  18 Dec 2012; Daniel Pielmeier <billie@gentoo.org> -conky-1.9.0.ebuild:
+  Remove old.
 
   16 Dec 2012; Raúl Porcel <armin76@gentoo.org> conky-1.9.0-r1.ebuild:
   alpha/sparc stable wrt #442216
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index fa2254ebb1d5..9231eeb34187 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -14,13 +14,12 @@ AUX conky-1.9.0-lines-fix.patch 1067 SHA256 9a406f382092632e458d368b5fff81217258
 AUX conky-1.9.0-ncurses.patch 939 SHA256 76a777bab29009c2053b61e9e5904aea131c93d5f026acc161048374f75e72f6 SHA512 0a0737bec67eb241dee4029907d9f3e5bc8d49c8239fbdda5cbfa2b7b0aa50fb2ac9bf3397ccecd94768a176fc6c3ec0e18d67391d9285aff9658ba234202d4e WHIRLPOOL 0893db6ffbc2b37c58b2de8e34e4288640a1d3a5e3a754bd39faec141a7e94e49c83011f5eb58c86afe838fff1b77a661ff63a61f6780f9ca5e5b24f50463014
 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a
 EBUILD conky-1.9.0-r1.ebuild 3863 SHA256 9688e8eac08d7bae592b8a56b4330657227a748ceda6fca41ae0e3b2964ea616 SHA512 e219cfa569130ea04646a61da400616ab464c0e641f423781c98c95bead0a50601d9e1638c7f6c490b4256543f7c2de50b5683ef28b2d86d1b6725d1b591a8fd WHIRLPOOL e634b4c5a4d3c3c1c656fd702ffc0c545489912678a2c063481574abc230b0476ba87c88dae383c9641d5238a8abf7ab37be16c71b671393ee373babbb5654fa
-EBUILD conky-1.9.0.ebuild 3821 SHA256 b1ca4897544da14150977cdb2585556aeafbc962f6eae25389722ccc70185af6 SHA512 8e337924be4c4b939a8b976f91db9877a609704d09261cffec38a60b3136ca42f23a20702ff49c491f95da87f0aad341380a08160623f1c6fcd88463c356be40 WHIRLPOOL 51d9f19c1c558dcb49fccb3eb1b130d84cf360d97b278fb7e5b10388df26e7b89e5ad7ceac8614dcc1e8ef34fc7bff69ed075fd8815b126a3a8c8fd7db4d25d2
-MISC ChangeLog 29711 SHA256 835be4991f4658054505acbcc1954c7022a764d38edcd849e19542808e3fd9d3 SHA512 871da06ae26c88a716bde204ad87b373f3495799979cacdaf80108e5c8e674b003aca0f36e5a10223539198cf934b50bde22f06d713d929496ee0c1c40f65c9f WHIRLPOOL f7055b804968658943ef2844e45d6b820658be156d10a0ab9ccebb4e6a44dc742911708fea135211663ae00e4284728ebc8fda87a38cdce3a4891cf11936ae39
+MISC ChangeLog 29798 SHA256 0b8e877834884dd237c39385e1f4458836945214c33e7512fb22a87a480a630f SHA512 dd1e879fa24b14f2bde58e8f0acf82801bd48b7036477311101e5f04a1fa3ab301fa55cc0923df5471c6e37ec06b7d15c5b65fc77ddec2955bfc16c20ce5b23c WHIRLPOOL 48178a8b5caaeb02091196c8cb6261fa7bb312cca77c45897ec210cfcead8fdc23bbc4e0ee190e3551a5cdfaf0ef10d3410b7666f5da9e80f6ea1ceb009c2a5b
 MISC metadata.xml 2035 SHA256 7629c0d86a74d086f1b9934919881b5ee82c285e94d58d4a802694633ea11302 SHA512 546dafceed03c1148cdd4003021112306b636124f0f4ee13950d4a1b5bb8a7ff56256e6acf131e08e4573195e987810d562b2c202ba9c3022097a52e47c1f325 WHIRLPOOL 3e2eebfc6456a2e3d4658076ba8a02c84ff7a967768330e6df866589886b10dceccdaf8ff4d6863a2a61f676cb09d60ab8d7f5e57e1ae895b890f12de009dc23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDN5iwACgkQuQc30/atMkBeZgCeMmwpc80FWMKNXDJVD9mEDn2M
-wH8An3+sEETWWn5/Mxx5Sm3oLTVQssXD
-=Z2G1
+iEYEAREIAAYFAlDQqDIACgkQlcuUeyFa0U3yoQCfR232QmU+amxjguF3zleO+o0Z
+jvgAoKzN8FDm19a/9urExf+Q0BfDjeF8
+=n68p
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.9.0.ebuild b/app-admin/conky/conky-1.9.0.ebuild
deleted file mode 100644
index 0172d03929f5..000000000000
--- a/app-admin/conky/conky-1.9.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2012 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.ebuild,v 1.10 2012/12/04 20:58:53 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"
-}
-
-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
-}