Except for the "choice of law" clause, the text of QPL and QPL-1.0 is identical. The packages labelled as "QPL" have a choice of law clause, and they explicitly refer to QPL version 1.0. So looks like we can drop one of them. QPL was added more recently and is used by fewer ebuilds: dev-tex/hevea-2.35 (tex) mail-filter/spamprobe-1.4d-r1 (maintainer-needed) net-analyzer/barnyard-0.2.0-r6 (netmon) net-analyzer/sancp-1.6.1-r6 (netmon) net-analyzer/sguil-client-1.0.0 (netmon) net-analyzer/sguil-sensor-1.0.0-r1 (netmon) sci-physics/fastjet-3.0.6-r1 (sci-physics)
Please review the PR: https://github.com/gentoo/gentoo/pull/20783
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c102b3f955012f5b24896a3c02621cf16aa98067 commit c102b3f955012f5b24896a3c02621cf16aa98067 Author: Ulrich Müller <ulm@gentoo.org> AuthorDate: 2021-05-12 11:02:18 +0000 Commit: Ulrich Müller <ulm@gentoo.org> CommitDate: 2021-05-13 16:12:13 +0000 licenses: QPL and QPL-1.0 are duplicates Drop QPL because it was added more recently. Also, QPL-1.0 is the name used in the SPDX list. Closes: https://bugs.gentoo.org/789666 Signed-off-by: Ulrich Müller <ulm@gentoo.org> licenses/QPL | 99 ------------------------------------------------- profiles/license_groups | 4 +- 2 files changed, 2 insertions(+), 101 deletions(-) Additionally, it has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb8bd45513d52d1a2e2afcad2c8992da61288b1 commit 9fb8bd45513d52d1a2e2afcad2c8992da61288b1 Author: Ulrich Müller <ulm@gentoo.org> AuthorDate: 2021-05-12 11:00:17 +0000 Commit: Ulrich Müller <ulm@gentoo.org> CommitDate: 2021-05-13 16:12:12 +0000 sci-physics/fastjet: Update LICENSE This appears to be licensed under GPL-2+, not QPL. Bug: https://bugs.gentoo.org/789666 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Ulrich Müller <ulm@gentoo.org> .../fastjet/{fastjet-3.0.6-r1.ebuild => fastjet-3.0.6-r2.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4228725346f733553d37b1811787dc1724e2277c commit 4228725346f733553d37b1811787dc1724e2277c Author: Ulrich Müller <ulm@gentoo.org> AuthorDate: 2021-05-12 10:59:29 +0000 Commit: Ulrich Müller <ulm@gentoo.org> CommitDate: 2021-05-13 16:12:12 +0000 net-analyzer/sguil-sensor: Update LICENSE QPL and QPL-1.0 are duplicates. Bug: https://bugs.gentoo.org/789666 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Ulrich Müller <ulm@gentoo.org> net-analyzer/sguil-sensor/sguil-sensor-1.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1931e55c9607687f94d4a0eebc927a656687608 commit e1931e55c9607687f94d4a0eebc927a656687608 Author: Ulrich Müller <ulm@gentoo.org> AuthorDate: 2021-05-12 10:59:12 +0000 Commit: Ulrich Müller <ulm@gentoo.org> CommitDate: 2021-05-13 16:12:11 +0000 net-analyzer/sguil-client: Update LICENSE QPL and QPL-1.0 are duplicates. Bug: https://bugs.gentoo.org/789666 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Ulrich Müller <ulm@gentoo.org> net-analyzer/sguil-client/sguil-client-1.0.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e544c64f4acc1df8f6e1ccb5789f35807ff45f3 commit 6e544c64f4acc1df8f6e1ccb5789f35807ff45f3 Author: Ulrich Müller <ulm@gentoo.org> AuthorDate: 2021-05-12 10:58:52 +0000 Commit: Ulrich Müller <ulm@gentoo.org> CommitDate: 2021-05-13 16:12:10 +0000 net-analyzer/sancp: Update LICENSE QPL and QPL-1.0 are duplicates. Bug: https://bugs.gentoo.org/789666 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Ulrich Müller <ulm@gentoo.org> net-analyzer/sancp/{sancp-1.6.1-r6.ebuild => sancp-1.6.1-r7.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781a3421b96f9e9cf2bc5041a11726dc1147bc03 commit 781a3421b96f9e9cf2bc5041a11726dc1147bc03 Author: Ulrich Müller <ulm@gentoo.org> AuthorDate: 2021-05-12 10:58:24 +0000 Commit: Ulrich Müller <ulm@gentoo.org> CommitDate: 2021-05-13 16:12:10 +0000 net-analyzer/barnyard: Update LICENSE QPL and QPL-1.0 are duplicates. Bug: https://bugs.gentoo.org/789666 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Ulrich Müller <ulm@gentoo.org> .../barnyard/{barnyard-0.2.0-r6.ebuild => barnyard-0.2.0-r7.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=950d04f9d9e1a4f2f028a6e57208e2f21ba0d736 commit 950d04f9d9e1a4f2f028a6e57208e2f21ba0d736 Author: Ulrich Müller <ulm@gentoo.org> AuthorDate: 2021-05-12 10:57:58 +0000 Commit: Ulrich Müller <ulm@gentoo.org> CommitDate: 2021-05-13 16:12:09 +0000 mail-filter/spamprobe: Update LICENSE QPL and QPL-1.0 are duplicates. Bug: https://bugs.gentoo.org/789666 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Ulrich Müller <ulm@gentoo.org> .../spamprobe/{spamprobe-1.4d-r1.ebuild => spamprobe-1.4d-r2.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5256ea3d793de2d0443c1e641ac4e45da2340d8b commit 5256ea3d793de2d0443c1e641ac4e45da2340d8b Author: Ulrich Müller <ulm@gentoo.org> AuthorDate: 2021-05-12 10:57:22 +0000 Commit: Ulrich Müller <ulm@gentoo.org> CommitDate: 2021-05-13 16:12:08 +0000 dev-tex/hevea: Update LICENSE QPL and QPL-1.0 are duplicates. Bug: https://bugs.gentoo.org/789666 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Ulrich Müller <ulm@gentoo.org> dev-tex/hevea/{hevea-2.35.ebuild => hevea-2.35-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
