[gentoo-commits] gentoo-x86 commit in eclass: elisp-common.eclass
ulm 15/05/25 12:52:56 Modified: elisp-common.eclass Log: Consistent spelling. Revision ChangesPath 1.93 eclass/elisp-common.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.93view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.93content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?r1=1.92r2=1.93 Index: elisp-common.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- elisp-common.eclass 24 May 2015 21:46:16 - 1.92 +++ elisp-common.eclass 25 May 2015 12:52:56 - 1.93 @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.92 2015/05/24 21:46:16 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.93 2015/05/25 12:52:56 ulm Exp $ # # @ECLASS: elisp-common.eclass # @MAINTAINER: -# Gentoo GNU Emacs Project em...@gentoo.org +# Gentoo GNU Emacs project em...@gentoo.org # @AUTHOR: # Matthew Kennedy mkenn...@gentoo.org # Jeremy Maitin-Shepard j...@attbi.com
[gentoo-commits] gentoo-x86 commit in eclass: elisp-common.eclass elisp.eclass
ulm 15/05/24 21:46:16 Modified: elisp-common.eclass elisp.eclass Log: Update maintainer information. Revision ChangesPath 1.92 eclass/elisp-common.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.92view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.92content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?r1=1.91r2=1.92 Index: elisp-common.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- elisp-common.eclass 24 Apr 2015 22:42:01 - 1.91 +++ elisp-common.eclass 24 May 2015 21:46:16 - 1.92 @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.91 2015/04/24 22:42:01 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.92 2015/05/24 21:46:16 ulm Exp $ # # @ECLASS: elisp-common.eclass # @MAINTAINER: -# Gentoo Emacs team em...@gentoo.org +# Gentoo GNU Emacs Project em...@gentoo.org # @AUTHOR: # Matthew Kennedy mkenn...@gentoo.org # Jeremy Maitin-Shepard j...@attbi.com 1.59 eclass/elisp.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp.eclass?rev=1.59view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp.eclass?rev=1.59content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp.eclass?r1=1.58r2=1.59 Index: elisp.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- elisp.eclass7 Jun 2014 10:28:16 - 1.58 +++ elisp.eclass24 May 2015 21:46:16 - 1.59 @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.58 2014/06/07 10:28:16 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.59 2015/05/24 21:46:16 ulm Exp $ # # @ECLASS: elisp.eclass # @MAINTAINER: -# Gentoo Emacs team em...@gentoo.org +# Gentoo GNU Emacs project em...@gentoo.org # @AUTHOR: # Matthew Kennedy mkenn...@gentoo.org # Jeremy Maitin-Shepard j...@attbi.com
[gentoo-commits] gentoo-x86 commit in eclass: elisp-common.eclass ChangeLog
ulm 15/04/24 22:42:01
Modified: elisp-common.eclass ChangeLog
Log:
Fix filename matching in elisp-site-file-install. It should use shortest
match, not longest.
Revision ChangesPath
1.91 eclass/elisp-common.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.91view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.91content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?r1=1.90r2=1.91
Index: elisp-common.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- elisp-common.eclass 11 Jun 2014 09:13:36 - 1.90
+++ elisp-common.eclass 24 Apr 2015 22:42:01 - 1.91
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.90
2014/06/11 09:13:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.91
2015/04/24 22:42:01 ulm Exp $
#
# @ECLASS: elisp-common.eclass
# @MAINTAINER:
@@ -322,7 +322,8 @@
[[ ${sf} == [0-9][0-9]*-gentoo*.el ]] \
|| ewarn elisp-site-file-install: bad name of site-init file
- sf=${T}/${sf/%-gentoo*.el/-gentoo.el}
+ [[ ${sf%-gentoo*.el} != ${sf} ]] sf=${sf%-gentoo*.el}-gentoo.el
+ sf=${T}/${sf}
ebegin Installing site initialisation file for GNU Emacs
[[ $1 = ${sf} ]] || cp $1 ${sf}
sed -i -e
1{:x;/^\$/{n;bx;};/^;.*${PN}/I!s:^:${header}\n\n:;1s:^:\n:;} \
1.1593 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1593view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1593content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1592r2=1.1593
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1592
retrieving revision 1.1593
diff -u -r1.1592 -r1.1593
--- ChangeLog 22 Apr 2015 20:23:47 - 1.1592
+++ ChangeLog 24 Apr 2015 22:42:01 - 1.1593
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1592 2015/04/22
20:23:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1593 2015/04/24
22:42:01 ulm Exp $
+
+ 24 Apr 2015; Ulrich Müller u...@gentoo.org elisp-common.eclass:
+ Fix filename matching in elisp-site-file-install. It should use shortest
+ match, not longest.
22 Apr 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
Sync with qt overlay: cleanup prefix-related patching and fix bug #542780.
[gentoo-commits] gentoo-x86 commit in eclass: elisp-common.eclass
ulm 14/06/11 09:13:36 Modified: elisp-common.eclass Log: Update version number in example. Revision ChangesPath 1.90 eclass/elisp-common.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.90view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.90content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?r1=1.89r2=1.90 Index: elisp-common.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- elisp-common.eclass 24 May 2014 08:48:40 - 1.89 +++ elisp-common.eclass 11 Jun 2014 09:13:36 - 1.90 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.89 2014/05/24 08:48:40 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.90 2014/06/11 09:13:36 ulm Exp $ # # @ECLASS: elisp-common.eclass # @MAINTAINER: @@ -30,15 +30,15 @@ # to your DEPEND/RDEPEND line and use the functions provided here to # bring the files to the correct locations. # -# If your package requires a minimum Emacs version, e.g. Emacs 23, then -# the dependency should be on =virtual/emacs-23 instead. Because the +# If your package requires a minimum Emacs version, e.g. Emacs 24, then +# the dependency should be on =virtual/emacs-24 instead. Because the # user can select the Emacs executable with eselect, you should also # make sure that the active Emacs version is sufficient. This can be # tested with function elisp-need-emacs(), which would typically be # called from pkg_setup(), as in the following example: # # @CODE -# elisp-need-emacs 23 || die Emacs version too low +# elisp-need-emacs 24 || die Emacs version too low # @CODE # # Please note that such tests should be limited to packages that are
[gentoo-commits] gentoo-x86 commit in eclass: elisp-common.eclass ChangeLog
ulm 14/05/24 08:47:29
Modified: elisp-common.eclass ChangeLog
Log:
elisp-site-regen: Look for site-init files only in site-gentoo.d subdirectory.
Revision ChangesPath
1.88 eclass/elisp-common.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.88view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.88content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?r1=1.87r2=1.88
Index: elisp-common.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- elisp-common.eclass 4 Nov 2013 21:36:36 - 1.87
+++ elisp-common.eclass 24 May 2014 08:47:29 - 1.88
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.87
2013/11/04 21:36:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.88
2014/05/24 08:47:29 ulm Exp $
#
# @ECLASS: elisp-common.eclass
# @MAINTAINER:
@@ -342,10 +342,6 @@
# Regenerate the site-gentoo.el file, based on packages' site
# initialisation files in the /usr/share/emacs/site-lisp/site-gentoo.d/
# directory.
-#
-# Note: Before December 2007, site initialisation files were installed
-# in /usr/share/emacs/site-lisp/. For backwards compatibility, this
-# location is still supported when generating site-gentoo.el.
elisp-site-regen() {
local sitelisp=${ROOT}${EPREFIX}${SITELISP}
@@ -369,16 +365,8 @@
ebegin Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE})
- for sf in ${sitelisp}/[0-9][0-9]*-gentoo.el \
- ${sitelisp}/site-gentoo.d/[0-9][0-9]*.el
- do
- [[ -r ${sf} ]] || continue
- # sort files by their basename. straight insertion sort.
- for ((i=${#sflist[@]}; i0; i--)); do
- [[ ${sf##*/} ${sflist[i-1]##*/} ]] || break
- sflist[i]=${sflist[i-1]}
- done
- sflist[i]=${sf}
+ for sf in ${sitelisp}/site-gentoo.d/[0-9][0-9]*.el; do
+ [[ -r ${sf} ]] sflist+=(${sf})
done
cat -EOF ${T}/site-gentoo.el
1.1272 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1272view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1272content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1271r2=1.1272
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1271
retrieving revision 1.1272
diff -u -r1.1271 -r1.1272
--- ChangeLog 23 May 2014 17:11:10 - 1.1271
+++ ChangeLog 24 May 2014 08:47:29 - 1.1272
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1271 2014/05/23
17:11:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1272 2014/05/24
08:47:29 ulm Exp $
+
+ 24 May 2014; Ulrich Müller u...@gentoo.org elisp-common.eclass:
+ elisp-site-regen: Look for site-init files only in site-gentoo.d
+ subdirectory.
23 May 2014; Michał Górny mgo...@gentoo.org multilib-build.eclass:
Change ABI-flag separator from : to . to avoid issues with Makefile rules
[gentoo-commits] gentoo-x86 commit in eclass: elisp-common.eclass ChangeLog
ulm 14/05/24 08:48:40
Modified: elisp-common.eclass ChangeLog
Log:
elisp-site-regen: Die on errors.
Revision ChangesPath
1.89 eclass/elisp-common.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.89view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?rev=1.89content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/elisp-common.eclass?r1=1.88r2=1.89
Index: elisp-common.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- elisp-common.eclass 24 May 2014 08:47:29 - 1.88
+++ elisp-common.eclass 24 May 2014 08:48:40 - 1.89
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.88
2014/05/24 08:47:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.89
2014/05/24 08:48:40 ulm Exp $
#
# @ECLASS: elisp-common.eclass
# @MAINTAINER:
@@ -345,31 +345,27 @@
elisp-site-regen() {
local sitelisp=${ROOT}${EPREFIX}${SITELISP}
- local sf i null= page=$'\f'
+ local sf i ret=0 null= page=$'\f'
local -a sflist
- if [[ ! -d ${sitelisp} ]]; then
- eerror elisp-site-regen: Directory ${sitelisp} does not exist
- return 1
- fi
-
- if [[ ! -d ${T} ]]; then
- eerror elisp-site-regen: Temporary directory ${T} does not
exist
- return 1
- fi
-
if [[ ${EBUILD_PHASE} = *rm ! -e ${sitelisp}/site-gentoo.el ]]; then
ewarn Refusing to create site-gentoo.el in ${EBUILD_PHASE}
phase.
return 0
fi
+ [[ -d ${sitelisp} ]] \
+ || die elisp-site-regen: Directory ${sitelisp} does not exist
+
+ [[ -d ${T} ]] \
+ || die elisp-site-regen: Temporary directory ${T} does not
exist
+
ebegin Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE})
for sf in ${sitelisp}/site-gentoo.d/[0-9][0-9]*.el; do
[[ -r ${sf} ]] sflist+=(${sf})
done
- cat -EOF ${T}/site-gentoo.el
+ cat -EOF ${T}/site-gentoo.el || ret=$?
;;; site-gentoo.el --- site initialisation for Gentoo-installed packages
;;; Commentary:
@@ -379,8 +375,8 @@
;;; Code:
EOF
# Use sed instead of cat here, since files may miss a trailing newline.
- sed '$q' ${sflist[@]} /dev/null ${T}/site-gentoo.el
- cat -EOF ${T}/site-gentoo.el
+ sed '$q' ${sflist[@]} /dev/null ${T}/site-gentoo.el || ret=$?
+ cat -EOF ${T}/site-gentoo.el || ret=$?
${page}
(provide 'site-gentoo)
@@ -393,7 +389,10 @@
;;; site-gentoo.el ends here
EOF
- if cmp -s ${sitelisp}/site-gentoo.el ${T}/site-gentoo.el; then
+ if [[ ${ret} -ne 0 ]]; then
+ eend ${ret} elisp-site-regen: Writing site-gentoo.el failed.
+ die
+ elif cmp -s ${sitelisp}/site-gentoo.el ${T}/site-gentoo.el; then
# This prevents outputting unnecessary text when there
# was actually no change.
# A case is a remerge where we have doubled output.
@@ -402,7 +401,7 @@
einfo ... no changes.
else
mv ${T}/site-gentoo.el ${sitelisp}/site-gentoo.el
- eend
+ eend $? elisp-site-regen: Replacing site-gentoo.el failed ||
die
case ${#sflist[@]} in
0) [[ ${PN} = emacs-common-gentoo ]] \
|| ewarn ... Huh? No site initialisation files
found. ;;
1.1273 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1273view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1273content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1272r2=1.1273
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1272
retrieving revision 1.1273
diff -u -r1.1272 -r1.1273
--- ChangeLog 24 May 2014 08:47:29 - 1.1272
+++ ChangeLog 24 May 2014 08:48:40 - 1.1273
@@ -1,10 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1272 2014/05/24
08:47:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1273 2014/05/24
08:48:40 ulm Exp $
24 May 2014; Ulrich Müller u...@gentoo.org elisp-common.eclass:
elisp-site-regen: Look
