Merge branch 'core-updates'

gnu: libmicrohttpd: Update to 0.9.40.

* gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.40.

Merge branch 'master' into core-updates

gnu: Update packages to use 'non-copyleft' instead of 'bsd-style'.

* gnu/packages/avr.scm, gnu/packages/compression.scm,
  gnu/packages/curl.scm, gnu/packages/cyrus-sasl.scm,
  gnu/packages/databases.scm, gnu/packages/firmware.scm,
  gnu/packages/flex.scm, gnu/packages/fontutils.scm,
  gnu/packages/gd.scm, gnu/packages/ghostscript.scm,
  gnu/packages/gnunet.scm, gnu/packages/graphics.scm,
  gnu/packages/hugs.scm, gnu/packages/image.scm,
  gnu/packages/linux.scm, gnu/packages/mail.scm,
  gnu/packages/maths.scm, gnu/packages/mit-krb5.scm,
  gnu/packages/python.scm, gnu/packages/rdf.scm,
  gnu/packages/ssh.scm, gnu/packages/tcl.scm,
  gnu/packages/xdisorg.scm, gnu/packages/xiph.scm,
  gnu/packages/yasm.scm, gnu/packages/zip.scm: Use 'non-copyleft'
  instead of 'bsd-style'.

gnu: gnunet: Update to 0.10.1.

* gnu/packages/gnunet.scm (gnunet): Update to 0.10.1.
  Adapt environment variable GNUNET_PREFIX to new use.
  Disable parallel tests.
  Disable tests until a failure is fixed.
* gnu/packages/patches/gnunet-fix-scheduler.patch,
  gnu/packages/patches/gnunet-fix-tests.patch: Delete patch files.
* gnu-system.am (dist_patch_DATA): Unregister patches.

gnu: libextractor: Adjust to deal with current libmagic.

* gnu/packages/gnunet.scm (libextractor)[source]: Add 'snippet'.
  (libextractor)[inputs]: Remove GNU-GETTEXT, which was unneeded.  Add
  FILE.

gnu: libmicrohttpd: Update to 0.9.39.

* gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.39.

Merge branch 'core-updates'

Conflicts:
	gnu/packages/bootstrap.scm

gnu: Make libtool and libltdl completely separate.

* gnu/packages/autotools.scm (libtool)[outputs]: Remove.
  [arguments]: Remove 'if' around arguments.  Add #:configure-flags.
* gnu/packages/apr.scm (apr)[inputs]: Change libtool to libltdl.
* gnu/packages/fontutils.scm (libuninameslist)[native-inputs]: Remove
  "libtool-bin".
* gnu/packages/global.scm (global): Change libtool to libltdl.
* gnu/packages/gnunet.scm (libextractor, gnunet): Likewise.
* gnu/packages/graphviz.scm (graphviz): Likewise.
* gnu/packages/libcanberra.scm (libcanberra): Likewise.
* gnu/packages/libevent.scm (libuv)[native-inputs]: Remove "bin" part
  for libtool.
* gnu/packages/mail.scm (mailutils): Change libtool to libltdl.
  (libetpan): Remove "bin" part for libtool.
* gnu/packages/mp3.scm (libmp3splt): Change libtool to libltdl.
* gnu/packages/openldap.scm (openldap): Remove "bin" part of libtool.
  Move it from 'inputs' to 'native-inputs'.
* gnu/packages/photo.scm (libgphoto2): Change libtool to libltdl.
* gnu/packages/pulseaudio.scm (pulseaudio): Likewise.
* gnu/packages/ssh.scm (guile-ssh): Remove "bin" part of libtool.
* gnu/packages/web.scm (libpsl): Likewise.
* gnu/packages/weechat.scm (weechat): Move libtool to 'native-inputs'
  and add libltdl to 'inputs'.

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

gnu: libmicrohttpd: Update to 0.9.38.

* gnu/packages/gnunet.scm (libmicrohttpd): Update to 0.9.38.

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.

Use #:prefix instead of #:renamer with 'symbol-prefix-proc'.

* gnu/packages/abiword.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm,
  gnu/packages/backup.scm, gnu/packages/bittorrent.scm,
  gnu/packages/boost.scm, gnu/packages/compression.scm,
  gnu/packages/cryptsetup.scm, gnu/packages/curl.scm,
  gnu/packages/cyrus-sasl.scm, gnu/packages/dc.scm, gnu/packages/emacs.scm,
  gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/geeqie.scm,
  gnu/packages/ghostscript.scm, gnu/packages/gimp.scm,
  gnu/packages/gkrellm.scm, gnu/packages/gl.scm, gnu/packages/glib.scm,
  gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
  gnu/packages/gnutls.scm, gnu/packages/gnuzilla.scm, gnu/packages/gsasl.scm,
  gnu/packages/gtk.scm, gnu/packages/gv.scm, gnu/packages/image.scm,
  gnu/packages/indent.scm, gnu/packages/inkscape.scm,
  gnu/packages/lesstif.scm, gnu/packages/links.scm, gnu/packages/lisp.scm,
  gnu/packages/lsh.scm, gnu/packages/lsof.scm, gnu/packages/maths.scm,
  gnu/packages/mp3.scm, gnu/packages/openssl.scm, gnu/packages/ots.scm,
  gnu/packages/pciutils.scm, gnu/packages/pcre.scm, gnu/packages/pdf.scm,
  gnu/packages/pulseaudio.scm, gnu/packages/python.scm, gnu/packages/slim.scm,
  gnu/packages/ssh.scm, gnu/packages/texlive.scm, gnu/packages/vim.scm,
  gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wv.scm,
  gnu/packages/xiph.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm,
  gnu/packages/yasm.scm, gnu/packages/zip.scm,
  guix/build/cmake-build-system.scm, guix/build/perl-build-system.scm,
  guix/build/python-build-system.scm, guix/download.scm: Replaces uses of
  #:renamer and 'symbol-prefix-proc' with #:prefix.

Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/image.scm

gnu: Consolidate databases in (gnu packages databases).

* gnu/packages/databases.scm: New file, with the contents of the
  following deleted files.
* gnu/packages/mysql.scm, gnu/packages/postgresql.scm,
  gnu/packages/recutils.scm, gnu/packages/sqlite.scm,
  gnu/packages/bdb.scm: Remove.
* gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly.
* gnu/packages/apl.scm, gnu/packages/dc.scm, gnu/packages/games.scm,
  gnu/packages/gnunet.scm, gnu/packages/linux.scm, gnu/packages/mail.scm,
  gnu/packages/mpd.scm, gnu/packages/nvi.scm, gnu/packages/openldap.scm,
  gnu/packages/package-management.scm, gnu/packages/python.scm,
  gnu/packages/qt.scm, gnu/packages/rdf.scm,
  gnu/packages/version-control.scm: Adjust to new module name.

Merge branch 'master' into core-updates

gnu: gnurl: Update to 7.37.0.

* gnu/packages/gnunet.scm (gnurl): Update to 7.37.0.

gnu: Consolidate libjpeg, libpng, and libtiff into one module.

* gnu/packages/image.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add image.scm and remove libjpeg.scm,
  libpng.scm, and libtiff.scm.
* gnu/packages/libjpeg.scm, gnu/packages/libpng.scm, gnu/packages/libtiff.scm:
  Delete files.
* gnu/packages/emacs.scm gnu/packages/games.scm, gnu/packages/gd.scm,
  gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
  gnu/packages/gimp.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm,
  gnu/packages/gnustep.scm, gnu/packages/gnuzilla.scm,
  gnu/packages/graphviz.scm, gnu/packages/gtk.scm,
  gnu/packages/imagemagick.scm, gnu/packages/inkscape.scm,
  gnu/packages/netpbm.scm, gnu/packages/pdf.scm, gnu/packages/plotutils.scm,
  gnu/packages/qemu.scm, gnu/packages/qt.scm, gnu/packages/scheme.scm,
  gnu/packages/sdl.scm, gnu/packages/slim.scm, gnu/packages/tcl.scm,
  gnu/packages/texlive.scm, gnu/packages/video.scm, gnu/packages/xiph.scm,
  gnu/packages/xorg.scm: Use (gnu packages image) module.

gnu: libmicrohttpd: Upgrade to 0.9.37.

* gnu/packages/gnunet.scm (libmicrohttpd): Upgrade to 0.9.37.

gnu: Synchronize synopses and descriptions with the Womb.

* gnu/packages/gnunet.scm (gnunet): Synchronize description and synopsis
  with upstream.
* gnu/packages/maths.scm (units): Likewise.
* gnu/packages/grub.scm (grub): Likewise.
* gnu/packages/pretty-print.scm (enscript): Likewise.