diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2015-01-21 22:26:54 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-01-21 22:26:54 +0100 |
| commit | 46ec0f08d13d35b673c5e8a0c9ae630fec0b4715 (patch) | |
| tree | 8cfe7f3208b7bf74170bc27921c70865a84c5249 | |
| parent | app-xemacs/xemacs-base: Pre release version bump. (diff) | |
| download | emacs-46ec0f08d13d35b673c5e8a0c9ae630fec0b4715.tar.gz emacs-46ec0f08d13d35b673c5e8a0c9ae630fec0b4715.tar.bz2 emacs-46ec0f08d13d35b673c5e8a0c9ae630fec0b4715.zip | |
app-emacs/emacs-common-gentoo: Merge changes from Portage tree.
Package-Manager: portage-2.2.15
| -rw-r--r-- | app-emacs/emacs-common-gentoo/ChangeLog | 5 | ||||
| -rw-r--r-- | app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog index a748e8c..7e6ffe0 100644 --- a/app-emacs/emacs-common-gentoo/ChangeLog +++ b/app-emacs/emacs-common-gentoo/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for app-emacs/emacs-common-gentoo -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 21 Jan 2015; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild: + Merge changes from Portage tree. + 19 Jan 2014; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild: Switch from package.mask to empty KEYWORDS. diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild index 2671c28..820132b 100644 --- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild +++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -40,8 +40,8 @@ src_install() { doins site-start.el if use games; then - keepdir /var/lib/games/emacs - fowners "${GAMES_USER_DED:-games}" /var/lib/games/emacs + keepdir /var/games/emacs + fowners "${GAMES_USER_DED:-games}" /var/games/emacs fi if use X; then @@ -103,9 +103,12 @@ pkg_preinst() { if use games; then local f - for f in /var/lib/games/emacs/{snake,tetris}-scores; do + for f in /var/games/emacs/{snake,tetris}-scores; do if [[ -e ${EROOT}${f} ]]; then cp "${EROOT}${f}" "${ED}${f}" || die + elif [[ -e ${EROOT}/var/lib${f#/var} ]]; then + # backwards compatibility + cp "${EROOT}/var/lib${f#/var}" "${ED}${f}" || die fi touch "${ED}${f}" || die chown "${GAMES_USER_DED:-games}" "${ED}${f}" || die |