* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2013-10-31 15:07 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2013-10-31 15:07 UTC (permalink / raw
To: gentoo-commits
commit: a5b462bd12ae7e6b517155e49ed90ec267722c4c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 14:56:14 2013 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 14:56:14 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=a5b462bd
Create site-gentoo.el in preinst phase and have it belong to this package.
Package-Manager: portage-2.2.7
---
app-emacs/emacs-common-gentoo/ChangeLog | 3 +++
app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild | 7 ++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 0f2d01a..f75d40d 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 31 Oct 2013; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild:
+ Create site-gentoo.el in preinst phase and have it belong to this package.
+
10 Oct 2013; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild:
Migrate to git-r3.eclass.
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 1a49fd2..39dabf4 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
@@ -92,6 +92,10 @@ site-start-modified-p() {
}
pkg_preinst() {
+ # make sure that site-gentoo.el exists since site-start.el requires it
+ elisp-site-regen
+ cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
+
if use games; then
local f
for f in /var/lib/games/emacs/{snake,tetris}-scores; do
@@ -110,9 +114,6 @@ pkg_postinst() {
gnome2_icon_cache_update
fi
- # make sure that site-gentoo.el exists since site-start.el requires it
- elisp-site-regen
-
readme.gentoo_print_elog
if [[ -e ${EROOT}${SITELISP}/site-start.el ]]; then
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2013-11-13 9:47 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2013-11-13 9:47 UTC (permalink / raw
To: gentoo-commits
commit: a9d1eb636d5c5d016f9daab7113520a97f469361
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 09:48:47 2013 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 09:48:47 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=a9d1eb63
Refuse installation if the site-start.el file is still in its old location; we have warned about this since almost two years.
Package-Manager: portage-2.2.7
---
app-emacs/emacs-common-gentoo/ChangeLog | 4 ++++
.../emacs-common-gentoo-9999.ebuild | 26 ++++++++++++----------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index f75d40d..613b87d 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 13 Nov 2013; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild:
+ Refuse installation if the site-start.el file is still in its old location;
+ we have warned about this since almost two years.
+
31 Oct 2013; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild:
Create site-gentoo.el in preinst phase and have it belong to this package.
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 39dabf4..8994fe0 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
@@ -106,23 +106,16 @@ pkg_preinst() {
chown "${GAMES_USER_DED:-games}" "${ED}${f}" || die
done
fi
-}
-
-pkg_postinst() {
- if use X; then
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
- fi
-
- readme.gentoo_print_elog
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
- ewarn "If your site-start.el file contains your own customisation,"
- ewarn "you should move it to the new file. In any case, you should"
- ewarn "remove the old ${SITELISP}/site-start.el file."
+ 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"
@@ -130,6 +123,15 @@ pkg_postinst() {
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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2013-11-15 13:42 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2013-11-15 13:42 UTC (permalink / raw
To: gentoo-commits
commit: e94e71c712dd52c9f1c6b9543eff519898f2e08f
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 13:43:58 2013 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 13:43:58 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=e94e71c7
Install initial site-gentoo.el file from tarball.
Package-Manager: portage-2.2.7
---
app-emacs/emacs-common-gentoo/ChangeLog | 3 +++
app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild | 10 ++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 613b87d..9a7611a 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 15 Nov 2013; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild:
+ Install initial site-gentoo.el file from tarball.
+
13 Nov 2013; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild:
Refuse installation if the site-start.el file is still in its old location;
we have warned about this since almost two years.
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 8994fe0..f60db4f 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
@@ -34,6 +34,7 @@ pkg_setup() {
src_install() {
insinto "${SITELISP}"
doins subdirs.el
+ newins site-gentoo.el site-gentoo.el.orig
keepdir /etc/emacs
insinto /etc/emacs
@@ -93,8 +94,13 @@ site-start-modified-p() {
pkg_preinst() {
# make sure that site-gentoo.el exists since site-start.el requires it
- elisp-site-regen
- cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
+ if [[ -d ${EROOT}${SITELISP} ]]; then
+ elisp-site-regen
+ cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
+ rm "${ED}${SITELISP}/site-gentoo.el.orig" || die
+ else
+ mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
+ fi
if use games; then
local f
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2013-11-16 12:41 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2013-11-16 12:41 UTC (permalink / raw
To: gentoo-commits
commit: 485def22d5a0dc4bfffd72d104e92cdb3cb0a38d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 16 12:42:06 2013 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 12:42:06 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=485def22
Rearrange if statement in pkg_preinst.
Package-Manager: portage-2.2.7
---
app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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 f60db4f..4c0affa 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
@@ -34,7 +34,7 @@ pkg_setup() {
src_install() {
insinto "${SITELISP}"
doins subdirs.el
- newins site-gentoo.el site-gentoo.el.orig
+ newins site-gentoo.el{,.orig}
keepdir /etc/emacs
insinto /etc/emacs
@@ -94,12 +94,12 @@ site-start-modified-p() {
pkg_preinst() {
# make sure that site-gentoo.el exists since site-start.el requires it
- if [[ -d ${EROOT}${SITELISP} ]]; then
+ if [[ ! -d ${EROOT}${SITELISP} ]]; then
+ mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
+ else
elisp-site-regen
- cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
rm "${ED}${SITELISP}/site-gentoo.el.orig" || die
- else
- mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
+ cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
fi
if use games; then
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2015-01-21 21:43 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2015-01-21 21:43 UTC (permalink / raw
To: gentoo-commits
commit: b78e8134e02bfdc88747a73216d02111467c62f2
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 21 21:35:48 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm@gentoo.org>
+ +emacs-common-gentoo-9999-r1.ebuild:
+ Test new setgid games setup.
+
21 Jan 2015; Ulrich Müller <ulm@gentoo.org> 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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2015-01-21 21:43 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2015-01-21 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 46ec0f08d13d35b673c5e8a0c9ae630fec0b4715
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 21 21:26:54 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> 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 <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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2015-01-21 22:13 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2015-01-21 22:13 UTC (permalink / raw
To: gentoo-commits
commit: 65a92db18637a317e412ea186c85016f01129823
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 21 22:18:40 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 21 22:18:40 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=65a92db1
app-emacs/emacs-common-gentoo: Set g+w mode bit for dir and files.
Package-Manager: portage-2.2.15
---
app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild | 2 ++
1 file changed, 2 insertions(+)
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
index 48c2eb6..04fb9b7 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
@@ -37,6 +37,7 @@ src_install() {
if use games; then
keepdir /var/games/emacs
fowners root:games /var/games/emacs
+ fperms g+w /var/games/emacs
fi
if use X; then
@@ -107,6 +108,7 @@ pkg_preinst() {
fi
touch "${ED}${f}" || die
chown root:games "${ED}${f}" || die
+ chmod g+w "${ED}${f}" || die
done
fi
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2015-01-23 6:10 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2015-01-23 6:10 UTC (permalink / raw
To: gentoo-commits
commit: 7c3cde54f826bd48f8ed6c8ed83c651bf713ef0c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 23 06:14:11 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 23 06:14:11 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=7c3cde54
Respect GAMES_GROUP variable.
Package-Manager: portage-2.2.15
---
app-emacs/emacs-common-gentoo/ChangeLog | 4 ++++
app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 3d21394..01bddd6 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: $
+ 23 Jan 2015; Ulrich Müller <ulm@gentoo.org>
+ emacs-common-gentoo-9999-r1.ebuild:
+ Respect GAMES_GROUP variable.
+
*emacs-common-gentoo-9999-r1 (21 Jan 2015)
21 Jan 2015; Ulrich Müller <ulm@gentoo.org>
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
index 04fb9b7..0710b8c 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
@@ -22,7 +22,7 @@ PDEPEND="virtual/emacs"
S="${WORKDIR}/${PN}"
pkg_setup() {
- use games && enewgroup games 35
+ use games && enewgroup "${GAMES_GROUP:-games}" 35
}
src_install() {
@@ -36,7 +36,7 @@ src_install() {
if use games; then
keepdir /var/games/emacs
- fowners root:games /var/games/emacs
+ fowners "root:${GAMES_GROUP:-games}" /var/games/emacs
fperms g+w /var/games/emacs
fi
@@ -107,7 +107,7 @@ pkg_preinst() {
cp "${EROOT}/var/lib${f#/var}" "${ED}${f}" || die
fi
touch "${ED}${f}" || die
- chown root:games "${ED}${f}" || die
+ chown "root:${GAMES_GROUP:-games}" "${ED}${f}" || die
chmod g+w "${ED}${f}" || die
done
fi
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2015-02-09 12:09 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2015-02-09 12:09 UTC (permalink / raw
To: gentoo-commits
commit: d43fe141168cd70cd7c58468e419eb619e73f80d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 9 12:14:03 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 9 12:14:03 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=d43fe141
app-emacs/emacs-common-gentoo: Use group 'scores' instead of 'games' for shared score files.
Package-Manager: portage-2.2.16
---
app-emacs/emacs-common-gentoo/ChangeLog | 4 ++++
app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 01bddd6..e44bb76 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: $
+ 09 Feb 2015; Ulrich Müller <ulm@gentoo.org>
+ emacs-common-gentoo-9999-r1.ebuild:
+ Use group 'scores' instead of 'games' for shared score files.
+
23 Jan 2015; Ulrich Müller <ulm@gentoo.org>
emacs-common-gentoo-9999-r1.ebuild:
Respect GAMES_GROUP variable.
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
index 0710b8c..04dc5ad 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
@@ -22,7 +22,7 @@ PDEPEND="virtual/emacs"
S="${WORKDIR}/${PN}"
pkg_setup() {
- use games && enewgroup "${GAMES_GROUP:-games}" 35
+ use games && enewgroup scores 36
}
src_install() {
@@ -36,7 +36,7 @@ src_install() {
if use games; then
keepdir /var/games/emacs
- fowners "root:${GAMES_GROUP:-games}" /var/games/emacs
+ fowners root:scores /var/games/emacs
fperms g+w /var/games/emacs
fi
@@ -107,7 +107,7 @@ pkg_preinst() {
cp "${EROOT}/var/lib${f#/var}" "${ED}${f}" || die
fi
touch "${ED}${f}" || die
- chown "root:${GAMES_GROUP:-games}" "${ED}${f}" || die
+ chown root:scores "${ED}${f}" || die
chmod g+w "${ED}${f}" || die
done
fi
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2015-02-10 14:12 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2015-02-10 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 72c622efe628fde75b4db47ff57a732dc129490e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 10 14:18:35 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 10 14:18:35 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=72c622ef
app-emacs/emacs-common-gentoo: Fix permissions of shared score dir in pkg_postinst.
Package-Manager: portage-2.2.16
---
app-emacs/emacs-common-gentoo/ChangeLog | 4 ++++
app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index e44bb76..40b3c91 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: $
+ 10 Feb 2015; Ulrich Müller <ulm@gentoo.org>
+ emacs-common-gentoo-9999-r1.ebuild:
+ Fix permissions of shared score dir in pkg_postinst.
+
09 Feb 2015; Ulrich Müller <ulm@gentoo.org>
emacs-common-gentoo-9999-r1.ebuild:
Use group 'scores' instead of 'games' for shared score files.
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
index 04dc5ad..564b4bf 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
@@ -129,6 +129,11 @@ pkg_preinst() {
}
pkg_postinst() {
+ # update permissions of shared score dir
+ chmod 755 "${EROOT}"/var/games
+ chown root:scores "${EROOT}"/var/games/emacs
+ chmod 775 "${EROOT}"/var/games/emacs
+
if use X; then
fdo-mime_desktop_database_update
gnome2_icon_cache_update
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2015-02-19 22:07 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2015-02-19 22:07 UTC (permalink / raw
To: gentoo-commits
commit: 075711ddee821d79f2421fa2f7ef3422953cbcc5
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 19 22:12:35 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 22:12:35 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=075711dd
app-emacs/emacs-common-gentoo: Use "gamestat" group for shared score files, following QA tree policy.
Package-Manager: portage-2.2.17
---
app-emacs/emacs-common-gentoo/ChangeLog | 4 ++++
.../emacs-common-gentoo-9999-r1.ebuild | 16 +++++++++-------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 40b3c91..dd947e4 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: $
+ 19 Feb 2015; Ulrich Müller <ulm@gentoo.org>
+ emacs-common-gentoo-9999-r1.ebuild:
+ Use "gamestat" group for shared score files, following QA tree policy.
+
10 Feb 2015; Ulrich Müller <ulm@gentoo.org>
emacs-common-gentoo-9999-r1.ebuild:
Fix permissions of shared score dir in pkg_postinst.
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
index 564b4bf..2d872dd 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
@@ -22,7 +22,7 @@ PDEPEND="virtual/emacs"
S="${WORKDIR}/${PN}"
pkg_setup() {
- use games && enewgroup scores 36
+ use games && enewgroup gamestat 36
}
src_install() {
@@ -36,7 +36,7 @@ src_install() {
if use games; then
keepdir /var/games/emacs
- fowners root:scores /var/games/emacs
+ fowners root:gamestat /var/games/emacs
fperms g+w /var/games/emacs
fi
@@ -107,7 +107,7 @@ pkg_preinst() {
cp "${EROOT}/var/lib${f#/var}" "${ED}${f}" || die
fi
touch "${ED}${f}" || die
- chown root:scores "${ED}${f}" || die
+ chown root:gamestat "${ED}${f}" || die
chmod g+w "${ED}${f}" || die
done
fi
@@ -129,10 +129,12 @@ pkg_preinst() {
}
pkg_postinst() {
- # update permissions of shared score dir
- chmod 755 "${EROOT}"/var/games
- chown root:scores "${EROOT}"/var/games/emacs
- chmod 775 "${EROOT}"/var/games/emacs
+ if use games; then
+ # update permissions of shared score dir
+ chmod 755 "${EROOT}"/var/games
+ chown root:gamestat "${EROOT}"/var/games/emacs
+ chmod 775 "${EROOT}"/var/games/emacs
+ fi
if use X; then
fdo-mime_desktop_database_update
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2015-02-20 11:12 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2015-02-20 11:12 UTC (permalink / raw
To: gentoo-commits
commit: 5b190ffabcd4a51edf11b0bdfcbeb68c7f4656b8
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 20 11:19:08 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 20 11:19:08 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=5b190ffa
app-emacs/emacs-common-gentoo: Fix owner for /var/games too.
Package-Manager: portage-2.2.17
---
app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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
index 2d872dd..a50412c 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
@@ -130,7 +130,8 @@ pkg_preinst() {
pkg_postinst() {
if use games; then
- # update permissions of shared score dir
+ # update permissions of shared score dir #537580
+ chown root:root "${EROOT}"/var/games
chmod 755 "${EROOT}"/var/games
chown root:gamestat "${EROOT}"/var/games/emacs
chmod 775 "${EROOT}"/var/games/emacs
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2015-02-21 12:03 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2015-02-21 12:03 UTC (permalink / raw
To: gentoo-commits
commit: 02abf9634b75e3a761e519bc828aa60398f11808
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 21 12:00:16 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 21 12:00:16 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=02abf963
app-emacs/emacs-common-gentoo: Sync from Portage tree. Remove old.
Package-Manager: portage-2.2.17
---
app-emacs/emacs-common-gentoo/ChangeLog | 4 +
.../emacs-common-gentoo-9999-r1.ebuild | 26 ++--
.../emacs-common-gentoo-9999.ebuild | 148 ---------------------
3 files changed, 17 insertions(+), 161 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index dd947e4..d5575fd 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: $
+ 21 Feb 2015; Ulrich Müller <ulm@gentoo.org>
+ -emacs-common-gentoo-9999.ebuild, emacs-common-gentoo-9999-r1.ebuild:
+ Sync from Portage tree. Remove old.
+
19 Feb 2015; Ulrich Müller <ulm@gentoo.org>
emacs-common-gentoo-9999-r1.ebuild:
Use "gamestat" group for shared score files, following QA tree policy.
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
index a50412c..73cd753 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999-r1.ebuild
@@ -36,7 +36,7 @@ src_install() {
if use games; then
keepdir /var/games/emacs
- fowners root:gamestat /var/games/emacs
+ fowners 0:gamestat /var/games/emacs
fperms g+w /var/games/emacs
fi
@@ -44,17 +44,17 @@ src_install() {
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
+ pushd icons || die
+ newicon sink.png emacs-sink.png
+ newicon emacs_48.png emacs.png
+ newicon emacs22_48.png emacs22.png
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
+ newicon -s ${i} emacs_${i}.png emacs.png
done
- insinto /usr/share/icons/hicolor/scalable/apps
- doins emacs.svg
+ for i in 16 24 32 48; do
+ newicon -s ${i} emacs22_${i}.png emacs22.png
+ done
+ doicon -s scalable emacs.svg
popd
gnome2_icon_savelist
@@ -107,7 +107,7 @@ pkg_preinst() {
cp "${EROOT}/var/lib${f#/var}" "${ED}${f}" || die
fi
touch "${ED}${f}" || die
- chown root:gamestat "${ED}${f}" || die
+ chgrp gamestat "${ED}${f}" || die
chmod g+w "${ED}${f}" || die
done
fi
@@ -131,9 +131,9 @@ pkg_preinst() {
pkg_postinst() {
if use games; then
# update permissions of shared score dir #537580
- chown root:root "${EROOT}"/var/games
+ chown 0:0 "${EROOT}"/var/games
chmod 755 "${EROOT}"/var/games
- chown root:gamestat "${EROOT}"/var/games/emacs
+ chown 0:gamestat "${EROOT}"/var/games/emacs
chmod 775 "${EROOT}"/var/games/emacs
fi
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
deleted file mode 100644
index 820132b..0000000
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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() {
- if use games && [[ -z $(egetent passwd "${GAMES_USER_DED:-games}") ]]
- then
- enewgroup "${GAMES_GROUP:-games}" 35
- enewuser "${GAMES_USER_DED:-games}" 36 /bin/bash \
- "${GAMES_PREFIX:-/usr/games}" "${GAMES_GROUP:-games}"
- fi
-}
-
-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 "${GAMES_USER_DED:-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 "${GAMES_USER_DED:-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
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2015-02-22 18:26 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2015-02-22 18:26 UTC (permalink / raw
To: gentoo-commits
commit: cf9d573cea3688ca7e85403d3e7663568f27d34a
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 22 18:25:52 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm@gentoo.org>
+ +emacs-common-gentoo-9999.ebuild, -emacs-common-gentoo-9999-r1.ebuild:
+ Sync from Portage tree.
+
21 Feb 2015; Ulrich Müller <ulm@gentoo.org>
-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
}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2015-02-22 18:34 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2015-02-22 18:34 UTC (permalink / raw
To: gentoo-commits
commit: cf5388298e8410048bc3bda7620a81dad9898993
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 22 18:33:52 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 22 18:33:52 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=cf538829
app-emacs/emacs-common-gentoo: Remove all backwards compatibility code from the live ebuild.
Package-Manager: portage-2.2.17
---
app-emacs/emacs-common-gentoo/ChangeLog | 3 ++
.../emacs-common-gentoo-9999.ebuild | 44 ----------------------
2 files changed, 3 insertions(+), 44 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index dd4a433..c82b856 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild:
+ Remove all backwards compatibility code from the live ebuild.
+
22 Feb 2015; Ulrich Müller <ulm@gentoo.org>
+emacs-common-gentoo-9999.ebuild, -emacs-common-gentoo-9999-r1.ebuild:
Sync from Portage tree.
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 8187379..b0ccd51 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
@@ -73,20 +73,6 @@ src_install() {
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
@@ -102,41 +88,11 @@ pkg_preinst() {
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
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
- 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
}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2015-07-12 6:53 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2015-07-12 6:53 UTC (permalink / raw
To: gentoo-commits
commit: 15bf2c07e61bbadcc5619137351ad4fb88ab1569
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 06:51:16 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 06:51:16 2015 +0000
URL: https://gitweb.gentoo.org/proj/emacs.git/commit/?id=15bf2c07
Sync from Portage tree.
Package-Manager: portage-2.2.20
app-emacs/emacs-common-gentoo/ChangeLog | 3 +++
app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 08c1817..9423076 100644
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Jul 2015; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild:
+ Sync from Portage tree.
+
25 Apr 2015; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-9999.ebuild:
Update EGIT_REPO_URI.
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 9f0d73e..4bd5cd9 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
@@ -75,11 +75,11 @@ src_install() {
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
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/
@ 2016-03-21 9:45 Ulrich Müller
0 siblings, 0 replies; 17+ messages in thread
From: Ulrich Müller @ 2016-03-21 9:45 UTC (permalink / raw
To: gentoo-commits
commit: 7d2508da633f786dd0b6fe95bfd6af85fd80481b
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 09:43:25 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 09:44:30 2016 +0000
URL: https://gitweb.gentoo.org/proj/emacs.git/commit/?id=7d2508da
app-emacs/emacs-common-gentoo: Update to EAPI 6.
Package-Manager: portage-2.2.28
app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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 539333d..2da35b7 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-9999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
EGIT_REPO_URI="git://anongit.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
+inherit elisp-common eutils fdo-mime gnome2-utils readme.gentoo-r1 user git-r3
DESCRIPTION="Common files needed by all GNU Emacs versions"
-HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Emacs"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
LICENSE="GPL-3+"
SLOT="0"
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2016-03-21 9:45 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-15 13:42 [gentoo-commits] proj/emacs:master commit in: app-emacs/emacs-common-gentoo/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2016-03-21 9:45 Ulrich Müller
2015-07-12 6:53 Ulrich Müller
2015-02-22 18:34 Ulrich Müller
2015-02-22 18:26 Ulrich Müller
2015-02-21 12:03 Ulrich Müller
2015-02-20 11:12 Ulrich Müller
2015-02-19 22:07 Ulrich Müller
2015-02-10 14:12 Ulrich Müller
2015-02-09 12:09 Ulrich Müller
2015-01-23 6:10 Ulrich Müller
2015-01-21 22:13 Ulrich Müller
2015-01-21 21:43 Ulrich Müller
2015-01-21 21:43 Ulrich Müller
2013-11-16 12:41 Ulrich Müller
2013-11-13 9:47 Ulrich Müller
2013-10-31 15:07 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox