From db2a9da378f3c14b1c59079a1b023d0f51d1e364 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Mon, 4 Jan 2010 20:31:02 +0000 Subject: Upstream renamed the "trunk" to "emacs-23". (Portage version: 2.2_rc61/cvs/Linux i686) --- app-editors/emacs-vcs/ChangeLog | 8 ++++++-- app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild | 15 +++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) (limited to 'app-editors') diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 0103b038896c..b9e62dbe11c5 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs-vcs -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.2 2009/12/31 12:14:04 ulm Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.3 2010/01/04 20:31:02 ulm Exp $ + + 04 Jan 2010; Ulrich Mueller + emacs-vcs-23.1.9999-r2.ebuild: + Upstream renamed the "trunk" to "emacs-23". *emacs-vcs-23.1.91 (31 Dec 2009) diff --git a/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild index 88b33b0b2656..becf1e2c5b43 100644 --- a/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild,v 1.1 2009/12/27 18:48:45 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild,v 1.2 2010/01/04 20:31:02 ulm Exp $ EAPI=2 @@ -8,9 +8,9 @@ inherit autotools elisp-common eutils flag-o-matic if [ "${PV##*.}" = "9999" ]; then inherit bzr - EMACS_BRANCH="trunk" + EMACS_BRANCH="emacs-23" EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/emacs/${EMACS_BRANCH}/" - EBZR_CACHE_DIR="emacs-${EMACS_BRANCH}" + EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}" SRC_URI="" else SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz @@ -83,6 +83,13 @@ pkg_setup() { ewarn "Therefore, you may remove the old CVS directory:" ewarn "rm -rf ${cvsdir}" fi + + local olddir="${EBZR_STORE_DIR}/emacs-trunk" + if [ -d "${EBZR_STORE_DIR}/emacs-trunk" ]; then + ewarn "GNU Emacs upstream has renamed the \"trunk\" to \"emacs-23\"." + ewarn "Therefore, you may remove the old BZR directory:" + ewarn "rm -rf ${olddir}" + fi } src_prepare() { -- cgit v1.2.3-65-gdbad