From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MEjzJ-0002Ru-JC for garchives@archives.gentoo.org; Thu, 11 Jun 2009 13:06:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 826C7E03CF; Thu, 11 Jun 2009 13:06:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3FE9BE03CF for ; Thu, 11 Jun 2009 13:06:31 +0000 (UTC) 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 E45DB66047 for ; Thu, 11 Jun 2009 13:06:30 +0000 (UTC) Received: from ulm by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MEjzC-0001Ts-HC for gentoo-commits@lists.gentoo.org; Thu, 11 Jun 2009 13:06:30 +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: emacs-21.4-r19.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: emacs-21.4-r19.ebuild ChangeLog X-VCS-Directories: app-editors/emacs X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller Content-Type: text/plain; charset=utf8 Message-Id: Sender: Ulrich Mueller Date: Thu, 11 Jun 2009 13:06:30 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: affd6931-ea94-42d9-9fdc-2828ded28608 X-Archives-Hash: 59eeb02d8252b1ea529affec7f1b503c ulm 09/06/11 13:06:30 Modified: ChangeLog Added: emacs-21.4-r19.ebuild Log: Update for newer autoconf version, bug 273720. (Portage version: 2.2_rc33/cvs/Linux i686) Revision Changes Path 1.319 app-editors/emacs/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/= ChangeLog?rev=3D1.319&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/= ChangeLog?rev=3D1.319&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/= ChangeLog?r1=3D1.318&r2=3D1.319 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v retrieving revision 1.318 retrieving revision 1.319 diff -u -r1.318 -r1.319 --- ChangeLog 29 May 2009 16:14:57 -0000 1.318 +++ ChangeLog 11 Jun 2009 13:06:30 -0000 1.319 @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.318 2= 009/05/29 16:14:57 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.319 2= 009/06/11 13:06:30 ulm Exp $ + +*emacs-21.4-r19 (11 Jun 2009) + + 11 Jun 2009; Ulrich Mueller +emacs-21.4-r19.ebuild: + Update for newer autoconf version, bug 273720. =20 29 May 2009; Ulrich Mueller emacs-18.59-r6.ebuild, -files/emacs-22.1-Xaw3d-headers.patch, -files/emacs-22.2-sh.patch, 1.1 app-editors/emacs/emacs-21.4-r19.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/= emacs-21.4-r19.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/= emacs-21.4-r19.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: emacs-21.4-r19.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r19.ebuil= d,v 1.1 2009/06/11 13:06:30 ulm Exp $ EAPI=3D2 inherit flag-o-matic eutils toolchain-funcs autotools DESCRIPTION=3D"The extensible, customizable, self-documenting real-time d= isplay editor" HOMEPAGE=3D"http://www.gnu.org/software/emacs/" SRC_URI=3D"mirror://gnu/emacs/${P}a.tar.gz mirror://gentoo/${P}-patches-7.tar.bz2 leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )" LICENSE=3D"GPL-2 FDL-1.1 BSD as-is X11" SLOT=3D"21" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~= x86 ~x86-fbsd" IUSE=3D"X Xaw3d leim motif nls sendmail" DEPEND=3D"sys-libs/ncurses >=3Dapp-admin/eselect-emacs-1.2 X? ( x11-libs/libXext x11-libs/libICE x11-libs/libSM x11-libs/libXmu x11-libs/libXpm x11-misc/xbitmaps >=3Dmedia-libs/giflib-4.1.0.1b >=3Dmedia-libs/jpeg-6b-r2 >=3Dmedia-libs/tiff-3.5.5-r3 >=3Dmedia-libs/libpng-1.2.1 Xaw3d? ( x11-libs/Xaw3d ) !Xaw3d? ( motif? ( x11-libs/openmotif ) ) )" RDEPEND=3D"${DEPEND} >=3Dapp-emacs/emacs-common-gentoo-1[X?] sendmail? ( virtual/mta )" src_prepare() { EPATCH_SUFFIX=3Dpatch epatch sed -i \ -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=3Dcrtbegin.o):g= " \ -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=3Dcrtend.o):g" \ "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings" # install emacsclient.1 man page (bug 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 # custom aclocal.m4 was only needed for autoconf 2.13 and earlier rm aclocal.m4; touch aclocal.m4 eaclocal eautoconf } src_configure() { # -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=3D*" local myconf use nls || myconf=3D"${myconf} --disable-nls" if use X ; then myconf=3D"${myconf} --with-x --with-xpm --with-jpeg --with-tiff --with-gif --with-png" if use Xaw3d ; then einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" myconf=3D"${myconf} --with-x-toolkit=3Dathena" use motif \ && ewarn "USE flag \"motif\" ignored (superseded by \"Xaw3d\")" elif use motif ; then einfo "Configuring to build with Motif toolkit" myconf=3D"${myconf} --with-x-toolkit=3Dmotif" else # do not build emacs with any toolkit, bug 35300 einfo "Configuring to build with no toolkit" myconf=3D"${myconf} --with-x-toolkit=3Dno" fi else myconf=3D"${myconf} --without-x" fi econf ${myconf} || die "econf failed" } src_compile() { export SANDBOX_ON=3D0 emake CC=3D"$(tc-getCC)" || die "emake failed" einfo "Recompiling patched lisp files..." (cd lisp; emake recompile) || die "emake recompile failed" (cd src; emake versionclean) emake CC=3D"$(tc-getCC)" || die "emake failed" } src_install() { local i m 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} # move info documentation to the correct place 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}" # move man pages to the correct place 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 # fix 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 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=3D/usr/share/info/emacs-${SLOT} f [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=3Dnoinfo einfo "Regenerating Info directory index in ${infodir} ..." rm -f "${ROOT}"${infodir}/dir{,.*} for f in "${ROOT}"${infodir}/*.info*; do [[ ${f##*/} !=3D *[0-9].info* && -e ${f} ]] \ && install-info --info-dir=3D"${ROOT}"${infodir} "${f}" &>/dev/null done rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty echo } pkg_postinst() { emacs-infodir-rebuild if [[ $(readlink "${ROOT}"/usr/bin/emacs) =3D=3D emacs.emacs-${SLOT}* ]]= ; then # transition from pre-eselect revision eselect emacs set emacs-${SLOT} else eselect emacs update ifunset 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 } pkg_postrm() { emacs-infodir-rebuild eselect emacs update ifunset }