summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-editors/emacs/ChangeLog9
-rw-r--r--app-editors/emacs/emacs-21.4-r6.ebuild204
-rw-r--r--app-editors/emacs/files/digest-emacs-21.4-r66
3 files changed, 218 insertions, 1 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index dd2fa893c2a1..fb9e3a2e8e83 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-editors/emacs
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.112 2007/01/05 14:25:01 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.113 2007/02/02 14:41:33 opfer Exp $
+
+*emacs-21.4-r6 (02 Feb 2007)
+
+ 02 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
+ +emacs-21.4-r6.ebuild:
+ create symlinks for man pages, as reported by Ulrich Mueller
+ <ulm@kph.uni-mainz.de>
05 Jan 2007; Christian Faulhammer <opfer@gentoo.org> emacs-21.4-r5.ebuild:
correctly use aspell when having it installed, see bug #158850, reported
diff --git a/app-editors/emacs/emacs-21.4-r6.ebuild b/app-editors/emacs/emacs-21.4-r6.ebuild
new file mode 100644
index 000000000000..68ce770183bf
--- /dev/null
+++ b/app-editors/emacs/emacs-21.4-r6.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r6.ebuild,v 1.1 2007/02/02 14:41:33 opfer Exp $
+
+inherit flag-o-matic eutils alternatives toolchain-funcs
+
+DESCRIPTION="An incredibly powerful, extensible text editor"
+HOMEPAGE="http://www.gnu.org/software/emacs"
+SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
+ leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="21"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X Xaw3d leim lesstif motif nls nosendmail"
+
+RDEPEND="sys-libs/ncurses
+ X? ( || ( ( x11-libs/libXext
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXmu
+ x11-libs/libXpm
+ || ( media-fonts/font-adobe-100dpi
+ media-fonts/font-adobe-75dpi )
+ )
+ virtual/x11
+ )
+ >=media-libs/giflib-4.1.0.1b
+ >=media-libs/jpeg-6b-r2
+ >=media-libs/tiff-3.5.5-r3
+ >=media-libs/libpng-1.2.1
+ !arm? (
+ Xaw3d? ( x11-libs/Xaw3d )
+ !Xaw3d? ( || ( x11-libs/libXaw virtual/x11 ) )
+ motif? (
+ lesstif? ( x11-libs/lesstif )
+ !lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
+ )
+ )
+ nls? ( sys-devel/gettext )
+ !nosendmail? ( virtual/mta )"
+
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-2.58
+ X? ( || ( x11-misc/xbitmaps virtual/x11 ) )"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+DFILE=emacs-${SLOT}.desktop
+
+src_unpack() {
+
+ unpack ${A}
+
+ cd ${S}
+ epatch "${FILESDIR}/emacs-21.3-xorg.patch"
+ epatch "${FILESDIR}/emacs-21.3-amd64.patch"
+ epatch "${FILESDIR}/emacs-21.3-hppa.patch"
+ epatch "${FILESDIR}/emacs-21.2-sh.patch"
+ epatch "${FILESDIR}/emacs-21.4-libungif-gif-gentoo.patch"
+
+ use ppc64 && epatch "${FILESDIR}/emacs-21.3-ppc64.patch"
+
+ epatch "${FILESDIR}/emacs-subdirs-el-gentoo.diff"
+
+ # 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
+}
+
+src_compile() {
+ export SANDBOX_ON=0
+
+ # -fstack-protector gets internal compiler error at xterm.c (bug 33265)
+ filter-flags -fstack-protector
+
+ # 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=*"
+
+ export WANT_AUTOCONF=2.1
+ autoconf
+
+ local myconf
+ use nls || myconf="${myconf} --disable-nls"
+ if use X ; then
+ if use motif && use lesstif; then
+ append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
+ export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
+ fi
+ myconf="${myconf}
+ --with-x
+ --with-xpm
+ --with-jpeg
+ --with-tiff
+ --with-gif
+ --with-png"
+ if use Xaw3d ; then
+ myconf="${myconf} --with-x-toolkit=athena"
+ elif use motif ; then
+ myconf="${myconf} --with-x-toolkit=motif"
+ else
+ # do not build emacs with any toolkit, bug 35300
+ myconf="${myconf} --with-x-toolkit=no"
+ fi
+ else
+ myconf="${myconf} --without-x"
+ fi
+ econf ${myconf} || die
+ emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+ einstall || die
+ for i in ${D}/usr/bin/* ; do
+ mv ${i} ${i}.emacs-${SLOT} || die "mv ${i} failed"
+ done
+ mv ${D}/usr/bin/emacs{-${PV},}.emacs-${SLOT} || die "mv emacs failed"
+ dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT}
+
+ einfo "Fixing info documentation..."
+ mkdir ${T}/emacs-${SLOT}
+ mv ${D}/usr/share/info/dir ${T}
+ for i in ${D}/usr/share/info/*
+ do
+ mv ${i} ${T}/emacs-${SLOT}/${i##*/}.info
+ gzip -9 ${T}/emacs-${SLOT}/${i##*/}.info
+ done
+ mv ${T}/emacs-${SLOT} ${D}/usr/share/info
+ mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT}
+
+ if has_version 'app-text/aspell' ; then
+ # defaults to aspell if installed
+ elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
+ fi
+
+ newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${SLOT}
+
+ einfo "Fixing manpages..."
+ for m in ${D}/usr/share/man/man1/* ; do
+ mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv ${m} failed"
+ done
+
+ einfo "Fixing 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
+ keepdir /usr/share/emacs/site-lisp
+
+ dodoc BUGS ChangeLog README
+
+ insinto /usr/share/applications
+ doins ${FILESDIR}/${DFILE}
+}
+
+update-alternatives() {
+ # this creates symlinks for binaries and man pages, so the correct ones in a slotted
+ # environment can be accessed
+ for i in emacs emacsclient etags ctags b2m ebrowse \
+ rcs-checkin grep-changelog ; do
+ alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/${i}.emacs-*"
+ done
+
+ for j in emacs emacsclient etags ctags
+ do
+ alternatives_auto_makesym "/usr/share/man/man1/$j" "/usr/share/man/man1/$j.emacs-*"
+ done
+}
+
+pkg_postinst() {
+ update-alternatives
+ if use nosendmail; then
+ while read line; do einfo "${line}"; done<<'EOF'
+
+You disabled sendmail support for Emacs. If you later install a MTA
+then you will need to recompile Emacs. See Bug #11104.
+
+EOF
+ fi
+ if use X; then
+ while read line; do einfo "${line}"; done<<'EOF'
+
+You need to install some fonts for Emacs. Under monolithic
+XFree86/Xorg you typically had such fonts installed by default. With
+modular Xorg, you will have to perform this step yourself.
+
+Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic
+Emacs requirements under X11.
+
+EOF
+ fi
+
+
+}
+
+pkg_postrm() {
+ update-alternatives
+}
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r6 b/app-editors/emacs/files/digest-emacs-21.4-r6
new file mode 100644
index 000000000000..6898ecff2a12
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-21.4-r6
@@ -0,0 +1,6 @@
+MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483
+RMD160 c312e739935b56d08783bbfe97992297a363cb8a emacs-21.4a.tar.gz 20403483
+SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 emacs-21.4a.tar.gz 20403483
+MD5 32938cb5a7505d995a1e835639d19707 leim-21.4.tar.gz 3291433
+RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca leim-21.4.tar.gz 3291433
+SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b leim-21.4.tar.gz 3291433