diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2015-03-29 12:32:46 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-03-29 12:32:46 +0000 |
| commit | ce1aca3241ead3f779b0c1940b094f354fecf361 (patch) | |
| tree | d0c4d933283f4a619395be203efc2b947be18eb0 /app-editors | |
| parent | drop vulnerable (diff) | |
| download | gentoo-2-ce1aca3241ead3f779b0c1940b094f354fecf361.tar.gz gentoo-2-ce1aca3241ead3f779b0c1940b094f354fecf361.tar.bz2 gentoo-2-ce1aca3241ead3f779b0c1940b094f354fecf361.zip | |
Upstream has changed version number of emacs-24 branch to 24.5.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 8 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild (renamed from app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild) | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index ad5303055876..0e478ce86c2e 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-editors/emacs-vcs # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.189 2015/03/08 18:28:07 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.190 2015/03/29 12:32:46 ulm Exp $ + +*emacs-vcs-24.5.9999 (29 Mar 2015) + + 29 Mar 2015; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-24.4.9999-r2.ebuild, + +emacs-vcs-24.5.9999.ebuild: + Upstream has changed version number of emacs-24 branch to 24.5. *emacs-vcs-24.4.91 (08 Mar 2015) diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild index eb6f0d004796..5774faf6ed60 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r2.ebuild,v 1.2 2015/02/17 08:23:32 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild,v 1.1 2015/03/29 12:32:46 ulm Exp $ EAPI=5 @@ -95,6 +95,10 @@ if [[ ${PV##*.} = 9999 ]]; then sys-apps/texinfo" fi +# temporary blocker, because the emacs-24 branch installs as version 24.5 +RDEPEND="${RDEPEND} + !=app-editors/emacs-24.5*" + EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" SITEFILE="20${PN}-${SLOT}-gentoo.el" |