| 1 |
ulm 11/08/02 17:44:04 |
| 2 |
|
| 3 |
Modified: ChangeLog emacs-23.3.ebuild emacs-23.2-r2.ebuild |
| 4 |
Log: |
| 5 |
Update SRC_URI for new upstream tarballs; installed files should be unchanged, however. Remove unused code from 23.2 ebuild. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.7/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.425 app-editors/emacs/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.425&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.425&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.424&r2=1.425 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v |
| 19 |
retrieving revision 1.424 |
| 20 |
retrieving revision 1.425 |
| 21 |
diff -u -r1.424 -r1.425 |
| 22 |
--- ChangeLog 2 Aug 2011 05:41:31 -0000 1.424 |
| 23 |
+++ ChangeLog 2 Aug 2011 17:44:03 -0000 1.425 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for app-editors/emacs |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.424 2011/08/02 05:41:31 mattst88 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.425 2011/08/02 17:44:03 ulm Exp $ |
| 29 |
+ |
| 30 |
+ 02 Aug 2011; Ulrich Mueller <ulm@g.o> emacs-23.2-r2.ebuild, |
| 31 |
+ emacs-23.3.ebuild: |
| 32 |
+ Update SRC_URI for new upstream tarballs; installed files should be |
| 33 |
+ unchanged, however. Remove unused code from 23.2 ebuild. |
| 34 |
|
| 35 |
02 Aug 2011; Matt Turner <mattst88@g.o> emacs-21.4-r23.ebuild, |
| 36 |
emacs-22.3-r7.ebuild, emacs-23.2-r2.ebuild, emacs-23.3.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.13 app-editors/emacs/emacs-23.3.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3.ebuild?rev=1.13&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3.ebuild?rev=1.13&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3.ebuild?r1=1.12&r2=1.13 |
| 45 |
|
| 46 |
Index: emacs-23.3.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3.ebuild,v |
| 49 |
retrieving revision 1.12 |
| 50 |
retrieving revision 1.13 |
| 51 |
diff -u -r1.12 -r1.13 |
| 52 |
--- emacs-23.3.ebuild 2 Aug 2011 05:41:31 -0000 1.12 |
| 53 |
+++ emacs-23.3.ebuild 2 Aug 2011 17:44:03 -0000 1.13 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3.ebuild,v 1.12 2011/08/02 05:41:31 mattst88 Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3.ebuild,v 1.13 2011/08/02 17:44:03 ulm Exp $ |
| 59 |
|
| 60 |
EAPI=4 |
| 61 |
WANT_AUTOMAKE="none" |
| 62 |
@@ -9,7 +9,7 @@ |
| 63 |
|
| 64 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
| 65 |
HOMEPAGE="http://www.gnu.org/software/emacs/" |
| 66 |
-SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 |
| 67 |
+SRC_URI="mirror://gnu/emacs/${P}a.tar.bz2 |
| 68 |
mirror://gentoo/${P}-patches-1.tar.bz2" |
| 69 |
|
| 70 |
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2" |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.15 app-editors/emacs/emacs-23.2-r2.ebuild |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild?rev=1.15&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild?rev=1.15&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild?r1=1.14&r2=1.15 |
| 79 |
|
| 80 |
Index: emacs-23.2-r2.ebuild |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v |
| 83 |
retrieving revision 1.14 |
| 84 |
retrieving revision 1.15 |
| 85 |
diff -u -r1.14 -r1.15 |
| 86 |
--- emacs-23.2-r2.ebuild 2 Aug 2011 05:41:31 -0000 1.14 |
| 87 |
+++ emacs-23.2-r2.ebuild 2 Aug 2011 17:44:03 -0000 1.15 |
| 88 |
@@ -1,29 +1,15 @@ |
| 89 |
# Copyright 1999-2011 Gentoo Foundation |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v 1.14 2011/08/02 05:41:31 mattst88 Exp $ |
| 92 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v 1.15 2011/08/02 17:44:03 ulm Exp $ |
| 93 |
|
| 94 |
EAPI=2 |
| 95 |
|
| 96 |
inherit autotools elisp-common eutils flag-o-matic multilib |
| 97 |
|
| 98 |
-if [ "${PV##*.}" = "9999" ]; then |
| 99 |
- inherit bzr |
| 100 |
- EMACS_BRANCH="emacs-23" |
| 101 |
- EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EMACS_BRANCH}/" |
| 102 |
- EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}" |
| 103 |
- SRC_URI="" |
| 104 |
-else |
| 105 |
- SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 |
| 106 |
- mirror://gentoo/${P}-patches-2.tar.bz2" |
| 107 |
- # FULL_VERSION keeps the full version number, which is needed in |
| 108 |
- # order to determine some path information correctly for copy/move |
| 109 |
- # operations later on |
| 110 |
- FULL_VERSION="${PV%%_*}" |
| 111 |
- S="${WORKDIR}/emacs-${FULL_VERSION}" |
| 112 |
-fi |
| 113 |
- |
| 114 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
| 115 |
HOMEPAGE="http://www.gnu.org/software/emacs/" |
| 116 |
+SRC_URI="mirror://gnu/emacs/${P}a.tar.bz2 |
| 117 |
+ mirror://gentoo/${P}-patches-2.tar.bz2" |
| 118 |
|
| 119 |
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2" |
| 120 |
SLOT="23" |
| 121 |
@@ -76,21 +62,14 @@ |
| 122 |
|
| 123 |
EMACS_SUFFIX="emacs-${SLOT}" |
| 124 |
SITEFILE="20${PN}-${SLOT}-gentoo.el" |
| 125 |
+# FULL_VERSION keeps the full version number, which is needed in |
| 126 |
+# order to determine some path information correctly for copy/move |
| 127 |
+# operations later on |
| 128 |
+FULL_VERSION="${PV%%_*}" |
| 129 |
+S="${WORKDIR}/emacs-${FULL_VERSION}" |
| 130 |
|
| 131 |
src_prepare() { |
| 132 |
- if [ "${PV##*.}" = "9999" ]; then |
| 133 |
- FULL_VERSION=$(grep 'defconst[ ]*emacs-version' lisp/version.el \ |
| 134 |
- | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') |
| 135 |
- [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" |
| 136 |
- echo |
| 137 |
- einfo "Emacs branch: ${EMACS_BRANCH}" |
| 138 |
- einfo "Emacs version number: ${FULL_VERSION}" |
| 139 |
- [ "${FULL_VERSION%.*}" = ${PV%.*} ] \ |
| 140 |
- || die "Upstream version number changed to ${FULL_VERSION}" |
| 141 |
- echo |
| 142 |
- else |
| 143 |
- EPATCH_SUFFIX=patch epatch |
| 144 |
- fi |
| 145 |
+ EPATCH_SUFFIX=patch epatch |
| 146 |
|
| 147 |
sed -i \ |
| 148 |
-e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \ |
| 149 |
@@ -199,11 +178,6 @@ |
| 150 |
|
| 151 |
src_compile() { |
| 152 |
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 |
| 153 |
- if [ "${PV##*.}" = "9999" ]; then |
| 154 |
- emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" |
| 155 |
- # cleanup, otherwise emacs will be dumped again in src_install |
| 156 |
- (cd src; emake versionclean) |
| 157 |
- fi |
| 158 |
emake CC="$(tc-getCC)" || die "emake failed" |
| 159 |
} |
Archives