* doc/guix.texi (Invoking guix package): Mention the declarative approach and
  --manifest in the intro.  And an anchor for --manifest.  Explain why/how it
  can be used.  Tweak wording.

* gnu/packages/package-management.scm (guix-devel): Update to c2ee19e6.

* gnu/services/base.scm (swap-service)[start, stop]: Use 'restart-on-EINTR'.
* guix/build/syscalls.scm (swapoff): Fix typo in 'throw' arguments.

* guix/build/syscalls.scm (call-with-restart-on-EINTR): New procedure.
  (restart-on-EINTR): New macro.

* gnu/packages/python.scm (python-pyzmq, python2-pyzmq): New variables.

* gnu/packages/video.scm (youtube-dl): Update to 2015.05.20.

* gnu/packages/patches/fuse-CVE-2015-3202.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/linux.scm (fuse): Add patch.

* gnu/services/xorg.scm (xorg-configuration-file): Add XF86-INPUT-LIBINPUT.

* gnu/services/xorg.scm (slim-service): Expect STARTX to be a regular value,
  not a monadic value.

* gnu/services/xorg.scm (xorg-configuration-file): Add #:extra-config and
  honor it.
* doc/guix.texi (X Window): Adjust accordingly.

* gnu/services/xorg.scm (xorg-configuration-file): New procedure, with code
  formerly in 'xorg-start-command'.
  (xorg-start-command): Remove #:drivers and #:resolutions; add
  #:configuration-file; use it as well as 'xorg-configuration-file'.

* guix/scripts/package.scm (show-help): Add KIND parameter for
  --search-paths as a followup to dbc31ab2.

* guix/scripts/build.scm (set-build-options-from-command-line*): New
  procedure.
* guix/scripts/environment.scm (set-build-options-from-command-line*): Delete.

* guix/ui.scm (show-what-to-build*): New procedure.
* guix/scripts/environment.scm (show-what-to-build*): Delete.
* guix/scripts/system.scm (show-what-to-build*): Likewise.
* build-aux/make-binary-tarball.scm (show-what-to-build*): Likewise.

* gnu/packages/games.scm (fizmo): New variable.

* gnu/packages/patches/r-fix-15899.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/statistics.scm (r)[source]: Use it.

* gnu/packages/pdf.scm (zathura): Update to 0.3.3.

* gnu/packages/gtk.scm (girara): Update to 0.2.4.

* gnu/packages/gnome.scm (gconf): Propagate input glib.
  (gnome-vfs): Drop input glib.
  (libgnome): Drop propagated input glib.
* gnu/packages/ibus.scm (ibus): Drop input glib.

* gnu/packages/maths.scm (lpsolve): New variable.

* gnu/packages/patches/bitlbee-configure-doc-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/messaging.scm (bitlbee): Update to 3.4.  Add patch.
  [inputs]: Remove 'zlib'.

This reverts commit 4bfeb0ca.

This reverts commit 8c3a5d70, which is no
longer needed due to commit b2a5fa59.

* gnu/system/install.scm (self-contained-tarball): Pass
  "./root/.guix-profile", "./var/guix", and "./gnu" to 'tar' command instead
  of ".".

* guix/scripts/package.scm (show-help): Add help text.
  (%options): Add manifest option.
  (guix-package): Add manifest option handler.
* doc/guix.texi ("Invoking guix package"): Document it.
* tests/guix-package.sh: Add test.

* guix/profiles.scm (packages->manifest): New procedure.

* guix/ui.scm (make-user-module, load*): New procedures.
* guix/scripts/system.scm (%user-module): Define in terms of
  'make-user-module'.
  (read-operating-system): Define in terms of load*'.

* gnu/packages/game-development.scm (sfxr): New variable.

* gnu/packages/maths.scm (openblas)[arguments]: Do not pass DYNAMIC_ARCH when
  building for MIPS.  Also make non-substitutable for MIPS.

* nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter): Reinstate
  commit 9ba0b8d3.  Fixes a regression introduced in 2bb04905.

* guix/ftp-client.scm (ftp-open): When '%ftp-listen' returns something
  different from 220, throw instead of writing an error message.

* guix/scripts/package.scm (search-path-environment-variables): Add #:kind
  parameter.  Pass it to 'environment-variable-definition'.
  (display-search-paths): Add #:kind parameter and pass it to
  'search-path-environment-variables'.
  (%options): Add an optional parameter for "--search-paths".
  (guix-package)[process-query]: Handle it.
* tests/guix-package-net.sh: Adjust existing test.
* tests/guix-package.sh: Adjust existing tests and add new test.
* doc/guix.texi (Invoking guix package): Document it.

* guix/scripts/package.scm (search-path-environment-variables): Add $PATH to
  SEARCH-PATHS.

* gnu/packages/feh.scm (feh): Update to 2.13.

* gnu/packages/scheme.scm (mit-scheme)[inputs]: Add libx11.

* gnu/packages/guile.scm (guile-for-guile-emacs): New variable.
* gnu/packages/emacs.scm (guile-emacs): New variable.

* gnu/packages/cdrom.scm (xorriso): Update to 1.4.0.

* doc/guix.texi (Defining Packages): Link to "package Reference".  Add menu.
(package Reference, origin Reference): New subsections.

* gnu/packages/fltk.scm (fltk)[inputs]: Add libjpeg, libpng, and zlib.
  [arguments]: Add 'patch-config' phase.

* gnu/packages/xfce.scm (xfce4-clipman-plugin): New variable.
  (xfce)[propagated-inputs]: Add it.