patch
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
  patch
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD

* refs/remotes/gh/experimental/marc: (54 commits)
  for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work
  update zsh 5.0.0, make zprofile hack optional, sh and posix compatibility have been improved also it ships with sytemd completion
  update ati, make compile with 3.7 (gentoo patches)
  haxe-latest
  New TopGit dependency: experimental/ruby
  fix sort in lists.nix
  merge failure
  source of gupnp-igd is gone, too, use ubuntu source (launchpad) - same hash
  New TopGit dependency: experimental/eclipse
  2.6-2 moved to 2.6-3, so patches were not found
  libreoffice startup hack
  fix merge failure (hash)
  for eclipse use older cairo. With newer cairo Eclipse crashes after selecting a workspace
  Revert "cairo: Update to 1.12.4"
  New TopGit dependency: experimental/parallel-building
  reset jdk stuff to master. Don't know why it was different at all
  adding csound
  sox: parallelbuilding, flac, ogg support
  parallel building for sane
  Revert "openjdk: Don't use the official build system's boostrapping, do our own."
  ...