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 38FC6138ACF for ; Wed, 21 Jan 2015 21:43:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2C2DE08C9; 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 6BCF4E08C9 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 63FED3406FE 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 214E210153 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: <1421876148.b78e8134e02bfdc88747a73216d02111467c62f2.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 X-VCS-Directories: app-emacs/emacs-common-gentoo/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: b78e8134e02bfdc88747a73216d02111467c62f2 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: 575011d9-171f-46fa-8f29-a73573fc27b4 X-Archives-Hash: e02c1b26e26b86e3c7b91dd2cd672d60 commit: b78e8134e02bfdc88747a73216d02111467c62f2 Author: Ulrich Müller gentoo org> AuthorDate: Wed Jan 21 21:35:48 2015 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Jan 21 21:35:48 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=b78e8134 app-emacs/emacs-common-gentoo: Test new setgid games setup. Package-Manager: portage-2.2.15 --- app-emacs/emacs-common-gentoo/ChangeLog | 6 + .../emacs-common-gentoo-9999-r1.ebuild | 143 +++++++++++++++++++++ 2 files changed, 149 insertions(+) diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog index 7e6ffe0..3d21394 100644 --- a/app-emacs/emacs-common-gentoo/ChangeLog +++ b/app-emacs/emacs-common-gentoo/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*emacs-common-gentoo-9999-r1 (21 Jan 2015) + + 21 Jan 2015; Ulrich Müller + +emacs-common-gentoo-9999-r1.ebuild: + Test new setgid games setup. + 21 Jan 2015; Ulrich Müller emacs-common-gentoo-9999.ebuild: Merge changes from Portage tree. diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild new file mode 100644 index 0000000..48c2eb6 --- /dev/null +++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/emacs-tools.git" +EGIT_BRANCH="${PN}" +EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}" + +inherit elisp-common eutils fdo-mime gnome2-utils readme.gentoo user git-r3 + +DESCRIPTION="Common files needed by all GNU Emacs versions" +HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Emacs" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="games X" + +PDEPEND="virtual/emacs" + +S="${WORKDIR}/${PN}" + +pkg_setup() { + use games && enewgroup games 35 +} + +src_install() { + insinto "${SITELISP}" + doins subdirs.el + newins site-gentoo.el{,.orig} + + keepdir /etc/emacs + insinto /etc/emacs + doins site-start.el + + if use games; then + keepdir /var/games/emacs + fowners root:games /var/games/emacs + fi + + if use X; then + local i + domenu emacs.desktop emacsclient.desktop || die + + pushd icons + newicon sink.png emacs-sink.png || die + newicon emacs_48.png emacs.png || die + newicon emacs22_48.png emacs22.png || die + for i in 16 24 32 48 128; do + insinto /usr/share/icons/hicolor/${i}x${i}/apps + newins emacs_${i}.png emacs.png + [[ ${i} -ne 128 ]] && newins emacs22_${i}.png emacs22.png + done + insinto /usr/share/icons/hicolor/scalable/apps + doins emacs.svg + popd + + gnome2_icon_savelist + fi + + DOC_CONTENTS="All site initialisation for Gentoo-installed packages is + added to ${SITELISP}/site-gentoo.el. In order for this site + initialisation to be loaded for all users automatically, a default + site startup file /etc/emacs/site-start.el is installed. You are + responsible for maintenance of this file. + \n\nAlternatively, individual users can add the following command: + \n\n(require 'site-gentoo) + \n\nto their ~/.emacs initialisation files, or, for greater + flexibility, users may load single package-specific initialisation + files from the ${SITELISP}/site-gentoo.d/ directory." + readme.gentoo_create_doc +} + +site-start-modified-p() { + case $(cksum <"${EROOT}${SITELISP}/site-start.el") in + # checksums of auto-generated site-start.el files + "2098727038 349") return 1 ;; # elisp-common.eclass + "3626264063 355") return 1 ;; # emacs-common-gentoo-1.0 (cvs rev 1.1) + "3738455534 394") return 1 ;; # emacs-common-gentoo-1.0 (cvs rev 1.6) + "4199862847 394") return 1 ;; # emacs-common-gentoo-1.1 + "2547348044 394") return 1 ;; # emacs-common-gentoo-1.2 + "2214952934 397") return 1 ;; # emacs-common-gentoo-1.2-r1 + "3917799317 397") return 1 ;; # emacs-common-gentoo-1.2-r2 + *) return 0 ;; + esac +} + +pkg_preinst() { + # make sure that site-gentoo.el exists since site-start.el requires it + if [[ ! -d ${EROOT}${SITELISP} ]]; then + mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die + else + elisp-site-regen + rm "${ED}${SITELISP}/site-gentoo.el.orig" || die + cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die + fi + + if use games; then + local f + 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 root:games "${ED}${f}" || die + done + fi + + if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then + ewarn "The location of the site startup file for Emacs has changed to" + ewarn "/etc/emacs/site-start.el." + if site-start-modified-p; then + eerror "Locally modified ${SITELISP}/site-start.el file found." + eerror "If this file contains your own customisation, you should" + eerror "move it to /etc/emacs/. In any case, you must remove the" + eerror "file from the old location." + die "Cannot continue unless ${SITELISP}/site-start.el is removed." + else + ewarn "Removing the old ${SITELISP}/site-start.el file." + rm -f "${EROOT}${SITELISP}/site-start.el" + fi + fi +} + +pkg_postinst() { + if use X; then + fdo-mime_desktop_database_update + gnome2_icon_cache_update + fi + + readme.gentoo_print_elog +} + +pkg_postrm() { + if use X; then + fdo-mime_desktop_database_update + gnome2_icon_cache_update + fi +}