From: "Christian Faulhammer (fauli)" <fauli@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/emacs: emacs-23.1.ebuild ChangeLog
Date: Thu, 30 Jul 2009 14:43:07 +0000 [thread overview]
Message-ID: <E1MWWqZ-00057O-73@stork.gentoo.org> (raw)
fauli 09/07/30 14:43:07
Modified: ChangeLog
Added: emacs-23.1.ebuild
Log:
Major version bump to 23, with only one little patch for xz support
(Portage version: 2.1.6.13/cvs/Linux i686)
Revision Changes Path
1.326 app-editors/emacs/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.326&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.326&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.325&r2=1.326
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- ChangeLog 21 Jul 2009 23:28:18 -0000 1.325
+++ ChangeLog 30 Jul 2009 14:43:07 -0000 1.326
@@ -1,6 +1,12 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.325 2009/07/21 23:28:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.326 2009/07/30 14:43:07 fauli Exp $
+
+*emacs-23.1 (30 Jul 2009)
+
+ 30 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+ +files/emacs-23.0.94-handle-xz-suffix.patch, +emacs-23.1.ebuild:
+ Major version bump to 23, with only one little patch for xz support
21 Jul 2009; Jeroen Roovers <jer@gentoo.org> emacs-21.4-r19.ebuild:
Stable for HPPA (bug #277194).
1.1 app-editors/emacs/emacs-23.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-23.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-23.1.ebuild?rev=1.1&content-type=text/plain
Index: emacs-23.1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1.ebuild,v 1.1 2009/07/30 14:43:07 fauli Exp $
EAPI=2
inherit autotools elisp-common eutils flag-o-matic
if [ "${PV##*.}" = "9999" ]; then
ECVS_AUTH="pserver"
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
ECVS_MODULE="emacs"
ECVS_BRANCH="HEAD"
ECVS_LOCALNAME="emacs"
inherit cvs
SRC_URI=""
S="${WORKDIR}/${ECVS_LOCALNAME}"
else
SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
# FULL_VERSION keeps the full version number, which is needed in
# order to determine some path information correctly for copy/move
# operations later on
FULL_VERSION="${PV%%_*}"
S="${WORKDIR}/emacs-${FULL_VERSION}"
fi
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
LICENSE="GPL-3 FDL-1.3 BSD as-is X11 W3C unicode"
SLOT="23"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
RESTRICT="strip"
RDEPEND="!=app-editors/emacs-cvs-23.0*
!=app-editors/emacs-cvs-23.1.9999
sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
net-libs/liblockfile
hesiod? ( net-dns/hesiod )
kerberos? ( virtual/krb5 )
alsa? ( media-libs/alsa-lib )
gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
X? (
x11-libs/libXmu
x11-libs/libXt
x11-misc/xbitmaps
gif? ( media-libs/giflib )
jpeg? ( media-libs/jpeg )
png? ( media-libs/libpng )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
xft? (
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
)
)
gtk? ( x11-libs/gtk+:2 )
!gtk? (
Xaw3d? ( x11-libs/Xaw3d )
!Xaw3d? ( motif? ( x11-libs/openmotif ) )
)
)"
DEPEND="${RDEPEND}
dev-util/pkgconfig
gzip-el? ( app-arch/gzip )"
RDEPEND="${RDEPEND}
>=app-emacs/emacs-common-gentoo-1[X?]"
EMACS_SUFFIX="emacs-${SLOT}"
SITEFILE="20${PN}-${SLOT}-gentoo.el"
src_prepare() {
if [ "${PV##*.}" = "9999" ]; then
FULL_VERSION=$(grep 'defconst[ ]*emacs-version' lisp/version.el \
| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
echo
einfo "Emacs CVS branch: ${ECVS_BRANCH}"
einfo "Emacs version number: ${FULL_VERSION}"
[ "${FULL_VERSION%.*}" = ${PV%.*} ] \
|| die "Upstream version number changed to ${FULL_VERSION}"
echo
fi
epatch "${FILESDIR}/emacs-23.0.94-handle-xz-suffix.patch"
sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
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"
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"
fi
eautoreconf
}
src_configure() {
ALLOWED_FLAGS=""
strip-flags
#unset LDFLAGS
if use sh; then
replace-flags -O[1-9] -O0 #262359
else
replace-flags -O[3-9] -O2
fi
local myconf
if use alsa && ! use sound; then
echo
einfo "Although sound USE flag is disabled you chose to have alsa,"
einfo "so sound is switched on anyway."
echo
myconf="${myconf} --with-sound"
else
myconf="${myconf} $(use_with sound)"
fi
if use X; then
myconf="${myconf} --with-x"
myconf="${myconf} $(use_with toolkit-scroll-bars)"
myconf="${myconf} $(use_with gif) $(use_with jpeg)"
myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
myconf="${myconf} $(use_with tiff) $(use_with xpm)"
myconf="${myconf} $(use_with xft)"
if use xft; then
myconf="${myconf} $(use_with m17n-lib libotf)"
myconf="${myconf} $(use_with m17n-lib m17n-flt)"
else
myconf="${myconf} --without-libotf --without-m17n-flt"
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect because xft is not set."
fi
# GTK+ is the default toolkit if USE=gtk is chosen with other
# possibilities. Emacs upstream thinks this should be standard
# policy on all distributions
if use gtk; then
einfo "Configuring to build with GIMP Toolkit (GTK+)"
myconf="${myconf} --with-x-toolkit=gtk"
elif use Xaw3d; then
einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
myconf="${myconf} --with-x-toolkit=athena"
elif use motif; then
einfo "Configuring to build with Motif toolkit"
myconf="${myconf} --with-x-toolkit=motif"
else
einfo "Configuring to build with no toolkit"
myconf="${myconf} --with-x-toolkit=no"
fi
local f tk=
for f in gtk Xaw3d motif; do
use ${f} || continue
[ "${tk}" ] \
&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
tk="${tk}${tk:+ }${f}"
done
else
myconf="${myconf} --without-x"
fi
myconf="${myconf} $(use_with hesiod)"
myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
myconf="${myconf} $(use_with gpm) $(use_with dbus)"
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir=/usr/share/info/${EMACS_SUFFIX} \
${myconf} || die "econf emacs failed"
}
src_compile() {
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
if [ "${PV##*.}" = "9999" ]; then
emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
# cleanup, otherwise emacs will be dumped again in src_install
(cd src; emake versionclean)
fi
emake CC="$(tc-getCC)" || die "emake failed"
}
src_install () {
local i m
emake install DESTDIR="${D}" || die "make install failed"
rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
|| die "removing duplicate emacs executable failed"
mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
|| die "moving Emacs executable failed"
# move info documentation to the correct place
for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
mv "${i}" "${i}.info" || die "mv info failed"
done
# move man pages to the correct place
for m in "${D}"/usr/share/man/man1/* ; do
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
done
# avoid collision between slots, see bug #169033 e.g.
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${D}"/usr/share/{applications,icons}
rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
keepdir /var/lib/games/emacs
local c=";;"
if use source; then
insinto /usr/share/emacs/${FULL_VERSION}/src
# This is not meant to install all the source -- just the
# C source you might find via find-function
doins src/*.[ch]
c=""
fi
sed 's/^X//' >"${SITEFILE}" <<-EOF
X
;;; ${PN}-${SLOT} site-lisp configuration
X
(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
X ${c}(setq find-function-C-source-directory
X ${c} "/usr/share/emacs/${FULL_VERSION}/src")
X (let ((path (getenv "INFOPATH"))
X (dir "/usr/share/info/${EMACS_SUFFIX}"))
X (and path
X ;; move Emacs Info dir to beginning of list
X (setq Info-directory-list
X (cons dir (delete dir (split-string path ":" t)))))))
EOF
elisp-site-file-install "${SITEFILE}" || die
dodoc README BUGS || die "dodoc failed"
}
emacs-infodir-rebuild() {
# Depending on the Portage version, the Info dir file is compressed
# or removed. It is only rebuilt by Portage if our directory is in
# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
local infodir=/usr/share/info/${EMACS_SUFFIX} f
[ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo
einfo "Regenerating Info directory index in ${infodir} ..."
rm -f "${ROOT}"${infodir}/dir{,.*}
for f in "${ROOT}"${infodir}/*.info*; do
[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
&& install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
done
rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
echo
}
pkg_postinst() {
local f
for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
[ -e "${f}" ] || touch "${f}"
done
elisp-site-regen
emacs-infodir-rebuild
eselect emacs update ifunset
echo
elog "You can set the version to be started by /usr/bin/emacs through"
elog "the Emacs eselect module, which also redirects man and info pages."
elog "Therefore, several Emacs versions can be installed at the same time."
elog "\"man emacs.eselect\" for details."
}
pkg_postrm() {
elisp-site-regen
emacs-infodir-rebuild
eselect emacs update ifunset
}
next reply other threads:[~2009-07-30 14:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-30 14:43 Christian Faulhammer (fauli) [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-08-08 23:13 [gentoo-commits] gentoo-x86 commit in app-editors/emacs: emacs-23.1.ebuild ChangeLog Christian Faulhammer (fauli)
2009-08-11 17:57 Ulrich Mueller (ulm)
2009-08-20 7:41 Ulrich Mueller (ulm)
2009-09-15 17:20 Romain Perier (mrpouet)
2009-09-15 22:57 Christian Faulhammer (fauli)
2009-09-18 3:26 Jeroen Roovers (jer)
2009-09-20 16:07 Tiago Cunha (tcunha)
2009-09-26 13:22 Brent Baude (ranger)
2009-09-27 19:13 Gysbert Wassenaar (nixnut)
2009-10-01 18:26 Tobias Klausmann (klausman)
2009-10-12 16:34 Raul Porcel (armin76)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1MWWqZ-00057O-73@stork.gentoo.org \
--to=fauli@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox