[gentoo-commits] proj/g-sorcery:master commit in: /, gs_pypi/

["Jauhien Piatlicki" <piatlicki@gmail.com>]

commit:     b72296309417bc121a493a792212006dfb02aac9
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Thu Sep  5 17:08:59 2013 +0000
Commit:     Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com>
CommitDate: Thu Sep  5 17:08:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=b7229630

pypi: add license entry to ebuild

---
 gs-pypi.json       | 37 ++++++++++++++++++++++++++++++++++++-
 gs_pypi/ebuild.py  |  4 ++--
 gs_pypi/pypi_db.py |  1 +
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/gs-pypi.json b/gs-pypi.json
index b43af2e..58586ce 100644
--- a/gs-pypi.json
+++ b/gs-pypi.json
@@ -5,5 +5,40 @@
       "repo_uri": "https://pypi.python.org/",
       "db_uri": "https://github.com/jauhien/gs-pypi-db/archive/master.tar.gz"
     }
-  }
+  },
+  "common_config": {
+    "licenses": {
+     "Academic Free License (AFL)": "AFL-3.0",
+     "Aladdin Free Public License (AFPL)": "Aladdin",
+     "Apache Software License": "Apache-2.0",
+     "Artistic License": "Artistic",
+     "BSD License": "BSD",
+     "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication": "CC0-1.0",
+     "Common Public License": "CPL-1.0",
+     "GNU Affero General Public License v3": "AGPL-3",
+     "GNU Affero General Public License v3 or later (AGPLv3+)": "AGPL-3",
+     "GNU Free Documentation License (FDL)": "FDL-1.1+",
+     "GNU General Public License (GPL)": "GPL-1+",
+     "GNU General Public License v2 (GPLv2)": "GPL-2",
+     "GNU General Public License v2 or later (GPLv2+)": "GPL-2+",
+     "GNU General Public License v3 (GPLv3)": "GPL-3",
+     "GNU General Public License v3 or later (GPLv3+)": "GPL-3+",
+     "GNU Lesser General Public License v2 (LGPLv2)": "LGPL-2",
+     "GNU Lesser General Public License v2 or later (LGPLv2+)": "LGPL-2+",
+     "GNU Lesser General Public License v3 (LGPLv3)": "LGPL-3",
+     "GNU Lesser General Public License v3 or later (LGPLv3+)": "LGPL-3+",
+     "GNU Library or Lesser General Public License (LGPL)": "LGPL-2+",
+     "ISC License (ISCL)": "ISC",
+     "MIT License": "MIT",
+     "Mozilla Public License 1.0 (MPL)": "MPL-1.0",
+     "Mozilla Public License 1.1 (MPL 1.1)": "MPL-1.1",
+     "Mozilla Public License 2.0 (MPL 2.0)": "MPL-2.0",
+     "Public Domain": "public-domain",
+     "Python License (CNRI Python License)": "CNRI",
+     "Python Software Foundation License": "PYTHON",
+     "Repoze Public License": "repoze",
+     "W3C License": "W3C",
+     "Zope Public License": "ZPL",
+     "zlib/libpng License": "ZLIB"
+    }
 }

diff --git a/gs_pypi/ebuild.py b/gs_pypi/ebuild.py
index 666b55f..0be2999 100644
--- a/gs_pypi/ebuild.py
+++ b/gs_pypi/ebuild.py
@@ -31,7 +31,7 @@ class PypiEbuildWithoutDigestGenerator(DefaultEbuildGenerator):
         inherit = ["gs-pypi"]
         
         vars_after_description = \
-          ["homepage"]
+          ["homepage", "license"]
 
         vars_after_keywords = \
           []
@@ -49,7 +49,7 @@ class PypiEbuildWithDigestGenerator(DefaultEbuildGenerator):
         inherit = ["gs-pypi"]
         
         vars_after_description = \
-          ["homepage",
+          ["homepage", , "license",
            {"name" : "src_uri", "value" : 'http://pypi.python.org/packages/source/${REALNAME:0:1}/${REALNAME}/${REALNAME}-${REALVERSION}.tar.gz'}]
 
         vars_after_keywords = \

diff --git a/gs_pypi/pypi_db.py b/gs_pypi/pypi_db.py
index a9addea..a4a2e78 100644
--- a/gs_pypi/pypi_db.py
+++ b/gs_pypi/pypi_db.py
@@ -226,6 +226,7 @@ class PypiDBGenerator(DBGenerator):
 
                     if "License" in categories:
                         license = categories["License"][-1]
+            license = self.convert([common_config, config], "licenses", license)
 
             if not py_versions:
                 py_versions = ['2_6', '2_7', '3_2', '3_3']