summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2010-01-04 20:31:02 +0000
committerUlrich Müller <ulm@gentoo.org>2010-01-04 20:31:02 +0000
commit78f839d6d533332583e00695697dfd714a4ecad4 (patch)
treed4201a55e48788564e68a19218d2dbd164b3c5b6 /app-editors
parentapp-portage/layman: Propagate upstream changes to live ebuild (diff)
downloadhistorical-78f839d6d533332583e00695697dfd714a4ecad4.tar.gz
historical-78f839d6d533332583e00695697dfd714a4ecad4.tar.bz2
historical-78f839d6d533332583e00695697dfd714a4ecad4.zip
Upstream renamed the "trunk" to "emacs-23".
Package-Manager: portage-2.2_rc61/cvs/Linux i686
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs-vcs/ChangeLog8
-rw-r--r--app-editors/emacs-vcs/Manifest10
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild15
3 files changed, 22 insertions, 11 deletions
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 <ulm@gentoo.org>
+ 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/Manifest b/app-editors/emacs-vcs/Manifest
index 035bbedf6f48..bd06373e4aa4 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -5,13 +5,13 @@ DIST emacs-23.1.90.tar.gz 45646812 RMD160 571eff7a40de2c90d17536de12b14cd4219e12
DIST emacs-23.1.91.tar.gz 45428180 RMD160 4cd9d46fba9d9b64066e9d9771e9e50e83cfe320 SHA1 b897ac43632646f9dfb3dece729ca19760f68b51 SHA256 7736b90eaf44167eb36fb21a1ae65e808c7d2985570fe18015a86bcecf28cb3b
EBUILD emacs-vcs-23.1.90-r1.ebuild 9407 RMD160 30cdedcce7d1d84c6d491ff710f2515594c952ae SHA1 7162f8960fc6875ac9f4a140f7d6b4367781a8d6 SHA256 4e2542a07896ae03ff6845574efe874177f259b48f3b7d315de81095f7677592
EBUILD emacs-vcs-23.1.91.ebuild 9404 RMD160 4589d24ae75ad8f1d5d656164fc59939ea552c6e SHA1 94609d8b20829f941b693ffeb780426a8efaebe1 SHA256 eed2bdef30d1d9d8dfd0b914e4d344e50681356be85d2aabd083058e95087255
-EBUILD emacs-vcs-23.1.9999-r2.ebuild 9637 RMD160 4442b5607a600e74c947e3528835bd7fd7be2c1b SHA1 13b3850470636a4a034070357ca467b2982db776 SHA256 f865c943165122a446960ac83c6f74f71f3fe1ba7d193382177e20c98198fdbe
-MISC ChangeLog 49277 RMD160 0b458a57a89c9bc869021b9be14c996bec39d799 SHA1 be630ee49bff075e45e3e86e065dae4ece121ec9 SHA256 0ceeb990b9f8c38ec3be402c548015f7c8c898ff8e9d2481bb49551bb3034698
+EBUILD emacs-vcs-23.1.9999-r2.ebuild 9905 RMD160 3e9978975f90e35c9535c518c2e02fbe8e03e6f2 SHA1 c256ae27d97b6caf23bd049d8e0b15ab0d98cc33 SHA256 e00aca9584ddf7769f9261cb38e99dd158b56439948ec98f8add5074df2ba4c4
+MISC ChangeLog 49404 RMD160 68030a7ec76bc4a467c0b36dfbdf48a80930aef2 SHA1 7a37343abccdc1ad1d3742b6afd827d759a8dcdd SHA256 8c047646723f70599d649a7d80e6bb4214195f055515a0070725a7f2bd144aec
MISC metadata.xml 1622 RMD160 01a46ab0aebc8acab07a5a874736783791b75c4e SHA1 c2869923f6e835df175a9a6f0d803170bf98fd85 SHA256 7875ea72b5aa0e9dd526c88692c08a3e1598e563d8e2d27e336fd1d5d707cb5c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
-iEYEARECAAYFAks8ljQACgkQOeoy/oIi7uy33wCeLJaGAbRi4B97Ba8x1uqXPGrZ
-L44AnirmyaQ4gfkw7y+sH/w1gQQL8Q8N
-=xq0e
+iEYEARECAAYFAktCUKsACgkQOeoy/oIi7uwdHgCfY9uJVgGVpr5CymlOfYjEeTUb
+KZIAoKXplQ//oKRUWvGtunziGtaRxF04
+=RjBR
-----END PGP SIGNATURE-----
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() {