From 069266d74e28a2e685bc2c7acb1d8ca9954fb3ca Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Thu, 12 Dec 2013 20:20:02 +0100
Subject: Update pkgdep patch

This removes support for

;; Package-Requires: foo Package-Requires: (baz "1.2.3")
---
 emacs-bzr/PKGBUILD     |  4 ++--
 emacs-bzr/pkgdep.patch | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/emacs-bzr/PKGBUILD b/emacs-bzr/PKGBUILD
index a174f5d..b766337 100644
--- a/emacs-bzr/PKGBUILD
+++ b/emacs-bzr/PKGBUILD
@@ -7,7 +7,7 @@
 _opt_puresize="1820000"
 
 pkgname=emacs-bzr
-pkgver=115472
+pkgver=115490
 pkgrel=1
 pkgdesc='The extensible, customizable, self-documenting real-time display editor from its official Bzr repository'
 arch=('i686' 'x86_64')
@@ -77,4 +77,4 @@ package() {
 }
 md5sums=('SKIP'
          '3a868e5b80d5912ded06e6bdc040208a'
-         'ae8e59b5d23879f7c7b61c0096345d26')
+         '32afd921141d3d47e821a2dacb645550')
diff --git a/emacs-bzr/pkgdep.patch b/emacs-bzr/pkgdep.patch
index b6cd476..8afa06e 100644
--- a/emacs-bzr/pkgdep.patch
+++ b/emacs-bzr/pkgdep.patch
@@ -1,30 +1,34 @@
 === modified file 'lisp/emacs-lisp/package.el'
 *** lisp/emacs-lisp/package.el	2013-12-11 21:15:12 +0000
---- lisp/emacs-lisp/package.el	2013-12-11 22:29:35 +0000
+--- lisp/emacs-lisp/package.el	2013-12-12 19:13:00 +0000
 ***************
 *** 1104,1109 ****
---- 1104,1124 ----
-  
+--- 1104,1128 ----
+
   (declare-function lm-homepage "lisp-mnt" (&optional file))
-  
+
 + (defun package--prepare-dependencies (deps)
 +   "Turn DEPS into an acceptable list of dependencies.
-+ 
++
 + Any parts missing a version string get a default version string
 + of \"0\" (meaning any version) and an appropriate level of lists
 + is wrapped around any parts requiring it."
 +   (cond
 +    ((null deps) nil)
-+    ((symbolp deps) `((,deps "0")))
++    ((or (symbolp deps)
++         (and (listp deps)
++              (symbolp (car deps))
++              (stringp (cadr deps))))
++     (error "Invalid requirement specifier: %s" deps))
 +    ((stringp (cadr deps)) `(,deps))
 +    ((and (listp deps) (listp (car deps))
 +          (null (cdar deps)))
 +     `((,(caar deps) "0")))
 +    (t (mapcar (lambda (dep) (if (symbolp dep) `(,dep "0") dep)) deps))))
-+ 
++
   (defun package-buffer-info ()
     "Return a `package-desc' describing the package in the current buffer.
-  
+
 ***************
 *** 1135,1141 ****
   	 "Package lacks a \"Version\" or \"Package-Version\" header"))
@@ -33,8 +37,8 @@
 !        (if requires-str (package-read-from-string requires-str))
          :kind 'single
          :url homepage))))
-  
---- 1150,1158 ----
+
+--- 1154,1162 ----
   	 "Package lacks a \"Version\" or \"Package-Version\" header"))
         (package-desc-from-define
          file-name pkg-version desc
@@ -43,5 +47,3 @@
 !             (package-read-from-string requires-str)))
          :kind 'single
          :url homepage))))
-  
-
-- 
cgit v1.2.3-54-g00ecf