From 76b6359ba6b2c7cce2f0b0725c7ecd831563cabf Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Thu, 21 Mar 2013 00:05:31 -0700
Subject: Thu Mar 21 00:05:30 PDT 2013

---
 extra/emacs/PKGBUILD      | 14 ++++++++------
 extra/emacs/emacs.install | 10 +++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'extra/emacs')

diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index 6f7daae8b..eba624a79 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 175859 2013-01-23 00:12:50Z eric $
+# $Id: PKGBUILD 180309 2013-03-20 02:35:30Z eric $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 pkgname=emacs
-pkgver=24.2
-pkgrel=4
+pkgver=24.3
+pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig})
-md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158')
-
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig})
+md5sums=('ea9ed000ca165280265aabb55b9afbd7'
+         '3f6990fabfbe1d5f3cd58bace4eb20f1')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
@@ -29,6 +29,8 @@ package() {
   # remove conflict with ctags package
   mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
   mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
+  # remove conflict with texinfo
+  rm "$pkgdir"/usr/share/info/info.info.gz
   # fix user/root permissions on usr/share files
   find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
   # fix perms on /var/games
diff --git a/extra/emacs/emacs.install b/extra/emacs/emacs.install
index fa9ffeeb1..6712f44ba 100644
--- a/extra/emacs/emacs.install
+++ b/extra/emacs/emacs.install
@@ -1,11 +1,11 @@
 ICON_PATH=usr/share/icons/hicolor
 INFO_DIR=usr/share/info
 
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
+INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse
 ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode
 org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
-speedbar tramp url vip viper widget woman)
+speedbar srecode tramp url vip viper widget wisent woman)
 
 post_install() {
   gtk-update-icon-cache -q -t -f ${ICON_PATH}
@@ -13,7 +13,7 @@ post_install() {
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
 
@@ -27,6 +27,6 @@ pre_remove() {
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
-- 
cgit v1.2.3-54-g00ecf