emacs-gtk2 pkgrel update + autodiffing

Signed-off-by: Mattias Andrée <maandree@operamail.com>

3 files changed, 38 insertions, 11 deletions

diff --git a/emacs-gtk2/PKGBUILD b/emacs-gtk2/PKGBUILD
index f787add..16d413e 100644
--- a/emacs-gtk2/PKGBUILD
+++ b/emacs-gtk2/PKGBUILD
@@ -1,13 +1,18 @@
-pkgname=emacs-gtk2
+#Maintainer: Mattias Andrée <maandree@operamail.com>
+#Official Arch Linux package repository [gtk3 version] maintainer: Juergen Hoetzel <juergen@archlinux.org>
+#Official Arch Linux package repository [gtk3 version] contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
+
+_pkgname=emacs
+pkgname=$_pkgname-gtk2
 pkgver=24.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The extensible, customizable, self-documenting real-time display editor. GTK2 version"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
 install=emacs-gtk2.install
-source=(ftp://ftp.gnu.org/gnu/emacs/emacs-$pkgver.tar.bz2{,.sig})
+source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.bz2{,.sig})
 md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158')
 provides=('emacs')
 conflicts=('emacs')
@@ -15,23 +20,21 @@ conflicts=('emacs')
 
 build() {
   cd "$srcdir"/emacs-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --localstatedir=/var --with-x-toolkit=gtk --with-xft
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+    --localstatedir=/var --with-x-toolkit=gtk --with-xft
   make
 }
 
 package() {
-  cd "$srcdir"/emacs-$pkgver
+  cd "$srcdir"/$_pkgname-$pkgver
   make DESTDIR="$pkgdir" install
   
   # remove conflict with ctags package
   mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
   mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-  
-  # fix all the 777 perms on directories
-  find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
-  
+
   # fix user/root permissions on usr/share files
-  find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
+  find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
   
   # fix perms on /var/games
   chmod 775 "$pkgdir"/var/games
diff --git a/emacs-gtk2/emacs-gtk2.install b/emacs-gtk2/emacs-gtk2.install
index d84f1de..fa9ffee 100644
--- a/emacs-gtk2/emacs-gtk2.install
+++ b/emacs-gtk2/emacs-gtk2.install
@@ -2,7 +2,7 @@ ICON_PATH=usr/share/icons/hicolor
 INFO_DIR=usr/share/info
 
 INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
+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
 org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
 speedbar tramp url vip viper widget woman)
diff --git a/emacs-gtk2/watch b/emacs-gtk2/watch
new file mode 100755
index 0000000..c2c350a
--- /dev/null
+++ b/emacs-gtk2/watch
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+wget 'https://projects.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/emacs' >/dev/null 2>/dev/null
+wget 'https://projects.archlinux.org/svntogit/packages.git/plain/trunk/emacs.install?h=packages/emacs' >/dev/null 2>/dev/null
+
+touch {PKGBUILD,emacs.install}.upstream.new
+mv PKGBUILD.upstream.{new,old}
+mv emacs.install.upstream.{new,old}
+mv 'PKGBUILD?h=packages%2Femacs' PKGBUILD.upstream.new
+mv 'emacs.install?h=packages%2Femacs' emacs.install.upstream.new
+
+if [ $? = 0 ]; then
+	grep ^pkg < PKGBUILD.upstream.new | md5sum > new-sum
+	touch sum
+	if [ "$(cat sum)" = "$(cat new-sum)" ]; then
+		rm new-sum
+	else
+		mv new-sum sum
+		echo 'emacs-gtk2'
+	fi
+else
+	echo 'emacs-gtk2 (unfetchable)'
+fi
+