[patch] emacs-common-gentoo-1.5.ebuild.diff

emacs-common-gentoo-1.5.ebuild.diff (text/plain), 878 bytes, created by Ulrich Müller on 2015-07-11 15:12:23 UTC

Index: emacs-common-gentoo-1.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v
retrieving revision 1.11
diff -u -B -r1.11 emacs-common-gentoo-1.5.ebuild
--- emacs-common-gentoo-1.5.ebuild	5 Jun 2015 12:07:06 -0000	1.11
+++ emacs-common-gentoo-1.5.ebuild	11 Jul 2015 15:10:22 -0000
@@ -71,11 +71,11 @@
 
 pkg_preinst() {
 	# make sure that site-gentoo.el exists since site-start.el requires it
-	if [[ ! -d ${EROOT}${SITELISP} ]]; then
+	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
 		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
-	else
+	fi
+	if [[ -d ${EROOT}${SITELISP} ]]; then
 		elisp-site-regen
-		rm "${ED}${SITELISP}/site-gentoo.el.orig" || die
 		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
 	fi