* gnu/packages/terminals.scm (kmscon)[license]: Add lgpl2.1+, bsd-2 and gpl2+.

* gnu/packages/terminals.scm (libtsm)[license]: Add lgpl2.1+, isc and bsd-2.

* gnu/packages/python.scm (python-ipaddress): New variable.
(python2-ipaddress): Use package-with-python2.

* gnu/packages/python.scm (python-url): New variable.
(python2-url): New variable.

* gnu/packages/python.scm (python-publicsuffix2): New variable.
(python2-publicsuffix2): New variable.

* gnu/packages/python.scm (python-publicsuffix): New variable.
(python2-publicsuffix): New variable.

* gnu/packages/python.scm (python-schematics): New variable.
(python2-schematics): New variable.

* gnu/packages/python.scm (python-sh): New variable.
(python2-sh): New variable.

* gnu/packages/python.scm (python-pymongo): New variable.
(python2-pymongo): New variable.

* gnu/packages/python.scm (python-nltk): New variable.
(python2-nltk): New variable.

* gnu/packages/python.scm (python-binaryornot): New variable.
(python2-binaryornot): New variable.

* gnu/packages/python.scm (define-module): Add import.

* guix/import/utils.scm
(define-module): Import licenses with license: prefix.
(string->licenses): Use prefixed licenses.
(license->symbol): Return symbols with the prefix license:.
* guix/tests/pypi.scm (pypi->guix-package): Update test cases.
* guix/tests/gem.scm (gem->guix-package): Update test case.

* gnu/packages/messaging.scm (prosody): New variable.

* gnu/packages/lua.scm (lua5.1-sec): New variable.

* gnu/packages/lua.scm (lua5.1-filesystem): New variable.

* gnu/packages/lua.scm (lua5.1-socket): New variable.

* gnu/packages/lua.scm (lua5.1-expat): New variable.

* gnu/packages/gstreamer.scm (define-module): Import guix licenses with
"license:" prefix.

* gnu/packages/lua.scm (lua)[arguments]: Use regular build phase and add
make-flags.

* gnu/packages/networking.scm (bwm-ng): New variable.

* gnu/packages/patches/mupdf-CVE-2016-6265.patch,
gnu/packages/patches/mupdf-CVE-2016-6525.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/pdf.scm (mupdf): Use them.

When incorporating a copyleft licensed program with a lax licensed program,
it is correct to preserve the original license notice.  See also:
  https://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html

* guix/base64.scm: Restored original license header.

* gnu/packages/maths.scm (octave): Update to 4.0.3.
[inputs]: Remove unnecessary curl, cyrus-sasl and openssl dependencies.

* gnu/packages/gnupg.scm (python-gnupg)[arguments]: Fix check phase.

* gnu/packages/linux.scm (btrfs-progs): Update to 4.7.1.

* gnu/packages/enlightenment.scm (enlightenment)[propagated-inputs]:
Move efl from here ...
[inputs]: ... to here.

* gnu/packages/enlightenment.scm (enlightenment)[inputs]: Move gettext
from here ...
[native-inputs]: ... to here.

* gnu/packages/enlightenment.scm (rage): Update to 0.2.0.

* gnu/packages/enlightenment.scm (python-efl): Update to 1.18.0.

* gnu/packages/enlightenment.scm (efl): Update to 1.18.0.
[inputs]: Add ghostscript, libraw, libspectre, openjpeg, poppler.
[arguments]: Remove unecessary 'patch-config-files phase, add phase
hardlinking the location of pulseaudio and libsndfile.
* gnu/packages/enlightenment.scm (terminology, enlightenment, rage)
(python-efl)[inputs]: Remove elementary, now provided by efl.

* gnu/packages/linux.scm (btrfs-progs): Update to 4.7.
[native-inputs]: Add missing header comment for which.

* gnu/packages/admin.scm (fdupes)[arguments]: Use 'modify-phases'.

* gnu/packages/admin.scm (fdupes): Update to 1.6.1.
[source]: Update 'uri' template, add 'file-name' field.
[arguments]: Set CC in make-flags.

* gnu/packages/emacs.scm (emacs-ahungry-theme): New variable.

Signed-off-by: Alex Kost <alezost@gmail.com>

* gnu/packages/emacs.scm (emacs-f): Update to 0.18.2.

* gnu/packages/emacs.scm (emacs-s): Update to 1.11.0.

* gnu/packages/emacs.scm (emacs-dash): Update to 2.13.0.

* gnu/packages/emacs.scm (magit, emacs-magit-popup): Update to 2.8.0.

* gnu/packages/emacs.scm (emacs-with-editor): Update to 2.5.2.