metadata: mask net-misc/trickle[~scm]

dev-util/cquery: initial import
2018-06-12 17:06:44 +02:00 · 2018-06-12 17:05:02 +02:00
136 changed files with 290 additions and 4763 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,5 +0,0 @@
-# Disable checks for trailing whitespace for patches, they always trigger warnings,-blank-at-eof
-*.diff whitespace=-trailing-space,-space-before-tab,-blank-at-eof
-*.patch whitespace=-trailing-space,-space-before-tab,-blank-at-eof
-*.exlib whitespace=-blank-at-eof
-*.exheres-0 whitespace=-blank-at-eof
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -0,0 +1,10 @@
+image: exherbo/exherbo_ci
+
+variables:
+  REPO: hasufell
+  REPO_NAMESPACE: exherbo-unofficial
+
+build:
+  script:
+    - buildtest
+
--- a/README.md
+++ b/README.md
@ -8,5 +8,7 @@ Random exheres.

 You have these possibilities:

-1. git patch via email to: hasufell `ä` hasufell.de
-2. create an account [here](https://gogs.hasufell.de/user/sign_up) and fork+PR
+1. use https://gitlab.exherbo.org/exherbo-unofficial/hasufell
+2. use the patchbot on irc.freenode.net in `#exherbo`: https://exherbo.org/docs/patchbot.html
+3. git patch via email to: hasufell `ä` hasufell.de
+4. ask for an account on https://gogs.hasufell.de and fork+PR
--- a/exlibs/desktop-utils.exlib
+++ b/exlibs/desktop-utils.exlib
@ -105,12 +105,6 @@ find_desktop_file_category() {
    local subcat=

    case ${CATEGORY} in
-        app*) maincat="Utility"
-            case ${CATEGORY##*-} in
-                editors) subcat="TextEditor";;
-                *) ;;
-            esac
-            ;;
        dev*) maincat="Development"
            case ${CATEGORY##*-} in
                db) subcat="Database";;
--- a/licences/CC-Attribution-NoDerivs-3.0
+++ b/licences/CC-Attribution-NoDerivs-3.0
@ -1,294 +0,0 @@
-Creative Commons Legal Code
-
-Attribution-NoDerivs 3.0 Unported
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR
-    DAMAGES RESULTING FROM ITS USE.
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
-BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
-CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-CONDITIONS.
-
-1. Definitions
-
- a. "Adaptation" means a work based upon the Work, or upon the Work and
-    other pre-existing works, such as a translation, adaptation,
-    derivative work, arrangement of music or other alterations of a
-    literary or artistic work, or phonogram or performance and includes
-    cinematographic adaptations or any other form in which the Work may be
-    recast, transformed, or adapted including in any form recognizably
-    derived from the original, except that a work that constitutes a
-    Collection will not be considered an Adaptation for the purpose of
-    this License. For the avoidance of doubt, where the Work is a musical
-    work, performance or phonogram, the synchronization of the Work in
-    timed-relation with a moving image ("synching") will be considered an
-    Adaptation for the purpose of this License.
- b. "Collection" means a collection of literary or artistic works, such as
-    encyclopedias and anthologies, or performances, phonograms or
-    broadcasts, or other works or subject matter other than works listed
-    in Section 1(f) below, which, by reason of the selection and
-    arrangement of their contents, constitute intellectual creations, in
-    which the Work is included in its entirety in unmodified form along
-    with one or more other contributions, each constituting separate and
-    independent works in themselves, which together are assembled into a
-    collective whole. A work that constitutes a Collection will not be
-    considered an Adaptation (as defined above) for the purposes of this
-    License.
- c. "Distribute" means to make available to the public the original and
-    copies of the Work through sale or other transfer of ownership.
- d. "Licensor" means the individual, individuals, entity or entities that
-    offer(s) the Work under the terms of this License.
- e. "Original Author" means, in the case of a literary or artistic work,
-    the individual, individuals, entity or entities who created the Work
-    or if no individual or entity can be identified, the publisher; and in
-    addition (i) in the case of a performance the actors, singers,
-    musicians, dancers, and other persons who act, sing, deliver, declaim,
-    play in, interpret or otherwise perform literary or artistic works or
-    expressions of folklore; (ii) in the case of a phonogram the producer
-    being the person or legal entity who first fixes the sounds of a
-    performance or other sounds; and, (iii) in the case of broadcasts, the
-    organization that transmits the broadcast.
- f. "Work" means the literary and/or artistic work offered under the terms
-    of this License including without limitation any production in the
-    literary, scientific and artistic domain, whatever may be the mode or
-    form of its expression including digital form, such as a book,
-    pamphlet and other writing; a lecture, address, sermon or other work
-    of the same nature; a dramatic or dramatico-musical work; a
-    choreographic work or entertainment in dumb show; a musical
-    composition with or without words; a cinematographic work to which are
-    assimilated works expressed by a process analogous to cinematography;
-    a work of drawing, painting, architecture, sculpture, engraving or
-    lithography; a photographic work to which are assimilated works
-    expressed by a process analogous to photography; a work of applied
-    art; an illustration, map, plan, sketch or three-dimensional work
-    relative to geography, topography, architecture or science; a
-    performance; a broadcast; a phonogram; a compilation of data to the
-    extent it is protected as a copyrightable work; or a work performed by
-    a variety or circus performer to the extent it is not otherwise
-    considered a literary or artistic work.
- g. "You" means an individual or entity exercising rights under this
-    License who has not previously violated the terms of this License with
-    respect to the Work, or who has received express permission from the
-    Licensor to exercise rights under this License despite a previous
-    violation.
- h. "Publicly Perform" means to perform public recitations of the Work and
-    to communicate to the public those public recitations, by any means or
-    process, including by wire or wireless means or public digital
-    performances; to make available to the public Works in such a way that
-    members of the public may access these Works from a place and at a
-    place individually chosen by them; to perform the Work to the public
-    by any means or process and the communication to the public of the
-    performances of the Work, including by public digital performance; to
-    broadcast and rebroadcast the Work by any means including signs,
-    sounds or images.
- i. "Reproduce" means to make copies of the Work by any means including
-    without limitation by sound or visual recordings and the right of
-    fixation and reproducing fixations of the Work, including storage of a
-    protected performance or phonogram in digital form or other electronic
-    medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce,
-limit, or restrict any uses free from copyright or rights arising from
-limitations or exceptions that are provided for in connection with the
-copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License,
-Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-perpetual (for the duration of the applicable copyright) license to
-exercise the rights in the Work as stated below:
-
- a. to Reproduce the Work, to incorporate the Work into one or more
-    Collections, and to Reproduce the Work as incorporated in the
-    Collections; and,
- b. to Distribute and Publicly Perform the Work including as incorporated
-    in Collections.
- c. For the avoidance of doubt:
-
-     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
-        which the right to collect royalties through any statutory or
-        compulsory licensing scheme cannot be waived, the Licensor
-        reserves the exclusive right to collect such royalties for any
-        exercise by You of the rights granted under this License;
-    ii. Waivable Compulsory License Schemes. In those jurisdictions in
-        which the right to collect royalties through any statutory or
-        compulsory licensing scheme can be waived, the Licensor waives the
-        exclusive right to collect such royalties for any exercise by You
-        of the rights granted under this License; and,
-   iii. Voluntary License Schemes. The Licensor waives the right to
-        collect royalties, whether individually or, in the event that the
-        Licensor is a member of a collecting society that administers
-        voluntary licensing schemes, via that society, from any exercise
-        by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now
-known or hereafter devised. The above rights include the right to make
-such modifications as are technically necessary to exercise the rights in
-other media and formats, but otherwise you have no rights to make
-Adaptations. Subject to Section 8(f), all rights not expressly granted by
-Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made
-subject to and limited by the following restrictions:
-
- a. You may Distribute or Publicly Perform the Work only under the terms
-    of this License. You must include a copy of, or the Uniform Resource
-    Identifier (URI) for, this License with every copy of the Work You
-    Distribute or Publicly Perform. You may not offer or impose any terms
-    on the Work that restrict the terms of this License or the ability of
-    the recipient of the Work to exercise the rights granted to that
-    recipient under the terms of the License. You may not sublicense the
-    Work. You must keep intact all notices that refer to this License and
-    to the disclaimer of warranties with every copy of the Work You
-    Distribute or Publicly Perform. When You Distribute or Publicly
-    Perform the Work, You may not impose any effective technological
-    measures on the Work that restrict the ability of a recipient of the
-    Work from You to exercise the rights granted to that recipient under
-    the terms of the License. This Section 4(a) applies to the Work as
-    incorporated in a Collection, but this does not require the Collection
-    apart from the Work itself to be made subject to the terms of this
-    License. If You create a Collection, upon notice from any Licensor You
-    must, to the extent practicable, remove from the Collection any credit
-    as required by Section 4(b), as requested.
- b. If You Distribute, or Publicly Perform the Work or Collections, You
-    must, unless a request has been made pursuant to Section 4(a), keep
-    intact all copyright notices for the Work and provide, reasonable to
-    the medium or means You are utilizing: (i) the name of the Original
-    Author (or pseudonym, if applicable) if supplied, and/or if the
-    Original Author and/or Licensor designate another party or parties
-    (e.g., a sponsor institute, publishing entity, journal) for
-    attribution ("Attribution Parties") in Licensor's copyright notice,
-    terms of service or by other reasonable means, the name of such party
-    or parties; (ii) the title of the Work if supplied; (iii) to the
-    extent reasonably practicable, the URI, if any, that Licensor
-    specifies to be associated with the Work, unless such URI does not
-    refer to the copyright notice or licensing information for the Work.
-    The credit required by this Section 4(b) may be implemented in any
-    reasonable manner; provided, however, that in the case of a
-    Collection, at a minimum such credit will appear, if a credit for all
-    contributing authors of the Collection appears, then as part of these
-    credits and in a manner at least as prominent as the credits for the
-    other contributing authors. For the avoidance of doubt, You may only
-    use the credit required by this Section for the purpose of attribution
-    in the manner set out above and, by exercising Your rights under this
-    License, You may not implicitly or explicitly assert or imply any
-    connection with, sponsorship or endorsement by the Original Author,
-    Licensor and/or Attribution Parties, as appropriate, of You or Your
-    use of the Work, without the separate, express prior written
-    permission of the Original Author, Licensor and/or Attribution
-    Parties.
- c. Except as otherwise agreed in writing by the Licensor or as may be
-    otherwise permitted by applicable law, if You Reproduce, Distribute or
-    Publicly Perform the Work either by itself or as part of any
-    Collections, You must not distort, mutilate, modify or take other
-    derogatory action in relation to the Work which would be prejudicial
-    to the Original Author's honor or reputation.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
-OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
-KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
-LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
-WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
-OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
-LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
-ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
-ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
- a. This License and the rights granted hereunder will terminate
-    automatically upon any breach by You of the terms of this License.
-    Individuals or entities who have received Collections from You under
-    this License, however, will not have their licenses terminated
-    provided such individuals or entities remain in full compliance with
-    those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any
-    termination of this License.
- b. Subject to the above terms and conditions, the license granted here is
-    perpetual (for the duration of the applicable copyright in the Work).
-    Notwithstanding the above, Licensor reserves the right to release the
-    Work under different license terms or to stop distributing the Work at
-    any time; provided, however that any such election will not serve to
-    withdraw this License (or any other license that has been, or is
-    required to be, granted under the terms of this License), and this
-    License will continue in full force and effect unless terminated as
-    stated above.
-
-8. Miscellaneous
-
- a. Each time You Distribute or Publicly Perform the Work or a Collection,
-    the Licensor offers to the recipient a license to the Work on the same
-    terms and conditions as the license granted to You under this License.
- b. If any provision of this License is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this License, and without further action
-    by the parties to this agreement, such provision shall be reformed to
-    the minimum extent necessary to make such provision valid and
-    enforceable.
- c. No term or provision of this License shall be deemed waived and no
-    breach consented to unless such waiver or consent shall be in writing
-    and signed by the party to be charged with such waiver or consent.
- d. This License constitutes the entire agreement between the parties with
-    respect to the Work licensed here. There are no understandings,
-    agreements or representations with respect to the Work not specified
-    here. Licensor shall not be bound by any additional provisions that
-    may appear in any communication from You. This License may not be
-    modified without the mutual written agreement of the Licensor and You.
- e. The rights granted under, and the subject matter referenced, in this
-    License were drafted utilizing the terminology of the Berne Convention
-    for the Protection of Literary and Artistic Works (as amended on
-    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
-    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
-    and the Universal Copyright Convention (as revised on July 24, 1971).
-    These rights and subject matter take effect in the relevant
-    jurisdiction in which the License terms are sought to be enforced
-    according to the corresponding provisions of the implementation of
-    those treaty provisions in the applicable national law. If the
-    standard suite of rights granted under applicable copyright law
-    includes additional rights not granted under this License, such
-    additional rights are deemed to be included in the License; this
-    License is not intended to restrict the license of any rights under
-    applicable law.
-
-
-Creative Commons Notice
-
-    Creative Commons is not a party to this License, and makes no warranty
-    whatsoever in connection with the Work. Creative Commons will not be
-    liable to You or any party on any legal theory for any damages
-    whatsoever, including without limitation any general, special,
-    incidental or consequential damages arising in connection to this
-    license. Notwithstanding the foregoing two (2) sentences, if Creative
-    Commons has expressly identified itself as the Licensor hereunder, it
-    shall have all rights and obligations of Licensor.
-
-    Except for the limited purpose of indicating to the public that the
-    Work is licensed under the CCPL, Creative Commons does not authorize
-    the use by either party of the trademark "Creative Commons" or any
-    related trademark or logo of Creative Commons without the prior
-    written consent of Creative Commons. Any permitted use will be in
-    compliance with Creative Commons' then-current trademark usage
-    guidelines, as may be published on its website or otherwise made
-    available upon request from time to time. For the avoidance of doubt,
-    this trademark restriction does not form part of this License.
-
-    Creative Commons may be contacted at http://creativecommons.org/.
-
--- a/licences/dropbox
+++ b/licences/dropbox
@ -1,65 +0,0 @@
-Dropbox Terms of Service
-Thank you for using Dropbox! These terms of service (the “Terms”) govern your access to and use of Dropbox (“we” or “our”) websites and services (the “Services”), so please carefully read them before using the Services.
-
-By using the Services you agree to be bound by these Terms. If you are using the Services on behalf of an organization, you are agreeing to these Terms for that organization and promising that you have the authority to bind that organization to these terms. In that case, “you” and “your” will refer to that organization.
-
-You may use the Services only in compliance with these Terms. You may use the Services only if you have the power to form a contract with Dropbox and are not barred under any applicable laws from doing so. The Services may continue to change over time as we refine and add more features. We may stop, suspend, or modify the Services at any time without prior notice to you. We may also remove any content from our Services at our discretion.
-
-Your Stuff & Your Privacy
-By using our Services you may give us access to your information, files, and folders (together, “your stuff”). You retain ownership to your stuff. You are also solely responsible for your conduct, the content of your files and folders, and your communications with others while using the Services.
-
-We sometimes need your permission to do what you ask us to do with your stuff (for example, hosting, making public, or sharing your files). By submitting your stuff to the Services, you grant us (and those we work with to provide the Services) worldwide, non-exclusive, royalty-free, sublicenseable rights to use, copy, distribute, prepare derivative works (such as translations or format conversions) of, perform, or publicly display that stuff to the extent we think it necessary for the Service. You must ensure you have the rights you need to grant us that permission.
-
-How we use your stuff is also governed by the Dropbox Privacy Policy, which you acknowledge. You acknowledge that Dropbox has no obligation to monitor any information on the Services, even though we may do so. We are not responsible for the accuracy, completeness, appropriateness, or legality of files, user posts, or any other information you may be able to access using the Services. We may disclose information about your account or your stuff to law enforcement officials as outlined in our Privacy Policy.
-
-Sharing Your Stuff
-The Services provide features that allow you to share your stuff with others or to make it public. There are many things that users may do with that stuff (for example, copy it, modify it, re-share it). Please consider carefully what you choose to share or make public. Dropbox has no responsibility for that activity.
-
-Your Responsibilities
-Files and other content in the Services may be protected by intellectual property rights of others. Please do not copy, upload, download, or share files unless you have the right to do so. You, not Dropbox, will be fully responsible and liable for what you copy, share, upload, download or otherwise use while using the Services. You must not upload spyware or any other malicious software to the Service.
-
-You, and not Dropbox, are responsible for maintaining and protecting all of your stuff. Dropbox will not be liable for any loss or corruption of your stuff, or for any costs or expenses associated with backing up or restoring any of your stuff.
-
-If your contact information, or other information related to your account, changes, you must notify us promptly and keep your information current. The Services are not intended for use by you if you are under 13 years of age. By agreeing to these Terms, you are representing to us that you are over 13.
-
-Account Security
-You are responsible for safeguarding the password that you use to access the Services and you agree not to disclose your password to any third party. You are responsible for any activity using your account, whether or not you authorized that activity. You should immediately notify Dropbox of any unauthorized use of your account. You acknowledge that if you wish to protect your transmission of data or files to Dropbox, it is your responsibility to use a secure encrypted connection to communicate with the Services.
-
-Software and Updates
-Some use of our Service requires you to download a client software package (“Software”). Dropbox hereby grants you a limited, nonexclusive, nontransferable, revocable license to use the Software, solely to access the Services. Your license to use the Software is automatically revoked if you violate these Terms in a manner that implicates our intellectual property rights. We hereby reserve all rights not expressly granted in these Terms. You must not reverse engineer or decompile the Software, nor attempt to do so, nor assist anyone else to do so. Our Services may update the Software on your device automatically when a new version is available. Our pause syncing feature pauses syncing of your files, but may not cease all data transfer, so you should exit the desktop client if you’d like to stop data transfer.
-
-Dropbox Property and Feedback
-These terms do not grant you any right, title, or interest in the Services, Software, or the content in the Services. While we appreciate it when users send us feedback, please be aware that we may use any feedback, comments, or suggestions you send us or post in our forums without any obligation to you. The Software and other technology we use to provide the Services are protected by copyright, trademark, and other laws of both the United States and foreign countries. These Terms do not grant you any rights to use the Dropbox trademarks, logos, domain names, or other brand features.
-
-Acceptable Use Policy
-You will not, and will not to attempt to, misuse the Services, and will use the Services only in a manner consistent with the Dropbox Acceptable Use Policy.
-
-Copyright
-Dropbox respects others’ intellectual property and asks that you do too. We will respond to notices of alleged copyright infringement if they comply with the law and are properly provided to us. Such notices should be reported using our DMCA Process. We reserve the right to delete or disable content alleged to be infringing and to terminate repeat infringers. Our designated agent for notice of alleged copyright infringement on the Services is:
-
-Copyright Agent
-Dropbox Inc.
-760 Market Street #1150
-San Francisco, CA 94102
-copyright@dropbox.com
-Other Content
-The Services may contain links to third-party websites or resources. Dropbox does not endorse and is not responsible or liable for their availability, accuracy, the related content, products, or services. You are solely responsible for your use of any such websites or resources. Also, if we provide you with any software under an open source license, there may be provisions in those licenses that expressly conflict with these Terms, in which case the open source provisions will apply.
-
-Termination
-Though we’d much rather you stay, you can stop using our Services any time. We reserve the right to suspend or end the Services at any time, with or without cause, and with or without notice. For example, we may suspend or terminate your use if you are not complying with these Terms, or use the Services in any way that would cause us legal liability or disrupt others’ use of the Services. If we suspend or terminate your use, we will try to let you know in advance and help you retrieve data, though there may be some cases (for example, repeatedly or flagrantly violating these Terms, a court order, or danger to other users) where we may suspend immediately.
-
-Dropbox is Available “AS-IS”
-Though we want to provide a great service, there are certain things about the service we can’t promise. For example, THE SERVICES AND SOFTWARE ARE PROVIDED “AS IS”, AT YOUR OWN RISK, WITHOUT EXPRESS OR IMPLIED WARRANTY OR CONDITION OF ANY KIND. WE ALSO DISCLAIM ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. (We are not shouting- it’s just that these disclaimers are really important, so we want to highlight them). Dropbox will have no responsibility for any harm to your computer system, loss or corruption of data, or other harm that results from your access to or use of the Services or Software. Some states do not allow the types of disclaimers in this paragraph, so they may not apply to you.
-
-Limitation of Liability
-TO THE FULLEST EXTENT PERMITTED BY LAW, IN NO EVENT WILL DROPBOX, ITS AFFILIATES, OFFICERS, EMPLOYEES, AGENTS, SUPPLIERS OR LICENSORS BE LIABLE FOR (A) ANY INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE, EXEMPLARY OR CONSEQUENTIAL (INCLUDING LOSS OF USE, DATA, BUSINESS, OR PROFITS) DAMAGES, REGARDLESS OF LEGAL THEORY, WHETHER OR NOT DROPBOX HAS BEEN WARNED OF THE POSSIBILITY OF SUCH DAMAGES, AND EVEN IF A REMEDY FAILS OF ITS ESSENTIAL PURPOSE; (B) AGGREGATE LIABILITY FOR ALL CLAIMS RELATING TO THE SERVICES MORE THAN THE GREATER OF $20 OR THE AMOUNTS PAID BY YOU TO DROPBOX FOR THE PAST THREE MONTHS OF THE SERVICES IN QUESTION. Some states do not allow the types of limitations in this paragraph, so they may not apply to you.
-
-Export Restrictions
-The export and re-export of the Software may be controlled by the United States Export Administration Regulations. The Software may not be used in Cuba; Iran; North Korea; Sudan; or Syria or any country that is subject to an embargo by the United States. If you are a resident or national of, or a business located in, any of those countries, you may not download or use the Software. In addition, the Software may not be distributed to persons on the Table of Denial Orders; the Entity List; or the List of Specially Designated Nationals.
-
-Modifications
-We may revise these Terms from time to time and the most current version will always be posted on our website. If a revision, in our sole discretion, is material we will notify you (for example via email to the email address associated with your account). Other changes may be posted to our blog or terms page, so please check those pages regularly. By continuing to access or use the Services after revisions become effective, you agree to be bound by the revised Terms. If you do not agree to the new terms, please stop using the Services.
-
-Miscellaneous Legal Terms
-THESE TERMS AND THE USE OF THE SERVICES AND SOFTWARE WILL BE GOVERNED BY CALIFORNIA LAW EXCEPT FOR ITS CONFLICTS OF LAWS PRINCIPLES. ALL CLAIMS ARISING OUT OF OR RELATING TO THESE TERMS OR THE SERVICES OR SOFTWARE MUST BE LITIGATED EXCLUSIVELY IN THE FEDERAL OR STATE COURTS OF SAN FRANCISCO COUNTY, CALIFORNIA, AND BOTH PARTIES CONSENT TO VENUE AND PERSONAL JURISDICTION THERE. These Terms constitute the entire and exclusive agreement between you and Dropbox with respect to the Services, and supersede and replace any other agreements, terms and conditions applicable to the Services. These Terms create no third party beneficiary rights. Dropbox’s failure to enforce a provision is not a waiver of its right to do so later. If a provision is found unenforceable the remaining provisions of the Agreement will remain in full effect and an enforceable term will be substituted reflecting our intent as closely as possible. You may not assign any of your rights in these Terms, and any such attempt is void, but Dropbox may assign its rights to any of its affiliates or subsidiaries, or to any successor in interest of any business associated with the Services. Dropbox and you are not legal partners or agents; instead, our relationship is that of independent contractors.
-
--- a/metadata/categories.conf
+++ b/metadata/categories.conf
@ -1,25 +1,18 @@
 app-admin
 app-arch
-app-benchmarks
 app-crypt
-app-diagram
 app-editors
 app-ergonomics
-app-misc
 app-office
 dev-cpp
 dev-db
 dev-dotnet
 dev-games
-dev-haskell
-dev-java
 dev-lang
 dev-libs
 dev-ocaml
 dev-perl
 dev-python
-dev-ruby
-dev-scm
 dev-tcl
 dev-util
 games-action
@ -40,7 +33,6 @@ media-libs
 media-plugins
 media-sound
 media-video
-monitor
 net-firewall
 net-im
 net-libs
@ -49,9 +41,7 @@ net-p2p
 net-www
 sci-mathematics
 sys-apps
-sys-boot
 sys-process
-virtual
 voip
 www-apps
 www-servers
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@ -2,4 +2,4 @@ layout = exheres
 eapi_when_unknown = exheres-0
 eapi_when_unspecified = exheres-0
 profile_eapi_when_unspecified = exheres-0
-masters = arbor ocaml-unofficial java
+masters = arbor ocaml-unofficial
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@ -1,6 +1,4 @@
 (
-    app-editors/neovim-gtk[~scm]
-    dev-haskell/ghcup[~scm]
    dev-lang/fsharp[~scm]
    dev-lang/fstar[~scm]
    dev-python/pytype[~scm]
@ -9,24 +7,20 @@
    games-engines/OpenJK[~scm]
    games-engines/flare[~scm]
    games-fps/eduke32[~scm]
-    games-rpg/flare[~scm]
    games-rpg/valyriatear[~scm]
+    games-rpg/flare[~scm]
    games-strategy/freesynd[~scm]
-    media-gfx/pinta[~scm]
-    media-sound/pnmixer-rs[~scm]
-    media-sound/pnmixer[~scm]
    media/livestreamer[~scm]
+    media-gfx/pinta[~scm]
+    media-sound/pnmixer[~scm]
+    media-sound/pnmixer-rs[~scm]
    net-im/gajim-omemo[~scm]
    net-im/lurch[~scm]
    net-im/pidgin-opensteamworks[~scm]
    net-misc/remmina[~scm]
    net-misc/trickle[~scm]
-    sys-apps/fd[~scm]
-    sys-apps/lenovo-throttling-fix[~scm]
-    sys-apps/lsd[~scm]
    x11-apps/terminator[~scm]
    x11-misc/cbatticon[~scm]
-    x11-misc/fsearch[~scm]
    x11-wm/i3[~scm]
 ) [[
    *author = [ Julian Ospald <hasufell@posteo.de> ]
--- a/packages/app-admin/supervisor/supervisor-3.3.4.exheres-0
+++ b/packages/app-admin/supervisor/supervisor-3.3.4.exheres-0
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 require openrc-service [ openrc_confd_files=[ "${FILES}"/openrc/confd ] ]
-require setup-py [ import=setuptools test=pytest ]
+require setup-py [ import=setuptools blacklist="3" ]
 require pypi

 SUMMARY="A system for controlling process state under UNIX"
@ -17,8 +17,7 @@ DEPENDENCIES="
    run:
        dev-python/meld3[python_abis:*(-)?]
    test:
-        dev-python/pexpect[python_abis:*(-)?]
-        python_abis:2.7? ( dev-python/mock[python_abis:2.7] )
+        dev-python/mock[python_abis:*(-)?]
 "

 RESTRICT="test" # sydbox violations
--- a/packages/app-arch/innoextract/innoextract-1.6.exheres-0
+++ b/packages/app-arch/innoextract/innoextract-1.6.exheres-0
--- a/packages/app-benchmarks/stress/stress-1.0.4.exheres-0
+++ b/packages/app-benchmarks/stress/stress-1.0.4.exheres-0
@ -1,14 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-SUMMARY="Imposes stressful loads on different aspects of the system"
-HOMEPAGE="https://people.seas.harvard.edu/~apw/stress"
-DOWNLOADS="https://people.seas.harvard.edu/~apw/stress/${PNV}.tar.gz"
-
-LICENCES="GPL-3"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-BUGS_TO="hasufell@posteo.de"
-
--- a/packages/app-diagram/drawio-desktop-bin/drawio-desktop-bin-8.8.0.exheres-0
+++ b/packages/app-diagram/drawio-desktop-bin/drawio-desktop-bin-8.8.0.exheres-0
@ -1,76 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require gtk-icon-cache
-
-SUMMARY="Diagram drawing application built on web technology"
-HOMEPAGE="https://www.draw.io/"
-DOWNLOADS="
-    platform:amd64? ( https://github.com/jgraph/drawio-desktop/releases/download/v${PV}/draw.io-amd64-${PV}.deb )
-"
-
-LICENCES="Apache-2.0"
-SLOT="0"
-PLATFORMS="-* ~amd64"
-MYOPTIONS="
-    platform: amd64
-"
-
-DEPENDENCIES="
-    run:
-        dev-libs/atk
-        dev-libs/expat
-        dev-libs/glib:2
-        dev-libs/nspr
-        dev-libs/nss
-        gnome-platform/GConf:2
-        media-libs/fontconfig
-        net-print/cups
-        sys-apps/dbus
-        sys-sound/alsa-lib
-        x11-libs/cairo
-        x11-libs/gdk-pixbuf:2.0
-        x11-libs/gtk+:3
-        x11-libs/libX11
-        x11-libs/libXScrnSaver
-        x11-libs/libXcomposite
-        x11-libs/libXcursor
-        x11-libs/libXdamage
-        x11-libs/libXext
-        x11-libs/libXfixes
-        x11-libs/libXi
-        x11-libs/libXrandr
-        x11-libs/libXrender
-        x11-libs/libXtst
-        x11-libs/libxcb
-        x11-libs/pango
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-REMOTE_IDS="github:jgraph/drawio-desktop"
-
-RESTRICT="strip"
-
-WORK=${WORKBASE}
-
-pkg_setup() {
-    exdirectory --allow /opt
-}
-
-src_unpack() {
-    default
-    unpack ./data.tar.xz
-}
-
-src_install() {
-    insinto /
-
-    doins -r usr
-    edo mv "${IMAGE}"/usr/share/doc/draw.io/ "${IMAGE}"/usr/share/doc/${PNV}/
-
-    doins -r opt
-    edo chmod +x "${IMAGE}"/opt/draw.io/{draw.io,libffmpeg.so,libnode.so}
-    dodir /usr/$(exhost --target)/bin
-    dosym ../../../opt/draw.io/draw.io /usr/$(exhost --target)/bin/draw.io
-}
--- a/packages/app-editors/neovim-gtk/neovim-gtk-0.1.1-r2.exheres-0
+++ b/packages/app-editors/neovim-gtk/neovim-gtk-0.1.1-r2.exheres-0
@ -1,26 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require neovim-gtk
-
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-
-DEPENDENCIES="
-    build+run:
-        app-editors/neovim
-        dev-libs/glib:2
-        x11-libs/cairo
-        x11-libs/gtk+:3[>=3.10.0]
-        x11-libs/pango
-"
-
-src_install() {
-    ecargo_install
-
-    insinto /usr/share/applications
-    doins desktop/*.desktop
-
-    insinto /usr/share/icons/hicolor/128x128/apps
-    doins desktop/nvim-gtk.png
-}
--- a/packages/app-editors/neovim-gtk/neovim-gtk-scm.exheres-0
+++ b/packages/app-editors/neovim-gtk/neovim-gtk-scm.exheres-0
@ -1,38 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require neovim-gtk
-
-DOWNLOADS=""
-
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-
-DEPENDENCIES="
-    build+run:
-        app-editors/neovim
-        dev-libs/glib:2
-        x11-libs/cairo
-        x11-libs/gtk+:3[>=3.22.0]
-        x11-libs/pango[>=1.38]
-"
-
-src_unpack() {
-    cargo_src_unpack
-}
-
-src_install() {
-    ecargo_install
-
-    insinto /usr/share/nvim-gtk
-    doins -r runtime
-
-    insinto /usr/share/applications
-    doins desktop/*.desktop
-
-    insinto /usr/share/icons/hicolor/48x48/apps
-    doins desktop/org.daa.NeovimGtk.png
-
-    insinto /usr/share/icons/hicolor/scalable/apps
-    doins desktop/org.daa.NeovimGtk.svg
-}
--- a/packages/app-editors/neovim-gtk/neovim-gtk.exlib
+++ b/packages/app-editors/neovim-gtk/neovim-gtk.exlib
@ -1,30 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require freedesktop-desktop gtk-icon-cache
-require cargo [ channel=stable ]
-require github [ user=daa84 tag="v${PV}" ]
-
-SUMMARY="Gtk ui for neovim"
-HOMEPAGE="https://github.com/daa84/neovim-gtk ${HOMEPAGE}"
-
-LICENCES="GPL-3.0"
-MYOPTIONS=""
-
-BUGS_TO="hasufell@posteo.de"
-
-src_prepare() {
-    default
-    export PREFIX=/usr
-}
-
-pkg_postinst() {
-    freedesktop-desktop_update_desktop_database
-    gtk-icon-cache_pkg_postinst
-}
-
-pkg_postrm() {
-    freedesktop-desktop_update_desktop_database
-    gtk-icon-cache_pkg_postrm
-}
-
--- a/packages/app-editors/notepadqq/notepadqq-1.2.0.exheres-0
+++ b/packages/app-editors/notepadqq/notepadqq-1.2.0.exheres-0
--- a/packages/app-editors/oni/oni-0.3.6.exheres-0
+++ b/packages/app-editors/oni/oni-0.3.6.exheres-0
@ -1,96 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require desktop-utils gtk-icon-cache freedesktop-desktop
-
-SUMMARY="An IDE powered by Neovim"
-HOMEPAGE="https://www.onivim.io/"
-DOWNLOADS="
-platform:amd64? ( https://github.com/onivim/oni/releases/download/v${PV}/Oni-${PV}-x64-linux.tar.gz )
-    https://aur.archlinux.org/cgit/aur.git/plain/icons.tar.gz?h=oni -> oni-icons.tar.gz
-"
-
-LICENCES="MIT"
-SLOT="0"
-PLATFORMS="~amd64"
-MYOPTIONS="
-    ( platform: amd64 )
-"
-
-DEPENDENCIES="
-    run:
-        app-editors/neovim
-        dev-libs/atk
-        dev-libs/expat
-        dev-libs/glib:2
-        dev-libs/nspr
-        dev-libs/nss
-        gnome-platform/GConf:2
-        media-libs/fontconfig
-        net-print/cups
-        sys-apps/dbus
-        sys-sound/alsa-lib
-        x11-libs/cairo
-        x11-libs/gdk-pixbuf:2.0
-        x11-libs/gtk+:3
-        x11-libs/libX11
-        x11-libs/libXScrnSaver
-        x11-libs/libXcomposite
-        x11-libs/libXcursor
-        x11-libs/libXdamage
-        x11-libs/libXext
-        x11-libs/libXfixes
-        x11-libs/libXi
-        x11-libs/libXrandr
-        x11-libs/libXrender
-        x11-libs/libXtst
-        x11-libs/libxcb
-        x11-libs/libxkbfile
-        x11-libs/pango
-"
-
-BUGS_TO="hasufell@posteo.de"
-REMOTE_IDS="github:onivim/${PN}"
-UPSTREAM_DOCUMENTATION="https://onivim.github.io/oni-docs/"
-
-WORK=${WORKBASE}/Oni-${PV}-x64-linux
-
-pkg_setup() {
-    exdirectory --allow /opt
-}
-
-src_install() {
-    insinto /opt/${PN}
-    doins -r *
-    chmod +x "${IMAGE}"/opt/${PN}/oni
-
-    herebin ${PN} <<EOF
-#!/bin/bash
-set -e
-
-cd /opt/${PN}
-exec ./oni "\$@"
-EOF
-
-    install_desktop_entry \
-        "MimeType=text/english;text/plain;text/markdown;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;text/x-ruby;text/x-python;" \
-        "Categories=Utility;TextEditor;" \
-        "Keywords=Text;Editor;Neovim;" \
-        "GenericName=Text Editor"
-
-    for i in 16x16 32x32 64x64 128x128 256x256 512x512 1024x1024; do
-        insinto /usr/share/icons/hicolor/${i}/apps
-        newins "${WORKBASE}"/icons/${i}.png oni.png
-    done
-}
-
-pkg_postinst() {
-    freedesktop-desktop_pkg_postinst
-    gtk-icon-cache_pkg_postinst
-}
-
-pkg_postrm() {
-    freedesktop-desktop_pkg_postrm
-    gtk-icon-cache_pkg_postrm
-}
-
--- a/packages/app-ergonomics/workrave/workrave-1.10.20.exheres-0
+++ b/packages/app-ergonomics/workrave/workrave-1.10.20.exheres-0
@ -21,7 +21,6 @@ SLOT="0"
 PLATFORMS="~amd64 ~x86"

 MYOPTIONS="
-    gconf [[ description = [ compile with Gnome gconf2 support ] ]]
    gnome [[ description = [ Add support for gnome panel ] ]]
    pulseaudio
    xfce4-panel [[ description = [ Add support for XFCE panel ] ]]
@ -36,26 +35,21 @@ DEPENDENCIES="
        virtual/pkg-config
        x11-proto/xorgproto
    build+run:
-        dev-cpp/cairomm:1.0
        dev-cpp/libsigc++:2
-        dev-libs/atk
        dev-libs/glib:2
-        gnome-bindings/atkmm:1.6
        gnome-bindings/glibmm:2.4
        gnome-bindings/gtkmm:3
-        gnome-bindings/pangomm:1.4
        gnome-desktop/gobject-introspection:=
        media-libs/gstreamer:1.0[gobject-introspection]
        media-plugins/gst-plugins-base:1.0[gobject-introspection]
        media-plugins/gst-plugins-good:1.0
-        x11-libs/cairo
-        x11-libs/gdk-pixbuf:2.0
        x11-libs/gtk+:3[gobject-introspection]
+        x11-libs/libSM
        x11-libs/libX11
        x11-libs/libXScrnSaver
+        x11-libs/libXmu
+        x11-libs/libXt
        x11-libs/libXtst
-        x11-libs/pango:0
-        gconf? ( gnome-platform/GConf:2 )
        gnome? ( gnome-base/gnome-shell )
        pulseaudio? ( media-sound/pulseaudio )
        xfce4-panel? (
@ -71,6 +65,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
    --disable-distribution
    --enable-exercises
    --disable-experimental
+    --disable-gnome2
    --disable-static
    --disable-xml
    --disable-indicator
@ -82,7 +77,6 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
 )

 DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
-    'gconf gconf'
    'gnome gnome3'
    'pulseaudio pulse'
    'xfce4-panel xfce'
--- a/packages/app-misc/nnn/nnn-2.5.exheres-0
+++ b/packages/app-misc/nnn/nnn-2.5.exheres-0
@ -1,36 +0,0 @@
-# Copyright 2019 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require github [ user="jarun" tag="v${PV}" ]
-require bash-completion zsh-completion
-
-SUMMARY="Lean, fast, zero-config, full-featured file manager with batteries "
-
-LICENCES="BSD-2"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build:
-        virtual/pkg-config
-    build+run:
-        sys-libs/ncurses:=
-        sys-libs/readline:=
-    suggestion:
-        app-arch/libarchive [[ description = [ create, list and extract archives ] ]]
-        media/mediainfo [[ description = [ multimedia file details ] ]]
-        sys-auth/vlock [[ description = [ terminal locker ] ]]
-        sys-fs/sshfs-fuse [[ description = [ mount, unmount over SSHFS ] ]]
-        x11-apps/xdg-utils [[ description = [ desktop opener ] ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-src_install() {
-    emake PREFIX="/usr/$(exhost --target)" MANPREFIX="/usr/share/man" DESTDIR="${IMAGE}" install
-    emagicdocs
-
-    dobashcompletion scripts/auto-completion/bash/*
-    dozshcompletion scripts/auto-completion/zsh/*
-}
--- a/packages/dev-db/mysql-connector-c++/files/0001-Fix-build-with-LibreSSL.patch
+++ b/packages/dev-db/mysql-connector-c++/files/0001-Fix-build-with-LibreSSL.patch
@ -1,46 +0,0 @@
-From 4f94810a75ba89936c0b67ace13ff0e171f3649e Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@posteo.de>
-Date: Sun, 16 Sep 2018 19:13:05 +0800
-Subject: [PATCH 1/2] Fix build with LibreSSL
-
-This check is useless. If the library depends on specific
-features of SSL, it must check for those. Checking for
-version is not reliable and breaks LibreSSL compatibility.
---
- cdk/cmake/ssl.cmake                  | 6 +-----
- cdk/foundation/connection_openssl.cc | 2 +-
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/cdk/cmake/ssl.cmake b/cdk/cmake/ssl.cmake
-index 494f0fe..1e7adca 100644
--- a/cdk/cmake/ssl.cmake
-+++ b/cdk/cmake/ssl.cmake
-@@ -251,11 +251,7 @@ function(MYSQL_CHECK_SSL)
-       return()
-     endif()
- 
-    if(NOT OPENSSL_VERSION_MAJOR EQUAL 1)
-      message(SEND_ERROR "OpenSSL version 1.x is required but version ${OPENSSL_VERSION} was found")
-    else()
-      message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}")
-    endif()
-+    message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}")
- 
-     #
-     # We assume that FindOpenSSL finds  2 libraries in this order.
-diff --git a/cdk/foundation/connection_openssl.cc b/cdk/foundation/connection_openssl.cc
-index f7fe28c..200d710 100644
--- a/cdk/foundation/connection_openssl.cc
-+++ b/cdk/foundation/connection_openssl.cc
-@@ -188,7 +188,7 @@ static void throw_ssl_error(SSL* tls, int err)
-   case SSL_ERROR_WANT_CONNECT:
-   case SSL_ERROR_WANT_ACCEPT:
-   case SSL_ERROR_WANT_X509_LOOKUP:
-# if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-   case SSL_ERROR_WANT_ASYNC:
-   case SSL_ERROR_WANT_ASYNC_JOB:
- # endif
-- 
-2.19.0
-
--- a/packages/dev-db/mysql-connector-c++/files/0002-Don-t-call-ar-directly-use-CMAKE_AR.patch
+++ b/packages/dev-db/mysql-connector-c++/files/0002-Don-t-call-ar-directly-use-CMAKE_AR.patch
@ -1,25 +0,0 @@
-From 3594a934f7f142efeadaea41ee5be53983795899 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@posteo.de>
-Date: Sun, 16 Sep 2018 19:47:03 +0800
-Subject: [PATCH 2/2] Don't call ar directly, use CMAKE_AR
-
---
- cdk/cmake/libutils/merge_archives.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cdk/cmake/libutils/merge_archives.cmake.in b/cdk/cmake/libutils/merge_archives.cmake.in
-index fc58df4..e56c4b4 100644
--- a/cdk/cmake/libutils/merge_archives.cmake.in
-+++ b/cdk/cmake/libutils/merge_archives.cmake.in
-@@ -101,7 +101,7 @@ else()
-       # extract object from the library ...
- 
-       execute_process(
-        COMMAND ar x ../lib.a ${obj}
-+        COMMAND ${CMAKE_AR} x ../lib.a ${obj}
-         WORKING_DIRECTORY ${MERGELIBS_DIR}/${lib}/objs
-       )
- 
-- 
-2.19.0
-
--- a/packages/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.12.exheres-0
+++ b/packages/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.12.exheres-0
@ -1,13 +1,11 @@
 # Copyright 2017 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2

-CMAKE_SOURCE=${WORK}-src
-
 require cmake [ api=2 ]

 SUMMARY="MySQL database connector for C++ (mimics JDBC 4.0 API)"
 HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
-DOWNLOADS="https://dev.mysql.com/get/Downloads/Connector-C++/${PNV}-src.tar.gz"
+DOWNLOADS="https://dev.mysql.com/get/Downloads/Connector-C++/${PNV}.tar.gz"

 LICENCES="GPL-2"
 SLOT="0"
@ -27,27 +25,26 @@ DEPENDENCIES="

 BUGS_TO="hasufell@posteo.de"

-DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/0001-Fix-build-with-LibreSSL.patch
-    "${FILES}"/0002-Don-t-call-ar-directly-use-CMAKE_AR.patch
-)
-
 src_configure() {
    CMAKE_SRC_CONFIGURE_PARAMS=(
-        -DCMAKE_BUILD_TYPE=Release
-        -DINSTALL_DOC_DIR="/usr/share/doc/${PNVR}"
-        -DINSTALL_LIB_DIR="lib"
-        -DWITH_JDBC=ON
+        -DINSTALL_DOCS="/usr/share/doc/${PNVR}"
+        -DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
+        -DMYSQLCPPCONN_ICU_ENABLE=OFF
+        -DMYSQL_CXX_LINKAGE=0
+        -DMYSQL_INCLUDE_DIR="$(mysql_config --variable=pkgincludedir)"
+        -DUSE_MYSQLCPPCONN_GCOV_ENABLE=OFF
+        -DUSE_MYSQLCPPCONN_TRACE_ENABLE=OFF
    )

    cmake_src_configure
 }

 src_prepare() {
+    edo sed -i \
+            -e '/ADD_SUBDIRECTORY(test/d' \
+            -e 's#DOC_DESTINATION "."#DOC_DESTINATION ${INSTALL_DOCS}#' \
+            "${CMAKE_SOURCE}"/CMakeLists.txt
+
    cmake_src_prepare
 }

-src_install() {
-    cmake_src_install
-    edo rm "${IMAGE}"/usr/$(exhost --target)/BUILDINFO.txt
-}
--- a/packages/dev-db/mysql-workbench/mysql-workbench-6.3.10.exheres-0
+++ b/packages/dev-db/mysql-workbench/mysql-workbench-6.3.10.exheres-0
@ -7,7 +7,8 @@ require cmake [ api=2 ]

 SUMMARY="MySQL Workbench"
 HOMEPAGE="https://www.mysql.com/products/workbench/"
-DOWNLOADS="https://dev.mysql.com/get/Downloads/MySQLGUITools/${PN}-community-${PV}-src.tar.gz"
+DOWNLOADS="https://dev.mysql.com/get/Downloads/MySQLGUITools/${PN}-community-${PV}-src.tar.gz
+    http://www.antlr3.org/download/antlr-3.4-complete.jar"

 LICENCES="GPL-2"
 SLOT="0"
@ -26,18 +27,16 @@ DEPENDENCIES="
        dev-cpp/ctemplate
        dev-cpp/libsigc++:2
        dev-db/libiodbc
-        dev-db/mysql-connector-c++[>=${PV}]
+        dev-db/mysql-connector-c++
        dev-db/vsqlite++
-        dev-java/antlr:4
        dev-lang/python:2.7[sqlite]
-        dev-libs/antlr4-cpp
        dev-libs/boost
        dev-libs/glib:2
-        dev-libs/libsecret:1
        dev-libs/libxml2:2.0
        dev-libs/pcre
        dev-libs/tinyxml
        dev-python/paramiko[python_abis:2.7]
+        dev-python/pexpect[python_abis:2.7]
        dev-python/pycairo[python_abis:2.7]
        gnome-bindings/atkmm:1.6
        gnome-bindings/glibmm:2.4
@ -45,7 +44,6 @@ DEPENDENCIES="
        gnome-bindings/pangomm:1.4
        gnome-desktop/libgnome-keyring
        gnome-platform/libglade:2
-        net-libs/libssh
        sci-libs/gdal
        virtual/mysql
        x11-dri/mesa
@ -61,6 +59,9 @@ DEPENDENCIES="
 BUGS_TO="hasufell@posteo.de"

 src_prepare() {
+    edo install -D "${FETCHEDDIR}"/antlr-3.4-complete.jar \
+        "${WORKBASE}"/linux-res/bin/antlr-3.4-complete.jar
+
    # fix gdal includes
    edo sed -i \
            -e 's|#include <gdal/|#include <|' \
@ -79,16 +80,6 @@ src_prepare() {
            -e 's/\-Werror//' \
            "${CMAKE_SOURCE}"/CMakeLists.txt

-    # fix mysql-connector-c++ detection
-    edo sed -i \
-            -e '/MySQLCppConn_INCLUDE_DIR NAMES/s#/usr/include#/usr/include/jdbc#' \
-            "${CMAKE_SOURCE}"/build/cmake/Modules/FindMySQLCppConn.cmake
-
-    # fix antl4 jar detection
-    edo sed -i \
-            -e '/ANTLR_JAR_FILENAME/s/antlr-4.7.1-complete.jar/antlr-complete.jar/' \
-            "${CMAKE_SOURCE}"/CMakeLists.txt
-
    cmake_src_prepare
 }

@ -97,8 +88,6 @@ src_configure() {
        -DIODBC_CONFIG_PATH="/usr/$(exhost --target)/bin/iodbc-config"
        -DLIB_INSTALL_DIR="/usr/$(exhost --target)/lib"
        -DSHARE_INSTALL_PREFIX=/usr/share
-        -DANTLR_JAR_PATH="/usr/share/antlr-4"
-        -DANTLR_JAR_FILENAME="antlr-complete.jar"
    )

    cmake_src_configure
--- a/packages/dev-db/pgmodeler/pgmodeler-0.9.1-r1.exheres-0
+++ b/packages/dev-db/pgmodeler/pgmodeler-0.9.1-r1.exheres-0
@ -13,7 +13,7 @@ the job for you! This software reunites the concepts of entity-relationship
 diagrams and the features that PostgreSQL implements as extensions of SQL
 standards.
 "
-HOMEPAGE="https://pgmodeler.io/ ${HOMEPAGE}"
+HOMEPAGE="https://www.pgmodeler.com.br ${HOMEPAGE}"

 LICENCES="GPL-3"
 SLOT="0"
@ -25,13 +25,11 @@ DEPENDENCIES="
        virtual/pkg-config
        x11-libs/qttools:5
    build+run:
-        dev-db/postgresql-client
+        dev-db/postgresql
        dev-libs/libxml2
        group/pgmodeler
        x11-libs/qtbase:5
        x11-libs/qtsvg:5
-    suggestion:
-        dev-db/postgresql [[ description = [ For running postgresql DB on the same host ] ]]
 "

 BUGS_TO="hasufell@posteo.de"
--- a/packages/dev-haskell/cabal-install-bin/cabal-install-bin-2.4.0.0.exheres-0
+++ b/packages/dev-haskell/cabal-install-bin/cabal-install-bin-2.4.0.0.exheres-0
@ -1,36 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-SUMMARY="cabal-install is the command line interface to Cabal and hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-DOWNLOADS="https://downloads.haskell.org/~debian/pool/main/c/cabal-install-2.4/cabal-install-2.4_2.4%2Bgit20180920.1.60e200d-6~deb9_amd64.deb"
-
-LICENCES="BSD-3"
-SLOT="0"
-PLATFORMS="-* ~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    run:
-        virtual/GHC
-        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
-        !dev-haskell/cabal-install [[
-            description = [ Both install the same binary ]
-            resolution = uninstall-blocked-after
-        ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-WORK=${WORKBASE}
-
-src_unpack() {
-    default
-    unpack ./data.tar.xz
-}
-
-src_install() {
-    dobin opt/cabal/2.4/bin/cabal
-    doman opt/cabal/2.4/share/man/man1/*
-}
-
--- a/packages/dev-haskell/cabal-install-bin/cabal-install-bin-2.4.1.0.exheres-0
+++ b/packages/dev-haskell/cabal-install-bin/cabal-install-bin-2.4.1.0.exheres-0
@ -1,30 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-SUMMARY="cabal-install is the command line interface to Cabal and hackage"
-HOMEPAGE="https://www.haskell.org/cabal/"
-DOWNLOADS="https://downloads.haskell.org/~cabal/cabal-install-${PV}/cabal-install-${PV}-x86_64-unknown-linux.tar.xz"
-
-LICENCES="BSD-3"
-SLOT="0"
-PLATFORMS="-* ~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    run:
-        virtual/GHC
-        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
-        !dev-haskell/cabal-install [[
-            description = [ Both install the same binary ]
-            resolution = uninstall-blocked-after
-        ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-WORK=${WORKBASE}
-
-src_install() {
-    dobin cabal
-}
-
--- a/packages/dev-haskell/ghcup/ghcup-scm.exheres-0
+++ b/packages/dev-haskell/ghcup/ghcup-scm.exheres-0
@ -1,38 +0,0 @@
-# Copyright 2019 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require github [ user=haskell ]
-
-SUMMARY="Painless installation of GHC toolchain"
-HOMEPAGE="https://www.haskell.org/ghcup/ ${HOMEPAGE}"
-
-LICENCES="BSD-3"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-
-
-DEPENDENCIES="
-    run:
-        app-arch/gzip
-        app-arch/tar
-        app-arch/xz
-        net-misc/curl
-        sys-apps/coreutils
-        virtual/awk
-        suggestion:
-            net-misc/wget [[ description = [ alternative downloader ] ]]
-        recommendation:
-            (
-                dev-lang/llvm[>=2.7]
-                dev-lang/perl:*[>=5.6.1]
-                dev-libs/gmp[>=5]
-                dev-libs/libffi
-            ) [[ *description = [ Dependency for GHC ] *group-name = [ ghc-deps ] ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-src_install() {
-    dobin ghcup
-    emagicdocs
-}
--- a/packages/dev-haskell/stack-bin/stack-bin-1.9.1.exheres-0
+++ b/packages/dev-haskell/stack-bin/stack-bin-1.9.1.exheres-0
@ -1,31 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-SUMMARY="The Haskell Tool Stack"
-DESCRIPTION="
-Stack is a cross-platform program for developing Haskell projects.
-It is intended for Haskellers both new and experienced.
-"
-HOMEPAGE="http://haskellstack.org/"
-DOWNLOADS="https://github.com/commercialhaskell/stack/releases/download/v${PV}/stack-${PV}-linux-x86_64.tar.gz"
-
-LICENCES="BSD-3"
-SLOT="0"
-PLATFORMS="-* ~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    run:
-        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
-        virtual/GHC
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-WORK=${WORKBASE}/stack-${PV}-linux-x86_64
-
-src_install() {
-    default
-    dobin stack
-}
-
--- a/packages/dev-java/antlr/antlr-4.7.1.exheres-0
+++ b/packages/dev-java/antlr/antlr-4.7.1.exheres-0
@ -1,25 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo>
-# Distributed under the terms of the GNU General Public License v2
-
-require java
-
-SUMMARY="A powerful parser generator for reading, processing, executing, or translating structured text or binary files (Java target)"
-HOMEPAGE="http://www.antlr.org"
-DOWNLOADS="http://www.antlr.org/download/antlr-${PV}-complete.jar"
-
-LICENCES="BSD-3"
-SLOT="4"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
-"
-
-BUGS_TO="hasufell@posteo"
-
-WORK=${WORKBASE}
-
-src_install() {
-    insinto /usr/share/${PN}-${SLOT}
-    newins "${FETCHEDDIR}"/antlr-${PV}-complete.jar antlr-complete.jar
-}
--- a/packages/dev-lang/GHC/GHC-8.2.2-r1.exheres-0
+++ b/packages/dev-lang/GHC/GHC-8.2.2-r1.exheres-0
@ -1,182 +0,0 @@
-# Copyright 2008 Santiago M. Mola
-# Copyright 2008, 2009, 2010, 2011 Ingmar Vanhassel
-# Copyright 2011 Markus Rothe
-# Distributed under the terms of the GNU General Public License v2
-# Based in part upon 'ghc-6.8.2.ebuild' from Gentoo, which is:
-#     Copyright 1999-2008 Gentoo Foundation
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-
-MY_PN="ghc"
-MY_PNV="${MY_PN}-${PV}"
-MY_PNVR="${MY_PN}-${PVR}"
-
-require bash-completion flag-o-matic alternatives
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System (non-haskell packages version)"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell.
-"
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-src.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-testsuite.tar.xz
-    https://hawkings.mailstation.de/~hasufell/ghc-${PV}-x86_64-unknown-linux.tar.xz
-"
-
-PLATFORMS="-* ~amd64"
-
-BUGS_TO=""
-REMOTE_IDS="freecode:${MY_PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${MY_PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-MYOPTIONS="
-    doc
-    llvm [[ description = [ Code generation using LLVM ] ]]
-"
-
-# `make test` takes really long, so disable it. It also succeeds (i.e. returned value is zero) in
-# case of unexpected failures. There are always unexpected failures.
-# If you really want to run the tests, then enable expensive tests in order to run `make fulltest`,
-# which runs the same tests as `make test`, but includes more test cases per test.
-RESTRICT="test"
-
-DEPENDENCIES="
-    build:
-        dev-python/Sphinx
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp:=[>=5]
-        dev-libs/libffi
-        llvm? ( dev-lang/llvm[>=2.7] )
-        !dev-lang/ghc [[ resolution = uninstall-blocked-before ]]
-        !dev-lang/ghc-bin [[ resolution = uninstall-blocked-before ]]
-"
-
-WORK=${WORKBASE}/${MY_PNV}
-
-src_unpack() {
-    unpack ghc-${PV}-x86_64-unknown-linux.tar.xz
-    edo mv "${WORK}" "${WORK}-pre"
-    unpack ${MY_PNV}-src.tar.xz
-    unpack ${MY_PNV}-testsuite.tar.xz
-}
-
-src_prepare() {
-    # prepare pre-built ghc
-    edo mkdir "${TEMP}"/bin
-    edo ln -s /usr/$(exhost --target)/bin/$(exhost --tool-prefix)ar "${TEMP}/bin/ar"
-    edo ln -s /usr/$(exhost --target)/bin/true "${TEMP}"/bin/strip
-    edo pushd "${WORK}-pre"
-    PATH="${TEMP}/bin:$PATH" edo ./configure \
-        --prefix="${TEMP}/ghc-pre" \
-        --target=$(exhost --target)
-    PATH="${TEMP}/bin:$PATH" emake install
-    edo popd
-
-    autotools_src_prepare
-}
-
-src_configure() {
-    # Initialize build.mk
-    echo '# Exherbo changes' > mk/build.mk
-
-    cat <<EOF >> mk/build.mk
-# Put docs into the right place
-docdir = /usr/share/doc/${MY_PNVR}
-htmldir = /usr/share/doc/${MY_PNVR}/html
-EOF
-
-    if option doc; then
-        echo "BUILD_SPHINX_HTML=YES" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=YES" >> mk/build.mk
-    else
-        echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=( --with-ghc=${TEMP}/ghc-pre/bin/ghc )
-    export PATH="${WORKBASE}/usr/bin:${PATH}"
-
-    if option llvm; then
-        echo "GhcWithLlvmCodeGen=YES" >> mk/build.mk
-    else
-        echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=(
-        --with-system-libffi
-        --with-ffi-includes=$(${PKG_CONFIG} --variable includedir libffi)
-    )
-
-    # host and build cause compilation (at least for 7.6.1) to fail, as they're intended for
-    # cross-compilation.
-    econf \
-        AR=${AR} \
-        CC=${CC} \
-        --target=$(exhost --target) \
-        "${GHC_SRC_CONFIGURE_OPTIONS[@]}"
-
-    # don't strip anything. Very useful when stage2 SIGSEGVs on you
-    echo "STRIP_CMD = :" >> mk/build.mk
-}
-
-src_install() {
-    default
-
-    # libraries/ is a partial dupe of the html/ dir hierarchy, but
-    # containing only LICENSE files
-    edo rm -rf "${IMAGE}"/usr/share/doc/${MY_PNVR}/{LICENSE,libraries}
-
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg $(optionq doc && echo "haddock") runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        $(optionq doc &&  echo "/usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}}") \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    if [[ -d ${IMAGE}/usr/share/man ]]; then
-        local file alternatives=()
-        for file in "${IMAGE}"/usr/share/man/*/*; do
-            alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-            )
-        done
-
-        alternatives_for \
-            ghc ${SLOT} ${SLOT} \
-            "${alternatives[@]}"
-    fi
-}
-
-src_test_expensive() {
-    emake fulltest
-}
-
--- a/packages/dev-lang/GHC/GHC-8.4.3-r1.exheres-0
+++ b/packages/dev-lang/GHC/GHC-8.4.3-r1.exheres-0
@ -1,179 +0,0 @@
-# Copyright 2008 Santiago M. Mola
-# Copyright 2008, 2009, 2010, 2011 Ingmar Vanhassel
-# Copyright 2011 Markus Rothe
-# Distributed under the terms of the GNU General Public License v2
-# Based in part upon 'ghc-6.8.2.ebuild' from Gentoo, which is:
-#     Copyright 1999-2008 Gentoo Foundation
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-
-MY_PN="ghc"
-MY_PNV="${MY_PN}-${PV}"
-MY_PNVR="${MY_PN}-${PVR}"
-
-require bash-completion flag-o-matic alternatives
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System (non-haskell packages version)"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell.
-"
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-src.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-testsuite.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz
-"
-
-PLATFORMS="-* ~amd64"
-
-BUGS_TO=""
-REMOTE_IDS="freecode:${MY_PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${MY_PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-MYOPTIONS="
-    doc
-    llvm [[ description = [ Code generation using LLVM ] ]]
-"
-
-# `make test` takes really long, so disable it. It also succeeds (i.e. returned value is zero) in
-# case of unexpected failures. There are always unexpected failures.
-# If you really want to run the tests, then enable expensive tests in order to run `make fulltest`,
-# which runs the same tests as `make test`, but includes more test cases per test.
-RESTRICT="test"
-
-DEPENDENCIES="
-    build:
-        dev-python/Sphinx
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp:=[>=5]
-        dev-libs/libffi
-        llvm? ( dev-lang/llvm[>=2.7] )
-        !dev-lang/ghc [[ resolution = uninstall-blocked-before ]]
-        !dev-lang/ghc-bin [[ resolution = uninstall-blocked-before ]]
-"
-
-WORK=${WORKBASE}/${MY_PNV}
-
-src_unpack() {
-    unpack ghc-${PV}-x86_64-fedora27-linux.tar.xz
-    edo mv "${WORK}" "${WORK}-pre"
-    unpack ${MY_PNV}-src.tar.xz
-    unpack ${MY_PNV}-testsuite.tar.xz
-}
-
-src_prepare() {
-    # prepare pre-built ghc
-    edo pushd "${WORK}-pre"
-    edo ./configure \
-        --prefix="${TEMP}/ghc-pre" \
-        --target=$(exhost --target)
-    emake install
-    edo popd
-
-    autotools_src_prepare
-}
-
-src_configure() {
-    # Initialize build.mk
-    echo '# Exherbo changes' > mk/build.mk
-
-    cat <<EOF >> mk/build.mk
-# Put docs into the right place
-docdir = /usr/share/doc/${MY_PNVR}
-htmldir = /usr/share/doc/${MY_PNVR}/html
-EOF
-
-    if option doc; then
-        echo "BUILD_SPHINX_HTML=YES" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=YES" >> mk/build.mk
-    else
-        echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=( --with-ghc=${TEMP}/ghc-pre/bin/ghc )
-    export PATH="${WORKBASE}/usr/bin:${PATH}"
-
-    if option llvm; then
-        echo "GhcWithLlvmCodeGen=YES" >> mk/build.mk
-    else
-        echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=(
-        --with-system-libffi
-        --with-ffi-includes=$(${PKG_CONFIG} --variable includedir libffi)
-    )
-
-    # host and build cause compilation (at least for 7.6.1) to fail, as they're intended for
-    # cross-compilation.
-    econf \
-        AR=${AR} \
-        CC=${CC} \
-        --target=$(exhost --target) \
-        "${GHC_SRC_CONFIGURE_OPTIONS[@]}"
-
-    # don't strip anything. Very useful when stage2 SIGSEGVs on you
-    echo "STRIP_CMD = :" >> mk/build.mk
-}
-
-src_install() {
-    default
-
-    # libraries/ is a partial dupe of the html/ dir hierarchy, but
-    # containing only LICENSE files
-    edo rm -rf "${IMAGE}"/usr/share/doc/${MY_PNVR}/{LICENSE,libraries}
-
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg $(optionq doc && echo "haddock") runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        $(optionq doc &&  echo "/usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}}") \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    if [[ -d ${IMAGE}/usr/share/man ]]; then
-        local file alternatives=()
-        for file in "${IMAGE}"/usr/share/man/*/*; do
-            alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-            )
-        done
-
-        alternatives_for \
-            ghc ${SLOT} ${SLOT} \
-            "${alternatives[@]}"
-    fi
-}
-
-src_test_expensive() {
-    emake fulltest
-}
-
--- a/packages/dev-lang/GHC/GHC-8.4.4.exheres-0
+++ b/packages/dev-lang/GHC/GHC-8.4.4.exheres-0
@ -1,179 +0,0 @@
-# Copyright 2008 Santiago M. Mola
-# Copyright 2008, 2009, 2010, 2011 Ingmar Vanhassel
-# Copyright 2011 Markus Rothe
-# Distributed under the terms of the GNU General Public License v2
-# Based in part upon 'ghc-6.8.2.ebuild' from Gentoo, which is:
-#     Copyright 1999-2008 Gentoo Foundation
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-
-MY_PN="ghc"
-MY_PNV="${MY_PN}-${PV}"
-MY_PNVR="${MY_PN}-${PVR}"
-
-require bash-completion flag-o-matic alternatives
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System (non-haskell packages version)"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell.
-"
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-src.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-testsuite.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz
-"
-
-PLATFORMS="-* ~amd64"
-
-BUGS_TO=""
-REMOTE_IDS="freecode:${MY_PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${MY_PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-MYOPTIONS="
-    doc
-    llvm [[ description = [ Code generation using LLVM ] ]]
-"
-
-# `make test` takes really long, so disable it. It also succeeds (i.e. returned value is zero) in
-# case of unexpected failures. There are always unexpected failures.
-# If you really want to run the tests, then enable expensive tests in order to run `make fulltest`,
-# which runs the same tests as `make test`, but includes more test cases per test.
-RESTRICT="test"
-
-DEPENDENCIES="
-    build:
-        dev-python/Sphinx
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp:=[>=5]
-        dev-libs/libffi
-        llvm? ( dev-lang/llvm[>=2.7] )
-        !dev-lang/ghc [[ resolution = uninstall-blocked-before ]]
-        !dev-lang/ghc-bin [[ resolution = uninstall-blocked-before ]]
-"
-
-WORK=${WORKBASE}/${MY_PNV}
-
-src_unpack() {
-    unpack ghc-${PV}-x86_64-fedora27-linux.tar.xz
-    edo mv "${WORK}" "${WORK}-pre"
-    unpack ${MY_PNV}-src.tar.xz
-    unpack ${MY_PNV}-testsuite.tar.xz
-}
-
-src_prepare() {
-    # prepare pre-built ghc
-    edo pushd "${WORK}-pre"
-    edo ./configure \
-        --prefix="${TEMP}/ghc-pre" \
-        --target=$(exhost --target)
-    emake install
-    edo popd
-
-    autotools_src_prepare
-}
-
-src_configure() {
-    # Initialize build.mk
-    echo '# Exherbo changes' > mk/build.mk
-
-    cat <<EOF >> mk/build.mk
-# Put docs into the right place
-docdir = /usr/share/doc/${MY_PNVR}
-htmldir = /usr/share/doc/${MY_PNVR}/html
-EOF
-
-    if option doc; then
-        echo "BUILD_SPHINX_HTML=YES" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=YES" >> mk/build.mk
-    else
-        echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=( --with-ghc=${TEMP}/ghc-pre/bin/ghc )
-    export PATH="${WORKBASE}/usr/bin:${PATH}"
-
-    if option llvm; then
-        echo "GhcWithLlvmCodeGen=YES" >> mk/build.mk
-    else
-        echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=(
-        --with-system-libffi
-        --with-ffi-includes=$(${PKG_CONFIG} --variable includedir libffi)
-    )
-
-    # host and build cause compilation (at least for 7.6.1) to fail, as they're intended for
-    # cross-compilation.
-    econf \
-        AR=${AR} \
-        CC=${CC} \
-        --target=$(exhost --target) \
-        "${GHC_SRC_CONFIGURE_OPTIONS[@]}"
-
-    # don't strip anything. Very useful when stage2 SIGSEGVs on you
-    echo "STRIP_CMD = :" >> mk/build.mk
-}
-
-src_install() {
-    default
-
-    # libraries/ is a partial dupe of the html/ dir hierarchy, but
-    # containing only LICENSE files
-    edo rm -rf "${IMAGE}"/usr/share/doc/${MY_PNVR}/{LICENSE,libraries}
-
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg $(optionq doc && echo "haddock") runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        $(optionq doc &&  echo "/usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}}") \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    if [[ -d ${IMAGE}/usr/share/man ]]; then
-        local file alternatives=()
-        for file in "${IMAGE}"/usr/share/man/*/*; do
-            alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-            )
-        done
-
-        alternatives_for \
-            ghc ${SLOT} ${SLOT} \
-            "${alternatives[@]}"
-    fi
-}
-
-src_test_expensive() {
-    emake fulltest
-}
-
--- a/packages/dev-lang/GHC/GHC-8.6.2.exheres-0
+++ b/packages/dev-lang/GHC/GHC-8.6.2.exheres-0
@ -1,180 +0,0 @@
-# Copyright 2008 Santiago M. Mola
-# Copyright 2008, 2009, 2010, 2011 Ingmar Vanhassel
-# Copyright 2011 Markus Rothe
-# Distributed under the terms of the GNU General Public License v2
-# Based in part upon 'ghc-6.8.2.ebuild' from Gentoo, which is:
-#     Copyright 1999-2008 Gentoo Foundation
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-
-MY_PN="ghc"
-MY_PNV="${MY_PN}-${PV}"
-MY_PNVR="${MY_PN}-${PVR}"
-
-require bash-completion flag-o-matic alternatives
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System (non-haskell packages version)"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell.
-"
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-src.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-testsuite.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz
-"
-
-PLATFORMS="-* ~amd64"
-
-BUGS_TO=""
-REMOTE_IDS="freecode:${MY_PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${MY_PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-MYOPTIONS="
-    doc
-    llvm [[ description = [ Code generation using LLVM ] ]]
-"
-
-# `make test` takes really long, so disable it. It also succeeds (i.e. returned value is zero) in
-# case of unexpected failures. There are always unexpected failures.
-# If you really want to run the tests, then enable expensive tests in order to run `make fulltest`,
-# which runs the same tests as `make test`, but includes more test cases per test.
-RESTRICT="test"
-
-DEPENDENCIES="
-    build:
-        dev-python/Sphinx
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp:=[>=5]
-        dev-libs/libffi
-        llvm? ( dev-lang/llvm[>=2.7] )
-        !dev-lang/ghc [[ resolution = uninstall-blocked-before ]]
-        !dev-lang/ghc-bin [[ resolution = uninstall-blocked-before ]]
-"
-
-WORK=${WORKBASE}/${MY_PNV}
-
-src_unpack() {
-    unpack ghc-${PV}-x86_64-fedora27-linux.tar.xz
-    edo mv "${WORK}" "${WORK}-pre"
-    unpack ${MY_PNV}-src.tar.xz
-    unpack ${MY_PNV}-testsuite.tar.xz
-}
-
-src_prepare() {
-    # prepare pre-built ghc
-    edo pushd "${WORK}-pre"
-    edo ./configure \
-        --prefix="${TEMP}/ghc-pre" \
-        --target=$(exhost --target)
-    emake install
-    edo popd
-
-    autotools_src_prepare
-}
-
-src_configure() {
-    # Initialize build.mk
-    echo '# Exherbo changes' > mk/build.mk
-
-    cat <<EOF >> mk/build.mk
-# Put docs into the right place
-docdir = /usr/share/doc/${MY_PNVR}
-htmldir = /usr/share/doc/${MY_PNVR}/html
-EOF
-
-    if option doc; then
-        echo "BUILD_SPHINX_HTML=YES" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=YES" >> mk/build.mk
-    else
-        echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=( --with-ghc=${TEMP}/ghc-pre/bin/ghc )
-    export PATH="${WORKBASE}/usr/bin:${PATH}"
-
-    if option llvm; then
-        echo "GhcWithLlvmCodeGen=YES" >> mk/build.mk
-    else
-        echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=(
-        --with-system-libffi
-        --with-ffi-includes=$(${PKG_CONFIG} --variable includedir libffi)
-    )
-
-    # host and build cause compilation (at least for 7.6.1) to fail, as they're intended for
-    # cross-compilation.
-    econf \
-        AR=${AR} \
-        CC=${CC} \
-        --target=$(exhost --target) \
-        "${GHC_SRC_CONFIGURE_OPTIONS[@]}"
-
-    # don't strip anything. Very useful when stage2 SIGSEGVs on you
-    echo "STRIP_CMD = :" >> mk/build.mk
-}
-
-src_install() {
-    default
-
-    # libraries/ is a partial dupe of the html/ dir hierarchy, but
-    # containing only LICENSE files
-    edo rm -rf "${IMAGE}"/usr/share/doc/${MY_PNVR}/{LICENSE,libraries}
-
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg $(optionq doc && echo "haddock") runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        $(optionq doc &&  echo "/usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}}") \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    # alternatives for manpages
-    if [[ -d ${IMAGE}/usr/share/man ]]; then
-        local file alternatives=()
-        for file in "${IMAGE}"/usr/share/man/*/*; do
-            alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-            )
-        done
-
-        alternatives_for \
-            ghc ${SLOT} ${SLOT} \
-            "${alternatives[@]}"
-    fi
-}
-
-src_test_expensive() {
-    emake fulltest
-}
-
--- a/packages/dev-lang/GHC/GHC-8.6.3.exheres-0
+++ b/packages/dev-lang/GHC/GHC-8.6.3.exheres-0
@ -1,180 +0,0 @@
-# Copyright 2008 Santiago M. Mola
-# Copyright 2008, 2009, 2010, 2011 Ingmar Vanhassel
-# Copyright 2011 Markus Rothe
-# Distributed under the terms of the GNU General Public License v2
-# Based in part upon 'ghc-6.8.2.ebuild' from Gentoo, which is:
-#     Copyright 1999-2008 Gentoo Foundation
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-
-MY_PN="ghc"
-MY_PNV="${MY_PN}-${PV}"
-MY_PNVR="${MY_PN}-${PVR}"
-
-require bash-completion flag-o-matic alternatives
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System (non-haskell packages version)"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell.
-"
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-src.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-testsuite.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz
-"
-
-PLATFORMS="-* ~amd64"
-
-BUGS_TO=""
-REMOTE_IDS="freecode:${MY_PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${MY_PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-MYOPTIONS="
-    doc
-    llvm [[ description = [ Code generation using LLVM ] ]]
-"
-
-# `make test` takes really long, so disable it. It also succeeds (i.e. returned value is zero) in
-# case of unexpected failures. There are always unexpected failures.
-# If you really want to run the tests, then enable expensive tests in order to run `make fulltest`,
-# which runs the same tests as `make test`, but includes more test cases per test.
-RESTRICT="test"
-
-DEPENDENCIES="
-    build:
-        dev-python/Sphinx
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp:=[>=5]
-        dev-libs/libffi
-        llvm? ( dev-lang/llvm[>=2.7] )
-        !dev-lang/ghc [[ resolution = uninstall-blocked-before ]]
-        !dev-lang/ghc-bin [[ resolution = uninstall-blocked-before ]]
-"
-
-WORK=${WORKBASE}/${MY_PNV}
-
-src_unpack() {
-    unpack ghc-${PV}-x86_64-fedora27-linux.tar.xz
-    edo mv "${WORK}" "${WORK}-pre"
-    unpack ${MY_PNV}-src.tar.xz
-    unpack ${MY_PNV}-testsuite.tar.xz
-}
-
-src_prepare() {
-    # prepare pre-built ghc
-    edo pushd "${WORK}-pre"
-    edo ./configure \
-        --prefix="${TEMP}/ghc-pre" \
-        --target=$(exhost --target)
-    emake install
-    edo popd
-
-    autotools_src_prepare
-}
-
-src_configure() {
-    # Initialize build.mk
-    echo '# Exherbo changes' > mk/build.mk
-
-    cat <<EOF >> mk/build.mk
-# Put docs into the right place
-docdir = /usr/share/doc/${MY_PNVR}
-htmldir = /usr/share/doc/${MY_PNVR}/html
-EOF
-
-    if option doc; then
-        echo "BUILD_SPHINX_HTML=YES" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=YES" >> mk/build.mk
-    else
-        echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=( --with-ghc=${TEMP}/ghc-pre/bin/ghc )
-    export PATH="${WORKBASE}/usr/bin:${PATH}"
-
-    if option llvm; then
-        echo "GhcWithLlvmCodeGen=YES" >> mk/build.mk
-    else
-        echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=(
-        --with-system-libffi
-        --with-ffi-includes=$(${PKG_CONFIG} --variable includedir libffi)
-    )
-
-    # host and build cause compilation (at least for 7.6.1) to fail, as they're intended for
-    # cross-compilation.
-    econf \
-        AR=${AR} \
-        CC=${CC} \
-        --target=$(exhost --target) \
-        "${GHC_SRC_CONFIGURE_OPTIONS[@]}"
-
-    # don't strip anything. Very useful when stage2 SIGSEGVs on you
-    echo "STRIP_CMD = :" >> mk/build.mk
-}
-
-src_install() {
-    default
-
-    # libraries/ is a partial dupe of the html/ dir hierarchy, but
-    # containing only LICENSE files
-    edo rm -rf "${IMAGE}"/usr/share/doc/${MY_PNVR}/{LICENSE,libraries}
-
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg $(optionq doc && echo "haddock") runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        $(optionq doc &&  echo "/usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}}") \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    # alternatives for manpages
-    if [[ -d ${IMAGE}/usr/share/man ]]; then
-        local file alternatives=()
-        for file in "${IMAGE}"/usr/share/man/*/*; do
-            alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-            )
-        done
-
-        alternatives_for \
-            ghc ${SLOT} ${SLOT} \
-            "${alternatives[@]}"
-    fi
-}
-
-src_test_expensive() {
-    emake fulltest
-}
-
--- a/packages/dev-lang/GHC/GHC-8.6.4.exheres-0
+++ b/packages/dev-lang/GHC/GHC-8.6.4.exheres-0
@ -1,180 +0,0 @@
-# Copyright 2008 Santiago M. Mola
-# Copyright 2008, 2009, 2010, 2011 Ingmar Vanhassel
-# Copyright 2011 Markus Rothe
-# Distributed under the terms of the GNU General Public License v2
-# Based in part upon 'ghc-6.8.2.ebuild' from Gentoo, which is:
-#     Copyright 1999-2008 Gentoo Foundation
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-
-MY_PN="ghc"
-MY_PNV="${MY_PN}-${PV}"
-MY_PNVR="${MY_PN}-${PVR}"
-
-require bash-completion flag-o-matic alternatives
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System (non-haskell packages version)"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell.
-"
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-src.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-testsuite.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz
-"
-
-PLATFORMS="-* ~amd64"
-
-BUGS_TO=""
-REMOTE_IDS="freecode:${MY_PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${MY_PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-MYOPTIONS="
-    doc
-    llvm [[ description = [ Code generation using LLVM ] ]]
-"
-
-# `make test` takes really long, so disable it. It also succeeds (i.e. returned value is zero) in
-# case of unexpected failures. There are always unexpected failures.
-# If you really want to run the tests, then enable expensive tests in order to run `make fulltest`,
-# which runs the same tests as `make test`, but includes more test cases per test.
-RESTRICT="test"
-
-DEPENDENCIES="
-    build:
-        dev-python/Sphinx
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp:=[>=5]
-        dev-libs/libffi
-        llvm? ( dev-lang/llvm[>=2.7] )
-        !dev-lang/ghc [[ resolution = uninstall-blocked-before ]]
-        !dev-lang/ghc-bin [[ resolution = uninstall-blocked-before ]]
-"
-
-WORK=${WORKBASE}/${MY_PNV}
-
-src_unpack() {
-    unpack ghc-${PV}-x86_64-fedora27-linux.tar.xz
-    edo mv "${WORK}" "${WORK}-pre"
-    unpack ${MY_PNV}-src.tar.xz
-    unpack ${MY_PNV}-testsuite.tar.xz
-}
-
-src_prepare() {
-    # prepare pre-built ghc
-    edo pushd "${WORK}-pre"
-    edo ./configure \
-        --prefix="${TEMP}/ghc-pre" \
-        --target=$(exhost --target)
-    emake install
-    edo popd
-
-    autotools_src_prepare
-}
-
-src_configure() {
-    # Initialize build.mk
-    echo '# Exherbo changes' > mk/build.mk
-
-    cat <<EOF >> mk/build.mk
-# Put docs into the right place
-docdir = /usr/share/doc/${MY_PNVR}
-htmldir = /usr/share/doc/${MY_PNVR}/html
-EOF
-
-    if option doc; then
-        echo "BUILD_SPHINX_HTML=YES" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=YES" >> mk/build.mk
-    else
-        echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=( --with-ghc=${TEMP}/ghc-pre/bin/ghc )
-    export PATH="${WORKBASE}/usr/bin:${PATH}"
-
-    if option llvm; then
-        echo "GhcWithLlvmCodeGen=YES" >> mk/build.mk
-    else
-        echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=(
-        --with-system-libffi
-        --with-ffi-includes=$(${PKG_CONFIG} --variable includedir libffi)
-    )
-
-    # host and build cause compilation (at least for 7.6.1) to fail, as they're intended for
-    # cross-compilation.
-    econf \
-        AR=${AR} \
-        CC=${CC} \
-        --target=$(exhost --target) \
-        "${GHC_SRC_CONFIGURE_OPTIONS[@]}"
-
-    # don't strip anything. Very useful when stage2 SIGSEGVs on you
-    echo "STRIP_CMD = :" >> mk/build.mk
-}
-
-src_install() {
-    default
-
-    # libraries/ is a partial dupe of the html/ dir hierarchy, but
-    # containing only LICENSE files
-    edo rm -rf "${IMAGE}"/usr/share/doc/${MY_PNVR}/{LICENSE,libraries}
-
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg $(optionq doc && echo "haddock") runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        $(optionq doc &&  echo "/usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}}") \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    # alternatives for manpages
-    if [[ -d ${IMAGE}/usr/share/man ]]; then
-        local file alternatives=()
-        for file in "${IMAGE}"/usr/share/man/*/*; do
-            alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-            )
-        done
-
-        alternatives_for \
-            ghc ${SLOT} ${SLOT} \
-            "${alternatives[@]}"
-    fi
-}
-
-src_test_expensive() {
-    emake fulltest
-}
-
--- a/packages/dev-lang/GHC/GHC-8.6.5.exheres-0
+++ b/packages/dev-lang/GHC/GHC-8.6.5.exheres-0
@ -1,180 +0,0 @@
-# Copyright 2008 Santiago M. Mola
-# Copyright 2008, 2009, 2010, 2011 Ingmar Vanhassel
-# Copyright 2011 Markus Rothe
-# Distributed under the terms of the GNU General Public License v2
-# Based in part upon 'ghc-6.8.2.ebuild' from Gentoo, which is:
-#     Copyright 1999-2008 Gentoo Foundation
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-
-MY_PN="ghc"
-MY_PNV="${MY_PN}-${PV}"
-MY_PNVR="${MY_PN}-${PVR}"
-
-require bash-completion flag-o-matic alternatives
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System (non-haskell packages version)"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell.
-"
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-src.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/${MY_PNV}-testsuite.tar.xz
-    https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz
-"
-
-PLATFORMS="-* ~amd64"
-
-BUGS_TO=""
-REMOTE_IDS="freecode:${MY_PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${MY_PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-MYOPTIONS="
-    doc
-    llvm [[ description = [ Code generation using LLVM ] ]]
-"
-
-# `make test` takes really long, so disable it. It also succeeds (i.e. returned value is zero) in
-# case of unexpected failures. There are always unexpected failures.
-# If you really want to run the tests, then enable expensive tests in order to run `make fulltest`,
-# which runs the same tests as `make test`, but includes more test cases per test.
-RESTRICT="test"
-
-DEPENDENCIES="
-    build:
-        dev-python/Sphinx
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp:=[>=5]
-        dev-libs/libffi
-        llvm? ( dev-lang/llvm[>=2.7] )
-        !dev-lang/ghc [[ resolution = uninstall-blocked-before ]]
-        !dev-lang/ghc-bin [[ resolution = uninstall-blocked-before ]]
-"
-
-WORK=${WORKBASE}/${MY_PNV}
-
-src_unpack() {
-    unpack ghc-${PV}-x86_64-fedora27-linux.tar.xz
-    edo mv "${WORK}" "${WORK}-pre"
-    unpack ${MY_PNV}-src.tar.xz
-    unpack ${MY_PNV}-testsuite.tar.xz
-}
-
-src_prepare() {
-    # prepare pre-built ghc
-    edo pushd "${WORK}-pre"
-    edo ./configure \
-        --prefix="${TEMP}/ghc-pre" \
-        --target=$(exhost --target)
-    emake install
-    edo popd
-
-    autotools_src_prepare
-}
-
-src_configure() {
-    # Initialize build.mk
-    echo '# Exherbo changes' > mk/build.mk
-
-    cat <<EOF >> mk/build.mk
-# Put docs into the right place
-docdir = /usr/share/doc/${MY_PNVR}
-htmldir = /usr/share/doc/${MY_PNVR}/html
-EOF
-
-    if option doc; then
-        echo "BUILD_SPHINX_HTML=YES" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=YES" >> mk/build.mk
-    else
-        echo "BUILD_SPHINX_HTML=NO" >> mk/build.mk
-        echo "BUILD_SPHINX_PDF=NO" >> mk/build.mk
-        echo "HADDOCK_DOCS=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=( --with-ghc=${TEMP}/ghc-pre/bin/ghc )
-    export PATH="${WORKBASE}/usr/bin:${PATH}"
-
-    if option llvm; then
-        echo "GhcWithLlvmCodeGen=YES" >> mk/build.mk
-    else
-        echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk
-    fi
-
-    GHC_SRC_CONFIGURE_OPTIONS+=(
-        --with-system-libffi
-        --with-ffi-includes=$(${PKG_CONFIG} --variable includedir libffi)
-    )
-
-    # host and build cause compilation (at least for 7.6.1) to fail, as they're intended for
-    # cross-compilation.
-    econf \
-        AR=${AR} \
-        CC=${CC} \
-        --target=$(exhost --target) \
-        "${GHC_SRC_CONFIGURE_OPTIONS[@]}"
-
-    # don't strip anything. Very useful when stage2 SIGSEGVs on you
-    echo "STRIP_CMD = :" >> mk/build.mk
-}
-
-src_install() {
-    default
-
-    # libraries/ is a partial dupe of the html/ dir hierarchy, but
-    # containing only LICENSE files
-    edo rm -rf "${IMAGE}"/usr/share/doc/${MY_PNVR}/{LICENSE,libraries}
-
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg $(optionq doc && echo "haddock") runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        $(optionq doc &&  echo "/usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}}") \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    # alternatives for manpages
-    if [[ -d ${IMAGE}/usr/share/man ]]; then
-        local file alternatives=()
-        for file in "${IMAGE}"/usr/share/man/*/*; do
-            alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-            )
-        done
-
-        alternatives_for \
-            ghc ${SLOT} ${SLOT} \
-            "${alternatives[@]}"
-    fi
-}
-
-src_test_expensive() {
-    emake fulltest
-}
-
--- a/packages/dev-lang/GHC/files/ghc-bash-completion
+++ b/packages/dev-lang/GHC/files/ghc-bash-completion
@ -1,218 +0,0 @@
-# ghc-pkg command line completion for bash
-#
-# Copyright 2006-2007 Lennart Kolmodin <kolmodin@dtek.chalmers.se>
-
-_ghc-pkg-get-ghc-pkg()
-{
-    echo ghc-pkg
-}
-
-_ghc-pkg-pkg-fields()
-{
-    # usage: _ghc-pkg-pkg-fields pkg-id
-    #
-    # list all fields of the pkg-id
-
-    # same fields for all packages but different in different versions of
-    # ghc-pkg? this can probably be done better/faster
-
-    if [[ -z "$1" ]]; then
-        echo "usage: _ghc-pkg-pkg-fields pkg-id"
-        return 1
-    fi
-
-    local fields
-
-    fields="$( $(_ghc-pkg-get-ghc-pkg) describe $1 )"
-
-    #if [[ fields != *"cannot find package"* ]]; then
-    echo "$fields" | grep ".*:.*" | sed "s/^\(.*\):.*\$/\1/"
-    #fi
-}
-
-_ghc-pkg-pkg-ids()
-{
-    # usage: _ghc-pkg-pkg-ids
-    #
-    # simply lists all package ids known by ghc-pkg.
-    $(_ghc-pkg-get-ghc-pkg) list --simple-output
-}
-
-_ghc-pkg-pkgs()
-{
-    # usage: _ghc-pkg-pkgs [include-pkgs] [include-ids]
-    #
-    # with optional parameter include-pkgs it will list all packages known
-    # to ghc-pkg.
-    # with optional parameter include-ids it will list all package-ids known
-    # to ghc-pkg.
-    local pkgs
-    local result
-    pkgs=( $( _ghc-pkg-pkg-ids ) )
-    result=( )
-
-    local withPkgs="no" withIds="no"
-    while [[ -n "$1" ]]; do
-        case "$1" in
-            include-pkgs)
-                withPkgs="yes" ;;
-            include-ids)
-                withIds="yes" ;;
-            *)
-                echo "unknown parameter '$1' to _ghc-pkg-pkgs"
-                return 1 ;;
-        esac
-        shift
-    done
-
-    # user must supply either include-pkgs, include-ids or both
-    if [[ $withPkgs != "yes" && $withIds != "yes" ]]; then
-        echo "usage: _ghc-pkg-pkgs [include-pkgs] [include-ids]"
-        return 1
-    fi
-
-    # find all packages if the user requested them
-    if [[ $withPkgs == "yes" ]]; then
-        # O(n^2) algorithm to exclude duplicates
-        for p in ${pkgs[*]}; do
-            p="${p//-[0-9.]*/}"
-            for existing in ${result[*]}; do
-                if [[ "$existing" == "$p" ]]; then
-                    continue 2
-                fi
-            done
-            result=( "${result[@]}" "${p}" )
-        done
-    fi
-
-    # include all pkg-ids if requested
-    if [[ $withIds == "yes" ]]; then
-        result=( "${result[@]}" "${pkgs[@]}" )
-    fi
-
-    # we are finished, echo the result
-    echo "${result[*]}"
-
-    # happy ending
-    return 0
-}
-
-_ghc-pkg()
-{
-    local cur
-    cur=${COMP_WORDS[COMP_CWORD]}
-
-    COMPREPLY=()
-
-    local actions flags
-    actions='register update unregister expose hide list latest describe field'
-    dbflags="--user \
-        --global \
-        -f --package-conf= \
-        --global-conf="
-    registerflags="--force \
-        -g --auto-ghci-libs \
-        -D --define-name="
-    listflags="--simple-output"
-    flags="$dbflags \
-        $registerflags \
-        $listflags \
-        -? --help \
-        -V --version"
-
-    # if it's the users first word; complete it and return
-    if (($COMP_CWORD == 1)); then
-        COMPREPLY=( $( compgen -W "$actions $flags" -- $cur ) )
-        return 0
-    fi
-
-    # now we know we have at least one word written
-
-    local action="unknown" \
-          prev numwords \
-          cword act
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-    numwords=${#COMP_WORDS[@]}
-
-    # find the action with O(n*m) algorithm
-    # where n = ${#COMP_WORDS[*]}
-    #       m = number of actions
-    for cword in ${COMP_WORDS[*]}; do
-        for act in $actions; do
-            if [[ "$cword" == "$act" ]]; then
-                action=$cword
-            fi
-        done
-    done
-
-    case $action in
-        register|update)
-            # we want to complete both flags and paths, how?
-            # we do it by checking if the user has started to write a flag
-            # or a path, and then decide what to complete.
-            # that is, to complete a flag, the user must start to write a '-'
-            if [[ "$cur" == -* ]]; then
-                # (we assume) it's the start of a flag
-                # set COMPREPLY to flags relevant to these actions
-                COMPREPLY=( $( compgen -W "$dbflags $registerflags" -- $cur ) )
-            fi
-            ;;
-        unregister|expose|hide|list|describe)
-            # all these actions can be completed with exactly one argument,
-            # a pkg-id.
-            COMPREPLY=( $( compgen -W "$dbflags" -- $cur ) )
-
-            # add special flags for some actions
-            if [[ "$action" == "list" ]]; then
-                COMPREPLY+=( $( compgen -W "$listflags" -- $cur ) )
-            fi
-
-            COMPREPLY+=( $( compgen -W "$( _ghc-pkg-pkgs include-ids )" -- $cur ) )
-            ;;
-        latest)
-            # complete only packages, not package ids
-            COMPREPLY=( $( compgen -W "$( _ghc-pkg-pkgs include-pkgs )" -- $cur ) )
-            ;;
-        field)
-            # we should always complete on the flags...
-            COMPREPLY=( $( compgen -W "$dbflags" -- $cur ) )
-
-            # then, we should either complete the package name or the field
-            # lets find out which one
-
-            # find the number of words in COMP_WORDS before COMP_CWORD that
-            # isn't flags. it should be 2 or 3 for us to complete it,
-            #   exactly 2 if we should complete the package name
-            #   exactly 3 if we should complete the field name
-            #   otherwise, don't do any additional completion except the
-            #   flags
-
-            # count the number of non flags up till the current word
-            local numnonflags=0 lastword i
-            for (( i=0 ; $i < $COMP_CWORD ; i++ )); do
-                if [[ ${COMP_WORDS[$i]} != -* ]]; then
-                    lastword=${COMP_WORDS[$i]}
-                    numnonflags=$(( ++numnonflags ))
-                fi
-            done
-
-            case $numnonflags in
-                2)
-                    # complete on pkg-ids
-                    COMPREPLY+=( $( compgen -W "$( _ghc-pkg-pkgs include-ids )" -- $cur ) ) ;;
-                3)
-                    # complete on fields
-                    COMPREPLY+=( $( compgen -W "$( _ghc-pkg-pkg-fields $lastword )" -- $cur ) ) ;;
-            esac
-            ;;
-        *)
-            # unknown action, not yet given by the user
-            # return all possible completions
-            COMPREPLY=( $( compgen -W "$actions $flags" -- $cur ) )
-            ;;
-    esac
-}
-
-complete -F _ghc-pkg -o default ghc-pkg
-
-# vim: set ft=sh tw=80 sw=4 et :
--- a/packages/dev-lang/coconut/coconut-1.3.1.exheres-0
+++ b/packages/dev-lang/coconut/coconut-1.3.1.exheres-0
@ -31,7 +31,7 @@ DEPENDENCIES="
        dev-python/Pygments[>=2.2][python_abis:*(-)?]
        dev-python/prompt_toolkit[>=1.0][python_abis:*(-)?]
        dev-python/pyparsing[>=2.2.0&<2.2.1][python_abis:*(-)?]
-        python_abis:2.7? ( dev-python/futures[>=3.2][python_abis:2.7] )
+        python_abis:2.7? ( dev-python/futures[>=3.1][python_abis:2.7] )
    suggestion:
        dev-python/mypy[>=0.540] [[ description = [ coconut can run mypy on the compiled python code ] ]]
 "
--- a/packages/dev-lang/ghc-bin/files/ghc-bash-completion
+++ b/packages/dev-lang/ghc-bin/files/ghc-bash-completion
@ -1,218 +0,0 @@
-# ghc-pkg command line completion for bash
-#
-# Copyright 2006-2007 Lennart Kolmodin <kolmodin@dtek.chalmers.se>
-
-_ghc-pkg-get-ghc-pkg()
-{
-    echo ghc-pkg
-}
-
-_ghc-pkg-pkg-fields()
-{
-    # usage: _ghc-pkg-pkg-fields pkg-id
-    #
-    # list all fields of the pkg-id
-
-    # same fields for all packages but different in different versions of
-    # ghc-pkg? this can probably be done better/faster
-
-    if [[ -z "$1" ]]; then
-        echo "usage: _ghc-pkg-pkg-fields pkg-id"
-        return 1
-    fi
-
-    local fields
-
-    fields="$( $(_ghc-pkg-get-ghc-pkg) describe $1 )"
-
-    #if [[ fields != *"cannot find package"* ]]; then
-    echo "$fields" | grep ".*:.*" | sed "s/^\(.*\):.*\$/\1/"
-    #fi
-}
-
-_ghc-pkg-pkg-ids()
-{
-    # usage: _ghc-pkg-pkg-ids
-    #
-    # simply lists all package ids known by ghc-pkg.
-    $(_ghc-pkg-get-ghc-pkg) list --simple-output
-}
-
-_ghc-pkg-pkgs()
-{
-    # usage: _ghc-pkg-pkgs [include-pkgs] [include-ids]
-    #
-    # with optional parameter include-pkgs it will list all packages known
-    # to ghc-pkg.
-    # with optional parameter include-ids it will list all package-ids known
-    # to ghc-pkg.
-    local pkgs
-    local result
-    pkgs=( $( _ghc-pkg-pkg-ids ) )
-    result=( )
-
-    local withPkgs="no" withIds="no"
-    while [[ -n "$1" ]]; do
-        case "$1" in
-            include-pkgs)
-                withPkgs="yes" ;;
-            include-ids)
-                withIds="yes" ;;
-            *)
-                echo "unknown parameter '$1' to _ghc-pkg-pkgs"
-                return 1 ;;
-        esac
-        shift
-    done
-
-    # user must supply either include-pkgs, include-ids or both
-    if [[ $withPkgs != "yes" && $withIds != "yes" ]]; then
-        echo "usage: _ghc-pkg-pkgs [include-pkgs] [include-ids]"
-        return 1
-    fi
-
-    # find all packages if the user requested them
-    if [[ $withPkgs == "yes" ]]; then
-        # O(n^2) algorithm to exclude duplicates
-        for p in ${pkgs[*]}; do
-            p="${p//-[0-9.]*/}"
-            for existing in ${result[*]}; do
-                if [[ "$existing" == "$p" ]]; then
-                    continue 2
-                fi
-            done
-            result=( "${result[@]}" "${p}" )
-        done
-    fi
-
-    # include all pkg-ids if requested
-    if [[ $withIds == "yes" ]]; then
-        result=( "${result[@]}" "${pkgs[@]}" )
-    fi
-
-    # we are finished, echo the result
-    echo "${result[*]}"
-
-    # happy ending
-    return 0
-}
-
-_ghc-pkg()
-{
-    local cur
-    cur=${COMP_WORDS[COMP_CWORD]}
-
-    COMPREPLY=()
-
-    local actions flags
-    actions='register update unregister expose hide list latest describe field'
-    dbflags="--user \
-        --global \
-        -f --package-conf= \
-        --global-conf="
-    registerflags="--force \
-        -g --auto-ghci-libs \
-        -D --define-name="
-    listflags="--simple-output"
-    flags="$dbflags \
-        $registerflags \
-        $listflags \
-        -? --help \
-        -V --version"
-
-    # if it's the users first word; complete it and return
-    if (($COMP_CWORD == 1)); then
-        COMPREPLY=( $( compgen -W "$actions $flags" -- $cur ) )
-        return 0
-    fi
-
-    # now we know we have at least one word written
-
-    local action="unknown" \
-          prev numwords \
-          cword act
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-    numwords=${#COMP_WORDS[@]}
-
-    # find the action with O(n*m) algorithm
-    # where n = ${#COMP_WORDS[*]}
-    #       m = number of actions
-    for cword in ${COMP_WORDS[*]}; do
-        for act in $actions; do
-            if [[ "$cword" == "$act" ]]; then
-                action=$cword
-            fi
-        done
-    done
-
-    case $action in
-        register|update)
-            # we want to complete both flags and paths, how?
-            # we do it by checking if the user has started to write a flag
-            # or a path, and then decide what to complete.
-            # that is, to complete a flag, the user must start to write a '-'
-            if [[ "$cur" == -* ]]; then
-                # (we assume) it's the start of a flag
-                # set COMPREPLY to flags relevant to these actions
-                COMPREPLY=( $( compgen -W "$dbflags $registerflags" -- $cur ) )
-            fi
-            ;;
-        unregister|expose|hide|list|describe)
-            # all these actions can be completed with exactly one argument,
-            # a pkg-id.
-            COMPREPLY=( $( compgen -W "$dbflags" -- $cur ) )
-
-            # add special flags for some actions
-            if [[ "$action" == "list" ]]; then
-                COMPREPLY+=( $( compgen -W "$listflags" -- $cur ) )
-            fi
-
-            COMPREPLY+=( $( compgen -W "$( _ghc-pkg-pkgs include-ids )" -- $cur ) )
-            ;;
-        latest)
-            # complete only packages, not package ids
-            COMPREPLY=( $( compgen -W "$( _ghc-pkg-pkgs include-pkgs )" -- $cur ) )
-            ;;
-        field)
-            # we should always complete on the flags...
-            COMPREPLY=( $( compgen -W "$dbflags" -- $cur ) )
-
-            # then, we should either complete the package name or the field
-            # lets find out which one
-
-            # find the number of words in COMP_WORDS before COMP_CWORD that
-            # isn't flags. it should be 2 or 3 for us to complete it,
-            #   exactly 2 if we should complete the package name
-            #   exactly 3 if we should complete the field name
-            #   otherwise, don't do any additional completion except the
-            #   flags
-
-            # count the number of non flags up till the current word
-            local numnonflags=0 lastword i
-            for (( i=0 ; $i < $COMP_CWORD ; i++ )); do
-                if [[ ${COMP_WORDS[$i]} != -* ]]; then
-                    lastword=${COMP_WORDS[$i]}
-                    numnonflags=$(( ++numnonflags ))
-                fi
-            done
-
-            case $numnonflags in
-                2)
-                    # complete on pkg-ids
-                    COMPREPLY+=( $( compgen -W "$( _ghc-pkg-pkgs include-ids )" -- $cur ) ) ;;
-                3)
-                    # complete on fields
-                    COMPREPLY+=( $( compgen -W "$( _ghc-pkg-pkg-fields $lastword )" -- $cur ) ) ;;
-            esac
-            ;;
-        *)
-            # unknown action, not yet given by the user
-            # return all possible completions
-            COMPREPLY=( $( compgen -W "$actions $flags" -- $cur ) )
-            ;;
-    esac
-}
-
-complete -F _ghc-pkg -o default ghc-pkg
-
-# vim: set ft=sh tw=80 sw=4 et :
--- a/packages/dev-lang/ghc-bin/ghc-bin-8.0.2-r1.exheres-0
+++ b/packages/dev-lang/ghc-bin/ghc-bin-8.0.2-r1.exheres-0
@ -1,92 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require bash-completion alternatives
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell."
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-deb7-linux.tar.xz"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-PLATFORMS="-* ~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
-        sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
-        !dev-lang/GHC [[
-            description = [ different provider ]
-            resolution = uninstall-blocked-after
-        ]]
-        !dev-lang/ghc [[
-            description = [ Both install the same binaries/libs and alternatives ]
-            resolution = uninstall-blocked-before
-        ]]
-    suggestion:
-        dev-haskell/cabal-install-bin [[ description = [ the cabal binary for installing packages ] ]]
-        dev-lang/llvm[>=2.7] [[ description = [ LLVM can be used for code generation and linking ] ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-REMOTE_IDS="freecode:${PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-RESTRICT="test"
-
-WORK=${WORKBASE}/ghc-${PV}
-
-src_configure() {
-    # we are not building, shut up already
-    edo mkdir "${TEMP}"/bin
-    edo ln -s /usr/$(exhost --target)/bin/$(exhost --tool-prefix)ar "${TEMP}/bin/ar"
-    edo ln -s /usr/$(exhost --target)/bin/true "${TEMP}"/bin/strip
-    export PATH="${TEMP}/bin:$PATH"
-    edo ./configure \
-        --prefix=/usr/x86_64-pc-linux-gnu \
-        --datadir=/usr/share \
-        --datarootdir=/usr/share \
-        --docdir=/usr/share/doc/ghc-bin-${PV}
-}
-
-src_compile() {
-    :
-}
-
-src_install() {
-    default
-
-    # bashcomp
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg haddock runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}} \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-}
--- a/packages/dev-lang/ghc-bin/ghc-bin-8.2.2-r1.exheres-0
+++ b/packages/dev-lang/ghc-bin/ghc-bin-8.2.2-r1.exheres-0
@ -1,89 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require bash-completion alternatives
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell."
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-deb7-linux.tar.xz"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-PLATFORMS="-* ~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
-        sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
-        !dev-lang/GHC [[
-            description = [ different provider ]
-            resolution = uninstall-blocked-after
-        ]]
-        !dev-lang/ghc [[
-            description = [ Both install the same binaries/libs and alternatives ]
-            resolution = uninstall-blocked-before
-        ]]
-    suggestion:
-        dev-haskell/cabal-install-bin [[ description = [ the cabal binary for installing packages ] ]]
-        dev-lang/llvm[>=2.7] [[ description = [ LLVM can be used for code generation and linking ] ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-REMOTE_IDS="freecode:${PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-RESTRICT="test"
-
-WORK=${WORKBASE}/ghc-${PV}
-
-src_configure() {
-    # we are not building, shut up already
-    edo mkdir "${TEMP}"/bin
-    edo ln -s /usr/$(exhost --target)/bin/$(exhost --tool-prefix)ar "${TEMP}/bin/ar"
-    edo ln -s /usr/$(exhost --target)/bin/true "${TEMP}"/bin/strip
-    export PATH="${TEMP}/bin:$PATH"
-    econf \
-        --target=$(exhost --target)
-}
-
-src_compile() {
-    :
-}
-
-src_install() {
-    default
-
-    # bashcomp
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg haddock runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}} \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-}
--- a/packages/dev-lang/ghc-bin/ghc-bin-8.4.3-r1.exheres-0
+++ b/packages/dev-lang/ghc-bin/ghc-bin-8.4.3-r1.exheres-0
@ -1,96 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require bash-completion alternatives
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell."
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-PLATFORMS="-* ~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
-        sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
-        !dev-lang/GHC [[
-            description = [ different provider ]
-            resolution = uninstall-blocked-after
-        ]]
-        !dev-lang/ghc [[
-            description = [ Both install the same binaries/libs and alternatives ]
-            resolution = uninstall-blocked-before
-        ]]
-    suggestion:
-        dev-haskell/cabal-install-bin [[ description = [ the cabal binary for installing packages ] ]]
-        dev-lang/llvm[>=2.7] [[ description = [ LLVM can be used for code generation and linking ] ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-REMOTE_IDS="freecode:${PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-RESTRICT="test"
-
-WORK=${WORKBASE}/ghc-${PV}
-
-src_configure() {
-    econf \
-        --target=$(exhost --target)
-}
-
-src_compile() {
-    :
-}
-
-src_install() {
-    default
-
-    # bashcomp
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg haddock runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}} \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    # alternatives for manpages
-    local file alternatives=()
-    for file in "${IMAGE}"/usr/share/man/*/*; do
-        alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-        )
-    done
-    alternatives_for \
-        ghc ${SLOT} ${SLOT} \
-        "${alternatives[@]}"
-}
--- a/packages/dev-lang/ghc-bin/ghc-bin-8.4.4.exheres-0
+++ b/packages/dev-lang/ghc-bin/ghc-bin-8.4.4.exheres-0
@ -1,96 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require bash-completion alternatives
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell."
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-PLATFORMS="-* ~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
-        sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
-        !dev-lang/GHC [[
-            description = [ different provider ]
-            resolution = uninstall-blocked-after
-        ]]
-        !dev-lang/ghc [[
-            description = [ Both install the same binaries/libs and alternatives ]
-            resolution = uninstall-blocked-before
-        ]]
-    suggestion:
-        dev-haskell/cabal-install-bin [[ description = [ the cabal binary for installing packages ] ]]
-        dev-lang/llvm[>=2.7] [[ description = [ LLVM can be used for code generation and linking ] ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-REMOTE_IDS="freecode:${PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-RESTRICT="test"
-
-WORK=${WORKBASE}/ghc-${PV}
-
-src_configure() {
-    econf \
-        --target=$(exhost --target)
-}
-
-src_compile() {
-    :
-}
-
-src_install() {
-    default
-
-    # bashcomp
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg haddock runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}} \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    # alternatives for manpages
-    local file alternatives=()
-    for file in "${IMAGE}"/usr/share/man/*/*; do
-        alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-        )
-    done
-    alternatives_for \
-        ghc ${SLOT} ${SLOT} \
-        "${alternatives[@]}"
-}
--- a/packages/dev-lang/ghc-bin/ghc-bin-8.6.2-r1.exheres-0
+++ b/packages/dev-lang/ghc-bin/ghc-bin-8.6.2-r1.exheres-0
@ -1,96 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require bash-completion alternatives
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell."
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-PLATFORMS="-* ~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
-        sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
-        !dev-lang/GHC [[
-            description = [ different provider ]
-            resolution = uninstall-blocked-after
-        ]]
-        !dev-lang/ghc [[
-            description = [ Both install the same binaries/libs and alternatives ]
-            resolution = uninstall-blocked-before
-        ]]
-    suggestion:
-        dev-haskell/cabal-install-bin [[ description = [ the cabal binary for installing packages ] ]]
-        dev-lang/llvm[>=2.7] [[ description = [ LLVM can be used for code generation and linking ] ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-REMOTE_IDS="freecode:${PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-RESTRICT="test"
-
-WORK=${WORKBASE}/ghc-${PV}
-
-src_configure() {
-    econf \
-        --target=$(exhost --target)
-}
-
-src_compile() {
-    :
-}
-
-src_install() {
-    default
-
-    # bashcomp
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg haddock runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}} \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    # alternatives for manpages
-    local file alternatives=()
-    for file in "${IMAGE}"/usr/share/man/*/*; do
-        alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-        )
-    done
-    alternatives_for \
-        ghc ${SLOT} ${SLOT} \
-        "${alternatives[@]}"
-}
--- a/packages/dev-lang/ghc-bin/ghc-bin-8.6.3.exheres-0
+++ b/packages/dev-lang/ghc-bin/ghc-bin-8.6.3.exheres-0
@ -1,96 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require bash-completion alternatives
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell."
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-PLATFORMS="-* ~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
-        sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
-        !dev-lang/GHC [[
-            description = [ different provider ]
-            resolution = uninstall-blocked-after
-        ]]
-        !dev-lang/ghc [[
-            description = [ Both install the same binaries/libs and alternatives ]
-            resolution = uninstall-blocked-before
-        ]]
-    suggestion:
-        dev-haskell/cabal-install-bin [[ description = [ the cabal binary for installing packages ] ]]
-        dev-lang/llvm[>=2.7] [[ description = [ LLVM can be used for code generation and linking ] ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-REMOTE_IDS="freecode:${PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-RESTRICT="test"
-
-WORK=${WORKBASE}/ghc-${PV}
-
-src_configure() {
-    econf \
-        --target=$(exhost --target)
-}
-
-src_compile() {
-    :
-}
-
-src_install() {
-    default
-
-    # bashcomp
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg haddock runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}} \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    # alternatives for manpages
-    local file alternatives=()
-    for file in "${IMAGE}"/usr/share/man/*/*; do
-        alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-        )
-    done
-    alternatives_for \
-        ghc ${SLOT} ${SLOT} \
-        "${alternatives[@]}"
-}
--- a/packages/dev-lang/ghc-bin/ghc-bin-8.6.4.exheres-0
+++ b/packages/dev-lang/ghc-bin/ghc-bin-8.6.4.exheres-0
@ -1,96 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require bash-completion alternatives
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell."
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-PLATFORMS="-* ~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
-        sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
-        !dev-lang/GHC [[
-            description = [ different provider ]
-            resolution = uninstall-blocked-after
-        ]]
-        !dev-lang/ghc [[
-            description = [ Both install the same binaries/libs and alternatives ]
-            resolution = uninstall-blocked-before
-        ]]
-    suggestion:
-        dev-haskell/cabal-install-bin [[ description = [ the cabal binary for installing packages ] ]]
-        dev-lang/llvm[>=2.7] [[ description = [ LLVM can be used for code generation and linking ] ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-REMOTE_IDS="freecode:${PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-RESTRICT="test"
-
-WORK=${WORKBASE}/ghc-${PV}
-
-src_configure() {
-    econf \
-        --target=$(exhost --target)
-}
-
-src_compile() {
-    :
-}
-
-src_install() {
-    default
-
-    # bashcomp
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg haddock runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}} \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    # alternatives for manpages
-    local file alternatives=()
-    for file in "${IMAGE}"/usr/share/man/*/*; do
-        alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-        )
-    done
-    alternatives_for \
-        ghc ${SLOT} ${SLOT} \
-        "${alternatives[@]}"
-}
--- a/packages/dev-lang/ghc-bin/ghc-bin-8.6.5.exheres-0
+++ b/packages/dev-lang/ghc-bin/ghc-bin-8.6.5.exheres-0
@ -1,96 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require bash-completion alternatives
-
-SUMMARY="The Glorious Glasgow Haskell Compilation System"
-DESCRIPTION="
-GHC is a state-of-the-art, open source, compiler and interactive environment for the functional
-language Haskell."
-HOMEPAGE="https://www.haskell.org/ghc/"
-DOWNLOADS="https://downloads.haskell.org/~ghc/${PV}/ghc-${PV}-x86_64-fedora27-linux.tar.xz"
-
-LICENCES="BSD-3"
-SLOT="${PV}"
-PLATFORMS="-* ~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-lang/perl:*[>=5.6.1]
-        dev-libs/gmp[>=6.1] [[ note = [ depends on libgmp.so.10 ] ]]
-        sys-libs/ncurses[>=6.1-r2] [[ note = [ Only these include libtinfo.so symlinks ] ]]
-        !dev-lang/GHC [[
-            description = [ different provider ]
-            resolution = uninstall-blocked-after
-        ]]
-        !dev-lang/ghc [[
-            description = [ Both install the same binaries/libs and alternatives ]
-            resolution = uninstall-blocked-before
-        ]]
-    suggestion:
-        dev-haskell/cabal-install-bin [[ description = [ the cabal binary for installing packages ] ]]
-        dev-lang/llvm[>=2.7] [[ description = [ LLVM can be used for code generation and linking ] ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-REMOTE_IDS="freecode:${PN}"
-UPSTREAM_RELEASE_NOTES="http://www.haskell.org/${PN}/docs/${PV}/html/users_guide/release-${PV//./-}.html"
-
-RESTRICT="test"
-
-WORK=${WORKBASE}/ghc-${PV}
-
-src_configure() {
-    econf \
-        --target=$(exhost --target)
-}
-
-src_compile() {
-    :
-}
-
-src_install() {
-    default
-
-    # bashcomp
-    dobashcompletion "${FILES}/ghc-bash-completion"
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/share/bash-completion/completions/ghc-bin{,-${SLOT}}
-
-    # some scripts are not versioned, move
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hp2ps,hp2ps-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hpc,hpc-${SLOT}}
-    edo mv "${IMAGE}"/usr/$(exhost --target)/bin/{hsc2hs,hsc2hs-${SLOT}}
-
-    # remove unversioned symlinks, we create alternatives later
-    local ghc_bin
-    for ghc_bin in ghc ghci ghc-pkg haddock runghc runhaskell ; do
-        edo rm "${IMAGE}"/usr/$(exhost --target)/bin/${ghc_bin}
-    done
-    unset ghc_bin
-
-    # create alternatives for scripts/binaries
-    alternatives_for ghc ${SLOT} ${SLOT} \
-        /usr/$(exhost --target)/bin/ghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghci{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/ghc-pkg{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/haddock{,-ghc-${SLOT}} \
-        /usr/$(exhost --target)/bin/hp2ps{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hpc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/hsc2hs{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runghc{,-${SLOT}} \
-        /usr/$(exhost --target)/bin/runhaskell /usr/$(exhost --target)/bin/runghc-${SLOT}
-
-    # alternatives for manpages
-    local file alternatives=()
-    for file in "${IMAGE}"/usr/share/man/*/*; do
-        alternatives+=(
-            ${file#${IMAGE}}
-            ${file#${IMAGE}}-${SLOT}
-        )
-    done
-    alternatives_for \
-        ghc ${SLOT} ${SLOT} \
-        "${alternatives[@]}"
-}
--- a/packages/dev-libs/antlr4-cpp/antlr4-cpp-4.7.1.exheres-0
+++ b/packages/dev-libs/antlr4-cpp/antlr4-cpp-4.7.1.exheres-0
@ -1,36 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo>
-# Distributed under the terms of the GNU General Public License v2
-
-WORK=${WORKBASE}
-
-require cmake [ api=2 ]
-
-SUMMARY="A powerful parser generator for reading, processing, executing, or translating structured text or binary files (cpp target)"
-HOMEPAGE="http://www.antlr.org"
-DOWNLOADS="http://www.antlr.org/download/antlr4-cpp-runtime-${PV}-source.zip
-    http://www.antlr.org/download/antlr-${PV}-complete.jar"
-
-LICENCES="BSD-3"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build:
-        virtual/pkg-config
-    build+run:
-        dev-java/antlr:4
-        sys-apps/util-linux
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-src_configure() {
-    CMAKE_SRC_CONFIGURE_PARAMS=(
-        -DANTLR_JAR_LOCATION="/usr/share/antlr-4/antlr-complete.jar"
-        -DWITH_DEMO=False
-    )
-
-    cmake_src_configure
-}
-
--- a/packages/dev-libs/mbedtls/mbedtls-2.16.0.exheres-0
+++ b/packages/dev-libs/mbedtls/mbedtls-2.16.0.exheres-0
@ -36,7 +36,6 @@ DEPENDENCIES="
        sys-libs/zlib
    test:
        dev-lang/perl:*
-        dev-lang/python[>=3]
 "

 CMAKE_SRC_CONFIGURE_PARAMS=(
--- a/packages/dev-perl/razor/razor-2.85-r1.exheres-0
+++ b/packages/dev-perl/razor/razor-2.85-r1.exheres-0
@ -30,9 +30,14 @@ src_install() {
    # utterly broken shit, doesn't honour INSTALLMAN1DIR etc
    # no, I'm not hacking on perl build systems
    dodir /usr/share/man
+    edo mv "${IMAGE%/}"/usr/$(exhost --target)/man/man1 \
+        "${IMAGE%/}"/usr/share/man/man1
+    edo mv "${IMAGE%/}"/usr/$(exhost --target)/man/man3 \
+        "${IMAGE%/}"/usr/share/man/man3
    edo mv "${IMAGE%/}"/usr/$(exhost --target)/share/man/man5 \
        "${IMAGE%/}"/usr/share/man/man5
-    edo rmdir "${IMAGE%/}"/usr/$(exhost --target)/share/man \
+    edo rmdir "${IMAGE%/}"/usr/$(exhost --target)/man \
+        "${IMAGE%/}"/usr/$(exhost --target)/share/man \
        "${IMAGE%/}"/usr/$(exhost --target)/share
 }

--- a/packages/dev-python/mypy/mypy-0.570.exheres-0
+++ b/packages/dev-python/mypy/mypy-0.570.exheres-0
@ -23,27 +23,15 @@ MYOPTIONS=""

 DEPENDENCIES="
    build+run:
-        dev-python/typed-ast[>=1.3.1&<1.4.0][python_abis:*(-)?]
-        dev-python/mypy_extensions[>=0.4.0&<0.5.0][python_abis:*(-)?]
+        dev-python/typed-ast[>=1.1.0&<1.2.0][python_abis:*(-)?]
+        dev-python/psutil[>=5.4.0&<5.5.0][python_abis:*(-)?]
        python_abis:3.4? (
            dev-python/typing[>=3.5.3][python_abis:3.4]
        )
-    test:
-        dev-python/py[>=1.5.2][python_abis:*(-)?]
-        dev-python/pytest[>=3.0][python_abis:*(-)?]
-        dev-python/pytest-cov[>=2.4.0][python_abis:*(-)?]
-        dev-python/pytest-xdist[>=1.18][python_abis:*(-)?]
-        dev-python/virtualenv[python_abis:*(-)?]
-    suggestion:
-        dev-python/psutil[>=5.4.0&<5.5.0][python_abis:*(-)?] [[
-            description = [ Show memory stats in 'dmypy status -v' ] ]]
 "

 BUGS_TO="hasufell@posteo.de"

-# Require unpackaged: flake8-bugbear, flake8-pyi
-RESTRICT="test"
-
 prepare_one_multibuild() {
    edo sed -i \
            -e "/target = /s|lib|$(exhost --target)/lib|" \
@ -52,7 +40,3 @@ prepare_one_multibuild() {
    setup-py_prepare_one_multibuild
 }

-test_one_multibuild() {
-    PYTHONPATH="${PWD}" edo ${PYTHON} -B runtests.py -x lint
-}
-
--- a/packages/dev-python/mypy_extensions/mypy_extensions-0.4.1.exheres-0
+++ b/packages/dev-python/mypy_extensions/mypy_extensions-0.4.1.exheres-0
@ -1,17 +0,0 @@
-# Copyright 2018 Alexander Kapshuna <kapsh@kap.sh>
-# Distributed under the terms of the GNU General Public License v2
-
-require pypi setup-py [ import=setuptools ]
-
-SUMMARY="Experimental type system extensions for programs checked with the mypy typechecker"
-
-LICENCES="MIT"
-SLOT="0"
-PLATFORMS="~amd64"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        python_abis:3.4? ( dev-python/typing[>=3.5.3][python_abis:3.4] )
-"
-
--- a/packages/dev-python/oauth2client/oauth2client-4.1.2.exheres-0
+++ b/packages/dev-python/oauth2client/oauth2client-4.1.2.exheres-0
@ -7,7 +7,7 @@ SUMMARY="OAuth 2.0 client library"

 LICENCES="Apache-2.0"
 SLOT="0"
-PLATFORMS="~amd64 ~armv7 ~armv8 ~x86"
+PLATFORMS="~amd64 ~armv7 ~x86"
 MYOPTIONS=""

 DEPENDENCIES="
--- a/packages/dev-python/prompt_toolkit/prompt_toolkit-1.0.15-r1.exheres-0
+++ b/packages/dev-python/prompt_toolkit/prompt_toolkit-1.0.15-r1.exheres-0
@ -16,6 +16,7 @@ DEPENDENCIES="
    build+run:
        dev-python/six[>=1.9.0][python_abis:*(-)?]
        dev-python/wcwidth[python_abis:*(-)?]
+
 "

 BUGS_TO="hasufell@posteo.de"
--- a/packages/dev-python/psutil/psutil-5.4.8.exheres-0
+++ b/packages/dev-python/psutil/psutil-5.4.8.exheres-0
@ -1,7 +0,0 @@
-# Copyright 2012-2016 Wulf C. Krueger <philantrop@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require psutil
-
-PLATFORMS="~amd64 ~x86"
-
--- a/packages/dev-python/psutil/psutil.exlib
+++ b/packages/dev-python/psutil/psutil.exlib
@ -1,24 +0,0 @@
-# Copyright 2012-2016 Wulf C. Krueger <philantrop@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require pypi setup-py [ import=setuptools test=nose blacklist="none" ]
-
-SUMMARY="Cross-platform lib for process and system monitoring in Python"
-
-BUGS_TO="philantrop@exherbo.org"
-
-LICENCES="BSD-3"
-SLOT="0"
-MYOPTIONS=""
-
-# The tests are broken; they try to mess with mount points, devices & other funny
-# stuff. (last checked: 5.0.0)
-RESTRICT="test"
-
-DEPENDENCIES="
-    build+run:
-        python_abis:2.7? (
-            dev-python/enum34[python_abis:2.7]
-        )
-"
-
--- a/packages/dev-python/python-application/python-application-2.1.0.exheres-0
+++ b/packages/dev-python/python-application/python-application-2.1.0.exheres-0
--- a/packages/dev-python/python-eventlib/files/python-eventlib-0.2.2-libressl.patch
+++ b/packages/dev-python/python-eventlib/files/python-eventlib-0.2.2-libressl.patch
@ -0,0 +1,15 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Sep  8 01:22:40 UTC 2015
+Subject: fix compatibility with libressl
+Upstream: not yet
+
+--- a/eventlib/green/socket.py
+++ b/eventlib/green/socket.py
+@@ -89,7 +89,6 @@
+ else:
+     # some constants the SSL module exports but not in __all__
+     from eventlib.green.ssl import (RAND_add,
+-                                    RAND_egd,
+                                     RAND_status,
+                                     SSL_ERROR_ZERO_RETURN,
+                                     SSL_ERROR_WANT_READ,
--- a/packages/dev-python/python-eventlib/python-eventlib-0.2.4-r1.exheres-0
+++ b/packages/dev-python/python-eventlib/python-eventlib-0.2.4-r1.exheres-0
@ -1,11 +1,11 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2

-require github [ user="AGProjects" tag="release-${PV}" ]
-require setup-py [ import=distutils blacklist="3" work="${PN}-release-${PV}" ]
+require setup-py [ import=distutils blacklist="3" ]

 SUMMARY="Coroutine-based networking library"
 HOMEPAGE="http://sipsimpleclient.org"
+DOWNLOADS="http://download.ag-projects.com/SipClient/${PNV}.tar.gz"

 LICENCES="MIT"
 SLOT="0"
@ -16,6 +16,8 @@ MYOPTIONS=""
 DEPENDENCIES="
    run:
        dev-python/greenlet[python_abis:*(-)?]
-        net-twisted/Twisted[python_abis:*(-)?]
+        net-twisted/TwistedCore[python_abis:*(-)?]
 "

+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/${PNV}-libressl.patch" )
+
--- a/packages/dev-python/python-gnutls/python-gnutls-3.1.1.exheres-0
+++ b/packages/dev-python/python-gnutls/python-gnutls-3.1.1.exheres-0
--- a/packages/dev-python/python-msrplib/python-msrplib-0.19.2-r1.exheres-0
+++ b/packages/dev-python/python-msrplib/python-msrplib-0.19.2-r1.exheres-0
@ -1,11 +1,11 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2

-require github [ user="AGProjects" tag="release-${PV}" ]
-require setup-py [ import=distutils blacklist="3" work="${PN}-release-${PV}" ]
+require setup-py [ import=distutils blacklist="3" ]

 SUMMARY="Client library for MSRP protocol and its relay extension"
 HOMEPAGE="http://sipsimpleclient.org"
+DOWNLOADS="http://download.ag-projects.com/MSRP/${PNV}.tar.gz"

 LICENCES="LGPL-2"
 SLOT="0"
@ -17,6 +17,7 @@ DEPENDENCIES="
        dev-python/python-application[python_abis:*(-)?]
        dev-python/python-eventlib[python_abis:*(-)?]
        dev-python/python-gnutls[>=3.0.0][python_abis:*(-)?]
-        net-twisted/Twisted[python_abis:*(-)?]
+        net-twisted/TwistedCore[python_abis:*(-)?]
+        net-twisted/TwistedNames[python_abis:*(-)?]
 "

--- a/packages/dev-python/python-otr/python-otr-1.2.0.exheres-0
+++ b/packages/dev-python/python-otr/python-otr-1.2.0.exheres-0
@ -13,10 +13,10 @@ MYOPTIONS=""

 DEPENDENCIES="
    build+run:
-        dev-python/cryptography[>=1.6][python_abis:*(-)?]
+        dev-python/cryptography[python_abis:*(-)?]
        dev-python/enum34[python_abis:*(-)?]
        dev-python/gmpy2[python_abis:*(-)?]
-        dev-python/python-application[>=2.0.0][python_abis:*(-)?]
+        dev-python/python-application[python_abis:*(-)?]
        dev-python/zopeinterface[python_abis:*(-)?]
        net-libs/libotr
 "
--- a/packages/dev-python/python-periphery/python-periphery-1.1.1.exheres-0
+++ b/packages/dev-python/python-periphery/python-periphery-1.1.1.exheres-0
@ -1,22 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require github [ user="vsergeev" ]
-require pypi
-require setup-py [ import=setuptools test=pytest ]
-
-SUMMARY="A pure Python 2/3 library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux"
-HOMEPAGE="https://github.com/vsergeev/python-periphery ${HOMEPAGE}"
-
-LICENCES="MIT"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    test:
-        dev-python/pytest-runner[python_abis:*(-)?]
-"
-
-BUGS_TO="hasufell@posteo.de"
-
--- a/packages/dev-python/python-sipsimple/files/python-sipsimple-3.1.1-fix-build.patch
+++ b/packages/dev-python/python-sipsimple/files/python-sipsimple-3.1.1-fix-build.patch
--- a/packages/dev-python/python-sipsimple/python-sipsimple-3.4.2-r1.exheres-0
+++ b/packages/dev-python/python-sipsimple/python-sipsimple-3.4.2-r1.exheres-0
@ -21,8 +21,7 @@ DEPENDENCIES="
        virtual/pkg-config
    build+run:
        dev-db/sqlite:3
-        dev-libs/icu:=
-        dev-python/python-application[>=2.5.0][python_abis:*(-)?]
+        dev-python/python-application[>=2.0.0][python_abis:*(-)?]
        media-libs/libvpx
        media-libs/v4l-utils
        sys-apps/util-linux
@ -44,7 +43,7 @@ DEPENDENCIES="
        dev-python/python-xcaplib[python_abis:*(-)?]
        dev-python/zopeinterface[python_abis:*(-)?]
        media-libs/x264[-10bit]
-        net-twisted/Twisted[python_abis:*(-)?]
+        net-twisted/TwistedCore[python_abis:*(-)?]
 "

 DEFAULT_SRC_PREPARE_PATCHES=(
--- a/packages/dev-python/python-xcaplib/python-xcaplib-1.2.0.exheres-0
+++ b/packages/dev-python/python-xcaplib/python-xcaplib-1.2.0.exheres-0
--- a/packages/dev-python/rsa/rsa-3.4.2.exheres-0
+++ b/packages/dev-python/rsa/rsa-3.4.2.exheres-0
@ -7,7 +7,7 @@ SUMMARY="Pure-Python RSA implementation"

 LICENCES="Apache-2.0"
 SLOT="0"
-PLATFORMS="~amd64 ~armv7 ~armv8 ~x86"
+PLATFORMS="~amd64 ~armv7 ~x86"
 MYOPTIONS=""


--- a/packages/dev-python/typed-ast/typed-ast-1.0.4.exheres-0
+++ b/packages/dev-python/typed-ast/typed-ast-1.0.4.exheres-0
@ -1,7 +1,19 @@
 # Copyright 2017 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2

-require typed-ast
+require github [ user="python" project="typed_ast" ]
+require pypi
+require setup-py [ import=setuptools blacklist=2 ]

+SUMMARY="A fork of Python 2 and 3 ast modules with type comment support"
+DESCRIPTION="
+typed_ast is a Python 3 package that provides a Python 2.7 and Python 3 parser similar to the standard ast library. Unlike ast, the parsers in typed_ast include PEP 484 type comments and are independent of the version of Python under which they are run. The typed_ast parsers produce the standard Python AST (plus type comments), and are both fast and correct, as they are based on the CPython 2.7 and 3.6 parser
+"
+
+LICENCES="Apache-2.0"
+SLOT="0"
 PLATFORMS="~amd64 ~x86"
+MYOPTIONS=""
+
+BUGS_TO="hasufell@posteo.de"

--- a/packages/dev-python/typed-ast/typed-ast-1.1.0.exheres-0
+++ b/packages/dev-python/typed-ast/typed-ast-1.1.0.exheres-0
@ -1,7 +1,19 @@
 # Copyright 2017 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2

-require typed-ast
+require github [ user="python" project="typed_ast" ]
+require pypi
+require setup-py [ import=setuptools blacklist=2 ]

+SUMMARY="A fork of Python 2 and 3 ast modules with type comment support"
+DESCRIPTION="
+typed_ast is a Python 3 package that provides a Python 2.7 and Python 3 parser similar to the standard ast library. Unlike ast, the parsers in typed_ast include PEP 484 type comments and are independent of the version of Python under which they are run. The typed_ast parsers produce the standard Python AST (plus type comments), and are both fast and correct, as they are based on the CPython 2.7 and 3.6 parser
+"
+
+LICENCES="Apache-2.0"
+SLOT="0"
 PLATFORMS="~amd64 ~x86"
+MYOPTIONS=""
+
+BUGS_TO="hasufell@posteo.de"

--- a/packages/dev-python/typed-ast/typed-ast-1.3.1.exheres-0
+++ b/packages/dev-python/typed-ast/typed-ast-1.3.1.exheres-0
@ -1,7 +0,0 @@
-# Copyright 2017 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require typed-ast
-
-PLATFORMS="~amd64 ~x86"
-
--- a/packages/dev-python/typed-ast/typed-ast.exlib
+++ b/packages/dev-python/typed-ast/typed-ast.exlib
@ -1,18 +0,0 @@
-# Copyright 2017 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require github [ user="python" project="typed_ast" ]
-require pypi
-require setup-py [ import=setuptools blacklist=2 ]
-
-SUMMARY="A fork of Python 2 and 3 ast modules with type comment support"
-DESCRIPTION="
-typed_ast is a Python 3 package that provides a Python 2.7 and Python 3 parser similar to the standard ast library. Unlike ast, the parsers in typed_ast include PEP 484 type comments and are independent of the version of Python under which they are run. The typed_ast parsers produce the standard Python AST (plus type comments), and are both fast and correct, as they are based on the CPython 2.7 and 3.6 parser
-"
-
-LICENCES="Apache-2.0"
-SLOT="0"
-MYOPTIONS=""
-
-BUGS_TO="hasufell@posteo.de"
-
--- a/packages/dev-ruby/msgpack/msgpack-1.2.4.exheres-0
+++ b/packages/dev-ruby/msgpack/msgpack-1.2.4.exheres-0
@ -1,15 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require gem
-
-SUMMARY="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="https://msgpack.org"
-
-LICENCES="Apache-2.0"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-BUGS_TO="hasufell@posteo.de"
-
--- a/packages/dev-ruby/neovim-ruby/neovim-ruby-0.7.1.exheres-0
+++ b/packages/dev-ruby/neovim-ruby/neovim-ruby-0.7.1.exheres-0
@ -1,23 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require gem [ pn=neovim ]
-
-SUMMARY="Ruby bindings for Neovim"
-HOMEPAGE="https://github.com/alexgenco/neovim-ruby"
-
-LICENCES="MIT"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-ruby/msgpack[~>1.1]
-        dev-ruby/multi_json[~>1.0]
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-REMOTE_IDS+=" github:alexgenco/neovim-ruby"
-
--- a/packages/dev-scm/git-imerge/git-imerge-1.1.0.exheres-0
+++ b/packages/dev-scm/git-imerge/git-imerge-1.1.0.exheres-0
@ -1,35 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require github [ user=mhagger tag="v${PV}" ]
-require python [ has_bin=true multibuild=false blacklist=2 ]
-require bash-completion
-
-SUMMARY="Incremental merge for git"
-
-LICENCES="GPL-2.0"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    run:
-        dev-scm/git
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-src_prepare() {
-    default
-
-    # fix shebang
-    edo sed -i \
-        -e "s:/usr/bin/env python.*$:/usr/$(exhost --target)/bin/env ${PYTHON##*/}:" \
-        ${PN}
-}
-
-src_install() {
-    dodoc README.rst
-    dobashcompletion ${PN}.bashcomplete
-    dobin ${PN}
-}
--- a/packages/dev-util/cquery/cquery-20180608.exheres-0
+++ b/packages/dev-util/cquery/cquery-20180608.exheres-0
@ -0,0 +1,90 @@
+# Copyright 2018 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: no release tag yet, but older releases are not cmake compatible
+SCM_REPOSITORY="https://github.com/cquery-project/cquery.git"
+SCM_REVISION="6aa854dbe21d0bf871c452040a45a5c24dd385e3"
+
+SCM_SECONDARY_REPOSITORIES="
+    doctest
+    loguru
+    msgpack_c
+    pugixml
+    rapidjson
+    sparsepp
+    predef
+    preprocessor
+    gtest
+"
+
+SCM_EXTERNAL_REFS="
+    third_party/doctest:doctest
+    third_party/loguru:loguru
+    third_party/msgpack-c:msgpack_c
+    third_party/pugixml:pugixml
+    third_party/rapidjson:rapidjson
+    third_party/sparsepp:sparsepp
+"
+
+SCM_doctest_REPOSITORY="https://github.com/onqtam/doctest.git"
+SCM_loguru_REPOSITORY="https://github.com/emilk/loguru.git"
+SCM_msgpack_c_REPOSITORY="https://github.com/msgpack/msgpack-c.git"
+SCM_pugixml_REPOSITORY="https://github.com/zeux/pugixml.git"
+SCM_rapidjson_REPOSITORY="https://github.com/Tencent/rapidjson.git"
+SCM_sparsepp_REPOSITORY="https://github.com/greg7mdp/sparsepp.git"
+SCM_predef_REPOSITORY="https://github.com/boostorg/predef.git"
+SCM_preprocessor_REPOSITORY="https://github.com/boostorg/preprocessor.git"
+SCM_gtest_REPOSITORY="https://github.com/google/googletest.git"
+
+SCM_msgpack_c_EXTERNAL_REFS="
+    external/boost/predef:predef
+    external/boost/preprocessor:preprocessor
+"
+
+SCM_rapidjson_EXTERNAL_REFS="
+    thirdparty/gtest:gtest
+"
+
+require scm-git
+require cmake [ api=2 ]
+
+CLANG_VERSION="6.0.0"
+CLANG_TARBALL_NAME="clang+llvm-${CLANG_VERSION}-x86_64-linux-gnu-ubuntu-14.04"
+
+
+SUMMARY="C/C++ language server supporting multi-million line code base"
+HOMEPAGE="https://github.com/cquery-project/cquery"
+DOWNLOADS="
+    !system-clang? (
+        platform:amd64? ( https://releases.llvm.org/${CLANG_VERSION}/${CLANG_TARBALL_NAME}.tar.xz )
+    )
+"
+
+LICENCES="MIT"
+SLOT="0"
+PLATFORMS="~amd64"
+MYOPTIONS="
+    system-clang [[ description = [ Use system clang, NOT RECOMMENDED! ] ]]
+    platform: amd64
+"
+
+DEPENDENCIES="
+    build+run:
+        dev-libs/ncurses-libtinfo
+        sys-libs/zlib
+        system-clang? ( dev-lang/clang[>=6.0.0] )
+"
+
+BUGS_TO="hasufell@posteo.de"
+
+REMOTE_IDS="github:cquery-project/cquery"
+UPSTREAM_DOCUMENTATION="https://github.com/cquery-project/cquery/wiki"
+
+CMAKE_SRC_CONFIGURE_PARAMS=(
+    -DCLANG_DOWNLOAD_LOCATION="${WORKBASE}"
+)
+
+CMAKE_SRC_CONFIGURE_OPTIONS=(
+    'system-clang SYSTEM_CLANG'
+)
+
--- a/packages/games-arcade/Commander-Genius/Commander-Genius-2.2.0.exheres-0
+++ b/packages/games-arcade/Commander-Genius/Commander-Genius-2.2.0.exheres-0
--- a/packages/games-board/pysolfc/pysolfc-2.1.3.exheres-0
+++ b/packages/games-board/pysolfc/pysolfc-2.1.3.exheres-0
@ -1,4 +1,4 @@
-# Copyright 2016-2018 Julian Ospald <hasufell@posteo.de>
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2

 MY_PN=PySolFC
@ -37,7 +37,7 @@ src_prepare() {
 src_install() {
    setup-py_src_install

-    insinto /usr/share/${MY_PN}/cardsets
+    insinto /usr/share/${MY_PN}
    doins -r "${WORKBASE}"/${MY_PN}-Cardsets-2.0/*

    doman docs/*.6
--- a/packages/games-engines/openmw/openmw-0.43.0.exheres-0
+++ b/packages/games-engines/openmw/openmw-0.43.0.exheres-0
--- a/packages/games-engines/residualvm/residualvm-0.3.0.exheres-0
+++ b/packages/games-engines/residualvm/residualvm-0.3.0.exheres-0
--- a/packages/games-fps/urbanterror/files/urbanterror-4.3.3-build.patch
+++ b/packages/games-fps/urbanterror/files/urbanterror-4.3.3-build.patch
--- a/packages/games-fps/urbanterror/urbanterror-4.3.3.exheres-0
+++ b/packages/games-fps/urbanterror/urbanterror-4.3.3.exheres-0
@ -3,8 +3,8 @@

 require desktop-utils gtk-icon-cache

-ENGINE_PV=4.3.4
-FULL_P=UrbanTerror434_full
+ENGINE_PV=4.3.3
+FULL_P=UrbanTerror433_full
 SUMMARY="Hollywood tactical shooter based on the ioquake3 engine"
 HOMEPAGE="http://www.urbanterror.info/home/"
 DOWNLOADS="https://up.barbatos.fr/urt/${FULL_P}.zip
--- a/packages/games-roguelike/tome4/tome4-1.5.10.exheres-0
+++ b/packages/games-roguelike/tome4/tome4-1.5.10.exheres-0
--- a/packages/games-rpg/flare/flare-1.0.exheres-0
+++ b/packages/games-rpg/flare/flare-1.0.exheres-0
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 require github [ user=clintbellanger project=flare-game tag=v${PV} pn=flare-game ]
-require cmake [ api=2 ] desktop-utils gtk-icon-cache
+require cmake desktop-utils gtk-icon-cache

 SUMMARY="Free/Libre Action Roleplaying game"

@ -15,7 +15,7 @@ DEPENDENCIES="
        games-engines/flare[~${PV}]
 "

-CMAKE_SOURCE=${WORKBASE}/${PN}-game-${PV}
+WORK=${WORKBASE}/${PN}-game-${PV}

 CMAKE_SRC_CONFIGURE_PARAMS=(
    -DBINDIR="/usr/$(exhost --target)/bin"
@ -31,5 +31,7 @@ exec flare --game=flare-game "\$@"
 EOF

    install_desktop_entry "Name=Flare (game)" "Exec=flare-game"
+
+    dodoc README
 }

--- a/packages/games-rpg/flare/flare-scm.exheres-0
+++ b/packages/games-rpg/flare/flare-scm.exheres-0
@ -3,7 +3,7 @@

 SCM_CHECKOUT_TO=flare-game
 require github [ user=clintbellanger project=flare-game pn=flare-game ]
-require cmake [ api=2 ] desktop-utils gtk-icon-cache
+require cmake desktop-utils gtk-icon-cache

 SUMMARY="Free/Libre Action Roleplaying game"

@ -30,5 +30,7 @@ exec flare --game=flare-game "\$@"
 EOF

    install_desktop_entry "Name=Flare (game)" "Exec=flare-game"
+
+    dodoc README
 }

--- a/packages/games-simulation/minetest/minetest-0.4.17.1.exheres-0
+++ b/packages/games-simulation/minetest/minetest-0.4.17.1.exheres-0
@ -7,7 +7,7 @@ require github [ user=minetest ]

 SUMMARY="An InfiniMiner/Minecraft inspired game"
 HOMEPAGE="http://minetest.net/"
-DOWNLOADS+=" http://github.com/minetest/minetest_game/tarball/0.4.17 -> minetest_game-0.4.17.tar.gz"
+DOWNLOADS+=" http://github.com/minetest/minetest_game/tarball/${PV} -> minetest_game-${PV}.tar.gz"

 LICENCES="|| ( LGPL-2.1 LGPL-3 ) CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
--- a/packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Replace-use-of-boost-system-posix_error.patch
+++ b/packages/games-strategy/freeorion/files/freeorion-0.4.7.1-Replace-use-of-boost-system-posix_error.patch
@ -0,0 +1,43 @@
+Upstream: yes
+Reason: Fix build with boost[>=1.66.0]
+
+From c9b5b13fb81b1ed142dee0e843101c6b8832ca95 Mon Sep 17 00:00:00 2001
+From: D Benage <dbenage.cx@gmail.com>
+Date: Wed, 13 Dec 2017 18:53:55 -0600
+Subject: [PATCH] Replace use of boost::system::posix_error
+
+First deprecated in boost v1.37
+---
+ GG/src/dialogs/FileDlg.cpp | 2 +-
+ UI/ClientUI.cpp            | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/GG/src/dialogs/FileDlg.cpp b/GG/src/dialogs/FileDlg.cpp
+index 9032aee58..17b923233 100644
+--- a/GG/src/dialogs/FileDlg.cpp
+++ b/GG/src/dialogs/FileDlg.cpp
+@@ -746,7 +746,7 @@ void FileDlg::OpenDirectory()
+             try {
+                 SetWorkingDirectory(fs::path(directory + "\\"));
+             } catch (const fs::filesystem_error& e) {
+-                if (e.code() == boost::system::posix_error::io_error) {
+                if (e.code() == boost::system::errc::io_error) {
+                     m_in_win32_drive_selection = true;
+                     m_files_edit->Clear();
+                     FilesEditChanged(m_files_edit->Text());
+diff --git a/UI/ClientUI.cpp b/UI/ClientUI.cpp
+index f294e9116..f9709ad4e 100644
+--- a/UI/ClientUI.cpp
+++ b/UI/ClientUI.cpp
+@@ -1136,7 +1136,7 @@ ClientUI::TexturesAndDist ClientUI::PrefixedTexturesAndDist(const boost::filesys
+                     textures.push_back(ClientUI::GetTexture(*it, mipmap));
+             } catch (const fs::filesystem_error& e) {
+                 // ignore files for which permission is denied, and rethrow other exceptions
+-                if (e.code() != boost::system::posix_error::permission_denied)
+                if (e.code() != boost::system::errc::permission_denied)
+                     throw;
+             }
+         }
+-- 
+2.17.0
+
--- a/packages/games-strategy/freeorion/files/freeorion-Remove-all-references-to-signals-library-from-CMakeL.patch
+++ b/packages/games-strategy/freeorion/files/freeorion-Remove-all-references-to-signals-library-from-CMakeL.patch
@ -1,66 +0,0 @@
-Upstream: yes, cherrry-picked from master
-Reason: Fix build with boost[>=1.69.0] which removed the signals lib
-
-From 72a634ef6262dc1401298adb28000d1c89442482 Mon Sep 17 00:00:00 2001
-From: geoffthemedio <geoffthemedio@gmail.com>
-Date: Fri, 26 Oct 2018 09:06:46 +0200
-Subject: [PATCH] Remove all references to signals library from CMakeLists.txt
-
---
- CMakeLists.txt    | 5 -----
- GG/CMakeLists.txt | 2 +-
- 2 files changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 927c8c165..8d3832049 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -205,7 +205,6 @@ find_package(Boost ${MINIMUM_BOOST_VERSION}
-         log_setup
-         regex
-         serialization
-        signals
-         system
-         thread
-     REQUIRED)
-@@ -357,7 +356,6 @@ target_link_libraries(freeorioncommon
-     ${Boost_LOG_SETUP_LIBRARY}
-     ${Boost_REGEX_LIBRARY}
-     ${Boost_SERIALIZATION_LIBRARY}
-    ${Boost_SIGNALS_LIBRARY}
-     ${Boost_SYSTEM_LIBRARY}
-     ${Boost_THREAD_LIBRARY}
-     ${ZLIB_LIBRARIES}
-@@ -668,8 +666,6 @@ if(APPLE)
-            ${CMAKE_COMMAND} -E copy_if_different "${Boost_PYTHON_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport"
-         COMMAND
-            ${CMAKE_COMMAND} -E copy_if_different "${Boost_SERIALIZATION_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport"
-        COMMAND
-           ${CMAKE_COMMAND} -E copy_if_different "${Boost_SIGNALS_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport"
-         COMMAND
-            ${CMAKE_COMMAND} -E copy_if_different "${Boost_SYSTEM_LIBRARY}" "$<TARGET_FILE_DIR:freeorion>/../SharedSupport"
-         COMMAND
-@@ -769,7 +765,6 @@ if(WIN32)
-         boost_python-vc90-mt-1_44.dll
-         boost_regex-vc90-mt-1_44.dll
-         boost_serialization-vc90-mt-1_44.dll
-        boost_signals-vc90-mt-1_44.dll
-         boost_system-vc90-mt-1_44.dll
-         boost_thread-vc90-mt-1_44.dll
-         glew32.dll
-diff --git a/GG/CMakeLists.txt b/GG/CMakeLists.txt
-index 1e5f29d93..238cc44d0 100644
--- a/GG/CMakeLists.txt
-+++ b/GG/CMakeLists.txt
-@@ -91,7 +91,7 @@ if(NOT USE_STATIC_LIBS)
- endif()
- 
- set(Boost_USE_STATIC_LIBS ${USE_STATIC_LIBS})
-find_package(Boost ${MINIMUM_BOOST_VERSION} COMPONENTS date_time filesystem regex signals system thread log REQUIRED)
-+find_package(Boost ${MINIMUM_BOOST_VERSION} COMPONENTS date_time filesystem regex system thread log REQUIRED)
- 
- find_package(OpenGL REQUIRED)
- find_package(GLEW REQUIRED)
-- 
-2.20.1
-
--- a/packages/games-strategy/freeorion/freeorion-0.4.7.1-r1.exheres-0
+++ b/packages/games-strategy/freeorion/freeorion-0.4.7.1-r1.exheres-0
@ -1,9 +1,9 @@
-# Copyright 2017-2018 Julian Ospald <hasufell@posteo.de>
+# Copyright 2017 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2

 CMAKE_SOURCE=${WORKBASE}/src-tarball

-require github [ user=${PN} release=v${PV} pnv=FreeOrion_v${PV}_2018-08-23.26f16b0_Source suffix=tar.gz ]
+require github [ user=${PN} release=v${PV} pnv=FreeOrion_v${PV}_2017-09-03.139ffd9_Source suffix=tar.gz ]
 require cmake [ api=2 ]
 require gtk-icon-cache

@ -47,7 +47,7 @@ DEPENDENCIES="
 BUGS_TO="hasufell@posteo.de"

 DEFAULT_SRC_PREPARE_PATCHES=(
-    "${FILES}"/${PN}-Remove-all-references-to-signals-library-from-CMakeL.patch
+    "${FILES}"/${PNV}-Replace-use-of-boost-system-posix_error.patch
 )

 CMAKE_SRC_CONFIGURE_PARAMS=(
--- a/packages/media-sound/pnmixer/pnmixer.exlib
+++ b/packages/media-sound/pnmixer/pnmixer.exlib
@ -8,7 +8,7 @@ PNMIXER_RELEASE=$(exparam release)
 PNMIXER_PV=$(exparam pv)

 require github [ user='nicklan' release="${PNMIXER_RELEASE}" pv="${PNMIXER_PV}" suffix="tar.gz" ]
-require cmake [ api=2 ]
+require cmake
 require gtk-icon-cache

 SUMMARY="Simple ALSA mixer application designed to run in system tray"
--- a/packages/monitor/s-tui/s-tui-0.8.2.exheres-0
+++ b/packages/monitor/s-tui/s-tui-0.8.2.exheres-0
@ -1,24 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require github [ user="amanusk" tag="v${PV}" ]
-require pypi setup-py [ import=setuptools ]
-
-SUMMARY="Stress-Terminal UI monitoring tool "
-HOMEPAGE="https://amanusk.github.io/s-tui/ ${HOMEPAGE}"
-
-LICENCES="GPL-2.0"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
-    build+run:
-        dev-python/psutil[>=5.2.0][python_abis:*(-)?]
-        dev-python/urwid[>=1.3.1][python_abis:*(-)?]
-    suggestion:
-        app-benchmarks/stress [[ description = [ For running stress tests in s-tui ] ]]
-"
-
-BUGS_TO="hasufell@posteo.de"
-
--- a/packages/net-im/dianara/dianara-1.4.1-r2.exheres-0
+++ b/packages/net-im/dianara/dianara-1.4.1-r2.exheres-0
@ -17,7 +17,8 @@ MYOPTIONS=""

 DEPENDENCIES="
    build+run:
-        app-crypt/qca:2[qt5(+)]
+        app-crypt/qca:2[qt5]
+        dev-libs/qjson
        sys-apps/file
        sys-auth/qoauth[>=2.0.0]
        x11-libs/qtbase:5
--- a/packages/net-im/signal-desktop/signal-desktop-1.12.0.exheres-0
+++ b/packages/net-im/signal-desktop/signal-desktop-1.12.0.exheres-0
@ -16,11 +16,6 @@ MYOPTIONS="
 RESTRICT="mirror"

 DEPENDENCIES="
-    build+run:
-        !net-im/signal-desktop[<1.15.5] [[
-            description = [ /usr/host/bin/${PN} was accidentially a directory, paludis would refuse to merge ]
-            resolution = uninstall-blocked-before
-        ]]
    run:
        dev-libs/atk
        dev-libs/expat
@ -33,7 +28,7 @@ DEPENDENCIES="
        sys-apps/dbus
        sys-sound/alsa-lib
        x11-libs/cairo[X]
-        x11-libs/gdk-pixbuf:2.0[X]
+        x11-libs/gdk-pixbuf[X]
        x11-libs/gtk+:3[X]
        x11-libs/libX11
        x11-libs/libXScrnSaver
@ -73,8 +68,8 @@ src_install() {
    doins -r usr/share/applications
    doins -r usr/share/icons
    edo chmod +x "${IMAGE}"/opt/Signal/signal-desktop
-    dodir /usr/$(exhost --target)/bin/
-    dosym ../../../opt/Signal/signal-desktop /usr/$(exhost --target)/bin/${PN}
+    dodir /usr/$(exhost --target)/bin/${PN}
+    dosym ../../../opt/Signal/${MY_PN} /usr/$(exhost --target)/bin/${PN}
 }

 pkg_postinst() {
--- a/packages/net-im/slack/slack-3.4.2.exheres-0
+++ b/packages/net-im/slack/slack-3.4.2.exheres-0
@ -1,88 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require gtk-icon-cache freedesktop-desktop freedesktop-mime
-
-SUMMARY="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-DOWNLOADS="https://downloads.slack-edge.com/linux_releases/${PN/-bin/}-desktop-${PV}-amd64.deb"
-
-LICENCES="all-rights-reserved"
-SLOT="0"
-PLATFORMS="~amd64 -*"
-MYOPTIONS=""
-
-RESTRICT="mirror"
-
-DEPENDENCIES="
-    run:
-        dev-libs/atk
-        dev-libs/expat
-        dev-libs/glib:2
-        dev-libs/libsecret:1
-        dev-libs/nspr
-        dev-libs/nss
-        gnome-platform/GConf:2
-        media-libs/fontconfig
-        net-print/cups
-        sys-apps/dbus
-        sys-sound/alsa-lib
-        x11-libs/cairo
-        x11-libs/gdk-pixbuf:2.0
-        x11-libs/gtk+:3
-        x11-libs/libX11
-        x11-libs/libXScrnSaver
-        x11-libs/libXcomposite
-        x11-libs/libXcursor
-        x11-libs/libXdamage
-        x11-libs/libXext
-        x11-libs/libXfixes
-        x11-libs/libXi
-        x11-libs/libXrandr
-        x11-libs/libXrender
-        x11-libs/libXtst
-        x11-libs/libxcb
-        x11-libs/libxkbfile
-        x11-libs/pango
-"
-
-BUGS_TO="hasufell@posteo.de"
-
-WORK=${WORKBASE}
-
-pkg_setup() {
-    exdirectory --allow /opt
-}
-
-src_unpack() {
-    default
-    unpack ./data.tar.xz
-}
-
-src_install() {
-    insinto /usr/share/pixmaps
-    doins usr/share/pixmaps/slack.png
-    insinto /usr/share/icons/hicolor/512x512/apps
-    doins usr/share/pixmaps/slack.png
-    insinto /usr/share/applications
-    doins usr/share/applications/slack.desktop
-
-    insinto /opt/slack
-    doins -r usr/lib/slack/.
-    edo chmod +x "${IMAGE}"/opt/slack/slack
-    dodir /usr/$(exhost --target)/bin
-    dosym ../../../opt/slack/slack /usr/$(exhost --target)/bin/slack
-}
-
-pkg_postinst() {
-    freedesktop-mime_pkg_postinst
-    freedesktop-desktop_pkg_postinst
-    gtk-icon-cache_pkg_postinst
-}
-
-pkg_postrm() {
-    freedesktop-mime_pkg_postrm
-    freedesktop-desktop_pkg_postrm
-    gtk-icon-cache_pkg_postrm
-}
-
--- a/packages/net-libs/libsearpc/libsearpc-3.1.0.exheres-0
+++ b/packages/net-libs/libsearpc/libsearpc-3.1.0.exheres-0
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 require python [ blacklist=3 has_bin=true multibuild=false ]
-require github [ user=haiwen tag="v${PV}" ]
+require github [ user=haiwen tag="v${PV}-latest" ]
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]

 SUMMARY="A simple C language RPC framework (including both server side & client side)"
--- a/packages/net-misc/dropbox/dropbox-57.4.89.exheres-0
+++ b/packages/net-misc/dropbox/dropbox-57.4.89.exheres-0
@ -1,91 +0,0 @@
-# Copyright 2018 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require gtk-icon-cache desktop-utils
-require systemd-service openrc-service [ openrc_confd_files=[ "${FILES}"/openrc/confd ] ]
-
-SUMMARY="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-DOWNLOADS="
-    platform:x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-    platform:amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-"
-
-LICENCES="CC-Attribution-NoDerivs-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    platform:
-        amd64
-        x86
-    ( providers: ijg-jpeg jpeg-turbo ) [[ number-selected = exactly-one ]]
-"
-RESTRICT="mirror strip"
-
-DEPENDENCIES="
-    build:
-        dev-util/patchelf
-    run:
-        dev-libs/glib:2
-        dev-libs/libffi
-        dev-libs/libxml2:2.0
-        dev-libs/libxslt
-        dev-libs/popt
-        media-libs/fontconfig
-        media-libs/freetype:2
-        sys-libs/zlib
-        x11-dri/mesa
-        x11-libs/libICE
-        x11-libs/libSM
-        x11-libs/libX11
-        x11-libs/libXcomposite
-        x11-libs/libXext
-        x11-libs/libXrender
-        x11-libs/libxcb
-        x11-libs/qtbase:5
-        x11-libs/qtdeclarative:5
-        x11-libs/qtwebkit:5
-"
-
-BUGS_TO="hasufell@posteo"
-
-pkg_setup() {
-    exdirectory --allow /opt
-}
-
-src_unpack() {
-    default
-    edo mkdir "${WORK}"
-    edo mv "${WORKBASE}"/.dropbox-dist/* "${WORK}"/
-    edo mv "${WORK}"/dropbox-lnx.*-${PV}/* "${WORK}"
-    edo rmdir "${WORK}"/dropbox-lnx.*-${PV}/
-    edo rmdir .dropbox-dist
-}
-
-src_prepare() {
-    # remove some bundled stuff
-    edo rm -v libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl
-
-    edo patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so
-}
-
-src_install() {
-    local installdir="/opt/dropbox"
-
-    insinto "${installdir}"
-    doins -r *
-    chmod a+x "${IMAGE}${installdir}"/{dropbox,dropbox_py3,dropboxd}
-    dodir /usr/$(exhost --target)/bin
-    dosym "../../../${installdir}/dropboxd" "/usr/$(exhost --target)/bin/dropbox"
-
-    insinto /usr/share/icons/hicolor/16x16/status
-    doins images/hicolor/16x16/status/*
-
-    install_desktop_entry "Name=Dropbox"
-
-    install_systemd_files
-    install_openrc_files
-
-    dodoc README ACKNOWLEDGEMENTS
-}
-
--- a/packages/net-misc/dropbox/files/dropbox.initd
+++ b/packages/net-misc/dropbox/files/dropbox.initd
@ -1,65 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-    need localmount net
-    after bootmisc
-}
-
-start() {
-    local tmpnice="${NICE:+"--nicelevel "}${NICE}"
-    local tmpionice="${IONICE:+"--ionice "}${IONICE}"
-    local started=""
-
-    ebegin "Starting dropbox"
-    for dbuser in ${DROPBOX_USERS}; do
-	local homedir=$(eval echo ~${dbuser})
-	if test -d "${homedir}" && \
-	    echo 0 > ${homedir}/.dropbox/dropbox.pid && \
-	    start-stop-daemon -S -b \
-	    ${tmpnice} ${tmpionice} \
-	    -u ${dbuser} -v \
-	    -p ${homedir}/.dropbox/dropbox.pid \
-	    -e HOME=${homedir} \
-	    -x /opt/bin/dropbox; then
-	    started="${started} ${dbuser}"
-	else
-	    eend $?
-	    eerror "Failed to start dropbox for ${dbuser}"
-	    if [ -n "${started}" ]; then
-		eerror "Stopping already started dropbox"
-		DROPBOX_USERS=${started} stop
-	    fi
-	    return 1
-	fi
-    done
-    if [ -z "${started}" ];then
-	eerror "No dropbox started"
-	eend 1
-    else
-	eend 0
-    fi
-}
-
-stop() {
-    local retval=0
-    ebegin "Stopping dropbox"
-    for dbuser in ${DROPBOX_USERS}; do
-	local homedir=$(eval echo ~${dbuser})
-	start-stop-daemon --stop \
-	    --pidfile ${homedir}/.dropbox/dropbox.pid || retval=$?
-    done
-    eend ${retval}
-}
-
-status() {
-    for dbuser in ${DROPBOX_USERS}; do
-	local homedir=$(eval echo ~${dbuser})
-	if [ -e ${homedir}/.dropbox/dropbox.pid ] ; then
-            echo "dropboxd for USER $dbuser: running."
-	else
-            echo "dropboxd for USER $dbuser: not running."
-	fi
-    done
-}
--- a/packages/net-misc/dropbox/files/openrc/confd/dropbox
+++ b/packages/net-misc/dropbox/files/openrc/confd/dropbox
@ -1,14 +0,0 @@
-# /etc/conf.d/dropbox.conf: config file for /etc/init.d/dropbox
-
-# Users to run dropbox
-DROPBOX_USERS=""
-
-# integer [-20 .. 19 ] default 0
-# change the priority of the server -20 (high) to 19 (low)
-# see nice(1) for description
-#NICE=0
-
-# See start-stop-daemon(8) for possible settings
-#IONICE=2
-
-PID_DIR=/var/run/dropbox
--- a/packages/net-misc/dropbox/files/openrc/initd/dropbox
+++ b/packages/net-misc/dropbox/files/openrc/initd/dropbox
@ -1,65 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-    need localmount net
-    after bootmisc
-}
-
-start() {
-    local tmpnice="${NICE:+"--nicelevel "}${NICE}"
-    local tmpionice="${IONICE:+"--ionice "}${IONICE}"
-    local started=""
-
-    ebegin "Starting dropbox"
-    for dbuser in ${DROPBOX_USERS}; do
-	local homedir=$(eval echo ~${dbuser})
-	if test -d "${homedir}" && \
-	    echo 0 > ${homedir}/.dropbox/dropbox.pid && \
-	    start-stop-daemon -S -b \
-	    ${tmpnice} ${tmpionice} \
-	    -u ${dbuser} -v \
-	    -p ${homedir}/.dropbox/dropbox.pid \
-	    -e HOME=${homedir} \
-	    -x /opt/bin/dropbox; then
-	    started="${started} ${dbuser}"
-	else
-	    eend $?
-	    eerror "Failed to start dropbox for ${dbuser}"
-	    if [ -n "${started}" ]; then
-		eerror "Stopping already started dropbox"
-		DROPBOX_USERS=${started} stop
-	    fi
-	    return 1
-	fi
-    done
-    if [ -z "${started}" ];then
-	eerror "No dropbox started"
-	eend 1
-    else
-	eend 0
-    fi
-}
-
-stop() {
-    local retval=0
-    ebegin "Stopping dropbox"
-    for dbuser in ${DROPBOX_USERS}; do
-	local homedir=$(eval echo ~${dbuser})
-	start-stop-daemon --stop \
-	    --pidfile ${homedir}/.dropbox/dropbox.pid || retval=$?
-    done
-    eend ${retval}
-}
-
-status() {
-    for dbuser in ${DROPBOX_USERS}; do
-	local homedir=$(eval echo ~${dbuser})
-	if [ -e ${homedir}/.dropbox/dropbox.pid ] ; then
-            echo "dropboxd for USER $dbuser: running."
-	else
-            echo "dropboxd for USER $dbuser: not running."
-	fi
-    done
-}
--- a/packages/net-misc/dropbox/files/systemd/dropbox@.service
+++ b/packages/net-misc/dropbox/files/systemd/dropbox@.service
@ -1,13 +0,0 @@
-[Unit]
-Description=Dropbox
-After=local-fs.target network.target
-
-[Service]
-ExecStart=/opt/dropbox/dropboxd
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-Restart=always
-User=%i
-
-[Install]
-WantedBy=multi-user.target
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Julian Ospald	2c1e762eb6	metadata: mask net-misc/trickle[~scm]	2018-06-12 17:06:44 +02:00
Julian Ospald	3322636ed3	dev-util/cquery: initial import	2018-06-12 17:05:02 +02:00