Index: guile-1.8.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.5.ebuild,v
retrieving revision 1.2
diff -u -B -r1.2 guile-1.8.5.ebuild
--- guile-1.8.5.ebuild	4 Jul 2008 19:21:08 -0000	1.2
+++ guile-1.8.5.ebuild	16 Aug 2008 10:04:25 -0000
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.5.ebuild,v 1.2 2008/07/04 19:21:08 hkbst Exp $
 
-inherit eutils autotools flag-o-matic
+inherit eutils autotools flag-o-matic elisp-common
 
 DESCRIPTION="Scheme interpreter"
 HOMEPAGE="http://www.gnu.org/software/guile/"
@@ -12,7 +12,10 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 RESTRICT="!regex? ( test )"
 
-DEPEND=">=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext"
+DEPEND=">=dev-libs/gmp-4.1
+	>=sys-devel/libtool-1.5.6
+	sys-devel/gettext
+	emacs? ( virtual/emacs )"
 
 # Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
 # but there are lots of collisions. Most in /usr/share/libguile. Therefore
@@ -20,7 +23,7 @@
 SLOT="12"
 MAJOR="1.8"
 
-IUSE="networking regex discouraged deprecated elisp nls debug-freelist debug-malloc debug threads"
+IUSE="networking regex discouraged deprecated elisp emacs nls debug-freelist debug-malloc debug threads"
 
 src_unpack() {
 	unpack ${A}; cd "${S}"
@@ -42,6 +45,7 @@
 	filter-flags -ftree-vectorize
 
 #will fail for me if posix is disabled or without modules -- hkBst
+	# disable build system's Emacs support; do it manually for USE=emacs
 	econf \
 		--disable-error-on-warning \
 		--disable-static \
@@ -57,9 +61,14 @@
 		$(use_enable debug-malloc) \
 		$(use_enable debug guile-debug) \
 		$(use_with threads) \
-		--with-modules
+		--with-modules \
+		EMACS=no
 
 	emake || die "make failed"
+
+	if use emacs; then
+		elisp-compile emacs/*.el || die "elisp-compile failed"
+	fi
 }
 
 src_install() {
@@ -73,10 +82,21 @@
 
 	# necessary for registering slib, see bug 206896
 	keepdir /usr/share/guile/site
+
+	if use emacs; then
+		elisp-install ${PN} emacs/*.{el,elc} || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
 }
 
 pkg_postinst() {
 	[ "${ROOT}" == "/" ] && pkg_config
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }
 
 pkg_config() {