Updating package, creating emacs-docs package

3 files changed, 143 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e674417cf9f7..65f91c3b3873 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,30 @@
+# Generated by mksrcinfo v8
+# Wed Sep 21 19:14:52 UTC 2016
 pkgbase = emacs-gtk2
-	pkgdesc = The extensible, customizable, self-documenting real-time display editor. GTK2 version
-	pkgver = 24.5
+	pkgver = 25.1
 	pkgrel = 1
-	url = http://www.gnu.org/software/emacs/emacs.html
-	install = emacs-gtk2.install
+	url = http://www.gnu.org/software/emacs/
 	arch = i686
 	arch = x86_64
-	license = GPL3
-	depends = librsvg
+	license = GPL
+	makedepends = git
+	source = ftp://ftp.gnu.org/gnu/emacs/emacs-25.1.tar.xz
+	md5sums = SKIP
+
+pkgname = emacs-gtk2
+	pkgdesc = GNU Emacs, the extensible self-documenting text editor, with a GUI build with the GTK2 toolkit.
 	depends = gpm
 	depends = giflib
-	depends = libxpm
-	depends = libotf
 	depends = m17n-lib
-	depends = gtk2
-	depends = hicolor-icon-theme
 	depends = desktop-file-utils
 	depends = alsa-lib
-	depends = imagemagick>=6.8.4.7
+	depends = imagemagick
+	depends = gtk2
 	provides = emacs
 	conflicts = emacs
-	source = ftp://ftp.gnu.org/gnu/emacs/emacs-24.5.tar.xz
-	sha256sums = dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e
+	conflicts = emacs-git
 
-pkgname = emacs-gtk2
+pkgname = emacs-docs
+	pkgdesc = GNU Emacs, built from git sources — HTML and PDF documentation package.
+	conflicts = emacs-git-docs
 
diff --git a/PKGBUILD b/PKGBUILD
index 3105fa8c0ff5..4d699e8250bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,140 @@
-# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
-# 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>
+# Maintainer: Pedro A. López-Valencia <https://aur.archlinux.org/users/vorbote>
 
-_pkgname=emacs
-pkgname=$_pkgname-gtk2
-pkgver=24.5
+#######################################################################
+# CAVEAT LECTOR
+#######################################################################
+#
+#  Don't run this on a tmpfs unless you have oodles of RAM.
+#  When the official git repo started, the size was about
+#  200MB. As time passes, it is growing more and more.
+#  Final directory size after a build is shy of 1Gb!
+#  Furthermore, the FSF isn't precisely rich and Savannah
+#  network costs aren't cheap. Keep your git checkout!
+#
+#  Keeping this directory in a safe place preserves the
+#  git repo and the src dir for faster compilation if
+#  you want. You may delete the pkg dir after successfully
+#  creating a package.
+#
+#  "makepkg -i" is your friend.
+#
+#######################################################################
+
+#######################################################################
+#
+# Still reading? Here kid, have enough rope to hang yourself. :-)
+#
+#######################################################################
+
+#######################################################################
+# Assign "YES" to the variable you want enabled, empty otherwise
+#######################################################################
+GTK3=""          # Leave empty to compile with gtk+ 2 support.
+LTO=             # Enable link-time optimization. Broken.
+CAIRO=           # Very broken for me. Use at own risk.
+XWIDGETS=        # Use GTK+ native widgets pulled from webkitgtk.
+DOCS_HTML=       # Generate and install html documentation.
+DOCS_PDF=        # Generate and install pdf documentation.
+#######################################################################
+
+_pkgname=('emacs')
+pkgname=("$_pkgname-gtk2" "$_pkgname-docs")
+pkgver=25.1
 pkgrel=1
-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' 'desktop-file-utils' 'alsa-lib' 'imagemagick>=6.8.4.7')
-install=emacs-gtk2.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz)
-sha256sums=(dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e)
-provides=('emacs')
-conflicts=('emacs')
+url="http://www.gnu.org/software/emacs/"
+_savannah="git://git.savannah.gnu.org/emacs.git"
+_github="git+https://github.com/emacs-mirror/emacs.git"
+license=('GPL')
+makedepends=('git')
+source=("ftp://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-$pkgver.tar.xz")
+md5sums=('SKIP')
+
+# There is no need to run autogen.sh after first checkout.
+# Doing so, breaks incremental compilation.
+prepare() {
+  cd "$srcdir/${_pkgname}-${pkgver}"
+
+  [[ -x configure ]] || ./autogen.sh
+}
 
 build() {
-  cd "$srcdir"/emacs-$pkgver
-  export ac_cv_lib_gif_EGifPutExtensionLast=yes
-  ./configure --without-gif \
-      --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-      --localstatedir=/var --with-x-toolkit=gtk2 --with-xft \
-      --without-gconf
+  cd "$srcdir/${_pkgname}-${pkgver}"
+
+  # Avoid hardening-wrapper (taken from emacs-pretest, thanks to Thomas Jost).
+  export PATH=$(echo "$PATH" | sed 's!/usr/lib/hardening-wrapper/bin!!g')
+
+  local _conf=(
+    --prefix=/usr
+    --sysconfdir=/etc
+    --libexecdir=/usr/lib
+    --localstatedir=/var
+    --mandir=/usr/share/man
+    --with-gameuser=:games
+    --with-sound=alsa
+    --with-xft
+    --with-modules)
+
+#######################################################################
+#######################################################################
+  if [[ $GTK3 = "YES" ]]; then
+    _conf+=('--with-x-toolkit=gtk3' '--without-gconf' '--with-gsettings');
+  else
+    _conf+=('--with-x-toolkit=gtk2' '--with-gconf' '--without-gsettings');
+  fi
+  if [[ $LTO = "YES" ]]; then _conf+=('--enable-link-time-optimization'); fi
+  if [[ $CAIRO = "YES" ]]; then _conf+=('--with-cairo'); fi
+  if [[ $XWIDGETS = "YES" ]]; then _conf+=('--with-xwidgets'); fi
+#######################################################################
+#######################################################################
+
+  ./configure "${_conf[@]}"
+
+  # Using "make" instead of "make bootstrap" enables incremental
+  # compiling. Less time recompiling. Yay! But if you may
+  # need to use bootstrap sometime, just add it to the command
+  # line.
+  # Please note that incremental compilation implies that you
+  # are reusing your src directory!
   make
+  make html
+  make pdf
 }
 
-package() {
-  cd "$srcdir"/$_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  
-  # fix file conflicts
-  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs} || true
-  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1} || true
-  rm "$pkgdir"/usr/share/info/info.info.gz || true
+package_emacs-gtk2() {
+  pkgdesc="GNU Emacs, the extensible self-documenting text editor, with a GUI build with the GTK2 toolkit."
+  depends=('gpm' 'giflib' 'm17n-lib' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gtk2')
+  conflicts=('emacs' 'emacs-git')
+  provides=('emacs')
+
+  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.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
+  find "$pkgdir"/usr/share/emacs/ | xargs chown root:root
+
+  # fix permssions on /var/games
+  mkdir -p "$pkgdir"/var/games/emacs
   chmod 775 "$pkgdir"/var/games
   chmod 775 "$pkgdir"/var/games/emacs
-  chmod 664 "$pkgdir"/var/games/emacs/*
   chown -R root:games "$pkgdir"/var/games
 }
+
+package_emacs-docs() {
+  pkgdesc="GNU Emacs, built from git sources — HTML and PDF documentation package."
+  makedepends+=('texlive-core')
+  conflicts=('emacs-git-docs')
+
+  cd "$srcdir/${_pkgname}-$pkgver"
+
+  make DESTDIR="$pkgdir/" install-html
+  make DESTDIR="$pkgdir/" install-pdf
+}
diff --git a/emacs-gtk2.install b/emacs-gtk2.install
deleted file mode 100644
index 2ef379ec9cfa..000000000000
--- a/emacs-gtk2.install
+++ /dev/null
@@ -1,33 +0,0 @@
-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)
-
-
-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.info.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-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.info.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}