gnu: Move contents of zip module into compression module.

* gnu/packages/zip.scm (zip, unzip, zziplib, perl-zip): Move to...
* gnu/packages/compression.scm: ...here.
* gnu/packages/zip.scm: Delete file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Unregister deleted file.
* po/packages/POTFILES.in: Unregister deleted file.
* gnu/packages/{audio, avr, bioinformatics, busybox, cdrom, ci, compression,
docbook, documentation, fonts, fpga, game-development, games, gl, gnome,
gnuzilla, graphics, guile, haskell, image, java, kodi, ldc, libreoffice,
markup, maths, mc, monitoring, music, php, pretty-print, python, scheme,
smalltalk, statistics, synergy, tex, textutils, video, web-browsers, xml,
zip}.scm, guix/build-system/{ant, font}.scm, guix/{download, packages}.scm:
Adapt module import.

1 files changed, 0 insertions, 183 deletions

diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm
deleted file mode 100644
index 018891359b..0000000000
--- a/gnu/packages/zip.scm
+++ /dev/null
@@ -1,183 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages zip)
-  #:use-module ((guix licenses) #:prefix license:)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages perl)
-  #:use-module (guix build-system perl)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python))
-
-(define-public zip
-  (package
-    (name "zip")
-    (version "3.0")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://sourceforge/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz"))
-      (sha256
-       (base32
-        "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"))))
-    (build-system gnu-build-system)
-    (inputs `(("bzip2" ,bzip2)))
-    (arguments
-     `(#:tests? #f ; no test target
-       #:make-flags (let ((out (assoc-ref %outputs "out")))
-                      (list "-f" "unix/Makefile"
-                            (string-append "prefix=" out)
-                            (string-append "MANDIR=" out "/share/man/man1")))
-       #:modules ((guix build gnu-build-system)
-                  (guix build utils)
-                  (srfi srfi-1))
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'build
-                  (lambda* (#:key (make-flags '()) #:allow-other-keys)
-                    (zero? (apply system* "make" "generic_gcc" make-flags))))
-         (delete 'configure))))
-    (home-page "http://www.info-zip.org/Zip.html")
-    (synopsis "Compression and file packing utility")
-    (description
-     "Zip is a compression and file packaging/archive utility.  Zip is useful
-for packaging a set of files for distribution, for archiving files, and for
-saving disk space by temporarily compressing unused files or directories.
-Zip puts one or more compressed files into a single ZIP archive, along with
-information about the files (name, path, date, time of last modification,
-protection, and check information to verify file integrity).  An entire
-directory structure can be packed into a ZIP archive with a single command.
-
-Zip has one compression method (deflation) and can also store files without
-compression.  Zip automatically chooses the better of the two for each file.
-Compression ratios of 2:1 to 3:1 are common for text files.")
-  (license (license:non-copyleft "file://LICENSE"
-                               "See LICENSE in the distribution."))))
-
-(define-public unzip
-  (package (inherit zip)
-    (name "unzip")
-    (version "6.0")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://sourceforge/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz"))
-      (sha256
-       (base32
-        "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"))
-      (patches (search-patches "unzip-CVE-2014-8139.patch"
-                               "unzip-CVE-2014-8140.patch"
-                               "unzip-CVE-2014-8141.patch"
-                               "unzip-CVE-2014-9636.patch"
-                               "unzip-CVE-2015-7696.patch"
-                               "unzip-CVE-2015-7697.patch"
-                               "unzip-allow-greater-hostver-values.patch"
-                               "unzip-initialize-symlink-flag.patch"
-                               "unzip-remove-build-date.patch"
-                               "unzip-attribs-overflow.patch"
-                               "unzip-overflow-on-invalid-input.patch"
-                               "unzip-format-secure.patch"
-                               "unzip-overflow-long-fsize.patch"))))
-    (build-system gnu-build-system)
-    ;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (delete 'configure)
-                  (replace 'build
-                           (lambda* (#:key make-flags #:allow-other-keys)
-                             (zero? (apply system* "make"
-                                           `("-j" ,(number->string
-                                                    (parallel-job-count))
-                                             ,@make-flags
-                                             "generic_gcc"))))))
-       #:make-flags (list "-f" "unix/Makefile"
-                          (string-append "prefix=" %output)
-                          (string-append "MANDIR=" %output "/share/man/man1"))))
-    (home-page "http://www.info-zip.org/UnZip.html")
-    (synopsis "Decompression and file extraction utility")
-    (description
-     "UnZip is an extraction utility for archives compressed in .zip format,
-also called \"zipfiles\".
-
-UnZip lists, tests, or extracts files from a .zip archive.  The default
-behaviour (with no options) is to extract into the current directory, and
-subdirectories below it, all files from the specified zipfile.  UnZip
-recreates the stored directory structure by default.")
-  (license (license:non-copyleft "file://LICENSE"
-                               "See LICENSE in the distribution."))))
-
-(define-public zziplib
-  (package
-    (name "zziplib")
-    (version "0.13.62")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://sourceforge/zziplib/zziplib13/"
-                          version "/zziplib-"
-                          version ".tar.bz2"))
-      (patches (search-patches "zziplib-CVE-2017-5974.patch"
-                               "zziplib-CVE-2017-5975.patch"
-                               "zziplib-CVE-2017-5976.patch"
-                               "zziplib-CVE-2017-5978.patch"
-                               "zziplib-CVE-2017-5979.patch"
-                               "zziplib-CVE-2017-5981.patch"))
-      (sha256
-       (base32
-        "0nsjqxw017hiyp524p9316283jlf5piixc1091gkimhz38zh7f51"))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("zlib" ,zlib)))
-    (native-inputs `(("perl" ,perl)     ; for the documentation
-                     ("pkg-config" ,pkg-config)
-                     ("python" ,python-2) ; for the documentation; Python 3 not supported,
-                                        ; http://forums.gentoo.org/viewtopic-t-863161-start-0.html
-                     ("zip" ,zip))) ; to create test files
-    (arguments
-     `(#:parallel-tests? #f)) ; since test files are created on the fly
-    (home-page "http://zziplib.sourceforge.net/")
-    (synopsis "Library for accessing zip files")
-    (description
-     "ZZipLib is a library based on zlib for accessing zip files.")
-    (license license:lgpl2.0+)))
-
-
-(define-public perl-zip
-  (package
-    (name "perl-zip")
-    (version "1.59")
-    (source 
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "mirror://cpan/authors/id/A/AD/ADAMK/Archive-Zip-" 
-             version ".tar.gz"))
-       (sha256
-        (base32
-         "0m31qlppg65vh32pwxkwjby02q70abx49d2yk6vfd4585fqb27cx"))))
-    (build-system perl-build-system)
-    (synopsis  "Provides an interface to ZIP archive files")
-    (description "The Archive::Zip module allows a Perl program to create,
-manipulate, read, and write Zip archive files.")
-    (home-page "http://search.cpan.org/~adamk/Archive-Zip-1.30/")
-    (license license:perl-license)))