| 1 |
ulm 10/01/05 08:17:41 |
| 2 |
|
| 3 |
Modified: ChangeLog emacs-vcs-23.1.9999-r2.ebuild |
| 4 |
Log: |
| 5 |
Revert previous change as upstream has renamed the branch again, bug 299667. |
| 6 |
(Portage version: 2.2_rc61/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 app-editors/emacs-vcs/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- ChangeLog 4 Jan 2010 20:31:02 -0000 1.3 |
| 22 |
+++ ChangeLog 5 Jan 2010 08:17:40 -0000 1.4 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for app-editors/emacs-vcs |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.3 2010/01/04 20:31:02 ulm Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.4 2010/01/05 08:17:40 ulm Exp $ |
| 28 |
+ |
| 29 |
+ 05 Jan 2010; Ulrich Mueller <ulm@g.o> |
| 30 |
+ emacs-vcs-23.1.9999-r2.ebuild: |
| 31 |
+ Revert previous change, as upstream has renamed emacs-23 back to trunk. |
| 32 |
+ Fixes bug 299667. |
| 33 |
|
| 34 |
04 Jan 2010; Ulrich Mueller <ulm@g.o> |
| 35 |
emacs-vcs-23.1.9999-r2.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: emacs-vcs-23.1.9999-r2.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- emacs-vcs-23.1.9999-r2.ebuild 4 Jan 2010 20:31:02 -0000 1.2 |
| 52 |
+++ emacs-vcs-23.1.9999-r2.ebuild 5 Jan 2010 08:17:40 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $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 $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.1.9999-r2.ebuild,v 1.3 2010/01/05 08:17:40 ulm Exp $ |
| 58 |
|
| 59 |
EAPI=2 |
| 60 |
|
| 61 |
@@ -8,9 +8,9 @@ |
| 62 |
|
| 63 |
if [ "${PV##*.}" = "9999" ]; then |
| 64 |
inherit bzr |
| 65 |
- EMACS_BRANCH="emacs-23" |
| 66 |
+ EMACS_BRANCH="trunk" |
| 67 |
EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/emacs/${EMACS_BRANCH}/" |
| 68 |
- EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}" |
| 69 |
+ EBZR_CACHE_DIR="emacs-${EMACS_BRANCH}" |
| 70 |
SRC_URI="" |
| 71 |
else |
| 72 |
SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz |
| 73 |
@@ -83,13 +83,6 @@ |
| 74 |
ewarn "Therefore, you may remove the old CVS directory:" |
| 75 |
ewarn "rm -rf ${cvsdir}" |
| 76 |
fi |
| 77 |
- |
| 78 |
- local olddir="${EBZR_STORE_DIR}/emacs-trunk" |
| 79 |
- if [ -d "${EBZR_STORE_DIR}/emacs-trunk" ]; then |
| 80 |
- ewarn "GNU Emacs upstream has renamed the \"trunk\" to \"emacs-23\"." |
| 81 |
- ewarn "Therefore, you may remove the old BZR directory:" |
| 82 |
- ewarn "rm -rf ${olddir}" |
| 83 |
- fi |
| 84 |
} |
| 85 |
|
| 86 |
src_prepare() { |
Archives