From ec550dd1d825c53823aa46902aeb38d5ca25e4ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Thu, 26 Apr 2007 08:59:31 +0000 Subject: [PATCH] Live CVS ebuild for Emacs 22 trunk. Fixed bash parameter expansion. Package-Manager: portage-2.1.2.4 --- app-editors/emacs-cvs/ChangeLog | 10 +- app-editors/emacs-cvs/Manifest | 53 ++-- .../emacs-cvs/emacs-cvs-22.0.98.ebuild | 4 +- .../emacs-cvs/emacs-cvs-22.0.99.ebuild | 4 +- .../emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild | 4 +- .../emacs-cvs/emacs-cvs-22.1.50.ebuild | 237 ++++++++++++++++++ .../emacs-cvs/emacs-cvs-23.0.0-r6.ebuild | 4 +- .../emacs-cvs/files/digest-emacs-cvs-22.1.50 | 0 8 files changed, 284 insertions(+), 32 deletions(-) create mode 100644 app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild create mode 100644 app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50 diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 83b4d9063290..96f0d9e47e07 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.113 2007/04/25 06:09:11 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.114 2007/04/26 08:59:31 ulm Exp $ + +*emacs-cvs-22.1.50 (26 Apr 2007) + + 26 Apr 2007; Ulrich Mueller emacs-cvs-22.0.98.ebuild, + emacs-cvs-22.0.99.ebuild, emacs-cvs-22.0.9999-r10.ebuild, + +emacs-cvs-22.1.50.ebuild, emacs-cvs-23.0.0-r6.ebuild: + New live CVS ebuild for Emacs 22 trunk. Fixed parameter expansion for file + name of man pages. 25 Apr 2007; Ulrich Mueller emacs-cvs-22.0.97.ebuild, emacs-cvs-23.0.0-r1.ebuild: diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index 9a59caf0421a..e51d1b7aa9a8 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -32,30 +32,34 @@ EBUILD emacs-cvs-22.0.97.ebuild 6729 RMD160 22c70db28d4ae032519fe315540b1d6dade1 MD5 57bbbe4aca499b149ebd9b26e814ee00 emacs-cvs-22.0.97.ebuild 6729 RMD160 22c70db28d4ae032519fe315540b1d6dade1b643 emacs-cvs-22.0.97.ebuild 6729 SHA256 7710604e4f71c366dd5ff9b17e4ec7e96556231c9133bba500835799964f6b38 emacs-cvs-22.0.97.ebuild 6729 -EBUILD emacs-cvs-22.0.98.ebuild 7538 RMD160 cef34069050bec208090861de3349b269ea55b96 SHA1 af85856a1d7ced9473372f986a6d9b18c476fd4f SHA256 e85b3d2f3e6c732deab6d8f67c10b7a9d05b0517774b518d95bee7c130fa7f63 -MD5 b3d225ba4b0a4cd119e32bd2d0c55dfb emacs-cvs-22.0.98.ebuild 7538 -RMD160 cef34069050bec208090861de3349b269ea55b96 emacs-cvs-22.0.98.ebuild 7538 -SHA256 e85b3d2f3e6c732deab6d8f67c10b7a9d05b0517774b518d95bee7c130fa7f63 emacs-cvs-22.0.98.ebuild 7538 -EBUILD emacs-cvs-22.0.99.ebuild 7538 RMD160 7b8d8be6f62db6143efcda17adb08f3f50ea47df SHA1 66ea978e5601455ca2b45f1efc54c1ab080d67ec SHA256 91a1ae62505efbfb2b481daad9810f2d91c13736cc1a6b2944fd91ff3488be3a -MD5 3e367c8099b9507832698a2203956470 emacs-cvs-22.0.99.ebuild 7538 -RMD160 7b8d8be6f62db6143efcda17adb08f3f50ea47df emacs-cvs-22.0.99.ebuild 7538 -SHA256 91a1ae62505efbfb2b481daad9810f2d91c13736cc1a6b2944fd91ff3488be3a emacs-cvs-22.0.99.ebuild 7538 -EBUILD emacs-cvs-22.0.9999-r10.ebuild 7869 RMD160 7942d07e5455d1b41268d6c98d602698307596e3 SHA1 1c7d0e251bf0a94ce69ed398fe63f4984736ec8e SHA256 f2ca69d7f7ee15849619aa9bdbed96b5fee8902f35a74f596ef00e25a9e1d93e -MD5 79ffc4f6d6db033eacd11c23010a4a6e emacs-cvs-22.0.9999-r10.ebuild 7869 -RMD160 7942d07e5455d1b41268d6c98d602698307596e3 emacs-cvs-22.0.9999-r10.ebuild 7869 -SHA256 f2ca69d7f7ee15849619aa9bdbed96b5fee8902f35a74f596ef00e25a9e1d93e emacs-cvs-22.0.9999-r10.ebuild 7869 +EBUILD emacs-cvs-22.0.98.ebuild 7537 RMD160 c3d6adffc1b92ea151dc14d1d9b842e35e45732b SHA1 d3b169ca54bae129d77dbc304b1f79e96c2e9379 SHA256 8379bd600c56a4eda2497ef2b57d2db7b46753a42b9d7dbfabac19376bc7ae53 +MD5 8688ec070e1b61acf6a5464ab0a77dba emacs-cvs-22.0.98.ebuild 7537 +RMD160 c3d6adffc1b92ea151dc14d1d9b842e35e45732b emacs-cvs-22.0.98.ebuild 7537 +SHA256 8379bd600c56a4eda2497ef2b57d2db7b46753a42b9d7dbfabac19376bc7ae53 emacs-cvs-22.0.98.ebuild 7537 +EBUILD emacs-cvs-22.0.99.ebuild 7537 RMD160 d8a80b5f36fcb04a317092aa165017ec24827654 SHA1 cc53194933594557a5546ff2be39ebff7532a284 SHA256 5ee7e14c388b6f7aa182cdafc589779427a2ce64ca487eeb63ab2e4ee78f3016 +MD5 a089b92712892c7712c17587b6eab513 emacs-cvs-22.0.99.ebuild 7537 +RMD160 d8a80b5f36fcb04a317092aa165017ec24827654 emacs-cvs-22.0.99.ebuild 7537 +SHA256 5ee7e14c388b6f7aa182cdafc589779427a2ce64ca487eeb63ab2e4ee78f3016 emacs-cvs-22.0.99.ebuild 7537 +EBUILD emacs-cvs-22.0.9999-r10.ebuild 7866 RMD160 c236fbb83d453acd0a6f3c7c40b36fe284f61774 SHA1 546ec7ecc3d4ad16deb2342e2e930c9584f7b84f SHA256 5045dd1f5e5febd76a6381757c0925f6cbabd1384a6eb4ffaef7a7ff9133201c +MD5 2ce1aa1fdf8387d5a6f16398867050b0 emacs-cvs-22.0.9999-r10.ebuild 7866 +RMD160 c236fbb83d453acd0a6f3c7c40b36fe284f61774 emacs-cvs-22.0.9999-r10.ebuild 7866 +SHA256 5045dd1f5e5febd76a6381757c0925f6cbabd1384a6eb4ffaef7a7ff9133201c emacs-cvs-22.0.9999-r10.ebuild 7866 +EBUILD emacs-cvs-22.1.50.ebuild 7730 RMD160 5f5914f417737f202248c2aee9c53a6dca441d32 SHA1 a1fa70d7501d7237230532f8eeee0093087f4c57 SHA256 95f4d40159ae983c9fbe22fb80064cd0d3798cc05fd8497fceef27d7f92f5bad +MD5 54deea1cde96ebdff54881ae68f0faea emacs-cvs-22.1.50.ebuild 7730 +RMD160 5f5914f417737f202248c2aee9c53a6dca441d32 emacs-cvs-22.1.50.ebuild 7730 +SHA256 95f4d40159ae983c9fbe22fb80064cd0d3798cc05fd8497fceef27d7f92f5bad emacs-cvs-22.1.50.ebuild 7730 EBUILD emacs-cvs-23.0.0-r1.ebuild 5863 RMD160 9d735adb41f82243e5f7b90e07d23bb8a42f8a1a SHA1 e8228066cf8ab0f5930479774195526f5be73b55 SHA256 3f76bc3547e6087396a3730ebc1b2b750398a6ad4ff80a3db3f1fca68213b2f3 MD5 e972070bdbccffafe4c30f921e9df45e emacs-cvs-23.0.0-r1.ebuild 5863 RMD160 9d735adb41f82243e5f7b90e07d23bb8a42f8a1a emacs-cvs-23.0.0-r1.ebuild 5863 SHA256 3f76bc3547e6087396a3730ebc1b2b750398a6ad4ff80a3db3f1fca68213b2f3 emacs-cvs-23.0.0-r1.ebuild 5863 -EBUILD emacs-cvs-23.0.0-r6.ebuild 7932 RMD160 019fd1b3ccf212f4e0c6b1cc81cf5a9874ded389 SHA1 9463eba9178940aa3bea7ef1abae7dcb19bf467c SHA256 507155608ef4df8cabe02088d1aaa1db84a50646dfda6a3b71e40b746e3a109d -MD5 ac223f62f36fda9dc3eb0be0d781cc5a emacs-cvs-23.0.0-r6.ebuild 7932 -RMD160 019fd1b3ccf212f4e0c6b1cc81cf5a9874ded389 emacs-cvs-23.0.0-r6.ebuild 7932 -SHA256 507155608ef4df8cabe02088d1aaa1db84a50646dfda6a3b71e40b746e3a109d emacs-cvs-23.0.0-r6.ebuild 7932 -MISC ChangeLog 22357 RMD160 7b1bec750916d5b1a2dff422d137148b9c0484e2 SHA1 4ceebc86e1978091d81fe7a62f6d462c768811ef SHA256 a0ca3236bcedaabfeab19f7a2aa04a6c9e2bd133131f4f7abe640c51fb83ec0d -MD5 c6e87459d628744214007ac329267c51 ChangeLog 22357 -RMD160 7b1bec750916d5b1a2dff422d137148b9c0484e2 ChangeLog 22357 -SHA256 a0ca3236bcedaabfeab19f7a2aa04a6c9e2bd133131f4f7abe640c51fb83ec0d ChangeLog 22357 +EBUILD emacs-cvs-23.0.0-r6.ebuild 7931 RMD160 672ed55ff160b65aaa10de09be31f1b032b563e0 SHA1 e2dbf4c594a005c115ec8820ecb3f7470df50718 SHA256 85849274a14f6cf6dfc1b9897d1f9576833c431f441da0748ab66bb99456e6f2 +MD5 fbd86c6222985e96b9faa2cc52255d40 emacs-cvs-23.0.0-r6.ebuild 7931 +RMD160 672ed55ff160b65aaa10de09be31f1b032b563e0 emacs-cvs-23.0.0-r6.ebuild 7931 +SHA256 85849274a14f6cf6dfc1b9897d1f9576833c431f441da0748ab66bb99456e6f2 emacs-cvs-23.0.0-r6.ebuild 7931 +MISC ChangeLog 22680 RMD160 a47d070744854e7f7505d5f1806ff8f30960367d SHA1 9a42d4c6102b0614cf07ab83615b67ab1fb6fd37 SHA256 607f6ae0ddc7f2276cf4fa4d45022f02f248273fe1090bc1ea9739696616f63d +MD5 c24f51baab31b7f76d14656eba95bd99 ChangeLog 22680 +RMD160 a47d070744854e7f7505d5f1806ff8f30960367d ChangeLog 22680 +SHA256 607f6ae0ddc7f2276cf4fa4d45022f02f248273fe1090bc1ea9739696616f63d ChangeLog 22680 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -72,6 +76,9 @@ SHA256 aa8d54b09b722e8720e8efe10c45d3efd315dc8b7c89c0ab57877601f3327e8e files/di MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.9999-r10 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.9999-r10 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.9999-r10 0 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.1.50 0 +RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.1.50 0 +SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.1.50 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r1 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r1 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r1 0 @@ -81,7 +88,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) -iD8DBQFGLvEROeoy/oIi7uwRAvPdAKClaTryIcy7yZ+pXdJb7+qJDL0xRgCgzUR6 -13hg2eIQObhhWqXOMVirdNI= -=oDTe +iD8DBQFGMGp9Oeoy/oIi7uwRAjJ5AJ9yNS1yyBBQkqIMh1tyQ2CHVrSW8wCfUshn +9iV1hNAHP0vKIX8Djw9Bcmg= +=h/XC -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild index 2f12db2c0048..a1c144e2ff5c 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.98.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-cvs/emacs-cvs-22.0.98.ebuild,v 1.7 2007/04/20 19:45:36 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild,v 1.8 2007/04/26 08:59:31 ulm Exp $ WANT_AUTOCONF="2.61" WANT_AUTOMAKE="latest" @@ -155,7 +155,7 @@ src_install () { # 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" + mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv man failed" done # avoid collision between slots, see bug #169033 e.g. diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild index a99d94590b31..3efb5f040500 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.99.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-cvs/emacs-cvs-22.0.99.ebuild,v 1.1 2007/04/24 03:24:06 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild,v 1.2 2007/04/26 08:59:31 ulm Exp $ WANT_AUTOCONF="2.61" WANT_AUTOMAKE="latest" @@ -155,7 +155,7 @@ src_install () { # 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" + mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv man failed" done # avoid collision between slots, see bug #169033 e.g. diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild index ea0c6d865889..d1e22d5b4632 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.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-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.8 2007/04/24 07:57:22 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.9 2007/04/26 08:59:31 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -167,7 +167,7 @@ src_install () { # 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" + mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv man failed" done # avoid collision between slots, see bug #169033 e.g. diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild new file mode 100644 index 000000000000..7ff82973580d --- /dev/null +++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild @@ -0,0 +1,237 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.1 2007/04/26 08:59:31 ulm Exp $ + +ECVS_AUTH="pserver" +ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" +ECVS_MODULE="emacs" +ECVS_BRANCH="HEAD" +ECVS_LOCALNAME="emacs" + +WANT_AUTOCONF="2.61" +WANT_AUTOMAKE="latest" + +inherit autotools cvs elisp-common eutils flag-o-matic + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +SRC_URI="" +HOMEPAGE="http://www.gnu.org/software/emacs/" +IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm" + +RESTRICT="${RESTRICT} nostrip" + +X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps" + +RDEPEND="sys-libs/ncurses + >=app-admin/eselect-emacs-0.7-r1 + sys-libs/zlib + hesiod? ( net-dns/hesiod ) + spell? ( || ( app-text/ispell app-text/aspell ) ) + alsa? ( media-sound/alsa-headers ) + X? ( $X_DEPEND + 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? ( x11-libs/openmotif ) ) + !motif? ( lesstif? ( x11-libs/lesstif ) ) )" + +DEPEND="${RDEPEND} + gzip-el? ( app-arch/gzip )" + +PROVIDE="virtual/emacs virtual/editor" + +SLOT="22" +LICENSE="GPL-2 FDL-1.2" +KEYWORDS="~amd64 ~sparc ~x86" +S="${WORKDIR}/${ECVS_LOCALNAME}" +EMACS_SUFFIX="emacs-${SLOT}-cvs" + +src_unpack() { + cvs_src_unpack + + cd "${S}" + # 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=$(grep 'defconst[ ]*emacs-version' lisp/version.el \ + | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') + [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" + echo + einfo "Emacs version number is ${FULL_VERSION}" + echo + + 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 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 + + epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch" + epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" + # ALSA is detected and used even if not requested by the USE=alsa flag. + # So remove the automagic check + use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection.patch" + + eautoreconf +} + +src_compile() { + export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 + ALLOWED_FLAGS="" + strip-flags + unset LDFLAGS + 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 + # GTK+ is the default toolkit if USE=gtk is chosen with other possibilities. + # Emacs upstream thinks this should be standard policy on all + # distributions + myconf="${myconf} --with-x" + myconf="${myconf} $(use_with xpm)" + myconf="${myconf} $(use_with toolkit-scroll-bars)" + myconf="${myconf} $(use_with jpeg) $(use_with tiff)" + myconf="${myconf} $(use_with gif) $(use_with png)" + if use gtk; then + echo + einfo "Configuring to build with GTK support, disabling all other toolkits" + echo + 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} --without-gtk" + myconf="${myconf} --with-x-toolkit=motif" + elif use lesstif; then + einfo "Configuring to build with lesstif toolkit support" + myconf="${myconf} --without-gtk" + myconf="${myconf} --with-x-toolkit=motif" + fi + else + myconf="${myconf} --without-x" + fi + + # $(use_with hesiod) is not possible, as "--without-hesiod" breaks the build + # system (has been reported upstream) + use hesiod && myconf="${myconf} --with-hesiod" + + econf \ + --program-suffix=-${EMACS_SUFFIX} \ + --without-carbon \ + ${myconf} || die "econf emacs failed" + + emake CC="$(tc-getCC) " bootstrap \ + || die "make bootstrap failed." +} + +src_install () { + emake install DESTDIR="${D}" || die "make install failed" + + 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 info documentation to the correct place + einfo "Fixing info documentation..." + dodir /usr/share/info/${EMACS_SUFFIX} + mv "${D}"/usr/share/info/{,${EMACS_SUFFIX}/}dir || die "mv dir failed" + for i in "${D}"/usr/share/info/* + do + if [ "${i##*/}" != ${EMACS_SUFFIX} ] ; then + mv ${i} ${i/info/info/${EMACS_SUFFIX}}.info + fi + 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_SUFFIX}.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//' >00${PN}-${SLOT}-gentoo.el <" emacs-version) +X (setq find-function-C-source-directory +X "/usr/share/emacs/${FULL_VERSION}/src")) +EOF + elisp-site-file-install 00${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_SUFFIX} 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 + echo +} + +pkg_postinst() { + test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el || + cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el + + elisp-site-regen + emacs-infodir-rebuild + eselect emacs update --if-unset + + 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. Man and info pages are automatically" + elog "redirected, so you are to test emacs-cvs along with the stable" + elog "release. \"man emacs.eselect\" for details." +} + +pkg_postrm() { + elisp-site-regen + emacs-infodir-rebuild + eselect emacs update --if-unset +} diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild index c3843f6a2e37..3fd9a7cb99ba 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-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-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.6 2007/04/20 19:45:36 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.7 2007/04/26 08:59:31 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -171,7 +171,7 @@ src_install () { # 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" + mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv man failed" done # avoid collision between slots, see bug #169033 e.g. diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.1.50 new file mode 100644 index 000000000000..e69de29bb2d1 -- 2.26.2