* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-cvs: ChangeLog emacs-cvs-22.1.50-r2.ebuild emacs-cvs-23.0.60-r1.ebuild emacs-cvs-23.0.50-r1.ebuild
@ 2007-11-27 14:11 Christian Faulhammer (opfer)
0 siblings, 0 replies; 2+ messages in thread
From: Christian Faulhammer (opfer) @ 2007-11-27 14:11 UTC (permalink / raw
To: gentoo-commits
opfer 07/11/27 14:11:49
Modified: ChangeLog
Added: emacs-cvs-22.1.50-r2.ebuild
emacs-cvs-23.0.60-r1.ebuild
emacs-cvs-23.0.50-r1.ebuild
Log:
rev-bump to force rebuild for users with more current codebase
(Portage version: 2.1.3.19)
Revision Changes Path
1.173 app-editors/emacs-cvs/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.173&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.173&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?r1=1.172&r2=1.173
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- ChangeLog 22 Nov 2007 22:08:00 -0000 1.172
+++ ChangeLog 27 Nov 2007 14:11:48 -0000 1.173
@@ -1,6 +1,15 @@
# ChangeLog for app-editors/emacs-cvs
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.172 2007/11/22 22:08:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.173 2007/11/27 14:11:48 opfer Exp $
+
+*emacs-cvs-23.0.60-r1 (27 Nov 2007)
+*emacs-cvs-23.0.50-r1 (27 Nov 2007)
+*emacs-cvs-22.1.50-r2 (27 Nov 2007)
+
+ 27 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
+ +emacs-cvs-22.1.50-r2.ebuild, +emacs-cvs-23.0.50-r1.ebuild,
+ +emacs-cvs-23.0.60-r1.ebuild:
+ rev-bump to force rebuild for users with more current codebase
22 Nov 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r1.ebuild,
emacs-cvs-22.1.50_p20070829-r1.ebuild, emacs-cvs-23.0.0_p20070920.ebuild,
1.1 app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild?rev=1.1&content-type=text/plain
Index: emacs-cvs-22.1.50-r2.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild,v 1.1 2007/11/27 14:11:48 opfer Exp $
ECVS_AUTH="pserver"
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
ECVS_MODULE="emacs"
ECVS_BRANCH="EMACS_22_BASE"
ECVS_LOCALNAME="emacs-22"
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
inherit autotools cvs elisp-common eutils flag-o-matic
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
SRC_URI=""
LICENSE="GPL-3 FDL-1.2 BSD"
SLOT="22"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
RESTRICT="strip"
X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-0.7-r1
sys-libs/zlib
hesiod? ( net-dns/hesiod )
kerberos? ( virtual/krb5 )
spell? ( || ( app-text/ispell app-text/aspell ) )
alsa? ( media-libs/alsa-lib )
X? (
$X_DEPEND
x11-misc/emacs-desktop
gif? ( media-libs/giflib )
jpeg? ( media-libs/jpeg )
tiff? ( media-libs/tiff )
png? ( media-libs/libpng )
xpm? ( x11-libs/libXpm )
gtk? ( =x11-libs/gtk+-2* )
!gtk? (
Xaw3d? ( x11-libs/Xaw3d )
!Xaw3d? (
motif? ( virtual/motif )
)
)
)"
DEPEND="${RDEPEND}
gzip-el? ( app-arch/gzip )"
S="${WORKDIR}/${ECVS_LOCALNAME}"
EMACS_SUFFIX="emacs-${SLOT}-cvs"
src_unpack() {
cvs_src_unpack
cd "${S}"
# 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=$(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
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 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
epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch"
epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
# ALSA is detected and used even if not requested by the USE=alsa flag.
# So remove the automagic check
use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch"
eautoreconf
}
src_compile() {
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
ALLOWED_FLAGS=""
strip-flags
unset LDFLAGS
replace-flags -O[3-9] -O2
sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
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 jpeg) $(use_with tiff)"
myconf="${myconf} $(use_with gif) $(use_with png)"
myconf="${myconf} $(use_with xpm)"
# 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
echo
einfo "Configuring to build with GTK support, disabling all other toolkits"
echo
myconf="${myconf} --with-x-toolkit=gtk"
elif use Xaw3d; then
einfo "Configuring to build with Xaw3d(athena) support"
myconf="${myconf} --with-x-toolkit=athena"
myconf="${myconf} --without-gtk"
elif use motif; then
einfo "Configuring to build with motif toolkit support"
myconf="${myconf} --with-x-toolkit=motif"
myconf="${myconf} --without-gtk"
else
einfo "Configuring to build with no toolkit"
myconf="${myconf} --with-x-toolkit=no"
myconf="${myconf} --without-gtk"
fi
else
myconf="${myconf} --without-x"
fi
myconf="${myconf} $(use_with hesiod)"
myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir=/usr/share/info/${EMACS_SUFFIX} \
--without-carbon \
${myconf} || die "econf emacs failed"
emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
}
src_install () {
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
einfo "Fixing info documentation ..."
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
einfo "Fixing manpages ..."
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 "${D}"/var/lib/games/emacs/{snake,tetris}-scores
keepdir /var/lib/games/emacs/
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]
sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF
;;; ${PN}-${SLOT} site-lisp configuration
(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
X (setq find-function-C-source-directory
X "/usr/share/emacs/${FULL_VERSION}/src"))
EOF
elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
fi
dodoc AUTHORS BUGS CONTRIBUTE README || 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
einfo "Regenerating Info directory index in ${infodir} ..."
rm -f "${ROOT}"${infodir}/dir{,.*}
for f in "${ROOT}"${infodir}/*.info*; do
[[ ${f##*/} == *[0-9].info* ]] \
|| install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null
done
echo
}
pkg_postinst() {
test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
local f
for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
test -e ${f} || touch ${f}
done
elisp-site-regen
emacs-infodir-rebuild
eselect emacs update --if-unset
if use X; then
elog "You need to install some fonts for Emacs. Under monolithic"
elog "XFree86/Xorg you typically had such fonts installed by default."
elog "With modular Xorg, you will have to perform this step yourself."
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
elog "machine would satisfy basic Emacs requirements under X11."
fi
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 "You can therefore test emacs-cvs along with the stable release."
elog "\"man emacs.eselect\" for details."
}
pkg_postrm() {
elisp-site-regen
emacs-infodir-rebuild
eselect emacs update --if-unset
}
1.1 app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild?rev=1.1&content-type=text/plain
Index: emacs-cvs-23.0.60-r1.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild,v 1.1 2007/11/27 14:11:48 opfer Exp $
ECVS_AUTH="pserver"
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
ECVS_MODULE="emacs"
ECVS_BRANCH="emacs-unicode-2"
ECVS_LOCALNAME="emacs-unicode"
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
inherit autotools cvs elisp-common eutils flag-o-matic
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
SRC_URI=""
LICENSE="GPL-3 FDL-1.2 BSD"
SLOT="23-unicode"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="alsa gif gpm gtk gzip-el hesiod jpeg kerberos motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft xpm"
RESTRICT="strip"
X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-0.7-r1
sys-libs/zlib
hesiod? ( net-dns/hesiod )
kerberos? ( virtual/krb5 )
spell? ( || ( app-text/ispell app-text/aspell ) )
alsa? ( media-libs/alsa-lib )
gpm? ( sys-libs/gpm )
X? (
$X_DEPEND
x11-misc/emacs-desktop
gif? ( media-libs/giflib )
jpeg? ( media-libs/jpeg )
tiff? ( media-libs/tiff )
png? ( media-libs/libpng )
svg? ( >=gnome-base/librsvg-2.0 )
xpm? ( x11-libs/libXpm )
xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 )
gtk? ( =x11-libs/gtk+-2* )
!gtk? (
Xaw3d? ( x11-libs/Xaw3d )
!Xaw3d? (
motif? ( virtual/motif )
)
)
)"
DEPEND="${RDEPEND}
gzip-el? ( app-arch/gzip )"
S="${WORKDIR}/${ECVS_LOCALNAME}"
EMACS_SUFFIX="emacs-${SLOT}"
src_unpack() {
cvs_src_unpack
cd "${S}"
# 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=$(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
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 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
epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
# ALSA is detected and used even if not requested by the USE=alsa flag.
# So remove the automagic check
use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch"
eautoreconf
}
src_compile() {
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
ALLOWED_FLAGS=""
strip-flags
unset LDFLAGS
replace-flags -O[3-9] -O2
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_enable xft font-backend)"
myconf="${myconf} $(use_with xft freetype)"
myconf="${myconf} $(use_with xft)"
myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
myconf="${myconf} $(use_with gif) $(use_with png)"
myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)"
# 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
echo
einfo "Configuring to build with GTK support, disabling all other toolkits"
echo
myconf="${myconf} --with-x-toolkit=gtk"
elif use Xaw3d; then
einfo "Configuring to build with Xaw3d(athena) support"
myconf="${myconf} --with-x-toolkit=athena"
myconf="${myconf} --without-gtk"
elif use motif; then
einfo "Configuring to build with motif toolkit support"
myconf="${myconf} --with-x-toolkit=motif"
myconf="${myconf} --without-gtk"
else
einfo "Configuring to build with no toolkit"
myconf="${myconf} --with-x-toolkit=no"
myconf="${myconf} --without-gtk"
fi
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)"
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir=/usr/share/info/${EMACS_SUFFIX} \
--without-carbon \
${myconf} || die "econf emacs failed"
emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
}
src_install () {
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
einfo "Fixing info documentation ..."
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
einfo "Fixing manpages ..."
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 "${D}"/var/lib/games/emacs/{snake,tetris}-scores
keepdir /var/lib/games/emacs/
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]
sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF
;;; ${PN}-${SLOT} site-lisp configuration
(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
X (setq find-function-C-source-directory
X "/usr/share/emacs/${FULL_VERSION}/src"))
EOF
elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
fi
dodoc README README.unicode 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
einfo "Regenerating Info directory index in ${infodir} ..."
rm -f "${ROOT}"${infodir}/dir{,.*}
for f in "${ROOT}"${infodir}/*.info*; do
[[ ${f##*/} == *[0-9].info* ]] \
|| install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null
done
echo
}
pkg_postinst() {
test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
local f
for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
test -e ${f} || touch ${f}
done
elisp-site-regen
emacs-infodir-rebuild
eselect emacs update --if-unset
if use X; then
elog "You need to install some fonts for Emacs. Under monolithic"
elog "XFree86/Xorg you typically had such fonts installed by default."
elog "With modular Xorg, you will have to perform this step yourself."
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
elog "machine would satisfy basic Emacs requirements under X11."
fi
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 "You can therefore test emacs-cvs along with the stable release."
elog "\"man emacs.eselect\" for details."
}
pkg_postrm() {
elisp-site-regen
emacs-infodir-rebuild
eselect emacs update --if-unset
}
1.1 app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild?rev=1.1&content-type=text/plain
Index: emacs-cvs-23.0.50-r1.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild,v 1.1 2007/11/27 14:11:48 opfer Exp $
ECVS_AUTH="pserver"
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
ECVS_MODULE="emacs"
ECVS_BRANCH="HEAD"
ECVS_LOCALNAME="emacs"
WANT_AUTOCONF="latest"
WANT_AUTOMAKE="latest"
inherit autotools cvs elisp-common eutils flag-o-matic
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
SRC_URI=""
LICENSE="GPL-3 FDL-1.2 BSD"
SLOT="23"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="alsa gif gpm gtk gzip-el hesiod jpeg kerberos motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xpm"
RESTRICT="strip"
X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
RDEPEND="!=app-editors/emacs-cvs-23.0.0-r6
sys-libs/ncurses
>=app-admin/eselect-emacs-0.7-r1
sys-libs/zlib
hesiod? ( net-dns/hesiod )
kerberos? ( virtual/krb5 )
spell? ( || ( app-text/ispell app-text/aspell ) )
alsa? ( media-libs/alsa-lib )
gpm? ( sys-libs/gpm )
X? (
$X_DEPEND
x11-misc/emacs-desktop
gif? ( media-libs/giflib )
jpeg? ( media-libs/jpeg )
tiff? ( media-libs/tiff )
png? ( media-libs/libpng )
svg? ( >=gnome-base/librsvg-2.0 )
xpm? ( x11-libs/libXpm )
gtk? ( =x11-libs/gtk+-2* )
!gtk? (
Xaw3d? ( x11-libs/Xaw3d )
!Xaw3d? (
motif? ( virtual/motif )
)
)
)"
DEPEND="${RDEPEND}
gzip-el? ( app-arch/gzip )"
S="${WORKDIR}/${ECVS_LOCALNAME}"
EMACS_SUFFIX="emacs-${SLOT}"
src_unpack() {
cvs_src_unpack
cd "${S}"
# 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=$(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
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 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
epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
# ALSA is detected and used even if not requested by the USE=alsa flag.
# So remove the automagic check
use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch"
eautoreconf
}
src_compile() {
export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
ALLOWED_FLAGS=""
strip-flags
unset LDFLAGS
replace-flags -O[3-9] -O2
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 jpeg) $(use_with tiff)"
myconf="${myconf} $(use_with gif) $(use_with png)"
myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)"
# 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
echo
einfo "Configuring to build with GTK support, disabling all other toolkits"
echo
myconf="${myconf} --with-x-toolkit=gtk"
elif use Xaw3d; then
einfo "Configuring to build with Xaw3d(athena) support"
myconf="${myconf} --with-x-toolkit=athena"
myconf="${myconf} --without-gtk"
elif use motif; then
einfo "Configuring to build with motif toolkit support"
myconf="${myconf} --with-x-toolkit=motif"
myconf="${myconf} --without-gtk"
else
einfo "Configuring to build with no toolkit"
myconf="${myconf} --with-x-toolkit=no"
myconf="${myconf} --without-gtk"
fi
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)"
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir=/usr/share/info/${EMACS_SUFFIX} \
--without-carbon \
${myconf} || die "econf emacs failed"
emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
}
src_install () {
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
einfo "Fixing info documentation ..."
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
einfo "Fixing manpages ..."
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 "${D}"/var/lib/games/emacs/{snake,tetris}-scores
keepdir /var/lib/games/emacs/
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]
sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF
;;; ${PN}-${SLOT} site-lisp configuration
(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
X (setq find-function-C-source-directory
X "/usr/share/emacs/${FULL_VERSION}/src"))
EOF
elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
fi
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
einfo "Regenerating Info directory index in ${infodir} ..."
rm -f "${ROOT}"${infodir}/dir{,.*}
for f in "${ROOT}"${infodir}/*.info*; do
[[ ${f##*/} == *[0-9].info* ]] \
|| install-info --info-dir="${ROOT}"${infodir} ${f} &>/dev/null
done
echo
}
pkg_postinst() {
test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
local f
for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
test -e ${f} || touch ${f}
done
elisp-site-regen
emacs-infodir-rebuild
eselect emacs update --if-unset
if use X; then
elog "You need to install some fonts for Emacs. Under monolithic"
elog "XFree86/Xorg you typically had such fonts installed by default."
elog "With modular Xorg, you will have to perform this step yourself."
elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
elog "machine would satisfy basic Emacs requirements under X11."
fi
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 "You can therefore test emacs-cvs along with the stable release."
elog "\"man emacs.eselect\" for details."
}
pkg_postrm() {
elisp-site-regen
emacs-infodir-rebuild
eselect emacs update --if-unset
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-cvs: ChangeLog emacs-cvs-22.1.50-r2.ebuild emacs-cvs-23.0.60-r1.ebuild emacs-cvs-23.0.50-r1.ebuild
@ 2008-01-30 20:59 Ulrich Mueller (ulm)
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Mueller (ulm) @ 2008-01-30 20:59 UTC (permalink / raw
To: gentoo-commits
ulm 08/01/30 20:59:49
Modified: ChangeLog emacs-cvs-22.1.50-r2.ebuild
emacs-cvs-23.0.60-r1.ebuild
emacs-cvs-23.0.50-r1.ebuild
Log:
Add missing dependency on pkgconfig.
(Portage version: 2.1.4)
Revision Changes Path
1.185 app-editors/emacs-cvs/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.185&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?rev=1.185&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/ChangeLog?r1=1.184&r2=1.185
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- ChangeLog 30 Jan 2008 17:15:41 -0000 1.184
+++ ChangeLog 30 Jan 2008 20:59:48 -0000 1.185
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs-cvs
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.184 2008/01/30 17:15:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.185 2008/01/30 20:59:48 ulm Exp $
+
+ 30 Jan 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r2.ebuild,
+ emacs-cvs-23.0.50-r1.ebuild, emacs-cvs-23.0.60-r1.ebuild:
+ Add missing dependency on pkgconfig.
30 Jan 2008; Ulrich Mueller <ulm@gentoo.org>
-files/emacs-cvs-format-int.patch,
1.8 app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild?r1=1.7&r2=1.8
Index: emacs-cvs-22.1.50-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- emacs-cvs-22.1.50-r2.ebuild 26 Jan 2008 18:52:34 -0000 1.7
+++ emacs-cvs-22.1.50-r2.ebuild 30 Jan 2008 20:59:48 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild,v 1.7 2008/01/26 18:52:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r2.ebuild,v 1.8 2008/01/30 20:59:48 ulm Exp $
ECVS_AUTH="pserver"
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -50,6 +50,8 @@
)"
DEPEND="${RDEPEND}
+ alsa? ( dev-util/pkgconfig )
+ X? ( gtk? ( dev-util/pkgconfig ) )
gzip-el? ( app-arch/gzip )"
S="${WORKDIR}/${ECVS_LOCALNAME}"
1.10 app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild?r1=1.9&r2=1.10
Index: emacs-cvs-23.0.60-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- emacs-cvs-23.0.60-r1.ebuild 26 Jan 2008 18:52:34 -0000 1.9
+++ emacs-cvs-23.0.60-r1.ebuild 30 Jan 2008 20:59:48 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild,v 1.9 2008/01/26 18:52:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r1.ebuild,v 1.10 2008/01/30 20:59:48 ulm Exp $
ECVS_AUTH="pserver"
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -54,6 +54,7 @@
)"
DEPEND="${RDEPEND}
+ dev-util/pkgconfig
gzip-el? ( app-arch/gzip )"
S="${WORKDIR}/${ECVS_LOCALNAME}"
1.10 app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild?r1=1.9&r2=1.10
Index: emacs-cvs-23.0.50-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- emacs-cvs-23.0.50-r1.ebuild 26 Jan 2008 18:52:34 -0000 1.9
+++ emacs-cvs-23.0.50-r1.ebuild 30 Jan 2008 20:59:48 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild,v 1.9 2008/01/26 18:52:34 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50-r1.ebuild,v 1.10 2008/01/30 20:59:48 ulm Exp $
ECVS_AUTH="pserver"
ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -54,6 +54,7 @@
)"
DEPEND="${RDEPEND}
+ dev-util/pkgconfig
gzip-el? ( app-arch/gzip )"
S="${WORKDIR}/${ECVS_LOCALNAME}"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-01-30 20:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-27 14:11 [gentoo-commits] gentoo-x86 commit in app-editors/emacs-cvs: ChangeLog emacs-cvs-22.1.50-r2.ebuild emacs-cvs-23.0.60-r1.ebuild emacs-cvs-23.0.50-r1.ebuild Christian Faulhammer (opfer)
-- strict thread matches above, loose matches on Subject: below --
2008-01-30 20:59 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