* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: ChangeLog emacs-vcs-24.1.9999-r1.ebuild emacs-vcs-24.1.9999.ebuild
@ 2012-06-01 16:47 Ulrich Mueller (ulm)
0 siblings, 0 replies; only message in thread
From: Ulrich Mueller (ulm) @ 2012-06-01 16:47 UTC (permalink / raw
To: gentoo-commits
ulm 12/06/01 16:47:13
Modified: ChangeLog
Added: emacs-vcs-24.1.9999-r1.ebuild
Removed: emacs-vcs-24.1.9999.ebuild
Log:
Install live version as emacs-24-vcs, in order to avoid collisions with the upcoming 24.1 release.
(Portage version: 2.1.10.63/cvs/Linux x86_64)
Revision Changes Path
1.97 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.96&r2=1.97
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ChangeLog 24 May 2012 21:12:55 -0000 1.96
+++ ChangeLog 1 Jun 2012 16:47:13 -0000 1.97
@@ -1,6 +1,13 @@
# 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.96 2012/05/24 21:12:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.97 2012/06/01 16:47:13 ulm Exp $
+
+*emacs-vcs-24.1.9999-r1 (01 Jun 2012)
+
+ 01 Jun 2012; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-24.1.9999.ebuild,
+ +emacs-vcs-24.1.9999-r1.ebuild:
+ Install live version as emacs-24-vcs, in order to avoid collisions with the
+ upcoming 24.1 release.
24 May 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.0.97.ebuild,
emacs-vcs-24.0.9999-r4.ebuild, emacs-vcs-24.1.9999.ebuild:
1.1 app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999-r1.ebuild?rev=1.1&content-type=text/plain
Index: emacs-vcs-24.1.9999-r1.ebuild
===================================================================
# 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.1 2012/06/01 16:47:13 ulm Exp $
EAPI=4
inherit autotools elisp-common eutils flag-o-matic multilib
if [[ ${PV##*.} = 9999 ]]; then
EBZR_PROJECT="emacs"
EBZR_BRANCH="trunk"
EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
# "Nosmart" is much faster for initial branching.
EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
inherit bzr
SRC_URI=""
else
SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.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 MIT W3C unicode PSF-2"
SLOT="24"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="alsa athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
RDEPEND="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 )
gnutls? ( net-libs/gnutls )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
X? (
x11-libs/libXmu
x11-libs/libXt
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
png? ( >=media-libs/libpng-1.4:0 )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
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? (
gtk3? ( x11-libs/gtk+:3 )
!gtk3? ( x11-libs/gtk+:2 )
)
!gtk? (
Xaw3d? ( x11-libs/libXaw3d )
!Xaw3d? (
athena? ( x11-libs/libXaw )
!athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
)
)
)"
DEPEND="${RDEPEND}
alsa? ( virtual/pkgconfig )
dbus? ( virtual/pkgconfig )
gnutls? ( virtual/pkgconfig )
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )"
RDEPEND="${RDEPEND}
>=app-emacs/emacs-common-gentoo-1.3[X?]"
EMACS_SUFFIX="emacs-${SLOT}-vcs"
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)
[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
einfo "Emacs branch: ${EBZR_BRANCH}"
einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
einfo "Emacs version number: ${FULL_VERSION}"
[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
|| die "Upstream version number changed to ${FULL_VERSION}"
fi
epatch_user
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
AT_M4DIR=m4 eautoreconf
}
src_configure() {
strip-flags
if use sh; then
replace-flags "-O[1-9]" -O0 #262359
elif use ia64; then
replace-flags "-O[2-9]" -O1 #325373
else
replace-flags "-O[3-9]" -O2
fi
local myconf
if use alsa && ! use sound; then
einfo "Although sound USE flag is disabled you chose to have alsa,"
einfo "so sound is switched on anyway."
myconf="${myconf} --with-sound"
else
myconf="${myconf} $(use_with sound)"
fi
if use X; then
myconf="${myconf} --with-x --without-ns"
myconf="${myconf} $(use_with gconf)"
myconf="${myconf} $(use_with gsettings)"
myconf="${myconf} $(use_with toolkit-scroll-bars)"
myconf="${myconf} $(use_with wide-int)"
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 imagemagick)"
if use xft; then
myconf="${myconf} --with-xft"
myconf="${myconf} $(use_with m17n-lib libotf)"
myconf="${myconf} $(use_with m17n-lib m17n-flt)"
else
myconf="${myconf} --without-xft"
myconf="${myconf} --without-libotf --without-m17n-flt"
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
fi
if use gtk; then
einfo "Configuring to build with GIMP Toolkit (GTK+)"
myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
local f
for f in athena Xaw3d motif; do
use ${f} && ewarn "USE flag \"${f}\" ignored" \
"(superseded by \"gtk\")"
done
elif use athena || use Xaw3d; then
einfo "Configuring to build with Athena/Lucid toolkit"
myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
use motif && ewarn "USE flag \"motif\" ignored" \
"(superseded by \"athena\" or \"Xaw3d\")"
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
! use gtk && use gtk3 \
&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
else
myconf="${myconf} --without-x --without-ns"
fi
if [[ ${PV##*.} = 9999 ]]; then
# These variables are not needed for building. We add them to
# configure options because they are stored in the Emacs binary
# and available in variable "system-configuration-options".
myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
fi
# According to configure, this option is only used for GNU/Linux
# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
# out the location because $(get_libdir) does not necessarily return
# something that matches the host OS's libdir naming (e.g. RHEL).
local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
crtdir=${crtdir%/*}
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-crt-dir="${crtdir}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
--disable-maintainer-mode \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with gpm) \
$(use_with dbus) \
$(use_with gnutls) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
${myconf}
}
src_compile() {
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
if [[ ${PV##*.} = 9999 ]]; then
emake CC="$(tc-getCC)" bootstrap
# cleanup, otherwise emacs will be dumped again in src_install
(cd src; emake versionclean)
fi
# set last component of emacs-version to (package revision + 1)
touch src/emacs-${FULL_VERSION}.${PR#r}
emake CC="$(tc-getCC)"
}
src_install () {
emake install DESTDIR="${D}"
rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
|| die "removing duplicate emacs executable failed"
mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
|| die "moving Emacs executable failed"
# move man pages to the correct place
local m
for m in "${ED}"/usr/share/man/man1/* ; do
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
done
# move info dir to avoid collisions with the dir file generated by portage
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|| die "moving info dir failed"
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${ED}"/usr/share/{applications,icons}
rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores
keepdir /var/lib/games/emacs
# remove unused <version>/site-lisp dir
rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
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/*.{c,h,m}
doins -r src/s
rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/s/README
c=""
fi
sed 's/^X//' >"${T}/${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} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src")
X (let ((path (getenv "INFOPATH"))
X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
X (and path
X ;; move Emacs Info dir before anything else in /usr/share/info
X (let* ((p (cons nil (split-string path ":" t))) (q p))
X (while (and (cdr q) (not (string-match re (cadr q))))
X (setq q (cdr q)))
X (setcdr q (cons dir (delete dir (cdr q))))
X (setq Info-directory-list (prune-directory-list (cdr p)))))))
EOF
elisp-site-file-install "${T}/${SITEFILE}" || die
dodoc README BUGS
}
pkg_preinst() {
# move Info dir file to correct name
local infodir=/usr/share/info/${EMACS_SUFFIX} f
if [[ -f ${ED}${infodir}/dir.orig ]]; then
mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
elif [[ -d "${ED}"${infodir} ]]; then
# this should not happen in EAPI 4
ewarn "Regenerating Info directory index in ${infodir} ..."
rm -f "${ED}"${infodir}/dir{,.*}
for f in "${ED}"${infodir}/*; do
if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
install-info --info-dir="${ED}"${infodir} "${f}" \
|| die "install-info failed"
fi
done
fi
}
pkg_postinst() {
local f
for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
[[ -e ${f} ]] || touch "${f}"
done
chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs
elisp-site-regen
eselect emacs update ifunset
if use X; then
elog "You need to install some fonts for Emacs."
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
elog "machine would satisfy basic Emacs requirements under X11."
elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
elog "for how to enable anti-aliased fonts."
elog
fi
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."
elog
elog "If you upgrade from a previous major version of Emacs, then it is"
elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
elog "all byte-compiled elisp files of the installed Emacs packages."
}
pkg_postrm() {
elisp-site-regen
eselect emacs update ifunset
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-01 16:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-01 16:47 [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: ChangeLog emacs-vcs-24.1.9999-r1.ebuild emacs-vcs-24.1.9999.ebuild Ulrich Mueller (ulm)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox