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 58F16138A87 for ; Sun, 22 Feb 2015 18:26:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E75DE0914; Sun, 22 Feb 2015 18:26:31 +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 BBA9BE0914 for ; Sun, 22 Feb 2015 18:26:30 +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 67DA1340B1E for ; Sun, 22 Feb 2015 18:26:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F36C12532 for ; Sun, 22 Feb 2015 18:26:25 +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: <1424629552.cf9d573cea3688ca7e85403d3e7663568f27d34a.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-r1.ebuild 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: cf9d573cea3688ca7e85403d3e7663568f27d34a X-VCS-Branch: master Date: Sun, 22 Feb 2015 18:26:25 +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: f9c6734f-aec8-4677-b23a-8b9704299b42 X-Archives-Hash: 22a10d91aa09b5d778da71bf4cf823fc commit: cf9d573cea3688ca7e85403d3e7663568f27d34a Author: Ulrich Müller gentoo org> AuthorDate: Sun Feb 22 18:25:52 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Feb 22 18:25:52 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=cf9d573c app-emacs/emacs-common-gentoo: Sync from Portage tree. Package-Manager: portage-2.2.17 --- app-emacs/emacs-common-gentoo/ChangeLog | 4 ++++ ...99-r1.ebuild => emacs-common-gentoo-9999.ebuild} | 21 ++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog index d5575fd..dd4a433 100644 --- a/app-emacs/emacs-common-gentoo/ChangeLog +++ b/app-emacs/emacs-common-gentoo/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Feb 2015; Ulrich Müller + +emacs-common-gentoo-9999.ebuild, -emacs-common-gentoo-9999-r1.ebuild: + Sync from Portage tree. + 21 Feb 2015; Ulrich Müller -emacs-common-gentoo-9999.ebuild, emacs-common-gentoo-9999-r1.ebuild: Sync from Portage tree. Remove old. diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild similarity index 89% rename from app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild rename to app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild index 73cd753..8187379 100644 --- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild +++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild @@ -110,6 +110,18 @@ pkg_preinst() { chgrp gamestat "${ED}${f}" || die chmod g+w "${ED}${f}" || die done + + if [[ -d ${EROOT}/var/games && -z $(find "${EROOT}"/var/games \ + -maxdepth 0 -uid 0 -gid 0 -perm 755 -print) ]]; then + chown 0:0 "${EROOT}"/var/games || die + chmod 755 "${EROOT}"/var/games || die + fi + if has 1.4-r1 ${REPLACING_VERSIONS} \ + && [[ -d ${EROOT}/var/games/emacs ]]; then + elog "Updating owner and permissions of score file directory." + chown 0:gamestat "${EROOT}"/var/games/emacs || die + chmod 775 "${EROOT}"/var/games/emacs || die + fi fi if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then @@ -129,19 +141,10 @@ pkg_preinst() { } pkg_postinst() { - if use games; then - # update permissions of shared score dir #537580 - chown 0:0 "${EROOT}"/var/games - chmod 755 "${EROOT}"/var/games - chown 0:gamestat "${EROOT}"/var/games/emacs - chmod 775 "${EROOT}"/var/games/emacs - fi - if use X; then fdo-mime_desktop_database_update gnome2_icon_cache_update fi - readme.gentoo_print_elog }