From 7af18e668425662cb5f429281231db4cc5f3c245 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Mon, 2 Feb 2009 00:24:57 +0000 Subject: Pretest for Emacs 23.1. Remove old snapshot. Package-Manager: portage-2.2_rc23/cvs/Linux i686 --- app-editors/emacs-cvs/ChangeLog | 9 +- app-editors/emacs-cvs/Manifest | 13 +- .../emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild | 269 ------------------- app-editors/emacs-cvs/emacs-cvs-23.0.90.ebuild | 296 +++++++++++++++++++++ .../files/emacs-cvs-freebsd-sparc-1.patch | 17 -- 5 files changed, 310 insertions(+), 294 deletions(-) delete mode 100644 app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild create mode 100644 app-editors/emacs-cvs/emacs-cvs-23.0.90.ebuild delete mode 100644 app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc-1.patch (limited to 'app-editors/emacs-cvs') diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 842c1d9cbb1b..8fafb9544643 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.233 2009/01/25 19:25:17 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.234 2009/02/02 00:24:56 ulm Exp $ + +*emacs-cvs-23.0.90 (02 Feb 2009) + + 02 Feb 2009; Ulrich Mueller + -files/emacs-cvs-freebsd-sparc-1.patch, + -emacs-cvs-23.0.60_pre20081226.ebuild, +emacs-cvs-23.0.90.ebuild: + Pretest for Emacs 23.1. Remove old snapshot. *emacs-cvs-23.0.9999-r1 (25 Jan 2009) *emacs-cvs-23.0.60_pre20090125 (25 Jan 2009) diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index 9c364e317a02..d9e287df716a 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -1,19 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX emacs-cvs-freebsd-sparc-1.patch 488 RMD160 37a5499a515a45e19858b6aaa1217ec116811d2d SHA1 47d2880c01857515d38adc9a56485e9bd695cac6 SHA256 963ea3506cbcf4797ec974e2802a11c6e9c09cddf1360dbbe6a452a2cef6efbf -DIST emacs-23.0.60_pre20081226.tar.gz 42797228 RMD160 dda5c23968f0280f2a8d43b16dbe51ea702281bd SHA1 10026c7dcea7e45029a5c4ff11fcda06e4ce0898 SHA256 6340eb55a88f10181737e13d50fb5c8b896b7b5abc514ce6c2fbc76c41931531 DIST emacs-23.0.60_pre20090125.tar.gz 42756583 RMD160 b85db7fe3f44081885a163e4896e3c7ba570a5ff SHA1 a7391d56b098edf268d7c25379d7fa5ac23f0e39 SHA256 5a6e29c1878a24d063b6ec577d15634b8be8b1d2f87e2239fa6b8afb92eaa86f -EBUILD emacs-cvs-23.0.60_pre20081226.ebuild 8320 RMD160 f9c4f9d777f9143004e3f327c85849041c977dae SHA1 6acda33311af16b8934d4dc68124d31fb26ab272 SHA256 b1b6841bf1a13894101a99b967f74b8c5bbedb248bfb51d258ecc4654c9c4a10 +DIST emacs-23.0.90.tar.gz 42816900 RMD160 59f151e19ee555a5173a9d37829ba379043dd7e0 SHA1 25ef0fe0f37e9e13cdbc684c9cebd3863ce20ab4 SHA256 0afb69a3996455c0883909fd1f9db786d0485eed9ef44c12bd623dff2ec7c7af EBUILD emacs-cvs-23.0.60_pre20090125.ebuild 9076 RMD160 1c366bbcab05dbdd7adc55ef51a936b6137731e7 SHA1 fc63400ee616935365c0c0ffb813f1075462abe5 SHA256 41a7b7faac4726e372b4b7c59eb34e94f64f89a2902bf584c4aaa554a0072cba +EBUILD emacs-cvs-23.0.90.ebuild 9064 RMD160 7b0224a4b0c7594cd676869dd64d1113c41bdad8 SHA1 e9f269427c1fdac756f8f7b3bb356bb365f33217 SHA256 efec615ca6e35dc2ea6f23a119daac05287f188026779e576979f2d9c8497b3a EBUILD emacs-cvs-23.0.9999-r1.ebuild 9069 RMD160 36c69779c9447d0bc153f182b35203747dfa167c SHA1 497cb88b2454439a97b8fe47166143f1ec9eb4e1 SHA256 7c2df39c4ada46190b9ba9c8b37f6aa2e1d9056908a93f7093374d604ae2ef50 EBUILD emacs-cvs-23.0.9999.ebuild 8735 RMD160 6f5289f600d0fd24e3c31996be62d3aa7f5fe920 SHA1 acd52272b7c57f9215da80e69af91fc81c3b0cd9 SHA256 a439734d51a23e59b8ec38e915ee0976ec985d6d231d82f6a9da43399b6efbf3 -MISC ChangeLog 43508 RMD160 bc0f7107205a1c5a202d2f6cca80d807a2e18947 SHA1 c2078cfdf44b4420f87bc1d14a0e52b48547b526 SHA256 4c1635946012449901b6d7de745e60a51966e2ab546d28934814176b79a71f73 +MISC ChangeLog 43747 RMD160 6ee84e4b6d33545c0aa0d32b9141360ca3e83922 SHA1 0b4785f27f1b6560827142284bb331ec0ca94f85 SHA256 57d88299c3403c43685d0858032df3173aa75c26d50e3f04aaaa30c3cbddc295 MISC metadata.xml 1529 RMD160 e40abfeff829d64e9f7d699d4e8fc5c4d6097bb5 SHA1 b2c01905cf0230739a45ad86bfbec800f8562c9f SHA256 b24dbef03ac32c182f69573275d416d664537eee2667e1e8c3199d4d34f3b20e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) -iEYEARECAAYFAkmADloACgkQOeoy/oIi7uwaCgCcDQQsx2oZ+0J/S61oEHA7TGaH -G4YAoI1EWl4tKscx2+3505LFK+f3x+jb -=Qygl +iEYEARECAAYFAkmGPZkACgkQOeoy/oIi7uwNIQCdF4vLkQD/9JfU1864gtFhV6Se +SfoAnjyfQSH9z6/9Iin8Y3/zSLJELOWn +=anL4 -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild deleted file mode 100644 index f2156ab68dca..000000000000 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.60_pre20081226.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1999-2009 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_pre20081226.ebuild,v 1.4 2009/01/25 19:25:17 ulm Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -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://gentoo/emacs-${PV}.tar.gz" - -LICENSE="GPL-3 FDL-1.3 BSD as-is X11 W3C" -SLOT="23" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft xpm" -RESTRICT="strip" - -RDEPEND="sys-libs/ncurses - >=app-admin/eselect-emacs-1.2 - net-libs/liblockfile - hesiod? ( net-dns/hesiod ) - kerberos? ( virtual/krb5 ) - spell? ( || ( app-text/ispell app-text/aspell ) ) - alsa? ( media-libs/alsa-lib ) - gpm? ( sys-libs/gpm ) - dbus? ( sys-apps/dbus ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - x11-misc/emacs-desktop - 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 )" - -# 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}" -S="${WORKDIR}/emacs-${FULL_VERSION}" -SITEFILE="20${PN}-${SLOT}-gentoo.el" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${PN}-freebsd-sparc-1.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_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 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 freetype) $(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 && einfo \ - "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" - - #emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed" - ## cleanup, otherwise emacs will be dumped again in src_install - #(cd src; emake versionclean) - 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 /usr/share/emacs/site-lisp - 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() { - [ -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 - [ -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 "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 ifunset -} diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.90.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.90.ebuild new file mode 100644 index 000000000000..641b0b81fbe3 --- /dev/null +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.90.ebuild @@ -0,0 +1,296 @@ +# Copyright 1999-2009 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.90.ebuild,v 1.1 2009/02/02 00:24:56 ulm Exp $ + +EAPI=2 +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" + +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="" + FULL_VERSION="" + S="${WORKDIR}/${ECVS_LOCALNAME}" +else + SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz + ftp://alpha.gnu.org/gnu/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 X11 W3C" +SLOT="23" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" +RESTRICT="strip" + +RDEPEND="sys-libs/ncurses + >=app-admin/eselect-emacs-1.2 + net-libs/liblockfile + hesiod? ( net-dns/hesiod ) + kerberos? ( virtual/krb5 ) + spell? ( || ( app-text/ispell app-text/aspell ) ) + alsa? ( media-libs/alsa-lib ) + gpm? ( sys-libs/gpm ) + dbus? ( sys-apps/dbus ) + X? ( + x11-libs/libXmu + x11-libs/libXt + x11-misc/xbitmaps + x11-misc/emacs-desktop + 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 )" + +EMACS_SUFFIX="emacs-${SLOT}" +SITEFILE="20${PN}-${SLOT}-gentoo.el" + +src_prepare() { + if [ -z "${FULL_VERSION}" ]; 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 + + 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 + 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 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 freetype) $(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 && einfo \ + "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 /usr/share/emacs/site-lisp + 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() { + [ -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 + [ -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 "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 ifunset +} diff --git a/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc-1.patch b/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc-1.patch deleted file mode 100644 index de206e7e0658..000000000000 --- a/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc-1.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://bugs.gentoo.org/159584 -Patch taken from FreeBSD ports, by Giorgos Keramidas - ---- emacs-orig/src/alloc.c -+++ emacs/src/alloc.c -@@ -4573,7 +4573,11 @@ - needed on ia64 too. See mach_dep.c, where it also says inline - assembler doesn't work with relevant proprietary compilers. */ - #ifdef __sparc__ -+#ifdef __sparc64__ -+ asm ("flushw"); -+#else - asm ("ta 3"); -+#endif - #endif - - /* Save registers that we need to see on the stack. We need to see -- cgit v1.2.3-65-gdbad