4 files changed, 131 insertions, 125 deletions
diff --git a/pcr/emacs-bzr/PKGBUILD b/pcr/emacs-bzr/PKGBUILD
deleted file mode 100644
index 2eaac430a..000000000
--- a/pcr/emacs-bzr/PKGBUILD
+++ /dev/null
@@ -1,93 +0,0 @@
-# Contributor (Arch): Neil Santos <nsantos16+aur@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-# Compile against Gtk+ 2.x, instead of the default 3.x
-_opt_use_gtk2="n"
-# Emacs is leaking like a sieve on my box with the default values;
-# this should be the number of bytes Emacs should allocate for pure
-# storage (see Elisp manual).  Default as of writing this is 1.62 megs
-# (not the final value; there are still calculations done on it).
-_opt_puresize="2000000"
-
-pkgname=emacs-bzr
-pkgver=110380
-pkgrel=1
-pkgdesc='The extensible, customizable, self-documenting real-time display editor from its official Bzr repository'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.gnu.org/software/emacs/'
-license=('GPL3')
-if [[ $_opt_use_gtk2 = "y" ]]; then
-  depends=('dbus-core' 'desktop-file-utils' 'libpng' 'libtiff' 'librsvg' 'giflib' 'gtk2' 'libxpm' 'libjpeg>=7' 'hicolor-icon-theme')
-else
-  depends=('dbus-core' 'desktop-file-utils' 'libpng' 'libtiff' 'librsvg' 'giflib' 'gtk3' 'libxpm' 'libjpeg>=7' 'hicolor-icon-theme')
-fi
-
-makedepends=('bzr' 'pkgconfig' 'texinfo')
-provides=("emacs=$pkgver")
-conflicts=('emacs' 'emacs-nox' 'emacs-otf' 'emacs-cvs' 'emacs-git')
-install=$pkgname.install
-
-_bzrtrunk='http://bzr.savannah.gnu.org/r/emacs/trunk'
-_bzrmod='emacs'
-
-build() {
-  cd $srcdir
-  msg "Connecting to Savannah..."
-
-  if [[ -d $_bzrmod/.bzr ]]; then
-    (cd $_bzrmod && bzr update -v && cd ..)
-    msg "Local checkout updated or server timeout"
-  else
-    bzr co --lightweight -v $_bzrtrunk $_bzrmod
-    msg "Checkout done or server timeout"
-  fi
-
-  cp -urT $_bzrmod/ ${_bzrmod}-build
-  cd ${_bzrmod}-build
-  msg "Adjusting BASE_PURESIZE to avoid possible leaks"
-  sed -i -e "s/\(define BASE_PURESIZE\s*(*\)[0-9]*/\1${_opt_puresize}/" src/puresize.h
-
-  msg "Bootstrapping Emacs Lisp files..."
-  make bootstrap
-
-  mandir=/usr/share/man
-  msg "Starting make..."
-  if [[ $_opt_use_gtk2 = "y" ]]; then
-    ./autogen.sh && ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib \
-      --mandir=${mandir} \
-      --without-sound \
-      --with-xft \
-      --with-x-toolkit=gtk2
-  else
-    ./autogen.sh && ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib \
-      --mandir=${mandir} \
-      --without-sound \
-      --with-xft \
-      --with-x-toolkit=gtk3
-  fi
-  make
-  make DESTDIR=${pkgdir} install
-
-  msg "Cleaning up..."
-  mv $pkgdir/usr/bin/{ctags,ctags.emacs}
-  mv $pkgdir/usr/bin/{etags,etags.emacs}
-  mv $pkgdir${mandir}/man1/{etags.1,etags.emacs.1}.gz
-  mv $pkgdir${mandir}/man1/{ctags.1,ctags.emacs.1}.gz
-
-  # This is mostly superfluous, and conflicts with texinfo
-  rm $pkgdir/usr/share/info/info.info.gz
-  rm $pkgdir/usr/share/info/dir
-
-  find $pkgdir/usr/share/emacs -type d -exec chmod 755 {} \;
-  find $pkgdir/usr/share/emacs -exec chown root.root {} \;
-  chmod 775 $pkgdir/var/games
-  chmod 775 $pkgdir/var/games/emacs
-  chmod 664 $pkgdir/var/games/emacs/*
-  chown -R root:50 $pkgdir/var/games
-}
diff --git a/pcr/emacs-bzr/emacs-bzr.install b/pcr/emacs-bzr/emacs-bzr.install
deleted file mode 100644
index 35d11bd56..000000000
--- a/pcr/emacs-bzr/emacs-bzr.install
+++ /dev/null
@@ -1,32 +0,0 @@
-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 ert eshell
-eudc flymake forms gnus 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)
-
-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
-}
diff --git a/pcr/emacs-git/PKGBUILD b/pcr/emacs-git/PKGBUILD
new file mode 100644
index 000000000..942bc1f54
--- /dev/null
+++ b/pcr/emacs-git/PKGBUILD
@@ -0,0 +1,99 @@
+# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>
+
+#
+# TIP: 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 will grow more and more.
+#
+
+pkgname=emacs-git
+pkgver=25.0.50.r120799
+pkgrel=1
+pkgdesc="GNU Emacs. Official git trunk."
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/emacs/"
+license=('GPL')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 
+	 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils' 
+	 'alsa-lib' 'imagemagick' 'gnutls')
+makedepends=('git')
+conflicts=('emacs')
+provides=('emacs')
+install="$pkgname".install
+source=("$pkgname::git://git.savannah.gnu.org/emacs.git")
+md5sums=('SKIP')
+
+pkgver() {
+  cd "$srcdir/$pkgname"
+  printf "%s.r%s" \
+    "$(grep AC_INIT configure.ac | sed -e 's/^.\+\ \([0-9]\+\.[0-9]\+\.[0-9]\+\).\+$/\1/')" \
+    "$(git rev-list --count HEAD)"
+}
+
+
+# There is no need to run autogen.sh after first checkout.
+# Doing so, breaks incremental recompilation.
+prepare() {
+  cd "$srcdir/$pkgname"
+  if ! [ -f configure ]; then 
+    ./autogen.sh
+  fi 
+}
+
+build() {
+  cd "$srcdir/$pkgname"
+  ac_cv_lib_gif_EGifPutExtensionLast=yes \
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --mandir=/usr/share/man \
+    --pdfdir=/usr/share/doc/emacs/pdf \
+    --with-sound=alsa \
+    --without-gconf \
+    --with-x-toolkit=gtk3 \
+    --with-xft
+
+  # Using "make" instead of "make bootstrap" makes incremental
+  # compiling work. Less time recompiling. Yay! But if you may 
+  # need to use bootstrap sometime, just add it below.
+  make
+
+  # You may need to run this if loaddefs.el files become
+  # corrupt.
+  #cd "$srcdir/$pkgname/lisp"
+  #make autoloads
+
+  # Before enabling "make docs" you need to install texlive, either from
+  # the repos or locally while using texlive-dummy from AUR.
+  #make docs
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+
+  make DESTDIR="$pkgdir/" install
+
+  # Before enabling "make install-doc" you need to install texlive, either
+  # from the repos or locally while using texlive-dummy from AUR.
+  # make DESTDIR="$pkgdir/" install-doc
+
+  # 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/ | xargs chown root:root
+
+  # fix permssions on /var/games
+  chmod 775 "$pkgdir"/var/games
+  chmod 775 "$pkgdir"/var/games/emacs
+  chmod 664 "$pkgdir"/var/games/emacs/*
+  chown -R root:games "$pkgdir"/var/games
+}
+
+# vim:set ft=sh ts=2 sw=2 et:
diff --git a/pcr/emacs-git/emacs-git.install b/pcr/emacs-git/emacs-git.install
new file mode 100644
index 000000000..6712f44ba
--- /dev/null
+++ b/pcr/emacs-git/emacs-git.install
@@ -0,0 +1,32 @@
+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
+}