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 A157C138200 for ; Wed, 10 Jul 2013 16:16:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1852EE09FF; Wed, 10 Jul 2013 16:16:56 +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 40D1CE0A01 for ; Wed, 10 Jul 2013 16:16:55 +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 26AF233E8AF for ; Wed, 10 Jul 2013 16:16:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BC755E545D for ; Wed, 10 Jul 2013 16:16:52 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1373444655.9462b6268f8bc4b1d8bd50a59ef2b8df55dd562a.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: config/ X-VCS-Repository: proj/R_overlay X-VCS-Files: config/description_fields.conf config/license.map X-VCS-Directories: config/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 9462b6268f8bc4b1d8bd50a59ef2b8df55dd562a X-VCS-Branch: master Date: Wed, 10 Jul 2013 16:16:52 +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: 4582f9c8-bc38-4ce6-b6f1-5fbaecd5709d X-Archives-Hash: bd5b1bf053930c70762b6991baa68681 commit: 9462b6268f8bc4b1d8bd50a59ef2b8df55dd562a Author: André Erdmann mailerd de> AuthorDate: Wed Jul 10 08:24:15 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Wed Jul 10 08:24:15 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=9462b626 config/: license map file, update field-def The license map file is neither complete nor 100% correct, but it roughly works. Added/Enabled '[License]' in description_fields.conf so that the description reader parses this field. --- config/description_fields.conf | 30 ++++--- config/license.map | 194 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 214 insertions(+), 10 deletions(-) diff --git a/config/description_fields.conf b/config/description_fields.conf index 0705798..b0d355d 100644 --- a/config/description_fields.conf +++ b/config/description_fields.conf @@ -25,7 +25,7 @@ # whitelist and adds to this list. # # allowed_values = -# -- same as allowed_value but witj multiple values +# -- same as allowed_value but with multiple values # # alias_withcase = , # alias = @@ -55,6 +55,11 @@ # isWhitespaceList # -- declares that the field's value is a list # separated by whitespace. Has no effect if 'isList' is set. +# +# isLicense +# -- use hardcoded 'License' field parsing +# configuration for this flag is done in the main config file +# # mandatory # -- declares that this field has to have an value that evaluates # to True (value is set and not empty). @@ -71,6 +76,12 @@ # # ---------------------------------------------------------------------------- +## Useful docs: +## +## http://cran.r-project.org/doc/manuals/R-exts.html#The-DESCRIPTION-file +## +## http://en.wikipedia.org/wiki/Commonly_misspelled_words +## has some links to other sites as well [Description] joinValues @@ -85,10 +96,11 @@ joinValues ignore [License] -isList +alias_nocase = License, Licence, Lisence + +# use hardcoded field handling +isLicense -# not used -ignore [Version] joinValues @@ -122,6 +134,10 @@ isList alias_nocase = OS_TYPE allowed_values = unix +[Homepage] +alias_nocase = Homepage, URL, Webpage +ignore + [Author] ignore @@ -146,12 +162,6 @@ ignore [Type] ignore -[URL] -ignore - -[Webpage] -ignore - [ZipData] ignore diff --git a/config/license.map b/config/license.map new file mode 100644 index 0000000..bcaf168 --- /dev/null +++ b/config/license.map @@ -0,0 +1,194 @@ +# freedist, as-is, ...? +! { + unlimited +} + +# freestyle text +! { + foo + freeforresearchpurpose. + whatlicenseisitunder? +} + + +AGPL-3 :: agpl + +AGPL-3 { + agpl3 + agpl>3 +} + +Apache-2.0 { + apachelicense2.0 +} + +Artistic { + artistic-1.0 +} + +Artistic-2 { + artistic-2.0 + artistic2.0#modifyasdesired + artisticlicense2.0 + theartisticlicense2.0 +} + +Boost-1.0 { + bsl + bsl-1.0 +} + +BSD { + freebsd +} + +CC0-1.0 { + cc0 +} + +CC-BY-SA-3.0 { + ccby-sa3.0us +} +CC-BY-SA-2.0 { + ccbysa2.0 +} + +|| ( CC-BY-SA-3.0 CC-BY-NC-SA-3.0 ) { + ccbysa3.0us|ccbyncsa3.0 +} + +CeCILL-C :: cecill +CeCILL-2 :: cecill2 + +# ? +CPL-0.5 { + cpl + commonpubliclicense1.0 +} + +EPL-1.0 { + epl +} + +EUPL-1.1 { + eupl +} + +GPL-2 { + gnugeneralpubliclicense2 + gpl2 + gpl2.0 +} + +GPL-2 :: gpl2forrpackage;researchonlylicenseforemdl1 + +GPL-2+ { + gpl>2 + gpl>2.0 + gpl>2.15.1 + gpl2.1ornewer + gpl2orlater + gpl2orlater. + gpl2ornewer + gpl2ornewercopying. + gpl2ornewer.thetermsofthislicenseareinafilecalledcopyingwhichisprovidedwithr. +} + +|| ( GPL-2 Artistic-2 ) { + gpl2|artistic2.0 +} + +|| ( GPL-2+ BSD ) { + gpl>2|bsd + gpl>2|freebsd +} + +GPL-3 { + gpl3 + gpl3.0 +} + +GPL-3+ { + gpl>3 + gpl>3.0 +} + +# gpl licenses without version: +GPL-3+ { + gnugeneralpubliclicense + gnugeneralpubliclicensegpl + gnugpl + gpl + gpl. +} + +|| ( GPL-3+ BSD ) { + gpl|bsd +} + +|| ( GPL-3+ LGPL-3+ ) { + gpl|lgpl +} + +|| ( GPL-2 GPL-3 ) { + gpl2|gpl3 +} + +LGPL-2 { + lgpl2 +} + +LGPL-2+ { + lgpl>2 + lgpl>2.0 + lgpl2ornewer +} + +LGPL-2.1 { + lgpl2.1 +} + +LGPL-2.1+ { + lgpl>2.1 +} + +LGPL-3 { + lgpl3 +} + +LGPL-3+ { + lgpl>3 +} + +LGPL-3+ { + lgpl +} + +MIT { + mitlicense +} + +# x11 is MIT? +MIT :: x11 + +|| ( MIT GPL-2 ) { + mit|gpl2 +} + +MPL-1.1 { + mozillapubliclicense1.1 + mpl1.1 +} + +MPL-2.0 { + mozillapubliclicense + mpl2.0 +} + +public-domain { + publicdomain +} + +ZLIB { + zliblicense +} 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 78DBC1381F3 for ; Wed, 10 Jul 2013 08:26:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A0D1E09E2; Wed, 10 Jul 2013 08:26:53 +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 67A11E09D7 for ; Wed, 10 Jul 2013 08:26:52 +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 43FBF33E8A2 for ; Wed, 10 Jul 2013 08:26:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B7460E5468 for ; Wed, 10 Jul 2013 08:26:48 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1373444655.9462b6268f8bc4b1d8bd50a59ef2b8df55dd562a.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:gsoc13/next commit in: config/ X-VCS-Repository: proj/R_overlay X-VCS-Files: config/description_fields.conf config/license.map X-VCS-Directories: config/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 9462b6268f8bc4b1d8bd50a59ef2b8df55dd562a X-VCS-Branch: gsoc13/next Date: Wed, 10 Jul 2013 08:26:48 +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: 7e4110b6-7a8c-47ec-9782-f4726ec163ed X-Archives-Hash: 048f8fb7305b1adc10b0af9df909d3fb Message-ID: <20130710082648.ERnobYnysFFBhT4QdCQuKUX1hP_4Gg5kbleW7oiIo1U@z> commit: 9462b6268f8bc4b1d8bd50a59ef2b8df55dd562a Author: André Erdmann mailerd de> AuthorDate: Wed Jul 10 08:24:15 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Wed Jul 10 08:24:15 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=9462b626 config/: license map file, update field-def The license map file is neither complete nor 100% correct, but it roughly works. Added/Enabled '[License]' in description_fields.conf so that the description reader parses this field. --- config/description_fields.conf | 30 ++++--- config/license.map | 194 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 214 insertions(+), 10 deletions(-) diff --git a/config/description_fields.conf b/config/description_fields.conf index 0705798..b0d355d 100644 --- a/config/description_fields.conf +++ b/config/description_fields.conf @@ -25,7 +25,7 @@ # whitelist and adds to this list. # # allowed_values = -# -- same as allowed_value but witj multiple values +# -- same as allowed_value but with multiple values # # alias_withcase = , # alias = @@ -55,6 +55,11 @@ # isWhitespaceList # -- declares that the field's value is a list # separated by whitespace. Has no effect if 'isList' is set. +# +# isLicense +# -- use hardcoded 'License' field parsing +# configuration for this flag is done in the main config file +# # mandatory # -- declares that this field has to have an value that evaluates # to True (value is set and not empty). @@ -71,6 +76,12 @@ # # ---------------------------------------------------------------------------- +## Useful docs: +## +## http://cran.r-project.org/doc/manuals/R-exts.html#The-DESCRIPTION-file +## +## http://en.wikipedia.org/wiki/Commonly_misspelled_words +## has some links to other sites as well [Description] joinValues @@ -85,10 +96,11 @@ joinValues ignore [License] -isList +alias_nocase = License, Licence, Lisence + +# use hardcoded field handling +isLicense -# not used -ignore [Version] joinValues @@ -122,6 +134,10 @@ isList alias_nocase = OS_TYPE allowed_values = unix +[Homepage] +alias_nocase = Homepage, URL, Webpage +ignore + [Author] ignore @@ -146,12 +162,6 @@ ignore [Type] ignore -[URL] -ignore - -[Webpage] -ignore - [ZipData] ignore diff --git a/config/license.map b/config/license.map new file mode 100644 index 0000000..bcaf168 --- /dev/null +++ b/config/license.map @@ -0,0 +1,194 @@ +# freedist, as-is, ...? +! { + unlimited +} + +# freestyle text +! { + foo + freeforresearchpurpose. + whatlicenseisitunder? +} + + +AGPL-3 :: agpl + +AGPL-3 { + agpl3 + agpl>3 +} + +Apache-2.0 { + apachelicense2.0 +} + +Artistic { + artistic-1.0 +} + +Artistic-2 { + artistic-2.0 + artistic2.0#modifyasdesired + artisticlicense2.0 + theartisticlicense2.0 +} + +Boost-1.0 { + bsl + bsl-1.0 +} + +BSD { + freebsd +} + +CC0-1.0 { + cc0 +} + +CC-BY-SA-3.0 { + ccby-sa3.0us +} +CC-BY-SA-2.0 { + ccbysa2.0 +} + +|| ( CC-BY-SA-3.0 CC-BY-NC-SA-3.0 ) { + ccbysa3.0us|ccbyncsa3.0 +} + +CeCILL-C :: cecill +CeCILL-2 :: cecill2 + +# ? +CPL-0.5 { + cpl + commonpubliclicense1.0 +} + +EPL-1.0 { + epl +} + +EUPL-1.1 { + eupl +} + +GPL-2 { + gnugeneralpubliclicense2 + gpl2 + gpl2.0 +} + +GPL-2 :: gpl2forrpackage;researchonlylicenseforemdl1 + +GPL-2+ { + gpl>2 + gpl>2.0 + gpl>2.15.1 + gpl2.1ornewer + gpl2orlater + gpl2orlater. + gpl2ornewer + gpl2ornewercopying. + gpl2ornewer.thetermsofthislicenseareinafilecalledcopyingwhichisprovidedwithr. +} + +|| ( GPL-2 Artistic-2 ) { + gpl2|artistic2.0 +} + +|| ( GPL-2+ BSD ) { + gpl>2|bsd + gpl>2|freebsd +} + +GPL-3 { + gpl3 + gpl3.0 +} + +GPL-3+ { + gpl>3 + gpl>3.0 +} + +# gpl licenses without version: +GPL-3+ { + gnugeneralpubliclicense + gnugeneralpubliclicensegpl + gnugpl + gpl + gpl. +} + +|| ( GPL-3+ BSD ) { + gpl|bsd +} + +|| ( GPL-3+ LGPL-3+ ) { + gpl|lgpl +} + +|| ( GPL-2 GPL-3 ) { + gpl2|gpl3 +} + +LGPL-2 { + lgpl2 +} + +LGPL-2+ { + lgpl>2 + lgpl>2.0 + lgpl2ornewer +} + +LGPL-2.1 { + lgpl2.1 +} + +LGPL-2.1+ { + lgpl>2.1 +} + +LGPL-3 { + lgpl3 +} + +LGPL-3+ { + lgpl>3 +} + +LGPL-3+ { + lgpl +} + +MIT { + mitlicense +} + +# x11 is MIT? +MIT :: x11 + +|| ( MIT GPL-2 ) { + mit|gpl2 +} + +MPL-1.1 { + mozillapubliclicense1.1 + mpl1.1 +} + +MPL-2.0 { + mozillapubliclicense + mpl2.0 +} + +public-domain { + publicdomain +} + +ZLIB { + zliblicense +}