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

Conflicts:
	community-staging/haskell-stm/PKGBUILD
	community-staging/haskell-syb/PKGBUILD
	community/cantata/PKGBUILD
	community/linux-tools/PKGBUILD
	community/python-pymongo/PKGBUILD
	core/less/PKGBUILD
	extra/alsa-plugins/PKGBUILD
	extra/avfs/PKGBUILD
	extra/cups/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/kdemultimedia-mplayerthumbs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mysql/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vim/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	multilib/lib32-alsa-lib/PKGBUILD
	multilib/lib32-alsa-plugins/PKGBUILD
	multilib/lib32-fontconfig/PKGBUILD
	staging/ghc/PKGBUILD
	staging/ghc/build.mk
	staging/haskell-http/PKGBUILD
	staging/haskell-mtl/PKGBUILD
	staging/haskell-network/PKGBUILD
	staging/haskell-parsec/PKGBUILD
	staging/haskell-random/PKGBUILD
	staging/haskell-text/PKGBUILD
	staging/haskell-transformers/PKGBUILD
	staging/haskell-zlib/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/coreutils/coreutils.install
	testing/dhcpcd/PKGBUILD
	testing/kactivities/PKGBUILD
	testing/kdeaccessibility-jovie/PKGBUILD
	testing/kdeaccessibility-kaccessible/PKGBUILD
	testing/kdeaccessibility-kmag/PKGBUILD
	testing/kdeaccessibility-kmousetool/PKGBUILD
	testing/kdeaccessibility-kmouth/PKGBUILD
	testing/kdeadmin/PKGBUILD
	testing/kdeartwork/PKGBUILD
	testing/kdebase-konsole/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase/PKGBUILD
	testing/kdebindings-kimono/PKGBUILD
	testing/kdebindings-korundum/PKGBUILD
	testing/kdebindings-kross/PKGBUILD
	testing/kdebindings-perlkde/PKGBUILD
	testing/kdebindings-perlqt/PKGBUILD
	testing/kdebindings-python/PKGBUILD
	testing/kdebindings-qtruby/PKGBUILD
	testing/kdebindings-qyoto/PKGBUILD
	testing/kdebindings-smokegen/PKGBUILD
	testing/kdebindings-smokekde/PKGBUILD
	testing/kdebindings-smokeqt/PKGBUILD
	testing/kdeedu-analitza/PKGBUILD
	testing/kdeedu-blinken/PKGBUILD
	testing/kdeedu-cantor/PKGBUILD
	testing/kdeedu-kalgebra/PKGBUILD
	testing/kdeedu-kalzium/PKGBUILD
	testing/kdeedu-kanagram/PKGBUILD
	testing/kdeedu-kbruch/PKGBUILD
	testing/kdeedu-kgeography/PKGBUILD
	testing/kdeedu-khangman/PKGBUILD
	testing/kdeedu-kig/PKGBUILD
	testing/kdeedu-kiten/PKGBUILD
	testing/kdeedu-klettres/PKGBUILD
	testing/kdeedu-kmplot/PKGBUILD
	testing/kdeedu-kstars/PKGBUILD
	testing/kdeedu-ktouch/PKGBUILD
	testing/kdeedu-kturtle/PKGBUILD
	testing/kdeedu-kwordquiz/PKGBUILD
	testing/kdeedu-marble/PKGBUILD
	testing/kdeedu-pairs/PKGBUILD
	testing/kdeedu-parley/PKGBUILD
	testing/kdeedu-rocs/PKGBUILD
	testing/kdeedu-step/PKGBUILD
	testing/kdegames/PKGBUILD
	testing/kdegraphics-gwenview/PKGBUILD
	testing/kdegraphics-kamera/PKGBUILD
	testing/kdegraphics-kcolorchooser/PKGBUILD
	testing/kdegraphics-kgamma/PKGBUILD
	testing/kdegraphics-kolourpaint/PKGBUILD
	testing/kdegraphics-kruler/PKGBUILD
	testing/kdegraphics-ksaneplugin/PKGBUILD
	testing/kdegraphics-ksnapshot/PKGBUILD
	testing/kdegraphics-mobipocket/PKGBUILD
	testing/kdegraphics-okular/PKGBUILD
	testing/kdegraphics-strigi-analyzer/PKGBUILD
	testing/kdegraphics-svgpart/PKGBUILD
	testing/kdegraphics-thumbnailers/PKGBUILD
	testing/kdemultimedia-audiocd-kio/PKGBUILD
	testing/kdemultimedia-dragonplayer/PKGBUILD
	testing/kdemultimedia-ffmpegthumbs/PKGBUILD
	testing/kdemultimedia-juk/PKGBUILD
	testing/kdemultimedia-kmix/PKGBUILD
	testing/kdemultimedia-kscd/PKGBUILD
	testing/kdemultimedia-mplayerthumbs/PKGBUILD
	testing/kdenetwork/PKGBUILD
	testing/kdepim-runtime/PKGBUILD
	testing/kdepim/PKGBUILD
	testing/kdepimlibs/PKGBUILD
	testing/kdeplasma-addons/PKGBUILD
	testing/kdesdk-kate/PKGBUILD
	testing/kdesdk/PKGBUILD
	testing/kdetoys/PKGBUILD
	testing/kdeutils-filelight/PKGBUILD
	testing/kdeutils-kcalc/PKGBUILD
	testing/kdeutils-kcharselect/PKGBUILD
	testing/kdeutils-kdf/PKGBUILD
	testing/kdeutils-kfloppy/PKGBUILD
	testing/kdeutils-kgpg/PKGBUILD
	testing/kdeutils-kremotecontrol/PKGBUILD
	testing/kdeutils-ktimer/PKGBUILD
	testing/kdeutils-kwallet/PKGBUILD
	testing/kdeutils-superkaramba/PKGBUILD
	testing/kdeutils-sweeper/PKGBUILD
	testing/kdewebdev/PKGBUILD
	testing/kmod/PKGBUILD
	testing/libkcddb/PKGBUILD
	testing/libkcompactdisc/PKGBUILD
	testing/libkdcraw/PKGBUILD
	testing/libkdeedu/PKGBUILD
	testing/libkexiv2/PKGBUILD
	testing/libkipi/PKGBUILD
	testing/libksane/PKGBUILD
	testing/libmpc/PKGBUILD
	testing/nepomuk-core/PKGBUILD
	testing/procps-ng/PKGBUILD
	testing/sudo/PKGBUILD
	testing/sysvinit/PKGBUILD
	testing/util-linux/PKGBUILD
	testing/util-linux/util-linux.install

2 files changed, 16 insertions, 4 deletions

diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD
index e9e6d7c32..3aa0a50b3 100644
--- a/core/ppp/PKGBUILD
+++ b/core/ppp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142987 2011-11-19 20:10:23Z thomas $
+# $Id: PKGBUILD 166496 2012-09-08 11:35:07Z thomas $
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 pkgname=ppp
 pkgver=2.4.5
-pkgrel=3
+pkgrel=4
 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking"
 arch=(i686 x86_64 'mips64el') 
 url="http://www.samba.org/ppp/"
@@ -20,7 +20,8 @@ source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz
         ip-up
         ip-down
         ip-up.d.dns.sh
-        ip-down.d.dns.sh)
+        ip-down.d.dns.sh
+        ppp.systemd)
 md5sums=('4621bc56167b6953ec4071043fe0ec57'
          '7a9259a8f038073eeea7e4552ff1849f'
          '48c024f73a80c8b69c4def22f86902cc'
@@ -31,7 +32,8 @@ md5sums=('4621bc56167b6953ec4071043fe0ec57'
          'e4beb16ed600b61336d50b2bd2df7cd5'
          '2fa0671f40711e69194ccf60979f8b33'
          '4a074d74c29625b254a1db720cb87b99'
-         '8d1be5af8e46393ba6eb273377831e38')
+         '8d1be5af8e46393ba6eb273377831e38'
+         'fafead5c9d66d0574e6f0a2e5f4d4631')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -77,4 +79,5 @@ package() {
   install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1"
   install -d -m755 "${pkgdir}/etc/ppp/peers" 
   chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so
+  install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service
 }
diff --git a/core/ppp/ppp.systemd b/core/ppp/ppp.systemd
new file mode 100644
index 000000000..a5c490a73
--- /dev/null
+++ b/core/ppp/ppp.systemd
@@ -0,0 +1,9 @@
+[Unit]
+Description=PPP link to %I
+Before=network.target
+
+[Service]
+ExecStart=/usr/sbin/pppd call %I nodetach
+
+[Install]
+WantedBy=multi-user.target