diff options
-rw-r--r-- | dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild | 2 | ||||
-rw-r--r-- | licenses/LPL-1.2 (renamed from licenses/9base) | 28 | ||||
-rw-r--r-- | metadata/license-mapping.conf | 1 | ||||
-rw-r--r-- | sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild | 2 |
4 files changed, 5 insertions, 28 deletions
diff --git a/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild b/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild index 234f72bd1850..8dbfd09383bd 100644 --- a/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild +++ b/dev-perl/DBIx-Simple/DBIx-Simple-1.370.0.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Very complete easy-to-use OO interface to DBI" # Upstream says "Any OSI approved license from https://opensource.org/licenses/alphabetical" LICENSE="|| ( AFL-3.0 AGPL-3 APL-1.0 Apache-2.0 BSD-2 Boost-1.0 CDDL CPAL-1.0 EPL-1.0 ECL-2.0 EUPL-1.1 GPL-2 GPL-3 LGPL-2.1 LGPL-3 HPND IBM IPAfont ISC - LPPL-1.3c 9base MIT MPL-2.0 NOSA nethack PHP-3 POSTGRESQL PYTHON CNRI + LPPL-1.3c LPL-1.2 MIT MPL-2.0 NOSA nethack PHP-3 POSTGRESQL PYTHON CNRI QPL-1.0 OFL-1.1 Sleepycat Watcom-1.0 W3C wxWinLL-3 ZLIB libpng )" SLOT="0" diff --git a/licenses/9base b/licenses/LPL-1.2 index d89b9576f822..f6ff2268ab8a 100644 --- a/licenses/9base +++ b/licenses/LPL-1.2 @@ -1,27 +1,3 @@ -The Plan 9 software is provided under the terms of the -Lucent Public License, Version 1.02, reproduced below, -with the following notable exceptions: - -1. No right is granted to create derivative works of or - to redistribute (other than with the Plan 9 Operating System) - the screen imprinter fonts identified in subdirectory - /lib/font/bit/lucida and printer fonts (Lucida Sans Unicode, Lucida - Sans Italic, Lucida Sans Demibold, Lucida Typewriter, Lucida Sans - Typewriter83), identified in subdirectory /sys/lib/postscript/font. - These directories contain material copyrights by B&H Inc. and Y&Y Inc. - -2. The printer fonts identified in subdirectory /sys/lib/ghostscript/font - are subject to the GNU GPL, reproduced in the file /LICENSE.gpl. - -3. The ghostscript program in the subdirectory /sys/src/cmd/gs is - covered by the Aladdin Free Public License, reproduced in the file - /LICENSE.afpl. - -Other, less notable exceptions are marked in the file tree with -COPYING, COPYRIGHT, or LICENSE files. - -=================================================================== - Lucent Public License Version 1.02 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS PUBLIC @@ -153,7 +129,7 @@ create potential liability for Contributors. Therefore, if a Distributor includes the Program in a commercial product offering, such Distributor ("Commercial Distributor") hereby agrees to defend and indemnify every Contributor ("Indemnified Contributor") against -any losses, damages and costs (collectively"Losses") arising from +any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Distributor in connection with its @@ -181,7 +157,7 @@ damages. 5. NO WARRANTY EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS -PROVIDED ON AN"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely diff --git a/metadata/license-mapping.conf b/metadata/license-mapping.conf index 8d18ccf62435..f5896f8d9d90 100644 --- a/metadata/license-mapping.conf +++ b/metadata/license-mapping.conf @@ -152,6 +152,7 @@ LGPL-3.0-or-later = LGPL-3+ Libpng = libpng libpng-2.0 = libpng2 libtiff = libtiff +LPL-1.2 = LPL-1.2 LPPL-1.2 = LPPL-1.2 LPPL-1.3c = LPPL-1.3c MirOS = MirOS diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild index 62c7605beca7..56460a596197 100644 --- a/sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild +++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r5.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://heirloom.sourceforge.net/tools.html" SRC_URI="mirror://sourceforge/heirloom/heirloom/${PV}/heirloom-${PV}.tar.bz2" S="${WORKDIR}/heirloom-${PV}" -LICENSE="CDDL GPL-2+ LGPL-2.1+ 9base ZLIB" +LICENSE="CDDL GPL-2+ LGPL-2.1+ LPL-1.2 ZLIB" SLOT="0" KEYWORDS="~amd64 ~x86" # slightly broken |