diff options
author | Ulrich Müller <ulm@gentoo.org> | 2008-03-26 14:36:57 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2008-03-26 14:36:57 +0000 |
commit | 881af27e3b6e9c2f8581c29fdfdc2535f71dde8d (patch) | |
tree | 968bd32416396ab7b995237534762ddb6fce8e87 /app-editors | |
parent | hide stderr when testing ggz-config, bug #214878 (diff) | |
download | historical-881af27e3b6e9c2f8581c29fdfdc2535f71dde8d.tar.gz historical-881af27e3b6e9c2f8581c29fdfdc2535f71dde8d.tar.bz2 historical-881af27e3b6e9c2f8581c29fdfdc2535f71dde8d.zip |
Version bump.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/emacs/ChangeLog | 7 | ||||
-rw-r--r-- | app-editors/emacs/Manifest | 10 | ||||
-rw-r--r-- | app-editors/emacs/emacs-22.2.ebuild | 252 |
3 files changed, 264 insertions, 5 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 9cb2b622c855..5dba5d4640b8 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.232 2008/02/02 21:08:12 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.233 2008/03/26 14:36:57 ulm Exp $ + +*emacs-22.2 (26 Mar 2008) + + 26 Mar 2008; Ulrich Mueller <ulm@gentoo.org> +emacs-22.2.ebuild: + Version bump. 02 Feb 2008; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r4.ebuild, emacs-21.4-r14.ebuild, emacs-22.1-r3.ebuild: diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index b0b01bc91dc2..7813f33b11ad 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -14,16 +14,18 @@ DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc DIST emacs-21.4-patches-1.tar.bz2 9598 RMD160 a838e9d49fbc23e2c7f000a96fca06f0e347ab47 SHA1 ef15a55f94fc01e99cc386273bebdfe363efe15c SHA256 75c8a3d9f420e9ab3f426b39b0f73299a22d399415cbd4190dfda63b6e65f3a1 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 DIST emacs-22.1.tar.gz 38172226 RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 SHA1 327664173eabe5db49d4e7e4a4b1794577af902e SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0 +DIST emacs-22.2.tar.gz 38694318 RMD160 ec2da7cd7065cbd76773e544da1d1495f33d6ea1 SHA1 7a371332cb8400d44e8eb31f19e432bbc93523a0 SHA256 216839e1fb38ca4f2ed0a07689fb47ee80d90845f34e0a56fe781d6aa462e367 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b EBUILD emacs-18.59-r4.ebuild 2509 RMD160 b503dc589880e0491c1959650146d977fc49f376 SHA1 fa57551797dbe663b776e1d7a63a35e72f3e8b07 SHA256 aa8b397fe71e105cfdcd74a698d2a8b46ee3df357ebb4d4ffbcc774d3edf1e6b EBUILD emacs-21.4-r14.ebuild 5623 RMD160 b02817c3ff91ceb620e8ec5f4ba4469b4a23c560 SHA1 fa57863e6925145dc184e80a60cffaea4f0cb0b5 SHA256 9459ddc0527722373dceaafad137fd0d6a69d6eed0992d7b29ccc879961a99ce EBUILD emacs-22.1-r3.ebuild 8075 RMD160 25895a9f231fb413711035e87dc4d90c210061ed SHA1 1ee710fe7d692813e13c9d7c3ff18659bb3564ab SHA256 7562419ba8aa72f3d89ec45b5f20e8f9f376817beb2a63d1d7509d52216105c0 -MISC ChangeLog 34141 RMD160 b714374c93ef62c10ef8c2e9d24baf6ffd03e386 SHA1 6ed0159fe57affd3ee8254d5d0c7949585150e46 SHA256 c0782d222f2cd3b11b769181da47cee6908dc360355bab465ed7f7f3a0dc0b12 +EBUILD emacs-22.2.ebuild 7873 RMD160 cce123d87c985234aebb6ff3d1c5aa7f99ed4144 SHA1 30c915799945cf570a48da0d4b741fcea2775811 SHA256 3fad45ce7bf4ff6b3c45b12a4a2a9fe7c70edb28c8e5bb2f2066322f4bf0ab70 +MISC ChangeLog 34252 RMD160 f5bf32ea266c777a4ef791581146cb0a19b0de46 SHA1 297e495c7ce48afe61b5fb7517043d86de7c9890 SHA256 7a67815ed67051c8739c8eff07e6aa1b86f6458e0581916acc181a67c4c32489 MISC metadata.xml 1213 RMD160 7df0bb43f41ecf811a37b60ee3cbefc7f798e840 SHA1 e545b177be5578569de6410bfea01cffe6003611 SHA256 1e71985b81478302fb03a9af91293f7dfad07aa7b31c4cc226170b45d573ce13 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (GNU/Linux) -iEYEARECAAYFAkfgxKsACgkQOeoy/oIi7uzMqACgm9JZDmsqO07+kqPPJsxJ4REq -RawAn2qu8E7fNwLlviXH3e+ndXOqirLq -=yU7o +iEYEARECAAYFAkfqX2sACgkQOeoy/oIi7uxykACgifqiap/dzEGCkufbxxAt3wBg +7BwAn1x7b6kBV+xxUhqC1XfpGOs/epDu +=l1f/ -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-22.2.ebuild b/app-editors/emacs/emacs-22.2.ebuild new file mode 100644 index 000000000000..a12c8cb8d6ef --- /dev/null +++ b/app-editors/emacs/emacs-22.2.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.2.ebuild,v 1.1 2008/03/26 14:36:57 ulm Exp $ + +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" +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/ispell app-text/aspell ) ) + 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? ( virtual/motif ) + ) + ) + )" + +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}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/emacs-22.1-Xaw3d-headers.patch" + epatch "${FILESDIR}/emacs-22.1-freebsd-sparc.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_compile() { + export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 + 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 GTK+ support" + myconf="${myconf} --with-x-toolkit=gtk" + elif use Xaw3d; then + einfo "Configuring to build with Xaw3d (athena) support" + myconf="${myconf} --with-x-toolkit=athena" + myconf="${myconf} --without-gtk" + elif use motif; then + einfo "Configuring to build with motif toolkit support" + 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 + 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" + + emake CC="$(tc-getCC)" || die "emake failed" + + einfo "Recompiling patched lisp files..." + (cd lisp; emake recompile) || die "emake recompile failed" + (cd src; emake versionclean) + 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 + einfo "Fixing info documentation ..." + 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 + einfo "Fixing manpages ..." + 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 /var/lib/games/emacs/ + + 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] + sed 's/^X//' >10${PN}-${SLOT}-gentoo.el <<-EOF + + ;;; ${PN}-${SLOT} site-lisp configuration + + (if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) + X (setq find-function-C-source-directory + X "/usr/share/emacs/${FULL_VERSION}/src")) + EOF + elisp-site-file-install 10${PN}-${SLOT}-gentoo.el + fi + + 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 + einfo "Regenerating Info directory index in ${infodir} ..." + rm -f "${ROOT}"${infodir}/dir{,.*} + for f in "${ROOT}"${infodir}/*.info*; do + [[ ${f##*/} == *[0-9].info* ]] \ + || 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 + + if use X; then + elog "You need to install some fonts for Emacs. Under monolithic" + elog "XFree86/Xorg you typically had such fonts installed by default." + elog "With modular Xorg, you will have to perform this step yourself." + 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 + emacs-infodir-rebuild + eselect emacs update ifunset +} |