Merge branch 'core-updates'

gnu: cdparanoia: Don't use patchelf.

* gnu/packages/cdrom.scm (cdparanoia): Remove 'patchelf' from inputs.
  [arguments]: Remove #:modules, #:imported-modules and #:phases.  Pass
  'LDFLAGS=-Wl,-rpath=...' as #:configure-flags.
  [origin]: Add 'snippet'.

gnu: Refer to %GNU-BUILD-SYSTEM-MODULES instead of listing modules.

* gnu/packages/cdrom.scm (cdparanoia)[arguments]: Refer to
  %GNU-BUILD-SYSTEM-MODULES instead of providing the actual list.
* gnu/packages/emacs.scm (magit, emacs-w3m, emacs-wget, emms):
  Likewise.
* gnu/packages/haskell.scm (ghc): Likewise.
* gnu/packages/samba.scm (samba): Likewise.
* gnu/packages/video.scm (ffmpeg): Likewise.

Merge branch 'master' into core-updates

gnu: Add libcdio-paranoia.

* gnu/packages/cdrom.scm (libcdio-paranoia): New variable.
* gnu/packages/video.scm (ffmpeg): Add input libcdio-paranoia.

gnu: cdio: Fix description.

* gnu/packages/cdrom.scm (libcdio): This package does not contain pycdio or
  libcdio-paranoia, so remove these from the description.  They can be
  obtained separately from <ftp://ftp.gnu.org/pub/gnu/libcdio/>.

gnu: Move 'which' to (gnu packages base).

* gnu/packages/which.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Remove it.
* gnu/packages/base.scm (which): New variable.
* gnu/packages/aspell.scm, gnu/packages/audio.scm,
  gnu/packages/autogen.scm, gnu/packages/cdrom.scm,
  gnu/packages/compression.scm, gnu/packages/datamash.scm,
  gnu/packages/games.scm, gnu/packages/glib.scm,
  gnu/packages/gnu-pw-mgr.scm, gnu/packages/gnutls.scm,
  gnu/packages/gps.scm, gnu/packages/guile.scm,
  gnu/packages/java.scm, gnu/packages/libevent.scm,
  gnu/packages/linux.scm, gnu/packages/lisp.scm,
  gnu/packages/node.scm, gnu/packages/ntp.scm,
  gnu/packages/orpheus.scm, gnu/packages/pciutils.scm,
  gnu/packages/python.scm, gnu/packages/qt.scm,
  gnu/packages/rsync.scm, gnu/packages/sawfish.scm,
  gnu/packages/scheme.scm, gnu/packages/ssh.scm,
  gnu/packages/statistics.scm, gnu/packages/texlive.scm,
  gnu/packages/wdiff.scm: Adjust accordingly.

Merge branch 'master' into 'core-updates'.

gnu: cd-discid: Fix download location.

* gnu/packages/cdrom.scm (cd-discid): Fix download location.

gnu: Add abcde.

* gnu/packages/cdrom.scm (abcde): New variable.

gnu: Add cd-discid.

* gnu/packages/cdrom.scm (cd-discid): New variable.

gnu: libcdio: Update to 0.93.

* gnu/packages/cdrom.scm (libcdio): Update to 0.93.

gnu: Some cleanup based on lint checkers.

* gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm,
  gnu/packages/apr.scm, gnu/packages/avahi.scm, gnu/packages/backup.scm,
  gnu/packages/base.scm, gnu/packages/calcurse.scm, gnu/packages/cdrom.scm,
  gnu/packages/check.scm, gnu/packages/compression.scm, gnu/packages/cook.scm,
  gnu/packages/crypto.scm, gnu/packages/cryptsetup.scm, gnu/packages/curl.scm,
  gnu/packages/cyrus-sasl.scm, gnu/packages/databases.scm,
  gnu/packages/doxygen.scm, gnu/packages/dwm.scm, gnu/packages/elf.scm,
  gnu/packages/emacs.scm, gnu/packages/feh.scm, gnu/packages/file.scm,
  gnu/packages/fish.scm, gnu/packages/flex.scm, gnu/packages/fltk.scm,
  gnu/packages/fontutils.scm, gnu/packages/games.scm, gnu/packages/gcal.scm,
  gnu/packages/gcc.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
  gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/glib.scm,
  gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
  gnu/packages/gperf.scm, gnu/packages/grub.scm, gnu/packages/gsasl.scm,
  gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile.scm,
  gnu/packages/hurd.scm, gnu/packages/icu4c.scm, gnu/packages/image.scm,
  gnu/packages/imagemagick.scm, gnu/packages/irssi.scm, gnu/packages/kde.scm,
  gnu/packages/libdaemon.scm, gnu/packages/libevent.scm,
  gnu/packages/libidn.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm,
  gnu/packages/lout.scm, gnu/packages/lsh.scm, gnu/packages/lsof.scm,
  gnu/packages/lua.scm, gnu/packages/maths.scm, gnu/packages/mcrypt.scm,
  gnu/packages/mp3.scm, gnu/packages/netpbm.scm, gnu/packages/noweb.scm,
  gnu/packages/ocaml.scm, gnu/packages/openssl.scm, gnu/packages/pcre.scm,
  gnu/packages/pdf.scm, gnu/packages/pkg-config.scm,
  gnu/packages/pretty-print.scm, gnu/packages/python.scm, gnu/packages/qt.scm,
  gnu/packages/rsync.scm, gnu/packages/scheme.scm, gnu/packages/scrot.scm,
  gnu/packages/sdl.scm, gnu/packages/skribilo.scm, gnu/packages/ssh.scm,
  gnu/packages/stalonetray.scm, gnu/packages/tcl.scm, gnu/packages/tcsh.scm,
  gnu/packages/telephony.scm, gnu/packages/texlive.scm, gnu/packages/tor.scm,
  gnu/packages/valgrind.scm, gnu/packages/version-control.scm,
  gnu/packages/vim.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
  gnu/packages/web.scm, gnu/packages/wordnet.scm, gnu/packages/xiph.scm,
  gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/packages/zile.scm,
  gnu/packages/zip.scm, gnu/packages/zsh.scm [synopsis, description]: Adjust
  according to lint checkers.
* gnu/packages/fltk.scm (fltk)[source]: Wrap long line in uri.
* /gnu/packages/xiph.scm (libogg, libtheora, vorbis-tools)[source]: Same.

gnu: Fix typos.

* gnu/packages/cdrom.scm (cdparanoia): Double space in description.
* gnu/packages/maths.scm (hdf5): Double space in synopsis.

Merge branch 'master' into core-updates

gnu: xorriso: Upgrade to 3.1.8.

* gnu/packages/cdrom.scm (xorriso): Upgrade to 3.1.8.

gnu: dvdisaster: Upgrade to 0.72.6.

* gnu/packages/cdrom.scm (dvdisaster): Upgrade to 0.72.6.

gnu: Move help2man package to (gnu packages man) module.

* gnu/packages/man.scm (help2man): New variable.
* gnu/packages/help2man.scm: Delete it.
* gnu/packages/cdrom.scm: Import (gnu packages man).
* gnu/packages/zile.scm: Import (gnu packages man).
* gnu-system.am (GNU_SYSTEM_MODULES): Delete 'gnu/packages/help2man.scm'.

gnu: dvdisaster: Build sequentially.

* gnu/packages/cdrom.scm (dvdisaster)[arguments]: Add #:parallel-build? #f.

gnu: xorriso: Upgrade to 1.3.6.pl01.

* gnu/packages/cdrom.scm (xorriso): Upgrade to 1.3.6.pl01.