summaryrefslogtreecommitdiff
path: root/app-editors/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/Manifest4
-rw-r--r--app-editors/emacs/emacs-23.3-r2.ebuild331
-rw-r--r--app-editors/emacs/files/emacs-23.3-wide-chars-fix.patch28
3 files changed, 0 insertions, 363 deletions
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
deleted file mode 100644
index 3df014a..0000000
--- a/app-editors/emacs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX emacs-23.3-wide-chars-fix.patch 764 RMD160 1bf415046569753e6c73ec9669bd8952e1dd7093 SHA1 022e3c94cf9e617bd017acfe9f051104e6a449ee SHA256 10786279c9e7f60a7f8a01b6132bce72d204aa798df033f4a68b657aa2f1053f
-DIST emacs-23.3-patches-1.tar.bz2 1675 RMD160 f167c15e8d1c6a9629967aa3f910cc476e22315e SHA1 51522c8af1c0991ef189f8537e6636f7e1b30553 SHA256 caec6e052a564e75de2873e2d0e4ffb8169bde3c4f786e1a04b8781df31456fe
-DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
-EBUILD emacs-23.3-r2.ebuild 10563 RMD160 bf38efd3daf6377c47380d994a36ddb455e2c127 SHA1 0f36b70eb96a92e425e558e1708edd568e807021 SHA256 456fa976eb058b5537a46e289d9e98f4a450ac38833464d8634b935703f86f2b
diff --git a/app-editors/emacs/emacs-23.3-r2.ebuild b/app-editors/emacs/emacs-23.3-r2.ebuild
deleted file mode 100644
index 1d2caf7..0000000
--- a/app-editors/emacs/emacs-23.3-r2.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# 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.3-r2.ebuild,v 1.7 2011/10/01 03:32:20 phajdan.jr Exp $
-
-EAPI=4
-WANT_AUTOMAKE="none"
-
-inherit autotools elisp-common eutils flag-o-matic multilib
-
-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.bz2
- mirror://gentoo/${P}-patches-1.tar.bz2"
-
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
-SLOT="23"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~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 athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-REQUIRED_USE="aqua? ( !X )"
-
-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-1.4:0 )
- 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/libXaw3d )
- !Xaw3d? (
- athena? ( x11-libs/libXaw )
- !athena? ( 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"
-# 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}"
-
-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
-
- epatch "${FILESDIR}/emacs-23.3-wide-chars-fix.patch"
-
- eautoreconf
-}
-
-src_configure() {
- ALLOWED_FLAGS=""
- strip-flags
- filter-flags -fstrict-aliasing
- append-flags $(test-flags -fno-strict-aliasing)
-
- 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 X; then
- myconf="${myconf} --with-x --without-ns"
- 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)"
-
- 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
-
- # 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 || use athena; then
- einfo "Configuring to build with Athena/Lucid toolkit"
- myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d 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
-
- local f tk=
- for f in gtk Xaw3d athena motif; do
- use ${f} || continue
- [[ ${tk} ]] \
- && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
- tk="${tk}${tk:+ }${f}"
- done
- elif use aqua; then
- einfo "Configuring to build with Cocoa support"
- myconf="${myconf} --with-ns --disable-ns-self-contained"
- myconf="${myconf} --without-x"
- else
- myconf="${myconf} --without-x --without-ns"
- 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} \
- --with-crt-dir="${crtdir}" \
- --with-gameuser="${GAMES_USER_DED:-games}" \
- $(use_with hesiod) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with gpm) \
- $(use_with dbus) \
- ${myconf}
-}
-
-src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- # set last component of emacs-version to (package revision + 1)
- touch src/emacs-${FULL_VERSION}.${PR#r}
- 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
-
- if use livecd; then
- # force an update of the emacs symlink for the livecd/dvd,
- # because some microemacs packages set it with USE=livecd
- eselect emacs update
- else
- eselect emacs update ifunset
- 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."
- 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
-}
diff --git a/app-editors/emacs/files/emacs-23.3-wide-chars-fix.patch b/app-editors/emacs/files/emacs-23.3-wide-chars-fix.patch
deleted file mode 100644
index 0a4825e..0000000
--- a/app-editors/emacs/files/emacs-23.3-wide-chars-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/xdisp.c b/src/xdisp.c
-index 1f4c829..0f21c82 100644
---- a/src/xdisp.c
-+++ b/src/xdisp.c
-@@ -5922,9 +5922,21 @@ get_next_display_element (it)
- int pos = (it->s ? -1
- : STRINGP (it->string) ? IT_STRING_CHARPOS (*it)
- : IT_CHARPOS (*it));
-+ int c;
-+
-+ if (it->what == IT_CHARACTER)
-+ c = it->char_to_display;
-+ else
-+ {
-+ struct composition *cmp = composition_table[it->cmp_it.id];
-+ int i;
-
-- it->face_id = FACE_FOR_CHAR (it->f, face, it->char_to_display, pos,
-- it->string);
-+ c = ' ';
-+ for (i = 0; i < cmp->glyph_len; i++)
-+ if ((c = COMPOSITION_GLYPH (cmp, i)) != '\t')
-+ break;
-+ }
-+ it->face_id = FACE_FOR_CHAR (it->f, face, c, pos, it->string);
- }
- }
- #endif