diff options
| -rw-r--r-- | app-editors/emacs-xwidget/ChangeLog | 3 | ||||
| -rw-r--r-- | app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog index 28a0a5a..1cec23c 100644 --- a/app-editors/emacs-xwidget/ChangeLog +++ b/app-editors/emacs-xwidget/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 29 Dec 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild: + Set a fake version number to avoid collisions with emacs-vcs. + *emacs-xwidget-25.0.9999 (29 Dec 2014) 29 Dec 2014; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.4.9999.ebuild, diff --git a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild index 0cce171..7ae4df6 100644 --- a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild +++ b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild @@ -104,8 +104,8 @@ EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" SITEFILE="20${PN}-${SLOT}-gentoo.el" src_prepare() { - # set a fake version number to avoid collisions between SLOTs - #sed -i -e "/AC_INIT/s/\(24\.[0-9]*\)\.[0-9]*/\1.60/" configure.ac + # set a fake version number to avoid collisions with emacs-vcs + sed -i -e "/AC_INIT/s/\(25\.[0-9]*\)\.[0-9]*/\1.60/" configure.ac if [[ ${PV##*.} = 9999 ]]; then FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ |