From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1KYeDZ-0002cC-F8 for garchives@archives.gentoo.org; Thu, 28 Aug 2008 09:55:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D597E0406; Thu, 28 Aug 2008 09:55:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 332B4E0406 for ; Thu, 28 Aug 2008 09:55:05 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 503C565442 for ; Thu, 28 Aug 2008 09:55:04 +0000 (UTC) Received: from ulm by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1KYeDV-0004UT-TN for gentoo-commits@lists.gentoo.org; Thu, 28 Aug 2008 09:55:02 +0000 From: "Ulrich Mueller (ulm)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ulm@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: elisp.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: elisp.eclass X-VCS-Directories: eclass X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller Content-Type: text/plain; charset=utf8 Message-Id: Sender: Ulrich Mueller Date: Thu, 28 Aug 2008 09:55:01 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a46a1c48-4377-4393-a979-da46d48d5df9 X-Archives-Hash: a742c70264b19789ff8ae262603ac0c5 ulm 08/08/28 09:55:01 Modified: elisp.eclass Log: Sync elisp.eclass from Emacs overlay (revision 1138): =20 Remove global VERSION variable to reduce namespace pollution. Handle the case of empty ${A} in src_unpack. Revision Changes Path 1.33 eclass/elisp.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclas= s?rev=3D1.33&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclas= s?rev=3D1.33&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/elisp.eclas= s?r1=3D1.32&r2=3D1.33 Index: elisp.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- elisp.eclass 23 Jun 2008 21:38:42 -0000 1.32 +++ elisp.eclass 28 Aug 2008 09:55:01 -0000 1.33 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.32 2008/06/23= 21:38:42 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/elisp.eclass,v 1.33 2008/08/28= 09:55:01 ulm Exp $ # # Copyright 2002-2003 Matthew Kennedy # Copyright 2003 Jeremy Maitin-Shepard @@ -37,23 +37,23 @@ =20 inherit elisp-common versionator =20 -VERSION=3D${NEED_EMACS:-21} -DEPEND=3D">=3Dvirtual/emacs-${VERSION}" -RDEPEND=3D">=3Dvirtual/emacs-${VERSION}" +DEPEND=3D">=3Dvirtual/emacs-${NEED_EMACS:-21}" +RDEPEND=3D">=3Dvirtual/emacs-${NEED_EMACS:-21}" IUSE=3D"" =20 elisp_pkg_setup() { - local emacs_version=3D"$(elisp-emacs-version)" - if ! version_is_at_least "${VERSION}" "${emacs_version}"; then - eerror "This package needs at least Emacs ${VERSION}." + local need_emacs=3D${NEED_EMACS:-21} + local have_emacs=3D$(elisp-emacs-version) + if ! version_is_at_least "${need_emacs}" "${have_emacs}"; then + eerror "This package needs at least Emacs ${need_emacs}." eerror "Use \"eselect emacs\" to select the active version." - die "Emacs version ${emacs_version} is too low." + die "Emacs version ${have_emacs} is too low." fi - einfo "Currently selected GNU Emacs version: ${emacs_version}" + einfo "Currently selected GNU Emacs version: ${have_emacs}" } =20 elisp_src_unpack() { - unpack ${A} + [ -n "${A}" ] && unpack ${A} if [ -f ${P}.el ]; then mv ${P}.el ${PN}.el || die "mv ${P}.el ${PN}.el failed" fi