[emacs-chris2] 24.3-1

leahneukirchen · Mar 20, 2013 · 68dcf0f · 68dcf0f
1 parent 1fa4e75
commit 68dcf0f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/emacs-chris2/PKGBUILD b/emacs-chris2/PKGBUILD
@@ -4,24 +4,27 @@
 
 pkgname=emacs-chris2
 _pkgname=emacs
-pkgver=24.2
-pkgrel=2
+pkgver=24.3
+pkgrel=1
 pkgdesc="The Emacs Editor, chris2 edition"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 conflicts=(emacs)
 provides=(emacs)
 license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libxaw' 'hicolor-icon-theme' 'imagemagick')
+depends=('libxaw' 'hicolor-icon-theme' 'libjpeg-turbo' 'giflib' 'libpng' 'desktop-file-utils' 'perl')
 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')
+sha256sums=('70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d'
+            '6c258b159c921006eee4b1a1aeb1be75a79ad8ed92b36b1b08b262d41a091093')
 
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --without-sound --with-x-toolkit=athena --without-xaw3d --without-xft --without-gconf --without-dbus --without-gnutls --without-toolkit-scroll-bars
+    --localstatedir=/var --without-all --with-x-toolkit=athena \
+    --with-xpm --with-jpeg --with-gif --with-png
   make
 }
 
@@ -31,7 +34,9 @@ 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}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1,ctags.emacs.1}
+  # remove conflict with texinfo
+  rm "$pkgdir"/usr/share/info/info.info
   # 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/emacs-chris2/emacs.install b/emacs-chris2/emacs.install
@@ -1,17 +1,19 @@
-ICON_PATH=/usr/share/icons/hicolor
-INFO_DIR=/usr/share/info
+ICON_PATH=usr/share/icons/hicolor
+INFO_DIR=usr/share/info
 
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ediff efaq eintr elisp emacs emacs-mime epa erc eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
-org pcl-cvs pgg rcirc reftex remember sasl sc ses sieve smtpmail
-speedbar tramp url vip viper widget woman)
+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 htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode
+org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
+speedbar srecode tramp url vip viper widget wisent woman)
 
 post_install() {
   gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
 
+  [[ -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
 }
 
@@ -21,12 +23,10 @@ post_upgrade() {
 
 pre_remove() {
   gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
 
+  [[ -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
 }
-
-op=$1
-shift
-$op $*