Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 69852 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/eclass/vim.eclass (-16 / +8 lines)
Lines 23-29 Link Here
23
# -aqua -gtk -motif nextaw      NEXTAW (7+)
23
# -aqua -gtk -motif nextaw      NEXTAW (7+)
24
# -aqua -gtk -motif -nextaw     ATHENA
24
# -aqua -gtk -motif -nextaw     ATHENA
25
25
26
inherit eutils vim-doc flag-o-matic versionator fdo-mime
26
inherit eutils vim-doc flag-o-matic versionator fdo-mime alternatives
27
27
28
# Support -cvs ebuilds, even though they're not in the official tree.
28
# Support -cvs ebuilds, even though they're not in the official tree.
29
MY_PN="${PN%-cvs}"
29
MY_PN="${PN%-cvs}"
Lines 535-546 Link Here
535
535
536
	else
536
	else
537
		dobin src/vim
537
		dobin src/vim
538
		ln -s vim ${D}/usr/bin/vimdiff && \
539
		ln -s vim ${D}/usr/bin/rvim && \
540
		ln -s vim ${D}/usr/bin/ex && \
541
		ln -s vim ${D}/usr/bin/view && \
542
		ln -s vim ${D}/usr/bin/rview \
543
			|| die "/usr/bin symlinks failed"
544
		if [[ $(get_major_version ) -ge 7 ]] && use vim-pager ; then
538
		if [[ $(get_major_version ) -ge 7 ]] && use vim-pager ; then
545
			ln -s /usr/share/vim/vim${VIM_VERSION//./}/macros/less.sh \
539
			ln -s /usr/share/vim/vim${VIM_VERSION//./}/macros/less.sh \
546
					${D}/usr/bin/vimpager
540
					${D}/usr/bin/vimpager
Lines 568-579 Link Here
568
update_vim_symlinks() {
562
update_vim_symlinks() {
569
	local f syms
563
	local f syms
570
564
571
	# Some of these are provided already on x86-fbsd, bug 69535.
565
	syms="vimdiff rvim rview"
572
	if use x86-fbsd ; then
573
		syms="vimdiff rvim rview"
574
	else
575
		syms="vi vimdiff rvim ex view rview"
576
	fi
577
566
578
	# Make or remove convenience symlink, vim -> gvim
567
	# Make or remove convenience symlink, vim -> gvim
579
	if [[ -f ${ROOT}/usr/bin/gvim ]]; then
568
	if [[ -f ${ROOT}/usr/bin/gvim ]]; then
Lines 595-603 Link Here
595
		done
584
		done
596
	fi
585
	fi
597
586
598
	# This will still break if you merge then remove the vi package,
587
	# These are provided already on x86-fbsd, bug 69535.
599
	# but there's only so much you can do, eh?  Unfortunately we don't
588
	if ! use x86-fbsd ; then
600
	# have triggers like are done in rpm-land.
589
		alternatives_makesym /usr/bin/vi /usr/bin/vim /usr/bin/nvi
590
		alternatives_makesym /usr/bin/ex /usr/bin/vim /usr/bin/nex
591
		alternatives_makesym /usr/bin/view /usr/bin/vim /usr/bin/nview
592
	fi
601
}
593
}
602
594
603
pkg_postinst() {
595
pkg_postinst() {

Return to bug 69852