summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-06-10 20:02:43 +0000
committerUlrich Müller <ulm@gentoo.org>2012-06-10 20:02:43 +0000
commit101d8f186d419300cbc572f38269afd2c7300763 (patch)
tree14eb0e72e446ecc4ee051a25e16b4619cb811e0c /app-editors
parentChange live ebuild to use Git. Merge changes from Portage tree. (diff)
downloademacs-101d8f186d419300cbc572f38269afd2c7300763.tar.gz
emacs-101d8f186d419300cbc572f38269afd2c7300763.tar.bz2
emacs-101d8f186d419300cbc572f38269afd2c7300763.zip
Moved to Portage tree.
svn path=/emacs-overlay/; revision=1810
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog11
-rw-r--r--app-editors/emacs/Manifest25
-rw-r--r--app-editors/emacs/emacs-24.1_rc.ebuild336
-rw-r--r--app-editors/emacs/metadata.xml42
4 files changed, 0 insertions, 414 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
deleted file mode 100644
index dd87f6d..0000000
--- a/app-editors/emacs/ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
-# ChangeLog for app-editors/emacs
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*emacs-24.1_rc (06 Jun 2012)
-
- 06 Jun 2012; Ulrich Müller <ulm@gentoo.org> +emacs-24.1_rc.ebuild,
- +metadata.xml:
- Copy from Portage tree. Move handling of game score files to
- app-emacs/emacs-common-gentoo.
-
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
deleted file mode 100644
index 8a66e13..0000000
--- a/app-editors/emacs/Manifest
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST emacs-24.1-rc.tar.gz 51474390 RMD160 b1cca7202d4123e3f5a7dd5da1b3228df5c8d787 SHA1 11d70533109ab55a75392f75ad28150c023ae9fe SHA256 83d4ea3cf59be4d672b59fa2944f7c6ab2c3790ab8644b9e5673bdfdcda20cbf
-DIST emacs-24.1_rc-patches-1.tar.bz2 1978 RMD160 773958ac1582cfd6aad565593647dc1cd39b7a74 SHA1 934ae3968a941d433496d283440ba15ea50e8f87 SHA256 8334e2c42bd3dee39c34181701e131263988d7795f278aafff4d72e1d7e584eb
-EBUILD emacs-24.1_rc.ebuild 10882 RMD160 b3185ddf00c65aabc08a1f42aabee2fd4c49ff18 SHA1 5f7ba898cd938b845ad2c70f506b72ff049254e0 SHA256 8556f69d4cfa14a841191e223c67607b24d21645f416ce690d8636c5fc2c3925
-MISC ChangeLog 332 RMD160 d8325e566039e9096655a2978e7dadb619102a45 SHA1 4a0cf5ec1b9c77f7488c6fd9c0e5cb68d8f8cfc5 SHA256 c79b9ba8f27a3c3f5eecf6544d98d72acd48566e38fc6edfa81a370bff8d0310
-MISC metadata.xml 2268 RMD160 9439ac90d3d08327b985af3076137641ae4d94ab SHA1 d29e5efc8600f89bf786a53383e6d13db11d2716 SHA256 7db9dfad4fdc3f86044a3919e26f088d70b7426505a342387a81cd5d5d451e5c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBAgAGBQJP0FBcAAoJEDxpGckxwJCB/JIP/1oXf0ihAvwUnojWWGKUp4a4
-HLCGVR4RxTwEqUSrakJeO0mq8CYhpADrQQA9cFDjyaIC+275osH90m6TICRbYhBL
-tvbhp6Bi1IzagAqE47gQHc2M8q+qGSOxOVO/tPToaCAaoo1bhzPhbnVVrrK/zoK0
-XQXjZLodqf9v2v6F6m0Ca57SwSy6bk5AaLxkHzMeGiQMzQwTJKiIgKVwXev7ZoN0
-I/nCg76oKJRIZu+2Gb6b7bIA2is1pFjmfyGQ5a0khiKsKS8gxOC4azOvLuTYNVBV
-8w1bAWINE98etViXmY52I/K5z62L6431csI5DdqswWmxDcZOxa3oqMSKu3N2D5fw
-nL0a7PGRP3V3oZMMQcb7l3ViXrzHfpmqRoLUKNJHNjK9mr+nL3a7eoutxuNz2iTc
-If/5PzFbypV3XKWbY/kDzPoTi3a32O3s48wnZ5R6PzmCm7SjK8sI0P6dbkcydZaw
-dtjtTbb8d+ilLUx4lR6wLkwYBmdSVBseqq9iE4aEnCcQA3utuLguvrU6ZA5qqZRZ
-T9exECpe2o3JKh0CKwjraTqs8nqnGb1/csEmtyE7bqvS+mCySulv4HDlN+Emhiw+
-2RjjAGm719NKFY1bIwuCOpowK015PEPgZXCwNC3Nl3r+PElCnPmZf10LdULPXGTy
-k3ky3tLJJ/W7NVC1CSR3
-=5A3N
------END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-24.1_rc.ebuild b/app-editors/emacs/emacs-24.1_rc.ebuild
deleted file mode 100644
index 46fffdf..0000000
--- a/app-editors/emacs/emacs-24.1_rc.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-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-alpha/emacs/pretest/${P/_/-}.tar.gz
- mirror://gentoo/${P}-patches-1.tar.bz2"
-
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
-REQUIRED_USE="aqua? ( !X )"
-
-RDEPEND="sys-libs/ncurses
- >=app-admin/eselect-emacs-1.2
- >=app-emacs/emacs-common-gentoo-1.3-r2[X?]
- net-libs/liblockfile
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- alsa? ( media-libs/alsa-lib )
- gpm? ( sys-libs/gpm )
- dbus? ( sys-apps/dbus )
- gnutls? ( net-libs/gnutls )
- libxml2? ( >=dev-libs/libxml2-2.2.0 )
- selinux? ( sys-libs/libselinux )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gconf? ( >=gnome-base/gconf-2.26.2 )
- gsettings? ( >=dev-libs/glib-2.28.6 )
- 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 )
- imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
- 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? (
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- )
- !gtk? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? (
- athena? ( x11-libs/libXaw )
- !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
- )
- )
- )"
-
-DEPEND="${RDEPEND}
- alsa? ( virtual/pkgconfig )
- dbus? ( virtual/pkgconfig )
- gnutls? ( virtual/pkgconfig )
- libxml2? ( virtual/pkgconfig )
- X? ( virtual/pkgconfig )
- gzip-el? ( app-arch/gzip )
- pax_kernel? ( sys-apps/paxctl )"
-
-RDEPEND="${RDEPEND}
- !<app-editors/emacs-vcs-24.1.9999-r1"
-
-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
- epatch_user
-
- 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
-
- AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
- strip-flags
-
- 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
- einfo "Although sound USE flag is disabled you chose to have alsa,"
- einfo "so sound is switched on anyway."
- 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 gsettings)"
- myconf="${myconf} $(use_with toolkit-scroll-bars)"
- myconf="${myconf} $(use_with wide-int)"
- 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 imagemagick)"
-
- 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
-
- if use gtk; then
- einfo "Configuring to build with GIMP Toolkit (GTK+)"
- myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
- local f
- for f in athena Xaw3d motif; do
- use ${f} && ewarn "USE flag \"${f}\" ignored" \
- "(superseded by \"gtk\")"
- done
- elif use athena || use Xaw3d; then
- einfo "Configuring to build with Athena/Lucid toolkit"
- myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
- use motif && ewarn "USE flag \"motif\" ignored" \
- "(superseded by \"athena\" or \"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
-
- ! use gtk && use gtk3 \
- && ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
- 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} \
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --with-crt-dir="${crtdir}" \
- --with-gameuser="${GAMES_USER_DED:-games}" \
- --without-compress-info \
- --disable-maintainer-mode \
- $(use_with hesiod) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with gpm) \
- $(use_with dbus) \
- $(use_with gnutls) \
- $(use_with libxml2 xml2) \
- $(use_with selinux) \
- ${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 () {
- 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
- local m
- 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 -rf "${ED}"/var
-
- # remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
- 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/*.{c,h,m}
- doins -r src/{m,s}
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
- 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
- elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo."
- elog "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"
- elif [[ -d "${ED}"${infodir} ]]; then
- # 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() {
- 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
- 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."
- elog
- fi
-
- 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."
- elog
- 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/metadata.xml b/app-editors/emacs/metadata.xml
deleted file mode 100644
index 7e2c504..0000000
--- a/app-editors/emacs/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>emacs</herd>
-<longdescription>
- GNU Emacs is an extensible, customizable text editor - and more. At its core
- is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
- with extensions to support text editing. The features of GNU Emacs include:
- * Content-sensitive editing modes, including syntax coloring, for a variety
- of file types including plain text, source code, and HTML.
- * Complete built-in documentation, including a tutorial for new users.
- * Full Unicode support for nearly all human languages and their scripts.
- * Highly customizable, using Emacs Lisp code or a graphical interface.
- * A large number of extensions that add other functionality, including a
- project planner, mail and news reader, debugger interface, calendar, and
- more. Many of these extensions are distributed with GNU Emacs; others are
- available separately.
-</longdescription>
-<use>
- <flag name='athena'>Enable the MIT Athena widget set
- (<pkg>x11-libs/libXaw</pkg>)</flag>
- <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
- font name</flag>
- <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
- system font name</flag>
- <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
- version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
- <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
- <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
- <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
- processing</flag>
- <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
- of the internal Lisp implementations</flag>
- <flag name='pax_kernel'>Enable building under a PaX enabled kernel
- (<pkg>sys-apps/paxctl</pkg>)</flag>
- <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
- preference to Emacs' own scrollbars</flag>
- <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
- This option has an effect only on architectures where "long" and
- "long long" types have different size.</flag>
-</use>
-</pkgmetadata>