emacs-pretest 25.0.90-1

4 files changed, 50 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 690ede50ebd7..f7d83d9e7386 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,11 @@
+# Generated by mksrcinfo v8
+# Sat Mar  5 20:06:26 UTC 2016
 pkgbase = emacs-pretest
 	pkgdesc = The extensible, customizable, self-documenting real-time display editor -- pretest version
-	pkgver = 24.4rc1
+	pkgver = 25.0.90
 	pkgrel = 1
 	url = http://www.gnu.org/software/emacs/emacs.html
-	install = emacs.install
+	install = emacs-pretest.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
@@ -20,14 +22,10 @@ pkgbase = emacs-pretest
 	depends = alsa-lib
 	depends = imagemagick
 	depends = gnutls
-	provides = emacs==24.4rc1
+	provides = emacs
 	conflicts = emacs
-	source = ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-24.4-rc1.tar.xz
-	source = ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-24.4-rc1.tar.xz.sig
-	md5sums = ad487658ad7421ad8d7b5152192eb945
-	md5sums = SKIP
-	sha256sums = 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd
-	sha256sums = SKIP
+	source = ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-25.0.90.tar.xz
+	source = ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-25.0.90.tar.xz.sig
 
 pkgname = emacs-pretest
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..c31862b5d057
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+*~
+pkg/
+src/
+*.gz
+*.bz2
+*.xz
+*.lzo
+*.xz4
+*.tgz
+*.tbz
+*.txz
+*.tar
+*.jar
+*.zip
+*.sig
diff --git a/PKGBUILD b/PKGBUILD
index 8752c53b308e..f12f8b2440b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,43 +4,46 @@
 
 pkgname=emacs-pretest
 _pkgname=emacs
-pkgver=24.4rc1
-_pkgver=24.4
-_rc=-rc1
+pkgver=25.0.90
 pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting real-time display editor -- pretest version"
 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' 'gnutls')
-install=emacs.install
-provides=("emacs==$pkgver")
+install=$pkgname.install
+provides=('emacs')
 conflicts=('emacs')
-source=(ftp://alpha.gnu.org/gnu/emacs/pretest/$_pkgname-$_pkgver$_rc.tar.xz{,.sig})
-md5sums=('ad487658ad7421ad8d7b5152192eb945'
-         'SKIP')
-sha256sums=('47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd'
+source=(ftp://alpha.gnu.org/gnu/emacs/pretest/$_pkgname-$pkgver$_rc.tar.xz{,.sig})
+whirlpoolsums=('4c566e40269aecf61ca1f3055d023fa4138f6a31436a7d7f2459b39818d33ae7d49e55719179239bd3d60936a85a83f062c2bc635fe8b3fa601749019bb17daa'
             'SKIP')
+validpgkkeys=('28D3BED851FDF3AB57FEF93C233587A47C207910')
 
 build() {
-  cd "$srcdir"/$_pkgname-$_pkgver
-  ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
+  cd "$srcdir"/$_pkgname-$pkgver
+
+  local confopts=(--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib
+    --localstatedir=/var --with-x-toolkit=gtk3 --with-xft)
+  ./configure "${confopts[@]}"
   make
 }
 
 package() {
-  cd "$srcdir"/$_pkgname-$_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}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1.gz}
+
   # 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
+
+  # fix ownership on usr/share files
+  find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
+
+  # fix access permissions on /var/games
   chmod 775 "$pkgdir"/var/games
   chmod 775 "$pkgdir"/var/games/emacs
   chmod 664 "$pkgdir"/var/games/emacs/*
diff --git a/emacs.install b/emacs-pretest.install
index 6712f44bab84..d2bd7d366826 100644
--- a/emacs.install
+++ b/emacs-pretest.install
@@ -1,18 +1,19 @@
 ICON_PATH=usr/share/icons/hicolor
 INFO_DIR=usr/share/info
 
-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)
+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
+  for f in "${INFO_FILES[@]}"; do
     install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
@@ -26,7 +27,7 @@ pre_remove() {
   update-desktop-database -q
 
   [[ -x usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
+  for f in "${INFO_FILES[@]}"; do
     install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }