summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2009-02-28 17:56:09 +0000
committerUlrich Müller <ulm@gentoo.org>2009-02-28 17:56:09 +0000
commit368d9453af242785338e4ef959583b79fba55a31 (patch)
treeb802abd3528a7be00724eb4b81ea94bc17cedee5 /app-editors/emacs
parentUpdated pkg_postinst() to reflect new location of archive of old desklets (diff)
downloadhistorical-368d9453af242785338e4ef959583b79fba55a31.tar.gz
historical-368d9453af242785338e4ef959583b79fba55a31.tar.bz2
historical-368d9453af242785338e4ef959583b79fba55a31.zip
IUSE default for xpm, SLOT dependency for gtk+; change EAPI to 2.
Package-Manager: portage-2.2_rc23/cvs/Linux i686
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/ChangeLog7
-rw-r--r--app-editors/emacs/Manifest9
-rw-r--r--app-editors/emacs/emacs-22.3-r2.ebuild260
3 files changed, 271 insertions, 5 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 4773d8ffeb68..16f91422349b 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-editors/emacs
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.304 2009/02/22 17:27:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.305 2009/02/28 17:56:09 ulm Exp $
+
+*emacs-22.3-r2 (28 Feb 2009)
+
+ 28 Feb 2009; Ulrich Mueller <ulm@gentoo.org> +emacs-22.3-r2.ebuild:
+ IUSE default for xpm, SLOT dependency for gtk+; change EAPI to 2.
22 Feb 2009; Ulrich Mueller <ulm@gentoo.org> -emacs-18.59-r5.ebuild:
Remove old.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index fe0951c850a3..57ed0e460f45 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -15,12 +15,13 @@ DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SH
EBUILD emacs-18.59-r6.ebuild 2516 RMD160 eec73e8fcf1462b945f9414a7db44268961eb7a0 SHA1 050566fc795050ce3609aec693e34217fabd5334 SHA256 92024b0574b11ea073e13cd92c9a652884fed2e817d7d66a5adcc463d1dcd76f
EBUILD emacs-21.4-r17.ebuild 5436 RMD160 3dff8243b2a106816e828c88d9c51bb5c482305e SHA1 e6875cdea8a82f643255082936f828a1c0df781d SHA256 c1054740d9cde10d87a4ed53b1d00a0e76b7f7a10f4d6d8674557b3fae5ada45
EBUILD emacs-22.3-r1.ebuild 8037 RMD160 2c09bc9892420361100b5afc8fdf7eb52bd1a5ea SHA1 d56b43f526eb798efc5d8a9fecfecf2d6710839a SHA256 42679ab77af9444cdc47ce51dd9ccb158efd5ca7c885764e0fb7c85a9b91f159
-MISC ChangeLog 43705 RMD160 48d3e29ebd68e46b872cf169be566eae65528f51 SHA1 5bc88f33b27be27b207940b449d0fff69c74101c SHA256 a995398a6168c23394484e8031d1ce2f84fb8757a1c70702baab8b7004769986
+EBUILD emacs-22.3-r2.ebuild 8050 RMD160 58b506face8b8eef384942637730dc64e27ee4f3 SHA1 4106c9fd9fddad287d2808ee32a5988ea06b465e SHA256 a717baa8a9a6a86005ee5069f73e396ba1319a0ce34da4093962d75079090c5a
+MISC ChangeLog 43874 RMD160 9987a771d729ebbff4acf48b4fb99bdd913353a5 SHA1 a480e75eff8bf94612c2084ac102ff5b005ebb79 SHA256 6ee22d8bb32fdb1a6a6fae64caeb23ef12a39e1bae33abb97168a9444f223ee9
MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
-iEYEARECAAYFAkmhi0cACgkQOeoy/oIi7uwUtQCgraBD9GkY8I3I78M/6pQJhKkd
-wXgAoOevm2Uc4oBnI8eWLuOAsOaD42a4
-=6m28
+iEUEARECAAYFAkmpewcACgkQOeoy/oIi7uzH9wCYwlTE1BJbKP+7xyTmK0/iT4S+
+EwCgnhHw1soQ2xRsaWD7UBZYjiBrK30=
+=fyWj
-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-22.3-r2.ebuild b/app-editors/emacs/emacs-22.3-r2.ebuild
new file mode 100644
index 000000000000..8345f5a01760
--- /dev/null
+++ b/app-editors/emacs/emacs-22.3-r2.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r2.ebuild,v 1.1 2009/02/28 17:56:09 ulm Exp $
+
+EAPI=2
+
+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"
+
+LICENSE="GPL-3 FDL-1.2 BSD as-is X11"
+SLOT="22"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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"
+
+RDEPEND="!<app-editors/emacs-cvs-22.1
+ sys-libs/ncurses
+ >=app-admin/eselect-emacs-1.2
+ net-libs/liblockfile
+ hesiod? ( net-dns/hesiod )
+ kerberos? ( virtual/krb5 )
+ spell? ( || ( app-text/aspell app-text/ispell ) )
+ alsa? ( media-libs/alsa-lib )
+ X? (
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-misc/xbitmaps
+ 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? ( x11-libs/openmotif ) )
+ )
+ )"
+
+DEPEND="${RDEPEND}
+ alsa? ( dev-util/pkgconfig )
+ X? ( gtk? ( 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}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+
+src_prepare() {
+ epatch "${FILESDIR}/emacs-22.1-Xaw3d-headers.patch"
+ epatch "${FILESDIR}/emacs-22.3-freebsd-sparc.patch"
+ # SuperH support (bug 238210)
+ epatch "${FILESDIR}/emacs-22.2-sh.patch"
+ # Fix sporadic segmentation faults in unexec (bug 236579)
+ epatch "${FILESDIR}/emacs-22.3-linux-random-heap.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_configure() {
+ ALLOWED_FLAGS=""
+ strip-flags
+ #unset LDFLAGS
+ if use hppa; then # bug #193703
+ replace-flags -O[2-9] -O
+ else
+ replace-flags -O[3-9] -O2
+ fi
+ 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
+ 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-${SLOT} \
+ --infodir=/usr/share/info/emacs-${SLOT} \
+ --without-carbon \
+ ${myconf} || die "econf emacs failed"
+}
+
+src_compile() {
+ export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
+ 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-${SLOT} \
+ || die "removing duplicate emacs executable failed"
+ mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
+ || die "moving Emacs executable failed"
+
+ # move info documentation to the correct place
+ for i in "${D}"/usr/share/info/emacs-${SLOT}/*; 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-${SLOT}.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 /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-${SLOT}"))
+ 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 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-${SLOT} 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
+
+ if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then
+ # transition from pre-eselect revision
+ eselect emacs set emacs-${SLOT}
+ else
+ eselect emacs update ifunset
+ 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
+ emacs-infodir-rebuild
+ eselect emacs update ifunset
+}