From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1IwL2g-0003FC-HA for garchives@archives.gentoo.org; Sun, 25 Nov 2007 17:13:15 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.2/8.14.0) with SMTP id lAPHDCmc016825; Sun, 25 Nov 2007 17:13:12 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.14.2/8.14.0) with ESMTP id lAPHDADM016819 for ; Sun, 25 Nov 2007 17:13:11 GMT Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 5F3AF6569A for ; Sun, 25 Nov 2007 17:13:10 +0000 (UTC) Received: from ulm by stork.gentoo.org with local (Exim 4.60) (envelope-from ) id 1IwL2b-0001CX-6u for gentoo-commits@lists.gentoo.org; Sun, 25 Nov 2007 17:13:09 +0000 From: "Ulrich Mueller (ulm)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ulm@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-22.1-r3.ebuild emacs-21.4-r14.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog emacs-22.1-r3.ebuild emacs-21.4-r14.ebuild X-VCS-Directories: app-editors/emacs X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: Sender: Ulrich Mueller Date: Sun, 25 Nov 2007 17:13:09 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@gentoo.org X-Archives-Salt: 2489ae67-a5fa-405f-82ba-cc1c03d1dba8 X-Archives-Hash: 898553a1010861d9d90e351fbc046f2c ulm 07/11/25 17:13:09 Modified: ChangeLog Added: emacs-22.1-r3.ebuild emacs-21.4-r14.ebuild Log: Correctly format integer values, patch from upstream CVS. (Portage version: 2.1.3.19) Revision Changes Path 1.209 app-editors/emacs/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.209&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.209&content-type=text/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.208&r2=1.209 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- ChangeLog 22 Nov 2007 21:57:27 -0000 1.208 +++ ChangeLog 25 Nov 2007 17:13:08 -0000 1.209 @@ -1,6 +1,15 @@ # ChangeLog for app-editors/emacs # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.208 2007/11/22 21:57:27 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.209 2007/11/25 17:13:08 ulm Exp $ + +*emacs-22.1-r3 (25 Nov 2007) +*emacs-21.4-r14 (25 Nov 2007) + + 25 Nov 2007; Ulrich Mueller + +files/emacs-22.1-format-int.patch, +emacs-21.4-r14.ebuild, + +emacs-22.1-r3.ebuild: + Correctly format integer values, SuSE bug 342158. Patch from upstream CVS, + partially backported to Emacs 21. 22 Nov 2007; Ulrich Mueller emacs-22.1-r2.ebuild: Fix alsa dependency, thanks Flameeyes for pointing this out. 1.1 app-editors/emacs/emacs-22.1-r3.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild?rev=1.1&content-type=text/plain Index: emacs-22.1-r3.ebuild =================================================================== # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.1 2007/11/25 17:13:08 ulm Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="latest" 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-2 FDL-1.2 BSD" SLOT="22" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE="alsa gif gtk gzip-el hesiod jpeg motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm" RESTRICT="strip" X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps" RDEPEND="!=app-admin/eselect-emacs-0.7-r1 sys-libs/zlib hesiod? ( net-dns/hesiod ) spell? ( || ( app-text/ispell app-text/aspell ) ) alsa? ( media-libs/alsa-lib ) 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? ( virtual/motif ) ) ) )" DEPEND="${RDEPEND} 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}" 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}/${P}-Xaw3d-headers.patch" epatch "${FILESDIR}/${P}-freebsd-sparc.patch" epatch "${FILESDIR}/${P}-oldxmenu-qa.patch" epatch "${FILESDIR}/${P}-backup-buffer.patch" epatch "${FILESDIR}/${P}-hack-local-variables.patch" epatch "${FILESDIR}/${P}-format-int.patch" # ALSA is detected and used even if not requested by the USE=alsa flag. # So remove the automagic check use alsa || epatch "${FILESDIR}/${P}-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 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 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} --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)" 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 () { 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//' >00${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 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-${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 local f for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do test -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 --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, 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 --if-unset } 1.1 app-editors/emacs/emacs-21.4-r14.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild?rev=1.1&content-type=text/plain Index: emacs-21.4-r14.ebuild =================================================================== # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v 1.1 2007/11/25 17:13:08 ulm Exp $ WANT_AUTOCONF="2.1" inherit flag-o-matic eutils toolchain-funcs autotools DESCRIPTION="An incredibly powerful, extensible text editor" HOMEPAGE="http://www.gnu.org/software/emacs/" SRC_URI="mirror://gnu/emacs/${P}a.tar.gz mirror://gentoo/${P}-patches-1.tar.bz2 leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )" LICENSE="GPL-2 FDL-1.1 BSD" SLOT="21" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="X Xaw3d leim lesstif motif nls sendmail" RDEPEND="sys-libs/ncurses X? ( x11-libs/libXext x11-libs/libICE x11-libs/libSM x11-libs/libXmu x11-libs/libXpm x11-misc/emacs-desktop >=media-libs/giflib-4.1.0.1b >=media-libs/jpeg-6b-r2 >=media-libs/tiff-3.5.5-r3 >=media-libs/libpng-1.2.1 Xaw3d? ( x11-libs/Xaw3d ) motif? ( lesstif? ( x11-libs/lesstif ) !lesstif? ( >=x11-libs/openmotif-2.1.30 ) ) ) sendmail? ( virtual/mta ) >=app-admin/eselect-emacs-0.7-r1" DEPEND="${RDEPEND} X? ( x11-misc/xbitmaps )" 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" EPATCH_SUFFIX=patch epatch # install emacsclient.1 man page (#165466) sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die # 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 } src_compile() { export SANDBOX_ON=0 # -fstack-protector gets internal compiler error at xterm.c (bug 33265) filter-flags -fstack-protector # 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=*" eautoconf local myconf use nls || myconf="${myconf} --disable-nls" if use X ; then if use motif && use lesstif; then append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif append-cppflags -I/usr/X11R6/include/lesstif fi myconf="${myconf} --with-x --with-xpm --with-jpeg --with-tiff --with-gif --with-png" if use Xaw3d ; then myconf="${myconf} --with-x-toolkit=athena" elif use motif ; then myconf="${myconf} --with-x-toolkit=motif" else # do not build emacs with any toolkit, bug 35300 myconf="${myconf} --with-x-toolkit=no" fi else myconf="${myconf} --without-x" fi econf ${myconf} || die "econf 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 "die emake failed" } src_install() { einstall || die "einstall failed" 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} einfo "Fixing info documentation..." mkdir "${T}/emacs-${SLOT}" mv "${D}/usr/share/info/dir" "${T}" for i in "${D}"/usr/share/info/* do mv ${i} "${T}"/emacs-${SLOT}/${i##*/}.info done mv "${T}/emacs-${SLOT}" "${D}/usr/share/info" mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}" einfo "Fixing manpages..." for m in "${D}"/usr/share/man/man1/* ; do mv ${m} ${m%.1}-emacs-${SLOT}.1 || die "mv ${m} failed" done # avoid collision between slots rm "${D}"/usr/share/emacs/site-lisp/subdirs.el einfo "Fixing 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 keepdir /usr/share/emacs/site-lisp dodoc BUGS ChangeLog README } 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{/${PV},}/site-lisp/subdirs.el 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 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 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 } pkg_postrm() { emacs-infodir-rebuild eselect emacs update --if-unset } -- gentoo-commits@gentoo.org mailing list