--- rdtool-0.6.14-r1.ebuild.~1.18~	2007-07-05 21:56:47.000000000 +0200
+++ rdtool-0.6.14-r1.ebuild	2007-07-05 21:58:42.000000000 +0200
@@ -2,9 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.14-r1.ebuild,v 1.18 2007/04/14 06:13:10 graaff Exp $
 
-IUSE="emacs"
-
-inherit ruby elisp-common
+inherit elisp-common ruby
 
 DESCRIPTION="A multipurpose documentation format for Ruby"
 HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=rdtool"
@@ -12,18 +10,20 @@
 LICENSE="Ruby GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="emacs"
 
 USE_RUBY="any"
 
 DEPEND=">=dev-lang/ruby-1.8.0
 	dev-ruby/amstd
 	emacs? ( virtual/emacs )"
+SITEFILE=50${PN}-gentoo.el
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i -e 's:^BIN_DIR = :&$(DESTDIR):' \
-	       -e 's:^SITE_RUBY = :&$(DESTDIR):' rdtoolconf.rb \
+		   -e 's:^SITE_RUBY = :&$(DESTDIR):' rdtoolconf.rb \
 		|| die "sed failed"
 	mv rdtoolconf.rb extconf.rb
 }
@@ -33,17 +33,15 @@
 	ruby_src_install
 
 	if use emacs ; then
-		elisp-install . utils/rd-mode.el
-		elisp-site-file-install ${FILESDIR}/50rdtool-gentoo.el
+		elisp-install ${PN} utils/rd-mode.el
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 }
 
 pkg_postinst() {
-
 	use emacs && elisp-site-regen
 }
 
 pkg_postrm() {
-
 	use emacs && elisp-site-regen
 }