[gentoo-commits] repo/gentoo:master commit in: profiles/, licenses/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     18a0c3a285d170125a4e2ef0db78f5c618cebd86
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 06:04:28 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 06:04:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a0c3a2

licenses: Drop unused Google-TOS, RASLIC, SVFL, sun-bcla-jvmstat

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 licenses/Google-TOS       | 302 ----------------------------------------------
 licenses/RASLIC           |  59 ---------
 licenses/SVFL             |  40 ------
 licenses/sun-bcla-jvmstat | 171 --------------------------
 profiles/license_groups   |   4 +-
 5 files changed, 2 insertions(+), 574 deletions(-)

diff --git a/licenses/Google-TOS b/licenses/Google-TOS
deleted file mode 100644
index 694bffbe72b..00000000000
--- a/licenses/Google-TOS
+++ /dev/null
@@ -1,302 +0,0 @@
-# file generated using the following command (open the link in browser for up-to-date version with html links)
-# o=$(sed -n '1,3p' Google-TOS; lynx -dump http://www.google.com/intl/en/policies/terms/); echo "$o" > Google-TOS
-
-                                   [1]Google
-
-[2]Policies & Principles
-
-   [3]Skip to content
-
-    1. [4]Overview
-    2. Terms of Service
-
-     * Terms of Service
-     * [5]Updates
-
-                            Google Terms of Service
-
-   Last modified: November 11, 2013 ([6]view archived versions)
-
-Welcome to Google!
-
-   Thanks for using our products and services (“Services”). The Services are
-   provided by Google Inc. (“Google”), located at 1600 Amphitheatre Parkway,
-   Mountain View, CA 94043, United States.
-
-   By using our Services, you are agreeing to these terms. Please read them
-   carefully.
-
-   Our Services are very diverse, so sometimes additional terms or product
-   requirements (including age requirements) may apply. Additional terms will
-   be available with the relevant Services, and those additional terms become
-   part of your agreement with us if you use those Services.
-
-Using our Services
-
-   You must follow any policies made available to you within the Services.
-
-   Don’t misuse our Services. For example, don’t interfere with our Services
-   or try to access them using a method other than the interface and the
-   instructions that we provide. You may use our Services only as permitted
-   by law, including applicable export and re-export control laws and
-   regulations. We may suspend or stop providing our Services to you if you
-   do not comply with our terms or policies or if we are investigating
-   suspected misconduct.
-
-   Using our Services does not give you ownership of any intellectual
-   property rights in our Services or the content you access. You may not use
-   content from our Services unless you obtain permission from its owner or
-   are otherwise permitted by law. These terms do not grant you the right to
-   use any branding or logos used in our Services. Don’t remove, obscure, or
-   alter any legal notices displayed in or along with our Services.
-
-   Our Services display some content that is not Google’s. This content is
-   the sole responsibility of the entity that makes it available. We may
-   review content to determine whether it is illegal or violates our
-   policies, and we may remove or refuse to display content that we
-   reasonably believe violates our policies or the law. But that does not
-   necessarily mean that we review content, so please don’t assume that we
-   do.
-
-   In connection with your use of the Services, we may send you service
-   announcements, administrative messages, and other information. You may opt
-   out of some of those communications.
-
-   Some of our Services are available on mobile devices. Do not use such
-   Services in a way that distracts you and prevents you from obeying traffic
-   or safety laws.
-
-Your Google Account
-
-   You may need a Google Account in order to use some of our Services. You
-   may create your own Google Account, or your Google Account may be assigned
-   to you by an administrator, such as your employer or educational
-   institution. If you are using a Google Account assigned to you by an
-   administrator, different or additional terms may apply and your
-   administrator may be able to access or disable your account.
-
-   To protect your Google Account, keep your password confidential. You are
-   responsible for the activity that happens on or through your Google
-   Account. Try not to reuse your Google Account password on third-party
-   applications. If you learn of any unauthorized use of your password or
-   Google Account, [7]follow these instructions.
-
-Privacy and Copyright Protection
-
-   Google’s [8]privacy policies explain how we treat your personal data and
-   protect your privacy when you use our Services. By using our Services, you
-   agree that Google can use such data in accordance with our privacy
-   policies.
-
-   We respond to notices of alleged copyright infringement and terminate
-   accounts of repeat infringers according to the process set out in the U.S.
-   Digital Millennium Copyright Act.
-
-   We provide information to help copyright holders manage their intellectual
-   property online. If you think somebody is violating your copyrights and
-   want to notify us, you can find information about submitting notices and
-   Google’s policy about responding to notices [9]in our Help Center.
-
-Your Content in our Services
-
-   Some of our Services allow you to submit content. You retain ownership of
-   any intellectual property rights that you hold in that content. In short,
-   what belongs to you stays yours.
-
-   When you upload or otherwise submit content to our Services, you give
-   Google (and those we work with) a worldwide license to use, host, store,
-   reproduce, modify, create derivative works (such as those resulting from
-   translations, adaptations or other changes we make so that your content
-   works better with our Services), communicate, publish, publicly perform,
-   publicly display and distribute such content. The rights you grant in this
-   license are for the limited purpose of operating, promoting, and improving
-   our Services, and to develop new ones. This license continues even if you
-   stop using our Services (for example, for a business listing you have
-   added to Google Maps). Some Services may offer you ways to access and
-   remove content that has been provided to that Service. Also, in some of
-   our Services, there are terms or settings that narrow the scope of our use
-   of the content submitted in those Services. Make sure you have the
-   necessary rights to grant us this license for any content that you submit
-   to our Services.
-
-   If you have a Google Account, we may display your Profile name, Profile
-   photo, and actions you take on Google or on third-party applications
-   connected to your Google Account (such as +1’s, reviews you write and
-   comments you post) in our Services, including displaying in ads and other
-   commercial contexts. We will respect the choices you make to limit sharing
-   or visibility settings in your Google Account. For example, you can choose
-   your settings so your name and photo do not appear in an ad.
-
-   You can find more information about how Google uses and stores content in
-   the privacy policy or additional terms for particular Services. If you
-   submit feedback or suggestions about our Services, we may use your
-   feedback or suggestions without obligation to you.
-
-About Software in our Services
-
-   When a Service requires or includes downloadable software, this software
-   may update automatically on your device once a new version or feature is
-   available. Some Services may let you adjust your automatic update
-   settings.
-
-   Google gives you a personal, worldwide, royalty-free, non-assignable and
-   non-exclusive license to use the software provided to you by Google as
-   part of the Services. This license is for the sole purpose of enabling you
-   to use and enjoy the benefit of the Services as provided by Google, in the
-   manner permitted by these terms. You may not copy, modify, distribute,
-   sell, or lease any part of our Services or included software, nor may you
-   reverse engineer or attempt to extract the source code of that software,
-   unless laws prohibit those restrictions or you have our written
-   permission.
-
-   Open source software is important to us. Some software used in our
-   Services may be offered under an open source license that we will make
-   available to you. There may be provisions in the open source license that
-   expressly override some of these terms.
-
-Modifying and Terminating our Services
-
-   We are constantly changing and improving our Services. We may add or
-   remove functionalities or features, and we may suspend or stop a Service
-   altogether.
-
-   You can stop using our Services at any time, although we’ll be sorry to
-   see you go. Google may also stop providing Services to you, or add or
-   create new limits to our Services at any time.
-
-   We believe that you own your data and preserving your access to such data
-   is important. If we discontinue a Service, where reasonably possible, we
-   will give you reasonable advance notice and a chance to get information
-   out of that Service.
-
-Our Warranties and Disclaimers
-
-   We provide our Services using a commercially reasonable level of skill and
-   care and we hope that you will enjoy using them. But there are certain
-   things that we don’t promise about our Services.
-
-   OTHER THAN AS EXPRESSLY SET OUT IN THESE TERMS OR ADDITIONAL TERMS,
-   NEITHER GOOGLE NOR ITS SUPPLIERS OR DISTRIBUTORS MAKE ANY SPECIFIC
-   PROMISES ABOUT THE SERVICES. FOR EXAMPLE, WE DON’T MAKE ANY COMMITMENTS
-   ABOUT THE CONTENT WITHIN THE SERVICES, THE SPECIFIC FUNCTIONS OF THE
-   SERVICES, OR THEIR RELIABILITY, AVAILABILITY, OR ABILITY TO MEET YOUR
-   NEEDS. WE PROVIDE THE SERVICES “AS IS”.
-
-   SOME JURISDICTIONS PROVIDE FOR CERTAIN WARRANTIES, LIKE THE IMPLIED
-   WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NON-INFRINGEMENT. TO THE EXTENT PERMITTED BY LAW, WE EXCLUDE ALL
-   WARRANTIES.
-
-Liability for our Services
-
-   WHEN PERMITTED BY LAW, GOOGLE, AND GOOGLE’S SUPPLIERS AND DISTRIBUTORS,
-   WILL NOT BE RESPONSIBLE FOR LOST PROFITS, REVENUES, OR DATA, FINANCIAL
-   LOSSES OR INDIRECT, SPECIAL, CONSEQUENTIAL, EXEMPLARY, OR PUNITIVE
-   DAMAGES.
-
-   TO THE EXTENT PERMITTED BY LAW, THE TOTAL LIABILITY OF GOOGLE, AND ITS
-   SUPPLIERS AND DISTRIBUTORS, FOR ANY CLAIMS UNDER THESE TERMS, INCLUDING
-   FOR ANY IMPLIED WARRANTIES, IS LIMITED TO THE AMOUNT YOU PAID US TO USE
-   THE SERVICES (OR, IF WE CHOOSE, TO SUPPLYING YOU THE SERVICES AGAIN).
-
-   IN ALL CASES, GOOGLE, AND ITS SUPPLIERS AND DISTRIBUTORS, WILL NOT BE
-   LIABLE FOR ANY LOSS OR DAMAGE THAT IS NOT REASONABLY FORESEEABLE.
-
-Business uses of our Services
-
-   If you are using our Services on behalf of a business, that business
-   accepts these terms. It will hold harmless and indemnify Google and its
-   affiliates, officers, agents, and employees from any claim, suit or action
-   arising from or related to the use of the Services or violation of these
-   terms, including any liability or expense arising from claims, losses,
-   damages, suits, judgments, litigation costs and attorneys’ fees.
-
-About these Terms
-
-   We may modify these terms or any additional terms that apply to a Service
-   to, for example, reflect changes to the law or changes to our Services.
-   You should look at the terms regularly. We’ll post notice of modifications
-   to these terms on this page. We’ll post notice of modified additional
-   terms in the applicable Service. Changes will not apply retroactively and
-   will become effective no sooner than fourteen days after they are posted.
-   However, changes addressing new functions for a Service or changes made
-   for legal reasons will be effective immediately. If you do not agree to
-   the modified terms for a Service, you should discontinue your use of that
-   Service.
-
-   If there is a conflict between these terms and the additional terms, the
-   additional terms will control for that conflict.
-
-   These terms control the relationship between Google and you. They do not
-   create any third party beneficiary rights.
-
-   If you do not comply with these terms, and we don’t take action right
-   away, this doesn’t mean that we are giving up any rights that we may have
-   (such as taking action in the future).
-
-   If it turns out that a particular term is not enforceable, this will not
-   affect any other terms.
-
-   The laws of California, U.S.A., excluding California’s conflict of laws
-   rules, will apply to any disputes arising out of or relating to these
-   terms or the Services. All claims arising out of or relating to these
-   terms or the Services will be litigated exclusively in the federal or
-   state courts of Santa Clara County, California, USA, and you and Google
-   consent to personal jurisdiction in those courts.
-
-   For information about how to contact Google, please visit our [10]contact
-   page.
-
-  Good to Know
-
-     * Our Good to Know site helps you stay safe and protect your family’s
-       information online. [11]Visit to learn more
-
-  Our legal policies
-
-     * [12]Privacy Policy
-     * Terms of Service
-     * [13]FAQ
-
-  Some technical details
-
-     * [14]Technologies and Principles
-     * [15]Advertising
-     * [16]How Google uses cookies
-     * [17]How Google uses pattern recognition
-     * [18]Types of location data used by Google
-     * [19]How Google Wallet uses credit card numbers
-     * [20]How Google Voice works
-
-   Change language: [[21]________________________]
-
-     * [22]Google
-     * [23]About Google
-     * [24]Privacy & Terms
-
-References
-
-   Visible links
-   1. http://www.google.com/
-   2. http://www.google.com/intl/en/policies/
-   3. http://www.google.com/intl/en/policies/terms/#content
-   4. http://www.google.com/intl/en/policies/
-   5. http://www.google.com/intl/en/policies/terms/archive/
-   6. http://www.google.com/intl/en/policies/terms/archive/
-   7. http://support.google.com/accounts/bin/answer.py?hl=en&answer=58585
-   8. http://www.google.com/intl/en/policies/privacy/
-   9. http://support.google.com/bin/static.py?hl=en&ts=1114905&page=ts.cs
-  10. http://www.google.com/intl/en/contact/
-  11. http://www.google.com/intl/en/goodtoknow/
-  12. http://www.google.com/intl/en/policies/privacy/
-  13. http://www.google.com/intl/en/policies/faq/
-  14. http://www.google.com/intl/en/policies/technologies/
-  15. http://www.google.com/intl/en/policies/technologies/ads/
-  16. http://www.google.com/intl/en/policies/technologies/cookies/
-  17. http://www.google.com/intl/en/policies/technologies/pattern-recognition/
-  18. http://www.google.com/intl/en/policies/technologies/location-data/
-  19. http://www.google.com/intl/en/policies/technologies/wallet/
-  20. http://www.google.com/intl/en/policies/technologies/voice/
-  22. http://www.google.com/
-  23. http://www.google.com/intl/en/about/
-  24. http://www.google.com/intl/en/policies/

diff --git a/licenses/RASLIC b/licenses/RASLIC
deleted file mode 100644
index eac150132f6..00000000000
--- a/licenses/RASLIC
+++ /dev/null
@@ -1,59 +0,0 @@
-
-Creative endeavors depend on the lively exchange of ideas. There are laws
-and customs which establish rights and responsibilities for authors and the
-users of what authors create. This notice is not intended to prevent you
-from using the software and documents in this package, but to ensure that
-there are no misunderstandings about terms and conditions of such use.
-
-Please read the following notice carefully. If you do not understand any
-portion of this notice, please seek appropriate professional legal advice
-before making use of the software and documents included in this software
-package. In addition to whatever other steps you may be obliged to take to
-respect the intellectual property rights of the various parties involved, if
-you do make use of the software and documents in this package, please give
-credit where credit is due by citing this package, its authors and the URL
-or other source from which you obtained it, or equivalent primary references
-in the literature with the same authors.
-
-Some of the software and documents included within this software package are
-the intellectual property of various parties, and placement in this package
-does not in any way imply that any such rights have in any way been waived
-or diminished.
-
-With respect to any software or documents for which a copyright exists, ALL
-RIGHTS ARE RESERVED TO THE OWNERS OF SUCH COPYRIGHT.
-
-Even though the authors of the various documents and software found here
-have made a good faith effort to ensure that the documents are correct and
-that the software performs according to its documentation, and we would
-greatly appreciate hearing of any problems you may encounter, the programs
-and documents any files created by the programs are provided **AS IS**
-without any warranty as to correctness, merchantability or fitness for any
-particular or general use.
-
-THE RESPONSIBILITY FOR ANY ADVERSE CONSEQUENCES FROM THE USE OF PROGRAMS OR
-DOCUMENTS OR ANY FILE OR FILES CREATED BY USE OF THE PROGRAMS OR DOCUMENTS
-LIES SOLELY WITH THE USERS OF THE PROGRAMS OR DOCUMENTS OR FILE OR FILES AND
-NOT WITH AUTHORS OF THE PROGRAMS OR DOCUMENTS.
-
-Subject to your acceptance of the conditions stated above, and your respect
-for the terms and conditions stated in the notices below, if you are not
-going to make any modifications or create derived works, you are given
-permission to freely copy and distribute this package, provided you do the
-following:
-
-   * 1. Either include the complete documentation, especially the file
-     NOTICE, with what you distribute or provide a clear indication where
-     people can get a copy of the documentation; and
-   * 2. Give credit where credit is due citing the version and original
-     authors properly; and
-   * 3. Do not give anyone the impression that the original authors are
-     providing a warranty of any kind.
-
-In addition, you may also modify this package and create derived works
-provided you do the following:
-
-   * 4. Explain in your documentation how what you did differs from this
-     version of RasMol; and
-   * 5. Make your modified source code available.
-

diff --git a/licenses/SVFL b/licenses/SVFL
deleted file mode 100644
index 64e657ecb88..00000000000
--- a/licenses/SVFL
+++ /dev/null
@@ -1,40 +0,0 @@
-Scott's Very Free License
-
-COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
-
-If you modify this file, you may insert additional notices immediately following
-this sentence.
-
-Copyright 2001 Scott Robert Ladd. All rights reserved, except as noted herein.
-
-This computer program source file is supplied "AS IS". Scott Robert Ladd
-(hereinafter referred to as "Author") disclaims all warranties, expressed or
-implied, including, without limitation, the warranties of merchantability and of
-fitness for any purpose. The Author assumes no liability for direct, indirect,
-incidental, special, exemplary, or consequential damages, which may result from
-the use of this free product, even if advised of the possibility of such damage.
-
-The Author hereby grants anyone permission to use, copy, modify, and distribute
-this source code, or portions hereof, for any legal purpose, without fee, subject
-to the following restrictions:
-
-  The origin of this source code must not be misrepresented.
-
-  Altered versions must be plainly marked as such and must not be misrepresented
-  as being the original source.
-
-  This Copyright notice may not be removed or altered from any source or altered
-  source distribution.
-
-The Author specifically permits (without fee) and encourages the use of this
-source code for entertainment, education, or decoration. If you use this source
-code in a product, acknowledgment is not required but would be appreciated.
-
-The Author's contact information is:
-
-  Scott Robert Ladd
-  scott@coyotegulch.com
-  http://www.coyotegulch.com
-
-Acknowledgement:
-This license is based on the wonderful simple license that accompanies libpng.

diff --git a/licenses/sun-bcla-jvmstat b/licenses/sun-bcla-jvmstat
deleted file mode 100644
index b509775aad6..00000000000
--- a/licenses/sun-bcla-jvmstat
+++ /dev/null
@@ -1,171 +0,0 @@
-Sun Microsystems, Inc.
-Binary Code License Agreement
-
-READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE
-TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE
-MEDIA PACKAGE.  BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO
-THE TERMS OF THIS AGREEMENT.  IF YOU ARE ACCESSING THE SOFTWARE
-ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING
-THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT.  IF YOU DO NOT AGREE
-TO ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE
-OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED
-ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END OF THIS
-AGREEMENT.
-
-1.  LICENSE TO USE.
-  Sun grants you a non-exclusive and non-transferable license for the
-  internal use only of the accompanying software and documentation and
-  any error corrections provided by Sun (collectively "Software"), by
-  the number of users and the class of computer hardware for which the
-  corresponding fee has been paid.
-
-2.  RESTRICTIONS.
-  Software is confidential and copyrighted. Title to Software and all
-  associated intellectual property rights is retained by Sun and/or
-  its licensors.  Except as specifically authorized in any
-  Supplemental License Terms, you may not make copies of Software,
-  other than a single copy of Software for archival purposes.  Unless
-  enforcement is prohibited by applicable law, you may not modify,
-  decompile, or reverse engineer Software.  Licensee acknowledges that
-  Software is not designed or intended for use in the design,
-  construction, operation or maintenance of any nuclear facility. Sun
-  Microsystems, Inc. disclaims any express or implied warranty of
-  fitness for such uses.   No right, title or interest in or to any
-  trademark, service mark, logo or trade name of Sun or its licensors
-  is granted under this Agreement.
-
-3.  LIMITED WARRANTY.
-  Sun warrants to you that for a period of ninety (90) days from the
-  date of purchase, as evidenced by a copy of the receipt, the media on
-  which Software is furnished (if any) will be free of defects in
-  materials and workmanship under normal use.  Except for the foregoing,
-  Software is provided "AS IS".  Your exclusive remedy and Sun's entire
-  liability under this limited warranty will be at Sun's option to
-  replace Software media or refund the fee paid for Software.
-
-4.  DISCLAIMER OF WARRANTY.
-  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
-  REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
-  NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
-  DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
-
-5.  LIMITATION OF LIABILITY.
-  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS
-  LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
-  SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES,
-  HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF
-  OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN
-  HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  In no event
-  will Sun's liability to you, whether in contract, tort (including
-  negligence), or otherwise, exceed the amount paid by you for
-  Software under this Agreement.  The foregoing limitations will apply
-  even if the above stated warranty fails of its essential purpose.
-
-6.  Termination.
-  This Agreement is effective until terminated.  You may terminate this
-  Agreement at any time by destroying all copies of Software.  This
-  Agreement will terminate immediately without notice from Sun if you
-  fail to comply with any provision of this Agreement.  Upon
-  Termination, you must destroy all copies of Software.
-
-7.  Export Regulations.
-  All Software and technical data delivered under this Agreement are
-  subject to US export control laws and may be subject to export or
-  import regulations in other countries.  You agree to comply strictly
-  with all such laws and regulations and acknowledge that you have the
-  responsibility to obtain such licenses to export, re-export, or
-  import as may be required after delivery to you.
-
-8.  U.S. Government Restricted Rights.
-  If Software is being acquired by or on behalf of the U.S. Government
-  or by a U.S. Government prime contractor or subcontractor (at any
-  tier), then the Government's rights in Software and accompanying
-  documentation will be only as set forth in this Agreement; this is
-  in accordance with 48 CFR 227.7201 through 227.7202-4 (for
-  Department of Defense (DOD) acquisitions) and with 48 CFR 2.101 and
-  12.212 (for non-DOD acquisitions).
-
-9.  Governing Law.
-  Any action related to this Agreement will be governed by California
-  law and controlling U.S. federal law.  No choice of law rules of any
-  jurisdiction will apply.
-
-10. Severability.
-  If any provision of this Agreement is held to be unenforceable, this
-  Agreement will remain in effect with the provision omitted, unless
-  omission would frustrate the intent of the parties, in which case
-  this Agreement will immediately terminate.
-
-11. Integration.
-  This Agreement is the entire agreement between you
-  and Sun relating to its subject matter.  It supersedes all prior
-  or contemporaneous oral or written communications, proposals,
-  representations and warranties and prevails over any conflicting
-  or additional terms of any quote, order, acknowledgment, or other
-  communication between the parties relating to its subject matter
-  during the term of this Agreement.  No modification of this
-  Agreement will be binding, unless in writing and signed by an
-  authorized representative of each party.
-
-For inquiries please contact:
-Sun Microsystems, Inc.
-4150 Network Circle
-Santa Clara, California 95054.
-
-
-DEVELOPMENT TOOLS
-
-JVMSTAT 3.0
-
-SUPPLEMENTAL LICENSE TERMS
-
-These supplemental license terms ("Supplemental Terms") add to or
-modify the terms of the Binary Code License Agreement (collectively,
-the "Agreement"). Capitalized terms not defined in these Supplemental
-Terms shall have the same meanings ascribed to them in the
-Agreement. These Supplemental Terms shall supersede any inconsistent
-or conflicting terms in the Binary Code License Agreement, or in any
-license contained within the Software.
-
-A. Software Internal Use and Development License Grant.
-  Subject to the terms and conditions of this Agreement, including,
-  but not limited to Section B (Java Technology Restrictions) of these
-  Supplemental Terms, Sun grants you a non-exclusive, non-transferable,
-  limited license to reproduce internally and use internally the binary
-  form of the Software complete and unmodified for the sole purpose of
-  designing, developing and testing your Java applets and applications
-  intended to run on the Java platform ("Programs").
-
-B. Java Technology Restrictions.
-  You may not create, modify, or change the behavior of, or authorize your
-  licensees to create, modify, or change the behavior of, classes,
-  interfaces, or subpackages that are in any way identified as "java",
-  "javax", "sun" or similar convention as specified by Sun in any naming
-  convention designation.
-
-C. Trademarks and Logos.
-  You acknowledge and agree as between you and Sun that Sun owns the
-  SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET trademarks and all SUN,
-  SOLARIS, JAVA, JINI, FORTE, and iPLANET-related trademarks, service
-  marks, logos and other brand designations ("Sun Marks"), and you agree
-  to comply with the Sun Trademark and Logo Usage Requirements currently
-  located at http://www.sun.com/policies/trademarks. Any use you make of
-  the Sun Marks inures to Sun's benefit.
-
-D. Source Code.
-  Software may contain source code that is provided solely for reference
-  purposes pursuant to the terms of this Agreement.  Source code may not
-  be redistributed unless expressly provided for in this Agreement.
-
-E. Termination for Infringement.
-  Either party may terminate this Agreement immediately should any
-  Software become, or in either party's opinion be likely to become, the
-  subject of a claim of infringement of any intellectual property right.
-
-For inquiries please contact:
-Sun Microsystems, Inc.
-4150 Network Circle, Santa Clara
-California 95054
-
-(LFI#143715/Form ID#011801)

diff --git a/profiles/license_groups b/profiles/license_groups
index df001e5c9d9..e86376351ce 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -30,7 +30,7 @@ OSI-APPROVED 0BSD AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Ar
 # Licenses in this list should NOT appear directly or indirectly in
 # @FSF-APPROVED or @OSI-APPROVED.
 # Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LPPL-1.3 LPPL-1.3b lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay SVFL symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free TextMate-bundle the-Click-license Time-Format Time-module
 s tm-align torque-2.5 totd Toyoda trio UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
+MISC-FREE AIFFWriter.m Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution BSD-with-disclosure buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-1.1 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA curl DES docbook dom4j DUMB-0.9.3 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net Interbase-1.0 ipadic Ispell JDOM JOVE Khronos-CLHPP LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LPPL-1.3 LPPL-1.3b lsof matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter par PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils rc rdisc regexp-UofT repoze RSA rwpng sash scanlogd sdlsasteroids Sendmail Sendmail-Open-Source SMAIL Snd SSLeay symlinks Sympow-BSD tablelist tcltk tcp_wrappers_license TeX TeX-other-free TextMate-bundle the-Click-license Time-Format Time-modules tm-
 align torque-2.5 totd Toyoda trio UCAR-Unidata URT VTK w3m wm2 x2x xbatt xboing XC Xdebug xtrs ZSH
 
 # Metaset for all free software
 FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE Amazon Atmel AVASYS bh-luxi bonnie Broadcom freedis
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA 2dboy-EULA AMD-GPU-PRO-EULA AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LOKI-EULA MakeMKV-EULA Microsemi Microsoft-vscode Mojang microsoft-edge ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2018 Oracle-BCLA-JavaSE PAPERS-PLEASE Primate-Plunge PUEL Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
+EULA 2dboy-EULA AMD-GPU-PRO-EULA AnyDesk-TOS Aseprite-EULA baudline BCS bestcrypt CAPYBARA-EULA Coherent-Graphics ETQW f.lux FAH-EULA-2014 Flightradar24 Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Intel-SDP Introversion LOKI-EULA MakeMKV-EULA Microsemi Microsoft-vscode Mojang microsoft-edge ms-teams-pre MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-2018 Oracle-BCLA-JavaSE PAPERS-PLEASE Primate-Plunge PUEL Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR Sourcetrail SPS Steam supermicro Synology teamspeak3 teamspeak5 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant WPS-EULA zi-labone
 
 # Deprecated license labels, used by repoman
 # Use Free-Art-1.2 or Free-Art-1.3 instead