diff options
author | Ulrich Müller <ulm@gentoo.org> | 2011-01-30 08:42:03 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2011-01-30 08:42:03 +0000 |
commit | 4597bbe3d06b6f0b8465f1a8dac5bcc8a5814a29 (patch) | |
tree | f1fdd76e3e57a4405b43a78e000d71d7dcd6f88e /app-editors | |
parent | Fix bad deps in 0.10.11. liboil was dropped in favour of orc, so we depend on... (diff) | |
download | gentoo-2-4597bbe3d06b6f0b8465f1a8dac5bcc8a5814a29.tar.gz gentoo-2-4597bbe3d06b6f0b8465f1a8dac5bcc8a5814a29.tar.bz2 gentoo-2-4597bbe3d06b6f0b8465f1a8dac5bcc8a5814a29.zip |
Apply changes from prefix overlay and from bug 268793. Respect the
--with-crt-dir configure option also on 32 bit architectures, fixes
bug 350532. Remove unnecessary automake dependency. Don't compress
GNU Info dir. Update ebuilds to EAPI 4, for docompress and REQUIRED_USE.
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/emacs/ChangeLog | 16 | ||||
-rw-r--r-- | app-editors/emacs/emacs-21.4-r23.ebuild | 183 | ||||
-rw-r--r-- | app-editors/emacs/emacs-22.3-r7.ebuild | 259 | ||||
-rw-r--r-- | app-editors/emacs/emacs-23.2-r3.ebuild | 343 |
4 files changed, 799 insertions, 2 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 3df1adfd6554..3f33a560699b 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for app-editors/emacs -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.405 2010/12/29 13:09:01 ulm Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.406 2011/01/30 08:42:03 ulm Exp $ + +*emacs-23.2-r3 (30 Jan 2011) +*emacs-22.3-r7 (30 Jan 2011) +*emacs-21.4-r23 (30 Jan 2011) + + 30 Jan 2011; Ulrich Mueller <ulm@gentoo.org> +emacs-21.4-r23.ebuild, + +emacs-22.3-r7.ebuild, +emacs-23.2-r3.ebuild: + Apply changes from prefix overlay and from bug 268793. Thanks to Matsui + Tetsushi <VED03370@nifty.ne.jp> and Fabian Groffen <grobian@gentoo.org>. + Respect the --with-crt-dir configure option also on 32 bit architectures, + fixes bug 350532. Remove unnecessary automake dependency. Don't compress + GNU Info dir. Update ebuilds to EAPI 4, for docompress and REQUIRED_USE. 29 Dec 2010; Ulrich Mueller <ulm@gentoo.org> emacs-22.3-r6.ebuild, emacs-23.2-r2.ebuild: diff --git a/app-editors/emacs/emacs-21.4-r23.ebuild b/app-editors/emacs/emacs-21.4-r23.ebuild new file mode 100644 index 000000000000..91e51e7dbd7f --- /dev/null +++ b/app-editors/emacs/emacs-21.4-r23.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r23.ebuild,v 1.1 2011/01/30 08:42:03 ulm Exp $ + +EAPI=4 +WANT_AUTOMAKE="none" + +inherit flag-o-matic eutils toolchain-funcs autotools + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +HOMEPAGE="http://www.gnu.org/software/emacs/" +SRC_URI="mirror://gnu/emacs/${P}a.tar.gz + mirror://gentoo/${P}-patches-11.tar.bz2 + leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )" + +LICENSE="GPL-2 FDL-1.1 BSD as-is MIT" +SLOT="21" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="X Xaw3d leim motif sendmail" + +DEPEND="sys-libs/ncurses + >=app-admin/eselect-emacs-1.2 + X? ( + x11-libs/libXext + x11-libs/libICE + x11-libs/libSM + x11-libs/libXmu + x11-libs/libXpm + x11-misc/xbitmaps + >=media-libs/giflib-4.1.0.1b + virtual/jpeg + >=media-libs/tiff-3.5.5-r3 + >=media-libs/libpng-1.2.1 + Xaw3d? ( x11-libs/Xaw3d ) + !Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) + )" + +RDEPEND="${DEPEND} + >=app-emacs/emacs-common-gentoo-1[X?] + sendmail? ( virtual/mta )" + +src_prepare() { + EPATCH_SUFFIX=patch epatch + + 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" + + # This will need to be updated for X-Compilation + sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \ + "${S}/src/s/gnu-linux.h" || die + + # custom aclocal.m4 was only needed for autoconf 2.13 and earlier + rm aclocal.m4 + eaclocal + eautoconf +} + +src_configure() { + # -fstack-protector gets internal compiler error at xterm.c (bug 33265) + filter-flags -fstack-protector -fstack-protector-all + + # emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002) + unset LDFLAGS + + # ever since GCC 3.2 + replace-flags -O[3-9] -O2 + + # -march is known to cause signal 6 on some environment + filter-flags "-march=*" + + local myconf + if use X ; then + myconf="${myconf} + --with-x + --with-xpm + --with-jpeg + --with-tiff + --with-gif + --with-png" + + if use Xaw3d ; then + einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" + myconf="${myconf} --with-x-toolkit=athena" + use motif \ + && ewarn "USE flag \"motif\" ignored (superseded by \"Xaw3d\")" + elif use motif ; then + einfo "Configuring to build with Motif toolkit" + myconf="${myconf} --with-x-toolkit=motif" + else + # do not build emacs with any toolkit, bug 35300 + einfo "Configuring to build with no toolkit" + myconf="${myconf} --with-x-toolkit=no" + fi + else + myconf="${myconf} --without-x" + fi + + econf ${myconf} +} + +src_compile() { + export SANDBOX_ON=0 + emake CC="$(tc-getCC)" + + einfo "Recompiling patched lisp files..." + (cd lisp; emake recompile) + (cd src; emake versionclean) + emake CC="$(tc-getCC)" +} + +src_install() { + local i m + + einstall infodir="${D}/usr/share/info/emacs-${SLOT}" + + for i in "${D}"/usr/bin/* ; do + mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed" + done + mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed" + rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT} + + # move man pages to the correct place + for m in "${D}"/usr/share/man/man1/* ; do + mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv ${m} failed" + done + + # move info dir to avoid collisions with the dir file generated by portage + mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} \ + || die "moving info dir failed" + touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir + docompress -x /usr/share/info/emacs-${SLOT}/dir.orig + + # avoid collision between slots + rm "${D}"/usr/share/emacs/site-lisp/subdirs.el + + # fix permissions + find "${D}" -perm 664 |xargs chmod -f 644 2>/dev/null + find "${D}" -type d |xargs chmod -f 755 2>/dev/null + + keepdir /usr/share/emacs/${PV}/leim + + dodoc BUGS ChangeLog README +} + +pkg_preinst() { + # move Info dir file to correct name + local infodir=/usr/share/info/emacs-${SLOT} f + if [ -f "${D}"${infodir}/dir.orig ]; then + mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed" + else + # this should not happen in EAPI 4 + ewarn "Regenerating Info directory index in ${infodir} ..." + rm -f "${D}"${infodir}/dir{,.*} + for f in "${D}"${infodir}/*; do + if [[ ${f##*/} != *[0-9].info* && -e ${f} ]]; then + install-info --info-dir="${D}"${infodir} "${f}" \ + || die "install-info failed" + fi + done + fi +} + +pkg_postinst() { + eselect emacs update ifunset + + if ! use sendmail && ! has_version "virtual/mta"; then + elog "You disabled sendmail support for Emacs. If you later install" + elog "a MTA then you will need to recompile Emacs. See Bug #11104." + fi + + if use X; then + echo + 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." + fi +} + +pkg_postrm() { + eselect emacs update ifunset +} diff --git a/app-editors/emacs/emacs-22.3-r7.ebuild b/app-editors/emacs/emacs-22.3-r7.ebuild new file mode 100644 index 000000000000..2835ba102f3f --- /dev/null +++ b/app-editors/emacs/emacs-22.3-r7.ebuild @@ -0,0 +1,259 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r7.ebuild,v 1.1 2011/01/30 08:42:03 ulm Exp $ + +EAPI=4 +WANT_AUTOMAKE="none" + +inherit autotools 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="mirror://gnu/emacs/${P}.tar.gz + mirror://gentoo/${P}-patches-6.tar.bz2" + +LICENSE="GPL-3 FDL-1.2 BSD as-is MIT" +SLOT="22" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png sound source tiff toolkit-scroll-bars X Xaw3d +xpm" +RESTRICT="strip" + +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 ) + X? ( + x11-libs/libXmu + x11-libs/libXt + x11-misc/xbitmaps + gif? ( media-libs/giflib ) + jpeg? ( virtual/jpeg ) + png? ( media-libs/libpng ) + tiff? ( media-libs/tiff ) + xpm? ( x11-libs/libXpm ) + gtk? ( x11-libs/gtk+:2 ) + !gtk? ( + Xaw3d? ( x11-libs/Xaw3d ) + !Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) + ) + )" + +DEPEND="${RDEPEND} + alsa? ( dev-util/pkgconfig ) + X? ( gtk? ( dev-util/pkgconfig ) ) + gzip-el? ( app-arch/gzip )" + +RDEPEND="${RDEPEND} + !<app-editors/emacs-vcs-22.1 + >=app-emacs/emacs-common-gentoo-1[X?]" + +# 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}" +EMACS_SUFFIX="emacs-${SLOT}" +SITEFILE="20${PN}-${SLOT}-gentoo.el" + +src_prepare() { + EPATCH_SUFFIX=patch epatch + + 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 + filter-flags -fstack-protector -fstack-protector-all #285778 + 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 gif) $(use_with jpeg)" + myconf="${myconf} $(use_with png) $(use_with tiff)" + 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 + 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" + myconf="${myconf} --without-gtk" + elif use motif; then + einfo "Configuring to build with Motif toolkit" + 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 + + 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)" + + econf \ + --program-suffix=-${EMACS_SUFFIX} \ + --infodir=/usr/share/info/${EMACS_SUFFIX} \ + --without-carbon \ + --with-gameuser="${GAMES_USER_DED:-games}" \ + ${myconf} +} + +src_compile() { + export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 + emake CC="$(tc-getCC)" +} + +src_install () { + local i m + + emake install DESTDIR="${D}" + + 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 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 + + # move info dir to avoid collisions with the dir file generated by portage + mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ + || die "moving info dir failed" + touch "${D}"/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 "${D}"/usr/share/emacs/site-lisp/subdirs.el + 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//' >"${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} "/usr/share/emacs/${FULL_VERSION}/src") + X (let ((path (getenv "INFOPATH")) + X (dir "/usr/share/info/${EMACS_SUFFIX}") + X (re "\\\\\`/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 AUTHORS BUGS CONTRIBUTE README +} + +pkg_preinst() { + # move Info dir file to correct name + local infodir=/usr/share/info/${EMACS_SUFFIX} f + if [ -f "${D}"${infodir}/dir.orig ]; then + mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed" + else + # this should not happen in EAPI 4 + ewarn "Regenerating Info directory index in ${infodir} ..." + rm -f "${D}"${infodir}/dir{,.*} + for f in "${D}"${infodir}/*; do + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then + install-info --info-dir="${D}"${infodir} "${f}" \ + || die "install-info failed" + fi + done + fi +} + +pkg_postinst() { + local f + for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do + [ -e "${f}" ] || touch "${f}" + done + chown "${GAMES_USER_DED:-games}" "${ROOT}"/var/lib/games/emacs + + elisp-site-regen + eselect emacs update ifunset + + if use X; then + echo + 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." + 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 "Therefore, several Emacs versions can be installed at the same time." + elog "\"man emacs.eselect\" for details." +} + +pkg_postrm() { + elisp-site-regen + eselect emacs update ifunset +} diff --git a/app-editors/emacs/emacs-23.2-r3.ebuild b/app-editors/emacs/emacs-23.2-r3.ebuild new file mode 100644 index 000000000000..6cb259415fd8 --- /dev/null +++ b/app-editors/emacs/emacs-23.2-r3.ebuild @@ -0,0 +1,343 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r3.ebuild,v 1.1 2011/01/30 08:42:03 ulm Exp $ + +EAPI=4 +WANT_AUTOMAKE="none" + +inherit autotools elisp-common eutils flag-o-matic multilib + +if [ "${PV##*.}" = "9999" ]; then + inherit bzr + EMACS_BRANCH="emacs-23" + EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EMACS_BRANCH}/" + EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}" + SRC_URI="" +else + SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 + mirror://gentoo/${P}-patches-3.tar.bz2" + # 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" +SLOT="23" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="alsa aqua dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" +REQUIRED_USE="aqua? ( !X )" +RESTRICT="strip" + +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 ) + X? ( + x11-libs/libXmu + x11-libs/libXt + x11-misc/xbitmaps + gconf? ( >=gnome-base/gconf-2.26.2 ) + gif? ( media-libs/giflib ) + jpeg? ( virtual/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-2.3:0 ) ) + ) + )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + gzip-el? ( app-arch/gzip )" + +RDEPEND="${RDEPEND} + !<app-editors/emacs-vcs-${PV} + >=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 branch: ${EMACS_BRANCH}" + einfo "Emacs version number: ${FULL_VERSION}" + [ "${FULL_VERSION%.*}" = ${PV%.*} ] \ + || die "Upstream version number changed to ${FULL_VERSION}" + echo + else + EPATCH_SUFFIX=patch epatch + fi + + 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 + filter-flags -fstack-protector -fstack-protector-all #285778 + + 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 + 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 aqua; then + einfo "Configuring to build with Cocoa support" + use X && ewarn "aqua USE flag disables X." + myconf="${myconf} --with-ns --disable-ns-self-contained" + myconf="${myconf} --without-x" + elif use X; then + myconf="${myconf} --with-x" + myconf="${myconf} $(use_with gconf)" + 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)" + + # 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} \ + --with-crt-dir="${crtdir}" \ + --with-gameuser="${GAMES_USER_DED:-games}" \ + ${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 + emake CC="$(tc-getCC)" +} + +src_install () { + local i m + + 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 + 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 + + 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//' >"${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 + + if use aqua; then + dodir /Applications/Gentoo + rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app + mv nextstep/Emacs.app \ + "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die + einfo "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo." + einfo "You may want to copy or symlink it into /Applications by yourself." + fi +} + +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" + else + # 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 + echo + 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." + 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 "Therefore, several Emacs versions can be installed at the same time." + elog "\"man emacs.eselect\" for details." + echo + 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 +} |