* [gentoo-commits] gentoo-x86 commit in app-emacs/emacs-common-gentoo: ChangeLog emacs-common-gentoo-1.5.ebuild
@ 2015-03-29 10:06 Jeroen Roovers (jer)
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2015-03-29 10:06 UTC (permalink / raw
To: gentoo-commits
jer 15/03/29 10:06:16
Modified: ChangeLog emacs-common-gentoo-1.5.ebuild
Log:
Stable for HPPA (bug #544448).
(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --ignore-arches, signed Manifest commit with key A792A613)
Revision Changes Path
1.117 app-emacs/emacs-common-gentoo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog?rev=1.117&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog?rev=1.117&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog?r1=1.116&r2=1.117
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- ChangeLog 28 Mar 2015 21:26:21 -0000 1.116
+++ ChangeLog 29 Mar 2015 10:06:16 -0000 1.117
@@ -1,6 +1,9 @@
# ChangeLog for app-emacs/emacs-common-gentoo
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.116 2015/03/28 21:26:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.117 2015/03/29 10:06:16 jer Exp $
+
+ 29 Mar 2015; Jeroen Roovers <jer@gentoo.org> emacs-common-gentoo-1.5.ebuild:
+ Stable for HPPA (bug #544448).
28 Mar 2015; Agostino Sarubbo <ago@gentoo.org> emacs-common-gentoo-1.5.ebuild:
Stable for ppc, wrt bug #544448
1.5 app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild?r1=1.4&r2=1.5
Index: emacs-common-gentoo-1.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emacs-common-gentoo-1.5.ebuild 28 Mar 2015 21:26:21 -0000 1.4
+++ emacs-common-gentoo-1.5.ebuild 29 Mar 2015 10:06:16 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v 1.4 2015/03/28 21:26:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v 1.5 2015/03/29 10:06:16 jer Exp $
EAPI=5
@@ -12,7 +12,7 @@
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="games X"
PDEPEND="virtual/emacs"
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emacs/emacs-common-gentoo: ChangeLog emacs-common-gentoo-1.5.ebuild
@ 2015-06-05 12:07 Ulrich Mueller (ulm)
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Mueller (ulm) @ 2015-06-05 12:07 UTC (permalink / raw
To: gentoo-commits
ulm 15/06/05 12:07:06
Modified: ChangeLog emacs-common-gentoo-1.5.ebuild
Log:
Remove backwards compatibility code for site-start.el.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Revision Changes Path
1.124 app-emacs/emacs-common-gentoo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog?rev=1.124&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog?rev=1.124&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog?r1=1.123&r2=1.124
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- ChangeLog 17 Apr 2015 12:24:38 -0000 1.123
+++ ChangeLog 5 Jun 2015 12:07:06 -0000 1.124
@@ -1,6 +1,9 @@
# ChangeLog for app-emacs/emacs-common-gentoo
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.123 2015/04/17 12:24:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.124 2015/06/05 12:07:06 ulm Exp $
+
+ 05 Jun 2015; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-1.5.ebuild:
+ Remove backwards compatibility code for site-start.el.
17 Apr 2015; Ulrich Müller <ulm@gentoo.org>
-emacs-common-gentoo-1.4-r1.ebuild:
1.11 app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild?r1=1.10&r2=1.11
Index: emacs-common-gentoo-1.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- emacs-common-gentoo-1.5.ebuild 17 Apr 2015 10:40:33 -0000 1.10
+++ emacs-common-gentoo-1.5.ebuild 5 Jun 2015 12:07:06 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v 1.10 2015/04/17 10:40:33 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v 1.11 2015/06/05 12:07:06 ulm Exp $
EAPI=5
@@ -69,20 +69,6 @@
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
@@ -119,21 +105,6 @@
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
}
pkg_postinst() {
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emacs/emacs-common-gentoo: ChangeLog emacs-common-gentoo-1.5.ebuild
@ 2015-07-11 20:06 Ulrich Mueller (ulm)
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Mueller (ulm) @ 2015-07-11 20:06 UTC (permalink / raw
To: gentoo-commits
ulm 15/07/11 20:06:26
Modified: ChangeLog emacs-common-gentoo-1.5.ebuild
Log:
Make pkg_preinst() idempotent, bug 554518.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Revision Changes Path
1.125 app-emacs/emacs-common-gentoo/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog?rev=1.125&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog?rev=1.125&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog?r1=1.124&r2=1.125
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- ChangeLog 5 Jun 2015 12:07:06 -0000 1.124
+++ ChangeLog 11 Jul 2015 20:06:26 -0000 1.125
@@ -1,6 +1,9 @@
# ChangeLog for app-emacs/emacs-common-gentoo
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.124 2015/06/05 12:07:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.125 2015/07/11 20:06:26 ulm Exp $
+
+ 11 Jul 2015; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-1.5.ebuild:
+ Make pkg_preinst() idempotent, bug 554518.
05 Jun 2015; Ulrich Müller <ulm@gentoo.org> emacs-common-gentoo-1.5.ebuild:
Remove backwards compatibility code for site-start.el.
1.12 app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild?r1=1.11&r2=1.12
Index: emacs-common-gentoo-1.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- emacs-common-gentoo-1.5.ebuild 5 Jun 2015 12:07:06 -0000 1.11
+++ emacs-common-gentoo-1.5.ebuild 11 Jul 2015 20:06:26 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v 1.11 2015/06/05 12:07:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.5.ebuild,v 1.12 2015/07/11 20:06:26 ulm Exp $
EAPI=5
@@ -71,11 +71,11 @@
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 [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-11 20:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-05 12:07 [gentoo-commits] gentoo-x86 commit in app-emacs/emacs-common-gentoo: ChangeLog emacs-common-gentoo-1.5.ebuild Ulrich Mueller (ulm)
-- strict thread matches above, loose matches on Subject: below --
2015-07-11 20:06 Ulrich Mueller (ulm)
2015-03-29 10:06 Jeroen Roovers (jer)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox