summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-07-14 14:36:09 +0000
committerUlrich Müller <ulm@gentoo.org>2012-07-14 14:36:09 +0000
commitc4603fdba15d6e42017cdf638f894c22d3e23302 (patch)
treee865fe09ea3f82f28cc3f6a26e48eee4cd611347 /app-editors/emacs-vcs
parentVersion bump (diff)
downloadgentoo-2-c4603fdba15d6e42017cdf638f894c22d3e23302.tar.gz
gentoo-2-c4603fdba15d6e42017cdf638f894c22d3e23302.tar.bz2
gentoo-2-c4603fdba15d6e42017cdf638f894c22d3e23302.zip
Reflect upstream renaming of configure.in to configure.ac.
(Portage version: 2.1.11.7/cvs/Linux x86_64)
Diffstat (limited to 'app-editors/emacs-vcs')
-rw-r--r--app-editors/emacs-vcs/ChangeLog5
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild12
2 files changed, 10 insertions, 7 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 756f3aa18df0..0b40816c9198 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.104 2012/06/29 07:59:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.105 2012/07/14 14:36:09 ulm Exp $
+
+ 14 Jul 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.1.9999-r1.ebuild:
+ Reflect upstream renaming of configure.in to configure.ac.
29 Jun 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.1.9999-r1.ebuild,
metadata.xml:
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild
index 058b102a1acd..cb425be5f50c 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.1.9999-r1.ebuild,v 1.7 2012/06/29 07:59:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild,v 1.8 2012/07/14 14:36:09 ulm Exp $
EAPI=4
@@ -94,7 +94,7 @@ SITEFILE="20${PN}-${SLOT}-gentoo.el"
src_prepare() {
if [[ ${PV##*.} = 9999 ]]; then
FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
- configure.in)
+ configure.ac)
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
einfo "Emacs branch: ${EBZR_BRANCH}"
einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
@@ -108,15 +108,15 @@ src_prepare() {
if ! use alsa; then
# ALSA is detected even if not requested by its USE flag.
# Suppress it by supplying pkg-config with a wrong library name.
- sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
- || die "unable to sed configure.in"
+ sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.ac \
+ || die "unable to sed configure.ac"
fi
if ! use gzip-el; then
# Emacs' build system automatically detects the gzip binary and
# compresses el files. We don't want that so confuse it with a
# wrong binary name
- sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
- || die "unable to sed configure.in"
+ sed -i -e "/AC_PATH_PROG/s/gzip/PrEvEnTcOmPrEsSiOn/" configure.ac \
+ || die "unable to sed configure.ac"
fi
AT_M4DIR=m4 eautoreconf