From: Ulrich Müller Date: Tue, 24 Apr 2007 03:24:06 +0000 (+0000) Subject: Version bump to 22.0.99. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9fc8e3e8e1ba52c918465480d1db83f72da4c81;p=gentoo.git Version bump to 22.0.99. Package-Manager: portage-2.1.2.4 --- diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 67c0d4447242..b0a3dbe7a1d8 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,11 @@ # 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.110 2007/04/20 19:45:36 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.111 2007/04/24 03:24:06 ulm Exp $ + +*emacs-cvs-22.0.99 (24 Apr 2007) + + 24 Apr 2007; Ulrich Mueller +emacs-cvs-22.0.99.ebuild: + Version bump. 20 Apr 2007; Ulrich Mueller emacs-cvs-22.0.98.ebuild, -emacs-cvs-22.0.9999-r7.ebuild, emacs-cvs-22.0.9999-r10.ebuild, diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index 2da2647614b7..549f2357fdba 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -27,6 +27,7 @@ RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 files/emacs.desktop.in 236 SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/emacs.desktop.in 236 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 +DIST emacs-22.0.99.tar.gz 38105148 RMD160 f405bfd29ede30103485cf4b39f00f6d8de28fed SHA1 95c699a9d09027a96c09dfebbf7c027dce4adbd3 SHA256 03711c96b0be87944bab3a40478e68970066f85303970d1d0d0d1438609f1b15 EBUILD emacs-cvs-22.0.97.ebuild 6643 RMD160 27e101617290ac9885a229e83ddc0e13092cd3cb SHA1 52530fd96c414b2cac12ff4576af3acb7d6e41f8 SHA256 5606e1ab0e975cc7162c93a65247718266617e1ca52a50c3e8c930d919ed95e7 MD5 992f42942a9163e96939d9832756f0ea emacs-cvs-22.0.97.ebuild 6643 RMD160 27e101617290ac9885a229e83ddc0e13092cd3cb emacs-cvs-22.0.97.ebuild 6643 @@ -35,6 +36,10 @@ EBUILD emacs-cvs-22.0.98.ebuild 7538 RMD160 cef34069050bec208090861de3349b269ea5 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 7860 RMD160 f3361801f884ea884086d231eee8d3f43e8385d2 SHA1 ffc128d102c47ded208a7e4b5f957a834e45757d SHA256 2c62f1fd38c6ea5d24cc550916a882876e6fc348fe8727332dd2e70c7f7898f7 MD5 aaa6ae72c62651d913fef37c708cfb1b emacs-cvs-22.0.9999-r10.ebuild 7860 RMD160 f3361801f884ea884086d231eee8d3f43e8385d2 emacs-cvs-22.0.9999-r10.ebuild 7860 @@ -47,10 +52,10 @@ EBUILD emacs-cvs-23.0.0-r6.ebuild 7932 RMD160 019fd1b3ccf212f4e0c6b1cc81cf5a9874 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 21917 RMD160 c10b55f8e75e51b89e9d82e2e6c2237e462ef154 SHA1 ce22f81c66fb674f77241f77ad2cf19d575c6e2e SHA256 936cce8275a799ccebcf1c39efa33dc7930279bd75bd54e568ec102052bc4c91 -MD5 e83efb34b600a4ce4ffb4ead31329bf3 ChangeLog 21917 -RMD160 c10b55f8e75e51b89e9d82e2e6c2237e462ef154 ChangeLog 21917 -SHA256 936cce8275a799ccebcf1c39efa33dc7930279bd75bd54e568ec102052bc4c91 ChangeLog 21917 +MISC ChangeLog 22042 RMD160 d517bae07fb6ab703334b5bc6dfe07a76030f192 SHA1 e365376fab133742e7c1100886e4475e40a6b6f6 SHA256 b098767677fc37c747de8c4b017f7374e23a45de826334c32822eadc828fb812 +MD5 8a59b59f1430c4d6cded8030784b03f9 ChangeLog 22042 +RMD160 d517bae07fb6ab703334b5bc6dfe07a76030f192 ChangeLog 22042 +SHA256 b098767677fc37c747de8c4b017f7374e23a45de826334c32822eadc828fb812 ChangeLog 22042 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158 @@ -61,6 +66,9 @@ SHA256 2cf2e7a1662db28db007818b2a58d1a4156216dcfdc2f8cee0dbba49517476a3 files/di 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 4dd2110cd9b9df0f3378769222d4a79a files/digest-emacs-cvs-22.0.99 247 +RMD160 a2718e7178826e47bb7821ef9f6165d8b25559a5 files/digest-emacs-cvs-22.0.99 247 +SHA256 aa8d54b09b722e8720e8efe10c45d3efd315dc8b7c89c0ab57877601f3327e8e files/digest-emacs-cvs-22.0.99 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 @@ -73,7 +81,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) -iD8DBQFGKRjnOeoy/oIi7uwRAheXAKCmSEX+ByCUu8j9UfXH8MRDHGN/0gCgr21k -E3t79j/ip92p2FzeDaqioIk= -=Csx2 +iD8DBQFGLXjhOeoy/oIi7uwRAlxFAJ9ZkIzXLw7oqomJzuuKu/d5cVki8ACfQVDr +annOryqbGVC8A6pz1nzEUnk= +=0gED -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild new file mode 100644 index 000000000000..a99d94590b31 --- /dev/null +++ b/app-editors/emacs-cvs/emacs-cvs-22.0.99.ebuild @@ -0,0 +1,230 @@ +# 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 $ + +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} + 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="~amd64 ~sparc ~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}-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-${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 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" + 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/files/digest-emacs-cvs-22.0.99 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.99 new file mode 100644 index 000000000000..87795999f711 --- /dev/null +++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.99 @@ -0,0 +1,3 @@ +MD5 f0f6c5e4163113f5e292e7b03b078aa9 emacs-22.0.99.tar.gz 38105148 +RMD160 f405bfd29ede30103485cf4b39f00f6d8de28fed emacs-22.0.99.tar.gz 38105148 +SHA256 03711c96b0be87944bab3a40478e68970066f85303970d1d0d0d1438609f1b15 emacs-22.0.99.tar.gz 38105148