clean up

Package-Manager: portage-2.1.3.19
RepoMan-Options: --force

3 files changed, 8 insertions, 118 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index fe31f648c308..fa385949eb2f 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,9 @@
 # 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.58 2008/02/02 19:00:45 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.59 2008/02/02 19:02:35 opfer Exp $
+
+  02 Feb 2008; Christian Faulhammer <opfer@gentoo.org> -conky-1.4.9.ebuild:
+  clean up
 
 *conky-1.4.9-r1 (02 Feb 2008)
 
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 0d0ca5694e55..39833aec3866 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -7,13 +7,12 @@ DIST conky-1.4.9.tar.bz2 412510 RMD160 d708ea0eae60cf1c1ca4d176fa20f8a464b803e1
 EBUILD conky-1.4.6.ebuild 2928 RMD160 2ba55f29a15b96eb39af48066087ae1f16b34c06 SHA1 37ecd90aed1202ed88d109fbe362edf0349ded12 SHA256 feeaa3a240ba4fd8e19c35627f7c7ec5b67503d99a9e8d00cf9869f5e01331de
 EBUILD conky-1.4.8.ebuild 3079 RMD160 3a1b66e31c40d961bfa3a38fc589a4d120e917a7 SHA1 73e1812fe4d09685fb0fbadab8dd896c6eccafb0 SHA256 ad7da5f1701efb7352cbce8a798e93a90240a34bae3ff4b77787e9255c71a8c0
 EBUILD conky-1.4.9-r1.ebuild 3539 RMD160 3b6704ad4c198a8c076059266519d9219ec13741 SHA1 6e7dd179df26ed7483627d120e471d4ab4a42a19 SHA256 f697a6633a4ef1ca73082cbf9b118efe4cd67e5c86d260628f0c4596b3e5f848
-EBUILD conky-1.4.9.ebuild 3080 RMD160 92c178b0224d84e24bbff77dda70ffbb86477465 SHA1 343f17bc238aeae307c0e1523b176c6c5fecdb8c SHA256 f8e9c389df996a2976c5350e2cc89b45b517c06068c3e81bdc41fd27bb0c56f7
-MISC ChangeLog 9582 RMD160 5412de1f661daec72704745f96aa2edb9c7ec62a SHA1 2774c74c40a0061fbc91515d36546e9548d4ed04 SHA256 d7d596d7cbbc554bb30afc1106bcba33faae89270c85eb97a651597807524411
+MISC ChangeLog 9670 RMD160 f83e2f3792dfbdcdb785cd4913499837d32f3e96 SHA1 8de27690866390098c8e747e73eda088951831bf SHA256 a5f0c9e792f9df7ad59349fb342ae278f9eb9ebc6691c2e183ec36f2582589f3
 MISC metadata.xml 569 RMD160 b366c022728c365d2c27ddd7d558e4d7815bd512 SHA1 55b29887fc494ea60ff7e6100c3a85857eabf3a7 SHA256 1cfb216faf8f26ef4032857408246f0addf6fd09e50f0d4f1cb67789b506832b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHpL4fNQqtfCuFneMRAoN0AKCA0ljpkoRuud0L21l03OP0FI8HUACghS3+
-cB6O4iwNLkXA/2JXASPAob0=
-=o8vF
+iD8DBQFHpL6MNQqtfCuFneMRAks1AJ45LP3CxDS24JF1ZQ+XwaT/rPboegCdEKWb
+DR75eoux0K6suY7mCVGkVQY=
+=Lzug
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.4.9.ebuild b/app-admin/conky/conky-1.4.9.ebuild
deleted file mode 100644
index 82f19754bf3c..000000000000
--- a/app-admin/conky/conky-1.4.9.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.9.ebuild,v 1.1 2007/11/30 23:57:22 dragonheart Exp $
-
-inherit eutils
-# used for epause
-
-DESCRIPTION="Conky is an advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sf.net"
-SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="audacious bmpx hddtemp ipv6 mpd rss truetype vim-syntax 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 ) )"
-
-DEPEND="
-	${DEPEND_COMMON}
-	X? (
-		x11-libs/libXt
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-src_compile() {
-	local mymake
-	if useq ipv6 ; then
-		elog "You have the ipv6 USE flag enabled.  Please note that using"
-		elog "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 hddtemp ) \
-		$(use_enable mpd) \
-		$(use_enable rss) \
-		$(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 doc/conkyrc.sample
-	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
-}
-
-pkg_postinst() {
-	elog 'Default configuration file is "~/.conkyrc"'
-	elog "You can find a sample configuration file in"
-	elog "/usr/share/doc/${PF}/conkyrc.sample.bz2"
-	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"
-	elog
-}