diff options
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs/ChangeLog | 9 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.4-r4.ebuild | 7 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.4-r6.ebuild | 5 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-21.4-r7.ebuild | 5 | ||||
| -rw-r--r-- | app-editors/emacs/emacs-22.0.50_pre20050225.ebuild | 195 | ||||
| -rw-r--r-- | app-editors/emacs/files/digest-emacs-22.0.50_pre20050225 | 9 |
6 files changed, 21 insertions, 209 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index dd373c3f40d8..670c9969cf2a 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.120 2007/02/20 22:15:16 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.121 2007/03/02 18:38:54 opfer Exp $ + + 02 Mar 2007; Christian Faulhammer <opfer@gentoo.org> emacs-21.4-r4.ebuild, + emacs-21.4-r6.ebuild, emacs-21.4-r7.ebuild, + -emacs-22.0.50_pre20050225.ebuild: + added flags for PPC64, fixes bug 152006, reported by corsair, solution found + by Andrew John Hughes <gnu_andrew@member.fsf.org>; removed stale version as + it is in prefix overlay for ppc-macos *emacs-21.4-r7 (20 Feb 2007) diff --git a/app-editors/emacs/emacs-21.4-r4.ebuild b/app-editors/emacs/emacs-21.4-r4.ebuild index 14b1262bada4..8f96cfcea6cd 100644 --- a/app-editors/emacs/emacs-21.4-r4.ebuild +++ b/app-editors/emacs/emacs-21.4-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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-r4.ebuild,v 1.11 2006/10/31 17:33:55 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r4.ebuild,v 1.12 2007/03/02 18:38:54 opfer Exp $ inherit flag-o-matic eutils alternatives toolchain-funcs @@ -80,6 +80,9 @@ src_compile() { # ever since GCC 3.2 replace-flags -O[3-9] -O2 + # this fixes bug 152006 + use ppc64 && append-flags -mno-fp-in-toc -mno-sum-in-toc + # -march is known to cause signal 6 on some environment filter-flags "-march=*" diff --git a/app-editors/emacs/emacs-21.4-r6.ebuild b/app-editors/emacs/emacs-21.4-r6.ebuild index 38a475557e14..acc03bb3c841 100644 --- a/app-editors/emacs/emacs-21.4-r6.ebuild +++ b/app-editors/emacs/emacs-21.4-r6.ebuild @@ -1,6 +1,6 @@ # 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.6 2007/02/06 06:09:41 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r6.ebuild,v 1.7 2007/03/02 18:38:54 opfer Exp $ inherit flag-o-matic eutils alternatives toolchain-funcs @@ -80,6 +80,9 @@ src_compile() { # ever since GCC 3.2 replace-flags -O[3-9] -O2 + # this fixes bug 152006 + use ppc64 && append-flags -mno-fp-in-toc -mno-sum-in-toc + # -march is known to cause signal 6 on some environment filter-flags "-march=*" diff --git a/app-editors/emacs/emacs-21.4-r7.ebuild b/app-editors/emacs/emacs-21.4-r7.ebuild index c5ab35a3e87d..67a55abf103b 100644 --- a/app-editors/emacs/emacs-21.4-r7.ebuild +++ b/app-editors/emacs/emacs-21.4-r7.ebuild @@ -1,6 +1,6 @@ # 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-r7.ebuild,v 1.1 2007/02/20 22:15:16 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r7.ebuild,v 1.2 2007/03/02 18:38:54 opfer Exp $ inherit flag-o-matic eutils alternatives toolchain-funcs @@ -82,6 +82,9 @@ src_compile() { # ever since GCC 3.2 replace-flags -O[3-9] -O2 + # this fixes bug 152006 + use ppc64 && append-flags -mno-fp-in-toc -mno-sum-in-toc + # -march is known to cause signal 6 on some environment filter-flags "-march=*" diff --git a/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild b/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild deleted file mode 100644 index 7bd0db9fd3a7..000000000000 --- a/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild,v 1.7 2007/02/28 21:55:12 genstef Exp $ - -inherit elisp-common alternatives flag-o-matic eutils - -IUSE="X Xaw3d aqua cjk gif gnome gtk jpeg multi-tty nls png spell tiff" - -INLINE="inline_patch-20041229" -MULTI_TTY="emacs--multi-tty--0--patch-301.2005-02-25" - -DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor." -HOMEPAGE="http://www.gnu.org/software/emacs/ - http://macemacsjp.sourceforge.jp/ - http://lorentey.hu/project/emacs.html.en" -SRC_URI="mirror://gentoo/${P/_pre/-}.tar.gz - cjk? ( mirror://sourceforge.jp/macemacsjp/12817/${INLINE}.tar.gz ) - multi-tty? ( http://lorentey.hu/downloads/emacs/multi-tty/${MULTI_TTY}.patch.gz )" - -RESTRICT="$RESTRICT nostrip" - -DEPEND=">=sys-apps/portage-2.0.51 - >=sys-libs/ncurses-5.3 - sys-libs/gdbm - spell? ( || ( app-text/ispell app-text/aspell ) ) - X? ( || ( ( x11-libs/libXext - x11-libs/libICE - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXpm - x11-misc/xbitmaps - || ( media-fonts/font-adobe-100dpi - media-fonts/font-adobe-75dpi ) - ) - virtual/x11 - ) - gif? ( >=media-libs/giflib-4.1.0.1b ) - jpeg? ( >=media-libs/jpeg-6b ) - tiff? ( >=media-libs/tiff-3.5.7 ) - png? ( >=media-libs/libpng-1.2.5 ) - gtk? ( =x11-libs/gtk+-2* ) - !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) - gnome? ( gnome-base/gnome-desktop ) ) - nls? ( >=sys-devel/gettext-0.11.5 ) - !=app-editors/emacs-cvs-21.3.50* - !=app-editors/emacs-cvs-22.0.50*" - -PROVIDE="virtual/emacs virtual/editor" - -SLOT="22.0.50" -LICENSE="GPL-2" -# should run on other arches, but the ebuild is intended for ppc-macos -KEYWORDS="-*" - -DFILE=emacs-${SLOT}.desktop - -S=${WORKDIR}/${P%_*} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff - if use ppc-macos ; then - use cjk && epatch ${WORKDIR}/${INLINE}/emacs-inline.patch - epatch ${FILESDIR}/emacs-nofink-gentoo.diff - fi - if use multi-tty ; then - if use aqua ; then - ewarn "Carbon Emacs will not compile with multi-tty patch; disabling multi-tty." - ewarn "If you want to use multi-tty, please trun off aqua USE flag." - epause; ebeep; epause - else - epatch ../${MULTI_TTY}.patch - fi - fi - - # 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 - - sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile.in || die -} - -src_compile() { - SANDBOX_ON=0 - - strip-flags - - local myconf - - use nls || myconf="${myconf} --disable-nls" - - if use X; then - myconf="${myconf} --with-x" - myconf="${myconf} --with-xpm --with-toolkit-scroll-bars" - myconf="${myconf} $(use_with jpeg) $(use_with tiff)" - myconf="${myconf} $(use_with gif) $(use_with png)" - if use gtk; then - einfo "Configuring to build with GTK support" - myconf="${myconf} --with-x-toolkit=gtk" - elif use Xaw3d; then - einfo "Configuring to build with Xaw3d support" - myconf="${myconf} --with-x-toolkit=athena" - else - einfo "Configuring to build with lucid toolkit support" - myconf="${myconf} --without-gtk" - myconf="${myconf} --with-x-toolkit=lucid" - fi - fi - - if use aqua ; then - einfo "Configuring to build with Carbon Emacs" - econf --enable-debug \ - --enable-carbon-app=/Applications/Gentoo \ - --without-x \ - $(use_with jpeg) $(use_with tiff) \ - $(use_with gif) $(use_with png) \ - || die "econf carbon emacs failed" - emake -j1 || die "make carbon emacs bootstrap failed" - fi - - econf --enable-debug \ - --program-suffix=.emacs-${SLOT} \ - --without-carbon \ - ${myconf} || die "econf emacs failed" - - emake -j1 CC="$(tc-getCC)" || die "make emacs bootstrap failed" -} - -src_install () { - einstall || die - rm ${D}/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed" - dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die - - if use aqua ; then - einfo "Installing Carbon Emacs..." - dodir /Applications/Gentoo/Emacs.app - pushd mac/Emacs.app - tar -chf - . | ( cd ${D}/Applications/Gentoo/Emacs.app; tar -xf -) - popd - fi - - # fix info documentation - einfo "Fixing info documentation..." - dodir /usr/share/info/emacs-${SLOT} - mv ${D}/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed" - for i in ${D}/usr/share/info/* - do - if [ "${i##*/}" != emacs-${SLOT} ] ; then - mv ${i} ${i/info/info/emacs-${SLOT}}.info - gzip -9 ${i/info/info/emacs-${SLOT}}.info - fi - done - - 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/-${SLOT}.1} || die "mv man failed" - done - - dodoc BUGS ChangeLog README* - - if use gnome; then - insinto /usr/share/applications - doins ${FILESDIR}/${DFILE} || die "install desktop file faild" - fi -} - -update-alternatives() { - 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 -} - -pkg_postinst() { - use ppc-macos || update-alternatives - if use aqua && use cjk ; then - einfo - einfo "If you are going to use Japanese input method on Carbon Emacs," - einfo "put the following lines to your ~/.emacs.el" - einfo "(if (eq window-system 'mac)" - einfo " (set-keyboard-coding-system 'sjis)" - einfo - fi -} - -pkg_postrm() { - use ppc-macos || update-alternatives -} diff --git a/app-editors/emacs/files/digest-emacs-22.0.50_pre20050225 b/app-editors/emacs/files/digest-emacs-22.0.50_pre20050225 deleted file mode 100644 index 9956386abf6b..000000000000 --- a/app-editors/emacs/files/digest-emacs-22.0.50_pre20050225 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 9ebc373bbef7ee62e63b15dcca9570fe emacs--multi-tty--0--patch-301.2005-02-25.patch.gz 150653 -RMD160 4bfcd54884fb0bbb7b3bdafa86eebfab33d60c2f emacs--multi-tty--0--patch-301.2005-02-25.patch.gz 150653 -SHA256 e8688a6c2fc4d86b8af91e76cabd01022b6ea0c5271667dd1a55a00afe6fee09 emacs--multi-tty--0--patch-301.2005-02-25.patch.gz 150653 -MD5 be496a1379f0a99af537f02f423c0291 emacs-22.0.50-20050225.tar.gz 33383930 -RMD160 cf882d823cc2ac75b3bcacd83f73654fc05ccb0b emacs-22.0.50-20050225.tar.gz 33383930 -SHA256 e132ac3975a04f42e810e762283953bfe48eeb7ecafcc56f78ad32b777dbee7f emacs-22.0.50-20050225.tar.gz 33383930 -MD5 ca71ae2407325987ea3eacb7665023fe inline_patch-20041229.tar.gz 7047 -RMD160 38e456bdd11a4edcaf952181159a9b98aaf11573 inline_patch-20041229.tar.gz 7047 -SHA256 7999d75451e0dbd0e9ea078f0899ba31e475c2d5d28c32e580243eedf5aea09b inline_patch-20041229.tar.gz 7047 |