3 files changed, 33 insertions, 45 deletions
diff --git a/pcr/emacs-magit-git/PKGBUILD b/pcr/emacs-magit-git/PKGBUILD
deleted file mode 100644
index 7957a7549..000000000
--- a/pcr/emacs-magit-git/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Contributor (Arch): Stefan Husmann <stefan.husmann@t-online.de>
-# Contributor (Arch): Peter Simons <simons@cryp.to>
-# Contributor (Arch): Just Lest <just.lest@gmail.com>
-# Contributor (Arch): Daniel White <daniel@whitehouse.id.au>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=emacs-magit-git
-pkgver=20121104
-pkgrel=1
-pkgdesc="It's Magit! A Emacs mode for Git."
-arch=("any")
-url="http://github.com/magit/magit"
-license=('GPL3')
-depends=('emacs' 'git')
-makedepends=('automake' 'autoconf')
-provides=('emacs-magit')
-conflicts=('emacs-magit')
-install="${pkgname}.install"
-
-_gitname="master"
-_gitroot="git://github.com/magit/magit.git"
-
-build()
-{
-  cd "${srcdir}"
-  if [ -d magit ] ; then
-    cd magit
-    git pull origin
-  else
-    git clone --depth=1 "${_gitroot}"
-  fi
-  [ -d "${srcdir}/build" ] && rm -rf "${srcdir}/build"
-  cp -r "${srcdir}/magit" "${srcdir}/build"
-  cd "${srcdir}/build"
-  make
-}
-
-package()
-{
-  cd "${srcdir}/build"
-  mkdir -p "${pkgdir}/usr/bin"	# work around a bug in the makefile
-  make PREFIX="/usr" DESTDIR="${pkgdir}" install install_contrib
-  rm "${pkgdir}/etc/emacs/site-start.d/50magit.el" "${pkgdir}/usr/share/info/dir"
-  rmdir "${pkgdir}/etc/emacs/site-start.d" "${pkgdir}/etc/emacs" "${pkgdir}/etc"
-}
diff --git a/pcr/emacs-magit/PKGBUILD b/pcr/emacs-magit/PKGBUILD
new file mode 100644
index 000000000..8dcf0785c
--- /dev/null
+++ b/pcr/emacs-magit/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer (AUR):  Esben Haabendal <esben@haabendal.dk>
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+
+# parabola changes and rationale:
+#  - added replaces for previous pkgname 'emacs-magit-git' (2018-02-02)
+
+pkgname=emacs-magit
+pkgver=2.11.0
+pkgrel=1
+pkgdesc="It's Magit! A Emacs mode for Git."
+arch=('any')
+_github_org="magit"
+_github_repo="magit"
+url="http://github.com/${_github_org}/${_github_repo}"
+license=('GPL3')
+depends=('emacs' 'git' 'emacs-dash>=2.13.0' 'emacs-with-editor-git>=2.6.0')
+provides=('emacs-magit' 'emacs-magit-popup')
+conflicts=('emacs-magit-git' 'emacs-magit-popup')
+replaces=('emacs-magit-git')
+install="${pkgname}.install"
+source=("git+https://github.com/${_github_org}/${_github_repo}.git#tag=$pkgver")
+md5sums=('SKIP')
+
+build() {
+  cd "$srcdir/${_github_repo}"
+  make LOAD_PATH="-L /usr/share/emacs/site-lisp -L /usr/share/emacs/site-lisp/dash -L ${srcdir}/magit/lisp" \
+       lisp docs
+}
+
+package() {
+  cd "$srcdir/${_github_repo}"
+  make PREFIX="/usr" DESTDIR="${pkgdir}" install
+}
diff --git a/pcr/emacs-magit-git/emacs-magit-git.install b/pcr/emacs-magit/emacs-magit.install
index a9904739e..a9904739e 100644
--- a/pcr/emacs-magit-git/emacs-magit-git.install
+++ b/pcr/emacs-magit/emacs-magit.install