pcr/emacs-org-mode: updated to 9.0.5

2 files changed, 40 insertions, 27 deletions

diff --git a/pcr/emacs-org-mode/PKGBUILD b/pcr/emacs-org-mode/PKGBUILD
index ba0028fa4..717a174f7 100644
--- a/pcr/emacs-org-mode/PKGBUILD
+++ b/pcr/emacs-org-mode/PKGBUILD
@@ -1,38 +1,41 @@
-# Contributor (Arch): Jiyunatori <tori_LEAVETHISOUT_@0xc29.net>
-# Contributor (Arch): mdev
-# adopted by domanov <domanov_LEAVETHISOUT_@gmail.com>
+# Maintainer (AUR): Davor Balder <dbalder@ozemail.com.au>
+# Contributor (AUR): Jiyunatori <tori_LEAVETHISOUT_@0xc29.net>
+# Contributor (AUR): mdev
 # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@hackers.camp>
 
+# parabola changes and rationale:
+#  no changes.
+
 pkgname=emacs-org-mode
 _srcname=org
-pkgver=8.2.6
-pkgrel=1
+pkgver=9.0.5
+pkgrel=0
 pkgdesc="Emacs Org Mode"
 arch=('any')
 url="http://orgmode.org/"
-depends=(emacs)
+depends=('emacs')
 license=('GPL')
 install=emacs-org-mode.install
-source=(http://orgmode.org/$_srcname-$pkgver.tar.gz)
+source=("http://orgmode.org/$_srcname-$pkgver.tar.gz")
+sha256sums=('e5bb3476190a5d42795c170c894c9dcb475587855bd535200cd7a2751e6e9869')
 
 build() {
-    cd "${srcdir}/${_srcname}-${pkgver}"
-    make compile || return 1
+  cd "$_srcname-$pkgver"
+  make compile
 }
 
 package() {
-    cd "${srcdir}/${_srcname}-${pkgver}"
-    make prefix="${pkgdir}/usr/share" install || return 1
+  cd "$_srcname-$pkgver"
+  make prefix="$pkgdir/usr/share" install
 
-    ## by default now we install also the contrib directory
-    install -d -m755 $pkgdir/usr/share/emacs/site-lisp/org_contrib || return 1
-    cp -r contrib/* $pkgdir/usr/share/emacs/site-lisp/org_contrib || return 1
+  ## by default now we install also the contrib directory
+  install -d -m755 $pkgdir/usr/share/emacs/site-lisp/org_contrib
+  cp -r contrib/* $pkgdir/usr/share/emacs/site-lisp/org_contrib
 
-    ##! proper install of info files (thanks mdev)
-    ##! replace "orgmode" with "org" in the following lines if you want 
-    ##! to replace emacs own org's info files. You also need to change the .install.
-    install -D -m644 doc/org $pkgdir/usr/share/info/orgmode || return 1
-    gzip -9 $pkgdir/usr/share/info/orgmode || return 1
-    rm $pkgdir/usr/share/info/org || return 1
+  ##! proper install of info files (thanks mdev)
+  ##! replace "orgmode" with "org" in the following lines if you want
+  ##! to replace emacs own org's info files. You also need to change the  .install.
+  install -D -m644 doc/org $pkgdir/usr/share/info/orgmode
+  gzip -9 $pkgdir/usr/share/info/orgmode
+  rm $pkgdir/usr/share/info/org
 }
-
diff --git a/pcr/emacs-org-mode/emacs-org-mode.install b/pcr/emacs-org-mode/emacs-org-mode.install
index e8bd91185..a963840ca 100644
--- a/pcr/emacs-org-mode/emacs-org-mode.install
+++ b/pcr/emacs-org-mode/emacs-org-mode.install
@@ -1,5 +1,5 @@
 ## NOTE: the line commented with '##!' are needed 
-## to REPLACE the info file shipped by emacs (currently at version 6.21)
+## to REPLACE the info file shipped by emacs (currently at org version 7.8.11)
 ## with the info docs from this distribution (thanks mdev)
 
 # arg 1:  the new package version
@@ -16,15 +16,17 @@ pre_install() {
 ##!      fi
 ##!   done
    cat << EOM
-To enable this version of org-mode instead of the one shipped with emacs,
-add the line:
-    (require 'org-install)
-to your .emacs file. 
+You don't need to (require 'org-install) anymore.
+Setting the load-paths is enough.
+
+If you want to make sure the correct autoloads are in place, you can do:
+
+  (require 'org-loaddefs.el)
 
 NOTE: info documentation for emacs-org-mode goes now as 'orgmode' in /usr/share/info,
       It does NOT replace the 'org' info files shipped with emacs:
         $ info orgmode ## this version 
-        $ info org     ## emacs' org version (currently 6.21)
+        $ info org     ## emacs org version
 EOM
 }
 
@@ -42,6 +44,14 @@ pre_upgrade() {
 
 post_upgrade() {
  post_install $1
+   cat << EOM
+You don't need to (require 'org-install) anymore.
+Setting the load-paths is enough.
+If you want to make sure the correct autoloads are in place, you can do:
+
+  (require 'org-loaddefs.el)
+
+EOM
 }