--- asymptote-1.33.ebuild	2007-09-22 12:30:23.000000000 +0200
+++ asymptote-1.33.ebuild.new	2007-09-22 12:42:22.000000000 +0200
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.33.ebuild,v 1.1 2007/08/28 21:13:22 centic Exp $
 
-inherit eutils elisp-common
+inherit eutils elisp-common latex-package
 
 DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net"
+HOMEPAGE="http://asymptote.sourceforge.net/"
 SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 LICENSE="GPL-2"
 
@@ -22,7 +22,7 @@
 	fftw? ( >=sci-libs/fftw-3.0.1 )
 	emacs? ( virtual/emacs )
 	gsl? ( sci-libs/gsl )
-	vim-syntax? ( app-editors/vim )"
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.5
 	>=sys-devel/bison-1.875
@@ -31,6 +31,8 @@
 		virtual/ghostscript
 		>=sys-apps/texinfo-4.7-r1 )"
 
+SITEFILE=64${PN}-gentoo.el
+
 pkg_setup() {
 	# checking if Boehm garbage collector was compiled with c++ support
 	if use boehm-gc ; then
@@ -55,10 +57,10 @@
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 
 	# Fixing fftw and gsl enabling
-	epatch ${FILESDIR}/${P}-configure-ac.patch
+	epatch "${FILESDIR}/${P}-configure-ac.patch"
 	einfo "Patching configure.ac"
 	sed -i \
 		-e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
@@ -67,7 +69,7 @@
 	einfo "Building configure"
 	WANT_AUTOCONF=2.5 autoconf
 
-	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch "${FILESDIR}/${P}-makefile.patch"
 }
 
 src_compile() {
@@ -83,6 +85,10 @@
 
 	econf ${myconf} $(use_with fftw) $(use_with gsl) || die "econf failed"
 	emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile base/*.el || die "elisp-compile failed"
+	fi
 }
 
 src_install() {
@@ -94,25 +100,25 @@
 		target="install"
 	fi
 
-	make DESTDIR=${D} ${target} || die "make install failed"
+	emake DESTDIR="${D}" ${target} || die "emake install failed"
 
 	dodoc BUGS ChangeLog README ReleaseNotes TODO
 
 	if use emacs ; then
-		elisp-site-file-install base/asy-mode.el
-		elisp-site-file-install base/asy-keywords.el
-		elisp-site-file-install "${FILESDIR}"/64asy-gentoo.el
+		elisp-install ${PN} base/*.el base/*.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
 	if use vim-syntax ; then
 		insinto /usr/share/vim/vimfiles/syntax
 		doins base/asy.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}/asy-ftd.vim"
 	fi
 }
 
 pkg_postinst() {
-	einfo 'Updating TeX tree...'
-	texhash &> /dev/null
+	latex-package_rehash
 
 	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
 	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
@@ -121,8 +127,6 @@
 }
 
 pkg_postrm() {
-	einfo 'Updating TeX tree...'
-	texhash &> /dev/null
-
-	[ -f "${SITELISP}"/site-gentoo.el ] && elisp-site-regen
+	latex-package_rehash
+	use emacs && elisp-site-regen
 }