Rename emacs-bzr to emacs-git

Use the new official git repository instead of the old bzr repository.

emacs-bzr/pkgver.patch

@@ -1,25 +0,0 @@
---- lisp/emacs-lisp/package.el	2014-02-12 01:20:34 +0000
-+++ lisp/emacs-lisp/package.el	2014-02-20 22:49:57 +0000
-@@ -1128,6 +1128,8 @@
-                  ((symbolp dep) `(,dep "0"))
-                  ((stringp dep)
-                   (error "Invalid requirement specifier: %S" dep))
-+                 ((and (listp dep) (null (cdr dep)))
-+                  (list (car dep) "0"))
-                  (t dep)))
-               deps))))
-
-@@ -1155,11 +1157,9 @@
- 	   ;; probably wants us to use it.  Otherwise try Version.
- 	   (pkg-version
- 	    (or (package-strip-rcs-id (lm-header "package-version"))
--		(package-strip-rcs-id (lm-header "version"))))
-+		(package-strip-rcs-id (lm-header "version"))
-+                "0"))
-            (homepage (lm-homepage)))
--      (unless pkg-version
--	(error
--	 "Package lacks a \"Version\" or \"Package-Version\" header"))
-       (package-desc-from-define
-        file-name pkg-version desc
-        (if requires-str

emacs-git/PKGBUILD

@@ -6,31 +6,32 @@
 # (not the final value; there are still calculations done on it).
 _opt_puresize="1820000"
 
-pkgname=emacs-bzr
-pkgver=117626
+pkgname=emacs-git
+pkgver=20141016
 pkgrel=1
-pkgdesc='The extensible, customizable, self-documenting real-time display editor from its official Bzr repository'
+pkgdesc='The extensible, customizable, self-documenting real-time display editor from its official Git repository'
 arch=('i686' 'x86_64')
 url='http://www.gnu.org/software/emacs/'
 license=('GPL3')
 depends=('dbus-core' 'desktop-file-utils' 'libpng' 'libtiff' 'librsvg'
-    'giflib' 'libxaw' 'libxpm' 'libjpeg>=7' 'hicolor-icon-theme')
-makedepends=('bzr' 'pkgconfig' 'texinfo')
+         'giflib' 'libxaw' 'libxpm' 'libjpeg>=7' 'hicolor-icon-theme'
+         'imagemagick' 'libotf' 'm17n-lib')
+makedepends=('git' 'pkgconfig' 'texinfo')
 provides=("emacs=$pkgver")
-conflicts=('emacs' 'emacs-nox' 'emacs-otf' 'emacs-cvs' 'emacs-git')
+conflicts=('emacs' 'emacs-nox' 'emacs-otf' 'emacs-cvs' 'emacs-bzr')
 install=$pkgname.install
-source=("bzr+http://bzr.savannah.gnu.org/r/emacs/trunk/"
+source=("git+http://git.savannah.gnu.org/r/emacs.git"
         'docstrings2.patch')
 
 _mandir=/usr/share/man
 
 pkgver() {
-    cd "$srcdir"/trunk
-    bzr revno
+    cd "$srcdir"/"$_name"
+    git log -1 --pretty=format:"%cd" --date=short | sed s/-//g
 }
 
 build() {
-  cd "$srcdir"/trunk
+  cd "$srcdir"/emacs
   msg "Adjusting BASE_PURESIZE to avoid possible leaks"
   sed -i -e "s/\(define BASE_PURESIZE\s*(*\)[0-9]*/\1${_opt_puresize}/" \
       src/puresize.h
@@ -46,13 +47,15 @@ build() {
       --without-sound \
       --with-xft \
       --without-gif \
+      --without-gconf \
+      --without-gsettings \
       --with-x-toolkit=lucid || return 1
   patch -p0 -i "$srcdir"/docstrings2.patch || return 1
   make bootstrap
 }
 
 package() {
-  cd "$srcdir"/trunk
+  cd "$srcdir"/emacs
   make DESTDIR=${pkgdir} install
 
   msg "Cleaning up..."
@@ -71,8 +74,6 @@ package() {
   chmod 775 $pkgdir/var/games/emacs
   chmod 664 $pkgdir/var/games/emacs/*
   chown -R root:50 $pkgdir/var/games
-
-  bzr revert
 }
 md5sums=('SKIP'
          '3a868e5b80d5912ded06e6bdc040208a')