From 166191b377e2e6117ab2a620e759724f7e446678 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 14 Mar 2015 19:26:34 +0100
Subject: 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/packages/avr.scm         | 2 +-
 gnu/packages/compression.scm | 2 +-
 gnu/packages/curl.scm        | 2 +-
 gnu/packages/cyrus-sasl.scm  | 4 ++--
 gnu/packages/databases.scm   | 6 +++---
 gnu/packages/firmware.scm    | 2 +-
 gnu/packages/flex.scm        | 2 +-
 gnu/packages/fontutils.scm   | 2 +-
 gnu/packages/gd.scm          | 4 ++--
 gnu/packages/ghostscript.scm | 2 +-
 gnu/packages/gnunet.scm      | 4 ++--
 gnu/packages/graphics.scm    | 2 +-
 gnu/packages/hugs.scm        | 4 ++--
 gnu/packages/image.scm       | 4 ++--
 gnu/packages/linux.scm       | 2 +-
 gnu/packages/mail.scm        | 4 ++--
 gnu/packages/maths.scm       | 6 +++---
 gnu/packages/mit-krb5.scm    | 2 +-
 gnu/packages/python.scm      | 4 ++--
 gnu/packages/rdf.scm         | 4 ++--
 gnu/packages/ssh.scm         | 2 +-
 gnu/packages/tcl.scm         | 2 +-
 gnu/packages/xdisorg.scm     | 2 +-
 gnu/packages/xiph.scm        | 8 ++++----
 gnu/packages/yasm.scm        | 2 +-
 gnu/packages/zip.scm         | 4 ++--
 26 files changed, 42 insertions(+), 42 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm
index 3f8e827707..d7ca1b1ace 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -48,4 +48,4 @@
     (description
      "AVR Libc is a project whose goal is to provide a high quality C library
 for use with GCC on Atmel AVR microcontrollers.")
-    (license (bsd-style "http://www.nongnu.org/avr-libc/LICENSE.txt"))))
+    (license (non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt"))))
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 721fb9e9b1..8b36766200 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -191,7 +191,7 @@ compressor.  It typically compresses files to within 10% to 15% of the best
 available techniques (the PPM family of statistical compressors), whilst
 being around twice as fast at compression and six times faster at
 decompression.")
-      (license (license:bsd-style "file://LICENSE"
+      (license (license:non-copyleft "file://LICENSE"
                                   "See LICENSE in the distribution."))
       (home-page "http://www.bzip.org/"))))
 
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 8792ddceaf..821a957615 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -83,6 +83,6 @@ curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading,
 HTTP form based upload, proxies, cookies, user+password authentication
 (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer resume,
 proxy tunneling, and so on")
-   (license (license:bsd-style "file://COPYING"
+   (license (license:non-copyleft "file://COPYING"
                        "See COPYING in the distribution."))
    (home-page "http://curl.haxx.se/")))
diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm
index 9880ace94f..8677cab1bd 100644
--- a/gnu/packages/cyrus-sasl.scm
+++ b/gnu/packages/cyrus-sasl.scm
@@ -61,6 +61,6 @@
 standards-track method for remote computers to authenticate.  The Cyrus SASL
 library makes supporting various SASL mechanisms easy for both client and
 server writers.")
-   (license (license:bsd-style "file://COPYING"
-                       "See COPYING in the distribution."))
+   (license (license:non-copyleft "file://COPYING"
+                                  "See COPYING in the distribution."))
    (home-page "http://cyrusimap.web.cmu.edu/index.php")))
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 16fa5fe7c1..da51c81b96 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -35,7 +35,7 @@
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages python)
   #:use-module ((guix licenses)
-                #:select (gpl2 gpl3+ lgpl2.1+ lgpl3+ x11-style bsd-style
+                #:select (gpl2 gpl3+ lgpl2.1+ lgpl3+ x11-style non-copyleft
                           public-domain))
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -84,8 +84,8 @@
     (description
      "Berkeley DB is an embeddable database allowing developers the choice of
 SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
-    (license (bsd-style "file://LICENSE"
-                        "See LICENSE in the distribution."))
+    (license (non-copyleft "file://LICENSE"
+                           "See LICENSE in the distribution."))
     (home-page
      "http://www.oracle.com/us/products/database/berkeley-db/overview/index.html")))
 
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 68f4e37849..156f3342d3 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -80,4 +80,4 @@
      "This is the firmware for the Qualcomm Atheros AR7010 and AR9271 USB
 802.11n NICs (aka. Wi-Fi USB dongles.)  It is used by the ath9k driver of
 Linux-libre.")
-    (license (bsd-style "http://directory.fsf.org/wiki/License:ClearBSD"))))
+    (license (non-copyleft "http://directory.fsf.org/wiki/License:ClearBSD"))))
diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm
index 0b290857fa..e76535cc17 100644
--- a/gnu/packages/flex.scm
+++ b/gnu/packages/flex.scm
@@ -75,6 +75,6 @@ can be compiled and linked to produce an executable.  When the executable
 is run, it analyzes its input for occurrences of text matching the
 regular expressions for each rule.  Whenever it finds a match, it
 executes the corresponding C code.")
-    (license (bsd-style "file://COPYING"
+    (license (non-copyleft "file://COPYING"
                         "See COPYING in the distribution."))))
 
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 52e34e516f..c04f24b83c 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -103,7 +103,7 @@ efficiently and quickly find needed fonts among the set of installed fonts;
 be used in concert with the X Render Extension and FreeType to implement
 high quality, anti-aliased and subpixel rendered text on a display.")
    ; The exact license is more X11-style than BSD-style.
-   (license (license:bsd-style "file://COPYING"
+   (license (license:non-copyleft "file://COPYING"
                        "See COPYING in the distribution."))
    (home-page "http://www.freedesktop.org/wiki/Software/fontconfig")))
 
diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm
index 2d6ccb8d7d..e27103778c 100644
--- a/gnu/packages/gd.scm
+++ b/gnu/packages/gd.scm
@@ -26,7 +26,7 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages pkg-config)
-  #:use-module ((guix licenses) #:select (bsd-style)))
+  #:use-module ((guix licenses) #:select (non-copyleft)))
 
 (define-public gd
   (package
@@ -64,5 +64,5 @@ languages.  GD creates PNG, JPEG, GIF, WebP, XPM, BMP images, among other
 formats.  GD is commonly used to generate charts, graphics, thumbnails, and
 most anything else, on the fly.  While not restricted to use on the web, the
 most common applications of GD involve website development.")
-    (license (bsd-style "file://COPYING"
+    (license (non-copyleft "file://COPYING"
                         "See COPYING file in the distribution."))))
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index e2d4e618fa..08d1c69a57 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -114,7 +114,7 @@ documents.  Programs included are psnup, for placing out several logical pages
 on a single sheet of paper, psselect, for selecting pages from a document,
 pstops, for general imposition, psbook, for signature generation for booklet
 printing, and psresize, for adjusting page sizes.")
-   (license (license:bsd-style "file://LICENSE"
+   (license (license:non-copyleft "file://LICENSE"
                                 "See LICENSE in the distribution."))
    (home-page "http://knackered.org/angus/psutils/")))
 
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 220f7486cd..e50de7cc5d 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -187,8 +187,8 @@ and support for SSL3 and TLS.")
     "Gnurl is a microfork of cURL, a command line tool for transferring data
 with URL syntax.  While cURL supports many crypto backends, libgnurl only
 supports HTTPS, HTTPS and GnuTLS.")
-   (license (license:bsd-style "file://COPYING"
-                       "See COPYING in the distribution."))
+   (license (license:non-copyleft "file://COPYING"
+                                  "See COPYING in the distribution."))
    (home-page "https://gnunet.org/gnurl")))
 
 (define-public gnunet
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index c5ccfc271b..1ee4d7e177 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -151,4 +151,4 @@ output.")
 
     ;; The web site says it's under a BSD-3 license, but the 'LICENSE' file
     ;; and headers use different wording.
-    (license (license:bsd-style "file://LICENSE"))))
+    (license (license:non-copyleft "file://LICENSE"))))
diff --git a/gnu/packages/hugs.scm b/gnu/packages/hugs.scm
index 0902f3bf77..36be5aee4a 100644
--- a/gnu/packages/hugs.scm
+++ b/gnu/packages/hugs.scm
@@ -76,5 +76,5 @@ Haskell programs.  It provides an almost complete implementation of Haskell
 with support for simple interactive programs, handle-based I/O, and exception
 handling.  Hugs has a nearly complete implementation of the Haskell module
 system and supports a number of advanced extensions.")
-   (license (bsd-style "file://License"
-                       "See License in the distribution."))))
+   (license (non-copyleft "file://License"
+                          "See License in the distribution."))))
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 5cce6284f0..11cb63a895 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -126,8 +126,8 @@ image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats.")
 used for storing image data.
 Included are a library, libtiff, for reading and writing TIFF and a small
 collection of tools for doing simple manipulations of TIFF images.")
-   (license (license:bsd-style "file://COPYRIGHT"
-                               "See COPYRIGHT in the distribution."))
+   (license (license:non-copyleft "file://COPYRIGHT"
+                                  "See COPYRIGHT in the distribution."))
    (home-page "http://www.libtiff.org/")))
 
 (define-public libwmf
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b7391b3532..c95c61692c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1891,7 +1891,7 @@ thanks to the use of namespaces.")
     (description
      "Get/set device parameters for Linux SATA/IDE drives.  It's primary use
 is for enabling irq-unmasking and IDE multiplemode.")
-    (license (bsd-style "file://LICENSE.TXT"))))
+    (license (non-copyleft "file://LICENSE.TXT"))))
 
 (define-public acpid
   (package
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 552bf2c761..f7bb1ee896 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -64,7 +64,7 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module ((guix licenses)
-                #:select (gpl2 gpl2+ gpl3+ lgpl2.1+ lgpl3+ bsd-style))
+                #:select (gpl2 gpl2+ gpl3+ lgpl2.1+ lgpl3+ non-copyleft))
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
@@ -461,7 +461,7 @@ useful features.")
 framework for different kinds of mail access: IMAP, SMTP, POP and NNTP.  It
 provides an API for C language.  It's the low-level API used by MailCore and
 MailCore 2.")
-    (license (bsd-style "file://COPYING"))))
+    (license (non-copyleft "file://COPYING"))))
 
 (define-public claws-mail
   (package
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 52d5dd92a4..b6d3ed3680 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -238,7 +238,7 @@ be output in text, PostScript, PDF or HTML.")
     (description
      "ARPACK-NG is a collection of Fortran77 subroutines designed to solve
 large scale eigenvalue problems.")
-    (license (license:bsd-style "file://COPYING"
+    (license (license:non-copyleft "file://COPYING"
                                 "See COPYING in the distribution."))))
 
 (define-public lapack
@@ -271,7 +271,7 @@ large scale eigenvalue problems.")
     (description
      "LAPACK is a Fortran 90 library for solving the most commonly occurring
 problems in numerical linear algebra.")
-    (license (license:bsd-style "file://LICENSE"
+    (license (license:non-copyleft "file://LICENSE"
                                 "See LICENSE in the distribution."))))
 
 (define-public gnuplot
@@ -522,7 +522,7 @@ ASCII text files using Gmsh's own scripting language.")
     (description "PETSc, pronounced PET-see (the S is silent), is a suite of
 data structures and routines for the scalable (parallel) solution of
 scientific applications modeled by partial differential equations.")
-    (license (license:bsd-style
+    (license (license:non-copyleft
               "http://www.mcs.anl.gov/petsc/documentation/copyright.html"))))
 
 (define-public petsc-complex
diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm
index 0a107a8bec..716d95bcd2 100644
--- a/gnu/packages/mit-krb5.scm
+++ b/gnu/packages/mit-krb5.scm
@@ -82,6 +82,6 @@
      "Massachusetts Institute of Technology implementation of Kerberos.
 Kerberos is a network authentication protocol designed to provide strong
 authentication for client/server applications by using secret-key cryptography.")
-    (license (bsd-style "file://NOTICE"
+    (license (non-copyleft "file://NOTICE"
                         "See NOTICE in the distribution."))
     (home-page "http://web.mit.edu/kerberos/")))
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ce882dba71..d014553e78 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -26,7 +26,7 @@
 
 (define-module (gnu packages python)
   #:use-module ((guix licenses)
-                #:select (asl2.0 bsd-3 bsd-2 bsd-style cc0 x11 x11-style
+                #:select (asl2.0 bsd-3 bsd-2 non-copyleft cc0 x11 x11-style
                           gpl2 gpl2+ gpl3+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+
                           psfl public-domain x11-style))
   #:use-module ((guix licenses) #:select (expat zlib) #:prefix license:)
@@ -723,7 +723,7 @@ Database API 2.0T.")
     (description
      "Mechanize implements stateful programmatic web browsing in Python,
 after Andy Lester’s Perl module WWW::Mechanize.")
-    (license (bsd-style "file://COPYING"
+    (license (non-copyleft "file://COPYING"
                         "See COPYING in the distribution."))))
 
 
diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm
index b105f0b1d7..96a52fd93a 100644
--- a/gnu/packages/rdf.scm
+++ b/gnu/packages/rdf.scm
@@ -19,7 +19,7 @@
 
 (define-module (gnu packages rdf)
   #:use-module ((guix licenses)
-                #:select (bsd-style isc gpl2 lgpl2.0+ lgpl2.1 lgpl2.1+))
+                #:select (non-copyleft isc gpl2 lgpl2.0+ lgpl2.1 lgpl2.1+))
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system cmake)
@@ -338,7 +338,7 @@ system.")
     (description
       "RDFLib is a Python library for working with RDF, a simple yet
 powerful language for representing information.")
-    (license (bsd-style "file://LICENSE"
+    (license (non-copyleft "file://LICENSE"
                         "See LICENSE in the distribution."))))
 
 (define-public python2-rdflib
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 8800be3dcb..0148b25a16 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -179,7 +179,7 @@ The connection layer multiplexes many different concurrent channels over the
 authenticated connection and allows tunneling of login sessions and
 TCP-forwarding.  It provides a flow control service for these channels.
 Additionally, various channel-specific options can be negotiated.")
-   (license (license:bsd-style "file://LICENSE"
+   (license (license:non-copyleft "file://LICENSE"
                                "See LICENSE in the distribution."))
    (home-page "http://www.openssh.org/")))
 
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 67510eb41f..7c2c3e549b 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -78,7 +78,7 @@
     (home-page "http://www.tcl.tk/")
     (synopsis "The Tcl scripting language")
     (description "The Tcl (Tool Command Language) scripting language.")
-    (license (bsd-style "http://www.tcl.tk/software/tcltk/license.html"
+    (license (non-copyleft "http://www.tcl.tk/software/tcltk/license.html"
                         "Tcl/Tk license"))))
 
 
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index bef0b38374..fbf1bbf48c 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -392,7 +392,7 @@ things less distracting.")
     (description
      "XLockMore is a classic screen locker and screen saver for the
 X Window System.")
-    (license (license:bsd-style #f "See xlock.c.")
+    (license (license:non-copyleft #f "See xlock.c.")
              ;; + GPLv2 in modes/glx/biof.c.
              )))
 
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index 96171a050d..f182270aea 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -65,7 +65,7 @@ format, which encapsulates raw compressed data and allows the interleaving of
 audio and video data.  In addition to encapsulation and interleaving of
 multiple data streams, ogg provides packet framing, error detection, and
 periodic timestamps for seeking.")
-   (license (license:bsd-style "file://COPYING"
+   (license (license:non-copyleft "file://COPYING"
                                "See COPYING in the distribution."))
    (home-page "http://xiph.org/ogg/")))
 
@@ -91,7 +91,7 @@ a fully open, non-proprietary, patent-and-royalty-free, general-purpose
 compressed audio format for mid to high quality (8kHz-48.0kHz, 16+ bit,
 polyphonic) audio and music at fixed and variable bitrates from 16 to
 128 kbps/channel.")
-   (license (license:bsd-style "file://COPYING"
+   (license (license:non-copyleft "file://COPYING"
                                "See COPYING in the distribution."))
    (home-page "http://xiph.org/vorbis/")))
 
@@ -141,7 +141,7 @@ for speech.  It is well-adapted to internet applications, such as VoIP.  It
 features compression of different bands in the same bitstream, intensity
 stereo encoding, and voice activity detection.")
     ;; 'src/getopt.c' is under LGPLv2+
-    (license (license:bsd-style "file://COPYING"
+    (license (license:non-copyleft "file://COPYING"
                                 "See COPYING in the distribution."))))
 
 (define ao
@@ -209,7 +209,7 @@ OpenBSD's sndio.")
    (description
 "FLAC stands for Free Lossless Audio Codec, an audio format that is lossless,
 meaning that audio is compressed in FLAC without any loss in quality.")
-   (license (license:bsd-style "file://COPYING"
+   (license (license:non-copyleft "file://COPYING"
                                "See COPYING in the distribution.")) ; and LGPL and GPL
    (home-page "http://xiph.org/flac/")))
 
diff --git a/gnu/packages/yasm.scm b/gnu/packages/yasm.scm
index 8314e22247..abf6663187 100644
--- a/gnu/packages/yasm.scm
+++ b/gnu/packages/yasm.scm
@@ -50,5 +50,5 @@ Yasm currently supports the x86 and AMD64 instruction sets, accepts NASM
 and GAS assembler syntaxes, outputs binary, ELF32, ELF64, 32 and 64-bit
 Mach-O, RDOFF2, COFF, Win32, and Win64 object formats, and generates source
 debugging information in STABS, DWARF 2, and CodeView 8 formats.")
-    (license (license:bsd-style "file://COPYING"
+    (license (license:non-copyleft "file://COPYING"
                                 "See COPYING in the distribution."))))
diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm
index f9eeb5c32c..e6f5067295 100644
--- a/gnu/packages/zip.scm
+++ b/gnu/packages/zip.scm
@@ -67,7 +67,7 @@ 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:bsd-style "file://LICENSE"
+  (license (license:non-copyleft "file://LICENSE"
                                "See LICENSE in the distribution."))))
 
 (define-public unzip
@@ -108,7 +108,7 @@ 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:bsd-style "file://LICENSE"
+  (license (license:non-copyleft "file://LICENSE"
                                "See LICENSE in the distribution."))))
 
 (define-public zziplib
-- 
cgit v1.2.3