--- gettext-0.16.1.ebuild~	2007-06-30 19:15:16.000000000 +0200
+++ gettext-0.16.1.ebuild	2007-06-30 19:18:48.000000000 +0200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1.ebuild,v 1.12 2007/03/16 17:24:25 yoswink Exp $
 
-inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common
+inherit flag-o-matic eutils multilib toolchain-funcs mono libtool
 
 DESCRIPTION="GNU locale utilities"
 HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html"
@@ -15,6 +15,7 @@
 
 DEPEND="virtual/libiconv
 	dev-libs/expat"
+PDEPEND="emacs? ( app-emacs/po-mode )"
 
 src_unpack() {
 	unpack ${A}
@@ -51,7 +52,7 @@
 	use nocxx && export CXX=$(tc-getCC)
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
-		$(use_with emacs) \
+		--without-emacs \
 		--disable-java \
 		${myconf} \
 		|| die
@@ -86,13 +87,6 @@
 	fi
 	rm -f "${D}"/usr/share/doc/${PF}/*.html
 
-	# Remove emacs site-lisp stuff if 'emacs' is not in USE
-	if use emacs ; then
-		elisp-site-file-install "${FILESDIR}"/50po-mode-gentoo.el
-	else
-		rm -rf "${D}"/usr/share/emacs
-	fi
-
 	dodoc AUTHORS ChangeLog NEWS README THANKS
 }
 
@@ -104,13 +98,8 @@
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
 	ewarn "Any package that linked against the previous version"
 	ewarn "of gettext will have to be rebuilt."
 	ewarn "Please 'emerge gentoolkit' and run:"
 	ewarn "revdep-rebuild --library libintl.so.7"
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}