Merge updates from master

20 files changed, 1195 insertions, 6 deletions

diff --git a/licenses/Avago b/licenses/Avago
new file mode 100644
index 000000000000..f14dd3d74589
--- /dev/null
+++ b/licenses/Avago
@@ -0,0 +1,662 @@
+IMPORTANT - READ CAREFULLY: This Software License Agreement ("Agreement")
+is a legal agreement between Licensee (either an individual or a single
+entity), (“Licensee”) and Avago Technologies General IP (Singapore) Pte.
+Ltd., ("Broadcom") for the Licensed Code, (hereinafter defined).
+
+By installing, copying, or otherwise using the Licensed Code (hereinafter
+defined), Licensee agrees to be bound by the terms of this Agreement. If
+Licensee does not agree to the terms of this Agreement, Licensee may not
+install, copy or use the Licensed Code. The Licensed Code is licensed, not
+sold.
+
+NOW THEREFORE, in consideration of the foregoing and the mutual promises
+and covenants contained in this Agreement the parties hereby agree as
+follows:
+
+1. Definitions
+
+1.1. "Authorized Use for Source Code" means use of the Source Code solely
+     for the purpose of internally developing, modifying, integrating and
+     testing Licensee's Products to interface with Broadcom Devices
+     authorized for such integration, and for no other use or purpose.
+
+1.2. "Authorized Use for Binary Code" means use of the Binary Code solely
+     for the purpose of internal evaluation or developing, integrating,
+     testing and use of Licensee's Products to interface with Broadcom
+     Devices and for no other application, use or purpose.
+
+1.3. "Authorized Use for Internal Code" means use of the Internal Use Code
+     solely for the purpose of internally developing, modifying,
+     integrating and testing Licensee's Products to interface with Broadcom
+     Devices authorized for such integration, and for no other use or
+     purpose.
+
+1.4. "Documentation" means explanatory and informational materials or
+     documentation concerning the Licensed Code, in printed or electronic
+     format, including without limitation, manuals, descriptions, user and/
+     or installation instructions, diagrams, printouts, listings,
+     flowcharts, and training materials, contained on visual media such as
+     paper or photographic film, or on other physical storage media in
+     machine-readable form. Documentation does not include any code.
+
+1.5. "Licensed Code" means collectively all the software programs which are
+     owned or distributed by Broadcom and obtained by Licensee via download
+     from the Broadcom support web-pages through acceptance of this
+     Agreement. The Licensed Code is specifically referenced individually
+     in this Agreement as Source Code, Binary Code, or Internal Use Code.
+
+1.6. "Licensee Products" means the hardware and software (and related
+     Licensee documentation) that will be developed or modified by or for
+     Licensee utilizing the Licensed Code for the purpose of interfacing or
+     being used with Broadcom Devices.
+
+1.7. "Updates" means maintenance releases, bug fixes, errata or other
+     corrections, and minor improvements or modifications to the Licensed
+     Code which may be provided by Broadcom to Licensee from time to time
+     at Broadcom's sole discretion. Broadcom is under no obligation to
+     provide Updates or provide support and maintenance services to
+     Licensee or Licensee Subsequent Users.
+
+1.8. "New Version" means significant changes, modifications, enhancements,
+     and/or functional improvements to the Licensed Code. New Versions are
+     made and generally distributed solely at the discretion of Broadcom.
+     Licensee must use the latest New Version of Licensed Code that is
+     available. Broadcom is under no obligation to port any development
+     work from one version to the latest New Version of Licensed Code.
+
+1.9. "Broadcom Devices" means those Broadcom products intended for use with
+     the Licensed Code and purchased from Broadcom or its agents.
+
+1.10. "Derivative Works" means: (a) for copyrightable or copyrighted
+      material, any translation (including translation into other computer
+      languages), port, modification, correction, addition, extension,
+      upgrade, improvement, compilation, abridgment or other form in which
+      an existing work may be recast, transformed or adapted; (b) for
+      patentable or patented material, any improvement thereon; and (c) for
+      material which is protected by trade secret, any new material derived
+      from such existing trade secret material, including new material
+      which may be protected by copyright, patent and/or trade secret.
+
+1.11. "Intellectual Property Rights" means (by whatever name or term known
+      or designated) copyrights, trade secrets, patents, moral rights and
+      any other intellectual and industrial property and proprietary rights
+      (excluding trademarks) including registrations, applications,
+      renewals and extensions of such rights anywhere in the world.
+
+1.12. "Binary Code" means the software programs provided for distribution
+      at the Broadcom support web-pages, in binary form, any other machine
+      readable materials, including, but not limited to, libraries, source
+      files, header files, and data files, any Updates and New Versions
+      provided by Broadcom.
+
+1.13. "Source Code" means the software programs provided for distribution
+      at the Broadcom support web-pages, in source form including, but not
+      limited to, libraries, source files, header files, and data files,
+      and Updates and New Versions provided by Broadcom.
+
+1.14. "Internal Use Code" means the software programs provided for
+      distribution at the Broadcom support web-pages, in source code or
+      object code format including, but not limited to, libraries, source
+      files, header files, and data files, and Updates and New Versions
+      provided by Broadcom that are only for Licensee's internal use.
+
+1.15. "JRE Code" mean Oracle Corporation's JAVA SE Runtime Environment
+      Code.
+
+1.16. "Subsequent User" means any user subsequent to Licensee, including
+      but not limited to, all Licensee customers, resellers, end users, and
+      OEMs.
+
+1.17 "Taxes" shall mean all taxes, levies, imposts, duties, fines or other
+     charges of whatsoever nature however imposed by any country or any
+     subdivision or authority thereof in any way connected with this
+     Agreement or any instrument or agreement required hereunder, and all
+     interest, penalties or similar liabilities with respect thereto,
+     except such taxes as are imposed on or measured by a party's net
+     income or property.
+
+
+2. Grant of Rights
+
+2.1 Binary Code. Subject to the terms of this Agreement, Broadcom grants to
+    Licensee a non-exclusive, world-wide, revocable (for breach in
+    accordance with Section 7), non-transferable limited license, without
+    the right to sublicense except as expressly provided herein, solely to:
+
+(a) Use the Binary Code and related Documentation solely for the Authorized
+    Use for Binary Code and only with Broadcom Devices
+
+(b) Make copies of the Binary Code and related Documentation to support the
+    Authorized Use for Binary Code and for archival and backup purposes in
+    support of the Authorized Use for Binary Code only with Broadcom
+    Devices;
+
+(c) Distribute the Binary Code as incorporated in Licensee's Products or
+    for use with Broadcom Devices to its Subsequent Users;
+
+(d) Distribute the Documentation related to Binary Code only for use with
+    Broadcom Devices;
+
+(e) Sublicense the rights provided in paragraphs (a) and (b) above in
+    accordance with the terms provided in this Agreement to contract
+    manufacturers ("CMs") and/or original design manufacturers ("ODMs"),
+    in each case meeting the requirements of Section 3.1(d) below for the
+    purpose of manufacturing Licensee's Products; and (f) Sublicense the
+    rights provided in paragraphs (b) and (c) in accordance with the terms
+    provided in this Agreement to Subsequent Users who are not end users
+    for the purpose of distributing and supporting Licensee's Product.
+
+2.2 Source Code. Subject to the terms of this Agreement, Broadcom grants to
+    Licensee a non-exclusive, worldwide, revocable (for breach in
+    accordance with Section 7), non-transferable limited license, without
+    the right to sublicense except as expressly provided herein, solely to:
+
+(a) Use the Source Code and related Documentation solely for the Authorized
+    Use for Source Code and only with Broadcom Devices;
+
+(b) Make copies of the Source Code and related Explanatory Material to
+    support the Authorized Use for Source Code only and for archival and
+    backup purposes in support of the Authorized use for Source Code only
+    with Broadcom Devices;
+
+(c) Modify and prepare Derivative Works of the Source Code for the
+    Authorized Use for Source Code and only for use with Broadcom Devices;
+
+(d) Distribute the binary form only of any authorized Derivative Work of
+    the Source Code ("Licensee Binary Derivative") and necessary portions
+    of the related Documentation only for use with Broadcom Devices; and
+
+(e) Sublicense the rights granted in paragraph (d) above in accordance with
+    the terms provided in this Agreement to Subsequent Users who are not
+    end users for the purpose of distributing and supporting Licensee's
+    Product.
+
+2.3 Internal Use Code. Subject to the terms of this Agreement, Broadcom
+    grants to Licensee a non-exclusive, worldwide, revocable (for breach in
+    accordance with Section 7), non-transferable limited license, without
+    the right to sublicense or distribute, solely to:
+
+(a) Use the Internal Use Code and related Documentation solely for the
+    Authorized Use for Internal Code and only with Broadcom Devices; and
+
+(b) Make copies of the Internal Use Code and related Documentation to
+    support the Authorized Use for Internal Code only and for archival and
+    backup purposes in support of the Authorized use for Internal Code only
+    with Broadcom Devices.
+
+2.4 Without limiting Section 4, Licensee may exercise the foregoing rights
+    directly and/or indirectly through its employees and contractors, who
+    are bound by terms at least as restrictive as this Agreement.
+
+
+3. License Restrictions
+
+3.1. Binary Code. The Licenses granted in Section 2.1 for Binary Code and
+     related Documentation are subject to the following restrictions:
+
+(a) Licensee shall not use the Binary Code and related Documentation for
+    any purpose other than as expressly provided in Article 2;
+
+(b) Licensee shall reproduce all copyright notices and other proprietary
+    markings or legends contained within or on the Binary Code and related
+    Documentation on any copies it makes; and
+
+(c) Licensee shall not distribute or disclose the Binary Code and related
+    Documentation except pursuant to an agreement with terms at least as
+    protective of the Binary Code as the terms of this Agreement. Licensee
+    shall not, and shall not allow its Subsequent Users to, disassemble,
+    de-compile, or reverse engineer the Binary Code.
+
+(d) Licensee may grant the sublicense set forth in Section 2.1(e) to its
+    CMs and ODMs, provided that each such CM and ODM agrees to abide by the
+    terms and conditions of this Agreement and Licensee shall remain
+    responsible for any failure by its CMs and ODM to comply with the terms
+    and conditions of this Agreement.
+
+3.2. Source Code. The Licenses granted in Section 2.2 for Source Code and
+     related Documentation are subject to the following restrictions:
+
+(a) Licensee shall not use the Source Code and related Documentation for
+    any purpose other than as expressly provided in Article 2;
+
+(b) Licensee shall reproduce all copyright notices and other proprietary
+    markings or legends contained within or on the Source Code and related
+    Documentation on any copies it makes;
+
+(c) Licensee shall not distribute or disclose any Source Code and related
+    Documentation to any Subsequent Users or third parties, without the
+    express written consent of Broadcom;
+
+(d) Licensee shall not knowingly infringe upon the intellectual property
+    rights of any third party when making Derivative Works to the Source
+    Code;
+
+(e) Licensee shall not disassemble, reverse-engineer, or decompile the
+    Source Code, except for making authorized Derivative Works; and
+
+(f) Licensee shall not distribute or disclose the Licensee Binary
+    Derivative except pursuant to an agreement with terms at least as
+    protective as those in this Agreement protecting Binary Code. Licensee
+    shall not, and shall not allow its Subsequent Users to, disassemble,
+    de-compile, or reverse engineer the Licensee Binary Derivative.
+
+3.3. Internal Use Code. The Licenses granted in Section 2.3 for Internal
+     Use Code and related Documentation are subject to the following
+     restrictions:
+
+(a) Licensee shall not use the Internal Use Code and related Documentation
+    for any purpose other than as expressly provided in Article 2;
+
+(b) Licensee shall reproduce all copyright notices and other proprietary
+    markings or legends contained within or on the Internal Use Code and
+    related Documentation on any copies it makes;
+
+(c) Licensee shall not distribute or disclose any Internal Use Code and
+    related Documentation to any Subsequent Users or third parties, without
+    the express written consent of Broadcom; and
+
+(d) Licensee shall not disassemble, reverse-engineer, or decompile the
+    Internal Use Code.
+
+3.4. Derivative Works of Source Code Made by Licensee. Subject to
+     Broadcom's rights in the underlying Source Code, Licensee shall own
+     all right, title and interest in and to the Derivative Works (both
+     binary and source format) it makes from Source Code, provided that
+     such Derivative Works are not made in breach of this Agreement.
+     Licensee shall not be required to disclose its Derivative Works of the
+     Source Code to Broadcom. Broadcom shall have no obligations whatsoever
+     to support, maintain, contribute to, or provide Updates, New Versions
+     or any modifications to Licensee Derivative Works of the Source Code
+     and shall have no liability whatsoever for such Derivative Works. In
+     the event Licensee requests Broadcom's input regarding Licensee
+     Derivative Works of Source Code and plans to disclose such Derivative
+     Works to Broadcom, a separate written agreement shall first be
+     executed by the parties.
+
+3.5. Broadcom Derivative Works. Nothing contained herein shall prevent
+     Broadcom from creating any Derivative Works of its Source Code at any
+     time. Licensee further agrees that Broadcom may independently create a
+     Derivative Work similar to or in competition with the Licensee
+     Derivative Work of the Source Code and may use that Derivative Work
+     for any purpose. Licensee grants Broadcom a Covenant Not to Sue for
+     any independently developed Derivative Works created by Broadcom for
+     its own Source Code that Licensee may believe or claim infringes on
+     any of Licensee's Intellectual Property Rights relating to the
+     Licensee Derivative Works of the Source Code.
+
+3.6. U.S. Government Subsequent Users. All Licensed Code and Documentation
+     qualify as "commercial items," as that term is defined at
+     48 C.F.R. 2.101, consisting of "commercial computer software" and
+     "commercial computer software documentation" as such terms are used in
+     48 C.F.R. 12.212. Consistent with 48 CFR 52.227-19, 48 C.F.R.12.212
+     and 48 C.F.R. 227.7202-1 through 227.7202-4, Licensee will provide to
+     U.S. Government end users such Binary Code with only those rights set
+     forth herein that apply to non-governmental end users. Use of such
+     Binary Code constitutes agreement by the government entity that the
+     computer software and computer software documentation is commercial
+     and constitutes acceptance of the rights and restrictions herein.
+
+3.7. No Implied Licenses. Except for the express and limited licenses
+     granted herein for specific purposes, no rights or licenses are
+     granted by Broadcom under this Agreement, by implication, inducement,
+     estoppel or otherwise with respect to any proprietary information or
+     to any patents, copyrights, trade secrets, trademarks, maskworks or
+     other Intellectual Property Rights owned or controlled by Broadcom.
+     Any further licenses must be express, in writing and signed by an
+     authorized representative of Broadcom.
+
+3.8. Injunctive Relief. In the event of a breach by Licensee of Section 2
+     or 3, Broadcom shall be entitled to applicable injunctive relief and
+     to all remedies available in equity and law to prevent Licensee from
+     disassembling, de-compiling, reverse engineering, disclosing or using
+     the Licensed Code in whole or in part.
+
+3.9. Licensed Code Containing JRE. Certain Licensed Code may contain JRE.
+     Use of the JRE is restricted by JRE licensing terms to General Purpose
+     Desktop Computers and Servers, as defined below. Licensee may seek its
+     own license for the JRE directly with the owner, if it deems
+     necessary. "General Purposes Desktop Computers and Servers" under JRE
+     licensing terms is defined as "computers, including desktop, laptop
+     and tablet computers, or servers, used for general computing functions
+     under end user control (such as but not specifically limited to email,
+     general purpose Internet browsing and office suite productivity
+     tools)". The full terms and conditions for use of the JRE are
+     available at: http://www.oracle.com/technetwork/java/javase/terms/license/index.html.
+
+3.10. Notwithstanding anything to the contrary in this Agreement, to the
+      extent there is a conflict between this Agreement provisions and any
+      applicable license to open source technology, the provisions of the
+      open source license shall take precedence and be followed, but only
+      to the minimum extent reasonably necessary to comply with the
+      applicable open source license.
+
+
+4. Confidentiality
+
+4.1 Licensee agrees to limit access to the Licensed Code and Documentation
+    to employees and contractors of Licensee (which may include, without
+    limitation, contractors retained by Licensee to maintain or modify the
+    Licensed Code and Documentation on behalf of Licensee) having a need to
+    access or know the Licensed Code and Documentation and who have
+    executed nondisclosure agreements with Licensee obligating them to
+    maintain the confidentiality of the Licensed Code and Documentation.
+
+4.2 Licensee shall hold in confidence the Licensed Code and Documentation
+    as Broadcom's confidential information ("Confidential Information") and
+    shall use the Broadcom Code and Documentation only as expressly
+    provided in Section 2, and protect the confidentiality of such
+    Confidential Information with the same degree of care as Licensee uses
+    to protect its own confidential or proprietary information of great
+    commercial value, but in no event less than reasonable care and for no
+    less than three (3) years from the date of disclosure.
+
+4.3 Licensee agrees to notify Broadcom immediately after Licensee becomes
+    aware of any suspected misuse or unauthorized disclosure of any
+    Confidential Information. The obligations of confidentiality imposed on
+    Licensee under this Section 4 shall not apply or shall cease to apply
+    to any of such Confidential Information that Licensee clearly
+    establishes: (i) was already rightfully in the possession of Licensee
+    at the time of disclosure as evidenced by records of Licensee; (ii) is
+    or becomes publicly available through no act or omission of Licensee;
+    (iii) is rightfully received by Licensee from a third party without an
+    obligation of confidentiality; (iv) is independently developed by
+    Licensee's employees or contractors without use of or access to the
+    information; or (v) is approved for unrestricted disclosure in writing
+    by an authorized representative of Broadcom. Broadcom makes no warranty
+    as to the accuracy of any Confidential Information, which is furnished
+    "AS IS" with all faults.
+
+
+5. Ownership of Code by Broadcom, Fees, and Taxes
+
+5.1 Broadcom (or its licensors) reserve all right, title, ownership and
+    interest in and to the Licensed Code and Documentation existing prior
+    to and after the Effective Date of this Agreement, or created or
+    generated by Broadcom (or its licensors) at any time, subject to any
+    licenses granted. Broadcom (or its licensors) reserves all right,
+    title, ownership and interest in and to any Derivative Works it creates
+    at any time to the Licensed Code and Documentation, subject to any
+    licenses granted.
+
+5.2 Fees and Taxes. No fees are due in connection with this Agreement
+    unless separately specified by Broadcom. If any such fees are
+    separately specified in writing, the following applies:
+
+5.2.1 Payment is due by Licensee upon download, at time of purchase, or no
+      later than within thirty (30) days of date of Broadcom invoice
+      therefore, as designated by Broadcom All payments shall be made in
+      U.S. currency unless otherwise agreed. If at any time, Licensee is
+      delinquent in the payment of any invoice, or is otherwise in breach
+      of this Agreement, Broadcom may, at its discretion, and without
+      prejudice to its other rights, withhold delivery (including partial
+      delivery) of any order or may, at its option, require Licensee to
+      prepay for further deliveries. Any sum not paid by Licensee, when
+      due, shall bear interest until paid at a rate of 1.5% per month
+      (18% per annum) or the maximum rate permitted by law, whichever is
+      less.
+
+5.2.2 All payments or reimbursements due under this Agreement and any
+      instrument or agreement required hereunder shall be made free and
+      clear and without deduction for any and all present and future Taxes.
+      Payments due to Broadcom under this Agreement and any instrument or
+      agreement required hereunder shall be increased so that amounts
+      received by Broadcom, after provisions for Taxes and all Taxes on
+      such increase, will be equal to the amounts required under this
+      Agreement and any instrument or agreement required hereunder if no
+      Taxes were due on such payments.
+
+5.2.3 The Licensee shall indemnify Broadcom for the full amount of Taxes
+      attributable to the provision of products or services under this
+      Agreement, and any liabilities (including penalties, interest and
+      expenses) arising from such Taxes, within thirty (30) days from any
+      written demand by Broadcom. The Licensee shall provide evidence that
+      all applicable Taxes have been paid to the appropriate taxing
+      authority by delivering to Broadcom receipts or notarized copies
+      thereof within thirty (30) days after the due date for such tax
+      payments.
+
+5.2.4 Without prejudice to the survival of any other Agreement of Licensee
+      hereunder, the obligations of Licensee contained in this section
+      shall survive the payment in full of all payments hereunder.
+
+
+6. Support
+
+(a) Broadcom may provide the following support services for the Licensed
+    Code to the extent Broadcom deems reasonable: Updates if and when
+    released and errata in Broadcom's sole discretion. Broadcom shall not
+    be responsible for any other support or maintenance of Licensed Code to
+    Licensee or its Subsequent Users, unless otherwise agreed to in
+    writing. Broadcom is under no obligation to provide support services
+    and may discontinue support services at any time. Broadcom will not
+    provide support for modified Licensed Code or Licensee's Derivative
+    Works of the Source Code.
+
+(b) Any Updates to the Licensed Code provided by Broadcom (which shall only
+    be provided by Broadcom in its sole discretion) shall be governed by
+    the terms of this Agreement.
+
+(c) If Licensee finds what Licensee considers an error in the Licensed
+    Code, Licensee will notify Broadcom so that Broadcom can, in its sole
+    discretion, make corrections to the Licensed Code or to future
+    revisions of the Licensed Code.
+
+
+7. Term and Termination
+
+7.1 Term. The term of this Agreement is five (5) years from the Effective
+    Date, subject to renewal upon mutual agreement of the parties.
+
+7.2 Termination for Breach. If Licensee breaches any material provision of
+    this Agreement, Broadcom shall have the right to terminate this
+    Agreement, including all licenses granted hereunder, in addition to any
+    and all other remedies available at law or equity, unless Licensee
+    cures such breach within sixty (60) days ("Cure Period") after
+    receiving written notice of the breach by Broadcom. Licensee shall make
+    best efforts to cure the material breach in the least amount of time
+    possible within the Cure Period.
+
+7.3 Insolvency. If either party: (a) becomes substantially insolvent;
+    (b) makes an assignment for the benefit of creditors; (c) files or has
+    filed against it a petition in bankruptcy or seeking reorganization;
+    (d) has a receiver appointed; or (e) institutes any proceedings for
+    liquidation or winding up or have such proceedings instituted against
+    it; then the other party may, in addition to other rights and remedies
+    it may have, terminate this Agreement immediately by written notice.
+
+7.4 Consequences. Upon termination or expiration of this Agreement for any
+    reason whatsoever, the licenses, rights, and covenants granted
+    hereunder and any obligations imposed hereunder shall cease except as
+    otherwise expressly set forth herein as surviving termination or
+    expiration.
+
+7.5 Return of Confidential Information. Upon expiration or termination of
+    this Agreement for any reason or upon written request by Broadcom,
+    Licensee agrees to promptly return to Broadcom or, at Broadcom's
+    request, destroy and certify by an officer of Licensee in writing the
+    destruction of, all Broadcom Confidential Information furnished to
+    Licensee, including all Licensed Code and Documentation.
+
+7.6 Survival of Licenses. Any Licensed Code and Documentation distributed
+    by Licensee prior to the effective date of any termination, expiration,
+    breach, or cancellation of this Agreement, shall remain licensed
+    (including any Licensed Code in inventory, manufactured in, or work in
+    progress with Licensee products) under the terms of this Agreement.
+    Licensee may retain an archival copy of portions of the Broadcom
+    Confidential Information, including Licensed Code and Documentation,
+    necessary for Licensee to provide ongoing technical support to
+    Subsequent Users using the Licensed Code ("Archival Materials") after
+    termination, expiration or cancellation of this Agreement. Such
+    Archival Materials may not be used for any other purpose without the
+    written consent from Broadcom. Licensee shall keep such Archival
+    Materials confidential for an additional five (5) years from the date
+    of termination, expiration, or cancellation of this Agreement,
+    regardless of when the Broadcom Confidential Information was disclosed.
+
+7.7 Survival. In the event of expiration or termination of this Agreement
+    for any reason, the following sections of this Agreement shall survive:
+    1, 3, 4, 5, 7, 8, 9, and 10. Termination will not prejudice either
+    party to require performance of any obligation due at the time of
+    termination. All end user licenses in effect and in compliance with the
+    Agreement prior to effective termination or expiration shall survive
+    and continue in full force and effect in accordance with their terms
+    and Licensee may continue to perform its obligations thereunder,
+    including support obligations.
+
+
+8. Disclaimer of All Warranties
+
+8.1 THE PARTIES AGREE THAT BROADCOM FURNISHES THE LICENSED CODE AND
+    DOCUMENTATION TO LICENSEE "AS IS", UNSUPPORTED, WITHOUT WARRANTY OF ANY
+    KIND. BROADCOM DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+    THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+    PURPOSE AND NON-INFRINGEMENT, INCLUDING ANY THAT MAY ARISE FROM A
+    COURSE OF PERFORMANCE, A COURSE OF DEALING OR TRADE USAGE. BROADCOM
+    SHALL NOT BE LIABLE FOR ANY ERROR, OMISSION, DEFECT, DEFICIENCY, OR
+    NONCONFORMITY IN THE LICENSED CODE OR DOCUMENTATION. BROADCOM MAKES NO
+    WARRANTY OR REPRESENTATION THAT THE LICENSED CODE OR DOCUMENTATION WILL
+    MEET LICENSEE'S REQUIREMENTS OR WILL WORK IN COMBINATION WITH ANY
+    HARDWARE OR SOFTWARE APPLICATION.
+
+8.2 BROADCOM DISCLAIMS ANY AND ALL LIABILITY IN CONNECTION WITH LICENSEE'S
+    USE OF THE LICENSED CODE IN ANY MEDICAL, NUCLEAR, AVIATION, NAVIGATION,
+    MILITARY, OR OTHER HIGH RISK DEVICE OR APPLICATION. LICENSEE REPRESENTS
+    AND WARRANTS THAT IT WILL NOT USE THE LICENSED CODE IN ANY MEDICAL,
+    NUCLEAR, AVIATION, NAVIGATION, MILITARY, OR OTHER HIGH RISK DEVICE OR
+    APPLICATION. LICENSEE SHALL INDEMNIFY, DEFEND, AND HOLD BROADCOM
+    HARMLESS AGAINST ANY LOSS, LIABILITY, OR DAMAGE OF ANY KIND THAT
+    BROADCOM INCURS IN CONNECTION WITH BREACH OF THE WARRANTY IN THIS
+    SECTION 8.2.
+
+8.3 BROADCOM DISCLAIMS ANY AND ALL LIABILITY IN CONNECTION WITH LICENSEE'S
+    CREATION AND USE OF DERIVATIVE WORKS OF THE SOURCE CODE. LICENSEE SHALL
+    INDEMNIFY, DEFEND, AND HOLD BROADCOM HARMLESS AGAINST ANY LOSS,
+    LIABILITY, OR DAMAGE OF ANY KIND THAT BROADCOM INCURS IN CONNECTION
+    WITH LICENSEE'S DERIVATIVE WORKS OF SOURCE CODE.
+
+
+9. Limitation of Liability
+
+IN NO EVENT SHALL BROADCOM, ITS EMPLOYEES, AFFILIATES OR SUPPLIERS BE
+LIABLE FOR ANY LOST PROFITS, REVENUE, SALES OR DATA OR COSTS OF PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES, INTERRUPTION, LOSS OF BUSINESS INFORMATION
+OR ANY SPECIAL, DIRECT, INDIRECT, INCIDENTAL, CONSEQUENTIAL, ECONOMIC OR
+PUNITIVE DAMAGES, HOWEVER CAUSED, AND WHETHER ARISING UNDER CONTRACT, TORT,
+STRICT LIABILITY, NEGLIGENCE OR OTHER THEORY OF LIABILITY, ARISING OUT OF
+THE USE OR INABILITY TO USE THE LICENSED CODE OR DOCUMENTATION, EVEN IF
+BROADCOM OR ITS EMPLOYEES, SUPPLIERS OR AFFILIATES ARE ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES. IN THE EVENT THAT THE APPLICABLE JURISDICTION
+DOES NOT ALLOW THE EXCLUSION OR LIMITATION OF LIABILITY, BUT DOES ALLOW
+LIABILITY TO BE LIMITED, THE LIABILITY OF BROADCOM, ITS EMPLOYEES,
+AFFILIATES, OR SUPPLIERS IN SUCH CASES, SHALL BE LIMITED TO
+$100 US DOLLARS.
+
+
+10. General
+
+10.1 Assignment. Licensee shall not assign this Agreement or any of its
+     rights or delegate any of its duties under this Agreement without the
+     prior written consent of Broadcom. Subject to the foregoing, this
+     Agreement will be binding upon, enforceable by, and inure to the
+     benefit of the parties and their respective successors and assigns.
+     Any attempted assignment in violation of this Section 10.1 shall be
+     null and void.
+
+10.2 Governing Law. This Agreement shall be construed and interpreted in
+     accordance with the law of the State of California without reference
+     to its conflicts of law principles.
+
+10.3 Exclusive Jurisdiction. All disputes arising out of or related to this
+     Agreement will be subject to the exclusive jurisdiction and venue of
+     the California state courts of Santa Clara County, California in
+     United States District Court for the Northern District of California,
+     and the parties consent to the personal and exclusive jurisdiction of
+     these courts.
+
+10.4 Export Control. Licensee shall follow all export control laws and
+     regulations relating to the Licensed Code and Documentation. Licensee
+     hereby acknowledges responsibility for compliance with all applicable
+     US and local laws and regulations related to import and export and
+     acknowledges and agrees that the Licensed Code is subject to the U.S.
+     Export Administration Regulations. Diversion contrary to U.S. law is
+     prohibited. Licensee agrees that the Licensed Code is being or will be
+     acquired for, shipped, transferred, or re-exported, directly or
+     indirectly, to prohibited or embargoed countries, nor be used for any
+     prohibited end-use, such as nuclear activities, chemical/biological
+     weapons, or missile projects, unless expressly authorized by the U.S.
+     Government. Prohibited countries are set forth in the Supplement 1 to
+     Part 740 of the U.S. Export Administration Regulations. Countries
+     currently subject to U.S. embargo include: Cuba, Iran, N. Korea, Sudan
+     and Syria. This list is subject to change without further notice from
+     Broadcom and Licensee understands that compliance with the list as it
+     exists in fact, is required. Licensee assumes sole responsibility for
+     obtaining any/all licenses required for export or re-export. All ECCN
+     and CCATS numbers and License Exception information are subject to
+     change without notice. Modification in any way nullifies the
+     classification. It is therefore Licensee’s obligation as an exporter
+     to verify such information and comply with the then currently
+     applicable regulations. Any data provided by Broadcom is for
+     informational purposes only. Broadcom makes no representation or
+     warranty as to the accuracy or reliability of any classifications or
+     numbers. Any use of such classifications or numbers by Licensee is
+     without recourse to Broadcom and is at Licensee’s own risk. Broadcom
+     is in no way responsible for any damages, whether direct, indirect,
+     consequential, incidental or otherwise, suffered by Licensee as a
+     result of using or relying upon such classifications or numbers for
+     any purpose whatsoever. Licensee agrees to consult the EAR, the
+     Bureau of Industry and Security's Export Counseling Division, and
+     other appropriate sources before distributing, importing, or using
+     Broadcom products. Licensee may request software classification
+     information from Broadcom. If requested, Customer agrees to sign
+     written assurances and other export-related documents as may be
+     required by Broadcom.
+
+10.5 Waiver. No failure or delay on the part of either party in the
+     exercise of any right or privilege hereunder shall operate as a waiver
+     thereof or of the exercise of any other right or privilege hereunder,
+     nor shall any single or partial exercise of any such right or
+     privilege preclude other or further exercise thereof or of any other
+     right or privilege.
+
+10.6 Notice. Any notice or claim provided for herein to Broadcom shall be
+     in writing and addressed as set forth below, and shall be given (i) by
+     personal delivery, effective upon delivery, or (ii) by first class
+     mail, postage prepaid, addressed as set forth below, effective one (1)
+     business day after proper deposit in the mail to Broadcom, 1320 Ridder
+     Park Drive, San Jose, California 95131, USA; Attn. Legal Department -
+     Important Legal Notice.
+
+10.7 Severability. If any term, condition, or provision of this Agreement,
+     or portion of this Agreement, is found to be invalid, unlawful or
+     unenforceable to any extent, the parties will endeavor in good faith
+     to agree to such amendments that will preserve, as far as possible,
+     the intentions expressed in this Agreement. Such invalid term,
+     condition or provision will be severed from the remaining terms,
+     conditions and provisions, which will continue to be valid and
+     enforceable to the fullest extent permitted by law.
+
+10.8 Other Rights. Nothing contained in this Agreement shall be construed
+     as conferring by implication, estoppel, or otherwise upon either party
+     or any third party any license or other right except, solely as to the
+     parties hereto, the rights expressly granted hereunder.
+
+10.9 Integration; Modification. This Agreement embodies the final, complete
+     and exclusive statement of the terms agreed upon by the parties with
+     respect to the subject matter hereof and supersedes any prior or
+     contemporaneous representations, descriptions, courses of dealing, or
+     agreements in regard to such subject matter. No amendment or
+     modification of this Agreement shall be valid or binding upon the
+     parties unless stated in writing and signed by an authorized
+     representative of each party.
+
+10.10 Publicity. All publicity concerning this transaction referring to the
+      other party shall require the other party's prior written approval
+      which shall not be unreasonably withheld.
+
+10.11 Relationship of the Parties. The relationship of the parties hereto
+      is that of independent contractors. Neither party, nor its agents or
+      employees, shall be deemed to be the agent, employee, joint venture
+      partner, partner or fiduciary of the other party. Neither party shall
+      have the right to bind the other party, transact any business on
+      behalf of or in the name of the other party, or incur any liability
+      for or on behalf of the other party.
diff --git a/licenses/hpe b/licenses/hpe
new file mode 100644
index 000000000000..cbca4e6d35b3
--- /dev/null
+++ b/licenses/hpe
@@ -0,0 +1,202 @@
+HPE End User License Agreement – Enterprise Version
+
+1. Applicability. This end user license agreement (the "Agreement") governs
+   the use of accompanying software, unless it is subject to a separate
+   agreement between you and Hewlett Packard Enterprise Company and its
+   subsidiaries (“HPE”). By downloading, copying, or using the software you
+   agree to this Agreement. HPE provides translations of this Agreement in
+   certain languages other than English, which may be found at:
+   http://www.hpe.com/software/SWLicensing.
+
+2. Terms. This Agreement includes supporting material accompanying the
+   software or referenced by HPE, which may be software license
+   information, additional license authorizations, software specifications,
+   published warranties, supplier terms, open source software licenses and
+   similar content ("Supporting Material"). Additional license
+   authorizations are at: http://www.hpe.com/software/SWLicensing.
+
+3. Authorization. If you agree to this Agreement on behalf of another
+   person or entity, you warrant you have authority to do so.
+
+4. Consumer Rights. If you obtained software as a consumer, nothing in this
+   Agreement affects your statutory rights.
+
+5. Electronic Delivery. HPE may elect to deliver software and related
+   software product or license information by electronic transmission or
+   download.
+
+6. License Grant. If you abide by this Agreement, HPE grants you a
+   non-exclusive non-transferable license to use one copy of the version or
+   release of the accompanying software for your internal purposes only,
+   and is subject to any specific software licensing information that is in
+   the software product or its Supporting Material.
+
+Your use is subject to the following restrictions, unless specifically
+allowed in Supporting Material:
+
+  * You may not use software to provide services to third parties.
+
+  * You may not make copies and distribute, resell or sublicense software
+    to third parties.
+
+  * You may not download and use patches, enhancements, bug fixes, or
+    similar updates unless you have a license to the underlying software.
+    However, such license doesn't automatically give you a right to receive
+    such updates and HPE reserves the right to make such updates only
+    available to customers with support contracts.
+
+  * You may not copy software or make it available on a public or external
+    distributed network.
+
+  * You may not allow access on an intranet unless it is restricted to
+    authorized users.
+
+  * You may make one copy of the software for archival purposes or when it
+    is an essential step in authorized use.
+
+  * You may not modify, reverse engineer, disassemble, decrypt, decompile
+    or make derivative works of software. If you have a mandatory right to
+    do so under statute, you must inform HPE in writing about such
+    modifications.
+
+7. Remote Monitoring. Some software may require keys or other technical
+   protection measures and HPE may monitor your compliance with the
+   Agreement, remotely or otherwise. If HPE makes a license management
+   program for recording and reporting license usage information, you will
+   use such program no later than 180 days from the date it's made
+   available.
+
+8. Ownership. No transfer of ownership of any intellectual property will
+   occur under this Agreement.
+
+9. Copyright Notices. You must reproduce copyright notices on software and
+   documentation for authorized copies.
+
+10. Operating Systems. Operating system software may only be used on
+    approved hardware and configurations.
+
+11. 90-day Limited Warranty for HPE Software.
+
+  * HPE-branded software materially conforms to its specifications, if any,
+    and is free of malware at the time of delivery; if you notify HPE
+    within 90 days of delivery of non-conformance to this warranty, HPE
+    will replace your copy. This Agreement states all remedies for warranty
+    claims.
+
+  * HPE does not warrant that the operation of software will be
+    uninterrupted or error free, or that software will operate in hardware
+    and software combinations other than as authorized by HPE in Supporting
+    Material. To the extent permitted by law, HPE disclaims all other
+    warranties.
+
+12. Intellectual Property Rights Infringement. HPE will defend and/or
+    settle any claims against you that allege that HPE-branded software as
+    supplied under this Agreement infringes the intellectual property
+    rights of a third party. HPE will rely on your prompt notification of
+    the claim and cooperation with our defense. HPE may modify the software
+    so as to be non-infringing and materially equivalent, or we may procure
+    a license. If these options are not available, we will refund to you
+    the amount paid for the affected product in the first year or the
+    depreciated value thereafter. HPE is not responsible for claims
+    resulting from any unauthorized use of the software.
+
+13. Limitation of Liability. HPE's liability to you under this Agreement is
+    limited to the amount actually paid by you to HPE for the relevant
+    software, except for amounts in Section 12 ("Intellectual Property
+    Rights Infringement"). Neither you nor HPE will be liable for lost
+    revenues or profits, downtime costs, loss or damage to data or
+    indirect, special or consequential costs or damages. This provision
+    does not limit either party's liability for: unauthorized use of
+    intellectual property, death or bodily injury caused by their
+    negligence; acts of fraud; willful repudiation of the Agreement; or any
+    liability that may not be excluded or limited by applicable law.
+
+14. Termination. This Agreement is effective until terminated or in the
+    case of a limited-term license, upon expiration; however, your rights
+    under this Agreement terminate if you fail to comply with it.
+    Immediately upon termination or expiration, you will destroy the
+    software and documentation and any copies, or return them to HPE. You
+    may keep one copy of software and documentation for archival purposes.
+    We may ask you to certify in writing you have complied with this
+    section. Warranty disclaimers, the limitation of liability, this
+    section on termination, and Section 15 ("General") will survive
+    termination.
+
+15. General.
+
+  a. Assignment. You may not assign this Agreement without prior written
+     consent of HPE, payment of transfer fees and compliance with HPE's
+     software license transfer policies. Authorized assignments will
+     terminate your license to the software and you must deliver software
+     and documentation and copies thereof to the assignee. The assignee
+     will agree in writing to this Agreement. You may only transfer
+     firmware if you transfer associated hardware.
+
+  b. U.S. Government. If the software is licensed to you for use in the
+     performance of a U.S. Government prime contract or subcontract, you
+     agree that, consistent with FAR 12.211 and 12.212, commercial computer
+     software, computer software documentation and technical data for
+     commercial items are licensed under HPE's standard commercial license.
+
+  c. Global Trade Compliance. You agree to comply with the trade-related
+     laws and regulations of the U.S. and other national governments. If
+     you export, import or otherwise transfer products provided under this
+     Agreement, you will be responsible for obtaining any required export
+     or import authorizations. You confirm that you are not located in a
+     country that is subject to trade control sanctions (currently Cuba,
+     Iran, N. Korea, N. Sudan, and Syria) and further agree that you will
+     not retransfer the products to any such country. HPE may suspend its
+     performance under this Agreement to the extent required by laws
+     applicable to either party.
+
+  d. Audit. HPE may audit you for compliance with the software license
+     terms. Upon reasonable notice, HPE may conduct an audit during normal
+     business hours (with the auditor's costs being at HPE's expense). If
+     an audit reveals underpayments then you will pay to HPE such
+     underpayments. If underpayments discovered exceed five (5) percent,
+     you will reimburse HPE for the auditor costs.
+
+  e. Open Source Components. To the extent the Supporting Material includes
+     open source licenses, such licenses shall control over this Agreement
+     with respect to the particular open source component. To the extent
+     Supporting Material includes the GNU General Public License or the
+     GNU Lesser General Public License: (a) the software includes a copy of
+     the source code; or (b) if you downloaded the software from a website,
+     a copy of the source code is available on the same website; or (c) if
+     you send HPE written notice, HPE will send you a copy of the source
+     code for a reasonable fee.
+
+  f. Notices. Written notices under this Agreement may be provided to HPE
+     via the method provided in the Supporting Material.
+
+  g. Governing Law. This Agreement will be governed by the laws of the
+     state of California, U.S.A., excluding rules as to choice and conflict
+     of law. You and HPE agree that the United Nations Convention on
+     Contracts for the International Sale of Goods will not apply.
+
+  h. Force Majeure. Neither party will be liable for performance delays nor
+     for non-performance due to causes beyond its reasonable control,
+     except for payment obligations.
+
+  i. Entire Agreement. This Agreement represents our entire understanding
+     with respect to its subject matter and supersedes any previous
+     communication or agreements that may exist. Modifications to the
+     Agreement will be made only through a written amendment signed by both
+     parties. If HPE doesn't exercise its rights under this Agreement, such
+     delay is not a waiver of its rights.
+
+16. Australian Consumers. If you acquired the software as a consumer within
+    the meaning of the 'Australian Consumer Law' under the Australian
+    Competition and Consumer Act 2010 (Cth) then despite any other
+    provision of this Agreement, the terms at this URL apply:
+    http://www.hpe.com/software/SWLicensing.
+
+17. Russian Consumers. If you are based in the Russian Federation and the
+    rights to use the software are provided to you under a separate license
+    and/or sublicense agreement concluded between you and a duly authorized
+    HPE partner, then this Agreement shall not be applicable.
+
+HPE End User License Agreement – Enterprise Version
+
+5012-3777 v1.5, 2016 
+© Copyright 2015 Hewlett Packard Enterprise Development LP
diff --git a/media-gfx/darktable/darktable-2.0.3.ebuild b/media-gfx/darktable/darktable-2.0.3.ebuild
index 019254054d59..aeb9318ac513 100644
--- a/media-gfx/darktable/darktable-2.0.3.ebuild
+++ b/media-gfx/darktable/darktable-2.0.3.ebuild
@@ -138,7 +138,7 @@ pkg_postinst() {
 	elog "please bear in mind that your edits will be preserved during this process,"
 	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
 	echo
-	ewarn "There will not be possible to downgrade!"
+	ewarn "It will not be possible to downgrade!"
 }
 
 pkg_postrm() {
diff --git a/media-gfx/darktable/darktable-2.0.4.ebuild b/media-gfx/darktable/darktable-2.0.4.ebuild
index 019254054d59..aeb9318ac513 100644
--- a/media-gfx/darktable/darktable-2.0.4.ebuild
+++ b/media-gfx/darktable/darktable-2.0.4.ebuild
@@ -138,7 +138,7 @@ pkg_postinst() {
 	elog "please bear in mind that your edits will be preserved during this process,"
 	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
 	echo
-	ewarn "There will not be possible to downgrade!"
+	ewarn "It will not be possible to downgrade!"
 }
 
 pkg_postrm() {
diff --git a/media-gfx/darktable/darktable-2.0.5.ebuild b/media-gfx/darktable/darktable-2.0.5.ebuild
index 9359328eaa49..a84180c1e0da 100644
--- a/media-gfx/darktable/darktable-2.0.5.ebuild
+++ b/media-gfx/darktable/darktable-2.0.5.ebuild
@@ -138,7 +138,7 @@ pkg_postinst() {
 	elog "please bear in mind that your edits will be preserved during this process,"
 	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
 	echo
-	ewarn "There will not be possible to downgrade!"
+	ewarn "It will not be possible to downgrade!"
 }
 
 pkg_postrm() {
diff --git a/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild b/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
new file mode 100644
index 000000000000..93eae02df694
--- /dev/null
+++ b/media-tv/dvbstream/dvbstream-0.7_pre20080516-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="RTP multicast stream server and other tools for DVB cards"
+HOMEPAGE="https://sourceforge.net/projects/dvbtools"
+MY_P="${PN}-snapshot-20080302"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="virtual/linuxtv-dvb-headers"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-update.diff"
+	"${FILESDIR}/${PN}-0.7_pre20080302-telnet-port-switch.diff"
+)
+
+src_prepare() {
+	default
+
+	sed -i Makefile \
+		-e 's:$(CFLAGS):$(CFLAGS) $(CPPFLAGS):' \
+		-e '/CFLAGS.*=.*-g -Wall -O2/s:-g -Wall -O2::' \
+		-e '/CFLAGS.*=/s:CFLAGS:CPPFLAGS:' \
+		-e 's:-I \.\./DVB/include:-I /usr/include:' \
+		-e 's:$(CC):$(CC) $(LDFLAGS):g' \
+		|| die 'failed to fix flags in the Makefile'
+
+	sed -e 's:\./svdrpsend.pl:dvbstream-send.pl:' \
+		-i TELNET/*.sh \
+		|| die 'failed to rename the svdrpsend.pl command in scripts'
+
+	sed -e 's:^DUMPRTP=.*$:DUMPRTP=dumprtp:' \
+		-e 's:^TS2ES=.*$:TS2ES=ts2es:' \
+		-i *.sh \
+		|| die 'failed to set DUMPRTP and TS2ES in scripts'
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin dvbstream dumprtp rtpfeed ts_filter
+	newbin TELNET/svdrpsend.pl dvbstream-send.pl
+
+	dodoc README*
+	newdoc TELNET/README README.telnet
+
+	insinto "/usr/share/doc/${PF}/tune"
+	doins TELNET/*.sh
+
+	insinto "/usr/share/doc/${PF}/multicast"
+	doins *.sh
+}
diff --git a/net-misc/chrony/chrony-2.4.ebuild b/net-misc/chrony/chrony-2.4.ebuild
index d23296ecb345..6ad1cd68c017 100644
--- a/net-misc/chrony/chrony-2.4.ebuild
+++ b/net-misc/chrony/chrony-2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 hppa ppc64"
+KEYWORDS="~alpha ~amd64 ~arm hppa ppc64"
 IUSE="caps +cmdmon html ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
 REQUIRED_USE="
 	?? ( libedit readline )
diff --git a/net-misc/curl/curl-7.50.1.ebuild b/net-misc/curl/curl-7.50.1.ebuild
index 04fab03b76c3..e0e23ec159a6 100644
--- a/net-misc/curl/curl-7.50.1.ebuild
+++ b/net-misc/curl/curl-7.50.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/sys-apps/openrc/openrc-0.21.3.ebuild b/sys-apps/openrc/openrc-0.21.3.ebuild
index 18b07e5486d5..abf47b5665fd 100644
--- a/sys-apps/openrc/openrc-0.21.3.ebuild
+++ b/sys-apps/openrc/openrc-0.21.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
-	KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-block/hpacucli/Manifest b/sys-block/hpacucli/Manifest
index 096dd390c184..74e016142f1f 100644
--- a/sys-block/hpacucli/Manifest
+++ b/sys-block/hpacucli/Manifest
@@ -1,2 +1,4 @@
 DIST hpacucli-9.30-15.0.i386.rpm 6405071 SHA256 f1019a4a26c7d9adef1761fafb46b3add3034e77d48efe431bd499bbe5609312 SHA512 f628e5ca1f4e598700aaf8896e310e3ee59705d2ad9eae813179c0e873878b3ab6dd317fb34f738f901eb6972e8f4e9428b57a572dd1f8de73660b1c89213ce1 WHIRLPOOL cc41b16426a4298eafbf200a9c437501c8a2eb2456ca4e9d3f278bed64e203dade4e0de7c94a56e14ef20928a9c292440193c1e98071d9aaa661616c0ad6ea64
 DIST hpacucli-9.30-15.0.x86_64.rpm 6367162 SHA256 d25b4fc593e11e00f2ca2b83417b23d1b1e12e6bff3afcda5333b274dea89901 SHA512 ad53b7452feffc7457220b9f1df8fd435637e7d1d61b42bdaffe75e62c8245a127b7a80435a40ac5675f0a64e14cc9a99fa556dbecb0e37ae70dda51927afd6e WHIRLPOOL 0ba12328989bd5dce8eb5d83377768605f931ca78dd0e534bdbf65c93a17536499a7a9ea77816f4640ec86be8bdb620ae578fa14f7f7542c18ef95ac6efa3d27
+DIST hpacucli-9.40-12.0.i386.rpm 6824495 SHA256 bc0078f6e2f8e64eb5e3ce26527e08134669ca507a84c36bbe4266ac3685fa9e SHA512 93ae6c170e14e187ce33522a7f7d4e0970f8443758aa76f4eb72c6b818eeeff7720e9869473b62e4b088ced0bb9a198afecf7ff62da2fc73e67208f5cc680158 WHIRLPOOL 7c5942fb85a778c79ea78343602ccd35d2fb5a271ff17164ab157e59ad6fb8aacaa9b6d4fa122a7537bf43d54ea314491f0cc91b99681ca51581b8942a18b96c
+DIST hpacucli-9.40-12.0.x86_64.rpm 6800521 SHA256 94c51105fed0a34e2a8896720ce8234af23fcffb11f0a6b7e56eb30c6e803cb8 SHA512 a7de22febc0261bdb60a5fee250d42455dc0ac152541f34eb91df81b4e57472ae96ee2972e3a4c44ff409e3d1c2b364054818c7ea610c3b2a20c913a51df2ed4 WHIRLPOOL 7d9c55d10a3953b6152e2b1937817ed8b129948229bfd4bf87f7fbd9dddece0d786fe390ca6ccc9cfd4356c91ee62484484e2dc153050365a324e3c54853c939
diff --git a/sys-block/hpacucli/files/hpacucli-wrapper-r1 b/sys-block/hpacucli/files/hpacucli-wrapper-r1
new file mode 100644
index 000000000000..fd2cec5cdf83
--- /dev/null
+++ b/sys-block/hpacucli/files/hpacucli-wrapper-r1
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+cmd="$(basename "$0")"
+
+HPACUCLI_BASEDIR="/opt/hp/hpacucli"
+HPACUCLI_LOCKDIR="/run/lock/$cmd"
+HPACUCLI_LOCK="${HPACUCLI_LOCKDIR}/CPQACU_MUTEX"
+HPACUCLI_BIN="${HPACUCLI_BASEDIR}/$cmd.bin"
+
+if pgrep -x "$cmd.bin"; then
+        echo "Another instance of $cmd is running! Stop it first."
+        exit 1
+fi
+
+if ! [ -f "${HPACUCLI_LOCK}" ]; then
+	mkdir -p -m 700 "${HPACUCLI_LOCKDIR}"
+	touch "${HPACUCLI_LOCK}"
+fi
+
+export LD_LIBRARY_PATH="${HPACUCLI_BASEDIR}"
+export ACUXE_LOCK_FILES_DIR="${HPACUCLI_LOCKDIR}/"
+"${HPACUCLI_BIN}" "${@}"
diff --git a/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild b/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
new file mode 100644
index 000000000000..6e0d28ca8cda
--- /dev/null
+++ b/sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rpm versionator pax-utils
+
+MY_PV=$(replace_version_separator 2 '-')
+
+SRC_URI_BASE="ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux"
+AMD64_PID="1257348637"
+AMD64_VID="80070"
+X86_PID="414707558"
+X86_VID="80071"
+
+DESCRIPTION="HP Array Configuration Utility Command Line Interface (HPACUCLI, formerly CPQACUXE)"
+HOMEPAGE="http://h18000.www1.hp.com/products/servers/linux/documentation.html"
+SRC_URI="
+	amd64? ( ${SRC_URI_BASE}/p${AMD64_PID}/v${AMD64_VID}/${PN}-${MY_PV}.x86_64.rpm )
+	x86? ( ${SRC_URI_BASE}/p${X86_PID}/v${X86_VID}/${PN}-${MY_PV}.i386.rpm )"
+
+LICENSE="hp-proliant-essentials"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/coreutils
+	sys-process/procps
+	>=sys-apps/util-linux-2.20.1"
+
+S="${WORKDIR}"
+
+HPACUCLI_BASEDIR="/opt/hp/hpacucli"
+QA_PREBUILT="${HPACUCLI_BASEDIR:1}/*"
+QA_EXECSTACK="${HPACUCLI_BASEDIR:1}/libcpqimgr*.so"
+
+src_install() {
+	local MY_S="${S}/opt/compaq/${PN}/bld"
+
+	newsbin "${FILESDIR}"/"${PN}-wrapper-r1" hpacucli
+	dosym /usr/sbin/hpacucli /usr/sbin/hpacuscripting
+
+	exeinto "${HPACUCLI_BASEDIR}"
+	for bin in "${MY_S}"/.hp*; do
+		local basename=$(basename "${bin}")
+		newexe "${bin}" ${basename#.}.bin
+	done
+
+	insinto "${HPACUCLI_BASEDIR}"
+	doins "${MY_S}"/*.so
+
+	dodoc "${MY_S}"/*.txt
+	doman "${S}"/usr/man/man*/*
+
+	cat <<-EOF >"${T}"/45${PN}
+		LDPATH=${HPACUCLI_BASEDIR}
+		EOF
+	doenvd "${T}"/45${PN}
+
+	pax-mark m "${D}opt/hp/hpacucli/"*
+}
diff --git a/sys-block/hpacucli/metadata.xml b/sys-block/hpacucli/metadata.xml
index 097975e3adc2..a32d600f949d 100644
--- a/sys-block/hpacucli/metadata.xml
+++ b/sys-block/hpacucli/metadata.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-block/hpssacli/Manifest b/sys-block/hpssacli/Manifest
new file mode 100644
index 000000000000..198ab11b81ef
--- /dev/null
+++ b/sys-block/hpssacli/Manifest
@@ -0,0 +1 @@
+DIST hpssacli-2.40-13.0.x86_64.rpm 11772990 SHA256 1e17602dec56f30dfe9329eb5ea060ac0dbb42ea003a27e8eecaa2148b331599 SHA512 4a650c2700f77bdc79693905e56598cbe8f198d4f54c7c97e05a7b8af830f11c5e5eea2d16538a3c6068eadb75159850b391d7f772f59447bbbd870f64eb7efa WHIRLPOOL b0821a4875724cab30c0e95fccdca71e0700e3008e48fe9efb6d0b5d1f8f3de32259b586aaa5f0bdbd51a350b8467d992ee6aefceac9ee81beb0c34f2a6b0ec7
diff --git a/sys-block/hpssacli/files/hpssacli-wrapper b/sys-block/hpssacli/files/hpssacli-wrapper
new file mode 100644
index 000000000000..2e425f719e20
--- /dev/null
+++ b/sys-block/hpssacli/files/hpssacli-wrapper
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+#
+# Uncomment the line below to turn off discovery of Fibre
+# export INFOMGR_BYPASS_FIBRE=1
+#
+# Uncomment the lines below to turn off discovery of Non-Smart Array controllers
+# export INFOMGR_BYPASS_NONSA=1
+#
+
+cmd="$(basename "$0")"
+
+HPSSACLI_BASEDIR="/opt/hp/hpssacli"
+HPSSACLI_BIN="${HPSSACLI_BASEDIR}/${cmd}.bin"
+
+if pgrep --exact "${cmd}.bin" 1>/dev/null; then
+        echo "Another instance of ${cmd} is running! Stop it first."
+        exit 1
+fi
+
+export LD_LIBRARY_PATH="${HPSSACLI_BASEDIR}"
+"${HPSSACLI_BIN}" "${@}"
diff --git a/sys-block/hpssacli/hpssacli-2.40.13.0.ebuild b/sys-block/hpssacli/hpssacli-2.40.13.0.ebuild
new file mode 100644
index 000000000000..75a43e145983
--- /dev/null
+++ b/sys-block/hpssacli/hpssacli-2.40.13.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit pax-utils rpm versionator
+
+MY_PV=$(replace_version_separator 2 '-')
+
+DESCRIPTION="HPE Smart Storage Administrator (HPE SSA) CLI (HPSSACLI, formerly HPACUCLI)"
+HOMEPAGE="http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_04bffb688a73438598fef81ddd"
+SRC_URI="http://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/${PN}-${MY_PV}.x86_64.rpm"
+
+LICENSE="hpe"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="elibc_glibc? ( >sys-libs/glibc-2.14 )
+	>=sys-libs/libunwind-0.99
+	>=sys-process/procps-3.3.6"
+
+DOCS=( license.txt readme.txt )
+
+MY_HPSSACLI_BASEDIR="/opt/hp/hpssacli"
+
+QA_PREBUILT="${MY_HPSSACLI_BASEDIR:1}/hpssa*.bin"
+QA_EXECSTACK="${MY_HPSSACLI_BASEDIR:1}/hpssa*.bin"
+
+src_unpack() {
+	rpm_src_unpack
+
+	mkdir "${S}" || die "Failed to create '${S}'"
+}
+
+src_prepare() {
+	default
+
+	# Create a clean $S
+	mv "${WORKDIR}"/opt/hp/hpssacli/bld/hpss* "${S}" || die "Failed to to copy 'hpss*' related files"
+	mv "${S}"/hpssacli.license "${S}"/license.txt || die "Renaming hpssacli.license failed!"
+	mv "${S}"/hpssacli*.txt "${S}"/readme.txt || die "Renaming hpssacli*.txt failed!"
+	rm -rf "${WORKDIR}"/opt || die "Failed to cleanup '${WORKDIR}/opt'"
+	rm -rf "${WORKDIR}"/usr || die "Failed to cleanup '${WORKDIR}/usr'"
+}
+
+src_install() {
+	newsbin "${FILESDIR}"/"${PN}-wrapper" ${PN}
+	dosym ${PN} /usr/sbin/hpssascripting
+
+	exeinto "${MY_HPSSACLI_BASEDIR}"
+	for bin in "${S}"/hpssa{cli,scripting}; do
+		local basename=$(basename "${bin}")
+		newexe "${bin}" ${basename}.bin
+	done
+
+	dodoc "${DOCS[@]}"
+
+	pax-mark m "${D%/}${HPSSACLI_BASEDIR}"/*.bin
+}
diff --git a/sys-block/hpssacli/metadata.xml b/sys-block/hpssacli/metadata.xml
new file mode 100644
index 000000000000..a32d600f949d
--- /dev/null
+++ b/sys-block/hpssacli/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
new file mode 100644
index 000000000000..33356e5c57b9
--- /dev/null
+++ b/sys-block/storcli/Manifest
@@ -0,0 +1 @@
+DIST storcli-1.19.04.zip 41606377 SHA256 026456cf30e1f14f33a42eb5804dcf9fb6d3b79b9fd46828db6cdd4abe736054 SHA512 3086360a4c40755cdcaa8faa7192adccae5555cf3aaa741be583fa3559a7dedc14652489d8248a69465040871710917d09461644df3d1d2d31fe6d6e0957196b WHIRLPOOL 81fd83d9b3e938b5cf5135066db97aa4db3c1c7b62ca861a1736dd7719874a2b68d5e1c65ad79d97e29e8d4cfbfa2ee0a7fdc347fc0931009e8f7cc946739cae
diff --git a/sys-block/storcli/metadata.xml b/sys-block/storcli/metadata.xml
new file mode 100644
index 000000000000..352d6632a496
--- /dev/null
+++ b/sys-block/storcli/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>whissi@whissi.de</email>
+		<name>Thomas D. (Whissi)</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-block/storcli/storcli-1.19.04.ebuild b/sys-block/storcli/storcli-1.19.04.ebuild
new file mode 100644
index 000000000000..744ee10c5f18
--- /dev/null
+++ b/sys-block/storcli/storcli-1.19.04.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit pax-utils
+
+DESCRIPTION="MegaRAID StorCLI (successor of the MegaCLI)"
+HOMEPAGE="http://www.avagotech.com/support/download-search?dnd-keyword=storcli"
+# For new versions check http://www.avagotech.com/cs/Satellite?pagename=AVG2/Utilities/searchResultsJson&page=1&q=storcli&endDate=null&searchType=type-AVG_Document_C~Downloads&isEntitled=null&dynamic-search-relevance=Newest
+SRC_URI="http://docs.avagotech.com/docs-and-downloads/docs-and-downloads/raid-controllers/raid-controllers-common-files/${PV}_StorCLI.zip -> ${P}.zip"
+
+LICENSE="Avago LSI BSD"
+SLOT="0/6.11"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+DOCS=( readme.txt license.txt )
+
+MY_STORCLI_BASEDIR="/opt/lsi/storcli"
+
+QA_PRESTRIPPED="${MY_STORCLI_BASEDIR:1}/storcli"
+
+src_unpack() {
+	unpack ${A}
+
+	mv storcli_all_os/Ubuntu/storcli_*.deb "${WORKDIR}" || die "Failed to move storclli_*.deb"
+
+	# Unpack Ubuntu package which will be our $S content
+	unpack "${WORKDIR}"/storcli_*.deb
+	rm -f storcli_*.deb || die "Failed to cleanup storcli_*.deb package"
+	unpack "${WORKDIR}"/data.tar.gz
+
+	mkdir "${S}" || die "Failed to create '${S}'"
+}
+
+src_prepare() {
+	default
+
+	# Create clean $S
+	mv "${WORKDIR}"/*CLI.txt "${S}"/readme.txt || die "Failed to move *CLI.txt to readme.txt"
+	mv "${WORKDIR}"/storcli_all_os/Linux/license.txt "${S}"/license.txt || die "Failed to move Linux/license.txt"
+	rm -rf "${WORKDIR}"/storcli_all* || die "Failed to cleanup storcli_all* dirs/files"
+	mv "${WORKDIR}"/opt/Mega*/storcli/* "${S}" || die "Failed to move storcli_.deb content to '${S}'"
+	rm -rf "${WORKDIR}"/{opt,control.tar.gz,data.tar.gz,debian-binary} || die "Failed to cleanup no longer needed files"
+}
+
+src_install() {
+	exeinto "${MY_STORCLI_BASEDIR}"
+
+	if use x86; then
+		doexe storcli
+	elif use amd64; then
+		newexe storcli64 storcli
+	fi
+
+	dosym "${MY_STORCLI_BASEDIR}"/storcli /usr/sbin/storcli
+
+	dodoc "${DOCS[@]}"
+
+	pax-mark m "${D%/}${MY_STORCLI_BASEDIR}"/storcli
+}