Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/ccrtp/PKGBUILD
	community/commoncpp2/PKGBUILD
	core/ncurses/PKGBUILD
	core/udev/PKGBUILD
	multilib/lib32-libjpeg-turbo/PKGBUILD

6 files changed, 164 insertions, 8 deletions

diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD
new file mode 100644
index 000000000..7409bba10
--- /dev/null
+++ b/extra/systemd/PKGBUILD
@@ -0,0 +1,86 @@
+# $Id: PKGBUILD 150113 2012-02-12 16:04:12Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+
+pkgname=systemd
+pkgver=42
+pkgrel=1
+pkgdesc="Session and Startup manager"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2')
+depends=('acl' 'dbus-core' 'kbd' 'kmod' 'libcap' 'util-linux' 'udev' 'xz')
+makedepends=('gperf' 'cryptsetup' 'docbook-xsl' 'intltool' 'libxslt' 'linux-api-headers')
+optdepends=('cryptsetup: required for encrypted block devices'
+            'dbus-python: systemd-analyze'
+            'initscripts: legacy support for hostname and vconsole setup'
+            'initscripts-systemd: native boot and initialization scripts'
+            'python2-cairo: systemd-analyze'
+            'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
+options=('!libtool')
+backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+        etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+        etc/dbus-1/system.d/org.freedesktop.login1.conf
+        etc/dbus-1/system.d/org.freedesktop.locale1.conf
+        etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+        etc/systemd/system.conf
+        etc/systemd/user.conf
+        etc/systemd/systemd-logind.conf
+        etc/systemd/systemd-journald.conf)
+install="$pkgname.install"
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+        "os-release")
+md5sums=('7686b44e368d2523901d3e903ed4dcea'
+         '752636def0db3c03f121f8b4f44a63cd')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  # Don't unset locale in getty
+  # https://bugzilla.redhat.com/show_bug.cgi?id=663900
+  sed -i -e '/^Environ.*LANG/s/^/#/' \
+         -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
+
+  ./configure --sysconfdir=/etc \
+              --libexecdir=/usr/lib \
+              --libdir=/usr/lib \
+              --localstatedir=/var \
+              --with-rootprefix= \
+              --with-rootlibdir=/lib
+
+  make
+
+  # fix .so links in manpages
+  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
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
+  printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+  # symlink to /bin/systemd for compat and sanity
+  ln -s ../lib/systemd/systemd "$pkgdir"/bin/systemd
+
+  # fix systemd-analyze for python2
+  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+  # rename man pages to avoid conflicts with sysvinit and initscripts
+  cd "$pkgdir/usr/share/man"
+
+  # not building this with systemd
+  rm -f "man1/systemadm.1"
+
+  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
+}
+
+# vim: ft=sh syn=sh et
diff --git a/extra/systemd/os-release b/extra/systemd/os-release
new file mode 100644
index 000000000..5e24a6031
--- /dev/null
+++ b/extra/systemd/os-release
@@ -0,0 +1,5 @@
+NAME="Arch Linux"
+ID=arch
+PRETTY_NAME="Arch Linux"
+ANSI_COLOR="1;36"
+
diff --git a/extra/systemd/systemd.install b/extra/systemd/systemd.install
new file mode 100644
index 000000000..f31642e13
--- /dev/null
+++ b/extra/systemd/systemd.install
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+checkgroups() {
+  if ! getent group lock >/dev/null; then
+    groupadd -g 54 lock
+  fi
+}
+
+sd_booted() {
+  [ -e sys/fs/cgroups/systemd ]
+}
+
+post_install() {
+  checkgroups
+
+  if [ ! -f etc/machine-id ]; then
+    systemd-machine-id-setup
+  fi
+
+  echo "systemd has been installed to /bin/systemd. Please ensure you append"
+  echo "init=/bin/systemd to your kernel command line in your bootloader."
+}
+
+post_upgrade() {
+  checkgroups
+
+  if [ ! -f etc/machine-id ]; then
+    systemd-machine-id-setup
+  fi
+
+  if sd_booted; then
+    systemctl daemon-reexec >/dev/null
+  fi
+
+  newpkgver=${1%-*}
+  oldpkgver=${2%-*}
+
+  # catch v31 need for restarting systemd-logind.service
+  if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
+    # but only if systemd is running
+    if sd_booted; then
+      systemctl try-restart systemd-logind.service
+    fi
+  fi
+}
+
+post_remove() {
+  if getent group lock >/dev/null; then
+    groupdel lock
+  fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD
index f42dd8ab0..22aec705e 100644
--- a/extra/twisted/PKGBUILD
+++ b/extra/twisted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145135 2011-12-17 16:20:46Z ibiru $
+# $Id: PKGBUILD 150115 2012-02-12 18:51:16Z eric $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=twisted
-pkgver=11.1.0
+pkgver=12.0.0
 pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python."
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,10 +12,10 @@ url="http://twistedmatrix.com/"
 license=('MIT')
 depends=('python2' 'pycrypto' 'zope-interface')
 optdepends=('python2-pyopenssl'
-            'python-soappy:for twisted.web.soap')
+            'python-soappy: for twisted.web.soap')
 install=twisted.install
 source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
-md5sums=('972f3497e6e19318c741bf2900ffe31c')
+md5sums=('cf49a8676c21c50faf1b42b528049471')
 
 build() {
     cd "$srcdir/Twisted-$pkgver"
diff --git a/extra/xfce4-timer-plugin/PKGBUILD b/extra/xfce4-timer-plugin/PKGBUILD
index b60a1c6c4..56cece775 100644
--- a/extra/xfce4-timer-plugin/PKGBUILD
+++ b/extra/xfce4-timer-plugin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149457 2012-02-08 03:29:26Z eric $
+# $Id: PKGBUILD 150121 2012-02-12 22:43:39Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-timer-plugin
-pkgver=0.6.2
+pkgver=0.6.4
 pkgrel=1
 pkgdesc="plugin to track time for the Xfce4 panel"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,9 @@ groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('688fe2dde9645bee1855e6a6c9579161')
+install=xfce4-timer-plugin.install
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('c2f9e113dcda742cd1559129b79f609b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xfce4-timer-plugin/xfce4-timer-plugin.install b/extra/xfce4-timer-plugin/xfce4-timer-plugin.install
new file mode 100644
index 000000000..17ca8f78a
--- /dev/null
+++ b/extra/xfce4-timer-plugin/xfce4-timer-plugin.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}