[gentoo-commits] dev/aballier:master commit in: scripts/texlive/tlpsrc/

[Alexis Ballier]

commit:     2804ad30ff3ef67ac799b80cdd611e156a7efde4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  2 10:55:05 2012 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Oct  3 11:04:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/aballier.git;a=commit;h=2804ad30

Don't map any catalogue licenses to "as-is".

This affects the following catalogue licenses:
   noinfo        -> TeX-noinfo
   nosource      -> TeX-nosource
   other-free    -> TeX-other-free
   other-nonfree -> TeX-other-nonfree
   other         -> (commented out, doesn't occur in TeX Live)
   unknown       -> (commented out, doesn't occur in TeX Live)

Furthermore, the nosell and nocommercial licenses don't occur any more
and is commented out, too. (The nosell license has been deleted from
the Portage tree.)

---
 .../tlpsrc/cataloguelicense2gentoolicense.sh       |   24 ++++++++++----------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/texlive/tlpsrc/cataloguelicense2gentoolicense.sh b/scripts/texlive/tlpsrc/cataloguelicense2gentoolicense.sh
index e3b41e0..2b99ffe 100755
--- a/scripts/texlive/tlpsrc/cataloguelicense2gentoolicense.sh
+++ b/scripts/texlive/tlpsrc/cataloguelicense2gentoolicense.sh
@@ -19,20 +19,20 @@ while [ $# -gt 0 ] ; do
             echo "LPPL-1.3";;
         gfsl)
             echo "LPPL-1.3";;
-        unknown)
-            echo "as-is";;
+        #unknown)
+        #    echo "TeX-unknown";;
         noinfo)
-            echo "as-is";;
+            echo "TeX-noinfo";;
         nosource)
-            echo "as-is";;
+            echo "TeX-nosource";;
         collection)
             echo "GPL-2";;
         other-free)
-            echo "as-is";;            
-        other)
-            echo "as-is";;
+            echo "TeX-other-free";;
+        #other)
+        #    echo "TeX-other";;
         other-nonfree)
-            echo "as-is";;
+            echo "TeX-other-nonfree";;
         lgpl)
             echo "LGPL-2";;
         lgpl2.1)
@@ -53,10 +53,10 @@ while [ $# -gt 0 ] ; do
             echo "FDL-1.1";;
         ofl)
             echo "OFL";;
-        nosell)
-            echo "nosell";;
-        nocommercial)
-            echo "nosell";;
+        #nosell)
+        #    echo "nosell";;
+        #nocommercial)
+        #    echo "nosell";;
         *)
             echo "The $1 license is not mapped yet!"
             exit 1;;