From: Ulrich Müller Date: Tue, 17 Apr 2007 04:58:27 +0000 (+0000) Subject: Version bump to 22.0.98. Taken from Emacs overlay. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e33fedf049d13eead76aab84fb4b9eff7a6bc259;p=gentoo.git Version bump to 22.0.98. Taken from Emacs overlay. Package-Manager: portage-2.1.2.4 --- diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 5b6485d3a199..f53a65914740 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,16 @@ # 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.102 2007/04/16 20:55:03 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.103 2007/04/17 04:58:27 ulm Exp $ + +*emacs-cvs-22.0.98 (17 Apr 2007) + + 17 Apr 2007; Ulrich Mueller +emacs-cvs-22.0.98.ebuild: + Taken from Emacs overlay: Prepare for new eselect module; new sound and + hesiod USE flags; dropped gnome USE flag; removed font dependencies for X; + suffix of emacs executable changed from .emacs- to -emacs- for better + compatibility with XEmacs; SLOT changed to 22. Request AUTOCONF 2.61 instead + of latest, fixes bug #170969. Remove colliding files between slots, fixes + bug #169033. 16 Apr 2007; Ulrich Mueller -files/emacs-22.0.50.desktop, -files/emacs-23.0.0.desktop, -files/50emacs-23.0.0.envd, diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index f4a483973cbc..1db628d945c6 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -23,6 +23,7 @@ RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 files/emacs.desktop.in 236 SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/emacs.desktop.in 236 DIST emacs-22.0.96.tar.gz 37846686 RMD160 d980f7f8ec6c646a9b741718284b081987f9d73c SHA1 e2942bdbf693a0814fcc3b34d5ae55765d5d4ad8 SHA256 a9fa904e00e09d8b68e701edda208bd274053d26d0b50d97d6c977084e5c307d DIST emacs-22.0.97.tar.gz 37900456 RMD160 3bd5abe6fdf4e1574b6fda4b2e85cfbf171fbab4 SHA1 60a50581ac93fc850225a929cc0c04dec0e51f36 SHA256 1b2cd679a1cbb1b6971291beac5d68ae55be538691c1fc8164f936899b8a913b +DIST emacs-22.0.98.tar.gz 38144204 RMD160 ca6b2914509653b8b8b575d33362ea7b4ccf9823 SHA1 ed8bc3c5000e6a9e72c1f876d906a22c3eb6eb08 SHA256 c3c5ba8231abfcba060531dafe34b6e2c51681b6dc60164d6d3c8009051faab7 EBUILD emacs-cvs-22.0.96.ebuild 6643 RMD160 54c533ada26f62bca9788950f84652612c1ccd9c SHA1 264b7d44d33c829da6dc1043b7f35bf611cbb7e3 SHA256 5a7ea1b265eee7be16812f93e785b999a5661ab5a082ebe57650e911e99dbb33 MD5 a623d23027c21407fae83d7fa07d4925 emacs-cvs-22.0.96.ebuild 6643 RMD160 54c533ada26f62bca9788950f84652612c1ccd9c emacs-cvs-22.0.96.ebuild 6643 @@ -31,6 +32,10 @@ EBUILD emacs-cvs-22.0.97.ebuild 6643 RMD160 27e101617290ac9885a229e83ddc0e13092c MD5 992f42942a9163e96939d9832756f0ea emacs-cvs-22.0.97.ebuild 6643 RMD160 27e101617290ac9885a229e83ddc0e13092cd3cb emacs-cvs-22.0.97.ebuild 6643 SHA256 5606e1ab0e975cc7162c93a65247718266617e1ca52a50c3e8c930d919ed95e7 emacs-cvs-22.0.97.ebuild 6643 +EBUILD emacs-cvs-22.0.98.ebuild 7521 RMD160 52717473a2b0111bd4a851b430c1f20621cc1fff SHA1 63d4a4e0113eaebbf583157dd94877c3c35088f5 SHA256 f331ea6f145504eb5fa7a391da7bde5983745f522305eda7d61c0de303ee989d +MD5 a5ea9b8a5e9550b509adfc3526fd7d00 emacs-cvs-22.0.98.ebuild 7521 +RMD160 52717473a2b0111bd4a851b430c1f20621cc1fff emacs-cvs-22.0.98.ebuild 7521 +SHA256 f331ea6f145504eb5fa7a391da7bde5983745f522305eda7d61c0de303ee989d emacs-cvs-22.0.98.ebuild 7521 EBUILD emacs-cvs-22.0.9999-r10.ebuild 7684 RMD160 7ec0c144203a0f92f306282ddcb9402e7e1a837e SHA1 e6dcd52440112cf156f8c8844a2d33fd7a341dc3 SHA256 775143b02a512ea1e40cf8c8d94ee2e0ab0ccab63c52146a5800aabdf22127a8 MD5 98d0997c24dc3669c9f9879d927ec5ca emacs-cvs-22.0.9999-r10.ebuild 7684 RMD160 7ec0c144203a0f92f306282ddcb9402e7e1a837e emacs-cvs-22.0.9999-r10.ebuild 7684 @@ -51,10 +56,10 @@ EBUILD emacs-cvs-23.0.0-r6.ebuild 7921 RMD160 bd76b87a60c0db6bf4fab495139e8db5a9 MD5 bccd4b6760ccc165854cdf5a9b359893 emacs-cvs-23.0.0-r6.ebuild 7921 RMD160 bd76b87a60c0db6bf4fab495139e8db5a9f7a3d2 emacs-cvs-23.0.0-r6.ebuild 7921 SHA256 8f4f518b4f61b4371fe052174d4d63214ba7763ecceb02d89a964a3cc327d7f7 emacs-cvs-23.0.0-r6.ebuild 7921 -MISC ChangeLog 19838 RMD160 86cfd427b9fa922e7994c760f15837a47e3824d7 SHA1 b233f5cc91b95482efda6401b01da5b813ccb9e6 SHA256 8e6f4c78d4835aec44bd720a28bbab6133ae05988504dade3b9ade04df72dd70 -MD5 cffc17a3a1540abec2a25ac16deb451e ChangeLog 19838 -RMD160 86cfd427b9fa922e7994c760f15837a47e3824d7 ChangeLog 19838 -SHA256 8e6f4c78d4835aec44bd720a28bbab6133ae05988504dade3b9ade04df72dd70 ChangeLog 19838 +MISC ChangeLog 20340 RMD160 8fdab3b3510be7cfd9df63ae45605dea31d385b1 SHA1 046a1cfa5f0cfd1f808ab93d529561f6aa549739 SHA256 1d6f276315efd91d602bac201fb16291c74736152928c538429d930d30d1f835 +MD5 80b5efea08eda352b6fc37bf04b3a2dc ChangeLog 20340 +RMD160 8fdab3b3510be7cfd9df63ae45605dea31d385b1 ChangeLog 20340 +SHA256 1d6f276315efd91d602bac201fb16291c74736152928c538429d930d30d1f835 ChangeLog 20340 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -65,6 +70,9 @@ SHA256 1319658529d77893d7ccf241ca85d5e8c0805818f9ec7a8f92b99fff821c92c1 files/di MD5 a45c1cc2431a74255c981575cf033f94 files/digest-emacs-cvs-22.0.97 247 RMD160 1a034da94a1d0ea15deae209e53da79099b0ed97 files/digest-emacs-cvs-22.0.97 247 SHA256 2cf2e7a1662db28db007818b2a58d1a4156216dcfdc2f8cee0dbba49517476a3 files/digest-emacs-cvs-22.0.97 247 +MD5 ef3bbd366e19774192bc6661663d09f6 files/digest-emacs-cvs-22.0.98 247 +RMD160 d4113eed932fd6a40f146beef15727488c033005 files/digest-emacs-cvs-22.0.98 247 +SHA256 753b26a456c597fb729acb3697a511848094901478febd88498f463a8eddb39f files/digest-emacs-cvs-22.0.98 247 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 @@ -83,7 +91,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) -iD8DBQFGI+MtOeoy/oIi7uwRAriLAKCVd2Nd35HZ11m5rYDSK0XVdljcWgCfVKLJ -EiKgGFjJmZVQYoJsNfj2Q7c= -=Lqwy +iD8DBQFGJFR+Oeoy/oIi7uwRAqr7AJ93Dnj4K3ga3qdC1DlnMyXtAqPE/wCeJVqM +5xFlNy/QB0gSGkIlS2FsTRw= +=zdlQ -----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 new file mode 100644 index 000000000000..14b91754a417 --- /dev/null +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.98.ebuild @@ -0,0 +1,229 @@ +# 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.1 2007/04/17 04:58:27 ulm Exp $ + +WANT_AUTOCONF="2.61" +WANT_AUTOMAKE="latest" + +inherit autotools elisp-common eutils flag-o-matic + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +SRC_URI="ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz" +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} + X? ( !gtk? ( Xaw3d? ( x11-libs/libXaw ) ) ) + gzip-el? ( app-arch/gzip )" + +PROVIDE="virtual/emacs virtual/editor" + +SLOT="22" +# 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}" +LICENSE="GPL-2 FDL-1.2" +KEYWORDS="~x86" +S="${WORKDIR}/emacs-${PV}" + +src_unpack() { + unpack ${A} + + cd "${S}" + 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}-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, 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" + myconf="${myconf} --with-x-toolkit=lucid" + 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-${SLOT} \ + --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-${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..." + 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 + 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-${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//' >00emacs-cvs-${SLOT}-gentoo.el <" emacs-version) +X (setq find-function-C-source-directory +X "/usr/share/emacs/${FULL_VERSION}/src")) +EOF + elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el + fi + + dodoc AUTHORS BUGS CONTRIBUTE MAINTAINERS 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 + 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 + + if [[ "$(readlink ${ROOT}/usr/bin/emacs)" == emacs.emacs-${SLOT}* ]]; then + # transition from pre-eselect revision + eselect emacs set emacs-${SLOT} + else + eselect emacs update --if-unset + 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 the Emacs eselect module" + elog "Man and info pages are automatically redirected, so you are to test emacs-cvs along with the" + elog "stable release" +} + +pkg_postrm() { + elisp-site-regen + emacs-infodir-rebuild + eselect emacs update --if-unset +} diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.98 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.98 new file mode 100644 index 000000000000..e05c6a06aefd --- /dev/null +++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.98 @@ -0,0 +1,3 @@ +MD5 d01226062d48c18fa0b22e4d0dccecc5 emacs-22.0.98.tar.gz 38144204 +RMD160 ca6b2914509653b8b8b575d33362ea7b4ccf9823 emacs-22.0.98.tar.gz 38144204 +SHA256 c3c5ba8231abfcba060531dafe34b6e2c51681b6dc60164d6d3c8009051faab7 emacs-22.0.98.tar.gz 38144204