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 A8DA113829C for ; Mon, 13 Jun 2016 06:29:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B9B8E09DC; Mon, 13 Jun 2016 06:29:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AAFEEE09DC for ; Mon, 13 Jun 2016 06:29:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5EC7B3405BB for ; Mon, 13 Jun 2016 06:29:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8F3897B for ; Mon, 13 Jun 2016 06:29:12 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1465505972.4a48d5b25f4e9b687427d47932cc4692adad10ec.ulm@gentoo> Subject: [gentoo-commits] proj/pms:master commit in: / X-VCS-Repository: proj/pms X-VCS-Files: ebuild-vars.tex names.tex X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 4a48d5b25f4e9b687427d47932cc4692adad10ec X-VCS-Branch: master Date: Mon, 13 Jun 2016 06:29:12 +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: 29c29977-9349-468d-b5e7-ee8cd24130cd X-Archives-Hash: 3f7090558b38c98e15f89a6ec341db10 commit: 4a48d5b25f4e9b687427d47932cc4692adad10ec Author: Ulrich Müller gentoo org> AuthorDate: Thu Jun 9 19:46:01 2016 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Thu Jun 9 20:59:32 2016 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=4a48d5b2 Specify restrictions upon license names. ebuild-vars.tex | 3 ++- names.tex | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ebuild-vars.tex b/ebuild-vars.tex index 1577e26..5f53c33 100644 --- a/ebuild-vars.tex +++ b/ebuild-vars.tex @@ -51,7 +51,8 @@ Ebuilds may define any of the following variables: \t{https://}, \t{ftp://} and \t{mirror://} (see section~\ref{sec:thirdpartymirrors} for mirror behaviour). Fetch restricted packages may include URL parts consisting of just a filename. See section~\ref{sec:dependencies} for full syntax. -\item[LICENSE] The package's license. Each text token must correspond to a tree ``licenses/'' entry +\item[LICENSE] The package's license. Each text token must be a valid license name, as per + section~\ref{sec:license-names}, and must correspond to a tree ``licenses/'' entry (see section~\ref{sec:licenses-dir}). See section~\ref{sec:dependencies} for full syntax. \label{ebuild-var-LICENSE} \item[KEYWORDS] A whitespace separated list of keywords for the ebuild. Each token must be a valid diff --git a/names.tex b/names.tex index f5cc9bf..d26fed6 100644 --- a/names.tex +++ b/names.tex @@ -37,6 +37,11 @@ described in section~\ref{sec:use-iuse-handling}. A repository name may contain any of the characters [\t{A-Za-z0-9\_-}]. It must not begin with a hyphen. In addition, every repository name must also be a valid package name. +\subsection{License Names} +\label{sec:license-names} +A license name may contain any of the characters [\t{A-Za-z0-9+\_.-}]. It must not begin with a +hyphen, a dot or a plus sign. + \subsection{Keyword Names} \label{sec:keyword-names} A keyword name may contain any of the characters [\t{A-Za-z0-9\_-}]. It must not begin with a