diff options
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/Manifest | 10 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-23.2.93.ebuild | 326 |
3 files changed, 338 insertions, 5 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index f296308b76c4..8703e49282ef 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs-vcs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.44 2011/01/31 21:19:35 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.45 2011/02/01 07:12:32 ulm Exp $ + +*emacs-vcs-23.2.93 (01 Feb 2011) + + 01 Feb 2011; Ulrich Mueller <ulm@gentoo.org> +emacs-vcs-23.2.93.ebuild: + New pretest version. 31 Jan 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-24.0.9999.ebuild, emacs-vcs-24.0.9999-r1.ebuild: diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index eedf9d74c5b0..41de3d9acbe2 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -4,21 +4,23 @@ Hash: SHA1 DIST emacs-23.2.90.tar.gz 47595891 RMD160 73f64eebad5b9cd7a6e6f6b39b2dbc541186b2da SHA1 a45e23760ba93dd1a176d49f561b0341c43886bc SHA256 a37d6f31642df593f9504d98b2c76ef95012a76ea55db479fd19b65b931bebce DIST emacs-23.2.91.tar.gz 47639593 RMD160 b9f2f54a6cf47281f1bf8a70f65a8f4f64d80eff SHA1 935393c3c8b4b669af8b1525ffeb45d0654666a9 SHA256 7fc96d09a141f7deb0b5878ebc6d09ffbddc54db930c0d18c7add9b33201d55c DIST emacs-23.2.92.tar.gz 47650092 RMD160 07c341a7ce02ca889236d6b0a5f821b915b38460 SHA1 7700f15f018eedfcc9aefbe57dae3f9e3812d1ed SHA256 69b5ad0cfe0e47a88b906164965fdacdb7b2d4baf82cc55416a828c30c6b510c +DIST emacs-23.2.93.tar.gz 47659652 RMD160 ffaa4c62361e722a3934e1b389c2991068832207 SHA1 b6f1e2f390c6697fab6eea09b25a4f683367ba4c SHA256 79c362653c78eaa1f543d1bff1314ec633207d0b07262571e8afb08eb06a9151 DIST emacs-24.0.50_pre20110116.tar.bz2 27711684 RMD160 d61b5dafa5008a7485eebc52a91e8ca43f58e480 SHA1 ebc7669a7eb7951211035621c5b56f16051cd647 SHA256 6d573b62e0399f58e41be472d9f64ec0901bf06c9acb235d95db7b26acf67595 EBUILD emacs-vcs-23.2.90.ebuild 9960 RMD160 f914b71040a56aaea04c59981bcc03dce42a5129 SHA1 bc7402e7fcc1f105a1a91d37a6475043b6737f3f SHA256 2cfc5ec987cea054baa3d0a6ab0d3ebd9933661a32092f8061d44ae771806f50 EBUILD emacs-vcs-23.2.91.ebuild 9960 RMD160 6f2beed920ecb92b4aa461ba2f49eea27d1f9272 SHA1 93cdda06d827cbe3ef6deec8b07c792646170638 SHA256 80ba753e42e81130616200ea09f9f54c1f4372a216d65529b4fcc25a99f7b1d6 EBUILD emacs-vcs-23.2.92.ebuild 9960 RMD160 8d40053abe474160a6800d822028360ae6a1958c SHA1 e9d7169ecdb75ed38f4bd5f1c5a891e70cd8af43 SHA256 1bf59c7aa25a7cc25f1a1827d18a60ea02f08ddcb6f34c548792739542ba848c +EBUILD emacs-vcs-23.2.93.ebuild 10178 RMD160 332027b439ffe5ae25a9e1496ae72b892d1e1d97 SHA1 0032f946bd45b91f6d9a7a52a318da3cb5e0d3dc SHA256 4c0b7990d439096d831938d6cb832ce5a30aeaa7c59dab10106fb358063c707c EBUILD emacs-vcs-23.2.9999-r1.ebuild 10171 RMD160 50c6e95aca230ebd9d5ce5ef02d50f26d5059260 SHA1 9da987f0bf4abf4013c900429520115070af64af SHA256 7114ec7e90fa5125edfdfba7b6a197add854304e9c3eaeba706f7e8360eff211 EBUILD emacs-vcs-23.2.9999.ebuild 9951 RMD160 71b2cda9f85acd8ab4cc66e9098503fe974fc5a7 SHA1 b554fcdbb08b859dc833e4a7cfd53cd9cd0fa103 SHA256 2c7ae627151ef5c797f3af15789d09aa8c903d3f711a9a24e607d43eb1da178f EBUILD emacs-vcs-24.0.50_pre20110116.ebuild 10062 RMD160 a6d68742b1fda29253adeb5ca10d24fab5bade5e SHA1 53ec2d9e2aa70478d54af78f4de30ff62306ec43 SHA256 4bc6cb77e32fdc44eb00b186e43622cd737bb98ed8acabdaed5852aafa935cb2 EBUILD emacs-vcs-24.0.9999-r1.ebuild 10367 RMD160 68202d8b07a0415336242c87aeebb63d0a1ef451 SHA1 96f6b647796db0cd5d8d2174bd3805aa38c4a26f SHA256 be51bf5bca5d07cc1361db9cec33026e117593382b20a517ece8a8771f2db9a4 EBUILD emacs-vcs-24.0.9999.ebuild 10357 RMD160 b24982c6d0e1540beb4c413c3e6571adfe4e30df SHA1 412ba66a61b11d059197463d67636f9a22a68f97 SHA256 5ed14b2840b5829f1d8dc66cddd84ea4145894bf2f89e23336951eea717356c8 -MISC ChangeLog 56587 RMD160 9b05c1ebdb7bfa4d0792b3577ee0da4ba38c8c81 SHA1 bf89b1d0cd55d54ce5b8f2113f3aee2dfb807827 SHA256 0c3b58e02a7ee1ddeed5ae6d159f5cd09b4fbd56c23aa0f170fa34a65ee033e2 +MISC ChangeLog 56719 RMD160 1fa563f9c84f7922188d80e8ee271863c7e0e84f SHA1 cb1fd49d3884e52bf82ae2470ace20ff2e5b3098 SHA256 cd52dd139faef3d5a1d7a05c6da5727544e60e5678b8d30219614267cb9309db MISC metadata.xml 1842 RMD160 57ca3c2d25e695ead4faa6cb01b4d7a03939b511 SHA1 1960513308596b38c3ad7cd248924c903611d39b SHA256 9ebd8972aea68e7b3fd62915725ca35d0678b218d922a467a2c978fe44312ddb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk1HKLoACgkQOeoy/oIi7uyNbACgulcguFpWaDwrajj6wKqSGECo -WUIAn3+da5JFaNhfQ4R9KklP5FXlY5yO -=/H7M +iEYEARECAAYFAk1Hs7QACgkQOeoy/oIi7uzMvgCguszZKAVftOjvv+BbKuSBWbf9 +NRMAoK9kX0u90yPkCNnXZkfGj5W5YSU6 +=vkj4 -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-vcs/emacs-vcs-23.2.93.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.2.93.ebuild new file mode 100644 index 000000000000..e44f0a914631 --- /dev/null +++ b/app-editors/emacs-vcs/emacs-vcs-23.2.93.ebuild @@ -0,0 +1,326 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.93.ebuild,v 1.1 2011/02/01 07:12:32 ulm Exp $ + +EAPI=4 +WANT_AUTOMAKE="none" + +inherit autotools elisp-common eutils flag-o-matic multilib + +if [ "${PV##*.}" = "9999" ]; then + inherit bzr + EMACS_BRANCH="emacs-23" + EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EMACS_BRANCH}/" + EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}" + SRC_URI="" +else + SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz + ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz" + # 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%%_*}" + S="${WORKDIR}/emacs-${FULL_VERSION}" +fi + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +HOMEPAGE="http://www.gnu.org/software/emacs/" + +LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode" +SLOT="23" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="alsa dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" +RESTRICT="strip" + +RDEPEND="sys-libs/ncurses + >=app-admin/eselect-emacs-1.2 + net-libs/liblockfile + hesiod? ( net-dns/hesiod ) + kerberos? ( virtual/krb5 ) + alsa? ( media-libs/alsa-lib ) + gpm? ( sys-libs/gpm ) + dbus? ( sys-apps/dbus ) + X? ( + x11-libs/libXmu + x11-libs/libXt + x11-misc/xbitmaps + gconf? ( >=gnome-base/gconf-2.26.2 ) + gif? ( media-libs/giflib ) + jpeg? ( virtual/jpeg ) + png? ( media-libs/libpng ) + svg? ( >=gnome-base/librsvg-2.0 ) + tiff? ( media-libs/tiff ) + xpm? ( x11-libs/libXpm ) + xft? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXft + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + ) + gtk? ( x11-libs/gtk+:2 ) + !gtk? ( + Xaw3d? ( x11-libs/Xaw3d ) + !Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) + ) + )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + gzip-el? ( app-arch/gzip )" + +RDEPEND="${RDEPEND} + >=app-emacs/emacs-common-gentoo-1[X?]" + +EMACS_SUFFIX="emacs-${SLOT}-vcs" +SITEFILE="20${PN}-${SLOT}-gentoo.el" + +src_prepare() { + if [ "${PV##*.}" = "9999" ]; then + FULL_VERSION=$(grep 'defconst[ ]*emacs-version' lisp/version.el \ + | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/') + [ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version" + echo + einfo "Emacs branch: ${EMACS_BRANCH}" + einfo "Emacs version number: ${FULL_VERSION}" + [ "${FULL_VERSION%.*}" = ${PV%.*} ] \ + || die "Upstream version number changed to ${FULL_VERSION}" + echo + #else + # EPATCH_SUFFIX=patch epatch + fi + + 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 alsa; then + # ALSA is detected even if not requested by its USE flag. + # Suppress it by supplying pkg-config with a wrong library name. + sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \ + || die "unable to sed configure.in" + fi + 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 + + eautoreconf +} + +src_configure() { + ALLOWED_FLAGS="" + strip-flags + filter-flags -fstack-protector -fstack-protector-all #285778 + + if use sh; then + replace-flags -O[1-9] -O0 #262359 + elif use ia64; then + replace-flags -O[2-9] -O1 #325373 + else + replace-flags -O[3-9] -O2 + fi + + 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 gconf)" + myconf="${myconf} $(use_with toolkit-scroll-bars)" + myconf="${myconf} $(use_with gif) $(use_with jpeg)" + myconf="${myconf} $(use_with png) $(use_with svg rsvg)" + myconf="${myconf} $(use_with tiff) $(use_with xpm)" + myconf="${myconf} $(use_with xft)" + + if use xft; then + myconf="${myconf} $(use_with m17n-lib libotf)" + myconf="${myconf} $(use_with m17n-lib m17n-flt)" + else + myconf="${myconf} --without-libotf --without-m17n-flt" + use m17n-lib && ewarn \ + "USE flag \"m17n-lib\" has no effect because xft is not set." + fi + + # 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 + einfo "Configuring to build with GIMP Toolkit (GTK+)" + myconf="${myconf} --with-x-toolkit=gtk" + elif use Xaw3d; then + einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" + myconf="${myconf} --with-x-toolkit=athena" + elif use motif; then + einfo "Configuring to build with Motif toolkit" + myconf="${myconf} --with-x-toolkit=motif" + else + einfo "Configuring to build with no toolkit" + myconf="${myconf} --with-x-toolkit=no" + fi + + local f tk= + for f in gtk Xaw3d motif; do + use ${f} || continue + [ "${tk}" ] \ + && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" + tk="${tk}${tk:+ }${f}" + done + else + myconf="${myconf} --without-x" + fi + + myconf="${myconf} $(use_with hesiod)" + myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)" + myconf="${myconf} $(use_with gpm) $(use_with dbus)" + + # According to configure, this option is only used for GNU/Linux + # (x86_64 and s390). For Gentoo Prefix we have to explicitly spell + # out the location because $(get_libdir) does not necessarily return + # something that matches the host OS's libdir naming (e.g. RHEL). + local crtdir=$($(tc-getCC) -print-file-name=crt1.o) + crtdir=${crtdir%/*} + + econf \ + --program-suffix=-${EMACS_SUFFIX} \ + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ + --with-crt-dir="${crtdir}" \ + ${myconf} +} + +src_compile() { + export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 + if [ "${PV##*.}" = "9999" ]; then + emake CC="$(tc-getCC)" bootstrap + # cleanup, otherwise emacs will be dumped again in src_install + (cd src; emake versionclean) + fi + emake CC="$(tc-getCC)" +} + +src_install () { + local i m + + emake install DESTDIR="${D}" + + rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ + || die "removing duplicate emacs executable failed" + mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \ + || die "moving Emacs executable failed" + + # move man pages to the correct place + for m in "${ED}"/usr/share/man/man1/* ; do + mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed" + done + + # move info dir to avoid collisions with the dir file generated by portage + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ + || die "moving info dir failed" + touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig + + # avoid collision between slots, see bug #169033 e.g. + rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el + rm -rf "${ED}"/usr/share/{applications,icons} + rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores + keepdir /var/lib/games/emacs + + local c=";;" + 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] + c="" + fi + + sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF + X + ;;; ${PN}-${SLOT} site-lisp configuration + X + (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) + X ${c}(setq find-function-C-source-directory + X ${c} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src") + X (let ((path (getenv "INFOPATH")) + X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") + X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) + X (and path + X ;; move Emacs Info dir before anything else in /usr/share/info + X (let* ((p (cons nil (split-string path ":" t))) (q p)) + X (while (and (cdr q) (not (string-match re (cadr q)))) + X (setq q (cdr q))) + X (setcdr q (cons dir (delete dir (cdr q)))) + X (setq Info-directory-list (prune-directory-list (cdr p))))))) + EOF + elisp-site-file-install "${T}/${SITEFILE}" || die + + dodoc README BUGS +} + +pkg_preinst() { + # move Info dir file to correct name + local infodir=/usr/share/info/${EMACS_SUFFIX} f + if [ -f "${ED}"${infodir}/dir.orig ]; then + mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" + else + # this should not happen in EAPI 4 + ewarn "Regenerating Info directory index in ${infodir} ..." + rm -f "${ED}"${infodir}/dir{,.*} + for f in "${ED}"${infodir}/*; do + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then + install-info --info-dir="${ED}"${infodir} "${f}" \ + || die "install-info failed" + fi + done + fi +} + +pkg_postinst() { + local f + for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do + [ -e "${f}" ] || touch "${f}" + done + chown games "${ROOT}"/var/lib/games/emacs + + elisp-site-regen + eselect emacs update ifunset + + if use X; then + echo + elog "You need to install some fonts for Emacs." + elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" + elog "machine would satisfy basic Emacs requirements under X11." + elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml" + elog "for how to enable anti-aliased fonts." + 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." + echo + elog "If you upgrade from a previous major version of Emacs, then it is" + elog "strongly recommended that you use app-admin/emacs-updater to rebuild" + elog "all byte-compiled elisp files of the installed Emacs packages." +} + +pkg_postrm() { + elisp-site-regen + eselect emacs update ifunset +} |