--- /usr/portage/eclass/vim.eclass	2005-02-08 22:43:24.000000000 +0100
+++ vim.eclass	2005-02-19 00:59:49.000000000 +0100
@@ -23,7 +23,7 @@
 # -aqua -gtk -motif nextaw      NEXTAW (7+)
 # -aqua -gtk -motif -nextaw     ATHENA
 
-inherit eutils vim-doc flag-o-matic versionator fdo-mime
+inherit eutils vim-doc flag-o-matic versionator fdo-mime alternatives
 
 # Support -cvs ebuilds, even though they're not in the official tree.
 MY_PN="${PN%-cvs}"
@@ -535,12 +535,6 @@
 
 	else
 		dobin src/vim
-		ln -s vim ${D}/usr/bin/vimdiff && \
-		ln -s vim ${D}/usr/bin/rvim && \
-		ln -s vim ${D}/usr/bin/ex && \
-		ln -s vim ${D}/usr/bin/view && \
-		ln -s vim ${D}/usr/bin/rview \
-			|| die "/usr/bin symlinks failed"
 		if [[ $(get_major_version ) -ge 7 ]] && use vim-pager ; then
 			ln -s /usr/share/vim/vim${VIM_VERSION//./}/macros/less.sh \
 					${D}/usr/bin/vimpager
@@ -568,12 +562,7 @@
 update_vim_symlinks() {
 	local f syms
 
-	# Some of these are provided already on x86-fbsd, bug 69535.
-	if use x86-fbsd ; then
-		syms="vimdiff rvim rview"
-	else
-		syms="vi vimdiff rvim ex view rview"
-	fi
+	syms="vimdiff rvim rview"
 
 	# Make or remove convenience symlink, vim -> gvim
 	if [[ -f ${ROOT}/usr/bin/gvim ]]; then
@@ -595,9 +584,12 @@
 		done
 	fi
 
-	# This will still break if you merge then remove the vi package,
-	# but there's only so much you can do, eh?  Unfortunately we don't
-	# have triggers like are done in rpm-land.
+	# These are provided already on x86-fbsd, bug 69535.
+	if ! use x86-fbsd ; then
+		alternatives_makesym /usr/bin/vi /usr/bin/vim /usr/bin/nvi
+		alternatives_makesym /usr/bin/ex /usr/bin/vim /usr/bin/nex
+		alternatives_makesym /usr/bin/view /usr/bin/vim /usr/bin/nview
+	fi
 }
 
 pkg_postinst() {