diff --git a/app-admin/conky/conky-1.999.ebuild b/app-admin/conky/conky-1.999.ebuild
deleted file mode 100644
index 9758cd70..00000000
--- a/app-admin/conky/conky-1.999.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Subversion repository ebuild for conky by drphibes
-# $Header: $
-
-inherit eutils
-# used for epause
-
-ESVN_REPO_URI="https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1"
-ESVN_PROJECT="conky1"
-inherit subversion
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sourceforge.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="audacious audacious-legacy bmpx debug hddtemp ipv6 mpd nano-syntax rss truetype vim-syntax
-smapi wifi X"
-
-DEPEND_COMMON="
-	virtual/libc
-	dev-util/pkgconfig
-	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 )
-		audacious-legacy? ( <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 ) )
-	nano-syntax? ( app-editors/nano )"
-
-DEPEND="
-	${DEPEND_COMMON}
-	X? (
-		x11-libs/libXt
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
-
-S=${WORKDIR}/conky
-
-pkg_setup() {
-	if use audacious; then
-		if has_version <media-sound/audacious-1.5.0 && ! built_with_use media-sound/audacious dbus; then
-			eerror "media-sound/audacious is not built with dbus USE flag."
-			eerror "Please add 'dbus' to your USE flags, and re-emerge media-sound/audacious."
-			die "media-sound/audacious needs USE=dbus"
-		fi
-	fi
-}
-
-src_compile() {
-	./autogen.sh ${ESVN_STORE_DIR}/${ESVN_PROJECT}/conky1
-
-	local mymake
-	if useq ipv6 ; then
-		ewarn "You have the ipv6 USE flag enabled.  Please note that using"
-		ewarn "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
-	if useq audacious-legacy; then
-		myconf="${myconf} --enable-audacious=legacy"
-	elif useq audacious; then
-		myconf="${myconf} --enable-audacious"
-	fi
-	econf \
-		${myconf} \
-		$(use_enable bmpx) \
-		$(use_enable debug) \
-		$(use_enable hddtemp ) \
-		$(use_enable mpd) \
-		$(use_enable rss) \
-		$(use_enable smapi) \
-		$(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
-	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
-
-	if use nano-syntax; then
-		insinto /usr/share/nano/
-		doins "${S}"/extras/nano/conky.nanorc
-	fi
-}
-
-pkg_postinst() {
-	elog "You can find the sample configuration file at"
-	elog "/etc/conky/conky.conf.  To customize it, copy"
-	elog "/etc/conky/conky.conf to ~/.conkyrc and edit"
-	elog "it to your liking."
-	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, for Nano with USE=nano-syntax"
-	elog
-}
diff --git a/doc/docs.xml b/doc/docs.xml
index 7f2473e7..d77c2e5b 100644
--- a/doc/docs.xml
+++ b/doc/docs.xml
@@ -79,7 +79,7 @@
 		</para>
 		<para>
 			Gentoo users -- Conky is in Gentoo's Portage... simply use "emerge app-admin/conky" for installation.
-			There is also usually an up-to-date ebuild within Conky's package or in	SVN.
+			There is also usually an up-to-date ebuild within Conky's package or in	the git repo.
 		</para>
 		<para>
 			Debian, etc. users -- Conky should be in your repositories, and can be installed by doing
@@ -91,7 +91,7 @@
 		<variablelist>
 			<varlistentry>
 				<term>
-					<command><option>sh autogen.sh</option></command> <option># Only required if building from SVN</option>
+					<command><option>sh autogen.sh</option></command> <option># Only required if building from the git repo</option>
 				</term>
 			</varlistentry>
 			<varlistentry>