added USE=vim-syntax -bug #152275 + old version cleanout

(Portage version: 2.1.2_rc1-r4)
 (Signed Manifest commit)

9 files changed, 11 insertions, 525 deletions

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index d7dd498fa21c..2dc6c6b71ad0 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,14 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX conky-1.3.4-arraybounds.patch 1560 RMD160 dcb1c9b195a03e19b2e477dbc149228930588b52 SHA1 ac0ef4fd2de644b06f57dfecd27d0b76b99b4b40 SHA256 4d1eb88c938305b680e4880a8b0f34264b72d4083ce660ef8afdaead8a752710
-MD5 d9296cc5c3fc007026e784f5825b153e files/conky-1.3.4-arraybounds.patch 1560
-RMD160 dcb1c9b195a03e19b2e477dbc149228930588b52 files/conky-1.3.4-arraybounds.patch 1560
-SHA256 4d1eb88c938305b680e4880a8b0f34264b72d4083ce660ef8afdaead8a752710 files/conky-1.3.4-arraybounds.patch 1560
-AUX conky-1.3.4-miscbug.patch 2591 RMD160 dd4495070c8c5acc6ba60328536325b126e8ef92 SHA1 c2a286702547734e756bea5120b5ae4c1ee0d811 SHA256 5ebd3da731900f6db25c6cc1a3dbbb71d33e458b9f4d9b3fb1771bb7abdc218b
-MD5 3f930afeab86d38688b8c7fe8a610bc7 files/conky-1.3.4-miscbug.patch 2591
-RMD160 dd4495070c8c5acc6ba60328536325b126e8ef92 files/conky-1.3.4-miscbug.patch 2591
-SHA256 5ebd3da731900f6db25c6cc1a3dbbb71d33e458b9f4d9b3fb1771bb7abdc218b files/conky-1.3.4-miscbug.patch 2591
 AUX conky-sigaction.patch 408 RMD160 17519cf444661e3c227103fed5b3c1f611f98f8d SHA1 15355cb8bef537b159156cb148b2cfba2956e921 SHA256 59cd8f7a8634f6ec89370db16dff6c75156ada06459bc4725514e8f328546335
 MD5 2ecd81682f750b475c15c805a96b497f files/conky-sigaction.patch 408
 RMD160 17519cf444661e3c227103fed5b3c1f611f98f8d files/conky-sigaction.patch 408
@@ -17,56 +9,32 @@ AUX portmon-mpd.patch 7143 RMD160 fe1ccafec1903de6c9b1db99e8278c06c86be2c9 SHA1
 MD5 5d84594f42f7e10ad9b8a6bf8617b5bd files/portmon-mpd.patch 7143
 RMD160 fe1ccafec1903de6c9b1db99e8278c06c86be2c9 files/portmon-mpd.patch 7143
 SHA256 6952b4756e2d59d34d00896b6e1a53d6514993dd0b53312c9b464ac9ba91b4b8 files/portmon-mpd.patch 7143
-DIST conky-1.3.4.tar.bz2 332871 RMD160 13f61eaada0171f5c60010941cbed3b030ff99b8 SHA1 12c437712a018ff372ecdb18980fb4b95cc2c632 SHA256 049e490936769d3b4ce7c2d9a240dc61a31aa065ec0ccd8e4ab0dcd35cdca99e
-DIST conky-1.3.5.tar.bz2 339478 RMD160 d3054cfeb896c16f753830e023ab5e0896de1040 SHA1 6a5d36935c308127d69fb5115534d920b304064c SHA256 5e7ac1fb87073bef4565066920e98923a04207cf7519a4552de99f19d027a6e5
 DIST conky-1.4.0.tar.bz2 361968 RMD160 dceee3ae83fb1aa34473b61bc1a1287bef38d14c SHA1 3f65b59daa825b0f7fab98d59cee0c6b09adf79f SHA256 75480c7cfe1741d7c881e6309e11573b1ce22f9242d35e12f0b3a9d593c6960e
-DIST conky-1.4.1.tar.bz2 364106 RMD160 c8a20d9331e363a05b3a233ff2a4d4dbf875e1c0 SHA1 8fcf058e8ff8d3090d726237b4b5652c7113807c SHA256 ea12650dfe96bec612fa0185f3191bd882a7381d80726ef510f113ce226f3e40
 DIST conky-1.4.2.tar.bz2 400574 RMD160 9622c9e5115dc5bfb6995424cfc66d3a6f90002e SHA1 cef7e9de4530a10b88040289c0024571a76d3d12 SHA256 e792a1ea4f865225e6f9d1e4cafd405745390a09d48d4a8936d4b0556e6e32b2
 DIST conky-1.4.3.tar.bz2 385833 RMD160 359fdbb8512766ed03ba6e06e91c2178d0128b53 SHA1 b4d589479df5ce0bb383bb7ed971e501f2f9c812 SHA256 47f541ad7f7ba44e0df084f1c891c1376c89ddab753ce693f527eac375d56b88
-EBUILD conky-1.3.4-r2.ebuild 2662 RMD160 cb44f4d794c053ce408b57c4efadb8ada3239204 SHA1 c214ff9ae57be8d108eb1f75b868ea97e3dc0d1d SHA256 a5f19b74b6edcbf2b1e307239add9960b8e2b3e01f8f32e1da90e2cc79ab1736
-MD5 daec6353bf84e62c4edd4d82d00cd350 conky-1.3.4-r2.ebuild 2662
-RMD160 cb44f4d794c053ce408b57c4efadb8ada3239204 conky-1.3.4-r2.ebuild 2662
-SHA256 a5f19b74b6edcbf2b1e307239add9960b8e2b3e01f8f32e1da90e2cc79ab1736 conky-1.3.4-r2.ebuild 2662
-EBUILD conky-1.3.5-r1.ebuild 2247 RMD160 a37dedf494b4b89e7656a175590b4b971fa2e6f0 SHA1 77f2947715cf89e9e740a3fae80e2ebf1774088f SHA256 b59fc2bfcf438818650a43063a569d69e927cb040f52bb24c812bd22b4c37222
-MD5 18290bbc2ed560becdfe5c1eed21f28a conky-1.3.5-r1.ebuild 2247
-RMD160 a37dedf494b4b89e7656a175590b4b971fa2e6f0 conky-1.3.5-r1.ebuild 2247
-SHA256 b59fc2bfcf438818650a43063a569d69e927cb040f52bb24c812bd22b4c37222 conky-1.3.5-r1.ebuild 2247
 EBUILD conky-1.4.0-r1.ebuild 2552 RMD160 c349fad9f2bf0475d91fc40edd632dc51182dde0 SHA1 33dc995f2f4177853e4bff96c5a9f3c49a062206 SHA256 c7b6e85af391cc83424db2445e4812a7a02dd7bff2abd63c1223062f3abae5aa
 MD5 9414d701b6e6f58e166b756c07cbe368 conky-1.4.0-r1.ebuild 2552
 RMD160 c349fad9f2bf0475d91fc40edd632dc51182dde0 conky-1.4.0-r1.ebuild 2552
 SHA256 c7b6e85af391cc83424db2445e4812a7a02dd7bff2abd63c1223062f3abae5aa conky-1.4.0-r1.ebuild 2552
-EBUILD conky-1.4.1.ebuild 2614 RMD160 bd7244f44781a7e53927df801b717f622074093c SHA1 bcb92f980beed48ac7dc01cb1a87cb796d4d49fb SHA256 63ebfd34b31926c00727e2b468fd65c47d7f4c5ef61b407afde59f1af64534ff
-MD5 3c2cc720a067d7710313ce6f72c23444 conky-1.4.1.ebuild 2614
-RMD160 bd7244f44781a7e53927df801b717f622074093c conky-1.4.1.ebuild 2614
-SHA256 63ebfd34b31926c00727e2b468fd65c47d7f4c5ef61b407afde59f1af64534ff conky-1.4.1.ebuild 2614
 EBUILD conky-1.4.2.ebuild 2603 RMD160 749ee3dc3836a4cfe8bfb0ab57bb727af2adc799 SHA1 cb411a06da4aac6a367b5cfd2d6b035af7c76ef4 SHA256 db4dd059345306849f8fba1d93c6bd4c588598427992814c63ebe62d746fe98d
 MD5 820af99b306ed3739b50be666010ccf7 conky-1.4.2.ebuild 2603
 RMD160 749ee3dc3836a4cfe8bfb0ab57bb727af2adc799 conky-1.4.2.ebuild 2603
 SHA256 db4dd059345306849f8fba1d93c6bd4c588598427992814c63ebe62d746fe98d conky-1.4.2.ebuild 2603
-EBUILD conky-1.4.3.ebuild 2497 RMD160 d5ef580f2acf2f480f0ffc008da991c32b9fbd7e SHA1 1e457f6f464eb1521bab9c67b217e61e0567a435 SHA256 e8e50fb145d05553270ff21dbb4d4cc7015e8f20cf9e085929c892aa66c0fd1a
-MD5 acdf5a4616b23164e71e24bdc3bdaa22 conky-1.4.3.ebuild 2497
-RMD160 d5ef580f2acf2f480f0ffc008da991c32b9fbd7e conky-1.4.3.ebuild 2497
-SHA256 e8e50fb145d05553270ff21dbb4d4cc7015e8f20cf9e085929c892aa66c0fd1a conky-1.4.3.ebuild 2497
-MISC ChangeLog 5844 RMD160 80536e036801dc642142d5192be40dda9f209806 SHA1 ab4c385b9cad856420e639234dfc563cc8b0fdc4 SHA256 69dae52a14cd4f7a995f3e5f08e238d87450fed787b64a08c3a31998bffc7810
-MD5 397edfef675a533beb847e93b99012e5 ChangeLog 5844
-RMD160 80536e036801dc642142d5192be40dda9f209806 ChangeLog 5844
-SHA256 69dae52a14cd4f7a995f3e5f08e238d87450fed787b64a08c3a31998bffc7810 ChangeLog 5844
+EBUILD conky-1.4.3.ebuild 2556 RMD160 91dc018a7c2ec90574d6ab87f5188aa1715fd4f8 SHA1 33b7d0bd978cc9f64ad08205e1126f15270c0b41 SHA256 3edaef1816a1ae09f49fcd64f983c30c9e35624dfb4380e6f5a8627f539b8604
+MD5 f399e20b1cc912fef3dfefab24d7484e conky-1.4.3.ebuild 2556
+RMD160 91dc018a7c2ec90574d6ab87f5188aa1715fd4f8 conky-1.4.3.ebuild 2556
+SHA256 3edaef1816a1ae09f49fcd64f983c30c9e35624dfb4380e6f5a8627f539b8604 conky-1.4.3.ebuild 2556
+MISC ChangeLog 6124 RMD160 227dbc6a6e8b920ff3c42dcb1cb978350402cd05 SHA1 cdb4f995ce7bba828f5491e1502c82083777f7cb SHA256 bebbd339921863b098c5c66bce245bb783b488a6c6c614609b5334f6daf9e088
+MD5 6c75742c4d7beb1df4a7e02422648121 ChangeLog 6124
+RMD160 227dbc6a6e8b920ff3c42dcb1cb978350402cd05 ChangeLog 6124
+SHA256 bebbd339921863b098c5c66bce245bb783b488a6c6c614609b5334f6daf9e088 ChangeLog 6124
 MISC metadata.xml 569 RMD160 b366c022728c365d2c27ddd7d558e4d7815bd512 SHA1 55b29887fc494ea60ff7e6100c3a85857eabf3a7 SHA256 1cfb216faf8f26ef4032857408246f0addf6fd09e50f0d4f1cb67789b506832b
 MD5 03a9b5b9e3a071e3a4f6450a3559735b metadata.xml 569
 RMD160 b366c022728c365d2c27ddd7d558e4d7815bd512 metadata.xml 569
 SHA256 1cfb216faf8f26ef4032857408246f0addf6fd09e50f0d4f1cb67789b506832b metadata.xml 569
-MD5 c55fb1487c2bca9b6ea69c92843bcaae files/digest-conky-1.3.4-r2 238
-RMD160 42085cf3f169a6ee9067bea9917d63f1dabf046a files/digest-conky-1.3.4-r2 238
-SHA256 a388ff1048d835a4a210aea54d7de4fcab095c5e34f39e253339a0828e0fa908 files/digest-conky-1.3.4-r2 238
-MD5 113c0f8393e0eaac049cfd63dd5395ad files/digest-conky-1.3.5-r1 238
-RMD160 7c0854d076f7e54ae71aa213cd7cca655f798089 files/digest-conky-1.3.5-r1 238
-SHA256 ea1c25dee1a62fca62b51b07051751b6830a4312f1fa847d72bc1b5b9a2fd2c7 files/digest-conky-1.3.5-r1 238
 MD5 dd1c99f09b0ec583eadca05832f8c5ea files/digest-conky-1.4.0-r1 238
 RMD160 4743c690e8a6d5923fd3a83d25c1f021549978cb files/digest-conky-1.4.0-r1 238
 SHA256 61e0266fd2231aa366ed5009e12d8667da17bc789f026bf0dd082af02853261f files/digest-conky-1.4.0-r1 238
-MD5 bb654fedea893b35ec7677d0dd6e1912 files/digest-conky-1.4.1 238
-RMD160 576e0ac8989b47af56c33f02bf634fac1f72b230 files/digest-conky-1.4.1 238
-SHA256 97f947b3bba8cb1c747b19c99b6a4500e7b6acaa709e667c8919564669872109 files/digest-conky-1.4.1 238
 MD5 8669fb84e545dd83e96aa87a60c83c67 files/digest-conky-1.4.2 238
 RMD160 6ecbeb97f9cd77a1b0b12b604c210b5632b4189f files/digest-conky-1.4.2 238
 SHA256 8d00a420a57f5165242e9e5d7706f84c37922314b23a6ab215405942e49094bd files/digest-conky-1.4.2 238
@@ -76,7 +44,7 @@ SHA256 8779053506609454d2b8df7e794ac34752aa39e8d8e25f2cce0d0503b781f86c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFVwWYmdTrptrqvGERAvr+AJ0Qes3MoDcIz9Wy2XmFEQPJVmeSsACfUlv+
-SZbMuHKAQUo9OzvbPVSoHsA=
-=EEdL
+iD8DBQFFVxeymdTrptrqvGERApLIAJ4xWbK/S8poUQQtQOa8iZp/6/lhCACcCivX
+d0MrHCfJlKTmcpJaRFZt0nI=
+=BoxD
 -----END PGP SIGNATURE-----
diff --git a/app-admin/conky/conky-1.3.4-r2.ebuild b/app-admin/conky/conky-1.3.4-r2.ebuild
deleted file mode 100644
index e648ed5d2065..000000000000
--- a/app-admin/conky/conky-1.3.4-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.3.4-r2.ebuild,v 1.1 2005/12/11 03:36:33 dragonheart Exp $
-
-inherit eutils
-
-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="~amd64 ~ppc ~sparc ~x86"
-IUSE="truetype X ipv6"
-
-DEPEND_COMMON="
-	virtual/libc
-	X? (
-		|| ( ( x11-libs/libICE
-				x11-libs/libXext
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libXrender
-				x11-libs/libXft
-				)
-				virtual/x11
-		)
-		truetype? ( >=media-libs/freetype-2 )
-	)"
-
-RDEPEND="${DEPEND_COMMON}"
-#	seti? ( sci-astronomy/setiathome )"
-
-DEPEND="
-	${DEPEND_COMMON}
-	X? (
-		|| ( ( x11-libs/libXt
-				x11-proto/xextproto
-				x11-proto/xproto
-				)
-				virtual/x11
-		)
-	)
-	sys-devel/libtool
-	sys-apps/grep
-	sys-apps/sed
-	sys-devel/gcc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-miscbug.patch
-	epatch ${FILESDIR}/${P}-arraybounds.patch
-}
-
-src_compile() {
-	local mymake
-	if useq ipv6 ; then
-		ewarn
-		ewarn "You have the ipv6 USE flag enabled.  Please note that"
-		ewarn "using the ipv6 USE flag with Conky disables the port"
-		ewarn "monitor."
-		ewarn
-		sleep 5
-	else
-		mymake="MPD_NO_IPV6=noipv6"
-	fi
-	local myconf
-	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime
-	--enable-mpd --enable-mldonkey"
-	econf \
-		${myconf} \
-		$(use_enable truetype xft) \
-		$(use_enable X x11) \
-		$(use_enable !ipv6 portmon) || die "econf failed"
-#		$(use_enable seti)
-	emake ${mymake} || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "make install failed"
-	dodoc ChangeLog AUTHORS README doc/conkyrc.sample doc/variables.html
-	dodoc doc/docs.html doc/config_settings.html
-}
-
-pkg_postinst() {
-	einfo 'Default configuration file is "~/.conkyrc"'
-	einfo "you can find a sample configuration file in"
-	einfo "/usr/share/doc/${PF}/conkyrc.sample.gz"
-	einfo
-	einfo "For more info on Conky's new features,"
-	einfo "please look at the README and ChangeLog:"
-	einfo "/usr/share/doc/${PF}/README.gz"
-	einfo "/usr/share/doc/${PF}/ChangeLog.gz"
-	einfo "There are also pretty html docs available"
-	einfo "on Conky's site or in /usr/share/doc/${PF}"
-	einfo
-	einfo "Comment out temperature info lines if you have no kernel"
-	einfo "support for it."
-	einfo
-	einfo "Check out app-vim/conky-syntax for conkyrc"
-	einfo "syntax highlighting in Vim"
-	einfo
-	ewarn "Conky doesn't work with window managers that"
-	ewarn "take control over root window such as Gnome's nautilus."
-	ewarn
-}
diff --git a/app-admin/conky/conky-1.3.5-r1.ebuild b/app-admin/conky/conky-1.3.5-r1.ebuild
deleted file mode 100644
index 83ba8e294517..000000000000
--- a/app-admin/conky/conky-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.3.5-r1.ebuild,v 1.1 2006/03/01 21:30:07 dragonheart Exp $
-
-inherit eutils
-
-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="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype X ipv6"
-
-DEPEND_COMMON="
-	virtual/libc
-	X? (
-		|| ( ( x11-libs/libICE
-				x11-libs/libXext
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libXrender
-				x11-libs/libXft
-				)
-				virtual/x11
-		)
-		truetype? ( >=media-libs/freetype-2 )
-	)"
-
-RDEPEND="${DEPEND_COMMON}"
-
-DEPEND="
-	${DEPEND_COMMON}
-	X? (
-		|| ( ( x11-libs/libXt
-				x11-proto/xextproto
-				x11-proto/xproto
-				)
-				virtual/x11
-		)
-	)
-	sys-apps/grep
-	sys-apps/sed"
-
-
-src_compile() {
-	local mymake
-	if useq ipv6 ; then
-		ewarn
-		ewarn "You have the ipv6 USE flag enabled.  Please note that"
-		ewarn "using the ipv6 USE flag with Conky disables the port"
-		ewarn "monitor."
-		ewarn
-		epause
-	else
-		mymake="MPD_NO_IPV6=noipv6"
-	fi
-	local myconf
-	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime \
-		--enable-mpd --enable-mldonkey --disable-bmpx"
-	econf \
-		${myconf} \
-		$(use_enable truetype xft) \
-		$(use_enable X x11) \
-		$(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 doc/variables.html
-	dodoc doc/docs.html doc/config_settings.html
-}
-
-pkg_postinst() {
-	einfo 'Default configuration file is "~/.conkyrc"'
-	einfo "you can find a sample configuration file in"
-	einfo "/usr/share/doc/${PF}/conkyrc.sample.gz"
-	einfo
-	einfo "For more info on Conky's new features,"
-	einfo "please look at the README and ChangeLog:"
-	einfo "/usr/share/doc/${PF}/README.gz"
-	einfo "/usr/share/doc/${PF}/ChangeLog.gz"
-	einfo "There are also pretty html docs available"
-	einfo "on Conky's site or in /usr/share/doc/${PF}"
-	einfo
-	einfo "Check out app-vim/conky-syntax for conkyrc"
-	einfo "syntax highlighting in Vim"
-	einfo
-}
diff --git a/app-admin/conky/conky-1.4.1.ebuild b/app-admin/conky/conky-1.4.1.ebuild
deleted file mode 100644
index 4b7fb1489e50..000000000000
--- a/app-admin/conky/conky-1.4.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.4.1.ebuild,v 1.4 2006/06/11 20:23:09 chainsaw Exp $
-
-inherit eutils
-
-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="truetype X ipv6 bmpx xmms infopipe audacious"
-
-DEPEND_COMMON="
-	virtual/libc
-	X? (
-		|| ( ( x11-libs/libICE
-				x11-libs/libXext
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libXrender
-				x11-libs/libXft
-				)
-				virtual/x11
-		)
-		truetype? ( >=media-libs/freetype-2 )
-		bmpx? ( media-sound/bmpx
-				>=sys-apps/dbus-0.35
-			)
-		audacious? ( media-sound/audacious )
-		infopipe? ( media-plugins/xmms-infopipe )
-		xmms? ( media-sound/xmms )
-	)"
-
-RDEPEND="${DEPEND_COMMON}"
-
-DEPEND="
-	${DEPEND_COMMON}
-	X? (
-		|| ( ( x11-libs/libXt
-				x11-proto/xextproto
-				x11-proto/xproto
-				)
-				virtual/x11
-		)
-	)
-	sys-apps/grep
-	sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/conky-sigaction.patch
-}
-
-
-src_compile() {
-	local mymake
-	if useq ipv6 ; then
-		ewarn
-		ewarn "You have the ipv6 USE flag enabled.  Please note that"
-		ewarn "using the ipv6 USE flag with Conky disables the port"
-		ewarn "monitor."
-		ewarn
-		epause
-	else
-		mymake="MPD_NO_IPV6=noipv6"
-	fi
-	local myconf
-	myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime \
-		--enable-mpd --enable-mldonkey"
-	econf \
-		${myconf} \
-		$(use_enable truetype xft) \
-		$(use_enable X x11) \
-		$(use_enable bmpx) \
-		$(use_enable xmms) \
-		$(use_enable audacious) \
-		$(use_enable infopipe) \
-		$(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 doc/variables.html
-	dodoc doc/docs.html doc/config_settings.html
-}
-
-pkg_postinst() {
-	einfo 'Default configuration file is "~/.conkyrc"'
-	einfo "you can find a sample configuration file in"
-	einfo "/usr/share/doc/${PF}/conkyrc.sample.gz"
-	einfo
-	einfo "For more info on Conky's new features,"
-	einfo "please look at the README and ChangeLog:"
-	einfo "/usr/share/doc/${PF}/README.gz"
-	einfo "/usr/share/doc/${PF}/ChangeLog.gz"
-	einfo "There are also pretty html docs available"
-	einfo "on Conky's site or in /usr/share/doc/${PF}"
-	einfo
-	einfo "Check out app-vim/conky-syntax for conkyrc"
-	einfo "syntax highlighting in Vim"
-	einfo
-}
diff --git a/app-admin/conky/files/conky-1.3.4-arraybounds.patch b/app-admin/conky/files/conky-1.3.4-arraybounds.patch
deleted file mode 100644
index e06a6eb5229c..000000000000
--- a/app-admin/conky/files/conky-1.3.4-arraybounds.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/conky.h.old        2005-11-30 01:08:25.000000000 -0500
-+++ src/conky.h   2005-11-29 12:35:21.000000000 -0500
-@@ -55,6 +55,9 @@
- #define CRIT_ERR(s, varargs...) \
- { fprintf(stderr, "Conky: " s "\n", ##varargs);  exit(EXIT_FAILURE); }
-
-+#define MIN(a,b) (a>b ? b : a)
-+#define MAX(a,b) (a<b ? b : a)
-+
- struct i8k_struct {
-        char *version;
-        char *bios;
-
---- src/conky.c.old	2005-11-30 01:08:26.000000000 -0500
-+++ src/conky.c   2005-11-30 00:52:18.000000000 -0500
-@@ -3462,7 +3462,9 @@
- 		printf("%s\n", s);
- 	}
- 	/* daemon_run(s);  the daemon can be called here, but we need to have a buffer in daemon_run() and we need to tell it when everything is ready to be sent */
--	strcpy(tmpstring1, s);
-+	memset(tmpstring1,0,TEXT_BUFFER_SIZE);
-+	memset(tmpstring2,0,TEXT_BUFFER_SIZE);
-+	strncpy(tmpstring1, s, TEXT_BUFFER_SIZE-1);
- 	pos = 0;
- 	added = 0;
- 	char space[2];
-@@ -3483,13 +3485,21 @@
- 			for (i2 = 0;
- 			     i2 < (8 - (1 + pos) % 8) && added <= max;
- 			     i2++) {
--				tmpstring2[pos + i2] = ' ';
-+				/*
-+				if ( pos + i2 > TEXT_BUFFER_SIZE-1 )
-+					fprintf(stderr,"buffer overrun detected\n");
-+				*/
-+				tmpstring2[ MIN(pos + i2, TEXT_BUFFER_SIZE-1) ] = ' '; /* guard against overrun */
- 				added++;
- 			}
- 			pos += i2;
- 		} else {
- 			if (tmpstring1[i] != 9) {
--				tmpstring2[pos] = tmpstring1[i];
-+				/*
-+				if ( pos > TEXT_BUFFER_SIZE-1 )
-+					 fprintf(stderr,"buffer overrun detected\n");
-+				*/
-+				tmpstring2[ MIN(pos, TEXT_BUFFER_SIZE-1) ] = tmpstring1[i]; /* guard against overrun */
- 				pos++;
- 			}
- 		}
diff --git a/app-admin/conky/files/conky-1.3.4-miscbug.patch b/app-admin/conky/files/conky-1.3.4-miscbug.patch
deleted file mode 100644
index 492679674bbb..000000000000
--- a/app-admin/conky/files/conky-1.3.4-miscbug.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- src/conky.h.old	2005-11-16 18:45:32.000000000 -0500
-+++ src/conky.h	2005-11-24 23:06:25.046033576 -0500
-@@ -209,8 +209,8 @@
- 
- int use_spacer;
- 
--char *tmpstring1;
--char *tmpstring2;
-+char tmpstring1[TEXT_BUFFER_SIZE];
-+char tmpstring2[TEXT_BUFFER_SIZE];
- 
- #ifdef X11
- /* in x11.c */
---- src/conky.c.old	2005-11-16 19:32:39.000000000 -0500
-+++ src/conky.c	2005-11-24 23:03:03.675646528 -0500
-@@ -34,6 +34,9 @@
- #define MAIL_FILE "$MAIL"
- #define MAX_IF_BLOCK_DEPTH 5
- 
-+/* #define SIGNAL_BLOCKING */
-+#undef SIGNAL_BLOCKING
-+
- #ifdef X11
- 
- /* alignments */
-@@ -4060,6 +4063,15 @@
- 
- static void main_loop()
- {
-+#ifdef SIGNAL_BLOCKING
-+	sigset_t  newmask, oldmask;
-+
-+	sigemptyset(&newmask);
-+	sigaddset(&newmask,SIGINT);
-+	sigaddset(&newmask,SIGTERM);
-+	sigaddset(&newmask,SIGUSR1);
-+#endif
-+
- #ifdef X11
- 	Region region = XCreateRegion();
- #endif /* X11 */
-@@ -4067,6 +4079,13 @@
- 	info.looped = 0;
- 	while (total_run_times == 0 || info.looped < total_run_times - 1) {
- 		info.looped++;
-+
-+#ifdef SIGNAL_BLOCKING
-+		/* block signals.  we will inspect for pending signals later */
-+		if (sigprocmask(SIG_BLOCK, &newmask, &oldmask) < 0)
-+			CRIT_ERR("unable to sigprocmask()");
-+#endif
-+
- #ifdef X11
- 		XFlush(display);
- 
-@@ -4287,7 +4306,12 @@
- 		}
- #endif /* X11 */
- 
--		/* inspect pending signal prior to entering next loop */
-+#ifdef SIGNAL_BLOCKING
-+		/* unblock signals of interest and let handler fly */
-+		if (sigprocmask(SIG_SETMASK, &oldmask, NULL) < 0)
-+			CRIT_ERR("unable to sigprocmask()");
-+#endif
-+
- 		switch(g_signal_pending) {
- 		case SIGUSR1:
- 			{
-@@ -4964,6 +4988,8 @@
- 
- int main(int argc, char **argv)
- {
-+	struct sigaction act, oact;
-+
- 	g_signal_pending=0;
- 	memset(&info, 0, sizeof(info) );
- 
-@@ -5058,11 +5084,6 @@
- 	init_X11();
- #endif /* X11 */
- 
--	tmpstring1 = (char *)
--	    malloc(TEXT_BUFFER_SIZE);
--	tmpstring2 = (char *)
--	    malloc(TEXT_BUFFER_SIZE);
--
- 	/* load current_config or CONFIG_FILE */
- 
- #ifdef CONFIG_FILE
-@@ -5241,16 +5262,22 @@
- 	}
- 
- 	/* Set signal handlers */
--	if ( signal(SIGINT,signal_handler) == SIG_ERR ||
--	     signal(SIGUSR1,signal_handler) == SIG_ERR ||
--	     signal(SIGTERM,signal_handler) == SIG_ERR )
-+	act.sa_handler = signal_handler;
-+	sigemptyset(&act.sa_mask);
-+	act.sa_flags = 0;
-+#ifdef SA_RESTART
-+	act.sa_flags |= SA_RESTART;
-+#endif
-+
-+	if ( sigaction(SIGINT,&act,&oact) < 0 ||
-+	     sigaction(SIGUSR1,&act,&oact) < 0 ||
-+	     sigaction(SIGTERM,&act,&oact) < 0 )
- 	{
- 		ERR("error setting signal handler: %s", strerror(errno) );
- 	}
- 
- 	main_loop();
--	free(tmpstring1);
--	free(tmpstring2);
-+
- 	return 0;
- }
- 
diff --git a/app-admin/conky/files/digest-conky-1.3.4-r2 b/app-admin/conky/files/digest-conky-1.3.4-r2
deleted file mode 100644
index b9c3e88e7462..000000000000
--- a/app-admin/conky/files/digest-conky-1.3.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 91f7d4ce29a6bc2d785f13224ea4aaac conky-1.3.4.tar.bz2 332871
-RMD160 13f61eaada0171f5c60010941cbed3b030ff99b8 conky-1.3.4.tar.bz2 332871
-SHA256 049e490936769d3b4ce7c2d9a240dc61a31aa065ec0ccd8e4ab0dcd35cdca99e conky-1.3.4.tar.bz2 332871
diff --git a/app-admin/conky/files/digest-conky-1.3.5-r1 b/app-admin/conky/files/digest-conky-1.3.5-r1
deleted file mode 100644
index d3d362320e65..000000000000
--- a/app-admin/conky/files/digest-conky-1.3.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e93e0f930dc2d8adfff6dec1e8db301b conky-1.3.5.tar.bz2 339478
-RMD160 d3054cfeb896c16f753830e023ab5e0896de1040 conky-1.3.5.tar.bz2 339478
-SHA256 5e7ac1fb87073bef4565066920e98923a04207cf7519a4552de99f19d027a6e5 conky-1.3.5.tar.bz2 339478
diff --git a/app-admin/conky/files/digest-conky-1.4.1 b/app-admin/conky/files/digest-conky-1.4.1
deleted file mode 100644
index dccf6d176a53..000000000000
--- a/app-admin/conky/files/digest-conky-1.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 14227017a9fbd11b413990793d3783bb conky-1.4.1.tar.bz2 364106
-RMD160 c8a20d9331e363a05b3a233ff2a4d4dbf875e1c0 conky-1.4.1.tar.bz2 364106
-SHA256 ea12650dfe96bec612fa0185f3191bd882a7381d80726ef510f113ce226f3e40 conky-1.4.1.tar.bz2 364106