diff options
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/Manifest | 38 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild | 369 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild | 369 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild | 3 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild | 4 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild | 4 |
7 files changed, 31 insertions, 763 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 9cc0bd70b503..1a3b4911b0d6 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-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.93 2012/05/19 15:58:54 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.94 2012/05/22 20:29:31 ulm Exp $ + + 22 May 2012; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-24.0.94.ebuild, + -emacs-vcs-24.0.95.ebuild, emacs-vcs-24.0.97.ebuild, + emacs-vcs-24.0.9999-r4.ebuild, emacs-vcs-24.1.9999.ebuild: + Call epatch_user to allow for user patches. Remove old. 19 May 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.0.97.ebuild, emacs-vcs-24.0.9999-r4.ebuild, emacs-vcs-24.1.9999.ebuild: diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index 9637facd2cbe..d449627dbd0c 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -2,32 +2,28 @@ Hash: SHA1 AUX emacs-24.0.92-ns-appdirs.patch 1538 RMD160 354b2726d80435aeb8b0e39616682df6774e7cf2 SHA1 50044a01c4c125d394308ea371f9a0337ee11609 SHA256 588b276284c7a56494fdba935a975c66edb668e5431bf25f1396696950c8f804 -DIST emacs-24.0.94.tar.gz 51251891 RMD160 3593d6a003b556f3755ba6ea3f8a92ba1b5ba2af SHA1 d70fe6da2d2b943423fcf16badb0294566710eaa SHA256 238dacb608e74fce088cde61b82907ba6ae5d975e88f38a0b199dbdbdb28feb5 -DIST emacs-24.0.95.tar.gz 51371928 RMD160 14a0ca326c18dc549495e862d83eb9e1917d2ead SHA1 09c1eaed7400f8cc0e5dab9fb2337c3c4cee5449 SHA256 434b8e4a27d376257a6fe93b35936466985ac45c90310e6041e0a0577752df64 DIST emacs-24.0.96.tar.gz 51433984 RMD160 ae8f46637b5cdadf7c401f6fc7e0240937becdb4 SHA1 15f932ad8c6a77107bc19ab3e3a8c8af27259ec2 SHA256 18ed15ff63cfa1ae929ccdb3a39cdc589420bd17dacc5af144c5eb717200f21a DIST emacs-24.0.97.tar.gz 51474077 RMD160 95ba986c3b13eabac0fc807d9b9e4ddbf64dde02 SHA1 dda4e06125dc35085f2b4c5d0fc4a9fb2a44adc1 SHA256 393620e822fd739344a28a4ec6d4e403e0301ad83cbb2d936b51043bea26afa8 -EBUILD emacs-vcs-24.0.94.ebuild 12096 RMD160 050b2618a55dcb870e5e0d3bdbb6679ea366f3db SHA1 4e02837568a4f984aa500c769f7c4c7b975edf07 SHA256 acd1d157916d19f4a760a3538b73eed5ebb4e5ade785622fb88e629e9d738c88 -EBUILD emacs-vcs-24.0.95.ebuild 12096 RMD160 cfc5f5ec6cca6aefe314764a51e00bbc255df7e5 SHA1 ac541028287e0e119b6537b35b29ebcdeb6ac70b SHA256 29e6058b2f5a9a165a7190acfac4335026bfb8f9283d4147bad56d06d1a053a2 EBUILD emacs-vcs-24.0.96.ebuild 12084 RMD160 4720f897611c673713d6c1d05d0e47743b618928 SHA1 260e58ae264dc9b00ff6ace1994d2da1bdb9482b SHA256 e864be530ffeeb4a7e8fd9e67d0ec35722251473bde70bc42c32281d0031fe0f -EBUILD emacs-vcs-24.0.97.ebuild 12117 RMD160 0c1af82425d4692d6b74a122314c9dd7847b5463 SHA1 079b499e6f2a76190f63e25d1998358e569ae8c4 SHA256 312088b38d728a11b36953d9b6d6f2dd5744e5eba5b5ccb9e288cbc15ab114f9 -EBUILD emacs-vcs-24.0.9999-r4.ebuild 11491 RMD160 e44b1d7dfe8604bae51d68340dfafc250e5e6cd5 SHA1 cde5fd146c4244e2c4d2d007a9152275873f2246 SHA256 f22bb8d3b3f029b35038f5623648b665a3833aeeed1d428cdb6067cafb3c6157 -EBUILD emacs-vcs-24.1.9999.ebuild 11485 RMD160 52f7d52d4fc869d8e6293b8489fc168e50fbcbd8 SHA1 68918db5fb4ff41d0d62fff338830d7c8d47a00f SHA256 9e292f4e6adda9fcfea7454f6b8c93ea044999d3c21f61a6cc53364c5eafe947 -MISC ChangeLog 66081 RMD160 362c2f1100b56f84a7aa117ca10e57d2091e49fa SHA1 3f8fe7aee57837bd1ae64139a94293c3fbd7811a SHA256 899ab07c970faff3e36ed51abaee88be686a03b0edd7226c5849ff457fdd341b +EBUILD emacs-vcs-24.0.97.ebuild 12130 RMD160 a518bb559d63ea66a4570445096c0259e85da4ea SHA1 c9be4c135366f794a340684577734b05dd4c0eef SHA256 143a31b3f9ba12bb984fb609f4b50e2d905d774617028fd595fc0e775bbae603 +EBUILD emacs-vcs-24.0.9999-r4.ebuild 11505 RMD160 03b302276936e109f4e6746e760e8cf90791b0ef SHA1 71166757754ccc98747ed904db4ca93f62a83b43 SHA256 4988b479d5d68926449c82476fc77eaef708cceb06e4def95601b71eb3e13b03 +EBUILD emacs-vcs-24.1.9999.ebuild 11499 RMD160 9bdbbd3c9c3a6a752ba0e6ddb123315929073daf SHA1 e179afad060ca357bc5a5ffc2b5a7cdd36d197d5 SHA256 7b04532538946f6f9e63107df31a12cff8a86fd2bb3b68e89e029e49e482fdc0 +MISC ChangeLog 66330 RMD160 3d79d4b2fab3518852a9812e5ee1fbed8bf0ebe1 SHA1 e9584dee4ab7a0f8d841aac5cdf533a8ad060095 SHA256 e38805345247d26fd899e0a364e1b938597b1d593a57c3b68670eea8817f8098 MISC metadata.xml 2159 RMD160 c0ec88f19a4e19271ea414b5e4429d0ca3ec4548 SHA1 3f8c32f164afe13baf231c60a2b64ca9912e5bfb SHA256 b1008bb18ce3aacd84175d61ac8254d017a4a9ba67d5b376f21a39e5699be3ba -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBAgAGBQJPt8RMAAoJEDxpGckxwJCBKUEP/1UWxqEqf77CbfMCoOYP5oui -iI4wWXeEGkHPivbJyg5TrXWYJ940EUQU8HkNzJDdD7hpv32j93doTgyc6NeiMPqu -sdz37aHxwlPzeO5/cau/cqXlZDinaMq+1OtnOZ73mToJ8SYHX5CQbZzyr5Lv4+54 -6Dsh2INVqBeClDj0J7wAUKMgCFtQfzH6cIQCexdO/dkmsO2StOnTq1E9q3j4YqUS -5jJCpQBj6opivznNiLTNlRGipCSLEGSCjFs9AuPtRqhLuSRi5ZbUF2Lt+ehRDoUk -1YCiZ8NSMaEBkDwMQ23N3+BwowVJ7s/jYx3svvxCZEP0GCcImWaD6jwujX1nA15N -ylpCFsaeJngFsmfirTeNDW0dF17FokgUwiW5Eaub4BxpZoySrf2IBPS17+6dJD7O -e2Mow7nx65n0bIt62kLgbAJ2A35g1RLhqOdz2vZBjVo+IrfLGwVwAUYwi5FW91Zg -Dh7MPh88v+erbq6wmcK/YvIOYecwL2JxtsnHimIdfOnxGHGZ87UiE4PrZSB8r7VJ -gR/hC4U71cq4DF2R9W+jjvF9HcijC040Yl4xuVl5B/tGbYYM5dKZrj4zbWnfkr+f -NIvizS9Gngkm2ZtSCe3ByfGjn4mW8FDrwciwIJ8eaoGMKf5iYqkIEEDvda/3y+s9 -LZX9t/KOtRvIMOcZMccB -=UNqL +iQIcBAEBAgAGBQJPu/hTAAoJEDxpGckxwJCBnOoP/0/NurQ/Ay5umMMlbz+FQezg +q6xMn1TxsiqOoQbZFfT/lpRVnrE4NTy+0kRz99eCu/M6F7zIq8c5tfqSxyc5Td0H +oH66OWhNB44M136DDLdMgYHj3XHEKc2ajaASrxrLvdhscmgvHoBN/Bsz52yAXoe5 +FR+Ncd2W/5vEA7IhuzW7lo9rxIDbYmzIxeHrhU2173T/aaYdDHW5rpuvOe6NCojl +RW3820s2NOxEpsHh5f+Vffpf3o2cGFMj+pxYbUyzwMy0CQ6jZK/y2m/WAsMpXbgy +dI5pHG2tJiQf2ycZqK0ktd0nquGygyZtmQI5w0OL6CsGrv3trSL5u9nDBjuLUD7Z +yV9dsGtXn9IS/+gBsIfx87UVZIurr6C0AE9cFO146iSukmSmSutMDXn6fYqwEB85 +UtMkBTdfK75IFax2AvUDERP+gZdc0pSys4evcV1oPDpyaxVwld8HtJw/OASFoWAm +0r3oaQpAFw+CwIkiOUbwokkev8YJMFtyiM3m4aVCr1GCZyk4b9sfAQk40p27kYkQ +ih6IW9RYEfbuXrhlU6s4lrPsQYYR+oZSnovSWMQ5WmVSspyDMju5T2LxuuQvvqcl +XFwEzcXOsC3Is4s3WPtajlCpl0uOvNSeRE2fk+lNuxxFH6kVWilekVPmiSaqbDAQ +ZrvqcttVfgZ71XB7u6Ac +=eWiW -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild deleted file mode 100644 index 812719a970eb..000000000000 --- a/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild +++ /dev/null @@ -1,369 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.94.ebuild,v 1.3 2012/05/03 18:33:00 jdhore Exp $ - -EAPI=4 - -inherit autotools elisp-common eutils flag-o-matic multilib - -if [[ ${PV##*.} = 9999 ]]; then - EBZR_PROJECT="emacs" - EBZR_BRANCH="trunk" - EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/" - # "Nosmart" is much faster for initial branching. - EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}" - inherit bzr - SRC_URI="" -else - SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz - mirror://gnu-alpha/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 PSF-2" -SLOT="24" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm" -REQUIRED_USE="aqua? ( !X )" - -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 ) - gnutls? ( net-libs/gnutls ) - libxml2? ( >=dev-libs/libxml2-2.2.0 ) - selinux? ( sys-libs/libselinux ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) - gsettings? ( >=dev-libs/glib-2.28.6 ) - gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg ) - png? ( >=media-libs/libpng-1.4:0 ) - svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff ) - xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) - 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? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - ) - !gtk? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( - athena? ( x11-libs/libXaw ) - !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) - ) - ) - )" - -DEPEND="${RDEPEND} - alsa? ( virtual/pkgconfig ) - dbus? ( virtual/pkgconfig ) - gnutls? ( virtual/pkgconfig ) - libxml2? ( virtual/pkgconfig ) - X? ( virtual/pkgconfig ) - gzip-el? ( app-arch/gzip )" - -RDEPEND="${RDEPEND} - >=app-emacs/emacs-common-gentoo-1.3[X?]" - -EMACS_SUFFIX="emacs-${SLOT}" -SITEFILE="20${PN}-${SLOT}-gentoo.el" - -src_prepare() { - if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \ - configure.in) - [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" - einfo "Emacs branch: ${EBZR_BRANCH}" - einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}" - einfo "Emacs version number: ${FULL_VERSION}" - [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ - || die "Upstream version number changed to ${FULL_VERSION}" - fi - - epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch - - 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 - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - ALLOWED_FLAGS="" - strip-flags - - 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 - einfo "Although sound USE flag is disabled you chose to have alsa," - einfo "so sound is switched on anyway." - myconf="${myconf} --with-sound" - else - myconf="${myconf} $(use_with sound)" - fi - - if use X; then - myconf="${myconf} --with-x --without-ns" - myconf="${myconf} $(use_with gconf)" - myconf="${myconf} $(use_with gsettings)" - myconf="${myconf} $(use_with toolkit-scroll-bars)" - myconf="${myconf} $(use_with wide-int)" - 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 imagemagick)" - - if use xft; then - myconf="${myconf} --with-xft" - myconf="${myconf} $(use_with m17n-lib libotf)" - myconf="${myconf} $(use_with m17n-lib m17n-flt)" - else - myconf="${myconf} --without-xft" - myconf="${myconf} --without-libotf --without-m17n-flt" - use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." - fi - - if use gtk; then - einfo "Configuring to build with GIMP Toolkit (GTK+)" - myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)" - local f - for f in athena Xaw3d motif; do - use ${f} && ewarn "USE flag \"${f}\" ignored" \ - "(superseded by \"gtk\")" - done - elif use athena || use Xaw3d; then - einfo "Configuring to build with Athena/Lucid toolkit" - myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" - use motif && ewarn "USE flag \"motif\" ignored" \ - "(superseded by \"athena\" or \"Xaw3d\")" - 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 - - ! use gtk && use gtk3 \ - && ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set." - elif use aqua; then - einfo "Configuring to build with Cocoa support" - myconf="${myconf} --with-ns --disable-ns-self-contained" - myconf="${myconf} --without-x" - else - myconf="${myconf} --without-x --without-ns" - fi - - if [[ ${PV##*.} = 9999 ]]; then - # These variables are not needed for building. We add them to - # configure options because they are stored in the Emacs binary - # and available in variable "system-configuration-options". - myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}" - fi - - # 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} \ - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --with-crt-dir="${crtdir}" \ - --with-gameuser="${GAMES_USER_DED:-games}" \ - --without-compress-info \ - --disable-maintainer-mode \ - $(use_with hesiod) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with gpm) \ - $(use_with dbus) \ - $(use_with gnutls) \ - $(use_with libxml2 xml2) \ - $(use_with selinux) \ - ${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 - # set last component of emacs-version to (package revision + 1) - touch src/emacs-${FULL_VERSION}.${PR#r} - 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 - - # remove unused <version>/site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp - - 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/*.{c,h,m} - doins -r src/{m,s} - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README - 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 - - if use aqua; then - dodir /Applications/Gentoo - rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app - mv nextstep/Emacs.app \ - "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die - elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo." - elog "You may want to copy or symlink it into /Applications by yourself." - fi -} - -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_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs - - elisp-site-regen - eselect emacs update ifunset - - if use X; then - 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." - elog - fi - - 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." - elog - 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 -} diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild deleted file mode 100644 index 2efd976c9e33..000000000000 --- a/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild +++ /dev/null @@ -1,369 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.95.ebuild,v 1.2 2012/05/03 18:33:00 jdhore Exp $ - -EAPI=4 - -inherit autotools elisp-common eutils flag-o-matic multilib - -if [[ ${PV##*.} = 9999 ]]; then - EBZR_PROJECT="emacs" - EBZR_BRANCH="trunk" - EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/" - # "Nosmart" is much faster for initial branching. - EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}" - inherit bzr - SRC_URI="" -else - SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz - mirror://gnu-alpha/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 PSF-2" -SLOT="24" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="alsa aqua athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm" -REQUIRED_USE="aqua? ( !X )" - -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 ) - gnutls? ( net-libs/gnutls ) - libxml2? ( >=dev-libs/libxml2-2.2.0 ) - selinux? ( sys-libs/libselinux ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) - gsettings? ( >=dev-libs/glib-2.28.6 ) - gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg ) - png? ( >=media-libs/libpng-1.4:0 ) - svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff ) - xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) - 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? ( - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - ) - !gtk? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( - athena? ( x11-libs/libXaw ) - !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) - ) - ) - )" - -DEPEND="${RDEPEND} - alsa? ( virtual/pkgconfig ) - dbus? ( virtual/pkgconfig ) - gnutls? ( virtual/pkgconfig ) - libxml2? ( virtual/pkgconfig ) - X? ( virtual/pkgconfig ) - gzip-el? ( app-arch/gzip )" - -RDEPEND="${RDEPEND} - >=app-emacs/emacs-common-gentoo-1.3[X?]" - -EMACS_SUFFIX="emacs-${SLOT}" -SITEFILE="20${PN}-${SLOT}-gentoo.el" - -src_prepare() { - if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \ - configure.in) - [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" - einfo "Emacs branch: ${EBZR_BRANCH}" - einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}" - einfo "Emacs version number: ${FULL_VERSION}" - [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ - || die "Upstream version number changed to ${FULL_VERSION}" - fi - - epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch - - 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 - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - ALLOWED_FLAGS="" - strip-flags - - 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 - einfo "Although sound USE flag is disabled you chose to have alsa," - einfo "so sound is switched on anyway." - myconf="${myconf} --with-sound" - else - myconf="${myconf} $(use_with sound)" - fi - - if use X; then - myconf="${myconf} --with-x --without-ns" - myconf="${myconf} $(use_with gconf)" - myconf="${myconf} $(use_with gsettings)" - myconf="${myconf} $(use_with toolkit-scroll-bars)" - myconf="${myconf} $(use_with wide-int)" - 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 imagemagick)" - - if use xft; then - myconf="${myconf} --with-xft" - myconf="${myconf} $(use_with m17n-lib libotf)" - myconf="${myconf} $(use_with m17n-lib m17n-flt)" - else - myconf="${myconf} --without-xft" - myconf="${myconf} --without-libotf --without-m17n-flt" - use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." - fi - - if use gtk; then - einfo "Configuring to build with GIMP Toolkit (GTK+)" - myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)" - local f - for f in athena Xaw3d motif; do - use ${f} && ewarn "USE flag \"${f}\" ignored" \ - "(superseded by \"gtk\")" - done - elif use athena || use Xaw3d; then - einfo "Configuring to build with Athena/Lucid toolkit" - myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" - use motif && ewarn "USE flag \"motif\" ignored" \ - "(superseded by \"athena\" or \"Xaw3d\")" - 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 - - ! use gtk && use gtk3 \ - && ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set." - elif use aqua; then - einfo "Configuring to build with Cocoa support" - myconf="${myconf} --with-ns --disable-ns-self-contained" - myconf="${myconf} --without-x" - else - myconf="${myconf} --without-x --without-ns" - fi - - if [[ ${PV##*.} = 9999 ]]; then - # These variables are not needed for building. We add them to - # configure options because they are stored in the Emacs binary - # and available in variable "system-configuration-options". - myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}" - fi - - # 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} \ - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --with-crt-dir="${crtdir}" \ - --with-gameuser="${GAMES_USER_DED:-games}" \ - --without-compress-info \ - --disable-maintainer-mode \ - $(use_with hesiod) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with gpm) \ - $(use_with dbus) \ - $(use_with gnutls) \ - $(use_with libxml2 xml2) \ - $(use_with selinux) \ - ${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 - # set last component of emacs-version to (package revision + 1) - touch src/emacs-${FULL_VERSION}.${PR#r} - 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 - - # remove unused <version>/site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp - - 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/*.{c,h,m} - doins -r src/{m,s} - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README - 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 - - if use aqua; then - dodir /Applications/Gentoo - rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app - mv nextstep/Emacs.app \ - "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die - elog "Emacs${EMACS_SUFFIX#emacs}.app is in ${EPREFIX}/Applications/Gentoo." - elog "You may want to copy or symlink it into /Applications by yourself." - fi -} - -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_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs - - elisp-site-regen - eselect emacs update ifunset - - if use X; then - 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." - elog - fi - - 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." - elog - 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 -} diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild index 68307fb73959..a565a60b922a 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v 1.2 2012/05/19 15:58:54 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v 1.3 2012/05/22 20:29:31 ulm Exp $ EAPI=4 @@ -106,6 +106,7 @@ src_prepare() { fi epatch "${FILESDIR}"/emacs-24.0.92-ns-appdirs.patch + epatch_user if ! use alsa; then # ALSA is detected even if not requested by its USE flag. diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild index 807d15abb8ea..11662c31b962 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v 1.4 2012/05/19 15:58:54 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v 1.5 2012/05/22 20:29:31 ulm Exp $ EAPI=4 @@ -104,6 +104,8 @@ src_prepare() { || die "Upstream version number changed to ${FULL_VERSION}" fi + epatch_user + 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. diff --git a/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild index 2d1241a68903..5d9430afe5c8 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v 1.4 2012/05/19 15:58:54 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v 1.5 2012/05/22 20:29:31 ulm Exp $ EAPI=4 @@ -104,6 +104,8 @@ src_prepare() { || die "Upstream version number changed to ${FULL_VERSION}" fi + epatch_user + 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. |