summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-03-06 09:05:37 +0000
committerUlrich Müller <ulm@gentoo.org>2013-03-06 09:05:37 +0000
commit4578d59a9cb812ff14fc4e824fa510e56ef2f068 (patch)
tree3ad8963561cec2e13ed460fc6ec7b3b3dae6fcce
parentx11-libs/qwt: Enhance building static-libs by using multibuild.eclass (diff)
downloadgentoo-2-4578d59a9cb812ff14fc4e824fa510e56ef2f068.tar.gz
gentoo-2-4578d59a9cb812ff14fc4e824fa510e56ef2f068.tar.bz2
gentoo-2-4578d59a9cb812ff14fc4e824fa510e56ef2f068.zip
Fix previous commit, REPLACING_VERSIONS is not valid in src_install.
(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
-rw-r--r--app-editors/emacs/ChangeLog5
-rw-r--r--app-editors/emacs/emacs-24.3_rc1.ebuild7
2 files changed, 8 insertions, 4 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 9d879b34ab94..ce890505ea60 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.556 2013/03/05 18:25:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.557 2013/03/06 09:05:37 ulm Exp $
+
+ 06 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-24.3_rc1.ebuild:
+ Fix previous commit, REPLACING_VERSIONS is not valid in src_install.
05 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-23.4-r5.ebuild:
Use functions from readme.gentoo.eclass instead of elog.
diff --git a/app-editors/emacs/emacs-24.3_rc1.ebuild b/app-editors/emacs/emacs-24.3_rc1.ebuild
index e0a269e72925..8d1ea65413c5 100644
--- a/app-editors/emacs/emacs-24.3_rc1.ebuild
+++ b/app-editors/emacs/emacs-24.3_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3_rc1.ebuild,v 1.1 2013/03/05 13:49:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3_rc1.ebuild,v 1.2 2013/03/06 09:05:37 ulm Exp $
EAPI=5
@@ -289,8 +289,6 @@ src_install () {
use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
${EPREFIX}/Applications/Gentoo. You may want to copy or symlink it
into /Applications by yourself."
- [[ ${REPLACING_VERSIONS} =~ (^|[[:space:]])24\.[12]($|[^0-9]) ]] \
- && FORCE_PRINT_ELOG=1
readme.gentoo_create_doc
}
@@ -314,6 +312,9 @@ pkg_preinst() {
pkg_postinst() {
elisp-site-regen
+
+ [[ ${REPLACING_VERSIONS} =~ (^|[[:space:]])24\.[12]($|[^0-9]) ]] \
+ && FORCE_PRINT_ELOG=1
readme.gentoo_print_elog
if use livecd; then