emacs-elib-1.0-4.1: rebuild

3 files changed, 54 insertions, 45 deletions

diff --git a/pcr/emacs-elib/PKGBUILD b/pcr/emacs-elib/PKGBUILD
index 7382423f1..8e58112d5 100644
--- a/pcr/emacs-elib/PKGBUILD
+++ b/pcr/emacs-elib/PKGBUILD
@@ -1,51 +1,48 @@
-# PKGBUILD for Emacs Lisp Library (elib)
 # Contributor (Arch): J. Bromley <jbromley@gmail.com>
-# $Id: PKGBUILD,v e6d455730f95 2009/12/03 05:38:28 jbromley $
+# Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>
 # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
 
 pkgname=emacs-elib
 _pkgname=elib
 pkgver=1.0
-pkgrel=3
+pkgrel=4.1
 pkgdesc="The Emacs Lisp library"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('any')
 url="http://jdee.sourceforge.net/"
-license="GPL"
+license=('GPL')
 depends=('emacs')
-makedepends=('texinfo' 'gzip')
-conflicts=()
-replaces=()
-backup=()
 install="$pkgname.install"
-source=(http://downloads.sourceforge.net/project/jdee/jdee/Dependencies/elib.tar.gz)
-md5sums=('4feb380f2e3b12eb5500dfe6714e349d')
+source=(http://downloads.sourceforge.net/project/jdee/jdee/Dependencies/elib.tar.gz
+        elib-deprecation.patch
+        elib.texi.patch)
+md5sums=('4feb380f2e3b12eb5500dfe6714e349d'
+         '03c491e8a476b4ba4c8e494fed3f54b6'
+         '2e88e1585923a05a38aab32f8e49b4fc')
 
-build() {
-mv $startdir/src/pub/comp/os/unix/gnu/elib/$_pkgname-$pkgver.tar.gz $startdir/src
-cd $startdir/src/
-tar -xzf $_pkgname-$pkgver.tar.gz
-cd $startdir/src/$_pkgname-$pkgver
+prepare() {
+  mv $srcdir/pub/comp/os/unix/gnu/elib/$_pkgname-$pkgver.tar.gz \
+     $srcdir
+  cd $srcdir/
+  bsdtar -xzf $_pkgname-$pkgver.tar.gz
+  cd $srcdir/$_pkgname-$pkgver
 
-# Fix up paths and old --infodir flag.
-sed -i 's!/usr/local!/usr!' Makefile
-sed -i 's!/info!/share/info!' Makefile
-sed -i 's!--infodir!--info-dir!g' Makefile
-
-# Patch to get rid of deprecated code.
-patch -p1 < $startdir/elib-deprecation.patch
-
-# Create directories for installation
-mkdir -p $startdir/pkg/usr/share/info
-mkdir -p $startdir/pkg/usr/share/emacs/site-lisp
-make || return 1
+  # Fix up paths and old --infodir flag.
+  sed -i 's!/usr/local!/usr!' Makefile
+  sed -i 's!/info!/share/info!' Makefile
+  sed -i 's!--infodir!--info-dir!g' Makefile
+  
+  patch -p1 < $srcdir/elib-deprecation.patch
+  patch -p1 < $srcdir/elib.texi.patch
+}
 
-# Install the compile package and gzip info file.
-make prefix=$startdir/pkg/usr install
-find $startdir/pkg -name dir -exec rm '{}' \;
-mv $startdir/pkg/usr/share/info/elib.info $startdir/pkg/usr/share/info/elib
-gzip $startdir/pkg/usr/share/info/elib
+build () {
+  cd $srcdir/$_pkgname-$pkgver
+  make 
 }
 
-# Local Variables:
-# mode: shell-script
-# End:
+package() {
+  cd $srcdir/$_pkgname-$pkgver
+  install -d $pkgdir/usr/share/{info,emacs/site-lisp/elib}
+  make prefix=$pkgdir/usr install
+  find $pkgdir -name dir -exec rm '{}' \;
+}
\ No newline at end of file
diff --git a/pcr/emacs-elib/elib.texi.patch b/pcr/emacs-elib/elib.texi.patch
new file mode 100644
index 000000000..53a1ac5ba
--- /dev/null
+++ b/pcr/emacs-elib/elib.texi.patch
@@ -0,0 +1,15 @@
+diff -Naur elib-1.0.orig/elib.texi elib-1.0.new/elib.texi
+--- elib-1.0.orig/elib.texi	2014-06-23 12:42:40.903218024 +0200
++++ elib-1.0.new/elib.texi	2014-06-23 12:43:06.273064475 +0200
+@@ -33,9 +33,9 @@
+ @sp 4
+ @comment The title is printed in a large font.
+ @center @titlefont{User's Guide}
+-@sp
++@sp 1
+ @center @titlefont{to}
+-@sp
++@sp 1
+ @center @titlefont{Elib - The Emacs Lisp Library}
+ @sp 2
+ @center version 1.0
diff --git a/pcr/emacs-elib/emacs-elib.install b/pcr/emacs-elib/emacs-elib.install
index 53a01f9f6..a0f80eadc 100644
--- a/pcr/emacs-elib/emacs-elib.install
+++ b/pcr/emacs-elib/emacs-elib.install
@@ -3,10 +3,10 @@
 # $Id: emacs-elib.install,v e6d455730f95 2008/06/23 05:55:28 jbromley $
 post_install () {
 if sh -c 'install-info --version' > /dev/nul 2>&1; then
-   if [ -f /usr/share/info/elib.gz ]; then
+   if [ -f /usr/share/info/elib.info.gz ]; then
        cd /usr/share/info
        install-info --info-dir=/usr/share/info --section=Emacs --name=Elib \
-                    --description=' The Emacs Lisp Library' elib.gz
+                    --description=' The Emacs Lisp Library' elib.info.gz
    fi
 fi
 
@@ -25,10 +25,7 @@ post_upgrade () {
         post_install $1
 }
 
-op=$1
-shift
-$op $*
-
-# Local Variables:
-# mode: shell-script
-# End:
+pre-remove () {
+  install-info --info-dir=/usr/share/info --section=Emacs --name=Elib \
+                    --description=' The Emacs Lisp Library' elib.info.gz
+		    }