Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/libgda3/PKGBUILD
	community/intel-tbb/PKGBUILD
	community/mtpaint/PKGBUILD
	extra/cmake/PKGBUILD
	extra/graphicsmagick/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/lyx/PKGBUILD
	extra/qtscriptgenerator/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdelibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	libre/libretools/PKGBUILD
	libre/p7zip-libre/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/wine/PKGBUILD
	testing/glibc/PKGBUILD

1 files changed, 13 insertions, 8 deletions

diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index eb7d8b9fc..7ae0e15f8 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 58198 2011-11-08 16:54:47Z dreisner $
+# $Id: PKGBUILD 61447 2011-12-31 17:01:55Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=systemd
 pkgver=37
-pkgrel=2
+pkgrel=3
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2')
 depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172')
-makedepends=('gperf' 'cryptsetup' 'gtk2' 'intltool' 'libnotify')
+makedepends=('gperf' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'linux-api-headers')
 optdepends=('cryptsetup: required for encrypted block devices'
             'dbus-python: systemd-analyze'
             'gtk2: systemadm'
@@ -58,7 +58,7 @@ build() {
   make
 
   # fix .so links in manpages
-  sed -i 's|\.so halt\.8|.so systemd.halt.8|' man/{halt,poweroff}.8
+  sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
   sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
 }
 
@@ -73,9 +73,14 @@ package() {
   # fix systemd-analyze for python2
   sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
 
-  # rename man pages to avoid conflicts with sysvinit
-  cd "$pkgdir/usr/share/man/man8"
-  for manpage in telinit halt reboot poweroff runlevel shutdown; do
-    mv {,systemd.}"$manpage.8"
+  # rename man pages to avoid conflicts with sysvinit and initscripts
+  cd "$pkgdir/usr/share/man"
+
+  manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+            man5/{hostname,{vconsole,locale}.conf}.5)
+
+  for manpage in "${manpages[@]}"; do
+    IFS='/' read section page <<< "$manpage"
+    mv "$manpage" "$section/systemd.$page"
   done
 }