diff options
author | Ulrich Müller <ulm@gentoo.org> | 2011-01-30 08:55:47 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2011-01-30 08:55:47 +0000 |
commit | d562a0165da550bd1d5b202ebc2a2244e50c6491 (patch) | |
tree | 3f24ffd8eb55520888b8d5dbafd5c86824232b68 /app-editors/emacs | |
parent | Typo. (diff) | |
download | emacs-d562a0165da550bd1d5b202ebc2a2244e50c6491.tar.gz emacs-d562a0165da550bd1d5b202ebc2a2244e50c6491.tar.bz2 emacs-d562a0165da550bd1d5b202ebc2a2244e50c6491.zip |
Moved to Portage tree.
svn path=/emacs-overlay/; revision=1575
Diffstat (limited to 'app-editors/emacs')
-rw-r--r-- | app-editors/emacs/ChangeLog | 50 | ||||
-rw-r--r-- | app-editors/emacs/Manifest | 12 | ||||
-rw-r--r-- | app-editors/emacs/emacs-21.4-r23.ebuild | 183 | ||||
-rw-r--r-- | app-editors/emacs/emacs-22.3-r7.ebuild | 259 | ||||
-rw-r--r-- | app-editors/emacs/emacs-23.2-r3.ebuild | 343 | ||||
-rw-r--r-- | app-editors/emacs/metadata.xml | 33 |
6 files changed, 0 insertions, 880 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog deleted file mode 100644 index cbd8276..0000000 --- a/app-editors/emacs/ChangeLog +++ /dev/null @@ -1,50 +0,0 @@ -# ChangeLog for app-editors/emacs -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 26 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.2-r3.ebuild, - -files/emacs-23.2-gnu-linux-crt-dir.patch, - -files/emacs-23.2-ns-appdirs.patch: - Patches moved into patchset. - - 25 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.2-r3.ebuild, - +files/emacs-23.2-gnu-linux-crt-dir.patch: - Honour the --with-crt-dir configure option also on 32 bit architectures, - fixes bug 350532. - - 25 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.2-r3.ebuild: - Omit trailing slash from crtdir. - - 13 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.2-r3.ebuild: - Install Emacs.app with mv because doins -r does not preserve permissions. - - 11 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.2-r3.ebuild, - +files/emacs-23.2-ns-appdirs.patch: - Incorporate changes from Alt/Prefix overlay and from bug 268793. Thanks to - Matsui Tetsushi <VED03370@nifty.ne.jp> and Fabian Groffen. - - 02 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r23.ebuild, - emacs-22.3-r7.ebuild, emacs-23.2-r3.ebuild: - Some die statements are not needed in EAPI 4. - - 01 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r23.ebuild, - emacs-22.3-r7.ebuild, emacs-23.2-r3.ebuild: - Remove unnecessary automake dependency. - -*emacs-23.2-r3 (31 Dec 2010) -*emacs-22.3-r7 (31 Dec 2010) -*emacs-21.4-r23 (31 Dec 2010) - - 31 Dec 2010; Ulrich Mueller <ulm@gentoo.org> -emacs-21.4-r22.ebuild, - +emacs-21.4-r23.ebuild, -emacs-22.3-r6.ebuild, +emacs-22.3-r7.ebuild, - -emacs-23.2-r2.ebuild, +emacs-23.2-r3.ebuild: - Don't compress GNU Info dir. Update ebuilds to EAPI 4. - -*emacs-23.2-r2 (31 Dec 2010) -*emacs-22.3-r6 (31 Dec 2010) -*emacs-21.4-r22 (31 Dec 2010) - - 31 Dec 2010; Ulrich Mueller <ulm@gentoo.org> +emacs-21.4-r22.ebuild, - +emacs-22.3-r6.ebuild, +emacs-23.2-r2.ebuild, +metadata.xml: - Copied from portage tree. - diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest deleted file mode 100644 index 331768c..0000000 --- a/app-editors/emacs/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -DIST emacs-21.4-patches-11.tar.bz2 13005 RMD160 2a55e7e102659d978e9069f56d188c91a721f468 SHA1 f1068df11532aadc38c0ebb618f9d420add3f2bb SHA256 10f76aa765ae9de34b3a36fbfa8391cb1be1dd97e0f78700623b3d9a3c68902c -DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 -DIST emacs-22.3-patches-6.tar.bz2 5278 RMD160 2a3b57cf2fbed502a2de52d3cf28c0ba6fd9470a SHA1 4752d9733cad948910a4296f032fdc878328f7cf SHA256 dd4c7f315faa2ebfc093e845d6a7610102af5974614d7352e861436499f17275 -DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16 -DIST emacs-23.2-patches-3.tar.bz2 3122 RMD160 6d008cf875916fb41d99844d90bd59c2a16cd053 SHA1 500c2c4faee31e04d108b8a2946cce98d72a9c9f SHA256 25b83ed7f2ae87fbf816e7b28c68eec723c05c6c23e999f51b0d94cc51c8c1c9 -DIST emacs-23.2.tar.bz2 38376047 RMD160 b7441be0a32e78e02f108dcb3b09b531c6849d95 SHA1 b46e6b33e1f5e24ede0ecd0d8703b64847c83946 SHA256 ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5 -DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b -EBUILD emacs-21.4-r23.ebuild 5019 RMD160 83385af5aaed6fe97262908b040346e2278a5e9d SHA1 15c3ca2917d94b8dcb6a960bb4fc2959b0e85c46 SHA256 5a1d1f0df477f371eed9c256b5070d25742f6638f9ff2bf7ab20e5abcabf90db -EBUILD emacs-22.3-r7.ebuild 7922 RMD160 c9443e4c4a89a6d8cfe736c3e06a973d56cc336c SHA1 89fa3bd31666854a9e42d9b02b06a8625213fd98 SHA256 d3fdfd8726b97aa6d2528e666aebe0d9ad39731af6a7ad34e9cfde1cec292f36 -EBUILD emacs-23.2-r3.ebuild 10944 RMD160 93e7161525e930b2498a0b66fae4ed21c0a91b35 SHA1 216280bd3912aeb7ae876bd0be2bf678d465658d SHA256 18cb8d51fa78f3eb9a24bcdcc5318f564dc2af35c7f893babb6c84676a1b6f9b -MISC ChangeLog 1923 RMD160 79dfa48f6395b937a718aa15cbfa13c7670b441f SHA1 ffca161a741443412f360106f3df8188240acae7 SHA256 fa917fe9623b1d1c27a7efbb6a37ee1cfcef6cf3cba72d1e04f4ba9b154673e1 -MISC metadata.xml 1745 RMD160 c60885ffe070e2e88f9a5b8def28fd20d05e5de3 SHA1 c4480fbafe47b334f878d9e87328e37c20cba56b SHA256 86f6e3328b4abfbf278876ab4ab7c546c5164713e736b14ad7cab4c68825d010 diff --git a/app-editors/emacs/emacs-21.4-r23.ebuild b/app-editors/emacs/emacs-21.4-r23.ebuild deleted file mode 100644 index 1189321..0000000 --- a/app-editors/emacs/emacs-21.4-r23.ebuild +++ /dev/null @@ -1,183 +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-21.4-r22.ebuild,v 1.11 2010/11/14 16:22:09 armin76 Exp $ - -EAPI=4 -WANT_AUTOMAKE="none" - -inherit flag-o-matic eutils toolchain-funcs autotools - -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.gz - mirror://gentoo/${P}-patches-11.tar.bz2 - leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )" - -LICENSE="GPL-2 FDL-1.1 BSD as-is MIT" -SLOT="21" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="X Xaw3d leim motif sendmail" - -DEPEND="sys-libs/ncurses - >=app-admin/eselect-emacs-1.2 - X? ( - x11-libs/libXext - x11-libs/libICE - x11-libs/libSM - x11-libs/libXmu - x11-libs/libXpm - x11-misc/xbitmaps - >=media-libs/giflib-4.1.0.1b - virtual/jpeg - >=media-libs/tiff-3.5.5-r3 - >=media-libs/libpng-1.2.1 - Xaw3d? ( x11-libs/Xaw3d ) - !Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) - )" - -RDEPEND="${DEPEND} - >=app-emacs/emacs-common-gentoo-1[X?] - sendmail? ( virtual/mta )" - -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" - - # 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" || die - - # custom aclocal.m4 was only needed for autoconf 2.13 and earlier - rm aclocal.m4 - eaclocal - eautoconf -} - -src_configure() { - # -fstack-protector gets internal compiler error at xterm.c (bug 33265) - filter-flags -fstack-protector -fstack-protector-all - - # 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=*" - - local myconf - if use X ; then - myconf="${myconf} - --with-x - --with-xpm - --with-jpeg - --with-tiff - --with-gif - --with-png" - - if use Xaw3d ; then - einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" - myconf="${myconf} --with-x-toolkit=athena" - use motif \ - && ewarn "USE flag \"motif\" ignored (superseded by \"Xaw3d\")" - elif use motif ; then - einfo "Configuring to build with Motif toolkit" - myconf="${myconf} --with-x-toolkit=motif" - else - # do not build emacs with any toolkit, bug 35300 - einfo "Configuring to build with no toolkit" - myconf="${myconf} --with-x-toolkit=no" - fi - else - myconf="${myconf} --without-x" - fi - - econf ${myconf} -} - -src_compile() { - export SANDBOX_ON=0 - emake CC="$(tc-getCC)" - - einfo "Recompiling patched lisp files..." - (cd lisp; emake recompile) - (cd src; emake versionclean) - emake CC="$(tc-getCC)" -} - -src_install() { - local i m - - einstall infodir="${D}/usr/share/info/emacs-${SLOT}" - - for i in "${D}"/usr/bin/* ; do - mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed" - done - mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed" - rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT} - - # 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 ${m} failed" - done - - # move info dir to avoid collisions with the dir file generated by portage - mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} \ - || die "moving info dir failed" - touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir - docompress -x /usr/share/info/emacs-${SLOT}/dir.orig - - # avoid collision between slots - rm "${D}"/usr/share/emacs/site-lisp/subdirs.el - - # fix 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 - - dodoc BUGS ChangeLog README -} - -pkg_preinst() { - # move Info dir file to correct name - local infodir=/usr/share/info/emacs-${SLOT} f - if [ -f "${D}"${infodir}/dir.orig ]; then - mv "${D}"${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 "${D}"${infodir}/dir{,.*} - for f in "${D}"${infodir}/*; do - if [[ ${f##*/} != *[0-9].info* && -e ${f} ]]; then - install-info --info-dir="${D}"${infodir} "${f}" \ - || die "install-info failed" - fi - done - fi -} - -pkg_postinst() { - eselect emacs update ifunset - - if ! use sendmail && ! has_version "virtual/mta"; then - elog "You disabled sendmail support for Emacs. If you later install" - elog "a MTA then you will need to recompile Emacs. See Bug #11104." - 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." - fi -} - -pkg_postrm() { - eselect emacs update ifunset -} diff --git a/app-editors/emacs/emacs-22.3-r7.ebuild b/app-editors/emacs/emacs-22.3-r7.ebuild deleted file mode 100644 index 245ce39..0000000 --- a/app-editors/emacs/emacs-22.3-r7.ebuild +++ /dev/null @@ -1,259 +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-22.3-r6.ebuild,v 1.12 2010/12/29 13:09:01 ulm Exp $ - -EAPI=4 -WANT_AUTOMAKE="none" - -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 - mirror://gentoo/${P}-patches-6.tar.bz2" - -LICENSE="GPL-3 FDL-1.2 BSD as-is MIT" -SLOT="22" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png sound source tiff toolkit-scroll-bars X Xaw3d +xpm" -RESTRICT="strip" - -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 ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg ) - png? ( media-libs/libpng ) - tiff? ( media-libs/tiff ) - xpm? ( x11-libs/libXpm ) - gtk? ( x11-libs/gtk+:2 ) - !gtk? ( - Xaw3d? ( x11-libs/Xaw3d ) - !Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) - ) - )" - -DEPEND="${RDEPEND} - alsa? ( dev-util/pkgconfig ) - X? ( gtk? ( dev-util/pkgconfig ) ) - gzip-el? ( app-arch/gzip )" - -RDEPEND="${RDEPEND} - !<app-editors/emacs-vcs-22.1 - >=app-emacs/emacs-common-gentoo-1[X?]" - -# 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}" -EMACS_SUFFIX="emacs-${SLOT}" -SITEFILE="20${PN}-${SLOT}-gentoo.el" - -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 - - eautoreconf -} - -src_configure() { - ALLOWED_FLAGS="" - strip-flags - filter-flags -fstack-protector -fstack-protector-all #285778 - replace-flags -O[3-9] -O2 - 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 gif) $(use_with jpeg)" - myconf="${myconf} $(use_with png) $(use_with tiff)" - 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_SUFFIX} \ - --infodir=/usr/share/info/${EMACS_SUFFIX} \ - --without-carbon \ - --with-gameuser="${GAMES_USER_DED:-games}" \ - ${myconf} -} - -src_compile() { - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - emake CC="$(tc-getCC)" -} - -src_install () { - local i m - - emake install DESTDIR="${D}" - - rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ - || die "removing duplicate emacs executable failed" - mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \ - || die "moving Emacs executable failed" - - # move man pages to the correct place - for m in "${D}"/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 "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ - || die "moving info dir failed" - touch "${D}"/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 "${D}"/usr/share/emacs/site-lisp/subdirs.el - rm "${D}"/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} "/usr/share/emacs/${FULL_VERSION}/src") - X (let ((path (getenv "INFOPATH")) - X (dir "/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`/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 AUTHORS BUGS CONTRIBUTE README -} - -pkg_preinst() { - # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [ -f "${D}"${infodir}/dir.orig ]; then - mv "${D}"${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 "${D}"${infodir}/dir{,.*} - for f in "${D}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${D}"${infodir} "${f}" \ - || die "install-info failed" - fi - done - fi -} - -pkg_postinst() { - local f - for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do - [ -e "${f}" ] || touch "${f}" - done - chown "${GAMES_USER_DED:-games}" "${ROOT}"/var/lib/games/emacs - - elisp-site-regen - eselect emacs update ifunset - - 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." - 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 - eselect emacs update ifunset -} diff --git a/app-editors/emacs/emacs-23.2-r3.ebuild b/app-editors/emacs/emacs-23.2-r3.ebuild deleted file mode 100644 index 0700570..0000000 --- a/app-editors/emacs/emacs-23.2-r3.ebuild +++ /dev/null @@ -1,343 +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.2-r2.ebuild,v 1.12 2010/12/29 13:09:01 ulm Exp $ - -EAPI=4 -WANT_AUTOMAKE="none" - -inherit autotools elisp-common eutils flag-o-matic multilib - -if [ "${PV##*.}" = "9999" ]; then - inherit bzr - EMACS_BRANCH="emacs-23" - EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EMACS_BRANCH}/" - EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}" - SRC_URI="" -else - SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 - mirror://gentoo/${P}-patches-3.tar.bz2" - # 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}" -fi - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="http://www.gnu.org/software/emacs/" - -LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode" -SLOT="23" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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 dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" -REQUIRED_USE="aqua? ( !X )" -RESTRICT="strip" - -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 ) - 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/Xaw3d ) - !Xaw3d? ( 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" - -src_prepare() { - if [ "${PV##*.}" = "9999" ]; then - FULL_VERSION=$(grep 'defconst[ ]*emacs-version' lisp/version.el \ - | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') - [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" - echo - einfo "Emacs branch: ${EMACS_BRANCH}" - einfo "Emacs version number: ${FULL_VERSION}" - [ "${FULL_VERSION%.*}" = ${PV%.*} ] \ - || die "Upstream version number changed to ${FULL_VERSION}" - echo - else - EPATCH_SUFFIX=patch epatch - fi - - 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 - filter-flags -fstack-protector -fstack-protector-all #285778 - - 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 aqua; then - einfo "Configuring to build with Cocoa support" - use X && ewarn "aqua USE flag disables X." - myconf="${myconf} --with-ns --disable-ns-self-contained" - myconf="${myconf} --without-x" - elif use X; then - myconf="${myconf} --with-x" - 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)" - myconf="${myconf} $(use_with xft)" - - if use xft; then - myconf="${myconf} $(use_with m17n-lib libotf)" - myconf="${myconf} $(use_with m17n-lib m17n-flt)" - else - myconf="${myconf} --without-libotf --without-m17n-flt" - use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect because 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; then - einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" - myconf="${myconf} --with-x-toolkit=athena" - 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 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)" - myconf="${myconf} $(use_with gpm) $(use_with dbus)" - - # 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}" \ - ${myconf} -} - -src_compile() { - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - if [ "${PV##*.}" = "9999" ]; then - emake CC="$(tc-getCC)" bootstrap - # cleanup, otherwise emacs will be dumped again in src_install - (cd src; emake versionclean) - fi - 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 - eselect emacs update ifunset - - 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/metadata.xml b/app-editors/emacs/metadata.xml deleted file mode 100644 index efef7c8..0000000 --- a/app-editors/emacs/metadata.xml +++ /dev/null @@ -1,33 +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 wide - variety of file types including plain text, source code, and HTML. - * Complete built-in documentation, including a tutorial for new users. - * Support for many languages and their scripts, including all the European - "Latin" scripts, Russian, Greek, Japanese, Chinese, Korean, Thai, - Vietnamese, Lao, Ethiopian, and some Indian scripts. - * Highly customizable, using Emacs Lisp code or a graphical customization - 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='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system - font name</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='leim'>Add support for Emacs input methods</flag> - <flag name='sendmail'>Build Emacs with MTA support</flag> - <flag name='sound'>Enable sound</flag> - <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in - preference to Emacs' own scrollbars</flag> -</use> -</pkgmetadata> |