From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8F64F1381F3 for ; Thu, 5 Sep 2013 17:09:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A7FCE101F; Thu, 5 Sep 2013 17:09:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6C0CE101F for ; Thu, 5 Sep 2013 17:09:34 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C16933EB59 for ; Thu, 5 Sep 2013 17:09:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E32C5E468F for ; Thu, 5 Sep 2013 17:09:31 +0000 (UTC) From: "Jauhien Piatlicki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jauhien Piatlicki" Message-ID: <1378400939.b72296309417bc121a493a792212006dfb02aac9.jauhien@gentoo> Subject: [gentoo-commits] proj/g-sorcery:master commit in: /, gs_pypi/ X-VCS-Repository: proj/g-sorcery X-VCS-Files: gs-pypi.json gs_pypi/ebuild.py gs_pypi/pypi_db.py X-VCS-Directories: / gs_pypi/ X-VCS-Committer: jauhien X-VCS-Committer-Name: Jauhien Piatlicki X-VCS-Revision: b72296309417bc121a493a792212006dfb02aac9 X-VCS-Branch: master Date: Thu, 5 Sep 2013 17:09:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b7e69d60-c97c-4d49-8396-ac897f4df59b X-Archives-Hash: d6732c0f9b6495bd5dba4c362ca10dec commit: b72296309417bc121a493a792212006dfb02aac9 Author: Jauhien Piatlicki (jauhien) gmail com> AuthorDate: Thu Sep 5 17:08:59 2013 +0000 Commit: Jauhien Piatlicki gmail 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']