From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DA910138A1A for ; Wed, 21 Jan 2015 21:43:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78806E091B; Wed, 21 Jan 2015 21:43:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24A24E08B8 for ; Wed, 21 Jan 2015 21:43:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5319F3406F7 for ; Wed, 21 Jan 2015 21:43:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F4DF1014D for ; Wed, 21 Jan 2015 21:43:06 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1421875614.46ec0f08d13d35b673c5e8a0c9ae630fec0b4715.ulm@gentoo> Subject: [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/ X-VCS-Repository: proj/emacs X-VCS-Files: app-emacs/emacs-common-gentoo/ChangeLog app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild X-VCS-Directories: app-emacs/emacs-common-gentoo/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 46ec0f08d13d35b673c5e8a0c9ae630fec0b4715 X-VCS-Branch: master Date: Wed, 21 Jan 2015 21:43:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 73f7ea8d-daee-4d57-b763-34c63469d8d2 X-Archives-Hash: adb8c5518d88a82385ddb0e86b8eb48b commit: 46ec0f08d13d35b673c5e8a0c9ae630fec0b4715 Author: Ulrich Müller gentoo org> AuthorDate: Wed Jan 21 21:26:54 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Jan 21 21:26:54 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=46ec0f08 app-emacs/emacs-common-gentoo: Merge changes from Portage tree. Package-Manager: portage-2.2.15 --- app-emacs/emacs-common-gentoo/ChangeLog | 5 ++++- 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 emacs-common-gentoo-9999.ebuild: + Merge changes from Portage tree. + 19 Jan 2014; Ulrich Müller 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