--- root-5.20.00.ebuild	29 Jul 2008 10:43:53 -0000	1.4
+++ root-5.20.00.ebuild	2 Sep 2008 16:04:51 -0000
@@ -3,7 +3,7 @@ 
 # $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00.ebuild,v 1.4 2008/07/29 10:43:53 bicatali Exp $
 
 EAPI=1
-inherit versionator flag-o-matic eutils toolchain-funcs qt4 fortran
+inherit versionator flag-o-matic eutils toolchain-funcs qt4 fortran elisp-common
 
 #DOC_PV=$(get_major_version)_$(get_version_component_range 2)
 DOC_PV=5_16
@@ -17,7 +17,7 @@ 
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 
-IUSE="afs cern clarens doc fftw geant4 kerberos ldap +math mysql odbc
+IUSE="afs cern clarens doc emacs fftw geant4 kerberos ldap +math mysql odbc
 	oracle postgres python ruby qt4 ssl xml xrootd"
 
 # libafterimage ignored, may be re-install for >=5.20
@@ -53,7 +53,8 @@ 
 	geant4? ( sci-physics/geant:4 )
 	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
 	oracle? ( dev-db/oracle-instantclient-basic )
-	clarens? ( dev-libs/xmlrpc-c )"
+	clarens? ( dev-libs/xmlrpc-c )
+	emacs? ( virtual/emacs )"
 
 DEPEND="${RDEPEND}
 	cern? ( dev-lang/cfortran )
@@ -179,6 +180,10 @@ 
 
 	emake || die "emake failed"
 	emake cintdlls || die "emake cintdlls failed"
+
+	if use emacs; then
+		elisp-compile build/misc/*.el || die "elisp-compile failed"
+	fi
 }
 
 src_install() {
@@ -193,4 +198,11 @@ 
 		doins "${DISTDIR}"/Users_Guide_${DOC_PV}.pdf \
 			|| die "pdf install failed"
 	fi
+
+	# The build system installs Emacs support unconditionally and in the wrong
+	# directory. Remove it and call elisp-install in case of USE=emacs.
+	rm -rf "${D}"/usr/share/emacs
+	if use emacs; then
+		elisp-install ${PN} build/misc/*.{el,elc} || die "elisp-install failed"
+	fi
 }