Sun Dec 23 02:15:27 PST 2012

4 files changed, 31 insertions, 17 deletions

diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD
index 8c8ec44c7..80a32233c 100644
--- a/core/ed/PKGBUILD
+++ b/core/ed/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 172178 2012-12-01 00:07:10Z dreisner $
+# $Id: PKGBUILD 173766 2012-12-22 18:16:53Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=ed
 pkgver=1.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A POSIX-compliant line-oriented text editor"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,6 +12,7 @@ url="http://www.gnu.org/software/ed/ed.html"
 depends=('glibc' 'sh')
 options=('!emptydirs')
 source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz)
+install='ed.install'
 md5sums=('0aa4e2428e325203d0d7c3e86c961b1c')
 
 build() {
@@ -32,7 +33,4 @@ check() {
 
 package() {
   make -C "$pkgname-$pkgver" "DESTDIR=$pkgdir" install
-
-  # nuke info pages
-  rm -r "$pkgdir/usr/share/info"
 }
diff --git a/core/ed/ed.install b/core/ed/ed.install
new file mode 100644
index 000000000..2be95d935
--- /dev/null
+++ b/core/ed/ed.install
@@ -0,0 +1,18 @@
+infodir=usr/share/info
+filelist=(ed.info)
+
+post_install() {
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2>/dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2>/dev/null
+  done
+}
diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD
index 8cf902069..2e9902106 100644
--- a/core/pcmciautils/PKGBUILD
+++ b/core/pcmciautils/PKGBUILD
@@ -1,28 +1,24 @@
-# $Id: PKGBUILD 173074 2012-12-10 03:04:40Z dreisner $
+# $Id: PKGBUILD 173746 2012-12-22 15:22:21Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pcmciautils
 pkgver=018
-pkgrel=5
+pkgrel=6
 pkgdesc="Utilities for inserting and removing PCMCIA cards"
 arch=('i686' 'x86_64')
 url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
 license=('GPL')
 groups=('base')
-# sysfsutils will not be required in the next release
-depends=('udev' 'sysfsutils')
+depends=('systemd')
 conflicts=('pcmcia-cs')
 # source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
         initcpio-install-pcmcia)
 options=(!makeflags)
-md5sums=('964c802994677a71b38ec56554aa229f'
-         '041af04025daee5b3b05812ac3896c8f')
 
 build() {
   cd "$pkgname-$pkgver"
-  sed -i -e 's,/usr/bin/install,install,g;
-             s,/lib/udev,/usr/lib/udev,g' Makefile
+  sed -i -e 's,/lib/udev,/usr/lib/udev,g' Makefile
   make
 }
 
@@ -32,3 +28,5 @@ package() {
   # install the mkinitpcio hook
   install -Dm644 initcpio-install-pcmcia "$pkgdir/usr/lib/initcpio/install/pcmcia"
 }
+md5sums=('2e9469c44dcb790d2b497723c2fa0566'
+         '041af04025daee5b3b05812ac3896c8f')
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 857bcc495..e0aabed6c 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171469 2012-11-17 23:02:13Z allan $
+# $Id: PKGBUILD 173745 2012-12-22 15:22:20Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
-pkgver=2.22.1
-pkgrel=3
+pkgver=2.22.2
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
@@ -75,7 +75,7 @@ package() {
   # TODO(dreisner): offer this upstream?
   install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
 }
-md5sums=('730cf9932531ed09b53a04ca30fcb4c9'
+md5sums=('eeacbfdd2556acd899a2d0ffdb446185'
          'a39554bfd65cccfd8254bb46922f4a67'
          '4368b3f98abd8a32662e094c54e7f9b1'
          'a31374fef2cba0ca34dfc7078e2969e4'