[gentoo-commits] proj/emacs:master commit in: eclass/

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Müller]

commit:     ddf4c60d7b580790322c8b677490dbbaead15073
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 13:13:13 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 25 13:13:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/emacs.git/commit/?id=ddf4c60d

elisp-common.eclass: Fix filename matching in elisp-site-file-install.

* elisp-common.eclass (elisp-site-file-install): Fix filename
matching. It should use shortest match, not longest.

 eclass/ChangeLog           | 5 +++++
 eclass/elisp-common.eclass | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index cef4072..3cfdab5 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-25  Ulrich Müller  <ulm@gentoo.org>
+
+	* elisp-common.eclass (elisp-site-file-install): Fix filename
+	matching. It should use shortest match, not longest.
+
 2014-06-07  Ulrich Müller  <ulm@gentoo.org>
 
 	* elisp.eclass (DEPEND): Increase minimum Emacs version to 23.

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 6f93e92..36ad8ae 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -322,7 +322,8 @@ elisp-site-file-install() {
 
 	[[ ${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:;}" \

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Müller]

commit:     22f5a584b9b981e6216d955c36d70e3059dc7d58
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 08:34:45 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 08:34:45 2016 +0000
URL:        https://gitweb.gentoo.org/proj/emacs.git/commit/?id=22f5a584

eclass: Update e-mail address of GNU Emacs project.

 eclass/elisp-common.eclass | 2 +-
 eclass/elisp.eclass        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 1517788..101437e 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -4,7 +4,7 @@
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:
-# Gentoo GNU Emacs project <emacs@gentoo.org>
+# Gentoo GNU Emacs project <gnu-emacs@gentoo.org>
 # @AUTHOR:
 # Matthew Kennedy <mkennedy@gentoo.org>
 # Jeremy Maitin-Shepard <jbms@attbi.com>

diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 93a7d4b..660865c 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -4,7 +4,7 @@
 #
 # @ECLASS: elisp.eclass
 # @MAINTAINER:
-# Gentoo GNU Emacs project <emacs@gentoo.org>
+# Gentoo GNU Emacs project <gnu-emacs@gentoo.org>
 # @AUTHOR:
 # Matthew Kennedy <mkennedy@gentoo.org>
 # Jeremy Maitin-Shepard <jbms@attbi.com>

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Müller]

commit:     32537869bbf98938b76ecd31eea0ffd64cded99e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 15:31:40 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 15:35:20 2015 +0000
URL:        https://gitweb.gentoo.org/proj/emacs.git/commit/?id=32537869

elisp*.eclass: Merge changes from Portage tree.

 eclass/ChangeLog           |  4 ++++
 eclass/elisp-common.eclass |  2 +-
 eclass/elisp.eclass        | 43 +++++++++++++++++++++++++++++--------------
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 3cfdab5..087edf2 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-20  Ulrich Müller  <ulm@gentoo.org>
+
+	* elisp.eclass: Support EAPI 6.
+
 2015-05-25  Ulrich Müller  <ulm@gentoo.org>
 
 	* elisp-common.eclass (elisp-site-file-install): Fix filename

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 4ccbfb1..1517788 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:

diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index c24613b..93a7d4b 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 #
 # @ECLASS: elisp.eclass
 # @MAINTAINER:
@@ -65,13 +65,21 @@
 # DOCS="blah.txt ChangeLog" is automatically used to install the given
 # files by dodoc in src_install().
 
-inherit elisp-common eutils
-
-case "${EAPI:-0}" in
-	0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} \
-		pkg_{setup,postinst,postrm} ;;
-	*) EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
-		pkg_{setup,postinst,postrm} ;;
+inherit elisp-common
+
+case ${EAPI:-0} in
+	0|1)
+		inherit eutils
+		EXPORT_FUNCTIONS src_{unpack,compile,install} \
+			pkg_{setup,postinst,postrm} ;;
+	2|3|4|5)
+		inherit eutils
+		EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
+			pkg_{setup,postinst,postrm} ;;
+	6)
+		EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
+			pkg_{setup,postinst,postrm} ;;
+	*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
 esac
 
 DEPEND=">=virtual/emacs-${NEED_EMACS:-23}"
@@ -105,7 +113,7 @@ elisp_src_unpack() {
 		[[ -d ${S} ]] || S=${WORKDIR}
 	fi
 
-	case "${EAPI:-0}" in
+	case ${EAPI:-0} in
 		0|1) [[ -d ${S} ]] && cd "${S}"
 			elisp_src_prepare ;;
 	esac
@@ -117,21 +125,28 @@ elisp_src_unpack() {
 # for in the current working dir, WORKDIR, and FILESDIR.
 
 elisp_src_prepare() {
-	local patch
+	local patch file
 	for patch in ${ELISP_PATCHES}; do
 		if [[ -f ${patch} ]]; then
-			epatch "${patch}"
+			file="${patch}"
 		elif [[ -f ${WORKDIR}/${patch} ]]; then
-			epatch "${WORKDIR}/${patch}"
+			file="${WORKDIR}/${patch}"
 		elif [[ -f ${FILESDIR}/${patch} ]]; then
-			epatch "${FILESDIR}/${patch}"
+			file="${FILESDIR}/${patch}"
 		else
 			die "Cannot find ${patch}"
 		fi
+		case ${EAPI:-0} in
+			0|1|2|3|4|5) epatch "${file}" ;;
+			6) eapply "${file}" ;;
+		esac
 	done
 
 	# apply any user patches
-	epatch_user
+	case ${EAPI:-0} in
+		0|1|2|3|4|5) epatch_user ;;
+		6) eapply_user ;;
+	esac
 
 	if [[ -n ${ELISP_REMOVE} ]]; then
 		rm ${ELISP_REMOVE} || die

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Müller]

commit:     09c0c9585b26da1ccfc1eb3d3720c71f24e328dd
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 13:11:19 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 25 13:11:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/emacs.git/commit/?id=09c0c958

eclass/: Update copyright years.

 eclass/ChangeLog           | 2 +-
 eclass/elisp-common.eclass | 2 +-
 eclass/elisp.eclass        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 0664efe..cef4072 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -806,5 +806,5 @@
 
 	* elisp.eclass: Initial.
 
-Copyright 2002-2014 Gentoo Foundation
+Copyright 2002-2015 Gentoo Foundation
 Distributed under the terms of the GNU General Public License v2

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 14d99ee..6f93e92 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -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: $
 #

diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 61d7288..b2039bc 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -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: $
 #

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Müller]

commit:     e147bd3dcfd75763ee57be5161a28419584866bf
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 13:17:05 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 25 13:17:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/emacs.git/commit/?id=e147bd3d

elisp*.eclass: Update maintainer information.

 eclass/elisp-common.eclass | 2 +-
 eclass/elisp.eclass        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 36ad8ae..4ccbfb1 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -4,7 +4,7 @@
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:
-# Gentoo Emacs team <emacs@gentoo.org>
+# Gentoo GNU Emacs project <emacs@gentoo.org>
 # @AUTHOR:
 # Matthew Kennedy <mkennedy@gentoo.org>
 # Jeremy Maitin-Shepard <jbms@attbi.com>

diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index b2039bc..c24613b 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -4,7 +4,7 @@
 #
 # @ECLASS: elisp.eclass
 # @MAINTAINER:
-# Gentoo Emacs team <emacs@gentoo.org>
+# Gentoo GNU Emacs project <emacs@gentoo.org>
 # @AUTHOR:
 # Matthew Kennedy <mkennedy@gentoo.org>
 # Jeremy Maitin-Shepard <jbms@attbi.com>

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Müller]

commit:     f88edb9ae964ded03304698cb8e39041fbc9a311
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 11 09:16:22 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 11 09:16:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=f88edb9a

elisp-common.eclass: Update version number in example.

---
 eclass/elisp-common.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index bc8cda7..14d99ee 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -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] proj/emacs:master commit in: eclass/

[Ulrich Müller]

commit:     2dccd92ace00253911b517e2adbd41fe99eeea57
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  7 10:32:34 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun  7 10:32:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=2dccd92a

Increase minimum Emacs version to 23, versions 21 and 22 have been removed.

---
 eclass/ChangeLog    | 5 +++++
 eclass/elisp.eclass | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index a246178..0664efe 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-07  Ulrich Müller  <ulm@gentoo.org>
+
+	* elisp.eclass (DEPEND): Increase minimum Emacs version to 23.
+	(elisp_pkg_setup): Ditto.
+
 2014-05-18  Ulrich Müller  <ulm@gentoo.org>
 
 	* elisp-common.eclass (elisp-site-regen): Die on errors.

diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 2919f26..61d7288 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 #
@@ -29,7 +29,7 @@
 # @ECLASS-VARIABLE: NEED_EMACS
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# If you need anything different from Emacs 21, use the NEED_EMACS
+# If you need anything different from Emacs 23, use the NEED_EMACS
 # variable before inheriting elisp.eclass.  Set it to the major version
 # your package uses and the dependency will be adjusted.
 
@@ -74,7 +74,7 @@ case "${EAPI:-0}" in
 		pkg_{setup,postinst,postrm} ;;
 esac
 
-DEPEND=">=virtual/emacs-${NEED_EMACS:-21}"
+DEPEND=">=virtual/emacs-${NEED_EMACS:-23}"
 RDEPEND="${DEPEND}"
 
 # @FUNCTION: elisp_pkg_setup
@@ -83,7 +83,7 @@ RDEPEND="${DEPEND}"
 # version requirement of the NEED_EMACS variable.
 
 elisp_pkg_setup() {
-	elisp-need-emacs "${NEED_EMACS:-21}"
+	elisp-need-emacs "${NEED_EMACS:-23}"
 	case $? in
 		0) ;;
 		1) die "Emacs version too low" ;;

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Müller]

commit:     de8abcc26e30dafe939bf63251b64ced7cae7b33
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon May 19 17:38:21 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon May 19 17:38:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=de8abcc2

Remove obsolete comment.

---
 eclass/elisp-common.eclass | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index bf01c83..bc8cda7 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -342,10 +342,6 @@ elisp-site-file-install() {
 # 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}

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Müller]

commit:     20f13fc2b967d676455e78874b3a3317539da520
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 18 14:41:18 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 18 14:41:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=20f13fc2

elisp-common.eclass: Die on errors in elisp-site-regen.

* elisp-common.eclass (elisp-site-regen): Die on errors.

---
 eclass/ChangeLog           |  2 ++
 eclass/elisp-common.eclass | 31 +++++++++++++++----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 34ffa34..a246178 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,5 +1,7 @@
 2014-05-18  Ulrich Müller  <ulm@gentoo.org>
 
+	* elisp-common.eclass (elisp-site-regen): Die on errors.
+
 	* elisp-common.eclass (elisp-site-regen): Look for site-init files
 	only in site-gentoo.d subdirectory.
 

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 12bbc00..bf01c83 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -349,31 +349,27 @@ elisp-site-file-install() {
 
 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:
@@ -383,8 +379,8 @@ elisp-site-regen() {
 	;;; 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)
@@ -397,7 +393,10 @@ elisp-site-regen() {
 	;;; 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.
@@ -406,7 +405,7 @@ elisp-site-regen() {
 		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." ;;

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Müller]

commit:     7775d6825cd8a37cdcca83a062f7d09546981184
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 18 14:37:31 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun May 18 14:37:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=7775d682

elisp-common.eclass: Look for site-init files in site-gentoo.d only.

* elisp-common.eclass (elisp-site-regen): Look for site-init files
only in site-gentoo.d subdirectory.

---
 eclass/ChangeLog           |  7 ++++++-
 eclass/elisp-common.eclass | 14 +++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index e46c0f1..34ffa34 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-18  Ulrich Müller  <ulm@gentoo.org>
+
+	* elisp-common.eclass (elisp-site-regen): Look for site-init files
+	only in site-gentoo.d subdirectory.
+
 2013-10-31  Ulrich Müller  <ulm@gentoo.org>
 
 	* elisp-common.eclass (elisp-site-regen): Don't create
@@ -794,5 +799,5 @@
 
 	* elisp.eclass: Initial.
 
-Copyright 2002-2013 Gentoo Foundation
+Copyright 2002-2014 Gentoo Foundation
 Distributed under the terms of the GNU General Public License v2

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index d1e7fbb..12bbc00 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 #
@@ -369,16 +369,8 @@ elisp-site-regen() {
 
 	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[@]}; i>0; 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

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Müller]

commit:     6dc2a422952ae3725cf2b9e937d117a7286a06f8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  4 21:35:35 2013 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Nov  4 21:35:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=6dc2a422

Fix ChangeLog.

---
 eclass/ChangeLog | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 3bdade8..e46c0f1 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,3 +1,12 @@
+2013-10-31  Ulrich Müller  <ulm@gentoo.org>
+
+	* elisp-common.eclass (elisp-site-regen): Don't create
+	site-gentoo.el in postrm phase.
+
+2013-09-04  Ulrich Müller  <ulm@gentoo.org>
+
+	* elisp-common.eclass: Add proper @CODE tags in comments.
+
 2013-07-18  Ulrich Müller  <ulm@gentoo.org>
 
 	* elisp-common.eclass (elisp-emacs-version): Unset TERM and
@@ -5,8 +14,8 @@
 
 2013-07-16  Mats Lidell  <matsl@gentoo.org>
 
-	* xemacs-packages.eclass (xemacs-packages_src_prepare,
-	xemacs-packages_src_configure): New functions that does
+	* xemacs-packages.eclass (xemacs-packages_src_prepare)
+	(xemacs-packages_src_configure): New functions that does
 	nothing. Needed for EAPI>2 support.
 
 2013-03-04  Ulrich Müller  <ulm@gentoo.org>
@@ -36,10 +45,20 @@
 	* elisp-common.eclass (elisp-site-regen): Remove last remnants of
 	backwards compatibility code that was introduced at 2007-12-01.
 
+2012-08-24  Ulrich Müller  <ulm@gentoo.org>
+
+	* elisp-common.eclass (elisp-site-regen): Suppress warning for
+	initial installation.
+
 2012-08-17  Ulrich Müller  <ulm@gentoo.org>
 
 	* elisp.eclass (IUSE): Remove unnecessary variable assignment.
 
+2012-07-18  Ulrich Müller  <ulm@gentoo.org>
+
+	* elisp-common.eclass: Make use of the @ROFF token in
+	documentation.
+
 2012-02-11  Ulrich Müller  <ulm@gentoo.org>
 
 	* elisp-common.eclass (elisp-need-emacs): Require GNU Emacs.
@@ -775,18 +794,5 @@
 
 	* elisp.eclass: Initial.
 
-Copyright 2002-2012 Gentoo Foundation
+Copyright 2002-2013 Gentoo Foundation
 Distributed under the terms of the GNU General Public License v2
-
-  31 Oct 2013; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
-  Don't create site-gentoo.el in postrm phase.
-
-  04 Sep 2013; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
-  Add proper @CODE tags in comments.
-
-  24 Aug 2012; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
-  Suppress warning for initial installation.
-
-  18 Jul 2012; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
-  Sync from Portage tree: Make use of the @ROFF token in documentation.
-

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Müller]

commit:     99251e279a016d3fd7e00e76194374d09bc48308
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 15:08:37 2013 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 15:08:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=99251e27

Don't create site-gentoo.el in postrm phase.

---
 eclass/ChangeLog           | 3 +++
 eclass/elisp-common.eclass | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index d443777..3bdade8 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -778,6 +778,9 @@
 Copyright 2002-2012 Gentoo Foundation
 Distributed under the terms of the GNU General Public License v2
 
+  31 Oct 2013; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
+  Don't create site-gentoo.el in postrm phase.
+
   04 Sep 2013; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
   Add proper @CODE tags in comments.
 

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 8085e56..d1e7fbb 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -362,6 +362,11 @@ elisp-site-regen() {
 		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
+
 	ebegin "Regenerating site-gentoo.el for GNU Emacs (${EBUILD_PHASE})"
 
 	for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Mueller]

commit:     cf86331609a3e82f99313edf70e2e18f90a56623
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  4 19:12:07 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Sep  4 19:12:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=cf863316

Add proper @CODE tags in comments.

---
 eclass/ChangeLog           |  3 +++
 eclass/elisp-common.eclass | 46 +++++++++++++++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 9495777..d443777 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -778,6 +778,9 @@
 Copyright 2002-2012 Gentoo Foundation
 Distributed under the terms of the GNU General Public License v2
 
+  04 Sep 2013; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
+  Add proper @CODE tags in comments.
+
   24 Aug 2012; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
   Suppress warning for initial installation.
 

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 4decc2c..8085e56 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -23,7 +23,9 @@
 #
 # When relying on the emacs USE flag, you need to add
 #
-#   	emacs? ( virtual/emacs )
+# @CODE
+# 	emacs? ( virtual/emacs )
+# @CODE
 #
 # to your DEPEND/RDEPEND line and use the functions provided here to
 # bring the files to the correct locations.
@@ -35,7 +37,9 @@
 # tested with function elisp-need-emacs(), which would typically be
 # called from pkg_setup(), as in the following example:
 #
-#   	elisp-need-emacs 23 || die "Emacs version too low"
+# @CODE
+# 	elisp-need-emacs 23 || die "Emacs version too low"
+# @CODE
 #
 # Please note that such tests should be limited to packages that are
 # known to fail with lower Emacs versions; the standard case is to
@@ -50,7 +54,9 @@
 # directory is added to the load-path which makes sure that all files
 # are loadable.
 #
-#   	elisp-compile *.el
+# @CODE
+# 	elisp-compile *.el
+# @CODE
 #
 # Function elisp-make-autoload-file() can be used to generate a file
 # with autoload definitions for the lisp functions.  It takes the output
@@ -70,16 +76,20 @@
 # choose something else, but remember to tell elisp-site-file-install()
 # (see below) the change, as it defaults to ${PN}.
 #
-#   	elisp-install ${PN} *.el *.elc
+# @CODE
+# 	elisp-install ${PN} *.el *.elc
+# @CODE
 #
 # To let the Emacs support be activated by Emacs on startup, you need
 # to provide a site file (shipped in ${FILESDIR}) which contains the
 # startup code (have a look in the documentation of your software).
 # Normally this would look like this:
 #
-#   	(add-to-list 'load-path "@SITELISP@")
-#   	(add-to-list 'auto-mode-alist '("\\.csv\\'" . csv-mode))
-#   	(autoload 'csv-mode "csv-mode" "Major mode for csv files." t)
+# @CODE
+# 	(add-to-list 'load-path "@SITELISP@")
+# 	(add-to-list 'auto-mode-alist '("\\.csv\\'" . csv-mode))
+# 	(autoload 'csv-mode "csv-mode" "Major mode for csv files." t)
+# @CODE
 #
 # If your Emacs support files are installed in a subdirectory of
 # /usr/share/emacs/site-lisp/ (which is strongly recommended), you need
@@ -108,11 +118,15 @@
 # Best practice is to define a SITEFILE variable in the global scope of
 # your ebuild (e.g., right after S or RDEPEND):
 #
-#   	SITEFILE="50${PN}-gentoo.el"
+# @CODE
+# 	SITEFILE="50${PN}-gentoo.el"
+# @CODE
 #
 # Which is then installed by
 #
-#   	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+# @CODE
+# 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+# @CODE
 #
 # in src_install().  Any characters after the "-gentoo" part and before
 # the extension will be stripped from the destination file's name.
@@ -126,13 +140,15 @@
 # After that you need to recreate the start-up file of Emacs after
 # emerging and unmerging by using
 #
-#   	pkg_postinst() {
-#   		elisp-site-regen
-#   	}
+# @CODE
+# 	pkg_postinst() {
+# 		elisp-site-regen
+# 	}
 #
-#   	pkg_postrm() {
-#   		elisp-site-regen
-#   	}
+# 	pkg_postrm() {
+# 		elisp-site-regen
+# 	}
+# @CODE
 #
 # When having optional Emacs support, you should prepend "use emacs &&"
 # to above calls of elisp-site-regen().

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Mueller]

commit:     536e1683293482536e6fa5b3586856dbf3f042d0
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 16:47:55 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 16:47:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=536e1683

Add missing ChangeLog entry for elisp-common.eclass.

---
 eclass/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index dde7bab..9495777 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-18  Ulrich Müller  <ulm@gentoo.org>
+
+	* elisp-common.eclass (elisp-emacs-version): Unset TERM and
+	DISPLAY so that microemacsen won't hang, but exit with an error.
+
 2013-07-16  Mats Lidell  <matsl@gentoo.org>
 
 	* xemacs-packages.eclass (xemacs-packages_src_prepare,

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Mueller]

commit:     a62ea099deece42b3e5d3adff95c40636e3f497b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 22:21:26 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 22:21:26 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=a62ea099

elisp-common.eclass: Update a comment.

---
 eclass/elisp-common.eclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 8f6a826..4decc2c 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -177,9 +177,10 @@ elisp-emacs-version() {
 	# The following will work for at least versions 18-24.
 	echo "(princ emacs-version)" >"${T}"/emacs-version.el
 	version=$(
-		# EMACS could be a microemacs variant that doesn't know our
-		# options and would hang in interactive mode. Redirecting stdin
-		# and unsetting TERM and DISPLAY will make most of them fail.
+		# EMACS could be a microemacs variant that ignores the -batch
+		# option and would therefore hang, waiting for user interaction.
+		# Redirecting stdin and unsetting TERM and DISPLAY will cause
+		# most of them to exit with an error.
 		unset TERM DISPLAY
 		${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el </dev/null
 	)

[gentoo-commits] proj/emacs:master commit in: eclass/

[Ulrich Mueller]

commit:     0914a69ece4ac510cacd7719a6d7a11de3a8a071
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 20:37:34 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 20:37:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=0914a69e

Make elisp-emacs-version() more robust.

---
 eclass/elisp-common.eclass | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index dcba57b..8f6a826 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -173,16 +173,27 @@ BYTECOMPFLAGS="-L ."
 # Output version of currently active Emacs.
 
 elisp-emacs-version() {
-	local ret
+	local version ret
 	# The following will work for at least versions 18-24.
 	echo "(princ emacs-version)" >"${T}"/emacs-version.el
-	${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el
+	version=$(
+		# EMACS could be a microemacs variant that doesn't know our
+		# options and would hang in interactive mode. Redirecting stdin
+		# and unsetting TERM and DISPLAY will make most of them fail.
+		unset TERM DISPLAY
+		${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el </dev/null
+	)
 	ret=$?
 	rm -f "${T}"/emacs-version.el
 	if [[ ${ret} -ne 0 ]]; then
 		eerror "elisp-emacs-version: Failed to run ${EMACS}"
+		return ${ret}
+	fi
+	if [[ -z ${version} ]]; then
+		eerror "elisp-emacs-version: Could not determine Emacs version"
+		return 1
 	fi
-	return ${ret}
+	echo "${version}"
 }
 
 # @FUNCTION: elisp-need-emacs

[gentoo-commits] proj/emacs:master commit in: eclass/

[Mats Lidell]

commit:     6eae828d7ae7e88949ca8e5f09b07083d2965e6f
Author:     Mats Lidell <mats.lidell <AT> cag <DOT> se>
AuthorDate: Tue Jul 16 16:36:22 2013 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 16:36:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=6eae828d

Added support for EAPI>2 in xemacs-packages.eclass

---
 eclass/ChangeLog              |  6 ++++
 eclass/xemacs-packages.eclass | 80 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index f0ddafe..dde7bab 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-16  Mats Lidell  <matsl@gentoo.org>
+
+	* xemacs-packages.eclass (xemacs-packages_src_prepare,
+	xemacs-packages_src_configure): New functions that does
+	nothing. Needed for EAPI>2 support.
+
 2013-03-04  Ulrich Müller  <ulm@gentoo.org>
 
 	* elisp.eclass (elisp_src_install, elisp_pkg_postinst):

diff --git a/eclass/xemacs-packages.eclass b/eclass/xemacs-packages.eclass
new file mode 100644
index 0000000..c65fc0e
--- /dev/null
+++ b/eclass/xemacs-packages.eclass
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/eclass/xemacs-packages.eclass,v 1.19 2011/12/27 17:55:13 fauli Exp $
+
+# @ECLASS: xemacs-packages.eclass
+# @MAINTAINER:
+# xemacs@gentoo.org
+# @BLURB: Eclass to support elisp packages distributed by XEmacs.
+# @DESCRIPTION:
+# This eclass supports ebuilds for packages distributed by XEmacs.
+
+case "${EAPI:-0}" in
+	0|1) EXPORT_FUNCTIONS src_{unpack,compile,install} ;;
+	*) EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} ;;
+esac
+
+RDEPEND="app-editors/xemacs"
+
+S="${WORKDIR}"
+
+[ -z "$HOMEPAGE" ]    && HOMEPAGE="http://xemacs.org/"
+[ -z "$LICENSE" ]     && LICENSE="GPL-2"
+
+# @ECLASS-VARIABLE: PKG_CAT
+# @REQUIRED
+# @DESCRIPTION:
+# The package category that the package is in. Can be either standard,
+# mule, or contrib.
+
+case "${PKG_CAT}" in
+	"standard" )
+		MY_INSTALL_DIR="/usr/lib/xemacs/xemacs-packages" ;;
+
+	"mule" )
+		MY_INSTALL_DIR="/usr/lib/xemacs/mule-packages" ;;
+
+	"contrib" )
+		MY_INSTALL_DIR="/usr/lib/xemacs/site-packages" ;;
+	*)
+		die "Unsupported package category in PKG_CAT (or unset)" ;;
+esac
+[ -n "$DEBUG" ] && einfo "MY_INSTALL_DIR is ${MY_INSTALL_DIR}"
+
+# @ECLASS-VARIABLE: EXPERIMENTAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If set then the package is downloaded from the experimental packages
+# repository, which is the staging area for packages upstream. Packages
+# in the experimental repository are auto-generated from XEmacs VCS, so
+# they may not be well-tested.
+
+if [ -n "$EXPERIMENTAL" ]
+then
+	[ -z "$SRC_URI" ] && SRC_URI="http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/${P}-pkg.tar.gz"
+else
+	[ -z "$SRC_URI" ] && SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${P}-pkg.tar.gz"
+fi
+[ -n "$DEBUG" ] && einfo "SRC_URI is ${SRC_URI}"
+
+xemacs-packages_src_unpack() { 
+	einfo "Nothing to unpack"
+}
+
+xemacs-packages_src_prepare() {
+	einfo "Nothing to prepare"
+}
+
+xemacs-packages_src_configure() {
+	einfo "Nothing to configure"
+}
+
+xemacs-packages_src_compile() {
+	einfo "Nothing to compile"
+}
+
+xemacs-packages_src_install() {
+	dodir ${MY_INSTALL_DIR}
+	cd "${D}${MY_INSTALL_DIR}"
+	unpack ${A}
+}